diff --git a/common/ethrollup.go b/common/ethrollup.go index f612b99..066e650 100644 --- a/common/ethrollup.go +++ b/common/ethrollup.go @@ -40,8 +40,6 @@ const ( RollupConstMaxWithdrawalDelay = 2 * 7 * 24 * 60 * 60 // RollupConstExchangeMultiplier exchange multiplier RollupConstExchangeMultiplier = 1e14 - // LenVerifiers number of Rollup Smart Contract Verifiers - LenVerifiers = 1 ) var ( diff --git a/eth/.env.example b/eth/.env.example index 4475a6a..712b4e5 100644 --- a/eth/.env.example +++ b/eth/.env.example @@ -1,7 +1,7 @@ -GENESIS_BLOCK=97 -AUCTION="0x5E0816F0f8bC560cB2B9e9C87187BeCac8c2021F" -AUCTION_TEST="0x56D4563E85477AC8Aa6a3b980b831DDb18a826ec" -TOKENHEZ="0x2b7dEe2CF60484325716A1c6A193519c8c3b19F3" -HERMEZ="0x6F4e99522F4eB37e0B73D0C0373147893EF12fD5" -WDELAYER="0x5D94e3e7aeC542aB0F9129B9a7BAdeb5B3Ca0f77" -WDELAYER_TEST="0xdc05EFc3029024068FCc86f05323411f14D69280" +GENESIS_BLOCK=98 +AUCTION="0x317113D2593e3efF1FfAE0ba2fF7A61861Df7ae5" +AUCTION_TEST="0x2b7dEe2CF60484325716A1c6A193519c8c3b19F3" +TOKENHEZ="0x5D94e3e7aeC542aB0F9129B9a7BAdeb5B3Ca0f77" +HERMEZ="0x8EEaea23686c319133a7cC110b840d1591d9AeE0" +WDELAYER="0x5E0816F0f8bC560cB2B9e9C87187BeCac8c2021F" +WDELAYER_TEST="0xc8F466fFeF9E9788fb363c2F4fBDdF2cAe477805" diff --git a/eth/README.md b/eth/README.md index 1993dd6..ad0d8ac 100644 --- a/eth/README.md +++ b/eth/README.md @@ -8,7 +8,7 @@ The first step is to clone the github repository where the contracts are located While the prepared deployment is not found to master, branch in repository must be changed: -`git checkout feature/newDeploymentScript-eth-1` (tested with commit `071926ea2bce1c673cb1ff2728297191a396d350`) +`git checkout feature/newDeploymentScript-eth-edu` (tested with commit `e6c5b7db8da2de1b9cc55e281c8d1dfa524b06f0`) Now, install the dependencies: diff --git a/eth/client_test.go b/eth/client_test.go index 2bcf8ed..b941864 100644 --- a/eth/client_test.go +++ b/eth/client_test.go @@ -3,15 +3,12 @@ package eth import ( "testing" - "github.com/ethereum/go-ethereum/ethclient" "github.com/stretchr/testify/require" ) func TestClientInterface(t *testing.T) { - ethClient, err := ethclient.Dial(ethClientDialURL) - require.Nil(t, err) var c ClientInterface - client, _ := NewClient(ethClient, nil, nil, &ClientConfig{}) + client := &Client{} c = client require.NotNil(t, c) } diff --git a/eth/contracts/README.md b/eth/contracts/README.md index cb725b6..e0f2bd8 100644 --- a/eth/contracts/README.md +++ b/eth/contracts/README.md @@ -10,14 +10,19 @@ abigen --abi=HEZ.abi --bin=HEZ.bin --pkg=HEZ --out=HEZ.go ``` You must compile the contracts to get the `.bin` and `.abi` files. The contracts used are in the repo: https://github.com/hermeznetwork/contracts -Branch: `feature/newDeploymentScript` -Specifically they have been processed in the commit with hash: `254dc035142c56553d6d4ee9b2ea9d97259357c2` +Branch: `feature/newDeploymentScript-eth-edu` +at the commit with hash: `e6c5b7db8da2de1b9cc55e281c8d1dfa524b06f0` + +Alternatively, you can run the `update.sh` script like this: +``` +./update.sh CONTRACT_REPO_PATH +``` Versions: +``` + solidity version 0.6.12 +``` ``` $ abigen --version -abigen version 1.9.21-stable-0287d548 - $ solc --version -solc, the solidity compiler commandline interface -Version: 0.7.1+commit.f4a555be.Linux.g++ +abigen version 1.9.25-stable-e7872729 ``` diff --git a/eth/contracts/auction/HermezAuctionProtocol.go b/eth/contracts/auction/HermezAuctionProtocol.go index 2c72682..7b36b19 100644 --- a/eth/contracts/auction/HermezAuctionProtocol.go +++ b/eth/contracts/auction/HermezAuctionProtocol.go @@ -13,7 +13,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - "github.com/hermeznetwork/tracerr" ) // Reference imports to suppress errors if they are not otherwise used. @@ -93,7 +92,7 @@ type HermezAuctionProtocolTransactorRaw struct { func NewHermezAuctionProtocol(address common.Address, backend bind.ContractBackend) (*HermezAuctionProtocol, error) { contract, err := bindHermezAuctionProtocol(address, backend, backend, backend) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocol{HermezAuctionProtocolCaller: HermezAuctionProtocolCaller{contract: contract}, HermezAuctionProtocolTransactor: HermezAuctionProtocolTransactor{contract: contract}, HermezAuctionProtocolFilterer: HermezAuctionProtocolFilterer{contract: contract}}, nil } @@ -102,7 +101,7 @@ func NewHermezAuctionProtocol(address common.Address, backend bind.ContractBacke func NewHermezAuctionProtocolCaller(address common.Address, caller bind.ContractCaller) (*HermezAuctionProtocolCaller, error) { contract, err := bindHermezAuctionProtocol(address, caller, nil, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolCaller{contract: contract}, nil } @@ -111,7 +110,7 @@ func NewHermezAuctionProtocolCaller(address common.Address, caller bind.Contract func NewHermezAuctionProtocolTransactor(address common.Address, transactor bind.ContractTransactor) (*HermezAuctionProtocolTransactor, error) { contract, err := bindHermezAuctionProtocol(address, nil, transactor, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolTransactor{contract: contract}, nil } @@ -120,7 +119,7 @@ func NewHermezAuctionProtocolTransactor(address common.Address, transactor bind. func NewHermezAuctionProtocolFilterer(address common.Address, filterer bind.ContractFilterer) (*HermezAuctionProtocolFilterer, error) { contract, err := bindHermezAuctionProtocol(address, nil, nil, filterer) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolFilterer{contract: contract}, nil } @@ -129,7 +128,7 @@ func NewHermezAuctionProtocolFilterer(address common.Address, filterer bind.Cont func bindHermezAuctionProtocol(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) { parsed, err := abi.JSON(strings.NewReader(HermezAuctionProtocolABI)) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil } @@ -180,12 +179,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) BLOCKSPERSLOT(opts *b err := _HermezAuctionProtocol.contract.Call(opts, &out, "BLOCKS_PER_SLOT") if err != nil { - return *new(uint8), tracerr.Wrap(err) + return *new(uint8), err } out0 := *abi.ConvertType(out[0], new(uint8)).(*uint8) - return out0, tracerr.Wrap(err) + return out0, err } @@ -211,12 +210,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) INITIALMINIMALBIDDING err := _HermezAuctionProtocol.contract.Call(opts, &out, "INITIAL_MINIMAL_BIDDING") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -242,12 +241,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) BootCoordinatorURL(op err := _HermezAuctionProtocol.contract.Call(opts, &out, "bootCoordinatorURL") if err != nil { - return *new(string), tracerr.Wrap(err) + return *new(string), err } out0 := *abi.ConvertType(out[0], new(string)).(*string) - return out0, tracerr.Wrap(err) + return out0, err } @@ -273,12 +272,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) CanForge(opts *bind.C err := _HermezAuctionProtocol.contract.Call(opts, &out, "canForge", forger, blockNumber) if err != nil { - return *new(bool), tracerr.Wrap(err) + return *new(bool), err } out0 := *abi.ConvertType(out[0], new(bool)).(*bool) - return out0, tracerr.Wrap(err) + return out0, err } @@ -314,7 +313,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) Coordinators(opts *bi outstruct.Forger = out[0].(common.Address) outstruct.CoordinatorURL = out[1].(string) - return *outstruct, tracerr.Wrap(err) + return *outstruct, err } @@ -346,12 +345,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GenesisBlock(opts *bi err := _HermezAuctionProtocol.contract.Call(opts, &out, "genesisBlock") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -377,12 +376,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetAllocationRatio(op err := _HermezAuctionProtocol.contract.Call(opts, &out, "getAllocationRatio") if err != nil { - return *new([3]uint16), tracerr.Wrap(err) + return *new([3]uint16), err } out0 := *abi.ConvertType(out[0], new([3]uint16)).(*[3]uint16) - return out0, tracerr.Wrap(err) + return out0, err } @@ -408,12 +407,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetBootCoordinator(op err := _HermezAuctionProtocol.contract.Call(opts, &out, "getBootCoordinator") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -439,12 +438,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetClaimableHEZ(opts err := _HermezAuctionProtocol.contract.Call(opts, &out, "getClaimableHEZ", bidder) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -470,12 +469,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetClosedAuctionSlots err := _HermezAuctionProtocol.contract.Call(opts, &out, "getClosedAuctionSlots") if err != nil { - return *new(uint16), tracerr.Wrap(err) + return *new(uint16), err } out0 := *abi.ConvertType(out[0], new(uint16)).(*uint16) - return out0, tracerr.Wrap(err) + return out0, err } @@ -501,12 +500,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetCurrentSlotNumber( err := _HermezAuctionProtocol.contract.Call(opts, &out, "getCurrentSlotNumber") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -532,12 +531,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetDefaultSlotSetBid( err := _HermezAuctionProtocol.contract.Call(opts, &out, "getDefaultSlotSetBid", slotSet) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -563,12 +562,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetDonationAddress(op err := _HermezAuctionProtocol.contract.Call(opts, &out, "getDonationAddress") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -594,12 +593,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetMinBidBySlot(opts err := _HermezAuctionProtocol.contract.Call(opts, &out, "getMinBidBySlot", slot) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -625,12 +624,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetOpenAuctionSlots(o err := _HermezAuctionProtocol.contract.Call(opts, &out, "getOpenAuctionSlots") if err != nil { - return *new(uint16), tracerr.Wrap(err) + return *new(uint16), err } out0 := *abi.ConvertType(out[0], new(uint16)).(*uint16) - return out0, tracerr.Wrap(err) + return out0, err } @@ -656,12 +655,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetOutbidding(opts *b err := _HermezAuctionProtocol.contract.Call(opts, &out, "getOutbidding") if err != nil { - return *new(uint16), tracerr.Wrap(err) + return *new(uint16), err } out0 := *abi.ConvertType(out[0], new(uint16)).(*uint16) - return out0, tracerr.Wrap(err) + return out0, err } @@ -687,12 +686,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetSlotDeadline(opts err := _HermezAuctionProtocol.contract.Call(opts, &out, "getSlotDeadline") if err != nil { - return *new(uint8), tracerr.Wrap(err) + return *new(uint8), err } out0 := *abi.ConvertType(out[0], new(uint8)).(*uint8) - return out0, tracerr.Wrap(err) + return out0, err } @@ -718,12 +717,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetSlotNumber(opts *b err := _HermezAuctionProtocol.contract.Call(opts, &out, "getSlotNumber", blockNumber) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -749,12 +748,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GetSlotSet(opts *bind err := _HermezAuctionProtocol.contract.Call(opts, &out, "getSlotSet", slot) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -780,12 +779,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) GovernanceAddress(opt err := _HermezAuctionProtocol.contract.Call(opts, &out, "governanceAddress") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -811,12 +810,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) HermezRollup(opts *bi err := _HermezAuctionProtocol.contract.Call(opts, &out, "hermezRollup") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -842,12 +841,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) PendingBalances(opts err := _HermezAuctionProtocol.contract.Call(opts, &out, "pendingBalances", arg0) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -892,7 +891,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) Slots(opts *bind.Call outstruct.BidAmount = out[3].(*big.Int) outstruct.ClosedMinBid = out[4].(*big.Int) - return *outstruct, tracerr.Wrap(err) + return *outstruct, err } @@ -930,12 +929,12 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolCaller) TokenHEZ(opts *bind.C err := _HermezAuctionProtocol.contract.Call(opts, &out, "tokenHEZ") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -1354,7 +1353,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterHEZClaimed(op logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "HEZClaimed", ownerRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolHEZClaimedIterator{contract: _HermezAuctionProtocol.contract, event: "HEZClaimed", logs: logs, sub: sub}, nil } @@ -1371,7 +1370,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchHEZClaimed(opt logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "HEZClaimed", ownerRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1381,19 +1380,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchHEZClaimed(opt // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolHEZClaimed) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "HEZClaimed", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1407,7 +1406,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchHEZClaimed(opt func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseHEZClaimed(log types.Log) (*HermezAuctionProtocolHEZClaimed, error) { event := new(HermezAuctionProtocolHEZClaimed) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "HEZClaimed", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1500,7 +1499,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterInitializeHer logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "InitializeHermezAuctionProtocolEvent") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolInitializeHermezAuctionProtocolEventIterator{contract: _HermezAuctionProtocol.contract, event: "InitializeHermezAuctionProtocolEvent", logs: logs, sub: sub}, nil } @@ -1512,7 +1511,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchInitializeHerm logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "InitializeHermezAuctionProtocolEvent") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1522,19 +1521,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchInitializeHerm // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolInitializeHermezAuctionProtocolEvent) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "InitializeHermezAuctionProtocolEvent", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1548,7 +1547,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchInitializeHerm func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseInitializeHermezAuctionProtocolEvent(log types.Log) (*HermezAuctionProtocolInitializeHermezAuctionProtocolEvent, error) { event := new(HermezAuctionProtocolInitializeHermezAuctionProtocolEvent) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "InitializeHermezAuctionProtocolEvent", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1634,7 +1633,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewAllocation logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewAllocationRatio") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewAllocationRatioIterator{contract: _HermezAuctionProtocol.contract, event: "NewAllocationRatio", logs: logs, sub: sub}, nil } @@ -1646,7 +1645,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewAllocationR logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewAllocationRatio") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1656,19 +1655,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewAllocationR // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewAllocationRatio) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewAllocationRatio", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1682,7 +1681,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewAllocationR func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewAllocationRatio(log types.Log) (*HermezAuctionProtocolNewAllocationRatio, error) { event := new(HermezAuctionProtocolNewAllocationRatio) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewAllocationRatio", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1780,7 +1779,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewBid(opts * logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewBid", slotRule, bidderRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewBidIterator{contract: _HermezAuctionProtocol.contract, event: "NewBid", logs: logs, sub: sub}, nil } @@ -1802,7 +1801,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewBid(opts *b logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewBid", slotRule, bidderRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1812,19 +1811,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewBid(opts *b // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewBid) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewBid", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1838,7 +1837,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewBid(opts *b func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewBid(log types.Log) (*HermezAuctionProtocolNewBid, error) { event := new(HermezAuctionProtocolNewBid) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewBid", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1930,7 +1929,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewBootCoordi logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewBootCoordinator", newBootCoordinatorRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewBootCoordinatorIterator{contract: _HermezAuctionProtocol.contract, event: "NewBootCoordinator", logs: logs, sub: sub}, nil } @@ -1947,7 +1946,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewBootCoordin logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewBootCoordinator", newBootCoordinatorRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1957,19 +1956,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewBootCoordin // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewBootCoordinator) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewBootCoordinator", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1983,7 +1982,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewBootCoordin func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewBootCoordinator(log types.Log) (*HermezAuctionProtocolNewBootCoordinator, error) { event := new(HermezAuctionProtocolNewBootCoordinator) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewBootCoordinator", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2069,7 +2068,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewClosedAuct logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewClosedAuctionSlots") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewClosedAuctionSlotsIterator{contract: _HermezAuctionProtocol.contract, event: "NewClosedAuctionSlots", logs: logs, sub: sub}, nil } @@ -2081,7 +2080,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewClosedAucti logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewClosedAuctionSlots") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2091,19 +2090,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewClosedAucti // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewClosedAuctionSlots) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewClosedAuctionSlots", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2117,7 +2116,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewClosedAucti func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewClosedAuctionSlots(log types.Log) (*HermezAuctionProtocolNewClosedAuctionSlots, error) { event := new(HermezAuctionProtocolNewClosedAuctionSlots) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewClosedAuctionSlots", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2204,7 +2203,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewDefaultSlo logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewDefaultSlotSetBid") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewDefaultSlotSetBidIterator{contract: _HermezAuctionProtocol.contract, event: "NewDefaultSlotSetBid", logs: logs, sub: sub}, nil } @@ -2216,7 +2215,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewDefaultSlot logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewDefaultSlotSetBid") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2226,19 +2225,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewDefaultSlot // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewDefaultSlotSetBid) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewDefaultSlotSetBid", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2252,7 +2251,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewDefaultSlot func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewDefaultSlotSetBid(log types.Log) (*HermezAuctionProtocolNewDefaultSlotSetBid, error) { event := new(HermezAuctionProtocolNewDefaultSlotSetBid) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewDefaultSlotSetBid", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2343,7 +2342,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewDonationAd logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewDonationAddress", newDonationAddressRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewDonationAddressIterator{contract: _HermezAuctionProtocol.contract, event: "NewDonationAddress", logs: logs, sub: sub}, nil } @@ -2360,7 +2359,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewDonationAdd logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewDonationAddress", newDonationAddressRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2370,19 +2369,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewDonationAdd // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewDonationAddress) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewDonationAddress", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2396,7 +2395,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewDonationAdd func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewDonationAddress(log types.Log) (*HermezAuctionProtocolNewDonationAddress, error) { event := new(HermezAuctionProtocolNewDonationAddress) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewDonationAddress", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2492,7 +2491,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewForge(opts logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewForge", forgerRule, slotToForgeRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewForgeIterator{contract: _HermezAuctionProtocol.contract, event: "NewForge", logs: logs, sub: sub}, nil } @@ -2513,7 +2512,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewForge(opts logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewForge", forgerRule, slotToForgeRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2523,19 +2522,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewForge(opts // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewForge) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewForge", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2549,7 +2548,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewForge(opts func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewForge(log types.Log) (*HermezAuctionProtocolNewForge, error) { event := new(HermezAuctionProtocolNewForge) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewForge", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2653,7 +2652,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewForgeAlloc logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewForgeAllocated", bidderRule, forgerRule, slotToForgeRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewForgeAllocatedIterator{contract: _HermezAuctionProtocol.contract, event: "NewForgeAllocated", logs: logs, sub: sub}, nil } @@ -2678,7 +2677,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewForgeAlloca logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewForgeAllocated", bidderRule, forgerRule, slotToForgeRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2688,19 +2687,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewForgeAlloca // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewForgeAllocated) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewForgeAllocated", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2714,7 +2713,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewForgeAlloca func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewForgeAllocated(log types.Log) (*HermezAuctionProtocolNewForgeAllocated, error) { event := new(HermezAuctionProtocolNewForgeAllocated) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewForgeAllocated", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2800,7 +2799,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewOpenAuctio logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewOpenAuctionSlots") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewOpenAuctionSlotsIterator{contract: _HermezAuctionProtocol.contract, event: "NewOpenAuctionSlots", logs: logs, sub: sub}, nil } @@ -2812,7 +2811,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewOpenAuction logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewOpenAuctionSlots") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2822,19 +2821,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewOpenAuction // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewOpenAuctionSlots) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewOpenAuctionSlots", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2848,7 +2847,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewOpenAuction func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewOpenAuctionSlots(log types.Log) (*HermezAuctionProtocolNewOpenAuctionSlots, error) { event := new(HermezAuctionProtocolNewOpenAuctionSlots) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewOpenAuctionSlots", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2934,7 +2933,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewOutbidding logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewOutbidding") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewOutbiddingIterator{contract: _HermezAuctionProtocol.contract, event: "NewOutbidding", logs: logs, sub: sub}, nil } @@ -2946,7 +2945,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewOutbidding( logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewOutbidding") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2956,19 +2955,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewOutbidding( // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewOutbidding) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewOutbidding", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2982,7 +2981,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewOutbidding( func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewOutbidding(log types.Log) (*HermezAuctionProtocolNewOutbidding, error) { event := new(HermezAuctionProtocolNewOutbidding) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewOutbidding", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -3068,7 +3067,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterNewSlotDeadli logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "NewSlotDeadline") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolNewSlotDeadlineIterator{contract: _HermezAuctionProtocol.contract, event: "NewSlotDeadline", logs: logs, sub: sub}, nil } @@ -3080,7 +3079,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewSlotDeadlin logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "NewSlotDeadline") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -3090,19 +3089,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewSlotDeadlin // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolNewSlotDeadline) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewSlotDeadline", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -3116,7 +3115,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchNewSlotDeadlin func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseNewSlotDeadline(log types.Log) (*HermezAuctionProtocolNewSlotDeadline, error) { event := new(HermezAuctionProtocolNewSlotDeadline) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "NewSlotDeadline", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -3213,7 +3212,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) FilterSetCoordinato logs, sub, err := _HermezAuctionProtocol.contract.FilterLogs(opts, "SetCoordinator", bidderRule, forgerRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAuctionProtocolSetCoordinatorIterator{contract: _HermezAuctionProtocol.contract, event: "SetCoordinator", logs: logs, sub: sub}, nil } @@ -3234,7 +3233,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchSetCoordinator logs, sub, err := _HermezAuctionProtocol.contract.WatchLogs(opts, "SetCoordinator", bidderRule, forgerRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -3244,19 +3243,19 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchSetCoordinator // New log arrived, parse the event and forward to the user event := new(HermezAuctionProtocolSetCoordinator) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "SetCoordinator", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -3270,7 +3269,7 @@ func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) WatchSetCoordinator func (_HermezAuctionProtocol *HermezAuctionProtocolFilterer) ParseSetCoordinator(log types.Log) (*HermezAuctionProtocolSetCoordinator, error) { event := new(HermezAuctionProtocolSetCoordinator) if err := _HermezAuctionProtocol.contract.UnpackLog(event, "SetCoordinator", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil diff --git a/eth/contracts/hermez/Hermez.go b/eth/contracts/hermez/Hermez.go index beb3bf3..69e5763 100644 --- a/eth/contracts/hermez/Hermez.go +++ b/eth/contracts/hermez/Hermez.go @@ -13,7 +13,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - "github.com/hermeznetwork/tracerr" ) // Reference imports to suppress errors if they are not otherwise used. @@ -28,7 +27,7 @@ var ( ) // HermezABI is the input ABI used to generate the binding from. -const HermezABI = "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"}],\"name\":\"AddToken\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"batchNum\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"l1UserTxsLen\",\"type\":\"uint16\"}],\"name\":\"ForgeBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"forgeL1L2BatchTimeout\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"feeAddToken\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"withdrawalDelay\",\"type\":\"uint64\"}],\"name\":\"InitializeHermezEvent\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"queueIndex\",\"type\":\"uint32\"},{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"position\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"l1UserTx\",\"type\":\"bytes\"}],\"name\":\"L1UserTxEvent\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[],\"name\":\"SafeMode\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"numBucket\",\"type\":\"uint8\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"blockStamp\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"withdrawals\",\"type\":\"uint256\"}],\"name\":\"UpdateBucketWithdraw\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256[4][5]\",\"name\":\"arrayBuckets\",\"type\":\"uint256[4][5]\"}],\"name\":\"UpdateBucketsParameters\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"newFeeAddToken\",\"type\":\"uint256\"}],\"name\":\"UpdateFeeAddToken\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"newForgeL1L2BatchTimeout\",\"type\":\"uint8\"}],\"name\":\"UpdateForgeL1L2BatchTimeout\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"addressArray\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"uint64[]\",\"name\":\"valueArray\",\"type\":\"uint64[]\"}],\"name\":\"UpdateTokenExchange\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"newWithdrawalDelay\",\"type\":\"uint64\"}],\"name\":\"UpdateWithdrawalDelay\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint48\",\"name\":\"idx\",\"type\":\"uint48\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"numExitRoot\",\"type\":\"uint32\"},{\"indexed\":true,\"internalType\":\"bool\",\"name\":\"instantWithdraw\",\"type\":\"bool\"}],\"name\":\"WithdrawEvent\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"ABSOLUTE_MAX_L1L2BATCHTIMEOUT\",\"outputs\":[{\"internalType\":\"uint8\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"babyPubKey\",\"type\":\"uint256\"},{\"internalType\":\"uint48\",\"name\":\"fromIdx\",\"type\":\"uint48\"},{\"internalType\":\"uint16\",\"name\":\"loadAmountF\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"amountF\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"},{\"internalType\":\"uint48\",\"name\":\"toIdx\",\"type\":\"uint48\"},{\"internalType\":\"bytes\",\"name\":\"permit\",\"type\":\"bytes\"}],\"name\":\"addL1Transaction\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"permit\",\"type\":\"bytes\"}],\"name\":\"addToken\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"buckets\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"ceilUSD\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"blockStamp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"withdrawals\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"blockWithdrawalRate\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"maxWithdrawals\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"},{\"internalType\":\"uint48\",\"name\":\"\",\"type\":\"uint48\"}],\"name\":\"exitNullifierMap\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"exitRootsMap\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"feeAddToken\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint48\",\"name\":\"newLastIdx\",\"type\":\"uint48\"},{\"internalType\":\"uint256\",\"name\":\"newStRoot\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"newExitRoot\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"encodedL1CoordinatorTx\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"l1L2TxsData\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"feeIdxCoordinator\",\"type\":\"bytes\"},{\"internalType\":\"uint8\",\"name\":\"verifierIdx\",\"type\":\"uint8\"},{\"internalType\":\"bool\",\"name\":\"l1Batch\",\"type\":\"bool\"},{\"internalType\":\"uint256[2]\",\"name\":\"proofA\",\"type\":\"uint256[2]\"},{\"internalType\":\"uint256[2][2]\",\"name\":\"proofB\",\"type\":\"uint256[2][2]\"},{\"internalType\":\"uint256[2]\",\"name\":\"proofC\",\"type\":\"uint256[2]\"}],\"name\":\"forgeBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"forgeL1L2BatchTimeout\",\"outputs\":[{\"internalType\":\"uint8\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"hermezAuctionContract\",\"outputs\":[{\"internalType\":\"contractIHermezAuctionProtocol\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"hermezGovernanceAddress\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"_verifiers\",\"type\":\"address[]\"},{\"internalType\":\"uint256[]\",\"name\":\"_verifiersParams\",\"type\":\"uint256[]\"},{\"internalType\":\"address\",\"name\":\"_withdrawVerifier\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_hermezAuctionContract\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_tokenHEZ\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"_forgeL1L2BatchTimeout\",\"type\":\"uint8\"},{\"internalType\":\"uint256\",\"name\":\"_feeAddToken\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"_poseidon2Elements\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_poseidon3Elements\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_poseidon4Elements\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_hermezGovernanceAddress\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"_withdrawalDelay\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"_withdrawDelayerContract\",\"type\":\"address\"}],\"name\":\"initializeHermez\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint192\",\"name\":\"amount\",\"type\":\"uint192\"}],\"name\":\"instantWithdrawalViewer\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"l1L2TxsDataHashMap\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastForgedBatch\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastIdx\",\"outputs\":[{\"internalType\":\"uint48\",\"name\":\"\",\"type\":\"uint48\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastL1L2Batch\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"mapL1TxQueue\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextL1FillingQueue\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextL1ToForgeQueue\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"registerTokensCount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"rollupVerifiers\",\"outputs\":[{\"internalType\":\"contractVerifierRollupInterface\",\"name\":\"verifierInterface\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"maxTx\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nLevels\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"safeMode\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"stateRootMap\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"tokenExchange\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"tokenHEZ\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"tokenList\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"tokenMap\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256[4][5]\",\"name\":\"arrayBuckets\",\"type\":\"uint256[4][5]\"}],\"name\":\"updateBucketsParameters\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"newFeeAddToken\",\"type\":\"uint256\"}],\"name\":\"updateFeeAddToken\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"newForgeL1L2BatchTimeout\",\"type\":\"uint8\"}],\"name\":\"updateForgeL1L2BatchTimeout\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"addressArray\",\"type\":\"address[]\"},{\"internalType\":\"uint64[]\",\"name\":\"valueArray\",\"type\":\"uint64[]\"}],\"name\":\"updateTokenExchange\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"newWithdrawalDelay\",\"type\":\"uint64\"}],\"name\":\"updateWithdrawalDelay\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256[2]\",\"name\":\"proofA\",\"type\":\"uint256[2]\"},{\"internalType\":\"uint256[2][2]\",\"name\":\"proofB\",\"type\":\"uint256[2][2]\"},{\"internalType\":\"uint256[2]\",\"name\":\"proofC\",\"type\":\"uint256[2]\"},{\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"},{\"internalType\":\"uint192\",\"name\":\"amount\",\"type\":\"uint192\"},{\"internalType\":\"uint32\",\"name\":\"numExitRoot\",\"type\":\"uint32\"},{\"internalType\":\"uint48\",\"name\":\"idx\",\"type\":\"uint48\"},{\"internalType\":\"bool\",\"name\":\"instantWithdraw\",\"type\":\"bool\"}],\"name\":\"withdrawCircuit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawDelayerContract\",\"outputs\":[{\"internalType\":\"contractIWithdrawalDelayer\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"},{\"internalType\":\"uint192\",\"name\":\"amount\",\"type\":\"uint192\"},{\"internalType\":\"uint256\",\"name\":\"babyPubKey\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"numExitRoot\",\"type\":\"uint32\"},{\"internalType\":\"uint256[]\",\"name\":\"siblings\",\"type\":\"uint256[]\"},{\"internalType\":\"uint48\",\"name\":\"idx\",\"type\":\"uint48\"},{\"internalType\":\"bool\",\"name\":\"instantWithdraw\",\"type\":\"bool\"}],\"name\":\"withdrawMerkleProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawVerifier\",\"outputs\":[{\"internalType\":\"contractVerifierWithdrawInterface\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawalDelay\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]" +const HermezABI = "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"}],\"name\":\"AddToken\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"batchNum\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"l1UserTxsLen\",\"type\":\"uint16\"}],\"name\":\"ForgeBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"forgeL1L2BatchTimeout\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"feeAddToken\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"withdrawalDelay\",\"type\":\"uint64\"}],\"name\":\"InitializeHermezEvent\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"queueIndex\",\"type\":\"uint32\"},{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"position\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"l1UserTx\",\"type\":\"bytes\"}],\"name\":\"L1UserTxEvent\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[],\"name\":\"SafeMode\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint8\",\"name\":\"numBucket\",\"type\":\"uint8\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"blockStamp\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"withdrawals\",\"type\":\"uint256\"}],\"name\":\"UpdateBucketWithdraw\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256[4][5]\",\"name\":\"arrayBuckets\",\"type\":\"uint256[4][5]\"}],\"name\":\"UpdateBucketsParameters\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"newFeeAddToken\",\"type\":\"uint256\"}],\"name\":\"UpdateFeeAddToken\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"newForgeL1L2BatchTimeout\",\"type\":\"uint8\"}],\"name\":\"UpdateForgeL1L2BatchTimeout\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"addressArray\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"uint64[]\",\"name\":\"valueArray\",\"type\":\"uint64[]\"}],\"name\":\"UpdateTokenExchange\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"newWithdrawalDelay\",\"type\":\"uint64\"}],\"name\":\"UpdateWithdrawalDelay\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint48\",\"name\":\"idx\",\"type\":\"uint48\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"numExitRoot\",\"type\":\"uint32\"},{\"indexed\":true,\"internalType\":\"bool\",\"name\":\"instantWithdraw\",\"type\":\"bool\"}],\"name\":\"WithdrawEvent\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"ABSOLUTE_MAX_L1L2BATCHTIMEOUT\",\"outputs\":[{\"internalType\":\"uint8\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"babyPubKey\",\"type\":\"uint256\"},{\"internalType\":\"uint48\",\"name\":\"fromIdx\",\"type\":\"uint48\"},{\"internalType\":\"uint16\",\"name\":\"loadAmountF\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"amountF\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"},{\"internalType\":\"uint48\",\"name\":\"toIdx\",\"type\":\"uint48\"},{\"internalType\":\"bytes\",\"name\":\"permit\",\"type\":\"bytes\"}],\"name\":\"addL1Transaction\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"permit\",\"type\":\"bytes\"}],\"name\":\"addToken\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"buckets\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"ceilUSD\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"blockStamp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"withdrawals\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"blockWithdrawalRate\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"maxWithdrawals\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"},{\"internalType\":\"uint48\",\"name\":\"\",\"type\":\"uint48\"}],\"name\":\"exitNullifierMap\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"exitRootsMap\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"feeAddToken\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint48\",\"name\":\"newLastIdx\",\"type\":\"uint48\"},{\"internalType\":\"uint256\",\"name\":\"newStRoot\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"newExitRoot\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"encodedL1CoordinatorTx\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"l1L2TxsData\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"feeIdxCoordinator\",\"type\":\"bytes\"},{\"internalType\":\"uint8\",\"name\":\"verifierIdx\",\"type\":\"uint8\"},{\"internalType\":\"bool\",\"name\":\"l1Batch\",\"type\":\"bool\"},{\"internalType\":\"uint256[2]\",\"name\":\"proofA\",\"type\":\"uint256[2]\"},{\"internalType\":\"uint256[2][2]\",\"name\":\"proofB\",\"type\":\"uint256[2][2]\"},{\"internalType\":\"uint256[2]\",\"name\":\"proofC\",\"type\":\"uint256[2]\"}],\"name\":\"forgeBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"forgeL1L2BatchTimeout\",\"outputs\":[{\"internalType\":\"uint8\",\"name\":\"\",\"type\":\"uint8\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"hermezAuctionContract\",\"outputs\":[{\"internalType\":\"contractIHermezAuctionProtocol\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"hermezGovernanceAddress\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"_verifiers\",\"type\":\"address[]\"},{\"internalType\":\"uint256[]\",\"name\":\"_verifiersParams\",\"type\":\"uint256[]\"},{\"internalType\":\"address\",\"name\":\"_withdrawVerifier\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_hermezAuctionContract\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_tokenHEZ\",\"type\":\"address\"},{\"internalType\":\"uint8\",\"name\":\"_forgeL1L2BatchTimeout\",\"type\":\"uint8\"},{\"internalType\":\"uint256\",\"name\":\"_feeAddToken\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"_poseidon2Elements\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_poseidon3Elements\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_poseidon4Elements\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_hermezGovernanceAddress\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"_withdrawalDelay\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"_withdrawDelayerContract\",\"type\":\"address\"}],\"name\":\"initializeHermez\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"tokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint192\",\"name\":\"amount\",\"type\":\"uint192\"}],\"name\":\"instantWithdrawalViewer\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"l1L2TxsDataHashMap\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastForgedBatch\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastIdx\",\"outputs\":[{\"internalType\":\"uint48\",\"name\":\"\",\"type\":\"uint48\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lastL1L2Batch\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"mapL1TxQueue\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextL1FillingQueue\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextL1ToForgeQueue\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"registerTokensCount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"rollupVerifiers\",\"outputs\":[{\"internalType\":\"contractVerifierRollupInterface\",\"name\":\"verifierInterface\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"maxTx\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nLevels\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"rollupVerifiersLength\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"safeMode\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"name\":\"stateRootMap\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"tokenExchange\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"tokenHEZ\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"tokenList\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"tokenMap\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256[4][5]\",\"name\":\"arrayBuckets\",\"type\":\"uint256[4][5]\"}],\"name\":\"updateBucketsParameters\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"newFeeAddToken\",\"type\":\"uint256\"}],\"name\":\"updateFeeAddToken\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"newForgeL1L2BatchTimeout\",\"type\":\"uint8\"}],\"name\":\"updateForgeL1L2BatchTimeout\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"addressArray\",\"type\":\"address[]\"},{\"internalType\":\"uint64[]\",\"name\":\"valueArray\",\"type\":\"uint64[]\"}],\"name\":\"updateTokenExchange\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"newWithdrawalDelay\",\"type\":\"uint64\"}],\"name\":\"updateWithdrawalDelay\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256[2]\",\"name\":\"proofA\",\"type\":\"uint256[2]\"},{\"internalType\":\"uint256[2][2]\",\"name\":\"proofB\",\"type\":\"uint256[2][2]\"},{\"internalType\":\"uint256[2]\",\"name\":\"proofC\",\"type\":\"uint256[2]\"},{\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"},{\"internalType\":\"uint192\",\"name\":\"amount\",\"type\":\"uint192\"},{\"internalType\":\"uint32\",\"name\":\"numExitRoot\",\"type\":\"uint32\"},{\"internalType\":\"uint48\",\"name\":\"idx\",\"type\":\"uint48\"},{\"internalType\":\"bool\",\"name\":\"instantWithdraw\",\"type\":\"bool\"}],\"name\":\"withdrawCircuit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawDelayerContract\",\"outputs\":[{\"internalType\":\"contractIWithdrawalDelayer\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"tokenID\",\"type\":\"uint32\"},{\"internalType\":\"uint192\",\"name\":\"amount\",\"type\":\"uint192\"},{\"internalType\":\"uint256\",\"name\":\"babyPubKey\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"numExitRoot\",\"type\":\"uint32\"},{\"internalType\":\"uint256[]\",\"name\":\"siblings\",\"type\":\"uint256[]\"},{\"internalType\":\"uint48\",\"name\":\"idx\",\"type\":\"uint48\"},{\"internalType\":\"bool\",\"name\":\"instantWithdraw\",\"type\":\"bool\"}],\"name\":\"withdrawMerkleProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawVerifier\",\"outputs\":[{\"internalType\":\"contractVerifierWithdrawInterface\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawalDelay\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]" // Hermez is an auto generated Go binding around an Ethereum contract. type Hermez struct { @@ -93,7 +92,7 @@ type HermezTransactorRaw struct { func NewHermez(address common.Address, backend bind.ContractBackend) (*Hermez, error) { contract, err := bindHermez(address, backend, backend, backend) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &Hermez{HermezCaller: HermezCaller{contract: contract}, HermezTransactor: HermezTransactor{contract: contract}, HermezFilterer: HermezFilterer{contract: contract}}, nil } @@ -102,7 +101,7 @@ func NewHermez(address common.Address, backend bind.ContractBackend) (*Hermez, e func NewHermezCaller(address common.Address, caller bind.ContractCaller) (*HermezCaller, error) { contract, err := bindHermez(address, caller, nil, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezCaller{contract: contract}, nil } @@ -111,7 +110,7 @@ func NewHermezCaller(address common.Address, caller bind.ContractCaller) (*Herme func NewHermezTransactor(address common.Address, transactor bind.ContractTransactor) (*HermezTransactor, error) { contract, err := bindHermez(address, nil, transactor, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezTransactor{contract: contract}, nil } @@ -120,7 +119,7 @@ func NewHermezTransactor(address common.Address, transactor bind.ContractTransac func NewHermezFilterer(address common.Address, filterer bind.ContractFilterer) (*HermezFilterer, error) { contract, err := bindHermez(address, nil, nil, filterer) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezFilterer{contract: contract}, nil } @@ -129,7 +128,7 @@ func NewHermezFilterer(address common.Address, filterer bind.ContractFilterer) ( func bindHermez(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) { parsed, err := abi.JSON(strings.NewReader(HermezABI)) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil } @@ -180,12 +179,12 @@ func (_Hermez *HermezCaller) ABSOLUTEMAXL1L2BATCHTIMEOUT(opts *bind.CallOpts) (u err := _Hermez.contract.Call(opts, &out, "ABSOLUTE_MAX_L1L2BATCHTIMEOUT") if err != nil { - return *new(uint8), tracerr.Wrap(err) + return *new(uint8), err } out0 := *abi.ConvertType(out[0], new(uint8)).(*uint8) - return out0, tracerr.Wrap(err) + return out0, err } @@ -230,7 +229,7 @@ func (_Hermez *HermezCaller) Buckets(opts *bind.CallOpts, arg0 *big.Int) (struct outstruct.BlockWithdrawalRate = out[3].(*big.Int) outstruct.MaxWithdrawals = out[4].(*big.Int) - return *outstruct, tracerr.Wrap(err) + return *outstruct, err } @@ -268,12 +267,12 @@ func (_Hermez *HermezCaller) ExitNullifierMap(opts *bind.CallOpts, arg0 uint32, err := _Hermez.contract.Call(opts, &out, "exitNullifierMap", arg0, arg1) if err != nil { - return *new(bool), tracerr.Wrap(err) + return *new(bool), err } out0 := *abi.ConvertType(out[0], new(bool)).(*bool) - return out0, tracerr.Wrap(err) + return out0, err } @@ -299,12 +298,12 @@ func (_Hermez *HermezCaller) ExitRootsMap(opts *bind.CallOpts, arg0 uint32) (*bi err := _Hermez.contract.Call(opts, &out, "exitRootsMap", arg0) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -330,12 +329,12 @@ func (_Hermez *HermezCaller) FeeAddToken(opts *bind.CallOpts) (*big.Int, error) err := _Hermez.contract.Call(opts, &out, "feeAddToken") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -361,12 +360,12 @@ func (_Hermez *HermezCaller) ForgeL1L2BatchTimeout(opts *bind.CallOpts) (uint8, err := _Hermez.contract.Call(opts, &out, "forgeL1L2BatchTimeout") if err != nil { - return *new(uint8), tracerr.Wrap(err) + return *new(uint8), err } out0 := *abi.ConvertType(out[0], new(uint8)).(*uint8) - return out0, tracerr.Wrap(err) + return out0, err } @@ -392,12 +391,12 @@ func (_Hermez *HermezCaller) HermezAuctionContract(opts *bind.CallOpts) (common. err := _Hermez.contract.Call(opts, &out, "hermezAuctionContract") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -423,12 +422,12 @@ func (_Hermez *HermezCaller) HermezGovernanceAddress(opts *bind.CallOpts) (commo err := _Hermez.contract.Call(opts, &out, "hermezGovernanceAddress") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -454,12 +453,12 @@ func (_Hermez *HermezCaller) InstantWithdrawalViewer(opts *bind.CallOpts, tokenA err := _Hermez.contract.Call(opts, &out, "instantWithdrawalViewer", tokenAddress, amount) if err != nil { - return *new(bool), tracerr.Wrap(err) + return *new(bool), err } out0 := *abi.ConvertType(out[0], new(bool)).(*bool) - return out0, tracerr.Wrap(err) + return out0, err } @@ -485,12 +484,12 @@ func (_Hermez *HermezCaller) L1L2TxsDataHashMap(opts *bind.CallOpts, arg0 uint32 err := _Hermez.contract.Call(opts, &out, "l1L2TxsDataHashMap", arg0) if err != nil { - return *new([32]byte), tracerr.Wrap(err) + return *new([32]byte), err } out0 := *abi.ConvertType(out[0], new([32]byte)).(*[32]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -516,12 +515,12 @@ func (_Hermez *HermezCaller) LastForgedBatch(opts *bind.CallOpts) (uint32, error err := _Hermez.contract.Call(opts, &out, "lastForgedBatch") if err != nil { - return *new(uint32), tracerr.Wrap(err) + return *new(uint32), err } out0 := *abi.ConvertType(out[0], new(uint32)).(*uint32) - return out0, tracerr.Wrap(err) + return out0, err } @@ -547,12 +546,12 @@ func (_Hermez *HermezCaller) LastIdx(opts *bind.CallOpts) (*big.Int, error) { err := _Hermez.contract.Call(opts, &out, "lastIdx") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -578,12 +577,12 @@ func (_Hermez *HermezCaller) LastL1L2Batch(opts *bind.CallOpts) (uint64, error) err := _Hermez.contract.Call(opts, &out, "lastL1L2Batch") if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -609,12 +608,12 @@ func (_Hermez *HermezCaller) MapL1TxQueue(opts *bind.CallOpts, arg0 uint32) ([]b err := _Hermez.contract.Call(opts, &out, "mapL1TxQueue", arg0) if err != nil { - return *new([]byte), tracerr.Wrap(err) + return *new([]byte), err } out0 := *abi.ConvertType(out[0], new([]byte)).(*[]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -640,12 +639,12 @@ func (_Hermez *HermezCaller) NextL1FillingQueue(opts *bind.CallOpts) (uint32, er err := _Hermez.contract.Call(opts, &out, "nextL1FillingQueue") if err != nil { - return *new(uint32), tracerr.Wrap(err) + return *new(uint32), err } out0 := *abi.ConvertType(out[0], new(uint32)).(*uint32) - return out0, tracerr.Wrap(err) + return out0, err } @@ -671,12 +670,12 @@ func (_Hermez *HermezCaller) NextL1ToForgeQueue(opts *bind.CallOpts) (uint32, er err := _Hermez.contract.Call(opts, &out, "nextL1ToForgeQueue") if err != nil { - return *new(uint32), tracerr.Wrap(err) + return *new(uint32), err } out0 := *abi.ConvertType(out[0], new(uint32)).(*uint32) - return out0, tracerr.Wrap(err) + return out0, err } @@ -702,12 +701,12 @@ func (_Hermez *HermezCaller) RegisterTokensCount(opts *bind.CallOpts) (*big.Int, err := _Hermez.contract.Call(opts, &out, "registerTokensCount") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -746,7 +745,7 @@ func (_Hermez *HermezCaller) RollupVerifiers(opts *bind.CallOpts, arg0 *big.Int) outstruct.MaxTx = out[1].(*big.Int) outstruct.NLevels = out[2].(*big.Int) - return *outstruct, tracerr.Wrap(err) + return *outstruct, err } @@ -772,6 +771,37 @@ func (_Hermez *HermezCallerSession) RollupVerifiers(arg0 *big.Int) (struct { return _Hermez.Contract.RollupVerifiers(&_Hermez.CallOpts, arg0) } +// RollupVerifiersLength is a free data retrieval call binding the contract method 0x7ba3a5e0. +// +// Solidity: function rollupVerifiersLength() view returns(uint256) +func (_Hermez *HermezCaller) RollupVerifiersLength(opts *bind.CallOpts) (*big.Int, error) { + var out []interface{} + err := _Hermez.contract.Call(opts, &out, "rollupVerifiersLength") + + if err != nil { + return *new(*big.Int), err + } + + out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) + + return out0, err + +} + +// RollupVerifiersLength is a free data retrieval call binding the contract method 0x7ba3a5e0. +// +// Solidity: function rollupVerifiersLength() view returns(uint256) +func (_Hermez *HermezSession) RollupVerifiersLength() (*big.Int, error) { + return _Hermez.Contract.RollupVerifiersLength(&_Hermez.CallOpts) +} + +// RollupVerifiersLength is a free data retrieval call binding the contract method 0x7ba3a5e0. +// +// Solidity: function rollupVerifiersLength() view returns(uint256) +func (_Hermez *HermezCallerSession) RollupVerifiersLength() (*big.Int, error) { + return _Hermez.Contract.RollupVerifiersLength(&_Hermez.CallOpts) +} + // StateRootMap is a free data retrieval call binding the contract method 0x9e00d7ea. // // Solidity: function stateRootMap(uint32 ) view returns(uint256) @@ -780,12 +810,12 @@ func (_Hermez *HermezCaller) StateRootMap(opts *bind.CallOpts, arg0 uint32) (*bi err := _Hermez.contract.Call(opts, &out, "stateRootMap", arg0) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -811,12 +841,12 @@ func (_Hermez *HermezCaller) TokenExchange(opts *bind.CallOpts, arg0 common.Addr err := _Hermez.contract.Call(opts, &out, "tokenExchange", arg0) if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -842,12 +872,12 @@ func (_Hermez *HermezCaller) TokenHEZ(opts *bind.CallOpts) (common.Address, erro err := _Hermez.contract.Call(opts, &out, "tokenHEZ") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -873,12 +903,12 @@ func (_Hermez *HermezCaller) TokenList(opts *bind.CallOpts, arg0 *big.Int) (comm err := _Hermez.contract.Call(opts, &out, "tokenList", arg0) if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -904,12 +934,12 @@ func (_Hermez *HermezCaller) TokenMap(opts *bind.CallOpts, arg0 common.Address) err := _Hermez.contract.Call(opts, &out, "tokenMap", arg0) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -935,12 +965,12 @@ func (_Hermez *HermezCaller) WithdrawDelayerContract(opts *bind.CallOpts) (commo err := _Hermez.contract.Call(opts, &out, "withdrawDelayerContract") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -966,12 +996,12 @@ func (_Hermez *HermezCaller) WithdrawVerifier(opts *bind.CallOpts) (common.Addre err := _Hermez.contract.Call(opts, &out, "withdrawVerifier") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -997,12 +1027,12 @@ func (_Hermez *HermezCaller) WithdrawalDelay(opts *bind.CallOpts) (uint64, error err := _Hermez.contract.Call(opts, &out, "withdrawalDelay") if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -1358,7 +1388,7 @@ func (_Hermez *HermezFilterer) FilterAddToken(opts *bind.FilterOpts, tokenAddres logs, sub, err := _Hermez.contract.FilterLogs(opts, "AddToken", tokenAddressRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezAddTokenIterator{contract: _Hermez.contract, event: "AddToken", logs: logs, sub: sub}, nil } @@ -1375,7 +1405,7 @@ func (_Hermez *HermezFilterer) WatchAddToken(opts *bind.WatchOpts, sink chan<- * logs, sub, err := _Hermez.contract.WatchLogs(opts, "AddToken", tokenAddressRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1385,19 +1415,19 @@ func (_Hermez *HermezFilterer) WatchAddToken(opts *bind.WatchOpts, sink chan<- * // New log arrived, parse the event and forward to the user event := new(HermezAddToken) if err := _Hermez.contract.UnpackLog(event, "AddToken", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1411,7 +1441,7 @@ func (_Hermez *HermezFilterer) WatchAddToken(opts *bind.WatchOpts, sink chan<- * func (_Hermez *HermezFilterer) ParseAddToken(log types.Log) (*HermezAddToken, error) { event := new(HermezAddToken) if err := _Hermez.contract.UnpackLog(event, "AddToken", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1503,7 +1533,7 @@ func (_Hermez *HermezFilterer) FilterForgeBatch(opts *bind.FilterOpts, batchNum logs, sub, err := _Hermez.contract.FilterLogs(opts, "ForgeBatch", batchNumRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezForgeBatchIterator{contract: _Hermez.contract, event: "ForgeBatch", logs: logs, sub: sub}, nil } @@ -1520,7 +1550,7 @@ func (_Hermez *HermezFilterer) WatchForgeBatch(opts *bind.WatchOpts, sink chan<- logs, sub, err := _Hermez.contract.WatchLogs(opts, "ForgeBatch", batchNumRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1530,19 +1560,19 @@ func (_Hermez *HermezFilterer) WatchForgeBatch(opts *bind.WatchOpts, sink chan<- // New log arrived, parse the event and forward to the user event := new(HermezForgeBatch) if err := _Hermez.contract.UnpackLog(event, "ForgeBatch", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1556,7 +1586,7 @@ func (_Hermez *HermezFilterer) WatchForgeBatch(opts *bind.WatchOpts, sink chan<- func (_Hermez *HermezFilterer) ParseForgeBatch(log types.Log) (*HermezForgeBatch, error) { event := new(HermezForgeBatch) if err := _Hermez.contract.UnpackLog(event, "ForgeBatch", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1644,7 +1674,7 @@ func (_Hermez *HermezFilterer) FilterInitializeHermezEvent(opts *bind.FilterOpts logs, sub, err := _Hermez.contract.FilterLogs(opts, "InitializeHermezEvent") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezInitializeHermezEventIterator{contract: _Hermez.contract, event: "InitializeHermezEvent", logs: logs, sub: sub}, nil } @@ -1656,7 +1686,7 @@ func (_Hermez *HermezFilterer) WatchInitializeHermezEvent(opts *bind.WatchOpts, logs, sub, err := _Hermez.contract.WatchLogs(opts, "InitializeHermezEvent") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1666,19 +1696,19 @@ func (_Hermez *HermezFilterer) WatchInitializeHermezEvent(opts *bind.WatchOpts, // New log arrived, parse the event and forward to the user event := new(HermezInitializeHermezEvent) if err := _Hermez.contract.UnpackLog(event, "InitializeHermezEvent", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1692,7 +1722,7 @@ func (_Hermez *HermezFilterer) WatchInitializeHermezEvent(opts *bind.WatchOpts, func (_Hermez *HermezFilterer) ParseInitializeHermezEvent(log types.Log) (*HermezInitializeHermezEvent, error) { event := new(HermezInitializeHermezEvent) if err := _Hermez.contract.UnpackLog(event, "InitializeHermezEvent", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1789,7 +1819,7 @@ func (_Hermez *HermezFilterer) FilterL1UserTxEvent(opts *bind.FilterOpts, queueI logs, sub, err := _Hermez.contract.FilterLogs(opts, "L1UserTxEvent", queueIndexRule, positionRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezL1UserTxEventIterator{contract: _Hermez.contract, event: "L1UserTxEvent", logs: logs, sub: sub}, nil } @@ -1810,7 +1840,7 @@ func (_Hermez *HermezFilterer) WatchL1UserTxEvent(opts *bind.WatchOpts, sink cha logs, sub, err := _Hermez.contract.WatchLogs(opts, "L1UserTxEvent", queueIndexRule, positionRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1820,19 +1850,19 @@ func (_Hermez *HermezFilterer) WatchL1UserTxEvent(opts *bind.WatchOpts, sink cha // New log arrived, parse the event and forward to the user event := new(HermezL1UserTxEvent) if err := _Hermez.contract.UnpackLog(event, "L1UserTxEvent", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1846,7 +1876,7 @@ func (_Hermez *HermezFilterer) WatchL1UserTxEvent(opts *bind.WatchOpts, sink cha func (_Hermez *HermezFilterer) ParseL1UserTxEvent(log types.Log) (*HermezL1UserTxEvent, error) { event := new(HermezL1UserTxEvent) if err := _Hermez.contract.UnpackLog(event, "L1UserTxEvent", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1931,7 +1961,7 @@ func (_Hermez *HermezFilterer) FilterSafeMode(opts *bind.FilterOpts) (*HermezSaf logs, sub, err := _Hermez.contract.FilterLogs(opts, "SafeMode") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezSafeModeIterator{contract: _Hermez.contract, event: "SafeMode", logs: logs, sub: sub}, nil } @@ -1943,7 +1973,7 @@ func (_Hermez *HermezFilterer) WatchSafeMode(opts *bind.WatchOpts, sink chan<- * logs, sub, err := _Hermez.contract.WatchLogs(opts, "SafeMode") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1953,19 +1983,19 @@ func (_Hermez *HermezFilterer) WatchSafeMode(opts *bind.WatchOpts, sink chan<- * // New log arrived, parse the event and forward to the user event := new(HermezSafeMode) if err := _Hermez.contract.UnpackLog(event, "SafeMode", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1979,7 +2009,7 @@ func (_Hermez *HermezFilterer) WatchSafeMode(opts *bind.WatchOpts, sink chan<- * func (_Hermez *HermezFilterer) ParseSafeMode(log types.Log) (*HermezSafeMode, error) { event := new(HermezSafeMode) if err := _Hermez.contract.UnpackLog(event, "SafeMode", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2076,7 +2106,7 @@ func (_Hermez *HermezFilterer) FilterUpdateBucketWithdraw(opts *bind.FilterOpts, logs, sub, err := _Hermez.contract.FilterLogs(opts, "UpdateBucketWithdraw", numBucketRule, blockStampRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezUpdateBucketWithdrawIterator{contract: _Hermez.contract, event: "UpdateBucketWithdraw", logs: logs, sub: sub}, nil } @@ -2097,7 +2127,7 @@ func (_Hermez *HermezFilterer) WatchUpdateBucketWithdraw(opts *bind.WatchOpts, s logs, sub, err := _Hermez.contract.WatchLogs(opts, "UpdateBucketWithdraw", numBucketRule, blockStampRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2107,19 +2137,19 @@ func (_Hermez *HermezFilterer) WatchUpdateBucketWithdraw(opts *bind.WatchOpts, s // New log arrived, parse the event and forward to the user event := new(HermezUpdateBucketWithdraw) if err := _Hermez.contract.UnpackLog(event, "UpdateBucketWithdraw", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2133,7 +2163,7 @@ func (_Hermez *HermezFilterer) WatchUpdateBucketWithdraw(opts *bind.WatchOpts, s func (_Hermez *HermezFilterer) ParseUpdateBucketWithdraw(log types.Log) (*HermezUpdateBucketWithdraw, error) { event := new(HermezUpdateBucketWithdraw) if err := _Hermez.contract.UnpackLog(event, "UpdateBucketWithdraw", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2219,7 +2249,7 @@ func (_Hermez *HermezFilterer) FilterUpdateBucketsParameters(opts *bind.FilterOp logs, sub, err := _Hermez.contract.FilterLogs(opts, "UpdateBucketsParameters") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezUpdateBucketsParametersIterator{contract: _Hermez.contract, event: "UpdateBucketsParameters", logs: logs, sub: sub}, nil } @@ -2231,7 +2261,7 @@ func (_Hermez *HermezFilterer) WatchUpdateBucketsParameters(opts *bind.WatchOpts logs, sub, err := _Hermez.contract.WatchLogs(opts, "UpdateBucketsParameters") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2241,19 +2271,19 @@ func (_Hermez *HermezFilterer) WatchUpdateBucketsParameters(opts *bind.WatchOpts // New log arrived, parse the event and forward to the user event := new(HermezUpdateBucketsParameters) if err := _Hermez.contract.UnpackLog(event, "UpdateBucketsParameters", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2267,7 +2297,7 @@ func (_Hermez *HermezFilterer) WatchUpdateBucketsParameters(opts *bind.WatchOpts func (_Hermez *HermezFilterer) ParseUpdateBucketsParameters(log types.Log) (*HermezUpdateBucketsParameters, error) { event := new(HermezUpdateBucketsParameters) if err := _Hermez.contract.UnpackLog(event, "UpdateBucketsParameters", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2353,7 +2383,7 @@ func (_Hermez *HermezFilterer) FilterUpdateFeeAddToken(opts *bind.FilterOpts) (* logs, sub, err := _Hermez.contract.FilterLogs(opts, "UpdateFeeAddToken") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezUpdateFeeAddTokenIterator{contract: _Hermez.contract, event: "UpdateFeeAddToken", logs: logs, sub: sub}, nil } @@ -2365,7 +2395,7 @@ func (_Hermez *HermezFilterer) WatchUpdateFeeAddToken(opts *bind.WatchOpts, sink logs, sub, err := _Hermez.contract.WatchLogs(opts, "UpdateFeeAddToken") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2375,19 +2405,19 @@ func (_Hermez *HermezFilterer) WatchUpdateFeeAddToken(opts *bind.WatchOpts, sink // New log arrived, parse the event and forward to the user event := new(HermezUpdateFeeAddToken) if err := _Hermez.contract.UnpackLog(event, "UpdateFeeAddToken", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2401,7 +2431,7 @@ func (_Hermez *HermezFilterer) WatchUpdateFeeAddToken(opts *bind.WatchOpts, sink func (_Hermez *HermezFilterer) ParseUpdateFeeAddToken(log types.Log) (*HermezUpdateFeeAddToken, error) { event := new(HermezUpdateFeeAddToken) if err := _Hermez.contract.UnpackLog(event, "UpdateFeeAddToken", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2487,7 +2517,7 @@ func (_Hermez *HermezFilterer) FilterUpdateForgeL1L2BatchTimeout(opts *bind.Filt logs, sub, err := _Hermez.contract.FilterLogs(opts, "UpdateForgeL1L2BatchTimeout") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezUpdateForgeL1L2BatchTimeoutIterator{contract: _Hermez.contract, event: "UpdateForgeL1L2BatchTimeout", logs: logs, sub: sub}, nil } @@ -2499,7 +2529,7 @@ func (_Hermez *HermezFilterer) WatchUpdateForgeL1L2BatchTimeout(opts *bind.Watch logs, sub, err := _Hermez.contract.WatchLogs(opts, "UpdateForgeL1L2BatchTimeout") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2509,19 +2539,19 @@ func (_Hermez *HermezFilterer) WatchUpdateForgeL1L2BatchTimeout(opts *bind.Watch // New log arrived, parse the event and forward to the user event := new(HermezUpdateForgeL1L2BatchTimeout) if err := _Hermez.contract.UnpackLog(event, "UpdateForgeL1L2BatchTimeout", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2535,7 +2565,7 @@ func (_Hermez *HermezFilterer) WatchUpdateForgeL1L2BatchTimeout(opts *bind.Watch func (_Hermez *HermezFilterer) ParseUpdateForgeL1L2BatchTimeout(log types.Log) (*HermezUpdateForgeL1L2BatchTimeout, error) { event := new(HermezUpdateForgeL1L2BatchTimeout) if err := _Hermez.contract.UnpackLog(event, "UpdateForgeL1L2BatchTimeout", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2622,7 +2652,7 @@ func (_Hermez *HermezFilterer) FilterUpdateTokenExchange(opts *bind.FilterOpts) logs, sub, err := _Hermez.contract.FilterLogs(opts, "UpdateTokenExchange") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezUpdateTokenExchangeIterator{contract: _Hermez.contract, event: "UpdateTokenExchange", logs: logs, sub: sub}, nil } @@ -2634,7 +2664,7 @@ func (_Hermez *HermezFilterer) WatchUpdateTokenExchange(opts *bind.WatchOpts, si logs, sub, err := _Hermez.contract.WatchLogs(opts, "UpdateTokenExchange") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2644,19 +2674,19 @@ func (_Hermez *HermezFilterer) WatchUpdateTokenExchange(opts *bind.WatchOpts, si // New log arrived, parse the event and forward to the user event := new(HermezUpdateTokenExchange) if err := _Hermez.contract.UnpackLog(event, "UpdateTokenExchange", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2670,7 +2700,7 @@ func (_Hermez *HermezFilterer) WatchUpdateTokenExchange(opts *bind.WatchOpts, si func (_Hermez *HermezFilterer) ParseUpdateTokenExchange(log types.Log) (*HermezUpdateTokenExchange, error) { event := new(HermezUpdateTokenExchange) if err := _Hermez.contract.UnpackLog(event, "UpdateTokenExchange", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2756,7 +2786,7 @@ func (_Hermez *HermezFilterer) FilterUpdateWithdrawalDelay(opts *bind.FilterOpts logs, sub, err := _Hermez.contract.FilterLogs(opts, "UpdateWithdrawalDelay") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezUpdateWithdrawalDelayIterator{contract: _Hermez.contract, event: "UpdateWithdrawalDelay", logs: logs, sub: sub}, nil } @@ -2768,7 +2798,7 @@ func (_Hermez *HermezFilterer) WatchUpdateWithdrawalDelay(opts *bind.WatchOpts, logs, sub, err := _Hermez.contract.WatchLogs(opts, "UpdateWithdrawalDelay") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2778,19 +2808,19 @@ func (_Hermez *HermezFilterer) WatchUpdateWithdrawalDelay(opts *bind.WatchOpts, // New log arrived, parse the event and forward to the user event := new(HermezUpdateWithdrawalDelay) if err := _Hermez.contract.UnpackLog(event, "UpdateWithdrawalDelay", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2804,7 +2834,7 @@ func (_Hermez *HermezFilterer) WatchUpdateWithdrawalDelay(opts *bind.WatchOpts, func (_Hermez *HermezFilterer) ParseUpdateWithdrawalDelay(log types.Log) (*HermezUpdateWithdrawalDelay, error) { event := new(HermezUpdateWithdrawalDelay) if err := _Hermez.contract.UnpackLog(event, "UpdateWithdrawalDelay", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -2905,7 +2935,7 @@ func (_Hermez *HermezFilterer) FilterWithdrawEvent(opts *bind.FilterOpts, idx [] logs, sub, err := _Hermez.contract.FilterLogs(opts, "WithdrawEvent", idxRule, numExitRootRule, instantWithdrawRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HermezWithdrawEventIterator{contract: _Hermez.contract, event: "WithdrawEvent", logs: logs, sub: sub}, nil } @@ -2930,7 +2960,7 @@ func (_Hermez *HermezFilterer) WatchWithdrawEvent(opts *bind.WatchOpts, sink cha logs, sub, err := _Hermez.contract.WatchLogs(opts, "WithdrawEvent", idxRule, numExitRootRule, instantWithdrawRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -2940,19 +2970,19 @@ func (_Hermez *HermezFilterer) WatchWithdrawEvent(opts *bind.WatchOpts, sink cha // New log arrived, parse the event and forward to the user event := new(HermezWithdrawEvent) if err := _Hermez.contract.UnpackLog(event, "WithdrawEvent", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -2966,7 +2996,7 @@ func (_Hermez *HermezFilterer) WatchWithdrawEvent(opts *bind.WatchOpts, sink cha func (_Hermez *HermezFilterer) ParseWithdrawEvent(log types.Log) (*HermezWithdrawEvent, error) { event := new(HermezWithdrawEvent) if err := _Hermez.contract.UnpackLog(event, "WithdrawEvent", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil diff --git a/eth/contracts/tokenHEZ/HEZ.go b/eth/contracts/tokenHEZ/HEZ.go index 7ca67a6..ae75b22 100644 --- a/eth/contracts/tokenHEZ/HEZ.go +++ b/eth/contracts/tokenHEZ/HEZ.go @@ -13,7 +13,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - "github.com/hermeznetwork/tracerr" ) // Reference imports to suppress errors if they are not otherwise used. @@ -93,7 +92,7 @@ type HEZTransactorRaw struct { func NewHEZ(address common.Address, backend bind.ContractBackend) (*HEZ, error) { contract, err := bindHEZ(address, backend, backend, backend) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZ{HEZCaller: HEZCaller{contract: contract}, HEZTransactor: HEZTransactor{contract: contract}, HEZFilterer: HEZFilterer{contract: contract}}, nil } @@ -102,7 +101,7 @@ func NewHEZ(address common.Address, backend bind.ContractBackend) (*HEZ, error) func NewHEZCaller(address common.Address, caller bind.ContractCaller) (*HEZCaller, error) { contract, err := bindHEZ(address, caller, nil, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZCaller{contract: contract}, nil } @@ -111,7 +110,7 @@ func NewHEZCaller(address common.Address, caller bind.ContractCaller) (*HEZCalle func NewHEZTransactor(address common.Address, transactor bind.ContractTransactor) (*HEZTransactor, error) { contract, err := bindHEZ(address, nil, transactor, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZTransactor{contract: contract}, nil } @@ -120,7 +119,7 @@ func NewHEZTransactor(address common.Address, transactor bind.ContractTransactor func NewHEZFilterer(address common.Address, filterer bind.ContractFilterer) (*HEZFilterer, error) { contract, err := bindHEZ(address, nil, nil, filterer) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZFilterer{contract: contract}, nil } @@ -129,7 +128,7 @@ func NewHEZFilterer(address common.Address, filterer bind.ContractFilterer) (*HE func bindHEZ(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) { parsed, err := abi.JSON(strings.NewReader(HEZABI)) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil } @@ -180,12 +179,12 @@ func (_HEZ *HEZCaller) EIP712DOMAINHASH(opts *bind.CallOpts) ([32]byte, error) { err := _HEZ.contract.Call(opts, &out, "EIP712DOMAIN_HASH") if err != nil { - return *new([32]byte), tracerr.Wrap(err) + return *new([32]byte), err } out0 := *abi.ConvertType(out[0], new([32]byte)).(*[32]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -211,12 +210,12 @@ func (_HEZ *HEZCaller) NAMEHASH(opts *bind.CallOpts) ([32]byte, error) { err := _HEZ.contract.Call(opts, &out, "NAME_HASH") if err != nil { - return *new([32]byte), tracerr.Wrap(err) + return *new([32]byte), err } out0 := *abi.ConvertType(out[0], new([32]byte)).(*[32]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -242,12 +241,12 @@ func (_HEZ *HEZCaller) PERMITTYPEHASH(opts *bind.CallOpts) ([32]byte, error) { err := _HEZ.contract.Call(opts, &out, "PERMIT_TYPEHASH") if err != nil { - return *new([32]byte), tracerr.Wrap(err) + return *new([32]byte), err } out0 := *abi.ConvertType(out[0], new([32]byte)).(*[32]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -273,12 +272,12 @@ func (_HEZ *HEZCaller) TRANSFERWITHAUTHORIZATIONTYPEHASH(opts *bind.CallOpts) ([ err := _HEZ.contract.Call(opts, &out, "TRANSFER_WITH_AUTHORIZATION_TYPEHASH") if err != nil { - return *new([32]byte), tracerr.Wrap(err) + return *new([32]byte), err } out0 := *abi.ConvertType(out[0], new([32]byte)).(*[32]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -304,12 +303,12 @@ func (_HEZ *HEZCaller) VERSIONHASH(opts *bind.CallOpts) ([32]byte, error) { err := _HEZ.contract.Call(opts, &out, "VERSION_HASH") if err != nil { - return *new([32]byte), tracerr.Wrap(err) + return *new([32]byte), err } out0 := *abi.ConvertType(out[0], new([32]byte)).(*[32]byte) - return out0, tracerr.Wrap(err) + return out0, err } @@ -335,12 +334,12 @@ func (_HEZ *HEZCaller) Allowance(opts *bind.CallOpts, arg0 common.Address, arg1 err := _HEZ.contract.Call(opts, &out, "allowance", arg0, arg1) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -366,12 +365,12 @@ func (_HEZ *HEZCaller) AuthorizationState(opts *bind.CallOpts, arg0 common.Addre err := _HEZ.contract.Call(opts, &out, "authorizationState", arg0, arg1) if err != nil { - return *new(bool), tracerr.Wrap(err) + return *new(bool), err } out0 := *abi.ConvertType(out[0], new(bool)).(*bool) - return out0, tracerr.Wrap(err) + return out0, err } @@ -397,12 +396,12 @@ func (_HEZ *HEZCaller) BalanceOf(opts *bind.CallOpts, arg0 common.Address) (*big err := _HEZ.contract.Call(opts, &out, "balanceOf", arg0) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -428,12 +427,12 @@ func (_HEZ *HEZCaller) Decimals(opts *bind.CallOpts) (uint8, error) { err := _HEZ.contract.Call(opts, &out, "decimals") if err != nil { - return *new(uint8), tracerr.Wrap(err) + return *new(uint8), err } out0 := *abi.ConvertType(out[0], new(uint8)).(*uint8) - return out0, tracerr.Wrap(err) + return out0, err } @@ -459,12 +458,12 @@ func (_HEZ *HEZCaller) GetChainId(opts *bind.CallOpts) (*big.Int, error) { err := _HEZ.contract.Call(opts, &out, "getChainId") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -490,12 +489,12 @@ func (_HEZ *HEZCaller) InitialBalance(opts *bind.CallOpts) (*big.Int, error) { err := _HEZ.contract.Call(opts, &out, "initialBalance") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -521,12 +520,12 @@ func (_HEZ *HEZCaller) Name(opts *bind.CallOpts) (string, error) { err := _HEZ.contract.Call(opts, &out, "name") if err != nil { - return *new(string), tracerr.Wrap(err) + return *new(string), err } out0 := *abi.ConvertType(out[0], new(string)).(*string) - return out0, tracerr.Wrap(err) + return out0, err } @@ -552,12 +551,12 @@ func (_HEZ *HEZCaller) Nonces(opts *bind.CallOpts, arg0 common.Address) (*big.In err := _HEZ.contract.Call(opts, &out, "nonces", arg0) if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -583,12 +582,12 @@ func (_HEZ *HEZCaller) Symbol(opts *bind.CallOpts) (string, error) { err := _HEZ.contract.Call(opts, &out, "symbol") if err != nil { - return *new(string), tracerr.Wrap(err) + return *new(string), err } out0 := *abi.ConvertType(out[0], new(string)).(*string) - return out0, tracerr.Wrap(err) + return out0, err } @@ -614,12 +613,12 @@ func (_HEZ *HEZCaller) TotalSupply(opts *bind.CallOpts) (*big.Int, error) { err := _HEZ.contract.Call(opts, &out, "totalSupply") if err != nil { - return *new(*big.Int), tracerr.Wrap(err) + return *new(*big.Int), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) - return out0, tracerr.Wrap(err) + return out0, err } @@ -854,7 +853,7 @@ func (_HEZ *HEZFilterer) FilterApproval(opts *bind.FilterOpts, owner []common.Ad logs, sub, err := _HEZ.contract.FilterLogs(opts, "Approval", ownerRule, spenderRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZApprovalIterator{contract: _HEZ.contract, event: "Approval", logs: logs, sub: sub}, nil } @@ -875,7 +874,7 @@ func (_HEZ *HEZFilterer) WatchApproval(opts *bind.WatchOpts, sink chan<- *HEZApp logs, sub, err := _HEZ.contract.WatchLogs(opts, "Approval", ownerRule, spenderRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -885,19 +884,19 @@ func (_HEZ *HEZFilterer) WatchApproval(opts *bind.WatchOpts, sink chan<- *HEZApp // New log arrived, parse the event and forward to the user event := new(HEZApproval) if err := _HEZ.contract.UnpackLog(event, "Approval", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -911,7 +910,7 @@ func (_HEZ *HEZFilterer) WatchApproval(opts *bind.WatchOpts, sink chan<- *HEZApp func (_HEZ *HEZFilterer) ParseApproval(log types.Log) (*HEZApproval, error) { event := new(HEZApproval) if err := _HEZ.contract.UnpackLog(event, "Approval", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1007,7 +1006,7 @@ func (_HEZ *HEZFilterer) FilterAuthorizationUsed(opts *bind.FilterOpts, authoriz logs, sub, err := _HEZ.contract.FilterLogs(opts, "AuthorizationUsed", authorizerRule, nonceRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZAuthorizationUsedIterator{contract: _HEZ.contract, event: "AuthorizationUsed", logs: logs, sub: sub}, nil } @@ -1028,7 +1027,7 @@ func (_HEZ *HEZFilterer) WatchAuthorizationUsed(opts *bind.WatchOpts, sink chan< logs, sub, err := _HEZ.contract.WatchLogs(opts, "AuthorizationUsed", authorizerRule, nonceRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1038,19 +1037,19 @@ func (_HEZ *HEZFilterer) WatchAuthorizationUsed(opts *bind.WatchOpts, sink chan< // New log arrived, parse the event and forward to the user event := new(HEZAuthorizationUsed) if err := _HEZ.contract.UnpackLog(event, "AuthorizationUsed", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1064,7 +1063,7 @@ func (_HEZ *HEZFilterer) WatchAuthorizationUsed(opts *bind.WatchOpts, sink chan< func (_HEZ *HEZFilterer) ParseAuthorizationUsed(log types.Log) (*HEZAuthorizationUsed, error) { event := new(HEZAuthorizationUsed) if err := _HEZ.contract.UnpackLog(event, "AuthorizationUsed", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1161,7 +1160,7 @@ func (_HEZ *HEZFilterer) FilterTransfer(opts *bind.FilterOpts, from []common.Add logs, sub, err := _HEZ.contract.FilterLogs(opts, "Transfer", fromRule, toRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &HEZTransferIterator{contract: _HEZ.contract, event: "Transfer", logs: logs, sub: sub}, nil } @@ -1182,7 +1181,7 @@ func (_HEZ *HEZFilterer) WatchTransfer(opts *bind.WatchOpts, sink chan<- *HEZTra logs, sub, err := _HEZ.contract.WatchLogs(opts, "Transfer", fromRule, toRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1192,19 +1191,19 @@ func (_HEZ *HEZFilterer) WatchTransfer(opts *bind.WatchOpts, sink chan<- *HEZTra // New log arrived, parse the event and forward to the user event := new(HEZTransfer) if err := _HEZ.contract.UnpackLog(event, "Transfer", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1218,7 +1217,7 @@ func (_HEZ *HEZFilterer) WatchTransfer(opts *bind.WatchOpts, sink chan<- *HEZTra func (_HEZ *HEZFilterer) ParseTransfer(log types.Log) (*HEZTransfer, error) { event := new(HEZTransfer) if err := _HEZ.contract.UnpackLog(event, "Transfer", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil diff --git a/eth/contracts/withdrawdelayer/WithdrawalDelayer.go b/eth/contracts/withdrawdelayer/WithdrawalDelayer.go index c07fba1..ffb4f65 100644 --- a/eth/contracts/withdrawdelayer/WithdrawalDelayer.go +++ b/eth/contracts/withdrawdelayer/WithdrawalDelayer.go @@ -13,7 +13,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - "github.com/hermeznetwork/tracerr" ) // Reference imports to suppress errors if they are not otherwise used. @@ -93,7 +92,7 @@ type WithdrawalDelayerTransactorRaw struct { func NewWithdrawalDelayer(address common.Address, backend bind.ContractBackend) (*WithdrawalDelayer, error) { contract, err := bindWithdrawalDelayer(address, backend, backend, backend) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayer{WithdrawalDelayerCaller: WithdrawalDelayerCaller{contract: contract}, WithdrawalDelayerTransactor: WithdrawalDelayerTransactor{contract: contract}, WithdrawalDelayerFilterer: WithdrawalDelayerFilterer{contract: contract}}, nil } @@ -102,7 +101,7 @@ func NewWithdrawalDelayer(address common.Address, backend bind.ContractBackend) func NewWithdrawalDelayerCaller(address common.Address, caller bind.ContractCaller) (*WithdrawalDelayerCaller, error) { contract, err := bindWithdrawalDelayer(address, caller, nil, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerCaller{contract: contract}, nil } @@ -111,7 +110,7 @@ func NewWithdrawalDelayerCaller(address common.Address, caller bind.ContractCall func NewWithdrawalDelayerTransactor(address common.Address, transactor bind.ContractTransactor) (*WithdrawalDelayerTransactor, error) { contract, err := bindWithdrawalDelayer(address, nil, transactor, nil) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerTransactor{contract: contract}, nil } @@ -120,7 +119,7 @@ func NewWithdrawalDelayerTransactor(address common.Address, transactor bind.Cont func NewWithdrawalDelayerFilterer(address common.Address, filterer bind.ContractFilterer) (*WithdrawalDelayerFilterer, error) { contract, err := bindWithdrawalDelayer(address, nil, nil, filterer) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerFilterer{contract: contract}, nil } @@ -129,7 +128,7 @@ func NewWithdrawalDelayerFilterer(address common.Address, filterer bind.Contract func bindWithdrawalDelayer(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) { parsed, err := abi.JSON(strings.NewReader(WithdrawalDelayerABI)) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil } @@ -180,12 +179,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) MAXEMERGENCYMODETIME(opts *bi err := _WithdrawalDelayer.contract.Call(opts, &out, "MAX_EMERGENCY_MODE_TIME") if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -211,12 +210,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) MAXWITHDRAWALDELAY(opts *bind err := _WithdrawalDelayer.contract.Call(opts, &out, "MAX_WITHDRAWAL_DELAY") if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -242,13 +241,13 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) DepositInfo(opts *bind.CallOp err := _WithdrawalDelayer.contract.Call(opts, &out, "depositInfo", _owner, _token) if err != nil { - return *new(*big.Int), *new(uint64), tracerr.Wrap(err) + return *new(*big.Int), *new(uint64), err } out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int) out1 := *abi.ConvertType(out[1], new(uint64)).(*uint64) - return out0, out1, tracerr.Wrap(err) + return out0, out1, err } @@ -284,7 +283,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) Deposits(opts *bind.CallOpts, outstruct.Amount = out[0].(*big.Int) outstruct.DepositTimestamp = out[1].(uint64) - return *outstruct, tracerr.Wrap(err) + return *outstruct, err } @@ -316,12 +315,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) GetEmergencyCouncil(opts *bin err := _WithdrawalDelayer.contract.Call(opts, &out, "getEmergencyCouncil") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -347,12 +346,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) GetEmergencyModeStartingTime( err := _WithdrawalDelayer.contract.Call(opts, &out, "getEmergencyModeStartingTime") if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -378,12 +377,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) GetHermezGovernanceAddress(op err := _WithdrawalDelayer.contract.Call(opts, &out, "getHermezGovernanceAddress") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -409,12 +408,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) GetWithdrawalDelay(opts *bind err := _WithdrawalDelayer.contract.Call(opts, &out, "getWithdrawalDelay") if err != nil { - return *new(uint64), tracerr.Wrap(err) + return *new(uint64), err } out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64) - return out0, tracerr.Wrap(err) + return out0, err } @@ -440,12 +439,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) HermezRollupAddress(opts *bin err := _WithdrawalDelayer.contract.Call(opts, &out, "hermezRollupAddress") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -471,12 +470,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) IsEmergencyMode(opts *bind.Ca err := _WithdrawalDelayer.contract.Call(opts, &out, "isEmergencyMode") if err != nil { - return *new(bool), tracerr.Wrap(err) + return *new(bool), err } out0 := *abi.ConvertType(out[0], new(bool)).(*bool) - return out0, tracerr.Wrap(err) + return out0, err } @@ -502,12 +501,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) PendingEmergencyCouncil(opts err := _WithdrawalDelayer.contract.Call(opts, &out, "pendingEmergencyCouncil") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -533,12 +532,12 @@ func (_WithdrawalDelayer *WithdrawalDelayerCaller) PendingGovernance(opts *bind. err := _WithdrawalDelayer.contract.Call(opts, &out, "pendingGovernance") if err != nil { - return *new(common.Address), tracerr.Wrap(err) + return *new(common.Address), err } out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - return out0, tracerr.Wrap(err) + return out0, err } @@ -858,7 +857,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterDeposit(opts *bind.Fi logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "Deposit", ownerRule, tokenRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerDepositIterator{contract: _WithdrawalDelayer.contract, event: "Deposit", logs: logs, sub: sub}, nil } @@ -879,7 +878,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchDeposit(opts *bind.Wat logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "Deposit", ownerRule, tokenRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -889,19 +888,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchDeposit(opts *bind.Wat // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerDeposit) if err := _WithdrawalDelayer.contract.UnpackLog(event, "Deposit", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -915,7 +914,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchDeposit(opts *bind.Wat func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseDeposit(log types.Log) (*WithdrawalDelayerDeposit, error) { event := new(WithdrawalDelayerDeposit) if err := _WithdrawalDelayer.contract.UnpackLog(event, "Deposit", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1000,7 +999,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterEmergencyModeEnabled( logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "EmergencyModeEnabled") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerEmergencyModeEnabledIterator{contract: _WithdrawalDelayer.contract, event: "EmergencyModeEnabled", logs: logs, sub: sub}, nil } @@ -1012,7 +1011,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchEmergencyModeEnabled(o logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "EmergencyModeEnabled") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1022,19 +1021,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchEmergencyModeEnabled(o // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerEmergencyModeEnabled) if err := _WithdrawalDelayer.contract.UnpackLog(event, "EmergencyModeEnabled", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1048,7 +1047,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchEmergencyModeEnabled(o func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseEmergencyModeEnabled(log types.Log) (*WithdrawalDelayerEmergencyModeEnabled, error) { event := new(WithdrawalDelayerEmergencyModeEnabled) if err := _WithdrawalDelayer.contract.UnpackLog(event, "EmergencyModeEnabled", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1150,7 +1149,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterEscapeHatchWithdrawal logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "EscapeHatchWithdrawal", whoRule, toRule, tokenRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerEscapeHatchWithdrawalIterator{contract: _WithdrawalDelayer.contract, event: "EscapeHatchWithdrawal", logs: logs, sub: sub}, nil } @@ -1175,7 +1174,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchEscapeHatchWithdrawal( logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "EscapeHatchWithdrawal", whoRule, toRule, tokenRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1185,19 +1184,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchEscapeHatchWithdrawal( // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerEscapeHatchWithdrawal) if err := _WithdrawalDelayer.contract.UnpackLog(event, "EscapeHatchWithdrawal", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1211,7 +1210,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchEscapeHatchWithdrawal( func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseEscapeHatchWithdrawal(log types.Log) (*WithdrawalDelayerEscapeHatchWithdrawal, error) { event := new(WithdrawalDelayerEscapeHatchWithdrawal) if err := _WithdrawalDelayer.contract.UnpackLog(event, "EscapeHatchWithdrawal", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1299,7 +1298,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterInitializeWithdrawalD logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "InitializeWithdrawalDelayerEvent") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerInitializeWithdrawalDelayerEventIterator{contract: _WithdrawalDelayer.contract, event: "InitializeWithdrawalDelayerEvent", logs: logs, sub: sub}, nil } @@ -1311,7 +1310,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchInitializeWithdrawalDe logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "InitializeWithdrawalDelayerEvent") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1321,19 +1320,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchInitializeWithdrawalDe // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerInitializeWithdrawalDelayerEvent) if err := _WithdrawalDelayer.contract.UnpackLog(event, "InitializeWithdrawalDelayerEvent", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1347,7 +1346,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchInitializeWithdrawalDe func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseInitializeWithdrawalDelayerEvent(log types.Log) (*WithdrawalDelayerInitializeWithdrawalDelayerEvent, error) { event := new(WithdrawalDelayerInitializeWithdrawalDelayerEvent) if err := _WithdrawalDelayer.contract.UnpackLog(event, "InitializeWithdrawalDelayerEvent", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1433,7 +1432,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterNewEmergencyCouncil(o logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "NewEmergencyCouncil") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerNewEmergencyCouncilIterator{contract: _WithdrawalDelayer.contract, event: "NewEmergencyCouncil", logs: logs, sub: sub}, nil } @@ -1445,7 +1444,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewEmergencyCouncil(op logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "NewEmergencyCouncil") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1455,19 +1454,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewEmergencyCouncil(op // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerNewEmergencyCouncil) if err := _WithdrawalDelayer.contract.UnpackLog(event, "NewEmergencyCouncil", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1481,7 +1480,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewEmergencyCouncil(op func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseNewEmergencyCouncil(log types.Log) (*WithdrawalDelayerNewEmergencyCouncil, error) { event := new(WithdrawalDelayerNewEmergencyCouncil) if err := _WithdrawalDelayer.contract.UnpackLog(event, "NewEmergencyCouncil", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1567,7 +1566,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterNewHermezGovernanceAd logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "NewHermezGovernanceAddress") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerNewHermezGovernanceAddressIterator{contract: _WithdrawalDelayer.contract, event: "NewHermezGovernanceAddress", logs: logs, sub: sub}, nil } @@ -1579,7 +1578,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewHermezGovernanceAdd logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "NewHermezGovernanceAddress") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1589,19 +1588,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewHermezGovernanceAdd // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerNewHermezGovernanceAddress) if err := _WithdrawalDelayer.contract.UnpackLog(event, "NewHermezGovernanceAddress", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1615,7 +1614,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewHermezGovernanceAdd func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseNewHermezGovernanceAddress(log types.Log) (*WithdrawalDelayerNewHermezGovernanceAddress, error) { event := new(WithdrawalDelayerNewHermezGovernanceAddress) if err := _WithdrawalDelayer.contract.UnpackLog(event, "NewHermezGovernanceAddress", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1701,7 +1700,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterNewWithdrawalDelay(op logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "NewWithdrawalDelay") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerNewWithdrawalDelayIterator{contract: _WithdrawalDelayer.contract, event: "NewWithdrawalDelay", logs: logs, sub: sub}, nil } @@ -1713,7 +1712,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewWithdrawalDelay(opt logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "NewWithdrawalDelay") if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1723,19 +1722,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewWithdrawalDelay(opt // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerNewWithdrawalDelay) if err := _WithdrawalDelayer.contract.UnpackLog(event, "NewWithdrawalDelay", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1749,7 +1748,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchNewWithdrawalDelay(opt func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseNewWithdrawalDelay(log types.Log) (*WithdrawalDelayerNewWithdrawalDelay, error) { event := new(WithdrawalDelayerNewWithdrawalDelay) if err := _WithdrawalDelayer.contract.UnpackLog(event, "NewWithdrawalDelay", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil @@ -1846,7 +1845,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) FilterWithdraw(opts *bind.F logs, sub, err := _WithdrawalDelayer.contract.FilterLogs(opts, "Withdraw", tokenRule, ownerRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return &WithdrawalDelayerWithdrawIterator{contract: _WithdrawalDelayer.contract, event: "Withdraw", logs: logs, sub: sub}, nil } @@ -1867,7 +1866,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchWithdraw(opts *bind.Wa logs, sub, err := _WithdrawalDelayer.contract.WatchLogs(opts, "Withdraw", tokenRule, ownerRule) if err != nil { - return nil, tracerr.Wrap(err) + return nil, err } return event.NewSubscription(func(quit <-chan struct{}) error { defer sub.Unsubscribe() @@ -1877,19 +1876,19 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchWithdraw(opts *bind.Wa // New log arrived, parse the event and forward to the user event := new(WithdrawalDelayerWithdraw) if err := _WithdrawalDelayer.contract.UnpackLog(event, "Withdraw", log); err != nil { - return tracerr.Wrap(err) + return err } event.Raw = log select { case sink <- event: case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } case err := <-sub.Err(): - return tracerr.Wrap(err) + return err case <-quit: return nil } @@ -1903,7 +1902,7 @@ func (_WithdrawalDelayer *WithdrawalDelayerFilterer) WatchWithdraw(opts *bind.Wa func (_WithdrawalDelayer *WithdrawalDelayerFilterer) ParseWithdraw(log types.Log) (*WithdrawalDelayerWithdraw, error) { event := new(WithdrawalDelayerWithdraw) if err := _WithdrawalDelayer.contract.UnpackLog(event, "Withdraw", log); err != nil { - return nil, tracerr.Wrap(err) + return nil, err } event.Raw = log return event, nil diff --git a/eth/rollup.go b/eth/rollup.go index b94c59a..3a1ad51 100644 --- a/eth/rollup.go +++ b/eth/rollup.go @@ -325,7 +325,7 @@ func NewRollupClient(client *EthereumClient, address ethCommon.Address, tokenHEZ // RollupForgeBatch is the interface to call the smart contract function func (c *RollupClient) RollupForgeBatch(args *RollupForgeBatchArgs, auth *bind.TransactOpts) (tx *types.Transaction, err error) { if auth == nil { - auth, err := c.client.NewAuth() + auth, err = c.client.NewAuth() if err != nil { return nil, err } @@ -662,7 +662,11 @@ func (c *RollupClient) RollupConstants() (rollupConstants *common.RollupConstant if err != nil { return tracerr.Wrap(err) } - for i := int64(0); i < int64(common.LenVerifiers); i++ { + rollupVerifiersLength, err := c.hermez.RollupVerifiersLength(c.opts) + if err != nil { + return tracerr.Wrap(err) + } + for i := int64(0); i < rollupVerifiersLength.Int64(); i++ { var newRollupVerifier common.RollupVerifierStruct rollupVerifier, err := c.hermez.RollupVerifiers(c.opts, big.NewInt(i)) if err != nil { diff --git a/eth/rollup_test.go b/eth/rollup_test.go index b36e27a..8f4b326 100644 --- a/eth/rollup_test.go +++ b/eth/rollup_test.go @@ -169,9 +169,7 @@ func TestRollupForgeBatch(t *testing.T) { args.ProofC[1] = big.NewInt(0) argsForge = args - auth, err := rollupClient.client.NewAuth() - require.NoError(t, err) - _, err = rollupClient.RollupForgeBatch(argsForge, auth) + _, err = rollupClient.RollupForgeBatch(argsForge, nil) require.NoError(t, err) currentBlockNum, err = rollupClient.client.EthLastBlock() @@ -820,9 +818,7 @@ func TestRollupL1UserTxERC20PermitForceExit(t *testing.T) { func TestRollupForgeBatch2(t *testing.T) { // Forge Batch 2 - auth, err := rollupClient.client.NewAuth() - require.NoError(t, err) - _, err = rollupClient.RollupForgeBatch(argsForge, auth) + _, err := rollupClient.RollupForgeBatch(argsForge, nil) require.NoError(t, err) currentBlockNum, err := rollupClient.client.EthLastBlock() require.NoError(t, err) @@ -875,9 +871,7 @@ func TestRollupForgeBatch2(t *testing.T) { argsForge = args - auth, err = rollupClient.client.NewAuth() - require.NoError(t, err) - _, err = rollupClient.RollupForgeBatch(argsForge, auth) + _, err = rollupClient.RollupForgeBatch(argsForge, nil) require.NoError(t, err) currentBlockNum, err = rollupClient.client.EthLastBlock()