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

Merge pull request #613 from hermeznetwork/fix/zkinputs-ISExitRoot-L1CoordTxs

Browse Source 
Fix ZKInputs.ISExitRoot for case of L1CoordTxs
This commit is contained in:
Eduard S
2021-03-04 16:44:43 +01:00
committed by GitHub
parent 6bf8584a82 7bc83d7f70
commit 9e96bc89f0
2 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
txprocessor/txprocessor.go
View File

@@ -340,6 +340,7 @@ func (tp *TxProcessor) ProcessTxs(coordIdxs []common.Idx, l1usertxs, l1coordinat
tp.zki.ISOutIdx[tp.i] = tp.s.CurrentIdx().BigInt()
tp.zki.ISStateRoot[tp.i] = tp.s.MT.Root().BigInt()
tp.zki.ISExitRoot[tp.i] = exitTree.Root().BigInt()
tp.i++
}
}
@@ -1333,7 +1334,7 @@ func (tp *TxProcessor) applyExit(coordIdxsMap map[common.TokenID]common.Idx,
}
return exitAccount, true, nil
} else if err != nil {
return exitAccount, false, tracerr.Wrap(err)
return nil, false, tracerr.Wrap(err)
}
// 1b. if idx already exist in exitTree:

92
txprocessor/zkinputsgen_test.go
View File

File diff suppressed because one or more lines are too long