Revived submitBatch #42
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,5 @@ logs | |
| build | ||
| config.toml | ||
| batches.json | ||
| users.json | ||
| genesis.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -337,6 +337,90 @@ func (b *Bazooka) DecodeState(stateBytes []byte) (ID, balance, nonce, token *big | |
| // Transactions | ||
| // | ||
|
|
||
| // SubmitBatch submits the batch on chain with updated root and compressed transactions | ||
| func (b *Bazooka) SubmitBatch(commitments []Commitment) error { | ||
| b.log.Info( | ||
| "Attempting to submit a new batch", | ||
| "NumOfCommitments", | ||
| len(commitments), | ||
| ) | ||
|
|
||
| if len(commitments) == 0 { | ||
| b.log.Info("No transactions to submit, waiting....") | ||
| return nil | ||
| } | ||
|
|
||
| var txs [][]byte | ||
| var updatedRoots [][32]byte | ||
| var aggregatedSig [][2]*big.Int | ||
| var totalTxs int | ||
|
|
||
| for _, commitment := range commitments { | ||
| compressedTxs, err := b.CompressTxs(commitment.Txs) | ||
| if err != nil { | ||
| b.log.Error("Unable to compress txs", "error", err) | ||
| return err | ||
| } | ||
| txs = append(txs, compressedTxs) | ||
| updatedRoots = append(updatedRoots, commitment.UpdatedRoot) | ||
| totalTxs += len(commitment.Txs) | ||
|
|
||
| // TODO cleanup | ||
| sig1 := commitment.AggregatedSignature[0:32] | ||
| sig2 := commitment.AggregatedSignature[32:64] | ||
| sig1bigInt := big.NewInt(0) | ||
| sig1bigInt.SetBytes(sig1) | ||
| sig2bigInt := big.NewInt(0) | ||
| sig2bigInt.SetBytes(sig2) | ||
| aggregatedSigBigInt := [2]*big.Int{sig1bigInt, sig2bigInt} | ||
| aggregatedSig = append(aggregatedSig, aggregatedSigBigInt) | ||
| } | ||
|
|
||
| b.log.Info("Batch prepared", "totalTransactions", totalTxs) | ||
|
|
||
| rollupAddress := ethCmn.HexToAddress(config.GlobalCfg.RollupAddress) | ||
| stakeAmount := big.NewInt(0) | ||
|
There was a problem hiding this comment. We should create an issue to make stakeAmount configurable too. |
||
|
|
||
| // TODO fix | ||
|
There was a problem hiding this comment. What's the thing we want to fix here? Is it adding a feeReceiver to the config? There was a problem hiding this comment. Right now I have added 0 as fee receiver to fix build but we need to replace that with the correct one. Lets talk here: #47 |
||
| var feeReceivers []*big.Int | ||
| dummyReceivers := big.NewInt(0) | ||
| feeReceivers = append(feeReceivers, dummyReceivers) | ||
|
|
||
| switch txType := commitments[0].BatchType; txType { | ||
| case TX_TRANSFER_TYPE: | ||
| data, err := b.ContractABI[common.ROLLUP_CONTRACT_KEY].Pack("submitTransfer", updatedRoots, aggregatedSig, feeReceivers, txs) | ||
| if err != nil { | ||
| b.log.Error("Error packing data for submitBatch", "err", err) | ||
| return err | ||
| } | ||
|
|
||
| // generate call msg | ||
| callMsg := ethereum.CallMsg{ | ||
| To: &rollupAddress, | ||
| Data: data, | ||
| Value: stakeAmount, | ||
| } | ||
|
|
||
| // generate auth | ||
| auth, err := b.generateAuthObj(b.EthClient, callMsg) | ||
| if err != nil { | ||
| b.log.Error("Error creating auth object", "error", err) | ||
| return err | ||
| } | ||
|
|
||
| tx, err := b.RollupContract.SubmitTransfer(auth, updatedRoots, aggregatedSig, feeReceivers, txs) | ||
| if err != nil { | ||
| b.log.Error("Error submitting batch", "err", err) | ||
| return err | ||
| } | ||
| b.log.Info("Sent a new batch!", "TxHash", tx.Hash().String()) | ||
| default: | ||
| b.log.Error("Tx not indentified", "txType", commitments[0].BatchType) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (b *Bazooka) FireDepositFinalisation(TBreplaced UserState, siblings []UserState, subTreeHeight uint64) (err error) { | ||
| // b.log.Info( | ||
| // "Attempting to finalise deposits", | ||
|
|
@@ -412,115 +496,10 @@ func (b *Bazooka) FireDepositFinalisation(TBreplaced UserState, siblings []UserS | |
| // return err | ||
| // } | ||
| // b.log.Info("Deposits successfully finalized!", "TxHash", tx.Hash()) | ||
| return nil | ||
| } | ||
|
|
||
| func (b *Bazooka) generateAuthObj(client *ethclient.Client, callMsg ethereum.CallMsg) (auth *bind.TransactOpts, err error) { | ||
|
There was a problem hiding this comment. We change the MixCaps to camelCase here, is the intention that we don't want to export generateAuthObj in the package? |
||
| // from address | ||
| fromAddress := config.OperatorAddress | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to create an issue that adds an AggregatedSignature wrapper with a method like
ToSol()?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#56