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

fixed pr remarks

Browse Source
This commit is contained in:
Mikelle
2021-03-24 19:13:54 +03:00
parent aa1f0a2618
commit ad4e6e8dcb
8 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
eth/rollup.go
View File

@@ -60,7 +60,7 @@ type RollupEventInitialize struct {
// RollupVariables returns the RollupVariables from the initialize event
func (ei *RollupEventInitialize) RollupVariables() *common.RollupVariables {
var buckets [common.RollupConstNumBuckets]common.BucketParams
buckets := make([]common.BucketParams, 1)
for i := range buckets {
buckets[i] = common.BucketParams{
CeilUSD: big.NewInt(0),
@@ -161,8 +161,7 @@ type rollupEventUpdateBucketsParametersAux struct {
// RollupEventUpdateBucketsParameters is an event of the Rollup Smart Contract
type RollupEventUpdateBucketsParameters struct {
// ArrayBuckets [common.RollupConstNumBuckets][4]*big.Int
ArrayBuckets [common.RollupConstNumBuckets]RollupUpdateBucketsParameters
ArrayBuckets []RollupUpdateBucketsParameters
SafeMode bool
}
@@ -496,8 +495,8 @@ func (c *RollupClient) RollupL1UserTxERC20ETH(fromBJJ babyjub.PublicKeyComp, fro
auth.Value = depositAmount
}
var permit []byte
return c.hermez.AddL1Transaction(auth, babyPubKey, fromIdxBig, big.NewInt(0).SetUint64(uint64(depositAmountF)),
big.NewInt(0).SetUint64(uint64(amountF)), tokenID, toIdxBig, permit)
return c.hermez.AddL1Transaction(auth, babyPubKey, fromIdxBig, big.NewInt(int64(depositAmountF)),
big.NewInt(int64(amountF)), tokenID, toIdxBig, permit)
},
); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("Failed add L1 Tx ERC20/ETH: %w", err))
@@ -545,7 +544,7 @@ func (c *RollupClient) RollupL1UserTxERC20Permit(fromBJJ babyjub.PublicKeyComp,
signature, _ := c.client.ks.SignHash(*c.client.account, digest)
permit := createPermit(owner, spender, amount, deadline, digest, signature)
return c.hermez.AddL1Transaction(auth, babyPubKey, fromIdxBig,
big.NewInt(0).SetUint64(uint64(depositAmountF)), big.NewInt(0).SetUint64(uint64(amountF)), tokenID, toIdxBig, permit)
big.NewInt(int64(depositAmountF)), big.NewInt(int64(amountF)), tokenID, toIdxBig, permit)
},
); err != nil {
return nil, tracerr.Wrap(fmt.Errorf("Failed add L1 Tx ERC20Permit: %w", err))
@@ -607,14 +606,16 @@ func (c *RollupClient) RollupUpdateFeeAddToken(newFeeAddToken *big.Int) (tx *typ
// RollupUpdateBucketsParameters is the interface to call the smart contract function
func (c *RollupClient) RollupUpdateBucketsParameters(
arrayBuckets [common.RollupConstNumBuckets]RollupUpdateBucketsParameters,
arrayBuckets []RollupUpdateBucketsParameters,
) (tx *types.Transaction, err error) {
if tx, err = c.client.CallAuth(
12500000, //nolint:gomnd
func(ec *ethclient.Client, auth *bind.TransactOpts) (*types.Transaction, error) {
params := make([]*big.Int, len(arrayBuckets))
for i, bucket := range arrayBuckets {
params[i], err = c.hermez.PackBucket(c.opts, bucket.CeilUSD, bucket.BlockStamp, bucket.Withdrawals, bucket.RateBlocks, bucket.RateWithdrawals, bucket.MaxWithdrawals)
params[i], err = c.hermez.PackBucket(c.opts,
bucket.CeilUSD, bucket.BlockStamp, bucket.Withdrawals,
bucket.RateBlocks, bucket.RateWithdrawals, bucket.MaxWithdrawals)
if err != nil {
return nil, tracerr.Wrap(fmt.Errorf("failed to pack bucket: %w", err))
}
@@ -909,6 +910,7 @@ func (c *RollupClient) RollupEventsByBlock(blockNum int64,
if err != nil {
return nil, tracerr.Wrap(err)
}
bucketsParameters.ArrayBuckets = make([]RollupUpdateBucketsParameters, len(bucketsParametersAux.ArrayBuckets))
for i, bucket := range bucketsParametersAux.ArrayBuckets {
bucket, err := c.hermez.UnpackBucket(c.opts, bucket)
if err != nil {

2
eth/rollup_test.go
View File

@@ -234,7 +234,7 @@ func TestRollupUpdateFeeAddToken(t *testing.T) {
}
func TestRollupUpdateBucketsParameters(t *testing.T) {
var bucketsParameters [common.RollupConstNumBuckets]RollupUpdateBucketsParameters
bucketsParameters := make([]RollupUpdateBucketsParameters, 5)
for i := range bucketsParameters {
bucketsParameters[i].CeilUSD = big.NewInt(int64((i + 1) * 100))
bucketsParameters[i].BlockStamp = big.NewInt(int64(0))