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

Update TxProcessor L2Tx logic for case ToIdx==0

Browse Source
This commit is contained in:
arnaucube
2020-09-30 19:31:45 +02:00
parent 938ef84b9b
commit 11c45cfc2f
3 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
db/statedb/utils.go
View File

@@ -1,6 +1,7 @@
package statedb
import (
"bytes"
"math/big"
ethCommon "github.com/ethereum/go-ethereum/common"
@@ -72,11 +73,11 @@ func (s *StateDB) setIdxByEthAddrBJJ(idx common.Idx, addr ethCommon.Address, pk
func (s *StateDB) GetIdxByEthAddr(addr ethCommon.Address) (common.Idx, error) {
b, err := s.db.Get(addr.Bytes())
if err != nil {
return common.Idx(0), err
return common.Idx(0), ErrToIdxNotFound
}
idx, err := common.IdxFromBytes(b)
if err != nil {
return common.Idx(0), err
return common.Idx(0), ErrToIdxNotFound
}
return idx, nil
}
@@ -87,20 +88,24 @@ func (s *StateDB) GetIdxByEthAddr(addr ethCommon.Address) (common.Idx, error) {
// query. Will return common.Idx(0) and error in case that Idx is not found in
// the StateDB.
func (s *StateDB) GetIdxByEthAddrBJJ(addr ethCommon.Address, pk *babyjub.PublicKey) (common.Idx, error) {
if pk == nil {
if !bytes.Equal(addr.Bytes(), common.EmptyAddr.Bytes()) && pk == nil {
// case ToEthAddr!=0 && ToBJJ=0
return s.GetIdxByEthAddr(addr)
} else if !bytes.Equal(addr.Bytes(), common.EmptyAddr.Bytes()) && pk != nil {
// case ToEthAddr!=0 && ToBJJ!=0
k := concatEthAddrBJJ(addr, pk)
b, err := s.db.Get(k)
if err != nil {
return common.Idx(0), ErrToIdxNotFound
}
idx, err := common.IdxFromBytes(b)
if err != nil {
return common.Idx(0), ErrToIdxNotFound
}
return idx, nil
}
k := concatEthAddrBJJ(addr, pk)
b, err := s.db.Get(k)
if err != nil {
return common.Idx(0), err
}
idx, err := common.IdxFromBytes(b)
if err != nil {
return common.Idx(0), err
}
return idx, nil
// rest of cases (included case ToEthAddr==0) are not possible
return common.Idx(0), ErrToIdxNotFound
}
func siblingsToZKInputFormat(s []*merkletree.Hash) []*big.Int {