diff --git a/api/api_test.go b/api/api_test.go index a9e2bb2..d7537a3 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -211,8 +211,7 @@ func TestMain(m *testing.M) { panic(err) } }() - chainID := uint16(0) - sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeTxSelector, 0, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeTxSelector, 0) if err != nil { panic(err) } @@ -221,6 +220,7 @@ func TestMain(m *testing.M) { test.WipeDB(l2DB.DB()) // this will clean HistoryDB and L2DB // Config (smart contract constants) + chainID := uint16(0) _config := getConfigTest(chainID) config = configAPI{ RollupConstants: *newRollupConstants(_config.RollupConstants), diff --git a/batchbuilder/batchbuilder.go b/batchbuilder/batchbuilder.go index d8c9670..40730d9 100644 --- a/batchbuilder/batchbuilder.go +++ b/batchbuilder/batchbuilder.go @@ -4,6 +4,7 @@ import ( ethCommon "github.com/ethereum/go-ethereum/common" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/statedb" + "github.com/hermeznetwork/hermez-node/txprocessor" "github.com/hermeznetwork/tracerr" ) @@ -55,13 +56,17 @@ func (bb *BatchBuilder) Reset(batchNum common.BatchNum, fromSynchronizer bool) e // BuildBatch takes the transactions and returns the common.ZKInputs of the next batch func (bb *BatchBuilder) BuildBatch(coordIdxs []common.Idx, configBatch *ConfigBatch, l1usertxs, l1coordinatortxs []common.L1Tx, pooll2txs []common.PoolL2Tx, tokenIDs []common.TokenID) (*common.ZKInputs, error) { //nolint:gomnd - ptc := statedb.ProcessTxsConfig{ // TODO TMP + tpc := txprocessor.Config{ // TODO TMP NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 64, + ChainID: uint16(0), } - ptOut, err := bb.localStateDB.ProcessTxs(ptc, coordIdxs, l1usertxs, l1coordinatortxs, pooll2txs) + bbStateDB := bb.localStateDB.StateDB + tp := txprocessor.NewTxProcessor(bbStateDB, tpc) + + ptOut, err := tp.ProcessTxs(coordIdxs, l1usertxs, l1coordinatortxs, pooll2txs) return ptOut.ZKInputs, tracerr.Wrap(err) } diff --git a/batchbuilder/batchbuilder_test.go b/batchbuilder/batchbuilder_test.go index 899eac2..7600a67 100644 --- a/batchbuilder/batchbuilder_test.go +++ b/batchbuilder/batchbuilder_test.go @@ -15,8 +15,7 @@ func TestBatchBuilder(t *testing.T) { require.Nil(t, err) defer assert.Nil(t, os.RemoveAll(dir)) - chainID := uint16(0) - synchDB, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, 0, chainID) + synchDB, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, 0) assert.Nil(t, err) bbDir, err := ioutil.TempDir("", "tmpBatchBuilderDB") diff --git a/coordinator/coordinator.go b/coordinator/coordinator.go index 4729b32..9f078d7 100644 --- a/coordinator/coordinator.go +++ b/coordinator/coordinator.go @@ -14,11 +14,11 @@ import ( "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/db/historydb" "github.com/hermeznetwork/hermez-node/db/l2db" - "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/eth" "github.com/hermeznetwork/hermez-node/log" "github.com/hermeznetwork/hermez-node/prover" "github.com/hermeznetwork/hermez-node/synchronizer" + "github.com/hermeznetwork/hermez-node/txprocessor" "github.com/hermeznetwork/hermez-node/txselector" "github.com/hermeznetwork/tracerr" ) @@ -210,11 +210,12 @@ func (c *Coordinator) syncStats(ctx context.Context, stats *synchronizer.Stats) selectionConfig := &txselector.SelectionConfig{ MaxL1UserTxs: 32, MaxL1CoordinatorTxs: 32, - ProcessTxsConfig: statedb.ProcessTxsConfig{ + TxProcessorConfig: txprocessor.Config{ NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 64, + ChainID: uint16(0), }, } diff --git a/coordinator/coordinator_test.go b/coordinator/coordinator_test.go index 261f199..16cfcc9 100644 --- a/coordinator/coordinator_test.go +++ b/coordinator/coordinator_test.go @@ -23,6 +23,7 @@ import ( "github.com/hermeznetwork/hermez-node/synchronizer" "github.com/hermeznetwork/hermez-node/test" "github.com/hermeznetwork/hermez-node/test/til" + "github.com/hermeznetwork/hermez-node/txprocessor" "github.com/hermeznetwork/hermez-node/txselector" "github.com/hermeznetwork/tracerr" "github.com/iden3/go-merkletree/db/pebble" @@ -98,7 +99,7 @@ func newTestModules(t *testing.T) modules { syncDBPath, err = ioutil.TempDir("", "tmpSyncDB") require.NoError(t, err) deleteme = append(deleteme, syncDBPath) - syncStateDB, err := statedb.NewStateDB(syncDBPath, 128, statedb.TypeSynchronizer, 48, chainID) + syncStateDB, err := statedb.NewStateDB(syncDBPath, 128, statedb.TypeSynchronizer, 48) assert.NoError(t, err) pass := os.Getenv("POSTGRES_PASS") @@ -620,19 +621,20 @@ PoolTransfer(0) User2-User3: 300 (126) require.Equal(t, testTokensLen*testUsersLen, len(sdbAccounts)) // Sanity check - require.Equal(t, modules.stateDB.MerkleTree().Root(), - pipeline.batchBuilder.LocalStateDB().MerkleTree().Root()) + require.Equal(t, modules.stateDB.MT.Root(), + pipeline.batchBuilder.LocalStateDB().MT.Root()) batchNum++ selectionConfig := &txselector.SelectionConfig{ MaxL1UserTxs: maxL1UserTxs, MaxL1CoordinatorTxs: maxL1CoordinatorTxs, - ProcessTxsConfig: statedb.ProcessTxsConfig{ + TxProcessorConfig: txprocessor.Config{ NLevels: nLevels, MaxFeeTx: maxFeeTxs, MaxTx: uint32(maxTxs), MaxL1Tx: uint32(maxL1Txs), + ChainID: chainID, }, } diff --git a/coordinator/purger_test.go b/coordinator/purger_test.go index 66e23c2..568fde6 100644 --- a/coordinator/purger_test.go +++ b/coordinator/purger_test.go @@ -28,7 +28,7 @@ func newStateDB(t *testing.T) *statedb.LocalStateDB { syncDBPath, err := ioutil.TempDir("", "tmpSyncDB") require.NoError(t, err) deleteme = append(deleteme, syncDBPath) - syncStateDB, err := statedb.NewStateDB(syncDBPath, 128, statedb.TypeSynchronizer, 48, chainID) + syncStateDB, err := statedb.NewStateDB(syncDBPath, 128, statedb.TypeSynchronizer, 48) assert.NoError(t, err) stateDBPath, err := ioutil.TempDir("", "tmpStateDB") require.NoError(t, err) diff --git a/db/statedb/statedb.go b/db/statedb/statedb.go index 5b3a4d7..526cc5e 100644 --- a/db/statedb/statedb.go +++ b/db/statedb/statedb.go @@ -49,6 +49,8 @@ var ( PrefixKeyAddr = []byte("a:") // PrefixKeyAddrBJJ is the key prefix for address-babyjubjub in the db PrefixKeyAddrBJJ = []byte("ab:") + // keyidx is used as key in the db to store the current Idx + keyidx = []byte("k:idx") ) const ( @@ -74,28 +76,21 @@ type TypeStateDB string // StateDB represents the StateDB object type StateDB struct { - path string - currentBatch common.BatchNum - db *pebble.PebbleStorage - mt *merkletree.MerkleTree - typ TypeStateDB - chainID uint16 - // idx holds the current Idx that the BatchBuilder is using - idx common.Idx - zki *common.ZKInputs - // i is the current transaction index in the ZKInputs generation (zki) - i int - // AccumulatedFees contains the accumulated fees for each token (Coord - // Idx) in the processed batch - AccumulatedFees map[common.Idx]*big.Int - keep int + path string + Typ TypeStateDB + // CurrentIdx holds the current Idx that the BatchBuilder is using + CurrentIdx common.Idx + CurrentBatch common.BatchNum + db *pebble.Storage + MT *merkletree.MerkleTree + keep int } // NewStateDB creates a new StateDB, allowing to use an in-memory or in-disk // storage. Checkpoints older than the value defined by `keep` will be // deleted. -func NewStateDB(pathDB string, keep int, typ TypeStateDB, nLevels int, chainID uint16) (*StateDB, error) { - var sto *pebble.PebbleStorage +func NewStateDB(pathDB string, keep int, typ TypeStateDB, nLevels int) (*StateDB, error) { + var sto *pebble.Storage var err error sto, err = pebble.NewPebbleStorage(path.Join(pathDB, PathCurrent), false) if err != nil { @@ -114,22 +109,21 @@ func NewStateDB(pathDB string, keep int, typ TypeStateDB, nLevels int, chainID u } sdb := &StateDB{ - path: pathDB, - db: sto, - mt: mt, - typ: typ, - chainID: chainID, - keep: keep, + path: pathDB, + db: sto, + MT: mt, + Typ: typ, + keep: keep, } // load currentBatch - sdb.currentBatch, err = sdb.GetCurrentBatch() + sdb.CurrentBatch, err = sdb.GetCurrentBatch() if err != nil { return nil, tracerr.Wrap(err) } // make reset (get checkpoint) at currentBatch - err = sdb.reset(sdb.currentBatch, false) + err = sdb.reset(sdb.CurrentBatch, false) if err != nil { return nil, tracerr.Wrap(err) } @@ -137,8 +131,8 @@ func NewStateDB(pathDB string, keep int, typ TypeStateDB, nLevels int, chainID u return sdb, nil } -// DB returns the *pebble.PebbleStorage from the StateDB -func (s *StateDB) DB() *pebble.PebbleStorage { +// DB returns the *pebble.Storage from the StateDB +func (s *StateDB) DB() *pebble.Storage { return s.db } @@ -160,7 +154,7 @@ func (s *StateDB) setCurrentBatch() error { if err != nil { return tracerr.Wrap(err) } - err = tx.Put(KeyCurrentBatch, s.currentBatch.Bytes()) + err = tx.Put(KeyCurrentBatch, s.CurrentBatch.Bytes()) if err != nil { return tracerr.Wrap(err) } @@ -173,10 +167,10 @@ func (s *StateDB) setCurrentBatch() error { // MakeCheckpoint does a checkpoint at the given batchNum in the defined path. Internally this advances & stores the current BatchNum, and then stores a Checkpoint of the current state of the StateDB. func (s *StateDB) MakeCheckpoint() error { // advance currentBatch - s.currentBatch++ - log.Debugw("Making StateDB checkpoint", "batch", s.currentBatch, "type", s.typ) + s.CurrentBatch++ + log.Debugw("Making StateDB checkpoint", "batch", s.CurrentBatch, "type", s.Typ) - checkpointPath := path.Join(s.path, fmt.Sprintf("%s%d", PathBatchNum, s.currentBatch)) + checkpointPath := path.Join(s.path, fmt.Sprintf("%s%d", PathBatchNum, s.CurrentBatch)) if err := s.setCurrentBatch(); err != nil { return tracerr.Wrap(err) @@ -322,7 +316,7 @@ func (s *StateDB) reset(batchNum common.BatchNum, closeCurrent bool) error { return tracerr.Wrap(err) } // remove all checkpoints > batchNum - for i := batchNum + 1; i <= s.currentBatch; i++ { + for i := batchNum + 1; i <= s.CurrentBatch; i++ { if err := s.DeleteCheckpoint(i); err != nil { return tracerr.Wrap(err) } @@ -334,16 +328,16 @@ func (s *StateDB) reset(batchNum common.BatchNum, closeCurrent bool) error { return tracerr.Wrap(err) } s.db = sto - s.idx = 255 - s.currentBatch = batchNum + s.CurrentIdx = 255 + s.CurrentBatch = batchNum - if s.mt != nil { + if s.MT != nil { // open the MT for the current s.db - mt, err := merkletree.NewMerkleTree(s.db.WithPrefix(PrefixKeyMT), s.mt.MaxLevels()) + mt, err := merkletree.NewMerkleTree(s.db.WithPrefix(PrefixKeyMT), s.MT.MaxLevels()) if err != nil { return tracerr.Wrap(err) } - s.mt = mt + s.MT = mt } return nil } @@ -363,31 +357,66 @@ func (s *StateDB) reset(batchNum common.BatchNum, closeCurrent bool) error { s.db = sto // get currentBatch num - s.currentBatch, err = s.GetCurrentBatch() + s.CurrentBatch, err = s.GetCurrentBatch() if err != nil { return tracerr.Wrap(err) } // idx is obtained from the statedb reset - s.idx, err = s.GetIdx() + s.CurrentIdx, err = s.GetIdx() if err != nil { return tracerr.Wrap(err) } - if s.mt != nil { + if s.MT != nil { // open the MT for the current s.db - mt, err := merkletree.NewMerkleTree(s.db.WithPrefix(PrefixKeyMT), s.mt.MaxLevels()) + mt, err := merkletree.NewMerkleTree(s.db.WithPrefix(PrefixKeyMT), s.MT.MaxLevels()) if err != nil { return tracerr.Wrap(err) } - s.mt = mt + s.MT = mt } return nil } +// GetIdx returns the stored Idx from the localStateDB, which is the last Idx +// used for an Account in the localStateDB. +func (s *StateDB) GetIdx() (common.Idx, error) { + idxBytes, err := s.DB().Get(keyidx) + if tracerr.Unwrap(err) == db.ErrNotFound { + return 0, nil + } + if err != nil { + return 0, tracerr.Wrap(err) + } + return common.IdxFromBytes(idxBytes[:]) +} + +// SetIdx stores Idx in the localStateDB +func (s *StateDB) SetIdx(idx common.Idx) error { + s.CurrentIdx = idx + + tx, err := s.DB().NewTx() + if err != nil { + return tracerr.Wrap(err) + } + idxBytes, err := idx.Bytes() + if err != nil { + return tracerr.Wrap(err) + } + err = tx.Put(keyidx, idxBytes[:]) + if err != nil { + return tracerr.Wrap(err) + } + if err := tx.Commit(); err != nil { + return tracerr.Wrap(err) + } + return nil +} + // GetAccount returns the account for the given Idx func (s *StateDB) GetAccount(idx common.Idx) (*common.Account, error) { - return getAccountInTreeDB(s.db, idx) + return GetAccountInTreeDB(s.db, idx) } // GetAccounts returns all the accounts in the db. Use for debugging pruposes @@ -419,9 +448,9 @@ func (s *StateDB) GetAccounts() ([]common.Account, error) { return accs, nil } -// getAccountInTreeDB is abstracted from StateDB to be used from StateDB and +// GetAccountInTreeDB is abstracted from StateDB to be used from StateDB and // from ExitTree. GetAccount returns the account for the given Idx -func getAccountInTreeDB(sto db.Storage, idx common.Idx) (*common.Account, error) { +func GetAccountInTreeDB(sto db.Storage, idx common.Idx) (*common.Account, error) { idxBytes, err := idx.Bytes() if err != nil { return nil, tracerr.Wrap(err) @@ -445,10 +474,10 @@ func getAccountInTreeDB(sto db.Storage, idx common.Idx) (*common.Account, error) } // CreateAccount creates a new Account in the StateDB for the given Idx. If -// StateDB.mt==nil, MerkleTree is not affected, otherwise updates the +// StateDB.MT==nil, MerkleTree is not affected, otherwise updates the // MerkleTree, returning a CircomProcessorProof. func (s *StateDB) CreateAccount(idx common.Idx, account *common.Account) (*merkletree.CircomProcessorProof, error) { - cpp, err := createAccountInTreeDB(s.db, s.mt, idx, account) + cpp, err := CreateAccountInTreeDB(s.db, s.MT, idx, account) if err != nil { return cpp, tracerr.Wrap(err) } @@ -457,11 +486,11 @@ func (s *StateDB) CreateAccount(idx common.Idx, account *common.Account) (*merkl return cpp, tracerr.Wrap(err) } -// createAccountInTreeDB is abstracted from StateDB to be used from StateDB and +// CreateAccountInTreeDB is abstracted from StateDB to be used from StateDB and // from ExitTree. Creates a new Account in the StateDB for the given Idx. If -// StateDB.mt==nil, MerkleTree is not affected, otherwise updates the +// StateDB.MT==nil, MerkleTree is not affected, otherwise updates the // MerkleTree, returning a CircomProcessorProof. -func createAccountInTreeDB(sto db.Storage, mt *merkletree.MerkleTree, idx common.Idx, account *common.Account) (*merkletree.CircomProcessorProof, error) { +func CreateAccountInTreeDB(sto db.Storage, mt *merkletree.MerkleTree, idx common.Idx, account *common.Account) (*merkletree.CircomProcessorProof, error) { // store at the DB the key: v, and value: leaf.Bytes() v, err := account.HashValue() if err != nil { @@ -511,14 +540,14 @@ func createAccountInTreeDB(sto db.Storage, mt *merkletree.MerkleTree, idx common // StateDB.mt==nil, MerkleTree is not affected, otherwise updates the // MerkleTree, returning a CircomProcessorProof. func (s *StateDB) UpdateAccount(idx common.Idx, account *common.Account) (*merkletree.CircomProcessorProof, error) { - return updateAccountInTreeDB(s.db, s.mt, idx, account) + return UpdateAccountInTreeDB(s.db, s.MT, idx, account) } -// updateAccountInTreeDB is abstracted from StateDB to be used from StateDB and +// UpdateAccountInTreeDB is abstracted from StateDB to be used from StateDB and // from ExitTree. Updates the Account in the StateDB for the given Idx. If // StateDB.mt==nil, MerkleTree is not affected, otherwise updates the // MerkleTree, returning a CircomProcessorProof. -func updateAccountInTreeDB(sto db.Storage, mt *merkletree.MerkleTree, idx common.Idx, account *common.Account) (*merkletree.CircomProcessorProof, error) { +func UpdateAccountInTreeDB(sto db.Storage, mt *merkletree.MerkleTree, idx common.Idx, account *common.Account) (*merkletree.CircomProcessorProof, error) { // store at the DB the key: v, and value: account.Bytes() v, err := account.HashValue() if err != nil { @@ -559,20 +588,15 @@ func updateAccountInTreeDB(sto db.Storage, mt *merkletree.MerkleTree, idx common // MTGetProof returns the CircomVerifierProof for a given Idx func (s *StateDB) MTGetProof(idx common.Idx) (*merkletree.CircomVerifierProof, error) { - if s.mt == nil { + if s.MT == nil { return nil, tracerr.Wrap(ErrStateDBWithoutMT) } - return s.mt.GenerateCircomVerifierProof(idx.BigInt(), s.mt.Root()) + return s.MT.GenerateCircomVerifierProof(idx.BigInt(), s.MT.Root()) } // MTGetRoot returns the current root of the underlying Merkle Tree func (s *StateDB) MTGetRoot() *big.Int { - return s.mt.Root().BigInt() -} - -// MerkleTree returns the underlying StateDB merkle tree. It can be nil. -func (s *StateDB) MerkleTree() *merkletree.MerkleTree { - return s.mt + return s.MT.Root().BigInt() } // LocalStateDB represents the local StateDB which allows to make copies from @@ -588,7 +612,7 @@ type LocalStateDB struct { // deleted. func NewLocalStateDB(path string, keep int, synchronizerDB *StateDB, typ TypeStateDB, nLevels int) (*LocalStateDB, error) { - s, err := NewStateDB(path, keep, typ, nLevels, synchronizerDB.chainID) + s, err := NewStateDB(path, keep, typ, nLevels) if err != nil { return nil, tracerr.Wrap(err) } @@ -602,7 +626,7 @@ func NewLocalStateDB(path string, keep int, synchronizerDB *StateDB, typ TypeSta // gets the state from LocalStateDB.synchronizerStateDB for the given batchNum. If fromSynchronizer is false, get the state from LocalStateDB checkpoints. func (l *LocalStateDB) Reset(batchNum common.BatchNum, fromSynchronizer bool) error { if batchNum == 0 { - l.idx = 0 + l.CurrentIdx = 0 return nil } @@ -646,17 +670,17 @@ func (l *LocalStateDB) Reset(batchNum common.BatchNum, fromSynchronizer bool) er l.db = sto // get currentBatch num - l.currentBatch, err = l.GetCurrentBatch() + l.CurrentBatch, err = l.GetCurrentBatch() if err != nil { return tracerr.Wrap(err) } // open the MT for the current s.db - if l.mt != nil { - mt, err := merkletree.NewMerkleTree(l.db.WithPrefix(PrefixKeyMT), l.mt.MaxLevels()) + if l.MT != nil { + mt, err := merkletree.NewMerkleTree(l.db.WithPrefix(PrefixKeyMT), l.MT.MaxLevels()) if err != nil { return tracerr.Wrap(err) } - l.mt = mt + l.MT = mt } return nil diff --git a/db/statedb/statedb_test.go b/db/statedb/statedb_test.go index 6c1cea3..002544f 100644 --- a/db/statedb/statedb_test.go +++ b/db/statedb/statedb_test.go @@ -45,8 +45,7 @@ func TestNewStateDBIntermediateState(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0, chainID) + sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0) assert.NoError(t, err) // test values @@ -68,7 +67,7 @@ func TestNewStateDBIntermediateState(t *testing.T) { // call NewStateDB which should get the db at the last checkpoint state // executing a Reset (discarding the last 'testkey0'&'testvalue0' data) - sdb, err = NewStateDB(dir, 128, TypeTxSelector, 0, chainID) + sdb, err = NewStateDB(dir, 128, TypeTxSelector, 0) assert.NoError(t, err) v, err = sdb.db.Get(k0) assert.NotNil(t, err) @@ -110,7 +109,7 @@ func TestNewStateDBIntermediateState(t *testing.T) { // call NewStateDB which should get the db at the last checkpoint state // executing a Reset (discarding the last 'testkey1'&'testvalue1' data) - sdb, err = NewStateDB(dir, 128, TypeTxSelector, 0, chainID) + sdb, err = NewStateDB(dir, 128, TypeTxSelector, 0) assert.NoError(t, err) v, err = sdb.db.Get(k0) @@ -128,8 +127,7 @@ func TestStateDBWithoutMT(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0, chainID) + sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0) assert.NoError(t, err) // create test accounts @@ -183,8 +181,7 @@ func TestStateDBWithMT(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32) assert.NoError(t, err) // create test accounts @@ -236,8 +233,7 @@ func TestCheckpoints(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32) assert.NoError(t, err) // create test accounts @@ -354,8 +350,7 @@ func TestStateDBGetAccounts(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.NoError(t, err) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0, chainID) + sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0) assert.NoError(t, err) // create test accounts @@ -402,8 +397,7 @@ func TestCheckAccountsTreeTestVectors(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32) require.NoError(t, err) ay0 := new(big.Int).Sub(new(big.Int).Exp(big.NewInt(2), big.NewInt(253), nil), big.NewInt(1)) @@ -467,7 +461,7 @@ func TestCheckAccountsTreeTestVectors(t *testing.T) { require.NoError(t, err) } // root value generated by js version: - assert.Equal(t, "17298264051379321456969039521810887093935433569451713402227686942080129181291", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "17298264051379321456969039521810887093935433569451713402227686942080129181291", sdb.MT.Root().BigInt().String()) } func TestListCheckpoints(t *testing.T) { @@ -475,8 +469,7 @@ func TestListCheckpoints(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32) require.NoError(t, err) numCheckpoints := 16 @@ -506,9 +499,8 @@ func TestDeleteOldCheckpoints(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) keep := 16 - sdb, err := NewStateDB(dir, keep, TypeSynchronizer, 32, chainID) + sdb, err := NewStateDB(dir, keep, TypeSynchronizer, 32) require.NoError(t, err) numCheckpoints := 32 diff --git a/db/statedb/utils.go b/db/statedb/utils.go index ee3681e..bf77688 100644 --- a/db/statedb/utils.go +++ b/db/statedb/utils.go @@ -3,14 +3,12 @@ package statedb import ( "bytes" "fmt" - "math/big" ethCommon "github.com/ethereum/go-ethereum/common" "github.com/hermeznetwork/hermez-node/common" "github.com/hermeznetwork/hermez-node/log" "github.com/hermeznetwork/tracerr" "github.com/iden3/go-iden3-crypto/babyjub" - "github.com/iden3/go-merkletree" ) func concatEthAddrTokenID(addr ethCommon.Address, tokenID common.TokenID) []byte { @@ -136,44 +134,3 @@ func (s *StateDB) GetTokenIDsFromIdxs(idxs []common.Idx) (map[common.TokenID]com } return m, nil } - -func siblingsToZKInputFormat(s []*merkletree.Hash) []*big.Int { - b := make([]*big.Int, len(s)) - for i := 0; i < len(s); i++ { - b[i] = s[i].BigInt() - } - return b -} - -// BJJCompressedTo256BigInts returns a [256]*big.Int array with the bit -// representation of the babyjub.PublicKeyComp -func BJJCompressedTo256BigInts(pkComp babyjub.PublicKeyComp) [256]*big.Int { - var r [256]*big.Int - b := pkComp[:] - - for i := 0; i < 256; i++ { - if b[i/8]&(1<<(i%8)) == 0 { - r[i] = big.NewInt(0) - } else { - r[i] = big.NewInt(1) - } - } - - return r -} - -// formatAccumulatedFees returns an array of [nFeeAccounts]*big.Int containing -// the balance of each FeeAccount, taken from the 'collectedFees' map, in the -// order of the 'orderTokenIDs' -func formatAccumulatedFees(collectedFees map[common.TokenID]*big.Int, orderTokenIDs []*big.Int) []*big.Int { - accFeeOut := make([]*big.Int, len(orderTokenIDs)) - for i := 0; i < len(orderTokenIDs); i++ { - tokenID := common.TokenIDFromBigInt(orderTokenIDs[i]) - if _, ok := collectedFees[tokenID]; ok { - accFeeOut[i] = new(big.Int).Set(collectedFees[tokenID]) - } else { - accFeeOut[i] = big.NewInt(0) - } - } - return accFeeOut -} diff --git a/db/statedb/utils_test.go b/db/statedb/utils_test.go index 54fb13c..41735bc 100644 --- a/db/statedb/utils_test.go +++ b/db/statedb/utils_test.go @@ -3,7 +3,6 @@ package statedb import ( "fmt" "io/ioutil" - "math/big" "os" "testing" @@ -20,8 +19,7 @@ func TestGetIdx(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0, chainID) + sdb, err := NewStateDB(dir, 128, TypeTxSelector, 0) assert.NoError(t, err) var sk babyjub.PrivateKey @@ -92,33 +90,3 @@ func TestGetIdx(t *testing.T) { _, err = sdb.GetIdxByEthAddr(addr, tokenID1) assert.NotNil(t, err) } - -func TestBJJCompressedTo256BigInt(t *testing.T) { - var pkComp babyjub.PublicKeyComp - r := BJJCompressedTo256BigInts(pkComp) - zero := big.NewInt(0) - for i := 0; i < 256; i++ { - assert.Equal(t, zero, r[i]) - } - - pkComp[0] = 3 - r = BJJCompressedTo256BigInts(pkComp) - one := big.NewInt(1) - for i := 0; i < 256; i++ { - if i != 0 && i != 1 { - assert.Equal(t, zero, r[i]) - } else { - assert.Equal(t, one, r[i]) - } - } - - pkComp[31] = 4 - r = BJJCompressedTo256BigInts(pkComp) - for i := 0; i < 256; i++ { - if i != 0 && i != 1 && i != 250 { - assert.Equal(t, zero, r[i]) - } else { - assert.Equal(t, one, r[i]) - } - } -} diff --git a/go.mod b/go.mod index 8dcebe2..7a12985 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,16 @@ go 1.14 require ( github.com/BurntSushi/toml v0.3.1 - github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6 github.com/btcsuite/btcd v0.21.0-beta // indirect github.com/dghubble/sling v1.3.0 github.com/ethereum/go-ethereum v1.9.25 github.com/getkin/kin-openapi v0.22.0 github.com/gin-contrib/cors v1.3.1 github.com/gin-gonic/gin v1.5.0 - github.com/go-sql-driver/mysql v1.5.0 // indirect github.com/gobuffalo/packr/v2 v2.8.1 github.com/hermeznetwork/tracerr v0.3.1-0.20201126162137-de9930d0cf29 github.com/iden3/go-iden3-crypto v0.0.6-0.20201221160344-58e589b6eb4c - github.com/iden3/go-merkletree v0.0.0-20201215142017-730707e5659a + github.com/iden3/go-merkletree v0.0.0-20201218120219-8f3905f15f89 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a github.com/jmoiron/sqlx v1.2.1-0.20200615141059-0794cb1f47ee github.com/joho/godotenv v1.3.0 diff --git a/go.sum b/go.sum index ed07b22..8a5e592 100644 --- a/go.sum +++ b/go.sum @@ -32,7 +32,6 @@ github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6Ro github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -40,15 +39,11 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc= github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apilayer/freegeoip v3.5.0+incompatible/go.mod h1:CUfFqErhFhXneJendyQ/rRcuA8kH8JxHvYnbOozmlCU= github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks= github.com/aristanetworks/glog v0.0.0-20180419172825-c15b03b3054f/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA= github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= -github.com/aristanetworks/goarista v0.0.0-20190712234253-ed1100a1c015 h1:7ABPr1+uJdqESAdlVevnc/2FJGiC/K3uMg1JiELeF+0= -github.com/aristanetworks/goarista v0.0.0-20190712234253-ed1100a1c015/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ= github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6 h1:6bZNnQcA2fkzH9AhZXbp2nDqbWa4bBqFeUb70Zq1HBM= github.com/aristanetworks/goarista v0.0.0-20190912214011-b54698eaaca6/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns= github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc= @@ -56,7 +51,6 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -67,15 +61,12 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= -github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 h1:qkOC5Gd33k54tobS36cXdAzJbeHaduLtnLQQwNoIi78= -github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3 h1:A/EVblehb75cUgXA5njHPn0kLAsykn6mJGz7rnmW5W0= github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta h1:At9hIZdJW0s9E/fAz28nrz6AmcNlSVucCH796ZteX1M= github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= -github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d h1:yJzD/yFppdVCf6ApMkVy8cUxV0XrxdP9rVf6D87/Mng= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts= @@ -92,9 +83,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 h1:JLaf/iINcLyjwbtTsCJjc6rtlASgHeIJPrB6QmwURnA= github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= -github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU= -github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= @@ -133,9 +123,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dchest/blake512 v1.0.0 h1:oDFEQFIqFSeuA34xLtXZ/rWxCXdSjirjzPhey5EUvmA= github.com/dchest/blake512 v1.0.0/go.mod h1:FV1x7xPPLWukZlpDpWQ88rF/SFwZ5qbskrzhLMB92JI= +github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0= github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= -github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ= -github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dghubble/sling v1.3.0 h1:pZHjCJq4zJvc6qVQ5wN1jo5oNZlNE0+8T/h0XeXBUKU= @@ -144,7 +133,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/dop251/goja v0.0.0-20200219165308-d1232e640a87/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -153,41 +141,32 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= -github.com/elastic/gosigar v0.10.4/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/elastic/gosigar v0.10.5/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.9.5/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= github.com/ethereum/go-ethereum v1.9.12/go.mod h1:PvsVkQmhZFx92Y+h2ylythYlheEDt/uBgFbl61Js/jo= -github.com/ethereum/go-ethereum v1.9.13/go.mod h1:qwN9d1GLyDh0N7Ab8bMGd0H9knaji2jOBm2RrMGjXls= -github.com/ethereum/go-ethereum v1.9.17 h1:2D02O8KcoyQHxfizvMi0vGXXzFIkQTMeKXwt0+4SYEA= -github.com/ethereum/go-ethereum v1.9.17/go.mod h1:kihoiSg74VC4dZAXMkmoWp70oQabz48BJg1tuzricFc= github.com/ethereum/go-ethereum v1.9.25 h1:mMiw/zOOtCLdGLWfcekua0qPrJTe7FVIiHJ4IKNTfR0= github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.22.0 h1:J5IFyKd/5yuB6AZAgwK0CMBKnabWcmkowtsl6bRkz4s= github.com/getkin/kin-openapi v0.22.0/go.mod h1:WGRs2ZMM1Q8LR1QBEwUxC6RJEfaBcD0s+pcEVXFuAjw= -github.com/getkin/kin-openapi v0.23.0 h1:RKtVNKk8kxcTIWEswgZ3Olvn1RxWOJ0zz8cP3d9aHIA= -github.com/getkin/kin-openapi v0.29.0 h1:YAJ8s2UFkhAfJ/bpDcBiUPD4spfVa1ur0FqhBuubaRw= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= @@ -195,15 +174,10 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA= github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.4.0 h1:3tMoCCfM7ppqsR0ptz/wi1impNpT7/9wQtMZ8lr1mCQ= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/gin-gonic/gin v1.5.0 h1:fi+bqFAx/oLK54somfCtEZs9HeH1LHVoEPUgARpTqyc= github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -235,12 +209,9 @@ github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b github.com/gobuffalo/packd v1.0.0 h1:6ERZvJHfe24rfFmA9OaoKBdC7+c9sydrytMg8SdFGBM= github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fdec9hrhI= github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc= -github.com/gobuffalo/packr/v2 v2.8.0 h1:IULGd15bQL59ijXLxEvA5wlMxsmx/ZkQv9T282zNVIY= -github.com/gobuffalo/packr/v2 v2.8.0/go.mod h1:PDk2k3vGevNE3SwVyVRgQCCXETC9SaONCNSXT1Q8M1g= github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA= github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg= github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg= -github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -269,8 +240,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw= -github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 h1:ur2rms48b3Ep1dxh7aUV2FZEQ8jEVO2F6ILKx8ofkAg= github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -278,6 +247,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -327,11 +297,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hermeznetwork/tracerr v0.3.1-0.20201126162137-de9930d0cf29 h1:dlXz/aVJfCh/wvF6jjsrl/lqHJbOigQLG6vFF5zGuNs= github.com/hermeznetwork/tracerr v0.3.1-0.20201126162137-de9930d0cf29/go.mod h1:nsWC1+tc4qUEbUGRv4DcPJJTjLsedlPajlFmpJoohK4= -github.com/holiman/uint256 v1.1.0 h1:Iye6ze0DW9s+7EMn8y6Q4ebegDzpu28JQHEVM1Bq+Wg= -github.com/holiman/uint256 v1.1.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/holiman/uint256 v1.1.1 h1:4JywC80b+/hSfljFlEBLHrrh+CIONLDz9NuFl0af4Mw= github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= -github.com/howeyc/fsnotify v0.9.0/go.mod h1:41HzSPxBGeFRQKEEwgh49TRw/nKBsYZ2cF1OzPjSJsA= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= @@ -339,34 +306,18 @@ github.com/huin/goupnp v0.0.0-20161224104101-679507af18f3/go.mod h1:MZ2ZmwcBpvOo github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo= github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= -github.com/iden3/go-circom-prover-verifier v0.0.1/go.mod h1:1FkpX4nUXxYcY2fpzqd27wHHEnWeo1v1nwDnz2TgBRo= -github.com/iden3/go-circom-witnesscalc v0.0.1/go.mod h1:xjT1BlFZDBioHOlbD75SmZZLC1d1AfOycqbSa/1QRJU= -github.com/iden3/go-iden3-core v0.0.8 h1:PLw7iCiX7Pw1dqBkR+JaLQWqB5RKd+vgu25UBdvFXGQ= -github.com/iden3/go-iden3-core v0.0.8/go.mod h1:URNjIhMql6sEbWubIGrjJdw5wHCE1Pk1XghxjBOtA3s= -github.com/iden3/go-iden3-crypto v0.0.5/go.mod h1:XKw1oDwYn2CIxKOtr7m/mL5jMn4mLOxAxtZBRxQBev8= -github.com/iden3/go-iden3-crypto v0.0.6-0.20200819064831-09d161e9f670/go.mod h1:oBgthFLboAWi9feaBUFy7OxEcyn9vA1khHSL/WwWFyg= +github.com/iden3/go-iden3-crypto v0.0.6-0.20201218111145-a2015adb2f1b/go.mod h1:oBgthFLboAWi9feaBUFy7OxEcyn9vA1khHSL/WwWFyg= github.com/iden3/go-iden3-crypto v0.0.6-0.20201221160344-58e589b6eb4c h1:D2u8FFYey6iFXLsqqJZ8R7ch8gZum+/b98whvoSDbyg= github.com/iden3/go-iden3-crypto v0.0.6-0.20201221160344-58e589b6eb4c/go.mod h1:oBgthFLboAWi9feaBUFy7OxEcyn9vA1khHSL/WwWFyg= -github.com/iden3/go-merkletree v0.0.0-20200902123354-eeb949f8c334 h1:FQngDJKiwM6i4kHlVFvSpJa9sO+QvZ7C+GqoPWe+5BI= -github.com/iden3/go-merkletree v0.0.0-20200902123354-eeb949f8c334/go.mod h1:MRe6i0mi2oDVUzgBIHsNRE6XAg8EBuqIQZMsd+do+dU= -github.com/iden3/go-merkletree v0.0.0-20201103115630-ad30c8309b44 h1:d6AbzJWWUosTpjb6Ab+I0bMO4UPY+u/HgkOdhksxDgY= -github.com/iden3/go-merkletree v0.0.0-20201103115630-ad30c8309b44/go.mod h1:MRe6i0mi2oDVUzgBIHsNRE6XAg8EBuqIQZMsd+do+dU= -github.com/iden3/go-merkletree v0.0.0-20201203095330-4a8397a45644 h1:obSehuklDMDpmQ4j0d6RxU70bjRjEWlGlkO13CKp8Fw= -github.com/iden3/go-merkletree v0.0.0-20201203095330-4a8397a45644/go.mod h1:MRe6i0mi2oDVUzgBIHsNRE6XAg8EBuqIQZMsd+do+dU= -github.com/iden3/go-merkletree v0.0.0-20201215142017-730707e5659a h1:Wq5haqbfI0Ruht6nHotf+0HS5xAXKO17Xa6NBZVtTrM= -github.com/iden3/go-merkletree v0.0.0-20201215142017-730707e5659a/go.mod h1:MRe6i0mi2oDVUzgBIHsNRE6XAg8EBuqIQZMsd+do+dU= -github.com/iden3/go-wasm3 v0.0.1/go.mod h1:j+TcAB94Dfrjlu5kJt83h2OqAU+oyNUTwNZnQyII1sI= +github.com/iden3/go-merkletree v0.0.0-20201218120219-8f3905f15f89 h1:t7tnOTCtw12Rniyk98Hi4gOp0h5JPdzbNcLWCFNj98o= +github.com/iden3/go-merkletree v0.0.0-20201218120219-8f3905f15f89/go.mod h1:MCXbnyoFRwt+7aYHtzVSB3sZZcHLjDf7VZZ2Zqrhqrc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/influxdata/influxdb v1.7.8/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/ipfsconsortium/go-ipfsc v0.0.0-20190116161836-3629ecc1f76f/go.mod h1:4MbfcV8YX3CWjkWgUIH4vEVk002kMJlOEmhoSJP8SeE= github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -374,8 +325,6 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o= github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jmoiron/sqlx v1.2.1-0.20200615141059-0794cb1f47ee h1:59lyMGvZusByi7Rvctn8cxdVAjhiOnqCv3G5DrYApYQ= github.com/jmoiron/sqlx v1.2.1-0.20200615141059-0794cb1f47ee/go.mod h1:ClpsPFzLpSBl7MvJ+BhV0JHz4vmKRBarpvZ9644v9Oo= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= @@ -392,11 +341,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/karalabe/hid v1.0.0/go.mod h1:Vr51f8rUOLYrfrWDFlV12GGQgM5AT8sVh+2fY4MPeu8= github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM52clh5rGzTKpVctGT1lH4Dc8Jw= github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/karrick/godirwalk v1.15.3 h1:0a2pXOgtB16CqIqXTiT7+K9L73f74n/aNQUnH6Ortew= -github.com/karrick/godirwalk v1.15.3/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.15.8 h1:7+rWAZPn9zuRxaIqqT8Ohs2Q2Ac0msBqwRdxNCr2VVs= github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -410,13 +356,11 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.1.0 h1:Sm1gr51B1kKyfD2BlRcLSiEkffoG96g6TPv6eRoEiB8= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -433,17 +377,13 @@ github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2 github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.0 h1:v2XXALHHh6zHfYTJ+cSkwtyffnaOyR1MXaA91mTrb8o= github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-oci8 v0.0.7/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI= @@ -479,7 +419,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= @@ -490,6 +429,7 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= @@ -504,12 +444,14 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= @@ -522,13 +464,11 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/oschwald/maxminddb-golang v1.4.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= @@ -584,8 +524,7 @@ github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= -github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 h1:HXr/qUllAWv9riaI4zh2eXWKmCSDqVS/XH1MRHLKRwk= @@ -600,12 +539,10 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil v2.20.5+incompatible h1:tYH07UPoQt0OCQdgWWMgYHy3/a9bcxNpBIysykNIP7I= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q= @@ -626,10 +563,8 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 h1:ju5UTwk5Odtm4trrY+4Ca4RMj5OyXbmVeDAVad2T0Jw= -github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 h1:njlZPzLwU639dk2kqnCPPv+wNjq7Xb6EfUxe/oX0/NM= @@ -639,8 +574,6 @@ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -658,9 +591,8 @@ github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tyler-smith/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= +github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= -github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -678,7 +610,6 @@ github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk= github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -719,7 +650,6 @@ golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -752,7 +682,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20200329125638-4c31acba0007/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= @@ -777,20 +706,16 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -816,8 +741,6 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -869,7 +792,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190912185636-87d9f09c5d89/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -930,8 +852,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= gopkg.in/go-playground/validator.v9 v9.29.1 h1:SvGtYmN60a5CVKTOzMSyfzWDeZRxRuGvRQyEAKbw1xc= gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw= @@ -942,18 +862,13 @@ gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mN gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951/go.mod h1:owOxCRGGeAx1uugABik6K9oeNu1cgxP/R9ItzLDxNWA= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190213234257-ec84240a7772/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= -gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200316214253-d7b0ff38cac9/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 h1:a6cXbcDDUkSBlpnkWV1bJ+vv3mOgQEltEJ2rPxroVu0= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0= diff --git a/node/node.go b/node/node.go index d70a4c3..0a3df78 100644 --- a/node/node.go +++ b/node/node.go @@ -136,7 +136,7 @@ func NewNode(mode Mode, cfg *config.Node) (*Node, error) { cfg.StateDB.Keep, safeStateDBKeep)) } stateDB, err := statedb.NewStateDB(cfg.StateDB.Path, cfg.StateDB.Keep, - statedb.TypeSynchronizer, 32, chainIDU16) + statedb.TypeSynchronizer, 32) if err != nil { return nil, tracerr.Wrap(err) } diff --git a/synchronizer/synchronizer.go b/synchronizer/synchronizer.go index b2e4f4c..598dc93 100644 --- a/synchronizer/synchronizer.go +++ b/synchronizer/synchronizer.go @@ -14,6 +14,7 @@ import ( "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/eth" "github.com/hermeznetwork/hermez-node/log" + "github.com/hermeznetwork/hermez-node/txprocessor" "github.com/hermeznetwork/tracerr" ) @@ -796,13 +797,16 @@ func (s *Synchronizer) rollupSync(ethBlock *common.Block) (*common.RollupData, e // ProcessTxs updates poolL2Txs adding: Nonce (and also TokenID, but we don't use it). //nolint:gomnd - ptc := statedb.ProcessTxsConfig{ // TODO TMP + tpc := txprocessor.Config{ // TODO TMP NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 64, + ChainID: uint16(0), } - processTxsOut, err := s.stateDB.ProcessTxs(ptc, forgeBatchArgs.FeeIdxCoordinator, + tp := txprocessor.NewTxProcessor(s.stateDB, tpc) + + processTxsOut, err := tp.ProcessTxs(forgeBatchArgs.FeeIdxCoordinator, l1UserTxs, batchData.L1CoordinatorTxs, poolL2Txs) if err != nil { return nil, tracerr.Wrap(err) diff --git a/synchronizer/synchronizer_test.go b/synchronizer/synchronizer_test.go index 58fa952..81fec78 100644 --- a/synchronizer/synchronizer_test.go +++ b/synchronizer/synchronizer_test.go @@ -290,7 +290,7 @@ func newTestModules(t *testing.T) (*statedb.StateDB, *historydb.HistoryDB) { require.NoError(t, err) deleteme = append(deleteme, dir) - stateDB, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32, chainID) + stateDB, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32) require.NoError(t, err) // Init History DB diff --git a/test/debugapi/debugapi_test.go b/test/debugapi/debugapi_test.go index eff755e..cf6b04d 100644 --- a/test/debugapi/debugapi_test.go +++ b/test/debugapi/debugapi_test.go @@ -44,8 +44,7 @@ func TestDebugAPI(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) - chainID := uint16(0) - sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32) require.Nil(t, err) err = sdb.MakeCheckpoint() // Make a checkpoint to increment the batchNum require.Nil(t, err) diff --git a/db/statedb/txprocessors.go b/txprocessor/txprocessor.go similarity index 59% rename from db/statedb/txprocessors.go rename to txprocessor/txprocessor.go index 7496c8b..31f9222 100644 --- a/db/statedb/txprocessors.go +++ b/txprocessor/txprocessor.go @@ -1,4 +1,4 @@ -package statedb +package txprocessor import ( "bytes" @@ -9,6 +9,7 @@ import ( "os" "github.com/hermeznetwork/hermez-node/common" + "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/log" "github.com/hermeznetwork/tracerr" "github.com/iden3/go-iden3-crypto/babyjub" @@ -17,14 +18,25 @@ import ( "github.com/iden3/go-merkletree/db/pebble" ) -var ( - // keyidx is used as key in the db to store the current Idx - keyidx = []byte("k:idx") -) +// TxProcessor represents the TxProcessor object +type TxProcessor struct { + s *statedb.StateDB + zki *common.ZKInputs + // i is the current transaction index in the ZKInputs generation (zki) + i int + // AccumulatedFees contains the accumulated fees for each token (Coord + // Idx) in the processed batch + AccumulatedFees map[common.Idx]*big.Int + config Config +} -func (s *StateDB) resetZKInputs() { - s.zki = nil - s.i = 0 // initialize current transaction index in the ZKInputs generation +// Config contains the TxProcessor configuration parameters +type Config struct { + NLevels uint32 + MaxFeeTx uint32 + MaxTx uint32 + MaxL1Tx uint32 + ChainID uint16 } type processedExit struct { @@ -43,12 +55,19 @@ type ProcessTxOutput struct { CollectedFees map[common.TokenID]*big.Int } -// ProcessTxsConfig contains the config for ProcessTxs -type ProcessTxsConfig struct { - NLevels uint32 - MaxFeeTx uint32 - MaxTx uint32 - MaxL1Tx uint32 +// NewTxProcessor returns a new TxProcessor with the given *StateDB & Config +func NewTxProcessor(sdb *statedb.StateDB, config Config) *TxProcessor { + return &TxProcessor{ + s: sdb, + zki: nil, + i: 0, + config: config, + } +} + +func (tp *TxProcessor) resetZKInputs() { + tp.zki = nil + tp.i = 0 // initialize current transaction index in the ZKInputs generation } // ProcessTxs process the given L1Txs & L2Txs applying the needed updates to @@ -60,48 +79,50 @@ type ProcessTxsConfig struct { // the HistoryDB, and adds Nonce & TokenID to the L2Txs. // And if TypeSynchronizer returns an array of common.Account with all the // created accounts. -func (s *StateDB) ProcessTxs(ptc ProcessTxsConfig, coordIdxs []common.Idx, l1usertxs, l1coordinatortxs []common.L1Tx, l2txs []common.PoolL2Tx) (ptOut *ProcessTxOutput, err error) { +func (tp *TxProcessor) ProcessTxs(coordIdxs []common.Idx, l1usertxs, l1coordinatortxs []common.L1Tx, + l2txs []common.PoolL2Tx) (ptOut *ProcessTxOutput, err error) { defer func() { if err == nil { - err = s.MakeCheckpoint() + err = tp.s.MakeCheckpoint() } }() var exitTree *merkletree.MerkleTree var createdAccounts []common.Account - if s.zki != nil { + if tp.zki != nil { return nil, tracerr.Wrap(errors.New("Expected StateDB.zki==nil, something went wrong and it's not empty")) } - defer s.resetZKInputs() + defer tp.resetZKInputs() - if len(coordIdxs) >= int(ptc.MaxFeeTx) { - return nil, tracerr.Wrap(fmt.Errorf("CoordIdxs (%d) length must be smaller than MaxFeeTx (%d)", len(coordIdxs), ptc.MaxFeeTx)) + if len(coordIdxs) >= int(tp.config.MaxFeeTx) { + return nil, tracerr.Wrap(fmt.Errorf("CoordIdxs (%d) length must be smaller than MaxFeeTx (%d)", len(coordIdxs), tp.config.MaxFeeTx)) } - s.AccumulatedFees = make(map[common.Idx]*big.Int) + tp.AccumulatedFees = make(map[common.Idx]*big.Int) nTx := len(l1usertxs) + len(l1coordinatortxs) + len(l2txs) - if nTx > int(ptc.MaxTx) { - return nil, tracerr.Wrap(fmt.Errorf("L1UserTx + L1CoordinatorTx + L2Tx (%d) can not be bigger than MaxTx (%d)", nTx, ptc.MaxTx)) + if nTx > int(tp.config.MaxTx) { + return nil, tracerr.Wrap(fmt.Errorf("L1UserTx + L1CoordinatorTx + L2Tx (%d) can not be bigger than MaxTx (%d)", nTx, tp.config.MaxTx)) } - if len(l1usertxs)+len(l1coordinatortxs) > int(ptc.MaxL1Tx) { - return nil, tracerr.Wrap(fmt.Errorf("L1UserTx + L1CoordinatorTx (%d) can not be bigger than MaxL1Tx (%d)", len(l1usertxs)+len(l1coordinatortxs), ptc.MaxTx)) + if len(l1usertxs)+len(l1coordinatortxs) > int(tp.config.MaxL1Tx) { + return nil, tracerr.Wrap(fmt.Errorf("L1UserTx + L1CoordinatorTx (%d) can not be bigger than MaxL1Tx (%d)", len(l1usertxs)+len(l1coordinatortxs), tp.config.MaxTx)) } exits := make([]processedExit, nTx) - if s.typ == TypeBatchBuilder { - s.zki = common.NewZKInputs(s.chainID, ptc.MaxTx, ptc.MaxL1Tx, ptc.MaxFeeTx, ptc.NLevels, s.currentBatch.BigInt()) - s.zki.OldLastIdx = s.idx.BigInt() - s.zki.OldStateRoot = s.mt.Root().BigInt() - s.zki.Metadata.NewLastIdxRaw = s.idx + if tp.s.Typ == statedb.TypeBatchBuilder { + tp.zki = common.NewZKInputs(tp.config.ChainID, tp.config.MaxTx, tp.config.MaxL1Tx, + tp.config.MaxFeeTx, tp.config.NLevels, tp.s.CurrentBatch.BigInt()) + tp.zki.OldLastIdx = tp.s.CurrentIdx.BigInt() + tp.zki.OldStateRoot = tp.s.MT.Root().BigInt() + tp.zki.Metadata.NewLastIdxRaw = tp.s.CurrentIdx } // TBD if ExitTree is only in memory or stored in disk, for the moment // is only needed in memory - if s.typ == TypeSynchronizer || s.typ == TypeBatchBuilder { + if tp.s.Typ == statedb.TypeSynchronizer || tp.s.Typ == statedb.TypeBatchBuilder { tmpDir, err := ioutil.TempDir("", "hermez-statedb-exittree") if err != nil { return nil, tracerr.Wrap(err) @@ -115,7 +136,7 @@ func (s *StateDB) ProcessTxs(ptc ProcessTxsConfig, coordIdxs []common.Idx, l1use if err != nil { return nil, tracerr.Wrap(err) } - exitTree, err = merkletree.NewMerkleTree(sto, s.mt.MaxLevels()) + exitTree, err = merkletree.NewMerkleTree(sto, tp.s.MT.MaxLevels()) if err != nil { return nil, tracerr.Wrap(err) } @@ -124,213 +145,219 @@ func (s *StateDB) ProcessTxs(ptc ProcessTxsConfig, coordIdxs []common.Idx, l1use // Process L1UserTxs for i := 0; i < len(l1usertxs); i++ { // assumption: l1usertx are sorted by L1Tx.Position - exitIdx, exitAccount, newExit, createdAccount, err := s.ProcessL1Tx(exitTree, &l1usertxs[i]) + exitIdx, exitAccount, newExit, createdAccount, err := tp.ProcessL1Tx(exitTree, + &l1usertxs[i]) if err != nil { return nil, tracerr.Wrap(err) } - if s.typ == TypeSynchronizer && createdAccount != nil { + if tp.s.Typ == statedb.TypeSynchronizer && createdAccount != nil { createdAccounts = append(createdAccounts, *createdAccount) } - if s.zki != nil { + if tp.zki != nil { l1TxData, err := l1usertxs[i].BytesGeneric() if err != nil { return nil, tracerr.Wrap(err) } - s.zki.Metadata.L1TxsData = append(s.zki.Metadata.L1TxsData, l1TxData) + tp.zki.Metadata.L1TxsData = append(tp.zki.Metadata.L1TxsData, l1TxData) - l1TxDataAvailability, err := l1usertxs[i].BytesDataAvailability(s.zki.Metadata.NLevels) + l1TxDataAvailability, err := + l1usertxs[i].BytesDataAvailability(tp.zki.Metadata.NLevels) if err != nil { return nil, tracerr.Wrap(err) } - s.zki.Metadata.L1TxsDataAvailability = append(s.zki.Metadata.L1TxsDataAvailability, l1TxDataAvailability) + tp.zki.Metadata.L1TxsDataAvailability = + append(tp.zki.Metadata.L1TxsDataAvailability, l1TxDataAvailability) - s.zki.ISOutIdx[s.i] = s.idx.BigInt() - s.zki.ISStateRoot[s.i] = s.mt.Root().BigInt() + tp.zki.ISOutIdx[tp.i] = tp.s.CurrentIdx.BigInt() + tp.zki.ISStateRoot[tp.i] = tp.s.MT.Root().BigInt() if exitIdx == nil { - s.zki.ISExitRoot[s.i] = exitTree.Root().BigInt() + tp.zki.ISExitRoot[tp.i] = exitTree.Root().BigInt() } } - if s.typ == TypeSynchronizer || s.typ == TypeBatchBuilder { + if tp.s.Typ == statedb.TypeSynchronizer || tp.s.Typ == statedb.TypeBatchBuilder { if exitIdx != nil && exitTree != nil { - exits[s.i] = processedExit{ + exits[tp.i] = processedExit{ exit: true, newExit: newExit, idx: *exitIdx, acc: *exitAccount, } } - s.i++ + tp.i++ } } // Process L1CoordinatorTxs for i := 0; i < len(l1coordinatortxs); i++ { - exitIdx, _, _, createdAccount, err := s.ProcessL1Tx(exitTree, &l1coordinatortxs[i]) + exitIdx, _, _, createdAccount, err := tp.ProcessL1Tx(exitTree, &l1coordinatortxs[i]) if err != nil { return nil, tracerr.Wrap(err) } if exitIdx != nil { log.Error("Unexpected Exit in L1CoordinatorTx") } - if s.typ == TypeSynchronizer && createdAccount != nil { + if tp.s.Typ == statedb.TypeSynchronizer && createdAccount != nil { createdAccounts = append(createdAccounts, *createdAccount) } - if s.zki != nil { + if tp.zki != nil { l1TxData, err := l1coordinatortxs[i].BytesGeneric() if err != nil { return nil, tracerr.Wrap(err) } - s.zki.Metadata.L1TxsData = append(s.zki.Metadata.L1TxsData, l1TxData) - l1TxDataAvailability, err := l1coordinatortxs[i].BytesDataAvailability(s.zki.Metadata.NLevels) + tp.zki.Metadata.L1TxsData = append(tp.zki.Metadata.L1TxsData, l1TxData) + l1TxDataAvailability, err := + l1coordinatortxs[i].BytesDataAvailability(tp.zki.Metadata.NLevels) if err != nil { return nil, tracerr.Wrap(err) } - s.zki.Metadata.L1TxsDataAvailability = append(s.zki.Metadata.L1TxsDataAvailability, l1TxDataAvailability) + tp.zki.Metadata.L1TxsDataAvailability = + append(tp.zki.Metadata.L1TxsDataAvailability, l1TxDataAvailability) - s.zki.ISOutIdx[s.i] = s.idx.BigInt() - s.zki.ISStateRoot[s.i] = s.mt.Root().BigInt() - s.i++ + tp.zki.ISOutIdx[tp.i] = tp.s.CurrentIdx.BigInt() + tp.zki.ISStateRoot[tp.i] = tp.s.MT.Root().BigInt() + tp.i++ } } - s.AccumulatedFees = make(map[common.Idx]*big.Int) + tp.AccumulatedFees = make(map[common.Idx]*big.Int) for _, idx := range coordIdxs { - s.AccumulatedFees[idx] = big.NewInt(0) + tp.AccumulatedFees[idx] = big.NewInt(0) } // once L1UserTxs & L1CoordinatorTxs are processed, get TokenIDs of // coordIdxs. In this way, if a coordIdx uses an Idx that is being // created in the current batch, at this point the Idx will be created - coordIdxsMap, err := s.GetTokenIDsFromIdxs(coordIdxs) + coordIdxsMap, err := tp.s.GetTokenIDsFromIdxs(coordIdxs) if err != nil { return nil, tracerr.Wrap(err) } // collectedFees will contain the amount of fee collected for each // TokenID var collectedFees map[common.TokenID]*big.Int - if s.typ == TypeSynchronizer || s.typ == TypeBatchBuilder { + if tp.s.Typ == statedb.TypeSynchronizer || tp.s.Typ == statedb.TypeBatchBuilder { collectedFees = make(map[common.TokenID]*big.Int) for tokenID := range coordIdxsMap { collectedFees[tokenID] = big.NewInt(0) } } - if s.zki != nil { + if tp.zki != nil { // get the feePlanTokens - feePlanTokens, err := s.getFeePlanTokens(coordIdxs) + feePlanTokens, err := tp.getFeePlanTokens(coordIdxs) if err != nil { log.Error(err) return nil, tracerr.Wrap(err) } - copy(s.zki.FeePlanTokens, feePlanTokens) + copy(tp.zki.FeePlanTokens, feePlanTokens) } // Process L2Txs for i := 0; i < len(l2txs); i++ { - exitIdx, exitAccount, newExit, err := s.ProcessL2Tx(coordIdxsMap, collectedFees, exitTree, &l2txs[i]) + exitIdx, exitAccount, newExit, err := tp.ProcessL2Tx(coordIdxsMap, collectedFees, + exitTree, &l2txs[i]) if err != nil { return nil, tracerr.Wrap(err) } - if s.zki != nil { - l2TxData, err := l2txs[i].L2Tx().BytesDataAvailability(s.zki.Metadata.NLevels) + if tp.zki != nil { + l2TxData, err := l2txs[i].L2Tx().BytesDataAvailability(tp.zki.Metadata.NLevels) if err != nil { return nil, tracerr.Wrap(err) } - s.zki.Metadata.L2TxsData = append(s.zki.Metadata.L2TxsData, l2TxData) + tp.zki.Metadata.L2TxsData = append(tp.zki.Metadata.L2TxsData, l2TxData) // Intermediate States - if s.i < nTx-1 { - s.zki.ISOutIdx[s.i] = s.idx.BigInt() - s.zki.ISStateRoot[s.i] = s.mt.Root().BigInt() - s.zki.ISAccFeeOut[s.i] = formatAccumulatedFees(collectedFees, s.zki.FeePlanTokens) + if tp.i < nTx-1 { + tp.zki.ISOutIdx[tp.i] = tp.s.CurrentIdx.BigInt() + tp.zki.ISStateRoot[tp.i] = tp.s.MT.Root().BigInt() + tp.zki.ISAccFeeOut[tp.i] = formatAccumulatedFees(collectedFees, tp.zki.FeePlanTokens) if exitIdx == nil { - s.zki.ISExitRoot[s.i] = exitTree.Root().BigInt() + tp.zki.ISExitRoot[tp.i] = exitTree.Root().BigInt() } } } - if s.typ == TypeSynchronizer || s.typ == TypeBatchBuilder { + if tp.s.Typ == statedb.TypeSynchronizer || tp.s.Typ == statedb.TypeBatchBuilder { if exitIdx != nil && exitTree != nil { - exits[s.i] = processedExit{ + exits[tp.i] = processedExit{ exit: true, newExit: newExit, idx: *exitIdx, acc: *exitAccount, } } - s.i++ + tp.i++ } } - if s.zki != nil { - last := s.i - 1 - if s.i == 0 { + if tp.zki != nil { + last := tp.i - 1 + if tp.i == 0 { last = 0 } - for i := last; i < int(ptc.MaxTx); i++ { - if i < int(ptc.MaxTx)-1 { - s.zki.ISOutIdx[i] = s.idx.BigInt() - s.zki.ISStateRoot[i] = s.mt.Root().BigInt() - s.zki.ISAccFeeOut[i] = formatAccumulatedFees(collectedFees, s.zki.FeePlanTokens) - s.zki.ISExitRoot[i] = exitTree.Root().BigInt() + for i := last; i < int(tp.config.MaxTx); i++ { + if i < int(tp.config.MaxTx)-1 { + tp.zki.ISOutIdx[i] = tp.s.CurrentIdx.BigInt() + tp.zki.ISStateRoot[i] = tp.s.MT.Root().BigInt() + tp.zki.ISAccFeeOut[i] = formatAccumulatedFees(collectedFees, tp.zki.FeePlanTokens) + tp.zki.ISExitRoot[i] = exitTree.Root().BigInt() } - if i >= s.i { - s.zki.TxCompressedData[i] = new(big.Int).SetBytes(common.SignatureConstantBytes) + if i >= tp.i { + tp.zki.TxCompressedData[i] = new(big.Int).SetBytes(common.SignatureConstantBytes) } } - isFinalAccFee := formatAccumulatedFees(collectedFees, s.zki.FeePlanTokens) - copy(s.zki.ISFinalAccFee, isFinalAccFee) + isFinalAccFee := formatAccumulatedFees(collectedFees, tp.zki.FeePlanTokens) + copy(tp.zki.ISFinalAccFee, isFinalAccFee) // before computing the Fees txs, set the ISInitStateRootFee - s.zki.ISInitStateRootFee = s.mt.Root().BigInt() + tp.zki.ISInitStateRootFee = tp.s.MT.Root().BigInt() } // distribute the AccumulatedFees from the processed L2Txs into the // Coordinator Idxs iFee := 0 - for idx, accumulatedFee := range s.AccumulatedFees { + for idx, accumulatedFee := range tp.AccumulatedFees { cmp := accumulatedFee.Cmp(big.NewInt(0)) if cmp == 1 { // accumulatedFee>0 // send the fee to the Idx of the Coordinator for the TokenID - accCoord, err := s.GetAccount(idx) + accCoord, err := tp.s.GetAccount(idx) if err != nil { log.Errorw("Can not distribute accumulated fees to coordinator account: No coord Idx to receive fee", "idx", idx) return nil, tracerr.Wrap(err) } - if s.zki != nil { - s.zki.TokenID3[iFee] = accCoord.TokenID.BigInt() - s.zki.Nonce3[iFee] = accCoord.Nonce.BigInt() + if tp.zki != nil { + tp.zki.TokenID3[iFee] = accCoord.TokenID.BigInt() + tp.zki.Nonce3[iFee] = accCoord.Nonce.BigInt() coordBJJSign, coordBJJY := babyjub.UnpackSignY(accCoord.PublicKey) if coordBJJSign { - s.zki.Sign3[iFee] = big.NewInt(1) + tp.zki.Sign3[iFee] = big.NewInt(1) } - s.zki.Ay3[iFee] = coordBJJY - s.zki.Balance3[iFee] = accCoord.Balance - s.zki.EthAddr3[iFee] = common.EthAddrToBigInt(accCoord.EthAddr) + tp.zki.Ay3[iFee] = coordBJJY + tp.zki.Balance3[iFee] = accCoord.Balance + tp.zki.EthAddr3[iFee] = common.EthAddrToBigInt(accCoord.EthAddr) } accCoord.Balance = new(big.Int).Add(accCoord.Balance, accumulatedFee) - pFee, err := s.UpdateAccount(idx, accCoord) + pFee, err := tp.s.UpdateAccount(idx, accCoord) if err != nil { log.Error(err) return nil, tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings3[iFee] = siblingsToZKInputFormat(pFee.Siblings) - s.zki.ISStateRootFee[iFee] = s.mt.Root().BigInt() + if tp.zki != nil { + tp.zki.Siblings3[iFee] = siblingsToZKInputFormat(pFee.Siblings) + tp.zki.ISStateRootFee[iFee] = tp.s.MT.Root().BigInt() } } iFee++ } - if s.zki != nil { - for i := len(s.AccumulatedFees); i < int(ptc.MaxFeeTx)-1; i++ { - s.zki.ISStateRootFee[i] = s.mt.Root().BigInt() + if tp.zki != nil { + for i := len(tp.AccumulatedFees); i < int(tp.config.MaxFeeTx)-1; i++ { + tp.zki.ISStateRootFee[i] = tp.s.MT.Root().BigInt() } // add Coord Idx to ZKInputs.FeeTxsData for i := 0; i < len(coordIdxs); i++ { - s.zki.FeeIdxs[i] = coordIdxs[i].BigInt() + tp.zki.FeeIdxs[i] = coordIdxs[i].BigInt() } } - if s.typ == TypeTxSelector { + if tp.s.Typ == statedb.TypeTxSelector { return nil, nil } @@ -358,7 +385,7 @@ func (s *StateDB) ProcessTxs(ptc ProcessTxsConfig, coordIdxs []common.Idx, l1use exitInfos = append(exitInfos, ei) } - if s.typ == TypeSynchronizer { + if tp.s.Typ == statedb.TypeSynchronizer { // return exitInfos, createdAccounts and collectedFees, so Synchronizer will // be able to store it into HistoryDB for the concrete BatchNum return &ProcessTxOutput{ @@ -371,13 +398,13 @@ func (s *StateDB) ProcessTxs(ptc ProcessTxsConfig, coordIdxs []common.Idx, l1use } // compute last ZKInputs parameters - s.zki.GlobalChainID = big.NewInt(0) // TODO, 0: ethereum, this will be get from config file - s.zki.Metadata.NewStateRootRaw = s.mt.Root() - s.zki.Metadata.NewExitRootRaw = exitTree.Root() + tp.zki.GlobalChainID = big.NewInt(0) // TODO, 0: ethereum, this will be get from config file + tp.zki.Metadata.NewStateRootRaw = tp.s.MT.Root() + tp.zki.Metadata.NewExitRootRaw = exitTree.Root() // return ZKInputs as the BatchBuilder will return it to forge the Batch return &ProcessTxOutput{ - ZKInputs: s.zki, + ZKInputs: tp.zki, ExitInfos: nil, CreatedAccounts: nil, CoordinatorIdxsMap: coordIdxsMap, @@ -387,10 +414,10 @@ func (s *StateDB) ProcessTxs(ptc ProcessTxsConfig, coordIdxs []common.Idx, l1use // getFeePlanTokens returns an array of *big.Int containing a list of tokenIDs // corresponding to the given CoordIdxs and the processed L2Txs -func (s *StateDB) getFeePlanTokens(coordIdxs []common.Idx) ([]*big.Int, error) { +func (tp *TxProcessor) getFeePlanTokens(coordIdxs []common.Idx) ([]*big.Int, error) { var tBI []*big.Int for i := 0; i < len(coordIdxs); i++ { - acc, err := s.GetAccount(coordIdxs[i]) + acc, err := tp.s.GetAccount(coordIdxs[i]) if err != nil { log.Errorf("could not get account to determine TokenID of CoordIdx %d not found: %s", coordIdxs[i], err.Error()) return nil, tracerr.Wrap(err) @@ -407,56 +434,58 @@ func (s *StateDB) getFeePlanTokens(coordIdxs []common.Idx) ([]*big.Int, error) { // And another *common.Account parameter which contains the created account in // case that has been a new created account and that the StateDB is of type // TypeSynchronizer. -func (s *StateDB) ProcessL1Tx(exitTree *merkletree.MerkleTree, tx *common.L1Tx) (*common.Idx, *common.Account, bool, *common.Account, error) { +func (tp *TxProcessor) ProcessL1Tx(exitTree *merkletree.MerkleTree, tx *common.L1Tx) (*common.Idx, + *common.Account, bool, *common.Account, error) { // ZKInputs - if s.zki != nil { + if tp.zki != nil { // Txs var err error - s.zki.TxCompressedData[s.i], err = tx.TxCompressedData() + tp.zki.TxCompressedData[tp.i], err = tx.TxCompressedData() if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) } - s.zki.FromIdx[s.i] = tx.FromIdx.BigInt() - s.zki.ToIdx[s.i] = tx.ToIdx.BigInt() - s.zki.OnChain[s.i] = big.NewInt(1) + tp.zki.FromIdx[tp.i] = tx.FromIdx.BigInt() + tp.zki.ToIdx[tp.i] = tx.ToIdx.BigInt() + tp.zki.OnChain[tp.i] = big.NewInt(1) // L1Txs depositAmountF16, err := common.NewFloat16(tx.DepositAmount) if err != nil { return nil, nil, false, nil, tracerr.Wrap(err) } - s.zki.DepositAmountF[s.i] = big.NewInt(int64(depositAmountF16)) - s.zki.FromEthAddr[s.i] = common.EthAddrToBigInt(tx.FromEthAddr) + tp.zki.DepositAmountF[tp.i] = big.NewInt(int64(depositAmountF16)) + tp.zki.FromEthAddr[tp.i] = common.EthAddrToBigInt(tx.FromEthAddr) if tx.FromBJJ != common.EmptyBJJComp { - s.zki.FromBJJCompressed[s.i] = BJJCompressedTo256BigInts(tx.FromBJJ) + tp.zki.FromBJJCompressed[tp.i] = BJJCompressedTo256BigInts(tx.FromBJJ) } // Intermediate States, for all the transactions except for the last one - if s.i < len(s.zki.ISOnChain) { // len(s.zki.ISOnChain) == nTx - s.zki.ISOnChain[s.i] = big.NewInt(1) + if tp.i < len(tp.zki.ISOnChain) { // len(tp.zki.ISOnChain) == nTx + tp.zki.ISOnChain[tp.i] = big.NewInt(1) } } switch tx.Type { case common.TxTypeForceTransfer: - s.computeEffectiveAmounts(tx) + tp.computeEffectiveAmounts(tx) // go to the MT account of sender and receiver, and update balance // & nonce - // coordIdxsMap is 'nil', as at L1Txs there is no L2 fees - // 0 for the parameter toIdx, as at L1Tx ToIdx can only be 0 in the Deposit type case. - err := s.applyTransfer(nil, nil, tx.Tx(), 0) + // coordIdxsMap is 'nil', as at L1Txs there is no L2 fees. + // 0 for the parameter toIdx, as at L1Tx ToIdx can only be 0 in + // the Deposit type case. + err := tp.applyTransfer(nil, nil, tx.Tx(), 0) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) } case common.TxTypeCreateAccountDeposit: - s.computeEffectiveAmounts(tx) + tp.computeEffectiveAmounts(tx) // add new account to the MT, update balance of the MT account - err := s.applyCreateAccount(tx) + err := tp.applyCreateAccount(tx) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) @@ -465,40 +494,40 @@ func (s *StateDB) ProcessL1Tx(exitTree *merkletree.MerkleTree, tx *common.L1Tx) // which in the case type==TypeSynchronizer will be added to an // array of created accounts that will be returned case common.TxTypeDeposit: - s.computeEffectiveAmounts(tx) + tp.computeEffectiveAmounts(tx) // update balance of the MT account - err := s.applyDeposit(tx, false) + err := tp.applyDeposit(tx, false) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) } case common.TxTypeDepositTransfer: - s.computeEffectiveAmounts(tx) + tp.computeEffectiveAmounts(tx) // update balance in MT account, update balance & nonce of sender // & receiver - err := s.applyDeposit(tx, true) + err := tp.applyDeposit(tx, true) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) } case common.TxTypeCreateAccountDepositTransfer: - s.computeEffectiveAmounts(tx) + tp.computeEffectiveAmounts(tx) // add new account to the merkletree, update balance in MT account, // update balance & nonce of sender & receiver - err := s.applyCreateAccountDepositTransfer(tx) + err := tp.applyCreateAccountDepositTransfer(tx) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) } case common.TxTypeForceExit: - s.computeEffectiveAmounts(tx) + tp.computeEffectiveAmounts(tx) // execute exit flow // coordIdxsMap is 'nil', as at L1Txs there is no L2 fees - exitAccount, newExit, err := s.applyExit(nil, nil, exitTree, tx.Tx()) + exitAccount, newExit, err := tp.applyExit(nil, nil, exitTree, tx.Tx()) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) @@ -508,9 +537,11 @@ func (s *StateDB) ProcessL1Tx(exitTree *merkletree.MerkleTree, tx *common.L1Tx) } var createdAccount *common.Account - if s.typ == TypeSynchronizer && (tx.Type == common.TxTypeCreateAccountDeposit || tx.Type == common.TxTypeCreateAccountDepositTransfer) { + if tp.s.Typ == statedb.TypeSynchronizer && + (tx.Type == common.TxTypeCreateAccountDeposit || + tx.Type == common.TxTypeCreateAccountDepositTransfer) { var err error - createdAccount, err = s.GetAccount(s.idx) + createdAccount, err = tp.s.GetAccount(tp.s.CurrentIdx) if err != nil { log.Error(err) return nil, nil, false, nil, tracerr.Wrap(err) @@ -524,73 +555,74 @@ func (s *StateDB) ProcessL1Tx(exitTree *merkletree.MerkleTree, tx *common.L1Tx) // StateDB depending on the transaction Type. It returns the 3 parameters // related to the Exit (in case of): Idx, ExitAccount, boolean determining if // the Exit created a new Leaf in the ExitTree. -func (s *StateDB) ProcessL2Tx(coordIdxsMap map[common.TokenID]common.Idx, collectedFees map[common.TokenID]*big.Int, - exitTree *merkletree.MerkleTree, tx *common.PoolL2Tx) (*common.Idx, *common.Account, bool, error) { +func (tp *TxProcessor) ProcessL2Tx(coordIdxsMap map[common.TokenID]common.Idx, + collectedFees map[common.TokenID]*big.Int, exitTree *merkletree.MerkleTree, + tx *common.PoolL2Tx) (*common.Idx, *common.Account, bool, error) { var err error // if tx.ToIdx==0, get toIdx by ToEthAddr or ToBJJ if tx.ToIdx == common.Idx(0) && tx.AuxToIdx == common.Idx(0) { - if s.typ == TypeSynchronizer { + if tp.s.Typ == statedb.TypeSynchronizer { // this should never be reached log.Error("WARNING: In StateDB with Synchronizer mode L2.ToIdx can't be 0") return nil, nil, false, tracerr.Wrap(fmt.Errorf("In StateDB with Synchronizer mode L2.ToIdx can't be 0")) } // case when tx.Type== common.TxTypeTransferToEthAddr or common.TxTypeTransferToBJJ - tx.AuxToIdx, err = s.GetIdxByEthAddrBJJ(tx.ToEthAddr, tx.ToBJJ, tx.TokenID) + tx.AuxToIdx, err = tp.s.GetIdxByEthAddrBJJ(tx.ToEthAddr, tx.ToBJJ, tx.TokenID) if err != nil { return nil, nil, false, tracerr.Wrap(err) } } // ZKInputs - if s.zki != nil { + if tp.zki != nil { // Txs - s.zki.TxCompressedData[s.i], err = tx.TxCompressedData(s.chainID) + tp.zki.TxCompressedData[tp.i], err = tx.TxCompressedData(tp.config.ChainID) if err != nil { return nil, nil, false, tracerr.Wrap(err) } - s.zki.TxCompressedDataV2[s.i], err = tx.TxCompressedDataV2() + tp.zki.TxCompressedDataV2[tp.i], err = tx.TxCompressedDataV2() if err != nil { return nil, nil, false, tracerr.Wrap(err) } - s.zki.FromIdx[s.i] = tx.FromIdx.BigInt() - s.zki.ToIdx[s.i] = tx.ToIdx.BigInt() + tp.zki.FromIdx[tp.i] = tx.FromIdx.BigInt() + tp.zki.ToIdx[tp.i] = tx.ToIdx.BigInt() // fill AuxToIdx if needed if tx.ToIdx == 0 { // use toIdx that can have been filled by tx.ToIdx or // if tx.Idx==0 (this case), toIdx is filled by the Idx // from db by ToEthAddr&ToBJJ - s.zki.AuxToIdx[s.i] = tx.AuxToIdx.BigInt() + tp.zki.AuxToIdx[tp.i] = tx.AuxToIdx.BigInt() } if tx.ToBJJ != common.EmptyBJJComp { - _, s.zki.ToBJJAy[s.i] = babyjub.UnpackSignY(tx.ToBJJ) + _, tp.zki.ToBJJAy[tp.i] = babyjub.UnpackSignY(tx.ToBJJ) } - s.zki.ToEthAddr[s.i] = common.EthAddrToBigInt(tx.ToEthAddr) + tp.zki.ToEthAddr[tp.i] = common.EthAddrToBigInt(tx.ToEthAddr) - s.zki.OnChain[s.i] = big.NewInt(0) - s.zki.NewAccount[s.i] = big.NewInt(0) + tp.zki.OnChain[tp.i] = big.NewInt(0) + tp.zki.NewAccount[tp.i] = big.NewInt(0) // L2Txs - // s.zki.RqOffset[s.i] = // TODO Rq once TxSelector is ready - // s.zki.RqTxCompressedDataV2[s.i] = // TODO - // s.zki.RqToEthAddr[s.i] = common.EthAddrToBigInt(tx.RqToEthAddr) // TODO - // s.zki.RqToBJJAy[s.i] = tx.ToBJJ.Y // TODO + // tp.zki.RqOffset[tp.i] = // TODO Rq once TxSelector is ready + // tp.zki.RqTxCompressedDataV2[tp.i] = // TODO + // tp.zki.RqToEthAddr[tp.i] = common.EthAddrToBigInt(tx.RqToEthAddr) // TODO + // tp.zki.RqToBJJAy[tp.i] = tx.ToBJJ.Y // TODO signature, err := tx.Signature.Decompress() if err != nil { log.Error(err) return nil, nil, false, tracerr.Wrap(err) } - s.zki.S[s.i] = signature.S - s.zki.R8x[s.i] = signature.R8.X - s.zki.R8y[s.i] = signature.R8.Y + tp.zki.S[tp.i] = signature.S + tp.zki.R8x[tp.i] = signature.R8.X + tp.zki.R8y[tp.i] = signature.R8.Y } // if StateDB type==TypeSynchronizer, will need to add Nonce - if s.typ == TypeSynchronizer { + if tp.s.Typ == statedb.TypeSynchronizer { // as type==TypeSynchronizer, always tx.ToIdx!=0 - acc, err := s.GetAccount(tx.FromIdx) + acc, err := tp.s.GetAccount(tx.FromIdx) if err != nil { log.Errorw("GetAccount", "fromIdx", tx.FromIdx, "err", err) return nil, nil, false, tracerr.Wrap(err) @@ -603,14 +635,14 @@ func (s *StateDB) ProcessL2Tx(coordIdxsMap map[common.TokenID]common.Idx, collec case common.TxTypeTransfer, common.TxTypeTransferToEthAddr, common.TxTypeTransferToBJJ: // go to the MT account of sender and receiver, and update // balance & nonce - err = s.applyTransfer(coordIdxsMap, collectedFees, tx.Tx(), tx.AuxToIdx) + err = tp.applyTransfer(coordIdxsMap, collectedFees, tx.Tx(), tx.AuxToIdx) if err != nil { log.Error(err) return nil, nil, false, tracerr.Wrap(err) } case common.TxTypeExit: // execute exit flow - exitAccount, newExit, err := s.applyExit(coordIdxsMap, collectedFees, exitTree, tx.Tx()) + exitAccount, newExit, err := tp.applyExit(coordIdxsMap, collectedFees, exitTree, tx.Tx()) if err != nil { log.Error(err) return nil, nil, false, tracerr.Wrap(err) @@ -623,7 +655,7 @@ func (s *StateDB) ProcessL2Tx(coordIdxsMap map[common.TokenID]common.Idx, collec // applyCreateAccount creates a new account in the account of the depositer, it // stores the deposit value -func (s *StateDB) applyCreateAccount(tx *common.L1Tx) error { +func (tp *TxProcessor) applyCreateAccount(tx *common.L1Tx) error { account := &common.Account{ TokenID: tx.TokenID, Nonce: 0, @@ -632,61 +664,60 @@ func (s *StateDB) applyCreateAccount(tx *common.L1Tx) error { EthAddr: tx.FromEthAddr, } - p, err := s.CreateAccount(common.Idx(s.idx+1), account) + p, err := tp.s.CreateAccount(common.Idx(tp.s.CurrentIdx+1), account) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.TokenID1[s.i] = tx.TokenID.BigInt() - s.zki.Nonce1[s.i] = big.NewInt(0) + if tp.zki != nil { + tp.zki.TokenID1[tp.i] = tx.TokenID.BigInt() + tp.zki.Nonce1[tp.i] = big.NewInt(0) fromBJJSign, fromBJJY := babyjub.UnpackSignY(tx.FromBJJ) if fromBJJSign { - s.zki.Sign1[s.i] = big.NewInt(1) + tp.zki.Sign1[tp.i] = big.NewInt(1) } - s.zki.Ay1[s.i] = fromBJJY - s.zki.Balance1[s.i] = tx.EffectiveDepositAmount - s.zki.EthAddr1[s.i] = common.EthAddrToBigInt(tx.FromEthAddr) - s.zki.Siblings1[s.i] = siblingsToZKInputFormat(p.Siblings) + tp.zki.Ay1[tp.i] = fromBJJY + tp.zki.Balance1[tp.i] = tx.EffectiveDepositAmount + tp.zki.EthAddr1[tp.i] = common.EthAddrToBigInt(tx.FromEthAddr) + tp.zki.Siblings1[tp.i] = siblingsToZKInputFormat(p.Siblings) if p.IsOld0 { - s.zki.IsOld0_1[s.i] = big.NewInt(1) + tp.zki.IsOld0_1[tp.i] = big.NewInt(1) } - s.zki.OldKey1[s.i] = p.OldKey.BigInt() - s.zki.OldValue1[s.i] = p.OldValue.BigInt() + tp.zki.OldKey1[tp.i] = p.OldKey.BigInt() + tp.zki.OldValue1[tp.i] = p.OldValue.BigInt() - s.zki.Metadata.NewLastIdxRaw = s.idx + 1 + tp.zki.Metadata.NewLastIdxRaw = tp.s.CurrentIdx + 1 - s.zki.AuxFromIdx[s.i] = common.Idx(s.idx + 1).BigInt() - s.zki.NewAccount[s.i] = big.NewInt(1) + tp.zki.AuxFromIdx[tp.i] = common.Idx(tp.s.CurrentIdx + 1).BigInt() + tp.zki.NewAccount[tp.i] = big.NewInt(1) - if s.i < len(s.zki.ISOnChain) { // len(s.zki.ISOnChain) == nTx + if tp.i < len(tp.zki.ISOnChain) { // len(tp.zki.ISOnChain) == nTx // intermediate states - s.zki.ISOnChain[s.i] = big.NewInt(1) + tp.zki.ISOnChain[tp.i] = big.NewInt(1) } } - s.idx = s.idx + 1 - return s.setIdx(s.idx) + return tp.s.SetIdx(tp.s.CurrentIdx + 1) } // applyDeposit updates the balance in the account of the depositer, if // andTransfer parameter is set to true, the method will also apply the // Transfer of the L1Tx/DepositTransfer -func (s *StateDB) applyDeposit(tx *common.L1Tx, transfer bool) error { - accSender, err := s.GetAccount(tx.FromIdx) +func (tp *TxProcessor) applyDeposit(tx *common.L1Tx, transfer bool) error { + accSender, err := tp.s.GetAccount(tx.FromIdx) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.TokenID1[s.i] = accSender.TokenID.BigInt() - s.zki.Nonce1[s.i] = accSender.Nonce.BigInt() + if tp.zki != nil { + tp.zki.TokenID1[tp.i] = accSender.TokenID.BigInt() + tp.zki.Nonce1[tp.i] = accSender.Nonce.BigInt() senderBJJSign, senderBJJY := babyjub.UnpackSignY(accSender.PublicKey) if senderBJJSign { - s.zki.Sign1[s.i] = big.NewInt(1) + tp.zki.Sign1[tp.i] = big.NewInt(1) } - s.zki.Ay1[s.i] = senderBJJY - s.zki.Balance1[s.i] = accSender.Balance - s.zki.EthAddr1[s.i] = common.EthAddrToBigInt(accSender.EthAddr) + tp.zki.Ay1[tp.i] = senderBJJY + tp.zki.Balance1[tp.i] = accSender.Balance + tp.zki.EthAddr1[tp.i] = common.EthAddrToBigInt(accSender.EthAddr) } // add the deposit to the sender @@ -695,12 +726,12 @@ func (s *StateDB) applyDeposit(tx *common.L1Tx, transfer bool) error { accSender.Balance = new(big.Int).Sub(accSender.Balance, tx.EffectiveAmount) // update sender account in localStateDB - p, err := s.UpdateAccount(tx.FromIdx, accSender) + p, err := tp.s.UpdateAccount(tx.FromIdx, accSender) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings1[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings1[tp.i] = siblingsToZKInputFormat(p.Siblings) // IsOld0_1, OldKey1, OldValue1 not needed as this is not an insert } @@ -710,34 +741,34 @@ func (s *StateDB) applyDeposit(tx *common.L1Tx, transfer bool) error { if tx.ToIdx == tx.FromIdx { accReceiver = accSender } else { - accReceiver, err = s.GetAccount(tx.ToIdx) + accReceiver, err = tp.s.GetAccount(tx.ToIdx) if err != nil { return tracerr.Wrap(err) } } - if s.zki != nil { - s.zki.TokenID2[s.i] = accReceiver.TokenID.BigInt() - s.zki.Nonce2[s.i] = accReceiver.Nonce.BigInt() + if tp.zki != nil { + tp.zki.TokenID2[tp.i] = accReceiver.TokenID.BigInt() + tp.zki.Nonce2[tp.i] = accReceiver.Nonce.BigInt() receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.PublicKey) if receiverBJJSign { - s.zki.Sign2[s.i] = big.NewInt(1) + tp.zki.Sign2[tp.i] = big.NewInt(1) } - s.zki.Ay2[s.i] = receiverBJJY - s.zki.Balance2[s.i] = accReceiver.Balance - s.zki.EthAddr2[s.i] = common.EthAddrToBigInt(accReceiver.EthAddr) + tp.zki.Ay2[tp.i] = receiverBJJY + tp.zki.Balance2[tp.i] = accReceiver.Balance + tp.zki.EthAddr2[tp.i] = common.EthAddrToBigInt(accReceiver.EthAddr) } // add amount to the receiver accReceiver.Balance = new(big.Int).Add(accReceiver.Balance, tx.EffectiveAmount) // update receiver account in localStateDB - p, err := s.UpdateAccount(tx.ToIdx, accReceiver) + p, err := tp.s.UpdateAccount(tx.ToIdx, accReceiver) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings2[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings2[tp.i] = siblingsToZKInputFormat(p.Siblings) // IsOld0_2, OldKey2, OldValue2 not needed as this is not an insert } } @@ -751,30 +782,30 @@ func (s *StateDB) applyDeposit(tx *common.L1Tx, transfer bool) error { // tx.ToIdx==0, then toIdx!=0, and will be used the toIdx parameter as Idx of // the receiver. This parameter is used when the tx.ToIdx is not specified and // the real ToIdx is found trhrough the ToEthAddr or ToBJJ. -func (s *StateDB) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx, +func (tp *TxProcessor) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx, collectedFees map[common.TokenID]*big.Int, tx common.Tx, auxToIdx common.Idx) error { if auxToIdx == common.Idx(0) { auxToIdx = tx.ToIdx } // get sender and receiver accounts from localStateDB - accSender, err := s.GetAccount(tx.FromIdx) + accSender, err := tp.s.GetAccount(tx.FromIdx) if err != nil { log.Error(err) return tracerr.Wrap(err) } - if s.zki != nil { + if tp.zki != nil { // Set the State1 before updating the Sender leaf - s.zki.TokenID1[s.i] = accSender.TokenID.BigInt() - s.zki.Nonce1[s.i] = accSender.Nonce.BigInt() + tp.zki.TokenID1[tp.i] = accSender.TokenID.BigInt() + tp.zki.Nonce1[tp.i] = accSender.Nonce.BigInt() senderBJJSign, senderBJJY := babyjub.UnpackSignY(accSender.PublicKey) if senderBJJSign { - s.zki.Sign1[s.i] = big.NewInt(1) + tp.zki.Sign1[tp.i] = big.NewInt(1) } - s.zki.Ay1[s.i] = senderBJJY - s.zki.Balance1[s.i] = accSender.Balance - s.zki.EthAddr1[s.i] = common.EthAddrToBigInt(accSender.EthAddr) + tp.zki.Ay1[tp.i] = senderBJJY + tp.zki.Balance1[tp.i] = accSender.Balance + tp.zki.EthAddr1[tp.i] = common.EthAddrToBigInt(accSender.EthAddr) } if !tx.IsL1 { // increment nonce @@ -789,15 +820,16 @@ func (s *StateDB) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx, accSender.Balance = new(big.Int).Sub(accSender.Balance, feeAndAmount) if _, ok := coordIdxsMap[accSender.TokenID]; ok { - accCoord, err := s.GetAccount(coordIdxsMap[accSender.TokenID]) + accCoord, err := tp.s.GetAccount(coordIdxsMap[accSender.TokenID]) if err != nil { return tracerr.Wrap(fmt.Errorf("Can not use CoordIdx that does not exist in the tree. TokenID: %d, CoordIdx: %d", accSender.TokenID, coordIdxsMap[accSender.TokenID])) } // accumulate the fee for the Coord account - accumulated := s.AccumulatedFees[accCoord.Idx] + accumulated := tp.AccumulatedFees[accCoord.Idx] accumulated.Add(accumulated, fee) - if s.typ == TypeSynchronizer || s.typ == TypeBatchBuilder { + if tp.s.Typ == statedb.TypeSynchronizer || + tp.s.Typ == statedb.TypeBatchBuilder { collected := collectedFees[accCoord.TokenID] collected.Add(collected, fee) } @@ -809,13 +841,13 @@ func (s *StateDB) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx, } // update sender account in localStateDB - pSender, err := s.UpdateAccount(tx.FromIdx, accSender) + pSender, err := tp.s.UpdateAccount(tx.FromIdx, accSender) if err != nil { log.Error(err) return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings1[s.i] = siblingsToZKInputFormat(pSender.Siblings) + if tp.zki != nil { + tp.zki.Siblings1[tp.i] = siblingsToZKInputFormat(pSender.Siblings) } var accReceiver *common.Account @@ -825,35 +857,35 @@ func (s *StateDB) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx, // updated yet accReceiver = accSender } else { - accReceiver, err = s.GetAccount(auxToIdx) + accReceiver, err = tp.s.GetAccount(auxToIdx) if err != nil { log.Error(err) return tracerr.Wrap(err) } } - if s.zki != nil { + if tp.zki != nil { // Set the State2 before updating the Receiver leaf - s.zki.TokenID2[s.i] = accReceiver.TokenID.BigInt() - s.zki.Nonce2[s.i] = accReceiver.Nonce.BigInt() + tp.zki.TokenID2[tp.i] = accReceiver.TokenID.BigInt() + tp.zki.Nonce2[tp.i] = accReceiver.Nonce.BigInt() receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.PublicKey) if receiverBJJSign { - s.zki.Sign2[s.i] = big.NewInt(1) + tp.zki.Sign2[tp.i] = big.NewInt(1) } - s.zki.Ay2[s.i] = receiverBJJY - s.zki.Balance2[s.i] = accReceiver.Balance - s.zki.EthAddr2[s.i] = common.EthAddrToBigInt(accReceiver.EthAddr) + tp.zki.Ay2[tp.i] = receiverBJJY + tp.zki.Balance2[tp.i] = accReceiver.Balance + tp.zki.EthAddr2[tp.i] = common.EthAddrToBigInt(accReceiver.EthAddr) } // add amount-feeAmount to the receiver accReceiver.Balance = new(big.Int).Add(accReceiver.Balance, tx.Amount) // update receiver account in localStateDB - pReceiver, err := s.UpdateAccount(auxToIdx, accReceiver) + pReceiver, err := tp.s.UpdateAccount(auxToIdx, accReceiver) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings2[s.i] = siblingsToZKInputFormat(pReceiver.Siblings) + if tp.zki != nil { + tp.zki.Siblings2[tp.i] = siblingsToZKInputFormat(pReceiver.Siblings) } return nil @@ -861,8 +893,8 @@ func (s *StateDB) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx, // applyCreateAccountDepositTransfer, in a single tx, creates a new account, // makes a deposit, and performs a transfer to another account -func (s *StateDB) applyCreateAccountDepositTransfer(tx *common.L1Tx) error { - auxFromIdx := common.Idx(s.idx + 1) +func (tp *TxProcessor) applyCreateAccountDepositTransfer(tx *common.L1Tx) error { + auxFromIdx := common.Idx(tp.s.CurrentIdx + 1) accSender := &common.Account{ TokenID: tx.TokenID, Nonce: 0, @@ -871,106 +903,105 @@ func (s *StateDB) applyCreateAccountDepositTransfer(tx *common.L1Tx) error { EthAddr: tx.FromEthAddr, } - if s.zki != nil { + if tp.zki != nil { // Set the State1 before updating the Sender leaf - s.zki.TokenID1[s.i] = tx.TokenID.BigInt() - s.zki.Nonce1[s.i] = big.NewInt(0) + tp.zki.TokenID1[tp.i] = tx.TokenID.BigInt() + tp.zki.Nonce1[tp.i] = big.NewInt(0) fromBJJSign, fromBJJY := babyjub.UnpackSignY(tx.FromBJJ) if fromBJJSign { - s.zki.Sign1[s.i] = big.NewInt(1) + tp.zki.Sign1[tp.i] = big.NewInt(1) } - s.zki.Ay1[s.i] = fromBJJY - s.zki.Balance1[s.i] = tx.EffectiveDepositAmount - s.zki.EthAddr1[s.i] = common.EthAddrToBigInt(tx.FromEthAddr) + tp.zki.Ay1[tp.i] = fromBJJY + tp.zki.Balance1[tp.i] = tx.EffectiveDepositAmount + tp.zki.EthAddr1[tp.i] = common.EthAddrToBigInt(tx.FromEthAddr) } // subtract amount to the sender accSender.Balance = new(big.Int).Sub(accSender.Balance, tx.EffectiveAmount) // create Account of the Sender - p, err := s.CreateAccount(common.Idx(s.idx+1), accSender) + p, err := tp.s.CreateAccount(common.Idx(tp.s.CurrentIdx+1), accSender) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings1[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings1[tp.i] = siblingsToZKInputFormat(p.Siblings) if p.IsOld0 { - s.zki.IsOld0_1[s.i] = big.NewInt(1) + tp.zki.IsOld0_1[tp.i] = big.NewInt(1) } - s.zki.OldKey1[s.i] = p.OldKey.BigInt() - s.zki.OldValue1[s.i] = p.OldValue.BigInt() + tp.zki.OldKey1[tp.i] = p.OldKey.BigInt() + tp.zki.OldValue1[tp.i] = p.OldValue.BigInt() - s.zki.Metadata.NewLastIdxRaw = s.idx + 1 + tp.zki.Metadata.NewLastIdxRaw = tp.s.CurrentIdx + 1 - s.zki.AuxFromIdx[s.i] = auxFromIdx.BigInt() - s.zki.NewAccount[s.i] = big.NewInt(1) + tp.zki.AuxFromIdx[tp.i] = auxFromIdx.BigInt() + tp.zki.NewAccount[tp.i] = big.NewInt(1) // intermediate states - s.zki.ISOnChain[s.i] = big.NewInt(1) + tp.zki.ISOnChain[tp.i] = big.NewInt(1) } var accReceiver *common.Account if tx.ToIdx == auxFromIdx { accReceiver = accSender } else { - accReceiver, err = s.GetAccount(tx.ToIdx) + accReceiver, err = tp.s.GetAccount(tx.ToIdx) if err != nil { log.Error(err) return tracerr.Wrap(err) } } - if s.zki != nil { + if tp.zki != nil { // Set the State2 before updating the Receiver leaf - s.zki.TokenID2[s.i] = accReceiver.TokenID.BigInt() - s.zki.Nonce2[s.i] = accReceiver.Nonce.BigInt() + tp.zki.TokenID2[tp.i] = accReceiver.TokenID.BigInt() + tp.zki.Nonce2[tp.i] = accReceiver.Nonce.BigInt() receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.PublicKey) if receiverBJJSign { - s.zki.Sign2[s.i] = big.NewInt(1) + tp.zki.Sign2[tp.i] = big.NewInt(1) } - s.zki.Ay2[s.i] = receiverBJJY - s.zki.Balance2[s.i] = accReceiver.Balance - s.zki.EthAddr2[s.i] = common.EthAddrToBigInt(accReceiver.EthAddr) + tp.zki.Ay2[tp.i] = receiverBJJY + tp.zki.Balance2[tp.i] = accReceiver.Balance + tp.zki.EthAddr2[tp.i] = common.EthAddrToBigInt(accReceiver.EthAddr) } // add amount to the receiver accReceiver.Balance = new(big.Int).Add(accReceiver.Balance, tx.EffectiveAmount) // update receiver account in localStateDB - p, err = s.UpdateAccount(tx.ToIdx, accReceiver) + p, err = tp.s.UpdateAccount(tx.ToIdx, accReceiver) if err != nil { return tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings2[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings2[tp.i] = siblingsToZKInputFormat(p.Siblings) } - s.idx = s.idx + 1 - return s.setIdx(s.idx) + return tp.s.SetIdx(tp.s.CurrentIdx + 1) } // It returns the ExitAccount and a boolean determining if the Exit created a // new Leaf in the ExitTree. -func (s *StateDB) applyExit(coordIdxsMap map[common.TokenID]common.Idx, +func (tp *TxProcessor) applyExit(coordIdxsMap map[common.TokenID]common.Idx, collectedFees map[common.TokenID]*big.Int, exitTree *merkletree.MerkleTree, tx common.Tx) (*common.Account, bool, error) { // 0. subtract tx.Amount from current Account in StateMT // add the tx.Amount into the Account (tx.FromIdx) in the ExitMT - acc, err := s.GetAccount(tx.FromIdx) + acc, err := tp.s.GetAccount(tx.FromIdx) if err != nil { return nil, false, tracerr.Wrap(err) } - if s.zki != nil { - s.zki.TokenID1[s.i] = acc.TokenID.BigInt() - s.zki.Nonce1[s.i] = acc.Nonce.BigInt() + if tp.zki != nil { + tp.zki.TokenID1[tp.i] = acc.TokenID.BigInt() + tp.zki.Nonce1[tp.i] = acc.Nonce.BigInt() accBJJSign, accBJJY := babyjub.UnpackSignY(acc.PublicKey) if accBJJSign { - s.zki.Sign1[s.i] = big.NewInt(1) + tp.zki.Sign1[tp.i] = big.NewInt(1) } - s.zki.Ay1[s.i] = accBJJY - s.zki.Balance1[s.i] = acc.Balance - s.zki.EthAddr1[s.i] = common.EthAddrToBigInt(acc.EthAddr) + tp.zki.Ay1[tp.i] = accBJJY + tp.zki.Balance1[tp.i] = acc.Balance + tp.zki.EthAddr1[tp.i] = common.EthAddrToBigInt(acc.EthAddr) - s.zki.NewExit[s.i] = big.NewInt(1) + tp.zki.NewExit[tp.i] = big.NewInt(1) } if !tx.IsL1 { @@ -986,15 +1017,16 @@ func (s *StateDB) applyExit(coordIdxsMap map[common.TokenID]common.Idx, acc.Balance = new(big.Int).Sub(acc.Balance, feeAndAmount) if _, ok := coordIdxsMap[acc.TokenID]; ok { - accCoord, err := s.GetAccount(coordIdxsMap[acc.TokenID]) + accCoord, err := tp.s.GetAccount(coordIdxsMap[acc.TokenID]) if err != nil { return nil, false, tracerr.Wrap(fmt.Errorf("Can not use CoordIdx that does not exist in the tree. TokenID: %d, CoordIdx: %d", acc.TokenID, coordIdxsMap[acc.TokenID])) } // accumulate the fee for the Coord account - accumulated := s.AccumulatedFees[accCoord.Idx] + accumulated := tp.AccumulatedFees[accCoord.Idx] accumulated.Add(accumulated, fee) - if s.typ == TypeSynchronizer || s.typ == TypeBatchBuilder { + if tp.s.Typ == statedb.TypeSynchronizer || + tp.s.Typ == statedb.TypeBatchBuilder { collected := collectedFees[accCoord.TokenID] collected.Add(collected, fee) } @@ -1005,21 +1037,22 @@ func (s *StateDB) applyExit(coordIdxsMap map[common.TokenID]common.Idx, acc.Balance = new(big.Int).Sub(acc.Balance, tx.Amount) } - p, err := s.UpdateAccount(tx.FromIdx, acc) + p, err := tp.s.UpdateAccount(tx.FromIdx, acc) if err != nil { return nil, false, tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings1[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings1[tp.i] = siblingsToZKInputFormat(p.Siblings) } if exitTree == nil { return nil, false, nil } - exitAccount, err := getAccountInTreeDB(exitTree.DB(), tx.FromIdx) + exitAccount, err := statedb.GetAccountInTreeDB(exitTree.DB(), tx.FromIdx) if tracerr.Unwrap(err) == db.ErrNotFound { // 1a. if idx does not exist in exitTree: - // add new leaf 'ExitTreeLeaf', where ExitTreeLeaf.Balance = exitAmount (exitAmount=tx.Amount) + // add new leaf 'ExitTreeLeaf', where ExitTreeLeaf.Balance = + // exitAmount (exitAmount=tx.Amount) exitAccount := &common.Account{ TokenID: acc.TokenID, Nonce: common.Nonce(0), @@ -1027,30 +1060,30 @@ func (s *StateDB) applyExit(coordIdxsMap map[common.TokenID]common.Idx, PublicKey: acc.PublicKey, EthAddr: acc.EthAddr, } - if s.zki != nil { + if tp.zki != nil { // Set the State2 before creating the Exit leaf - s.zki.TokenID2[s.i] = acc.TokenID.BigInt() - s.zki.Nonce2[s.i] = big.NewInt(0) + tp.zki.TokenID2[tp.i] = acc.TokenID.BigInt() + tp.zki.Nonce2[tp.i] = big.NewInt(0) accBJJSign, accBJJY := babyjub.UnpackSignY(acc.PublicKey) if accBJJSign { - s.zki.Sign2[s.i] = big.NewInt(1) + tp.zki.Sign2[tp.i] = big.NewInt(1) } - s.zki.Ay2[s.i] = accBJJY - s.zki.Balance2[s.i] = tx.Amount - s.zki.EthAddr2[s.i] = common.EthAddrToBigInt(acc.EthAddr) + tp.zki.Ay2[tp.i] = accBJJY + tp.zki.Balance2[tp.i] = tx.Amount + tp.zki.EthAddr2[tp.i] = common.EthAddrToBigInt(acc.EthAddr) } - p, err = createAccountInTreeDB(exitTree.DB(), exitTree, tx.FromIdx, exitAccount) + p, err = statedb.CreateAccountInTreeDB(exitTree.DB(), exitTree, tx.FromIdx, exitAccount) if err != nil { return nil, false, tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings2[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings2[tp.i] = siblingsToZKInputFormat(p.Siblings) if p.IsOld0 { - s.zki.IsOld0_2[s.i] = big.NewInt(1) + tp.zki.IsOld0_2[tp.i] = big.NewInt(1) } - s.zki.OldKey2[s.i] = p.OldKey.BigInt() - s.zki.OldValue2[s.i] = p.OldValue.BigInt() - s.zki.ISExitRoot[s.i] = exitTree.Root().BigInt() + tp.zki.OldKey2[tp.i] = p.OldKey.BigInt() + tp.zki.OldValue2[tp.i] = p.OldValue.BigInt() + tp.zki.ISExitRoot[tp.i] = exitTree.Root().BigInt() } return exitAccount, true, nil } else if err != nil { @@ -1058,40 +1091,40 @@ func (s *StateDB) applyExit(coordIdxsMap map[common.TokenID]common.Idx, } // 1b. if idx already exist in exitTree: - if s.zki != nil { + if tp.zki != nil { // Set the State2 before updating the Exit leaf - s.zki.TokenID2[s.i] = acc.TokenID.BigInt() - s.zki.Nonce2[s.i] = big.NewInt(0) + tp.zki.TokenID2[tp.i] = acc.TokenID.BigInt() + tp.zki.Nonce2[tp.i] = big.NewInt(0) accBJJSign, accBJJY := babyjub.UnpackSignY(acc.PublicKey) if accBJJSign { - s.zki.Sign2[s.i] = big.NewInt(1) + tp.zki.Sign2[tp.i] = big.NewInt(1) } - s.zki.Ay2[s.i] = accBJJY - s.zki.Balance2[s.i] = tx.Amount - s.zki.EthAddr2[s.i] = common.EthAddrToBigInt(acc.EthAddr) + tp.zki.Ay2[tp.i] = accBJJY + tp.zki.Balance2[tp.i] = tx.Amount + tp.zki.EthAddr2[tp.i] = common.EthAddrToBigInt(acc.EthAddr) } // update account, where account.Balance += exitAmount exitAccount.Balance = new(big.Int).Add(exitAccount.Balance, tx.Amount) - p, err = updateAccountInTreeDB(exitTree.DB(), exitTree, tx.FromIdx, exitAccount) + p, err = statedb.UpdateAccountInTreeDB(exitTree.DB(), exitTree, tx.FromIdx, exitAccount) if err != nil { return nil, false, tracerr.Wrap(err) } - if s.zki != nil { - s.zki.Siblings2[s.i] = siblingsToZKInputFormat(p.Siblings) + if tp.zki != nil { + tp.zki.Siblings2[tp.i] = siblingsToZKInputFormat(p.Siblings) if p.IsOld0 { - s.zki.IsOld0_2[s.i] = big.NewInt(1) + tp.zki.IsOld0_2[tp.i] = big.NewInt(1) } - s.zki.OldKey2[s.i] = p.OldKey.BigInt() - s.zki.OldValue2[s.i] = p.OldValue.BigInt() + tp.zki.OldKey2[tp.i] = p.OldKey.BigInt() + tp.zki.OldValue2[tp.i] = p.OldValue.BigInt() } return exitAccount, false, nil } // computeEffectiveAmounts checks that the L1Tx data is correct -func (s *StateDB) computeEffectiveAmounts(tx *common.L1Tx) { +func (tp *TxProcessor) computeEffectiveAmounts(tx *common.L1Tx) { tx.EffectiveAmount = tx.Amount tx.EffectiveDepositAmount = tx.DepositAmount @@ -1115,7 +1148,7 @@ func (s *StateDB) computeEffectiveAmounts(tx *common.L1Tx) { } // check if tx.TokenID==receiver.TokenID - accReceiver, err := s.GetAccount(tx.ToIdx) + accReceiver, err := tp.s.GetAccount(tx.ToIdx) if err != nil { log.Debugf("EffectiveAmount & EffectiveDepositAmount = 0: can not get account for tx.ToIdx: %d", tx.ToIdx) tx.EffectiveDepositAmount = big.NewInt(0) @@ -1130,7 +1163,7 @@ func (s *StateDB) computeEffectiveAmounts(tx *common.L1Tx) { return } - accSender, err := s.GetAccount(tx.FromIdx) + accSender, err := tp.s.GetAccount(tx.FromIdx) if err != nil { log.Debugf("EffectiveAmount & EffectiveDepositAmount = 0: can not get account for tx.FromIdx: %d", tx.FromIdx) tx.EffectiveDepositAmount = big.NewInt(0) @@ -1171,7 +1204,7 @@ func (s *StateDB) computeEffectiveAmounts(tx *common.L1Tx) { } // check that TokenID is the same for Sender & Receiver account - accReceiver, err := s.GetAccount(tx.ToIdx) + accReceiver, err := tp.s.GetAccount(tx.ToIdx) if err != nil { log.Debugf("EffectiveAmount & EffectiveDepositAmount = 0: can not get account for tx.ToIdx: %d", tx.ToIdx) tx.EffectiveDepositAmount = big.NewInt(0) @@ -1189,36 +1222,3 @@ func (s *StateDB) computeEffectiveAmounts(tx *common.L1Tx) { return } } - -// GetIdx returns the stored Idx from the localStateDB, which is the last Idx -// used for an Account in the localStateDB. -func (s *StateDB) GetIdx() (common.Idx, error) { - idxBytes, err := s.DB().Get(keyidx) - if tracerr.Unwrap(err) == db.ErrNotFound { - return 0, nil - } - if err != nil { - return 0, tracerr.Wrap(err) - } - return common.IdxFromBytes(idxBytes[:]) -} - -// setIdx stores Idx in the localStateDB -func (s *StateDB) setIdx(idx common.Idx) error { - tx, err := s.DB().NewTx() - if err != nil { - return tracerr.Wrap(err) - } - idxBytes, err := idx.Bytes() - if err != nil { - return tracerr.Wrap(err) - } - err = tx.Put(keyidx, idxBytes[:]) - if err != nil { - return tracerr.Wrap(err) - } - if err := tx.Commit(); err != nil { - return tracerr.Wrap(err) - } - return nil -} diff --git a/db/statedb/txprocessors_test.go b/txprocessor/txprocessor_test.go similarity index 84% rename from db/statedb/txprocessors_test.go rename to txprocessor/txprocessor_test.go index bb3b57a..0abd7d8 100644 --- a/db/statedb/txprocessors_test.go +++ b/txprocessor/txprocessor_test.go @@ -1,4 +1,4 @@ -package statedb +package txprocessor import ( "encoding/binary" @@ -10,13 +10,14 @@ import ( ethCommon "github.com/ethereum/go-ethereum/common" "github.com/hermeznetwork/hermez-node/common" + "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/log" "github.com/hermeznetwork/hermez-node/test/til" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) -func checkBalance(t *testing.T, tc *til.Context, sdb *StateDB, username string, tokenid int, expected string) { +func checkBalance(t *testing.T, tc *til.Context, sdb *statedb.StateDB, username string, tokenid int, expected string) { idx := tc.Users[username].Accounts[common.TokenID(tokenid)].Idx acc, err := sdb.GetAccount(idx) require.NoError(t, err) @@ -28,8 +29,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32) assert.NoError(t, err) set := ` @@ -43,17 +43,20 @@ func TestComputeEffectiveAmounts(t *testing.T) { > batchL1 > block ` + chainID := uint16(0) tc := til.NewContext(chainID, common.RollupConstMaxL1UserTx) blocks, err := tc.GenerateBlocks(set) require.NoError(t, err) - ptc := ProcessTxsConfig{ + config := Config{ NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 16, + ChainID: chainID, } - _, err = sdb.ProcessTxs(ptc, nil, blocks[0].Rollup.L1UserTxs, nil, nil) + tp := NewTxProcessor(sdb, config) + _, err = tp.ProcessTxs(nil, blocks[0].Rollup.L1UserTxs, nil, nil) require.NoError(t, err) tx := common.L1Tx{ @@ -64,7 +67,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { FromEthAddr: tc.Users["A"].Addr, UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(0), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(10), tx.EffectiveAmount) @@ -77,7 +80,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { FromEthAddr: tc.Users["A"].Addr, UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(0), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -90,7 +93,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { DepositAmount: big.NewInt(10), UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(10), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(10), tx.EffectiveAmount) @@ -103,7 +106,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { DepositAmount: big.NewInt(10), UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(10), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -116,7 +119,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { FromEthAddr: tc.Users["A"].Addr, UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(0), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -129,7 +132,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { FromEthAddr: tc.Users["B"].Addr, UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(0), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -143,7 +146,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { FromEthAddr: tc.Users["A"].Addr, UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(8), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -158,7 +161,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { FromEthAddr: tc.Users["B"].Addr, UserOrigin: true, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(8), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -175,7 +178,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { UserOrigin: true, Type: common.TxTypeCreateAccountDepositTransfer, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(8), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) @@ -192,7 +195,7 @@ func TestComputeEffectiveAmounts(t *testing.T) { UserOrigin: true, Type: common.TxTypeDepositTransfer, } - sdb.computeEffectiveAmounts(&tx) + tp.computeEffectiveAmounts(&tx) assert.Equal(t, big.NewInt(8), tx.EffectiveDepositAmount) assert.Equal(t, big.NewInt(0), tx.EffectiveAmount) } @@ -202,10 +205,10 @@ func TestProcessTxsBalances(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32) assert.NoError(t, err) + chainID := uint16(0) // generate test transactions from test.SetBlockchain0 code tc := til.NewContext(chainID, common.RollupConstMaxL1UserTx) blocks, err := tc.GenerateBlocks(til.SetBlockchainMinimumFlow0) @@ -213,34 +216,36 @@ func TestProcessTxsBalances(t *testing.T) { // Coordinator Idx where to send the fees coordIdxs := []common.Idx{256, 257} - ptc := ProcessTxsConfig{ + config := Config{ NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 16, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) log.Debug("block:0 batch:0, only L1CoordinatorTxs") - _, err = sdb.ProcessTxs(ptc, nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) + _, err = tp.ProcessTxs(nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) require.NoError(t, err) log.Debug("block:0 batch:1") l1UserTxs := []common.L1Tx{} l2Txs := common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[1].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) log.Debug("block:0 batch:2") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[2].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[2].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "A", 0, "500") log.Debug("block:0 batch:3") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[3].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[3].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[3].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[3].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "A", 0, "500") checkBalance(t, tc, sdb, "A", 1, "500") @@ -248,7 +253,7 @@ func TestProcessTxsBalances(t *testing.T) { log.Debug("block:0 batch:4") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[4].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[4].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[4].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[4].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "A", 0, "500") checkBalance(t, tc, sdb, "A", 1, "500") @@ -256,7 +261,7 @@ func TestProcessTxsBalances(t *testing.T) { log.Debug("block:0 batch:5") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[5].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[5].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[5].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[5].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "A", 0, "600") checkBalance(t, tc, sdb, "A", 1, "500") @@ -265,7 +270,7 @@ func TestProcessTxsBalances(t *testing.T) { log.Debug("block:0 batch:6") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[6].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[6].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[6].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[6].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "Coord", 0, "10") checkBalance(t, tc, sdb, "Coord", 1, "20") @@ -279,7 +284,7 @@ func TestProcessTxsBalances(t *testing.T) { log.Debug("block:0 batch:7") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[7].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[7].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[7].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[0].Rollup.Batches[7].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "Coord", 0, "35") checkBalance(t, tc, sdb, "Coord", 1, "30") @@ -294,7 +299,7 @@ func TestProcessTxsBalances(t *testing.T) { log.Debug("block:1 batch:0") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[1].Rollup.Batches[0].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[1].Rollup.Batches[0].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[1].Rollup.Batches[0].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[1].Rollup.Batches[0].L1CoordinatorTxs, l2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "Coord", 0, "75") checkBalance(t, tc, sdb, "Coord", 1, "30") @@ -309,14 +314,14 @@ func TestProcessTxsBalances(t *testing.T) { log.Debug("block:1 batch:1") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[1].Rollup.Batches[1].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[1].Rollup.Batches[1].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, blocks[1].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, l1UserTxs, blocks[1].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) // use Set of PoolL2 txs poolL2Txs, err := tc.GeneratePoolL2Txs(til.SetPoolL2MinimumFlow1) assert.NoError(t, err) - _, err = sdb.ProcessTxs(ptc, coordIdxs, []common.L1Tx{}, []common.L1Tx{}, poolL2Txs) + _, err = tp.ProcessTxs(coordIdxs, []common.L1Tx{}, []common.L1Tx{}, poolL2Txs) require.NoError(t, err) checkBalance(t, tc, sdb, "Coord", 0, "105") checkBalance(t, tc, sdb, "Coord", 1, "40") @@ -335,12 +340,12 @@ func TestProcessTxsSynchronizer(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeSynchronizer, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeSynchronizer, 32) assert.NoError(t, err) + chainID := uint16(0) // generate test transactions from test.SetBlockchain0 code - tc := til.NewContext(0, common.RollupConstMaxL1UserTx) + tc := til.NewContext(chainID, common.RollupConstMaxL1UserTx) blocks, err := tc.GenerateBlocks(til.SetBlockchain0) require.NoError(t, err) @@ -359,24 +364,26 @@ func TestProcessTxsSynchronizer(t *testing.T) { // Idx of user 'A' idxA1 := tc.Users["A"].Accounts[common.TokenID(1)].Idx - ptc := ProcessTxsConfig{ + config := Config{ NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 32, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) // Process the 1st batch, which contains the L1CoordinatorTxs necessary // to create the Coordinator accounts to receive the fees log.Debug("block:0 batch:0, only L1CoordinatorTxs") - ptOut, err := sdb.ProcessTxs(ptc, nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) + ptOut, err := tp.ProcessTxs(nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) require.NoError(t, err) assert.Equal(t, 4, len(ptOut.CreatedAccounts)) assert.Equal(t, 0, len(ptOut.CollectedFees)) log.Debug("block:0 batch:1") l2Txs := common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[1].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, blocks[0].Rollup.L1UserTxs, + ptOut, err = tp.ProcessTxs(coordIdxs, blocks[0].Rollup.L1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) assert.Equal(t, 0, len(ptOut.ExitInfos)) @@ -392,7 +399,7 @@ func TestProcessTxsSynchronizer(t *testing.T) { log.Debug("block:0 batch:2") l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[2].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, nil, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) + ptOut, err = tp.ProcessTxs(coordIdxs, nil, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) require.NoError(t, err) assert.Equal(t, 0, len(ptOut.ExitInfos)) assert.Equal(t, 0, len(ptOut.CreatedAccounts)) @@ -412,7 +419,7 @@ func TestProcessTxsSynchronizer(t *testing.T) { assert.Equal(t, common.Nonce(0), l2Txs[1].Nonce) assert.Equal(t, common.Nonce(0), l2Txs[2].Nonce) - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, nil, blocks[1].Rollup.Batches[0].L1CoordinatorTxs, l2Txs) + ptOut, err = tp.ProcessTxs(coordIdxs, nil, blocks[1].Rollup.Batches[0].L1CoordinatorTxs, l2Txs) require.NoError(t, err) // after processing expect l2Txs[0:2].Nonce!=0 and has expected value @@ -433,7 +440,7 @@ func TestProcessTxsSynchronizer(t *testing.T) { log.Debug("block:1 batch:1") l2Txs = common.L2TxsToPoolL2Txs(blocks[1].Rollup.Batches[1].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, blocks[1].Rollup.L1UserTxs, + ptOut, err = tp.ProcessTxs(coordIdxs, blocks[1].Rollup.L1UserTxs, blocks[1].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) @@ -464,12 +471,12 @@ func TestProcessTxsBatchBuilder(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, 32) assert.NoError(t, err) + chainID := uint16(0) // generate test transactions from test.SetBlockchain0 code - tc := til.NewContext(0, common.RollupConstMaxL1UserTx) + tc := til.NewContext(chainID, common.RollupConstMaxL1UserTx) blocks, err := tc.GenerateBlocks(til.SetBlockchain0) require.NoError(t, err) @@ -479,24 +486,26 @@ func TestProcessTxsBatchBuilder(t *testing.T) { // Idx of user 'A' idxA1 := tc.Users["A"].Accounts[common.TokenID(1)].Idx - ptc := ProcessTxsConfig{ + config := Config{ NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 32, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) // Process the 1st batch, which contains the L1CoordinatorTxs necessary // to create the Coordinator accounts to receive the fees log.Debug("block:0 batch:0, only L1CoordinatorTxs") - ptOut, err := sdb.ProcessTxs(ptc, nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) + ptOut, err := tp.ProcessTxs(nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) require.NoError(t, err) // expect 0 at CreatedAccount, as is only computed when StateDB.Type==TypeSynchronizer assert.Equal(t, 0, len(ptOut.CreatedAccounts)) log.Debug("block:0 batch:1") l2Txs := common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[1].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, blocks[0].Rollup.L1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) + ptOut, err = tp.ProcessTxs(coordIdxs, blocks[0].Rollup.L1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) assert.Equal(t, 0, len(ptOut.ExitInfos)) assert.Equal(t, 0, len(ptOut.CreatedAccounts)) @@ -506,7 +515,7 @@ func TestProcessTxsBatchBuilder(t *testing.T) { log.Debug("block:0 batch:2") l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[2].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, nil, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) + ptOut, err = tp.ProcessTxs(coordIdxs, nil, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) require.NoError(t, err) assert.Equal(t, 0, len(ptOut.ExitInfos)) assert.Equal(t, 0, len(ptOut.CreatedAccounts)) @@ -516,7 +525,7 @@ func TestProcessTxsBatchBuilder(t *testing.T) { log.Debug("block:1 batch:0") l2Txs = common.L2TxsToPoolL2Txs(blocks[1].Rollup.Batches[0].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, nil, blocks[1].Rollup.Batches[0].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, nil, blocks[1].Rollup.Batches[0].L1CoordinatorTxs, l2Txs) require.NoError(t, err) acc, err = sdb.GetAccount(idxA1) require.NoError(t, err) @@ -524,7 +533,7 @@ func TestProcessTxsBatchBuilder(t *testing.T) { log.Debug("block:1 batch:1") l2Txs = common.L2TxsToPoolL2Txs(blocks[1].Rollup.Batches[1].L2Txs) - _, err = sdb.ProcessTxs(ptc, coordIdxs, blocks[1].Rollup.L1UserTxs, blocks[1].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) + _, err = tp.ProcessTxs(coordIdxs, blocks[1].Rollup.L1UserTxs, blocks[1].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) acc, err = sdb.GetAccount(idxA1) assert.NoError(t, err) @@ -545,7 +554,7 @@ func TestProcessTxsBatchBuilder(t *testing.T) { assert.Equal(t, common.TokenID(1), acc.TokenID) assert.Equal(t, "2", acc.Balance.String()) - assert.Equal(t, "2720257526434001367979405991743527513807903085728407823609738212616896104498", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "2720257526434001367979405991743527513807903085728407823609738212616896104498", sdb.MT.Root().BigInt().String()) } func TestProcessTxsRootTestVectors(t *testing.T) { @@ -553,8 +562,7 @@ func TestProcessTxsRootTestVectors(t *testing.T) { require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, 32) assert.NoError(t, err) // same values than in the js test @@ -585,15 +593,18 @@ func TestProcessTxsRootTestVectors(t *testing.T) { }, } - ptc := ProcessTxsConfig{ + chainID := uint16(0) + config := Config{ NLevels: 32, MaxFeeTx: 8, MaxTx: 32, MaxL1Tx: 16, + ChainID: chainID, } - _, err = sdb.ProcessTxs(ptc, nil, l1Txs, nil, l2Txs) + tp := NewTxProcessor(sdb, config) + _, err = tp.ProcessTxs(nil, l1Txs, nil, l2Txs) require.NoError(t, err) - assert.Equal(t, "9827704113668630072730115158977131501210702363656902211840117643154933433410", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "9827704113668630072730115158977131501210702363656902211840117643154933433410", sdb.MT.Root().BigInt().String()) } func TestCreateAccountDepositMaxValue(t *testing.T) { @@ -602,8 +613,7 @@ func TestCreateAccountDepositMaxValue(t *testing.T) { defer assert.NoError(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.NoError(t, err) users := generateJsUsers(t) @@ -645,14 +655,17 @@ func TestCreateAccountDepositMaxValue(t *testing.T) { }, } - ptc := ProcessTxsConfig{ + chainID := uint16(0) + config := Config{ NLevels: uint32(nLevels), MaxTx: 3, MaxL1Tx: 2, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) - _, err = sdb.ProcessTxs(ptc, nil, l1Txs, nil, nil) + _, err = tp.ProcessTxs(nil, l1Txs, nil, nil) require.NoError(t, err) // check balances diff --git a/txprocessor/utils.go b/txprocessor/utils.go new file mode 100644 index 0000000..a839067 --- /dev/null +++ b/txprocessor/utils.go @@ -0,0 +1,50 @@ +package txprocessor + +import ( + "math/big" + + "github.com/hermeznetwork/hermez-node/common" + "github.com/iden3/go-iden3-crypto/babyjub" + "github.com/iden3/go-merkletree" +) + +func siblingsToZKInputFormat(s []*merkletree.Hash) []*big.Int { + b := make([]*big.Int, len(s)) + for i := 0; i < len(s); i++ { + b[i] = s[i].BigInt() + } + return b +} + +// BJJCompressedTo256BigInts returns a [256]*big.Int array with the bit +// representation of the babyjub.PublicKeyComp +func BJJCompressedTo256BigInts(pkComp babyjub.PublicKeyComp) [256]*big.Int { + var r [256]*big.Int + b := pkComp[:] + + for i := 0; i < 256; i++ { + if b[i/8]&(1<<(i%8)) == 0 { + r[i] = big.NewInt(0) + } else { + r[i] = big.NewInt(1) + } + } + + return r +} + +// formatAccumulatedFees returns an array of [nFeeAccounts]*big.Int containing +// the balance of each FeeAccount, taken from the 'collectedFees' map, in the +// order of the 'orderTokenIDs' +func formatAccumulatedFees(collectedFees map[common.TokenID]*big.Int, orderTokenIDs []*big.Int) []*big.Int { + accFeeOut := make([]*big.Int, len(orderTokenIDs)) + for i := 0; i < len(orderTokenIDs); i++ { + tokenID := common.TokenIDFromBigInt(orderTokenIDs[i]) + if _, ok := collectedFees[tokenID]; ok { + accFeeOut[i] = new(big.Int).Set(collectedFees[tokenID]) + } else { + accFeeOut[i] = big.NewInt(0) + } + } + return accFeeOut +} diff --git a/txprocessor/utils_test.go b/txprocessor/utils_test.go new file mode 100644 index 0000000..6dc8ab9 --- /dev/null +++ b/txprocessor/utils_test.go @@ -0,0 +1,39 @@ +package txprocessor + +import ( + "math/big" + "testing" + + "github.com/iden3/go-iden3-crypto/babyjub" + "github.com/stretchr/testify/assert" +) + +func TestBJJCompressedTo256BigInt(t *testing.T) { + var pkComp babyjub.PublicKeyComp + r := BJJCompressedTo256BigInts(pkComp) + zero := big.NewInt(0) + for i := 0; i < 256; i++ { + assert.Equal(t, zero, r[i]) + } + + pkComp[0] = 3 + r = BJJCompressedTo256BigInts(pkComp) + one := big.NewInt(1) + for i := 0; i < 256; i++ { + if i != 0 && i != 1 { + assert.Equal(t, zero, r[i]) + } else { + assert.Equal(t, one, r[i]) + } + } + + pkComp[31] = 4 + r = BJJCompressedTo256BigInts(pkComp) + for i := 0; i < 256; i++ { + if i != 0 && i != 1 && i != 250 { + assert.Equal(t, zero, r[i]) + } else { + assert.Equal(t, one, r[i]) + } + } +} diff --git a/db/statedb/zkinputsgen_test.go b/txprocessor/zkinputsgen_test.go similarity index 97% rename from db/statedb/zkinputsgen_test.go rename to txprocessor/zkinputsgen_test.go index e9d98f6..604e61d 100644 --- a/db/statedb/zkinputsgen_test.go +++ b/txprocessor/zkinputsgen_test.go @@ -1,4 +1,4 @@ -package statedb +package txprocessor import ( "encoding/hex" @@ -12,6 +12,7 @@ import ( ethCommon "github.com/ethereum/go-ethereum/common" "github.com/hermeznetwork/hermez-node/common" + "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/log" "github.com/hermeznetwork/hermez-node/test/til" "github.com/iden3/go-iden3-crypto/babyjub" @@ -78,8 +79,7 @@ func TestZKInputsHashTestVector0(t *testing.T) { require.NoError(t, err) defer assert.Nil(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, 32) assert.Nil(t, err) // same values than in the js test @@ -109,17 +109,21 @@ func TestZKInputsHashTestVector0(t *testing.T) { }, } - ptc := ProcessTxsConfig{ + chainID := uint16(0) + config := Config{ NLevels: 32, MaxFeeTx: 8, MaxTx: 32, MaxL1Tx: 16, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) - ptOut, err := sdb.ProcessTxs(ptc, nil, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(nil, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -153,16 +157,11 @@ func TestZKInputsHashTestVector1(t *testing.T) { require.NoError(t, err) defer assert.Nil(t, os.RemoveAll(dir)) - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, 32, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, 32) assert.Nil(t, err) // same values than in the js test users := generateJsUsers(t) - // bjj0, err := common.BJJFromStringWithChecksum("21b0a1688b37f77b1d1d5539ec3b826db5ac78b2513f574a04c50a7d4f8246d7") - // assert.Nil(t, err) - // bjj1, err := common.BJJFromStringWithChecksum("093985b1993d9f743f9d7d943ed56f38601cb8b196db025f79650c4007c3054d") - // assert.Nil(t, err) l1Txs := []common.L1Tx{ { FromIdx: 0, @@ -199,17 +198,21 @@ func TestZKInputsHashTestVector1(t *testing.T) { }, } - ptc := ProcessTxsConfig{ + chainID := uint16(0) + config := Config{ NLevels: 32, MaxFeeTx: 8, MaxTx: 32, MaxL1Tx: 16, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) - ptOut, err := sdb.ProcessTxs(ptc, nil, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(nil, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -253,18 +256,21 @@ func TestZKInputsEmpty(t *testing.T) { nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) - ptc := ProcessTxsConfig{ + chainID := uint16(0) + config := Config{ NLevels: uint32(nLevels), MaxTx: 3, MaxL1Tx: 2, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) // 0. Generate a batch from the empty state with no transactions @@ -274,10 +280,10 @@ func TestZKInputsEmpty(t *testing.T) { l1CoordTxs := []common.L1Tx{} l2Txs := []common.PoolL2Tx{} - ptOut, err := sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, l1CoordTxs, l2Txs) + ptOut, err := tp.ProcessTxs(coordIdxs, l1UserTxs, l1CoordTxs, l2Txs) require.Nil(t, err) - assert.Equal(t, "0", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "0", sdb.MT.Root().BigInt().String()) assert.Equal(t, "0", ptOut.ZKInputs.Metadata.NewExitRootRaw.BigInt().String()) // check that there are no accounts @@ -333,15 +339,15 @@ func TestZKInputsEmpty(t *testing.T) { }, } - toSign, err := l2Txs[0].HashToSign(sdb.chainID) + toSign, err := l2Txs[0].HashToSign(tp.config.ChainID) require.Nil(t, err) sig := users[0].BJJ.SignPoseidon(toSign) l2Txs[0].Signature = sig.Compress() - ptOut, err = sdb.ProcessTxs(ptc, nil, l1UserTxs, nil, l2Txs) + ptOut, err = tp.ProcessTxs(nil, l1UserTxs, nil, l2Txs) require.Nil(t, err) - rootNonZero := sdb.mt.Root() + rootNonZero := sdb.MT.Root() // check that there is 1 account accs, err = sdb.GetAccounts() @@ -363,10 +369,10 @@ func TestZKInputsEmpty(t *testing.T) { l1CoordTxs = []common.L1Tx{} l2Txs = []common.PoolL2Tx{} - ptOut, err = sdb.ProcessTxs(ptc, coordIdxs, l1UserTxs, l1CoordTxs, l2Txs) + ptOut, err = tp.ProcessTxs(coordIdxs, l1UserTxs, l1CoordTxs, l2Txs) require.Nil(t, err) - assert.Equal(t, rootNonZero, sdb.mt.Root()) + assert.Equal(t, rootNonZero, sdb.MT.Root()) assert.Equal(t, "0", ptOut.ZKInputs.Metadata.NewExitRootRaw.BigInt().String()) // check that there is still 1 account @@ -402,8 +408,7 @@ func TestZKInputs0(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // same values than in the js test @@ -434,22 +439,26 @@ func TestZKInputs0(t *testing.T) { }, } - toSign, err := l2Txs[0].HashToSign(sdb.chainID) + chainID := uint16(0) + toSign, err := l2Txs[0].HashToSign(chainID) require.NoError(t, err) sig := users[0].BJJ.SignPoseidon(toSign) l2Txs[0].Signature = sig.Compress() - ptc := ProcessTxsConfig{ + config := Config{ NLevels: uint32(nLevels), MaxTx: 3, MaxL1Tx: 2, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) - ptOut, err := sdb.ProcessTxs(ptc, nil, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(nil, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -490,8 +499,7 @@ func TestZKInputs1(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // same values than in the js test @@ -533,23 +541,27 @@ func TestZKInputs1(t *testing.T) { }, } - toSign, err := l2Txs[0].HashToSign(sdb.chainID) + chainID := uint16(0) + toSign, err := l2Txs[0].HashToSign(chainID) require.NoError(t, err) sig := users[0].BJJ.SignPoseidon(toSign) l2Txs[0].Signature = sig.Compress() - ptc := ProcessTxsConfig{ + config := Config{ NLevels: uint32(nLevels), MaxTx: 3, MaxL1Tx: 2, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) coordIdxs := []common.Idx{257} - ptOut, err := sdb.ProcessTxs(ptc, coordIdxs, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(coordIdxs, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -597,8 +609,7 @@ func TestZKInputs2(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // same values than in the js test @@ -671,21 +682,25 @@ func TestZKInputs2(t *testing.T) { }, } - l2Txs[0] = signL2Tx(t, sdb.chainID, users[0], l2Txs[0]) - l2Txs[1] = signL2Tx(t, sdb.chainID, users[0], l2Txs[1]) + chainID := uint16(0) + l2Txs[0] = signL2Tx(t, chainID, users[0], l2Txs[0]) + l2Txs[1] = signL2Tx(t, chainID, users[0], l2Txs[1]) - ptc := ProcessTxsConfig{ + config := Config{ NLevels: uint32(nLevels), MaxTx: 10, MaxL1Tx: 4, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) coordIdxs := []common.Idx{257} - ptOut, err := sdb.ProcessTxs(ptc, coordIdxs, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(coordIdxs, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -741,8 +756,7 @@ func TestZKInputs3(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // same values than in the js test @@ -815,21 +829,25 @@ func TestZKInputs3(t *testing.T) { }, } - l2Txs[0] = signL2Tx(t, sdb.chainID, users[0], l2Txs[0]) - l2Txs[1] = signL2Tx(t, sdb.chainID, users[0], l2Txs[1]) + chainID := uint16(0) + l2Txs[0] = signL2Tx(t, chainID, users[0], l2Txs[0]) + l2Txs[1] = signL2Tx(t, chainID, users[0], l2Txs[1]) - ptc := ProcessTxsConfig{ + config := Config{ NLevels: uint32(nLevels), MaxTx: 10, MaxL1Tx: 4, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) coordIdxs := []common.Idx{257} - ptOut, err := sdb.ProcessTxs(ptc, coordIdxs, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(coordIdxs, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -885,8 +903,7 @@ func TestZKInputs4(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // same values than in the js test @@ -969,21 +986,25 @@ func TestZKInputs4(t *testing.T) { }, } - l2Txs[0] = signL2Tx(t, sdb.chainID, users[0], l2Txs[0]) - l2Txs[1] = signL2Tx(t, sdb.chainID, users[0], l2Txs[1]) + chainID := uint16(0) + l2Txs[0] = signL2Tx(t, chainID, users[0], l2Txs[0]) + l2Txs[1] = signL2Tx(t, chainID, users[0], l2Txs[1]) - ptc := ProcessTxsConfig{ + config := Config{ NLevels: uint32(nLevels), MaxTx: 10, MaxL1Tx: 5, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) coordIdxs := []common.Idx{257} - ptOut, err := sdb.ProcessTxs(ptc, coordIdxs, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(coordIdxs, l1Txs, nil, l2Txs) require.NoError(t, err) // check expected account keys values from tx inputs @@ -1039,8 +1060,7 @@ func TestZKInputs5(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // same values than in the js test @@ -1101,24 +1121,29 @@ func TestZKInputs5(t *testing.T) { Type: common.TxTypeExit, }, } - l2Txs[0] = signL2Tx(t, sdb.chainID, users[0], l2Txs[0]) - l2Txs[1] = signL2Tx(t, sdb.chainID, users[0], l2Txs[1]) - ptc := ProcessTxsConfig{ + chainID := uint16(0) + l2Txs[0] = signL2Tx(t, chainID, users[0], l2Txs[0]) + l2Txs[1] = signL2Tx(t, chainID, users[0], l2Txs[1]) + + config := Config{ NLevels: uint32(nLevels), MaxTx: 10, MaxL1Tx: 5, MaxFeeTx: 2, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) + // skip first batch to do the test with BatchNum=1 - _, err = sdb.ProcessTxs(ptc, nil, nil, nil, nil) + _, err = tp.ProcessTxs(nil, nil, nil, nil) require.NoError(t, err) coordIdxs := []common.Idx{257} - ptOut, err := sdb.ProcessTxs(ptc, coordIdxs, l1Txs, nil, l2Txs) + ptOut, err := tp.ProcessTxs(coordIdxs, l1Txs, nil, l2Txs) require.NoError(t, err) - assert.Equal(t, "9004936174112171168716185012590576631374182232656264130522697453639057968430", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "9004936174112171168716185012590576631374182232656264130522697453639057968430", sdb.MT.Root().BigInt().String()) assert.Equal(t, "13150113024143718339322897969767386088676980172693068463217180231955278216962", ptOut.ZKInputs.Metadata.NewExitRootRaw.BigInt().String()) // check expected account keys values from tx inputs @@ -1163,29 +1188,31 @@ func TestZKInputs6(t *testing.T) { defer assert.Nil(t, os.RemoveAll(dir)) nLevels := 16 - chainID := uint16(0) - sdb, err := NewStateDB(dir, 128, TypeBatchBuilder, nLevels, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeBatchBuilder, nLevels) assert.Nil(t, err) // Coordinator Idx where to send the fees // coordIdxs := []common.Idx{256, 257} - ptc := ProcessTxsConfig{ + chainID := uint16(0) + config := Config{ NLevels: uint32(nLevels), MaxTx: 10, MaxL1Tx: 4, MaxFeeTx: 4, + ChainID: chainID, } + tp := NewTxProcessor(sdb, config) tc := til.NewContext(0, common.RollupConstMaxL1UserTx) blocks, err := tc.GenerateBlocks(til.SetBlockchainMinimumFlow0) require.NoError(t, err) log.Debug("block:0 batch:0, only L1CoordinatorTxs") - ptOut, err := sdb.ProcessTxs(ptc, nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) + ptOut, err := tp.ProcessTxs(nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) require.NoError(t, err) - assert.Equal(t, "9039235803989265562752459273677612535578150724983094202749787856042851287937", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "9039235803989265562752459273677612535578150724983094202749787856042851287937", sdb.MT.Root().BigInt().String()) assert.Equal(t, "0", ptOut.ZKInputs.Metadata.NewExitRootRaw.BigInt().String()) h, err := ptOut.ZKInputs.HashGlobalData() require.NoError(t, err) @@ -1196,10 +1223,10 @@ func TestZKInputs6(t *testing.T) { log.Debug("block:0 batch:1") l1UserTxs := []common.L1Tx{} l2Txs := common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[1].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, nil, l1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) + ptOut, err = tp.ProcessTxs(nil, l1UserTxs, blocks[0].Rollup.Batches[1].L1CoordinatorTxs, l2Txs) require.NoError(t, err) - assert.Equal(t, "11268490488303545450371226436237399651863451560820293060171443690124510027423", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "11268490488303545450371226436237399651863451560820293060171443690124510027423", sdb.MT.Root().BigInt().String()) assert.Equal(t, "0", ptOut.ZKInputs.Metadata.NewExitRootRaw.BigInt().String()) h, err = ptOut.ZKInputs.HashGlobalData() require.NoError(t, err) @@ -1210,9 +1237,9 @@ func TestZKInputs6(t *testing.T) { // log.Debug("block:0 batch:2") l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[0].Rollup.Batches[2].Batch.ForgeL1TxsNum]) l2Txs = common.L2TxsToPoolL2Txs(blocks[0].Rollup.Batches[2].L2Txs) - ptOut, err = sdb.ProcessTxs(ptc, nil, l1UserTxs, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) + ptOut, err = tp.ProcessTxs(nil, l1UserTxs, blocks[0].Rollup.Batches[2].L1CoordinatorTxs, l2Txs) require.NoError(t, err) - assert.Equal(t, "4506051426679555819811005692198685182747763336038770877076710632305611650930", sdb.mt.Root().BigInt().String()) + assert.Equal(t, "4506051426679555819811005692198685182747763336038770877076710632305611650930", sdb.MT.Root().BigInt().String()) h, err = ptOut.ZKInputs.HashGlobalData() require.NoError(t, err) assert.Equal(t, "4701632846207201125105176884973241543664109364248244712634276477520091620527", h.String()) diff --git a/txselector/txselector.go b/txselector/txselector.go index 910c020..4f203b7 100644 --- a/txselector/txselector.go +++ b/txselector/txselector.go @@ -13,6 +13,7 @@ import ( "github.com/hermeznetwork/hermez-node/db/l2db" "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/log" + "github.com/hermeznetwork/hermez-node/txprocessor" "github.com/hermeznetwork/tracerr" "github.com/iden3/go-iden3-crypto/babyjub" "github.com/iden3/go-merkletree/db" @@ -55,8 +56,8 @@ type SelectionConfig struct { // MaxL1CoordinatorTxs is the maximum L1-coordinator-tx for a batch MaxL1CoordinatorTxs uint64 - // ProcessTxsConfig contains the config for ProcessTxs - ProcessTxsConfig statedb.ProcessTxsConfig + // TxProcessorConfig contains the config for ProcessTxs + TxProcessorConfig txprocessor.Config } // TxSelector implements all the functionalities to select the txs for the next @@ -66,7 +67,7 @@ type TxSelector struct { localAccountsDB *statedb.LocalStateDB coordAccount *CoordAccount - coordIdxsDB *pebble.PebbleStorage + coordIdxsDB *pebble.Storage } // NewTxSelector returns a *TxSelector @@ -232,6 +233,9 @@ func (txsel *TxSelector) GetL1L2TxSelection(selectionConfig *SelectionConfig, return nil, nil, nil, nil, nil, tracerr.Wrap(err) } + txselStateDB := txsel.localAccountsDB.StateDB + tp := txprocessor.NewTxProcessor(txselStateDB, selectionConfig.TxProcessorConfig) + var validTxs txs var l1CoordinatorTxs []common.L1Tx positionL1 := len(l1Txs) @@ -239,7 +243,7 @@ func (txsel *TxSelector) GetL1L2TxSelection(selectionConfig *SelectionConfig, // Process L1UserTxs for i := 0; i < len(l1Txs); i++ { // assumption: l1usertx are sorted by L1Tx.Position - _, _, _, _, err := txsel.localAccountsDB.ProcessL1Tx(nil, &l1Txs[i]) + _, _, _, _, err := tp.ProcessL1Tx(nil, &l1Txs[i]) if err != nil { return nil, nil, nil, nil, nil, tracerr.Wrap(err) } @@ -302,14 +306,14 @@ func (txsel *TxSelector) GetL1L2TxSelection(selectionConfig *SelectionConfig, // Process L1CoordinatorTxs for i := 0; i < len(l1CoordinatorTxs); i++ { - _, _, _, _, err := txsel.localAccountsDB.ProcessL1Tx(nil, &l1CoordinatorTxs[i]) + _, _, _, _, err := tp.ProcessL1Tx(nil, &l1CoordinatorTxs[i]) if err != nil { return nil, nil, nil, nil, nil, tracerr.Wrap(err) } } - txsel.localAccountsDB.AccumulatedFees = make(map[common.Idx]*big.Int) + tp.AccumulatedFees = make(map[common.Idx]*big.Int) for _, idx := range coordIdxs { - txsel.localAccountsDB.AccumulatedFees[idx] = big.NewInt(0) + tp.AccumulatedFees[idx] = big.NewInt(0) } // once L1UserTxs & L1CoordinatorTxs are processed, get TokenIDs of @@ -321,12 +325,12 @@ func (txsel *TxSelector) GetL1L2TxSelection(selectionConfig *SelectionConfig, } // get most profitable L2-tx - maxL2Txs := selectionConfig.ProcessTxsConfig.MaxTx - uint32(len(l1CoordinatorTxs)) // - len(l1UserTxs) // TODO if there are L1UserTxs take them in to account + maxL2Txs := selectionConfig.TxProcessorConfig.MaxTx - uint32(len(l1CoordinatorTxs)) // - len(l1UserTxs) // TODO if there are L1UserTxs take them in to account l2Txs := txsel.getL2Profitable(validTxs, maxL2Txs) // Process L2Txs for i := 0; i < len(l2Txs); i++ { - _, _, _, err = txsel.localAccountsDB.ProcessL2Tx(coordIdxsMap, nil, nil, &l2Txs[i]) + _, _, _, err = tp.ProcessL2Tx(coordIdxsMap, nil, nil, &l2Txs[i]) if err != nil { return nil, nil, nil, nil, nil, tracerr.Wrap(err) } diff --git a/txselector/txselector_test.go b/txselector/txselector_test.go index d7d15b6..d12b3c5 100644 --- a/txselector/txselector_test.go +++ b/txselector/txselector_test.go @@ -15,6 +15,7 @@ import ( "github.com/hermeznetwork/hermez-node/db/statedb" "github.com/hermeznetwork/hermez-node/test" "github.com/hermeznetwork/hermez-node/test/til" + "github.com/hermeznetwork/hermez-node/txprocessor" "github.com/jmoiron/sqlx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -29,7 +30,7 @@ func initTest(t *testing.T, chainID uint16, testSet string) *TxSelector { dir, err := ioutil.TempDir("", "tmpdb") require.NoError(t, err) defer assert.NoError(t, os.RemoveAll(dir)) - sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeTxSelector, 0, chainID) + sdb, err := statedb.NewStateDB(dir, 128, statedb.TypeTxSelector, 0) require.NoError(t, err) txselDir, err := ioutil.TempDir("", "tmpTxSelDB") @@ -115,21 +116,24 @@ func TestGetL2TxSelection(t *testing.T) { } addTokens(t, tokens, txsel.l2db.DB()) - ptc := statedb.ProcessTxsConfig{ + tpc := txprocessor.Config{ NLevels: 32, MaxFeeTx: 64, MaxTx: 512, MaxL1Tx: 64, + ChainID: chainID, } selectionConfig := &SelectionConfig{ MaxL1UserTxs: 32, MaxL1CoordinatorTxs: 32, - ProcessTxsConfig: ptc, + TxProcessorConfig: tpc, } + txselStateDB := txsel.localAccountsDB.StateDB + tp := txprocessor.NewTxProcessor(txselStateDB, selectionConfig.TxProcessorConfig) // Process the 1st batch, which contains the L1CoordinatorTxs necessary // to create the Coordinator accounts to receive the fees - _, err = txsel.localAccountsDB.ProcessTxs(ptc, nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) + _, err = tp.ProcessTxs(nil, nil, blocks[0].Rollup.Batches[0].L1CoordinatorTxs, nil) require.NoError(t, err) // add the 1st batch of transactions to the TxSelector