arnaucube/hermez-node
1
0
Fork 0
mirror of https://github.com/arnaucube/hermez-node.git synced 2026-02-07 03:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add StateDB compute nonces on ProcessTx L2Tx

Browse Source 
Add StateDB compute nonces on ProcessTx L2Tx, and update StateDB for
type TypeSynchronizer, TypeTxSelector, TypeBatchBuilder
This commit is contained in:
arnaucube
2020-10-01 17:59:50 +02:00
parent d71871c8b7
commit 3374a4754d
14 changed files with 192 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
synchronizer/synchronizer.go
View File

@@ -58,7 +58,7 @@ type BatchData struct {
l1CoordinatorTxs []*common.L1Tx
l2Txs []*common.L2Tx
createdAccounts []*common.Account
exitTree []*common.ExitInfo
exitTree []common.ExitInfo
batch *common.Batch
}
@@ -69,7 +69,7 @@ func NewBatchData() *BatchData {
l1CoordinatorTxs: make([]*common.L1Tx, 0),
l2Txs: make([]*common.L2Tx, 0),
createdAccounts: make([]*common.Account, 0),
exitTree: make([]*common.ExitInfo, 0),
exitTree: make([]common.ExitInfo, 0),
}
}
@@ -435,7 +435,7 @@ func (s *Synchronizer) rollupSync(blockNum int64) (*rollupData, error) {
// TODO: Get createdAccounts from ProcessTxs()
// TODO: Get CollectedFees from ProcessTxs()
// TODO: Pass forgeBatchArgs.FeeIdxCoordinator to ProcessTxs()
_, exitInfo, err := s.stateDB.ProcessTxs(true, false, batchData.l1UserTxs, batchData.l1CoordinatorTxs, poolL2Txs)
_, exitInfo, err := s.stateDB.ProcessTxs(batchData.l1UserTxs, batchData.l1CoordinatorTxs, poolL2Txs)
if err != nil {
return nil, err
}

2
synchronizer/synchronizer_test.go
View File

@@ -19,7 +19,7 @@ func Test(t *testing.T) {
dir, err := ioutil.TempDir("", "tmpdb")
require.Nil(t, err)
sdb, err := statedb.NewStateDB(dir, true, 32)
sdb, err := statedb.NewStateDB(dir, statedb.TypeSynchronizer, 32)
assert.Nil(t, err)
// Init History DB