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 #530 from hermeznetwork/feature/exitfee0

Browse Source 
Update ZKInputs to incl Accumulated Fees of val 0
This commit is contained in:
Eduard S
2021-02-05 10:52:12 +01:00
committed by GitHub
parent d62800b69a e55ce04bbd
commit 56d05ce57a
2 changed files with 113 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
txprocessor/txprocessor.go
View File

@@ -360,35 +360,34 @@ func (tp *TxProcessor) ProcessTxs(coordIdxs []common.Idx, l1usertxs, l1coordinat
for _, idx := range coordIdxs {
accumulatedFee := tp.AccumulatedFees[idx]
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 := 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 tp.zki != nil {
tp.zki.TokenID3[iFee] = accCoord.TokenID.BigInt()
tp.zki.Nonce3[iFee] = accCoord.Nonce.BigInt()
coordBJJSign, coordBJJY := babyjub.UnpackSignY(accCoord.BJJ)
if coordBJJSign {
tp.zki.Sign3[iFee] = big.NewInt(1)
}
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 := tp.s.UpdateAccount(idx, accCoord)
if err != nil {
log.Error(err)
return nil, tracerr.Wrap(err)
}
if tp.zki != nil {
tp.zki.Siblings3[iFee] = siblingsToZKInputFormat(pFee.Siblings)
tp.zki.ISStateRootFee[iFee] = tp.s.MT.Root().BigInt()
// send the fee to the Idx of the Coordinator for the TokenID
// (even if the AccumulatedFee==0, as is how the zk circuit
// works)
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 tp.zki != nil {
tp.zki.TokenID3[iFee] = accCoord.TokenID.BigInt()
tp.zki.Nonce3[iFee] = accCoord.Nonce.BigInt()
coordBJJSign, coordBJJY := babyjub.UnpackSignY(accCoord.BJJ)
if coordBJJSign {
tp.zki.Sign3[iFee] = big.NewInt(1)
}
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 := tp.s.UpdateAccount(idx, accCoord)
if err != nil {
log.Error(err)
return nil, tracerr.Wrap(err)
}
if tp.zki != nil {
tp.zki.Siblings3[iFee] = siblingsToZKInputFormat(pFee.Siblings)
tp.zki.ISStateRootFee[iFee] = tp.s.MT.Root().BigInt()
}
iFee++
}