From 0f4be6a946bc791ef0f1f40d2e954cdf33f3c165 Mon Sep 17 00:00:00 2001
From: Mikelle <mikhwall@gmail.com>
Date: Fri, 19 Mar 2021 16:02:26 +0300
Subject: [PATCH] updated rollup according new contract api

---
 eth/rollup.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/eth/rollup.go b/eth/rollup.go
index dc4f721..b293aba 100644
--- a/eth/rollup.go
+++ b/eth/rollup.go
@@ -497,8 +497,8 @@ func (c *RollupClient) RollupL1UserTxERC20ETH(fromBJJ babyjub.PublicKeyComp, fro
 				auth.Value = depositAmount
 			}
 			var permit []byte
-			return c.hermez.AddL1Transaction(auth, babyPubKey, fromIdxBig, uint16(depositAmountF),
-				uint16(amountF), tokenID, toIdxBig, permit)
+			return c.hermez.AddL1Transaction(auth, babyPubKey, fromIdxBig, big.NewInt(0).SetUint64(uint64(depositAmountF)),
+				big.NewInt(0).SetUint64(uint64(amountF)), tokenID, toIdxBig, permit)
 		},
 	); err != nil {
 		return nil, tracerr.Wrap(fmt.Errorf("Failed add L1 Tx ERC20/ETH: %w", err))
@@ -546,7 +546,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,
-				uint16(depositAmountF), uint16(amountF), tokenID, toIdxBig, permit)
+				big.NewInt(0).SetUint64(uint64(depositAmountF)), big.NewInt(0).SetUint64(uint64(amountF)), tokenID, toIdxBig, permit)
 		},
 	); err != nil {
 		return nil, tracerr.Wrap(fmt.Errorf("Failed add L1 Tx ERC20Permit: %w", err))
@@ -610,18 +610,16 @@ func (c *RollupClient) RollupUpdateFeeAddToken(newFeeAddToken *big.Int) (tx *typ
 func (c *RollupClient) RollupUpdateBucketsParameters(
 	arrayBuckets [common.RollupConstNumBuckets]RollupUpdateBucketsParameters,
 ) (tx *types.Transaction, err error) {
-	params := [common.RollupConstNumBuckets][6]*big.Int{}
-	for i, bucket := range arrayBuckets {
-		params[i][0] = bucket.CeilUSD
-		params[i][1] = bucket.BlockStamp
-		params[i][2] = bucket.Withdrawals
-		params[i][3] = bucket.RateBlocks
-		params[i][4] = bucket.RateWithdrawals
-		params[i][5] = bucket.MaxWithdrawals
-	}
 	if tx, err = c.client.CallAuth(
 		12500000, //nolint:gomnd
 		func(ec *ethclient.Client, auth *bind.TransactOpts) (*types.Transaction, error) {
+			params := []*big.Int{}
+			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)
+				if err != nil {
+					return nil, tracerr.Wrap(fmt.Errorf("failed to pack bucket: %w", err))
+				}
+			}
 			return c.hermez.UpdateBucketsParameters(auth, params)
 		},
 	); err != nil {