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

Update Account.PublicKey to Account.BJJ

Browse Source 
Update account.PublicKey to account.BJJ for naming consistency with the rest of the code
This commit is contained in:
arnaucube
2021-01-05 15:34:50 +01:00
parent 962b9e4712
commit bf5ab12d0e
16 changed files with 168 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
txprocessor/txprocessor.go
View File

@@ -329,7 +329,7 @@ func (tp *TxProcessor) ProcessTxs(coordIdxs []common.Idx, l1usertxs, l1coordinat
if tp.zki != nil {
tp.zki.TokenID3[iFee] = accCoord.TokenID.BigInt()
tp.zki.Nonce3[iFee] = accCoord.Nonce.BigInt()
coordBJJSign, coordBJJY := babyjub.UnpackSignY(accCoord.PublicKey)
coordBJJSign, coordBJJY := babyjub.UnpackSignY(accCoord.BJJ)
if coordBJJSign {
tp.zki.Sign3[iFee] = big.NewInt(1)
}
@@ -402,7 +402,7 @@ func (tp *TxProcessor) ProcessTxs(coordIdxs []common.Idx, l1usertxs, l1coordinat
}
// compute last ZKInputs parameters
tp.zki.GlobalChainID = big.NewInt(0) // TODO, 0: ethereum, this will be get from config file
tp.zki.GlobalChainID = big.NewInt(int64(tp.config.ChainID))
tp.zki.Metadata.NewStateRootRaw = tp.s.MT.Root()
tp.zki.Metadata.NewExitRootRaw = exitTree.Root()
@@ -666,11 +666,11 @@ func (tp *TxProcessor) ProcessL2Tx(coordIdxsMap map[common.TokenID]common.Idx,
// stores the deposit value
func (tp *TxProcessor) applyCreateAccount(tx *common.L1Tx) error {
account := &common.Account{
TokenID: tx.TokenID,
Nonce: 0,
Balance: tx.EffectiveDepositAmount,
PublicKey: tx.FromBJJ,
EthAddr: tx.FromEthAddr,
TokenID: tx.TokenID,
Nonce: 0,
Balance: tx.EffectiveDepositAmount,
BJJ: tx.FromBJJ,
EthAddr: tx.FromEthAddr,
}
p, err := tp.s.CreateAccount(common.Idx(tp.s.CurrentIdx()+1), account)
@@ -720,7 +720,7 @@ func (tp *TxProcessor) applyDeposit(tx *common.L1Tx, transfer bool) error {
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)
senderBJJSign, senderBJJY := babyjub.UnpackSignY(accSender.BJJ)
if senderBJJSign {
tp.zki.Sign1[tp.i] = big.NewInt(1)
}
@@ -759,7 +759,7 @@ func (tp *TxProcessor) applyDeposit(tx *common.L1Tx, transfer bool) error {
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)
receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.BJJ)
if receiverBJJSign {
tp.zki.Sign2[tp.i] = big.NewInt(1)
}
@@ -807,7 +807,7 @@ func (tp *TxProcessor) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx,
// Set the State1 before updating the Sender leaf
tp.zki.TokenID1[tp.i] = accSender.TokenID.BigInt()
tp.zki.Nonce1[tp.i] = accSender.Nonce.BigInt()
senderBJJSign, senderBJJY := babyjub.UnpackSignY(accSender.PublicKey)
senderBJJSign, senderBJJY := babyjub.UnpackSignY(accSender.BJJ)
if senderBJJSign {
tp.zki.Sign1[tp.i] = big.NewInt(1)
}
@@ -875,7 +875,7 @@ func (tp *TxProcessor) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx,
// Set the State2 before updating the Receiver leaf
tp.zki.TokenID2[tp.i] = accReceiver.TokenID.BigInt()
tp.zki.Nonce2[tp.i] = accReceiver.Nonce.BigInt()
receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.PublicKey)
receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.BJJ)
if receiverBJJSign {
tp.zki.Sign2[tp.i] = big.NewInt(1)
}
@@ -904,11 +904,11 @@ func (tp *TxProcessor) applyTransfer(coordIdxsMap map[common.TokenID]common.Idx,
func (tp *TxProcessor) applyCreateAccountDepositTransfer(tx *common.L1Tx) error {
auxFromIdx := common.Idx(tp.s.CurrentIdx() + 1)
accSender := &common.Account{
TokenID: tx.TokenID,
Nonce: 0,
Balance: tx.EffectiveDepositAmount,
PublicKey: tx.FromBJJ,
EthAddr: tx.FromEthAddr,
TokenID: tx.TokenID,
Nonce: 0,
Balance: tx.EffectiveDepositAmount,
BJJ: tx.FromBJJ,
EthAddr: tx.FromEthAddr,
}
if tp.zki != nil {
@@ -963,7 +963,7 @@ func (tp *TxProcessor) applyCreateAccountDepositTransfer(tx *common.L1Tx) error
// Set the State2 before updating the Receiver leaf
tp.zki.TokenID2[tp.i] = accReceiver.TokenID.BigInt()
tp.zki.Nonce2[tp.i] = accReceiver.Nonce.BigInt()
receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.PublicKey)
receiverBJJSign, receiverBJJY := babyjub.UnpackSignY(accReceiver.BJJ)
if receiverBJJSign {
tp.zki.Sign2[tp.i] = big.NewInt(1)
}
@@ -1001,7 +1001,7 @@ func (tp *TxProcessor) applyExit(coordIdxsMap map[common.TokenID]common.Idx,
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)
accBJJSign, accBJJY := babyjub.UnpackSignY(acc.BJJ)
if accBJJSign {
tp.zki.Sign1[tp.i] = big.NewInt(1)
}
@@ -1063,17 +1063,17 @@ func (tp *TxProcessor) applyExit(coordIdxsMap map[common.TokenID]common.Idx,
// add new leaf 'ExitTreeLeaf', where ExitTreeLeaf.Balance =
// exitAmount (exitAmount=tx.Amount)
exitAccount := &common.Account{
TokenID: acc.TokenID,
Nonce: common.Nonce(0),
Balance: tx.Amount,
PublicKey: acc.PublicKey,
EthAddr: acc.EthAddr,
TokenID: acc.TokenID,
Nonce: common.Nonce(0),
Balance: tx.Amount,
BJJ: acc.BJJ,
EthAddr: acc.EthAddr,
}
if tp.zki != nil {
// Set the State2 before creating the Exit leaf
tp.zki.TokenID2[tp.i] = acc.TokenID.BigInt()
tp.zki.Nonce2[tp.i] = big.NewInt(0)
accBJJSign, accBJJY := babyjub.UnpackSignY(acc.PublicKey)
accBJJSign, accBJJY := babyjub.UnpackSignY(acc.BJJ)
if accBJJSign {
tp.zki.Sign2[tp.i] = big.NewInt(1)
}
@@ -1104,7 +1104,7 @@ func (tp *TxProcessor) applyExit(coordIdxsMap map[common.TokenID]common.Idx,
// Set the State2 before updating the Exit leaf
tp.zki.TokenID2[tp.i] = acc.TokenID.BigInt()
tp.zki.Nonce2[tp.i] = big.NewInt(0)
accBJJSign, accBJJY := babyjub.UnpackSignY(acc.PublicKey)
accBJJSign, accBJJY := babyjub.UnpackSignY(acc.BJJ)
if accBJJSign {
tp.zki.Sign2[tp.i] = big.NewInt(1)
}

40
txprocessor/zkinputsgen_test.go
View File

@@ -129,7 +129,7 @@ func TestZKInputsHashTestVector0(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
// check that there no exist more accounts
@@ -218,11 +218,11 @@ func TestZKInputsHashTestVector1(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
acc, err = sdb.GetAccount(common.Idx(257))
require.NoError(t, err)
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[1].Addr.Hex(), acc.EthAddr.Hex())
// check that there no exist more accounts
@@ -464,7 +464,7 @@ func TestZKInputs0(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
// check that there no exist more accounts
@@ -567,12 +567,12 @@ func TestZKInputs1(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "15999899", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(257))
require.NoError(t, err)
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[1].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16000101", acc.Balance.String())
@@ -706,22 +706,22 @@ func TestZKInputs2(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "15997798", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(257))
require.NoError(t, err)
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[1].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16000202", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(258))
require.NoError(t, err)
assert.Equal(t, users[2].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[2].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[2].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16001000", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(259))
require.NoError(t, err)
assert.Equal(t, users[3].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[3].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[3].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16001000", acc.Balance.String())
@@ -853,22 +853,22 @@ func TestZKInputs3(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "15997798", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(257))
require.NoError(t, err)
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[1].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16000202", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(258))
require.NoError(t, err)
assert.Equal(t, users[2].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[2].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[2].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16002000", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(259))
require.NoError(t, err)
assert.Equal(t, users[3].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[3].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[3].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16000000", acc.Balance.String())
@@ -1010,22 +1010,22 @@ func TestZKInputs4(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "15997798", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(257))
require.NoError(t, err)
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[1].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16000202", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(258))
require.NoError(t, err)
assert.Equal(t, users[2].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[2].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[2].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "32001000", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(259))
require.NoError(t, err)
assert.Equal(t, users[3].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[3].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[3].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16001000", acc.Balance.String())
@@ -1149,12 +1149,12 @@ func TestZKInputs5(t *testing.T) {
// check expected account keys values from tx inputs
acc, err := sdb.GetAccount(common.Idx(256))
require.NoError(t, err)
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[0].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[0].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "15997798", acc.Balance.String())
acc, err = sdb.GetAccount(common.Idx(257))
require.NoError(t, err)
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.PublicKey.String())
assert.Equal(t, users[1].BJJ.Public().Compress().String(), acc.BJJ.String())
assert.Equal(t, users[1].Addr.Hex(), acc.EthAddr.Hex())
assert.Equal(t, "16000202", acc.Balance.String())