mirror of
https://github.com/arnaucube/hermez-node.git
synced 2026-02-07 11:26:44 +01:00
Fix exit table, set delayed_withdrawn in exits
- In exit table, `instant_withdrawn`, `delayed_withdraw_request`, and
`delayed_withdrawn` were referencing batch_num. But these actions happen
outside a batch, so they should reference a block_num.
- Process delayed withdrawns:
- In Synchronizer, first match a Rollup delayed withdrawn request, with the
WDelayer deposit (via TxHash), and store the owner and token associated
with the delayed withdrawn.
- In HistoryDB: store the owner and token of a delayed withdrawal request
in the exit_tree, and set delayed_withdrawn when the withdraw is done in
the WDelayer.
- Update dependency of sqlx to master
- Last release of sqlx is from 2018 October, and it doesn't support
`NamedQuery` with a slice of structs, which is used in this commit.
This commit is contained in:
@@ -51,7 +51,7 @@ type Context struct {
|
||||
Instructions []instruction
|
||||
userNames []string
|
||||
Users map[string]*User // Name -> *User
|
||||
usersByIdx map[int]*User
|
||||
UsersByIdx map[int]*User
|
||||
accountsByIdx map[int]*Account
|
||||
LastRegisteredTokenID common.TokenID
|
||||
l1CreatedAccounts map[string]*Account // (Name, TokenID) -> *Account
|
||||
@@ -81,7 +81,7 @@ func NewContext(rollupConstMaxL1UserTx int) *Context {
|
||||
return &Context{
|
||||
Users: make(map[string]*User),
|
||||
l1CreatedAccounts: make(map[string]*Account),
|
||||
usersByIdx: make(map[int]*User),
|
||||
UsersByIdx: make(map[int]*User),
|
||||
accountsByIdx: make(map[int]*Account),
|
||||
LastRegisteredTokenID: 0,
|
||||
|
||||
@@ -393,7 +393,7 @@ func (tc *Context) calculateIdxForL1Txs(isCoordinatorTxs bool, txs []L1Tx) error
|
||||
}
|
||||
tc.l1CreatedAccounts[idxTokenIDToString(tx.fromIdxName, tx.L1Tx.TokenID)] = tc.Users[tx.fromIdxName].Accounts[tx.L1Tx.TokenID]
|
||||
tc.accountsByIdx[tc.idx] = tc.Users[tx.fromIdxName].Accounts[tx.L1Tx.TokenID]
|
||||
tc.usersByIdx[tc.idx] = tc.Users[tx.fromIdxName]
|
||||
tc.UsersByIdx[tc.idx] = tc.Users[tx.fromIdxName]
|
||||
tc.idx++
|
||||
}
|
||||
if isCoordinatorTxs {
|
||||
@@ -745,7 +745,7 @@ func (tc *Context) FillBlocksExtra(blocks []common.BlockData, cfg *ConfigExtra)
|
||||
tx := &l1Txs[k]
|
||||
if tx.Type == common.TxTypeCreateAccountDeposit ||
|
||||
tx.Type == common.TxTypeCreateAccountDepositTransfer {
|
||||
user, ok := tc.usersByIdx[tc.extra.idx]
|
||||
user, ok := tc.UsersByIdx[tc.extra.idx]
|
||||
if !ok {
|
||||
return fmt.Errorf("Created account with idx: %v not found", tc.extra.idx)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user