From b1b9949e72c4013f2b7c69cddc24c2e7d0f919d9 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Wed, 22 Jul 2020 23:00:17 -0400 Subject: [PATCH] `@0x/contract-wrappers`: Add `IZeroEx` wrapper. --- packages/contract-wrappers/CHANGELOG.json | 9 + .../src/generated-wrappers/broker.ts | 18 +- .../src/generated-wrappers/coordinator.ts | 26 +- .../src/generated-wrappers/dev_utils.ts | 124 +++---- .../erc20_bridge_sampler.ts | 36 +- .../src/generated-wrappers/erc20_token.ts | 24 +- .../src/generated-wrappers/erc721_token.ts | 38 +-- .../src/generated-wrappers/exchange.ts | 190 +++++------ .../src/generated-wrappers/forwarder.ts | 56 ++-- .../gods_unchained_validator.ts | 2 +- .../src/generated-wrappers/i_asset_data.ts | 36 +- .../i_erc20_bridge_sampler.ts | 34 +- .../i_liquidity_provider.ts | 10 +- .../i_liquidity_provider_registry.ts | 2 +- .../generated-wrappers/i_transform_erc20.ts | 314 +++++++++++++----- .../generated-wrappers/maximum_gas_price.ts | 4 +- .../src/generated-wrappers/staking.ts | 172 +++++----- .../src/generated-wrappers/staking_proxy.ts | 82 ++--- .../src/generated-wrappers/weth9.ts | 42 +-- 19 files changed, 680 insertions(+), 539 deletions(-) diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index cc74c0e948..85487ff583 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "13.9.0", + "changes": [ + { + "note": "Add `IZeroEx` wrapper", + "pr": 2626 + } + ] + }, { "version": "13.8.0", "changes": [ diff --git a/packages/contract-wrappers/src/generated-wrappers/broker.ts b/packages/contract-wrappers/src/generated-wrappers/broker.ts index 06ae217df9..07a6f52d75 100644 --- a/packages/contract-wrappers/src/generated-wrappers/broker.ts +++ b/packages/contract-wrappers/src/generated-wrappers/broker.ts @@ -624,7 +624,7 @@ export class BrokerContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -640,8 +640,8 @@ export class BrokerContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -659,7 +659,7 @@ export class BrokerContract extends BaseContract { > { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -756,7 +756,7 @@ export class BrokerContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -772,8 +772,8 @@ export class BrokerContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -789,7 +789,7 @@ export class BrokerContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -846,7 +846,7 @@ export class BrokerContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -862,15 +862,15 @@ export class BrokerContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/coordinator.ts b/packages/contract-wrappers/src/generated-wrappers/coordinator.ts index c7966e94ca..2ea0b0b9b9 100644 --- a/packages/contract-wrappers/src/generated-wrappers/coordinator.ts +++ b/packages/contract-wrappers/src/generated-wrappers/coordinator.ts @@ -42,7 +42,7 @@ export class CoordinatorContract extends BaseContract { * @ignore */ public static deployedBytecode = - '0x6080604052600436106100b15760003560e01c8063da4fe07411610069578063ee55b9681161004e578063ee55b9681461018a578063fb6961cc146101b7578063fdd059a5146101cc576100b1565b8063da4fe07414610162578063e1c7157814610175576100b1565b806389fab5b71161009a57806389fab5b714610109578063b2562b7a1461012b578063c26cfecd14610140576100b1565b80630f7d8e39146100b357806352813679146100e9575b005b3480156100bf57600080fd5b506100d36100ce3660046116c1565b6101ec565b6040516100e09190611a14565b60405180910390f35b3480156100f557600080fd5b506100b1610104366004611888565b610455565b34801561011557600080fd5b5061011e610482565b6040516100e09190611c40565b34801561013757600080fd5b5061011e6104bb565b34801561014c57600080fd5b506101556104f4565b6040516100e09190611ba1565b6100b1610170366004611888565b6104fa565b34801561018157600080fd5b506101556105e8565b34801561019657600080fd5b506101aa6101a5366004611706565b61060c565b6040516100e09190611a35565b3480156101c357600080fd5b50610155610ac0565b3480156101d857600080fd5b506101556101e7366004611774565b610ac6565b80516000908061020a5761020a61020560008686610ad9565b610b7e565b60008360018551038151811061021c57fe5b016020015160f81c90506008811061023d5761023d61020560018787610ad9565b60008160ff16600881111561024e57fe5b9050600081600881111561025e57fe5b14156102785761027361020560028888610ad9565b61043c565b600181600881111561028657fe5b141561029b5761027361020560038888610ad9565b60028160088111156102a957fe5b141561038557826042146102c6576102c661020560008888610ad9565b6000856000815181106102d557fe5b016020015160f81c905060006102f287600163ffffffff610b8616565b9050600061030788602163ffffffff610b8616565b90506001898484846040516000815260200160405260405161032c9493929190611bce565b6020604051602081039080840390855afa15801561034e573d6000803e3d6000fd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe00151975061044f9650505050505050565b600381600881111561039357fe5b141561043c57826042146103b0576103b061020560008888610ad9565b6000856000815181106103bf57fe5b016020015160f81c905060006103dc87600163ffffffff610b8616565b905060006103f188602163ffffffff610b8616565b905060018960405160200161040691906119e3565b604051602081830303815290604052805190602001208484846040516000815260200160405260405161032c9493929190611bce565b61044b61020560018888610ad9565b5050505b92915050565b6060610464856080015161060c565b80519091501561047b5761047b8582868686610bb0565b5050505050565b6040518060400160405280601781526020017f30782050726f746f636f6c20436f6f7264696e61746f7200000000000000000081525081565b6040518060400160405280600581526020017f332e302e3000000000000000000000000000000000000000000000000000000081525081565b60015481565b61050684848484610455565b6002546040517f2280c9100000000000000000000000000000000000000000000000000000000081526201000090910473ffffffffffffffffffffffffffffffffffffffff1690632280c9109034906105659088908790600401611c53565b6000604051808303818588803b15801561057e57600080fd5b505af1158015610592573d6000803e3d6000fd5b50505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526105d99190810190611741565b506105e2610d5d565b50505050565b7fa6511c04ca44625d50986f8c36bedc09366207a17b96e347094053a9f850716881565b60606000610620838263ffffffff610d7316565b90507fffffffff0000000000000000000000000000000000000000000000000000000081167f9b44d5560000000000000000000000000000000000000000000000000000000014806106b357507fffffffff0000000000000000000000000000000000000000000000000000000081167fe14b58c400000000000000000000000000000000000000000000000000000000145b1561073c576106c06112e5565b83516106d690859060049063ffffffff610dbf16565b8060200190516106e991908101906117fe565b604080516001808252818301909252919250816020015b6107086112e5565b815260200190600190039081610700579050509250808360008151811061072b57fe5b602002602001018190525050610aba565b7fffffffff0000000000000000000000000000000000000000000000000000000081167f9694a4020000000000000000000000000000000000000000000000000000000014806107cd57507fffffffff0000000000000000000000000000000000000000000000000000000081167f8ea8dfe400000000000000000000000000000000000000000000000000000000145b8061081957507fffffffff0000000000000000000000000000000000000000000000000000000081167fbeee2e1400000000000000000000000000000000000000000000000000000000145b8061086557507fffffffff0000000000000000000000000000000000000000000000000000000081167f78d29ac100000000000000000000000000000000000000000000000000000000145b806108b157507fffffffff0000000000000000000000000000000000000000000000000000000081167f8bc8efb300000000000000000000000000000000000000000000000000000000145b806108fd57507fffffffff0000000000000000000000000000000000000000000000000000000081167f369da09900000000000000000000000000000000000000000000000000000000145b8061094957507fffffffff0000000000000000000000000000000000000000000000000000000081167fa6c3bf3300000000000000000000000000000000000000000000000000000000145b1561097e57825161096490849060049063ffffffff610dbf16565b8060200190516109779190810190611635565b9150610aba565b7fffffffff0000000000000000000000000000000000000000000000000000000081167f88ec79fb000000000000000000000000000000000000000000000000000000001480610a0f57507fffffffff0000000000000000000000000000000000000000000000000000000081167fb718e29200000000000000000000000000000000000000000000000000000000145b15610aba57610a1c6112e5565b610a246112e5565b8451610a3a90869060049063ffffffff610dbf16565b806020019051610a4d9190810190611831565b60408051600280825260608201909252929450909250816020015b610a706112e5565b815260200190600190039081610a685790505093508184600081518110610a9357fe5b60200260200101819052508084600181518110610aac57fe5b602002602001018190525050505b50919050565b60005481565b600061044f610ad483610e46565b610e99565b606063779c522360e01b848484604051602401610af893929190611c0e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff000000000000000000000000000000000000000000000000000000009093169290921790915290509392505050565b805160208201fd5b60008160200183511015610ba757610ba76102056005855185602001610ea7565b50016020015190565b3273ffffffffffffffffffffffffffffffffffffffff841614610bd957610bd961020584610ec6565b6000610be786600154610f65565b60408051600080825260208201909252845192935091905b818114610c9057610c0e6113ac565b60405180606001604052808973ffffffffffffffffffffffffffffffffffffffff1681526020018681526020018881525090506000610c4c82610ac6565b90506000610c6d82898681518110610c6057fe5b60200260200101516101ec565b9050610c7f868263ffffffff610f7916565b95505060019092019150610bff9050565b50610ca1823263ffffffff610f7916565b875190925060005b818114610d5157600073ffffffffffffffffffffffffffffffffffffffff16898281518110610cd457fe5b60200260200101516060015173ffffffffffffffffffffffffffffffffffffffff161415610d0157610d49565b6000898281518110610d0f57fe5b60200260200101516040015190506000610d32828761101b90919063ffffffff16565b905080610d4657610d466102058884611053565b50505b600101610ca9565b50505050505050505050565b610d656110f5565b610d7157610d71611103565b565b60008160040183511015610d9457610d946102056003855185600401610ea7565b5001602001517fffffffff000000000000000000000000000000000000000000000000000000001690565b606081831115610dd857610dd861020560008585610ea7565b8351821115610df157610df16102056001848751610ea7565b8282036040519080825280601f01601f191660200182016040528015610e1e576020820181803883390190505b509050610e3f610e2d8261113c565b84610e378761113c565b018351611142565b9392505050565b604081810151825160209384015182519285019290922083517fa6511c04ca44625d50986f8c36bedc09366207a17b96e347094053a9f85071688152948501919091529183015260608201526080902090565b600061044f60005483611206565b6060632800659560e01b848484604051602401610af893929190611bec565b606063a458d7ff60e01b82604051602401610ee19190611a14565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff00000000000000000000000000000000000000000000000000000000909316929092179091529050919050565b6000610e3f82610f7485611240565b611206565b815160405160609184906020808202808401820192910182851015610fa557610fa561020586856112c8565b82851115610fbf57610fb8858583611142565b8497508793505b60018201915060208101905080840192508294508188528460405286886001840381518110610fea57fe5b73ffffffffffffffffffffffffffffffffffffffff9092166020928302919091019091015250959695505050505050565b60006020835102602084018181018192505b8083101561044b5782518086141561104757600194508193505b5060208301925061102d565b606063d789b64060e01b8383604051602401611070929190611baa565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff0000000000000000000000000000000000000000000000000000000090931692909217909152905092915050565b600254610100900460ff1690565b47801561113957604051339082156108fc029083906000818181858888f19350505050158015611137573d6000803e3d6000fd5b505b50565b60200190565b602081101561116c576001816020036101000a038019835116818551168082178652505050611201565b8282141561117957611201565b828211156111b35760208103905080820181840181515b828510156111ab578451865260209586019590940193611190565b905250611201565b60208103905080820181840183515b818612156111fc57825182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe092830192909101906111c2565b855250505b505050565b6040517f19010000000000000000000000000000000000000000000000000000000000008152600281019290925260228201526042902090565b608081810151825160208085015160408087015160609788015186519685019690962082517fec69816980a3a3ca4554410e60253953e9ff375ba4536a98adfa15cc71541508815294850195909552908301919091529481019490945273ffffffffffffffffffffffffffffffffffffffff9091169183019190915260a082015260c0902090565b6060635fc8372260e01b8383604051602401611070929190611cc9565b604051806101c00160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001606081526020016060815260200160608152602001606081525090565b6040805160608082018352600080835260208301529181019190915290565b803561044f81611d8c565b805161044f81611d8c565b600082601f8301126113f1578081fd5b81356114046113ff82611cfe565b611cd7565b8181529150602080830190840160005b838110156114415761142c876020843589010161144b565b83526020928301929190910190600101611414565b5050505092915050565b600082601f83011261145b578081fd5b81356114696113ff82611d1e565b915080825283602082850101111561148057600080fd5b8060208401602084013760009082016020015292915050565b600082601f8301126114a9578081fd5b81516114b76113ff82611d1e565b91508082528360208285010111156114ce57600080fd5b6114df816020840160208601611d60565b5092915050565b60006101c08083850312156114f9578182fd5b61150281611cd7565b91505061150f83836113d6565b815261151e83602084016113d6565b602082015261153083604084016113d6565b604082015261154283606084016113d6565b60608201526080820151608082015260a082015160a082015260c082015160c082015260e082015160e08201526101008083015181830152506101208083015181830152506101408083015167ffffffffffffffff808211156115a457600080fd5b6115b086838701611499565b838501526101609250828501519150808211156115cc57600080fd5b6115d886838701611499565b838501526101809250828501519150808211156115f457600080fd5b61160086838701611499565b838501526101a092508285015191508082111561161c57600080fd5b5061162985828601611499565b82840152505092915050565b60006020808385031215611647578182fd5b825167ffffffffffffffff81111561165d578283fd5b80840185601f82011261166e578384fd5b8051915061167e6113ff83611cfe565b82815283810190828501865b858110156116b3576116a18a8884518801016114e6565b8452928601929086019060010161168a565b509098975050505050505050565b600080604083850312156116d3578081fd5b82359150602083013567ffffffffffffffff8111156116f0578182fd5b6116fc8582860161144b565b9150509250929050565b600060208284031215611717578081fd5b813567ffffffffffffffff81111561172d578182fd5b6117398482850161144b565b949350505050565b600060208284031215611752578081fd5b815167ffffffffffffffff811115611768578182fd5b61173984828501611499565b600060208284031215611785578081fd5b813567ffffffffffffffff8082111561179c578283fd5b818401606081870312156117ae578384fd5b6117b86060611cd7565b925080356117c581611d8c565b8352602081810135908401526040810135828111156117e2578485fd5b6117ee8782840161144b565b6040850152509195945050505050565b60006020828403121561180f578081fd5b815167ffffffffffffffff811115611825578182fd5b611739848285016114e6565b60008060408385031215611843578182fd5b825167ffffffffffffffff8082111561185a578384fd5b611866868387016114e6565b9350602085015191508082111561187b578283fd5b506116fc858286016114e6565b6000806000806080858703121561189d578182fd5b843567ffffffffffffffff808211156118b4578384fd5b81870160a0818a0312156118c6578485fd5b6118d060a0611cd7565b92508035835260208101356020840152604081013560408401526118f789606083016113cb565b606084015260808101358281111561190d578586fd5b6119198a82840161144b565b6080850152505081955061193088602089016113cb565b94506040870135915080821115611945578384fd5b6119518883890161144b565b93506060870135915080821115611966578283fd5b50611973878288016113e1565b91505092959194509250565b73ffffffffffffffffffffffffffffffffffffffff169052565b600081518084526119b1816020860160208601611d60565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b7f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b73ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6000602080830181845280855180835260408601915060408482028701019250838701855b82811015611b94577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc088860301845281516101c0611a9987835161197f565b87820151611aa98989018261197f565b506040820151611abc604089018261197f565b506060820151611acf606089018261197f565b506080820151608088015260a082015160a088015260c082015160c088015260e082015160e08801526101008083015181890152506101208083015181890152506101408083015182828a0152611b28838a0182611999565b915050610160915081830151888203838a0152611b458282611999565b9250505061018080830151888303828a0152611b618382611999565b9150506101a0915081830151888203838a0152611b7e8282611999565b9850505094870194505090850190600101611a5a565b5092979650505050505050565b90815260200190565b91825273ffffffffffffffffffffffffffffffffffffffff16602082015260400190565b93845260ff9290921660208401526040830152606082015260800190565b6060810160088510611bfa57fe5b938152602081019290925260409091015290565b600060048510611c1a57fe5b84825283602083015260606040830152611c376060830184611999565b95945050505050565b600060208252610e3f6020830184611999565b60006040825283516040830152602084015160608301526040840151608083015273ffffffffffffffffffffffffffffffffffffffff60608501511660a0830152608084015160a060c0840152611cad60e0840182611999565b8381036020850152611cbf8186611999565b9695505050505050565b918252602082015260400190565b60405181810167ffffffffffffffff81118282101715611cf657600080fd5b604052919050565b600067ffffffffffffffff821115611d14578081fd5b5060209081020190565b600067ffffffffffffffff821115611d34578081fd5b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b60005b83811015611d7b578181015183820152602001611d63565b838111156105e25750506000910152565b73ffffffffffffffffffffffffffffffffffffffff8116811461113957600080fd5b8351602094850120835193850193909320604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f815295860194909452928401929092526060830152608082015260a090209056fea365627a7a72315820926abd0f9ec1c8b67d93fbc87771f0336fe827fb0a1927bf1606417cd86e97966c6578706572696d656e74616cf564736f6c63430005100040'; + '0x6080604052600436106100b15760003560e01c8063da4fe07411610069578063ee55b9681161004e578063ee55b9681461018a578063fb6961cc146101b7578063fdd059a5146101cc576100b1565b8063da4fe07414610162578063e1c7157814610175576100b1565b806389fab5b71161009a57806389fab5b714610109578063b2562b7a1461012b578063c26cfecd14610140576100b1565b80630f7d8e39146100b357806352813679146100e9575b005b3480156100bf57600080fd5b506100d36100ce3660046116c1565b6101ec565b6040516100e09190611a14565b60405180910390f35b3480156100f557600080fd5b506100b1610104366004611888565b610455565b34801561011557600080fd5b5061011e610482565b6040516100e09190611c40565b34801561013757600080fd5b5061011e6104bb565b34801561014c57600080fd5b506101556104f4565b6040516100e09190611ba1565b6100b1610170366004611888565b6104fa565b34801561018157600080fd5b506101556105e8565b34801561019657600080fd5b506101aa6101a5366004611706565b61060c565b6040516100e09190611a35565b3480156101c357600080fd5b50610155610ac0565b3480156101d857600080fd5b506101556101e7366004611774565b610ac6565b80516000908061020a5761020a61020560008686610ad9565b610b7e565b60008360018551038151811061021c57fe5b016020015160f81c90506008811061023d5761023d61020560018787610ad9565b60008160ff16600881111561024e57fe5b9050600081600881111561025e57fe5b14156102785761027361020560028888610ad9565b61043c565b600181600881111561028657fe5b141561029b5761027361020560038888610ad9565b60028160088111156102a957fe5b141561038557826042146102c6576102c661020560008888610ad9565b6000856000815181106102d557fe5b016020015160f81c905060006102f287600163ffffffff610b8616565b9050600061030788602163ffffffff610b8616565b90506001898484846040516000815260200160405260405161032c9493929190611bce565b6020604051602081039080840390855afa15801561034e573d6000803e3d6000fd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe00151975061044f9650505050505050565b600381600881111561039357fe5b141561043c57826042146103b0576103b061020560008888610ad9565b6000856000815181106103bf57fe5b016020015160f81c905060006103dc87600163ffffffff610b8616565b905060006103f188602163ffffffff610b8616565b905060018960405160200161040691906119e3565b604051602081830303815290604052805190602001208484846040516000815260200160405260405161032c9493929190611bce565b61044b61020560018888610ad9565b5050505b92915050565b6060610464856080015161060c565b80519091501561047b5761047b8582868686610bb0565b5050505050565b6040518060400160405280601781526020017f30782050726f746f636f6c20436f6f7264696e61746f7200000000000000000081525081565b6040518060400160405280600581526020017f332e302e3000000000000000000000000000000000000000000000000000000081525081565b60015481565b61050684848484610455565b6002546040517f2280c9100000000000000000000000000000000000000000000000000000000081526201000090910473ffffffffffffffffffffffffffffffffffffffff1690632280c9109034906105659088908790600401611c53565b6000604051808303818588803b15801561057e57600080fd5b505af1158015610592573d6000803e3d6000fd5b50505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526105d99190810190611741565b506105e2610d5d565b50505050565b7fa6511c04ca44625d50986f8c36bedc09366207a17b96e347094053a9f850716881565b60606000610620838263ffffffff610d7316565b90507fffffffff0000000000000000000000000000000000000000000000000000000081167f9b44d5560000000000000000000000000000000000000000000000000000000014806106b357507fffffffff0000000000000000000000000000000000000000000000000000000081167fe14b58c400000000000000000000000000000000000000000000000000000000145b1561073c576106c06112e5565b83516106d690859060049063ffffffff610dbf16565b8060200190516106e991908101906117fe565b604080516001808252818301909252919250816020015b6107086112e5565b815260200190600190039081610700579050509250808360008151811061072b57fe5b602002602001018190525050610aba565b7fffffffff0000000000000000000000000000000000000000000000000000000081167f9694a4020000000000000000000000000000000000000000000000000000000014806107cd57507fffffffff0000000000000000000000000000000000000000000000000000000081167f8ea8dfe400000000000000000000000000000000000000000000000000000000145b8061081957507fffffffff0000000000000000000000000000000000000000000000000000000081167fbeee2e1400000000000000000000000000000000000000000000000000000000145b8061086557507fffffffff0000000000000000000000000000000000000000000000000000000081167f78d29ac100000000000000000000000000000000000000000000000000000000145b806108b157507fffffffff0000000000000000000000000000000000000000000000000000000081167f8bc8efb300000000000000000000000000000000000000000000000000000000145b806108fd57507fffffffff0000000000000000000000000000000000000000000000000000000081167f369da09900000000000000000000000000000000000000000000000000000000145b8061094957507fffffffff0000000000000000000000000000000000000000000000000000000081167fa6c3bf3300000000000000000000000000000000000000000000000000000000145b1561097e57825161096490849060049063ffffffff610dbf16565b8060200190516109779190810190611635565b9150610aba565b7fffffffff0000000000000000000000000000000000000000000000000000000081167f88ec79fb000000000000000000000000000000000000000000000000000000001480610a0f57507fffffffff0000000000000000000000000000000000000000000000000000000081167fb718e29200000000000000000000000000000000000000000000000000000000145b15610aba57610a1c6112e5565b610a246112e5565b8451610a3a90869060049063ffffffff610dbf16565b806020019051610a4d9190810190611831565b60408051600280825260608201909252929450909250816020015b610a706112e5565b815260200190600190039081610a685790505093508184600081518110610a9357fe5b60200260200101819052508084600181518110610aac57fe5b602002602001018190525050505b50919050565b60005481565b600061044f610ad483610e46565b610e99565b606063779c522360e01b848484604051602401610af893929190611c0e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff000000000000000000000000000000000000000000000000000000009093169290921790915290509392505050565b805160208201fd5b60008160200183511015610ba757610ba76102056005855185602001610ea7565b50016020015190565b3273ffffffffffffffffffffffffffffffffffffffff841614610bd957610bd961020584610ec6565b6000610be786600154610f65565b60408051600080825260208201909252845192935091905b818114610c9057610c0e6113ac565b60405180606001604052808973ffffffffffffffffffffffffffffffffffffffff1681526020018681526020018881525090506000610c4c82610ac6565b90506000610c6d82898681518110610c6057fe5b60200260200101516101ec565b9050610c7f868263ffffffff610f7916565b95505060019092019150610bff9050565b50610ca1823263ffffffff610f7916565b875190925060005b818114610d5157600073ffffffffffffffffffffffffffffffffffffffff16898281518110610cd457fe5b60200260200101516060015173ffffffffffffffffffffffffffffffffffffffff161415610d0157610d49565b6000898281518110610d0f57fe5b60200260200101516040015190506000610d32828761101b90919063ffffffff16565b905080610d4657610d466102058884611053565b50505b600101610ca9565b50505050505050505050565b610d656110f5565b610d7157610d71611103565b565b60008160040183511015610d9457610d946102056003855185600401610ea7565b5001602001517fffffffff000000000000000000000000000000000000000000000000000000001690565b606081831115610dd857610dd861020560008585610ea7565b8351821115610df157610df16102056001848751610ea7565b8282036040519080825280601f01601f191660200182016040528015610e1e576020820181803883390190505b509050610e3f610e2d8261113c565b84610e378761113c565b018351611142565b9392505050565b604081810151825160209384015182519285019290922083517fa6511c04ca44625d50986f8c36bedc09366207a17b96e347094053a9f85071688152948501919091529183015260608201526080902090565b600061044f60005483611206565b6060632800659560e01b848484604051602401610af893929190611bec565b606063a458d7ff60e01b82604051602401610ee19190611a14565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff00000000000000000000000000000000000000000000000000000000909316929092179091529050919050565b6000610e3f82610f7485611240565b611206565b815160405160609184906020808202808401820192910182851015610fa557610fa561020586856112c8565b82851115610fbf57610fb8858583611142565b8497508793505b60018201915060208101905080840192508294508188528460405286886001840381518110610fea57fe5b73ffffffffffffffffffffffffffffffffffffffff9092166020928302919091019091015250959695505050505050565b60006020835102602084018181018192505b8083101561044b5782518086141561104757600194508193505b5060208301925061102d565b606063d789b64060e01b8383604051602401611070929190611baa565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff0000000000000000000000000000000000000000000000000000000090931692909217909152905092915050565b600254610100900460ff1690565b47801561113957604051339082156108fc029083906000818181858888f19350505050158015611137573d6000803e3d6000fd5b505b50565b60200190565b602081101561116c576001816020036101000a038019835116818551168082178652505050611201565b8282141561117957611201565b828211156111b35760208103905080820181840181515b828510156111ab578451865260209586019590940193611190565b905250611201565b60208103905080820181840183515b818612156111fc57825182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe092830192909101906111c2565b855250505b505050565b6040517f19010000000000000000000000000000000000000000000000000000000000008152600281019290925260228201526042902090565b608081810151825160208085015160408087015160609788015186519685019690962082517fec69816980a3a3ca4554410e60253953e9ff375ba4536a98adfa15cc71541508815294850195909552908301919091529481019490945273ffffffffffffffffffffffffffffffffffffffff9091169183019190915260a082015260c0902090565b6060635fc8372260e01b8383604051602401611070929190611cc9565b604051806101c00160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001606081526020016060815260200160608152602001606081525090565b6040805160608082018352600080835260208301529181019190915290565b803561044f81611d8c565b805161044f81611d8c565b600082601f8301126113f1578081fd5b81356114046113ff82611cfe565b611cd7565b8181529150602080830190840160005b838110156114415761142c876020843589010161144b565b83526020928301929190910190600101611414565b5050505092915050565b600082601f83011261145b578081fd5b81356114696113ff82611d1e565b915080825283602082850101111561148057600080fd5b8060208401602084013760009082016020015292915050565b600082601f8301126114a9578081fd5b81516114b76113ff82611d1e565b91508082528360208285010111156114ce57600080fd5b6114df816020840160208601611d60565b5092915050565b60006101c08083850312156114f9578182fd5b61150281611cd7565b91505061150f83836113d6565b815261151e83602084016113d6565b602082015261153083604084016113d6565b604082015261154283606084016113d6565b60608201526080820151608082015260a082015160a082015260c082015160c082015260e082015160e08201526101008083015181830152506101208083015181830152506101408083015167ffffffffffffffff808211156115a457600080fd5b6115b086838701611499565b838501526101609250828501519150808211156115cc57600080fd5b6115d886838701611499565b838501526101809250828501519150808211156115f457600080fd5b61160086838701611499565b838501526101a092508285015191508082111561161c57600080fd5b5061162985828601611499565b82840152505092915050565b60006020808385031215611647578182fd5b825167ffffffffffffffff81111561165d578283fd5b80840185601f82011261166e578384fd5b8051915061167e6113ff83611cfe565b82815283810190828501865b858110156116b3576116a18a8884518801016114e6565b8452928601929086019060010161168a565b509098975050505050505050565b600080604083850312156116d3578081fd5b82359150602083013567ffffffffffffffff8111156116f0578182fd5b6116fc8582860161144b565b9150509250929050565b600060208284031215611717578081fd5b813567ffffffffffffffff81111561172d578182fd5b6117398482850161144b565b949350505050565b600060208284031215611752578081fd5b815167ffffffffffffffff811115611768578182fd5b61173984828501611499565b600060208284031215611785578081fd5b813567ffffffffffffffff8082111561179c578283fd5b818401606081870312156117ae578384fd5b6117b86060611cd7565b925080356117c581611d8c565b8352602081810135908401526040810135828111156117e2578485fd5b6117ee8782840161144b565b6040850152509195945050505050565b60006020828403121561180f578081fd5b815167ffffffffffffffff811115611825578182fd5b611739848285016114e6565b60008060408385031215611843578182fd5b825167ffffffffffffffff8082111561185a578384fd5b611866868387016114e6565b9350602085015191508082111561187b578283fd5b506116fc858286016114e6565b6000806000806080858703121561189d578182fd5b843567ffffffffffffffff808211156118b4578384fd5b81870160a0818a0312156118c6578485fd5b6118d060a0611cd7565b92508035835260208101356020840152604081013560408401526118f789606083016113cb565b606084015260808101358281111561190d578586fd5b6119198a82840161144b565b6080850152505081955061193088602089016113cb565b94506040870135915080821115611945578384fd5b6119518883890161144b565b93506060870135915080821115611966578283fd5b50611973878288016113e1565b91505092959194509250565b73ffffffffffffffffffffffffffffffffffffffff169052565b600081518084526119b1816020860160208601611d60565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b7f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c810191909152603c0190565b73ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6000602080830181845280855180835260408601915060408482028701019250838701855b82811015611b94577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc088860301845281516101c0611a9987835161197f565b87820151611aa98989018261197f565b506040820151611abc604089018261197f565b506060820151611acf606089018261197f565b506080820151608088015260a082015160a088015260c082015160c088015260e082015160e08801526101008083015181890152506101208083015181890152506101408083015182828a0152611b28838a0182611999565b915050610160915081830151888203838a0152611b458282611999565b9250505061018080830151888303828a0152611b618382611999565b9150506101a0915081830151888203838a0152611b7e8282611999565b9850505094870194505090850190600101611a5a565b5092979650505050505050565b90815260200190565b91825273ffffffffffffffffffffffffffffffffffffffff16602082015260400190565b93845260ff9290921660208401526040830152606082015260800190565b6060810160088510611bfa57fe5b938152602081019290925260409091015290565b600060048510611c1a57fe5b84825283602083015260606040830152611c376060830184611999565b95945050505050565b600060208252610e3f6020830184611999565b60006040825283516040830152602084015160608301526040840151608083015273ffffffffffffffffffffffffffffffffffffffff60608501511660a0830152608084015160a060c0840152611cad60e0840182611999565b8381036020850152611cbf8186611999565b9695505050505050565b918252602082015260400190565b60405181810167ffffffffffffffff81118282101715611cf657600080fd5b604052919050565b600067ffffffffffffffff821115611d14578081fd5b5060209081020190565b600067ffffffffffffffff821115611d34578081fd5b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01660200190565b60005b83811015611d7b578181015183820152602001611d63565b838111156105e25750506000910152565b73ffffffffffffffffffffffffffffffffffffffff8116811461113957600080fd5b8351602094850120835193850193909320604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f815295860194909452928401929092526060830152608082015260a090209056fea365627a7a72315820353fada6a7d942697f3b4ca6576b433bad3cc0e8814b93adb94bd3e1d3df52df6c6578706572696d656e74616cf564736f6c63430005110040'; public static contractName = 'Coordinator'; private readonly _methodABIIndex: { [name: string]: number } = {}; public static async deployFrom0xArtifactAsync( @@ -585,7 +585,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -605,7 +605,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -625,7 +625,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -645,7 +645,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -665,7 +665,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -713,7 +713,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -787,7 +787,7 @@ export class CoordinatorContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -854,7 +854,7 @@ export class CoordinatorContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -870,15 +870,15 @@ export class CoordinatorContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -915,7 +915,7 @@ export class CoordinatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -947,7 +947,7 @@ export class CoordinatorContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } diff --git a/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts b/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts index af83160db5..108d4db5f8 100644 --- a/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts +++ b/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts @@ -42,7 +42,7 @@ export class DevUtilsContract extends BaseContract { * @ignore */ public static deployedBytecode = - '0x608060405234801561001057600080fd5b50600436106102775760003560e01c8063a5cd62ba11610160578063d186037f116100d8578063e4e6e7da1161008c578063ee18599711610071578063ee185997146105d8578063ef3bb097146105e0578063ff84e7cc146105e857610277565b8063e4e6e7da14610595578063e77286eb146105b657610277565b8063d3d862d1116100bd578063d3d862d114610540578063d469502814610553578063e25cabf71461057357610277565b8063d186037f1461051a578063d36379051461052d57610277565b8063bbb2dcf61161012f578063c82037ef11610114578063c82037ef146104dc578063ca49f47c146104e4578063d001c5dc1461050757610277565b8063bbb2dcf6146104b2578063c26cfecd146104d457610277565b8063a5cd62ba14610464578063a6627e9f14610484578063a7530f1214610497578063b43cffe11461049f57610277565b80637982653e116101f35780639baf2705116101c25780639eadc835116101a75780639eadc8351461041a578063a070cac81461043e578063a0901e511461045157610277565b80639baf2705146103fd5780639cd016051461041257610277565b80637982653e1461039657806379c9c426146103b65780637d727512146103c95780638f4ce479146103dc57610277565b80634dfdac201161024a57806363eb39921161022f57806363eb39921461033d5780636f83188e14610350578063750bdb301461037357610277565b80634dfdac20146102fd578063590aa8751461031d57610277565b806304a5618a1461027c5780630d7b7d76146102a75780632322cf76146102c857806346eb65cb146102e8575b600080fd5b61028f61028a366004614296565b6105f0565b60405161029e93929190614ce9565b60405180910390f35b6102ba6102b5366004613d5a565b610689565b60405161029e929190614ef1565b6102db6102d6366004613d5a565b6106ab565b60405161029e9190614bc6565b6102fb6102f6366004614296565b6106d3565b005b61031061030b366004613c75565b610757565b60405161029e9190614b1e565b61033061032b366004613c59565b6107da565b60405161029e9190614d49565b61033061034b366004613d9e565b610889565b61036361035e366004614296565b61093c565b60405161029e9493929190614ddd565b610386610381366004614296565b6109dc565b60405161029e9493929190614c07565b6103a96103a4366004614468565b610a6e565b60405161029e9190614dca565b6102db6103c4366004614570565b610b20565b6102db6103d7366004613d5a565b610ba1565b6103ef6103ea366004614296565b611497565b60405161029e929190614be4565b61040561152a565b60405161029e9190614871565b610405611539565b61042d610428366004614296565b611548565b60405161029e959493929190614c43565b6102db61044c366004614517565b6115ed565b61031061045f366004613e20565b61166e565b610477610472366004613eee565b6116e7565b60405161029e9190614a37565b610330610492366004613df5565b6117a1565b610405611851565b6103306104ad366004613cc3565b611860565b6104c56104c0366004614296565b611916565b60405161029e93929190614d14565b6102db6119a6565b6104056119ac565b6104f76104f2366004614296565b6119bb565b60405161029e9493929190614ca6565b610310610515366004613c75565b611a4d565b6102db610528366004613d5a565b611abb565b6103a961053b366004614468565b6123b7565b61033061054e366004613fc9565b612419565b610566610561366004614296565b61246e565b60405161029e9190614bcf565b610586610581366004613f72565b612511565b60405161029e93929190614a83565b6105a86105a3366004613c75565b612649565b60405161029e929190614ba1565b6105c96105c43660046144c0565b612662565b60405161029e93929190614e6a565b6104056129d2565b6104056129e1565b6104056129f0565b600080600073__$d8b635de2bf4a097b4e18b67d0fb68e779$__6304a5618a856040518263ffffffff1660e01b815260040161062c9190614d49565b60606040518083038186803b15801561064457600080fd5b505af4158015610658573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061067c91908101906141ec565b9250925092509193909250565b6000806106968484610ba1565b91506106a28484611abb565b90509250929050565b60008060006106ba8585610689565b915091506106c882826129ff565b925050505b92915050565b6040517f46eb65cb00000000000000000000000000000000000000000000000000000000815273__$d8b635de2bf4a097b4e18b67d0fb68e779$__906346eb65cb90610723908490600401614d49565b60006040518083038186803b15801561073b57600080fd5b505af415801561074f573d6000803e3d6000fd5b505050505b50565b606060008251905080604051908082528060200260200182016040528015610789578160200160208202803883390190505b50915060005b8181146107d2576107b3858583815181106107a657fe5b6020026020010151611abb565b8382815181106107bf57fe5b602090810291909101015260010161078f565b505092915050565b6040517f590aa87500000000000000000000000000000000000000000000000000000000815260609073__$d8b635de2bf4a097b4e18b67d0fb68e779$__9063590aa8759061082d908590600401614871565b60006040518083038186803b15801561084557600080fd5b505af4158015610859573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261088191908101906142c9565b90505b919050565b6040517f63eb399200000000000000000000000000000000000000000000000000000000815260609073__$d8b635de2bf4a097b4e18b67d0fb68e779$__906363eb3992906108e0908790879087906004016149b7565b60006040518083038186803b1580156108f857600080fd5b505af415801561090c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261093491908101906142c9565b949350505050565b60608060608073__$fddee3b26a806429350031cf3481976d2e$__636f83188e866040518263ffffffff1660e01b81526004016109799190614d49565b60006040518083038186803b15801561099157600080fd5b505af41580156109a5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109cd9190810190614333565b93509350935093509193509193565b6000806000606073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63750bdb30866040518263ffffffff1660e01b8152600401610a1a9190614d49565b60006040518083038186803b158015610a3257600080fd5b505af4158015610a46573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109cd9190810190614070565b600080546040517f9caa023b00000000000000000000000000000000000000000000000000000000815273__$7a69f714cdde1cb6b62e3c39bc8c94deae$__91639caa023b91610ad0916001600160a01b0316908890889088906004016149e9565b60206040518083038186803b158015610ae857600080fd5b505af4158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109349190810190614318565b600061093484610b9c6040518060400160405280600b81526020017f30782050726f746f636f6c0000000000000000000000000000000000000000008152506040518060400160405280600581526020017f332e302e300000000000000000000000000000000000000000000000000000008152508787612a15565b612a6c565b600080610bb4838263ffffffff612a8016565b90506001600160e01b031981167ff47261b0000000000000000000000000000000000000000000000000000000001415610c0f576000610bfb84601063ffffffff612ab916565b9050610c078186612aec565b925050611490565b6001600160e01b031981167f02571792000000000000000000000000000000000000000000000000000000001415610e285760008073__$d8b635de2bf4a097b4e18b67d0fb68e779$__6304a5618a866040518263ffffffff1660e01b8152600401610c7b9190614d49565b60606040518083038186803b158015610c9357600080fd5b505af4158015610ca7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610ccb91908101906141ec565b6040519194509250606091507f6352211e0000000000000000000000000000000000000000000000000000000090610d07908490602401614bc6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060846001600160a01b031683604051610d829190614855565b600060405180830381855afa9150503d8060008114610dbd576040519150601f19603f3d011682016040523d82523d6000602084013e610dc2565b606091505b50915091506000828015610dd7575081516020145b610de2576000610df3565b610df382600c63ffffffff612ab916565b9050896001600160a01b0316816001600160a01b031614610e15576000610e18565b60015b60ff169750505050505050611490565b6001600160e01b031981167fa7cb5fb70000000000000000000000000000000000000000000000000000000014156110c457600060608073__$d8b635de2bf4a097b4e18b67d0fb68e779$__639eadc835876040518263ffffffff1660e01b8152600401610e969190614d49565b60006040518083038186803b158015610eae57600080fd5b505af4158015610ec2573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610eea91908101906140da565b5081519296509094509250905060005b8181146110ba57828181518110610f0d57fe5b602002602001015160001415610f22576110b2565b83516060907efdd58e00000000000000000000000000000000000000000000000000000000908b90879085908110610f5657fe5b6020026020010151604051602401610f6f929190614a1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060876001600160a01b031683604051610fea9190614855565b600060405180830381855afa9150503d8060008114611025576040519150601f19603f3d011682016040523d82523d6000602084013e61102a565b606091505b5091509150600082801561103f575081516020145b61104a57600061105b565b61105b82600063ffffffff612be416565b9050600087868151811061106b57fe5b6020026020010151828161107b57fe5b049050806110975760009b5050505050505050505050506106cd565b8b8110806110a357508b155b156110ac57809b505b50505050505b600101610efa565b5050505050611490565b6001600160e01b031981167fc339d10a0000000000000000000000000000000000000000000000000000000014156111f7576040516060907fa85e59e4000000000000000000000000000000000000000000000000000000009061113390869060009081908190602401614d5c565b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b03199094169390931790925260045491519092506000916001600160a01b03169061119a908490614855565b600060405180830381855afa9150503d80600081146111d5576040519150601f19603f3d011682016040523d82523d6000602084013e6111da565b606091505b50509050806111ea5760006111ee565b6000195b93505050611490565b6001600160e01b031981167fdc1600f30000000000000000000000000000000000000000000000000000000014156113205760008073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63750bdb30866040518263ffffffff1660e01b81526004016112639190614d49565b60006040518083038186803b15801561127b57600080fd5b505af415801561128f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526112b79190810190614070565b5092509250506112c5612bf0565b6001600160a01b0316826001600160a01b03161480156112f257506005546001600160a01b038281169116145b1561131957600061130a611304612c08565b88612aec565b905061131581612c20565b9450505b5050611490565b6001600160e01b031981167f94cfcdd70000000000000000000000000000000000000000000000000000000014156114905760608073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63bbb2dcf6866040518263ffffffff1660e01b815260040161138c9190614d49565b60006040518083038186803b1580156113a457600080fd5b505af41580156113b8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113e0919081019061422c565b80519194509250905060005b81811461148b578381815181106113ff57fe5b60200260200101516000141561141457611483565b60006114338985848151811061142657fe5b6020026020010151610ba1565b9050600085838151811061144357fe5b6020026020010151828161145357fe5b0490508061146b5760009750505050505050506106cd565b87811080611477575087155b15611480578097505b50505b6001016113ec565b505050505b5092915050565b60008073__$d8b635de2bf4a097b4e18b67d0fb68e779$__638f4ce479846040518263ffffffff1660e01b81526004016114d19190614d49565b604080518083038186803b1580156114e857600080fd5b505af41580156114fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506115209190810190614039565b915091505b915091565b6004546001600160a01b031681565b6000546001600160a01b031681565b600080606080606073__$d8b635de2bf4a097b4e18b67d0fb68e779$__639eadc835876040518263ffffffff1660e01b81526004016115879190614d49565b60006040518083038186803b15801561159f57600080fd5b505af41580156115b3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526115db91908101906140da565b939a9299509097509550909350915050565b6000610934846116696040518060400160405280600b81526020017f30782050726f746f636f6c0000000000000000000000000000000000000000008152506040518060400160405280600581526020017f332e302e300000000000000000000000000000000000000000000000000000008152508787612a15565b612e1e565b606080825160405190808252806020026020018201604052801561169c578160200160208202803883390190505b50905060005b83518114611490578381815181106116b657fe5b60200260200101516001600160a01b0316318282815181106116d457fe5b60209081029190910101526001016116a2565b6000546040517f02cffc4500000000000000000000000000000000000000000000000000000000815260609173__$7a69f714cdde1cb6b62e3c39bc8c94deae$__916302cffc459161174d916001600160a01b039091169088908890889060040161489f565b60006040518083038186803b15801561176557600080fd5b505af4158015611779573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109349190810190613e53565b6040517fa6627e9f00000000000000000000000000000000000000000000000000000000815260609073__$d8b635de2bf4a097b4e18b67d0fb68e779$__9063a6627e9f906117f69086908690600401614a1e565b60006040518083038186803b15801561180e57600080fd5b505af4158015611822573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261184a91908101906142c9565b9392505050565b6006546001600160a01b031681565b6040517fb43cffe100000000000000000000000000000000000000000000000000000000815260609073__$d8b635de2bf4a097b4e18b67d0fb68e779$__9063b43cffe1906118b9908890889088908890600401614965565b60006040518083038186803b1580156118d157600080fd5b505af41580156118e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261190d91908101906142c9565b95945050505050565b600060608073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63bbb2dcf6856040518263ffffffff1660e01b81526004016119529190614d49565b60006040518083038186803b15801561196a57600080fd5b505af415801561197e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261067c919081019061422c565b60075481565b6005546001600160a01b031681565b6000806060600073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63ca49f47c866040518263ffffffff1660e01b81526004016119f99190614d49565b60006040518083038186803b158015611a1157600080fd5b505af4158015611a25573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109cd9190810190614184565b606060008251905080604051908082528060200260200182016040528015611a7f578160200160208202803883390190505b50915060005b8181146107d257611a9c8585838151811061142657fe5b838281518110611aa857fe5b6020908102919091010152600101611a85565b600080611ace838263ffffffff612a8016565b90506001600160e01b031981167f94cfcdd7000000000000000000000000000000000000000000000000000000001415611c395760608073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63bbb2dcf6866040518263ffffffff1660e01b8152600401611b3c9190614d49565b60006040518083038186803b158015611b5457600080fd5b505af4158015611b68573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611b90919081019061422c565b80519194509250905060005b818114611c2e57838181518110611baf57fe5b602002602001015160001415611bc457611c26565b6000611bd6898584815181106107a657fe5b90506000858381518110611be657fe5b60200260200101518281611bf657fe5b04905080611c0e5760009750505050505050506106cd565b87811080611c1a575087155b15611c23578097505b50505b600101611b9c565b506106cd9350505050565b6001600160e01b031981167ff47261b0000000000000000000000000000000000000000000000000000000001415611c9a576000611c7e84601063ffffffff612ab916565b600154909150610c0790829087906001600160a01b0316612e2d565b6001600160e01b031981167f02571792000000000000000000000000000000000000000000000000000000001415611fea5760008073__$d8b635de2bf4a097b4e18b67d0fb68e779$__6304a5618a866040518263ffffffff1660e01b8152600401611d069190614d49565b60606040518083038186803b158015611d1e57600080fd5b505af4158015611d32573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d5691908101906141ec565b600254604051929550909350606092507fe985e9c50000000000000000000000000000000000000000000000000000000091611da2918a916001600160a01b0390911690602401614885565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060846001600160a01b031683604051611e1d9190614855565b600060405180830381855afa9150503d8060008114611e58576040519150601f19603f3d011682016040523d82523d6000602084013e611e5d565b606091505b5091509150811580611e7157508051602014155b80611e8d5750611e8881600063ffffffff612be416565b600114155b15611fdb576040516060907f081812fc0000000000000000000000000000000000000000000000000000000090611ec8908790602401614bc6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050856001600160a01b031681604051611f3f9190614855565b600060405180830381855afa9150503d8060008114611f7a576040519150601f19603f3d011682016040523d82523d6000602084013e611f7f565b606091505b509093509150828015611f93575081516020145b8015611fc257506002546001600160a01b0316611fb783600c63ffffffff612ab916565b6001600160a01b0316145b611fcd576000611fd0565b60015b60ff169750506110ba565b60001996505050505050611490565b6001600160e01b031981167fa7cb5fb7000000000000000000000000000000000000000000000000000000001415612211576040517f9eadc83500000000000000000000000000000000000000000000000000000000815260009073__$d8b635de2bf4a097b4e18b67d0fb68e779$__90639eadc8359061206f908790600401614d49565b60006040518083038186803b15801561208757600080fd5b505af415801561209b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526120c391908101906140da565b5050600354604051929450606093507fe985e9c5000000000000000000000000000000000000000000000000000000009261210d925089916001600160a01b031690602401614885565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060836001600160a01b0316836040516121889190614855565b600060405180830381855afa9150503d80600081146121c3576040519150601f19603f3d011682016040523d82523d6000602084013e6121c8565b606091505b50915091508180156121db575080516020145b80156121f757506121f381600063ffffffff612be416565b6001145b612202576000612206565b6000195b955050505050611490565b6001600160e01b031981167fc339d10a00000000000000000000000000000000000000000000000000000000141561224d576000199150611490565b6001600160e01b031981167fdc1600f30000000000000000000000000000000000000000000000000000000014156114905760008073__$d8b635de2bf4a097b4e18b67d0fb68e779$__63750bdb30866040518263ffffffff1660e01b81526004016122b99190614d49565b60006040518083038186803b1580156122d157600080fd5b505af41580156122e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261230d9190810190614070565b50925092505061231b612bf0565b6001600160a01b0316826001600160a01b031614801561234857506005546001600160a01b038281169116145b1561239257600061236d61235a612c08565b60055489906001600160a01b0316612e2d565b905060001981146123865761238181612c20565b61238a565b6000195b9450506123ae565b6006546001600160a01b03828116911614156123ae5760001993505b50505092915050565b600080546040517f8dccde0400000000000000000000000000000000000000000000000000000000815273__$7a69f714cdde1cb6b62e3c39bc8c94deae$__91638dccde0491610ad0916001600160a01b0316908890889088906004016149e9565b6040517fd3d862d100000000000000000000000000000000000000000000000000000000815260609073__$d8b635de2bf4a097b4e18b67d0fb68e779$__9063d3d862d1906117f69086908690600401614b31565b6040517fd469502800000000000000000000000000000000000000000000000000000000815260009073__$d8b635de2bf4a097b4e18b67d0fb68e779$__9063d4695028906124c1908590600401614d49565b60206040518083038186803b1580156124d957600080fd5b505af41580156124ed573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610881919081019061401e565b60608060606000855190508060405190808252806020026020018201604052801561255657816020015b612543613691565b81526020019060019003908161253b5790505b50935080604051908082528060200260200182016040528015612583578160200160208202803883390190505b509250806040519080825280602002602001820160405280156125b0578160200160208202803883390190505b50915060005b818114612640576125ed8782815181106125cc57fe5b60200260200101518783815181106125e057fe5b6020026020010151612662565b87518890859081106125fb57fe5b6020026020010187858151811061260e57fe5b6020026020010187868151811061262157fe5b93151560209485029190910190930192909252919052526001016125b6565b50509250925092565b6060806126568484611a4d565b91506106a28484610757565b61266a613691565b600080546040517f9d3fa4b900000000000000000000000000000000000000000000000000000000815282916001600160a01b031690639d3fa4b9906126b4908890600401614e8e565b60606040518083038186803b1580156126cc57600080fd5b505afa1580156126e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506127049190810190614420565b85516000546040517fa12dcc6f00000000000000000000000000000000000000000000000000000000815292955090916001600160a01b039091169063a12dcc6f906127569089908990600401614ecc565b60206040518083038186803b15801561276e57600080fd5b505afa158015612782573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506127a69190810190613ffe565b915060006127b387612f37565b905060006127d4886101800151896101400151612f5390919063ffffffff16565b1561280957612802826127f88a60c001518b60800151612f7890919063ffffffff16565b8a60a00151612f94565b9050612876565b60c0880151612825576128028289608001518a60a00151612f94565b6000612836848a61018001516106ab565b9050600061284d848b608001518c60a00151612f94565b90506000612864838c60c001518d60a00151612f94565b905061287082826129ff565b93505050505b61289a61289487604001518a60a00151612fb690919063ffffffff16565b826129ff565b9450600460005460208a01516040517f9caa023b00000000000000000000000000000000000000000000000000000000815273__$7a69f714cdde1cb6b62e3c39bc8c94deae$__92639caa023b92612905926001600160a01b03909216918e91908c906004016149e9565b60206040518083038186803b15801561291d57600080fd5b505af4158015612931573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506129559190810190614318565b600481111561296057fe5b1461296c57600061296e565b845b945061297e886101600151612fd5565b61298757600094505b60e0880151158015906129a557506129a3886101a00151612fd5565b155b156129af57600094505b6003865160068111156129be57fe5b146129c857600094505b5050509250925092565b6001546001600160a01b031681565b6002546001600160a01b031681565b6003546001600160a01b031681565b6000818310612a0e578161184a565b5090919050565b8351602094850120835193850193909320604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f815295860194909452928401929092526060830152608082015260a0902090565b600061184a82612a7b8561318a565b613205565b60008160040183511015612aa657612aa6612aa1600385518560040161323f565b6132ae565b5001602001516001600160e01b03191690565b60008160140183511015612ada57612ada612aa1600485518560140161323f565b5001601401516001600160a01b031690565b60405160009081906060906001600160a01b038616907f70a082310000000000000000000000000000000000000000000000000000000090612b32908790602401614871565b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b0319909416939093179092529051612b859190614855565b600060405180830381855afa9150503d8060008114612bc0576040519150601f19603f3d011682016040523d82523d6000602084013e612bc5565b606091505b5091509150818015612bd8575080516020145b156107d2576106c88160005b600061184a83836132b6565b736b175474e89094c44da98b954eedeac495271d0f90565b7306af07097c9eeb7fd685c692751d5c66db49c21590565b600080612c2b612c08565b6001600160a01b0316634ba2363a6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612c6557600080fd5b505af1158015612c79573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612c9d91908101906142fc565b90506000816001600160a01b03166320aba08b6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612cdc57600080fd5b505af1158015612cf0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612d149190810190614629565b4211612d9257816001600160a01b031663c92aecc46040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612d5557600080fd5b505af1158015612d69573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612d8d9190810190614629565b612e05565b816001600160a01b0316639f678cca6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612dcd57600080fd5b505af1158015612de1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612e059190810190614629565b9050610934816b033b2e3c9fd0803ce800000086612f94565b600061184a82612a7b856132e0565b60405160009081906060906001600160a01b038716907fdd62ed3e0000000000000000000000000000000000000000000000000000000090612e759088908890602401614885565b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b0319909416939093179092529051612ec89190614855565b600060405180830381855afa9150503d8060008114612f03576040519150601f19603f3d011682016040523d82523d6000602084013e612f08565b606091505b5091509150818015612f1b575080516020145b15612f2e57612f2b816000612be4565b92505b50509392505050565b6000806000612f4584613399565b9150915061093482826129ff565b60008151835114801561184a5750508051602091820120825192909101919091201490565b60008282018381101561184a5761184a612aa16000868661359c565b600061093483612faa868563ffffffff6135bb16565b9063ffffffff6135ec16565b600082821115612fcf57612fcf612aa16002858561359c565b50900390565b60006020825181612fe257fe5b06600414612ff257506000610884565b6000613004838263ffffffff612a8016565b90506001600160e01b031981167f94cfcdd70000000000000000000000000000000000000000000000000000000014613041576001915050610884565b6040517fbbb2dcf600000000000000000000000000000000000000000000000000000000815260609073__$d8b635de2bf4a097b4e18b67d0fb68e779$__9063bbb2dcf690613094908790600401614d49565b60006040518083038186803b1580156130ac57600080fd5b505af41580156130c0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526130e8919081019061422c565b80519093509150600090505b81811461317e576000613124600085848151811061310e57fe5b6020026020010151612a8090919063ffffffff16565b90506001600160e01b031981167f02571792000000000000000000000000000000000000000000000000000000001415613175576131628483613616565b1561317557600095505050505050610884565b506001016130f4565b50600195945050505050565b608081810151825160208085015160408087015160609788015186519685019690962082517fec69816980a3a3ca4554410e60253953e9ff375ba4536a98adfa15cc7154150881529485019590955290830191909152948101949094526001600160a01b039091169183019190915260a082015260c0902090565b6040517f19010000000000000000000000000000000000000000000000000000000000008152600281019290925260228201526042902090565b6060632800659560e01b84848460405160240161325e93929190614dbc565b60408051601f198184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b03199093169290921790915290509392505050565b805160208201fd5b600081602001835110156132d7576132d7612aa1600585518560200161323f565b50016020015190565b6101408101516101608201516101808301516101a08401516000937ff80322eb8376aafb64eadf8f0d7623f22130fd9491a221e902b713cb984a75349390929091602087101561332c57fe5b601f1987018051610140890180516101608b0180516101808d0180516101a08f0180519d89528c5160209d8e012087528b519b8d019b909b2084528951998c01999099208152875197909a019690962088526101e085209390945290529190529252919091529050919050565b60008060048361014001515110156133b657506000905080611525565b6101408301516000906133cf908263ffffffff612a8016565b90506001600160e01b031981167fdc1600f300000000000000000000000000000000000000000000000000000000141561356c576101408401516040517f750bdb3000000000000000000000000000000000000000000000000000000000815260009173__$d8b635de2bf4a097b4e18b67d0fb68e779$__9163750bdb309161345a91600401614d49565b60006040518083038186803b15801561347257600080fd5b505af4158015613486573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526134ae9190810190614070565b506006549093506001600160a01b0380851691161415915061356a90505773__$ef9cb1cf4426222cc0af8204def2680bac$__63d12a7960866134ef613679565b6040518363ffffffff1660e01b815260040161350c929190614ea1565b60206040518083038186803b15801561352457600080fd5b505af4158015613538573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061355c9190810190614629565b600019935093505050611525565b505b61357f8460000151856101400151610ba1565b6135928560000151866101400151611abb565b9250925050915091565b606063e946c1bb60e01b84848460405160240161325e93929190614d9a565b6000826135ca575060006106cd565b828202828482816135d757fe5b041461184a5761184a612aa16001868661359c565b60008161360257613602612aa16003858561359c565b600082848161360d57fe5b04949350505050565b8151600090600183015b818110156107d25761366185828151811061363757fe5b602002602001015186868151811061364b57fe5b6020026020010151612f5390919063ffffffff16565b15613671576001925050506106cd565b600101613620565b731e0447b19bb6ecfdae1e4ae1694b0c3659614e4e90565b6040805160608101909152806000815260006020820181905260409091015290565b80356106cd81614fa4565b80516106cd81614fa4565b600082601f8301126136d9578081fd5b81356136ec6136e782614f26565b614eff565b81815291506020808301908481018184028601820187101561370d57600080fd5b60005b8481101561148b57813561372381614fa4565b84529282019290820190600101613710565b600082601f830112613745578081fd5b81356137536136e782614f26565b8181529150602080830190840160005b838110156137905761377b8760208435890101613924565b83526020928301929190910190600101613763565b5050505092915050565b600082601f8301126137aa578081fd5b81516137b86136e782614f26565b8181529150602080830190840160005b83811015613790576137e08760208451890101613972565b835260209283019291909101906001016137c8565b600082601f830112613805578081fd5b81356138136136e782614f26565b8181529150602080830190840160005b838110156137905761383b87602084358901016139c7565b83526020928301929190910190600101613823565b600082601f830112613860578081fd5b813561386e6136e782614f26565b81815291506020808301908481018184028601820187101561388f57600080fd5b60005b8481101561148b57813584529282019290820190600101613892565b600082601f8301126138be578081fd5b81516138cc6136e782614f26565b8181529150602080830190848101818402860182018710156138ed57600080fd5b60005b8481101561148b578151845292820192908201906001016138f0565b80516001600160e01b0319811681146106cd57600080fd5b600082601f830112613934578081fd5b81356139426136e782614f46565b915080825283602082850101111561395957600080fd5b8060208401602084013760009082016020015292915050565b600082601f830112613982578081fd5b81516139906136e782614f46565b91508082528360208285010111156139a757600080fd5b611490816020840160208601614f6a565b8051600581106106cd57600080fd5b60006101c08083850312156139da578182fd5b6139e381614eff565b9150506139f083836136b3565b81526139ff83602084016136b3565b6020820152613a1183604084016136b3565b6040820152613a2383606084016136b3565b60608201526080820135608082015260a082013560a082015260c082013560c082015260e082013560e08201526101008083013581830152506101208083013581830152506101408083013567ffffffffffffffff80821115613a8557600080fd5b613a9186838701613924565b83850152610160925082850135915080821115613aad57600080fd5b613ab986838701613924565b83850152610180925082850135915080821115613ad557600080fd5b613ae186838701613924565b838501526101a0925082850135915080821115613afd57600080fd5b50613b0a85828601613924565b82840152505092915050565b60006101c0808385031215613b29578182fd5b613b3281614eff565b915050613b3f83836136be565b8152613b4e83602084016136be565b6020820152613b6083604084016136be565b6040820152613b7283606084016136be565b60608201526080820151608082015260a082015160a082015260c082015160c082015260e082015160e08201526101008083015181830152506101208083015181830152506101408083015167ffffffffffffffff80821115613bd457600080fd5b613be086838701613972565b83850152610160925082850151915080821115613bfc57600080fd5b613c0886838701613972565b83850152610180925082850151915080821115613c2457600080fd5b613c3086838701613972565b838501526101a0925082850151915080821115613c4c57600080fd5b50613b0a85828601613972565b600060208284031215613c6a578081fd5b813561184a81614fa4565b60008060408385031215613c87578081fd5b8235613c9281614fa4565b9150602083013567ffffffffffffffff811115613cad578182fd5b613cb985828601613735565b9150509250929050565b60008060008060808587031215613cd8578182fd5b8435613ce381614fa4565b9350602085013567ffffffffffffffff80821115613cff578384fd5b613d0b88838901613850565b94506040870135915080821115613d20578384fd5b613d2c88838901613850565b93506060870135915080821115613d41578283fd5b50613d4e87828801613924565b91505092959194509250565b60008060408385031215613d6c578182fd5b8235613d7781614fa4565b9150602083013567ffffffffffffffff811115613d92578182fd5b613cb985828601613924565b600080600060608486031215613db2578081fd5b8335613dbd81614fa4565b9250602084013567ffffffffffffffff811115613dd8578182fd5b613de486828701613924565b925050604084013590509250925092565b60008060408385031215613e07578182fd5b8235613e1281614fa4565b946020939093013593505050565b600060208284031215613e31578081fd5b813567ffffffffffffffff811115613e47578182fd5b610934848285016136c9565b60006020808385031215613e65578182fd5b825167ffffffffffffffff811115613e7b578283fd5b80840185601f820112613e8c578384fd5b80519150613e9c6136e783614f26565b8281528381019082850185850284018601891015613eb8578687fd5b8693505b84841015613ee257613ece89826139b8565b835260019390930192918501918501613ebc565b50979650505050505050565b600080600060608486031215613f02578081fd5b833567ffffffffffffffff80821115613f19578283fd5b613f25878388016137f5565b94506020860135915080821115613f3a578283fd5b613f46878388016136c9565b93506040860135915080821115613f5b578283fd5b50613f6886828701613850565b9150509250925092565b60008060408385031215613f84578182fd5b823567ffffffffffffffff80821115613f9b578384fd5b613fa7868387016137f5565b93506020850135915080821115613fbc578283fd5b50613cb985828601613735565b60008060408385031215613fdb578182fd5b823567ffffffffffffffff80821115613ff2578384fd5b613fa786838701613850565b60006020828403121561400f578081fd5b8151801515811461184a578182fd5b60006020828403121561402f578081fd5b61184a838361390c565b6000806040838503121561404b578182fd5b614055848461390c565b9150602083015161406581614fa4565b809150509250929050565b60008060008060808587031215614085578182fd5b845161409081614fb9565b60208601519094506140a181614fa4565b60408601519093506140b281614fa4565b606086015190925067ffffffffffffffff8111156140ce578182fd5b613d4e87828801613972565b600080600080600060a086880312156140f1578283fd5b6140fb878761390c565b9450602086015161410b81614fa4565b604087015190945067ffffffffffffffff80821115614128578485fd5b61413489838a016138ae565b94506060880151915080821115614149578283fd5b61415589838a016138ae565b9350608088015191508082111561416a578283fd5b5061417788828901613972565b9150509295509295909350565b60008060008060808587031215614199578182fd5b6141a3868661390c565b935060208501516141b381614fa4565b604086015190935067ffffffffffffffff8111156141cf578283fd5b6141db87828801613972565b606096909601519497939650505050565b600080600060608486031215614200578081fd5b61420a858561390c565b9250602084015161421a81614fa4565b80925050604084015190509250925092565b600080600060608486031215614240578081fd5b835161424b81614fb9565b602085015190935067ffffffffffffffff80821115614268578283fd5b614274878388016138ae565b93506040860151915080821115614289578283fd5b50613f688682870161379a565b6000602082840312156142a7578081fd5b813567ffffffffffffffff8111156142bd578182fd5b61093484828501613924565b6000602082840312156142da578081fd5b815167ffffffffffffffff8111156142f0578182fd5b61093484828501613972565b60006020828403121561430d578081fd5b815161184a81614fa4565b600060208284031215614329578081fd5b61184a83836139b8565b60008060008060808587031215614348578182fd5b845167ffffffffffffffff8082111561435f578384fd5b61436b88838901613972565b9550602091508187015181811115614381578485fd5b80880189601f820112614392578586fd5b805191506143a26136e783614f26565b82815284810190828601885b858110156143d7576143c58e898451880101613b16565b845292870192908701906001016143ae565b505060408b01519098509450505050808211156143f2578384fd5b6143fe888389016138ae565b93506060870151915080821115614413578283fd5b50613d4e8782880161379a565b600060608284031215614431578081fd5b61443b6060614eff565b825160078110614449578283fd5b8152602083810151908201526040928301519281019290925250919050565b60008060006060848603121561447c578081fd5b833567ffffffffffffffff811115614492578182fd5b61449e868287016139c7565b93505060208401356144af81614fa4565b929592945050506040919091013590565b600080604083850312156144d2578182fd5b823567ffffffffffffffff808211156144e9578384fd5b6144f5868387016139c7565b9350602085013591508082111561450a578283fd5b50613cb985828601613924565b60008060006060848603121561452b578081fd5b833567ffffffffffffffff811115614541578182fd5b61454d868287016139c7565b93505060208401359150604084013561456581614fa4565b809150509250925092565b600080600060608486031215614584578081fd5b833567ffffffffffffffff8082111561459b578283fd5b81860160a081890312156145ad578384fd5b6145b760a0614eff565b925080358352602081013560208401526040810135604084015260608101356145df81614fa4565b60608401526080810135828111156145f5578485fd5b61460189828401613924565b60808501525091945050506020840135915061462085604086016136b3565b90509250925092565b60006020828403121561463a578081fd5b5051919050565b6001600160a01b0316815260200190565b600061465e8383614731565b505060600190565b6001600160a01b03169052565b600081518084526020840180819550602083028101915060208501845b848110156146be5782840388526146a8848351614705565b6020988901989094509190910190600101614690565b50919695505050505050565b6000815180845260208401935060208301825b828110156146fb5781518652602095860195909101906001016146dd565b5093949350505050565b6000815180845261471d816020860160208601614f6a565b601f01601f19169290920160200192915050565b80516007811061473d57fe5b825260208181015190830152604090810151910152565b60006101c0614764848451614666565b60208301516147766020860182614666565b5060408301516147896040860182614666565b50606083015161479c6060860182614666565b506080830151608085015260a083015160a085015260c083015160c085015260e083015160e08501526101008084015181860152506101208084015181860152506101408084015182828701526147f583870182614705565b915050610160915081840151858203838701526148128282614705565b92505050610180808401518583038287015261482e8382614705565b9150506101a09150818401518582038387015261484b8282614705565b9695505050505050565b60008251614867818460208701614f6a565b9190910192915050565b6001600160a01b0391909116815260200190565b6001600160a01b0392831681529116602082015260400190565b6000608082016001600160a01b038716835260206080818501528187516148c68185614bc6565b91508193508281028201838a01865b838110156148ff5786830385526148ed838351614754565b948601949250908501906001016148d5565b505086810360408801528094508851925061491a8382614bc6565b94505050818701845b8281101561494457614936858351614641565b945090830190600101614923565b50505050828103606084015261495a81856146ca565b979650505050505050565b60006001600160a01b03861682526080602083015261498760808301866146ca565b828103604084015261499981866146ca565b83810360608501526149ab8186614705565b98975050505050505050565b60006001600160a01b0385168252606060208301526149d96060830185614705565b9050826040830152949350505050565b60006001600160a01b03808716835260806020840152614a0c6080840187614754565b94166040830152506060015292915050565b6001600160a01b03929092168252602082015260400190565b602080825282518282018190526000918401906040840190835b81811015614a78578351614a6481614f9a565b835260209384019390920191600101614a51565b509095945050505050565b60006060820160608352808651614a9a8184614bc6565b915060209250828801845b82811015614ac657614ab8848351614652565b935090840190600101614aa5565b50505083810382850152614ada81876146ca565b84810360408601528551808252908301915082860190845b81811015614b10578251151584529284019291840191600101614af2565b509198975050505050505050565b60006020825261184a60208301846146ca565b600060408252614b4460408301856146ca565b602083820381850152818551808452828401915082838202850101838801865b83811015614b9257601f19878403018552614b80838351614705565b94860194925090850190600101614b64565b50909998505050505050505050565b600060408252614bb460408301856146ca565b828103602084015261190d81856146ca565b90815260200190565b6001600160e01b031991909116815260200190565b6001600160e01b03199290921682526001600160a01b0316602082015260400190565b60006001600160e01b0319861682526001600160a01b0380861660208401528085166040840152506080606083015261484b6080830184614705565b60006001600160e01b0319871682526001600160a01b038616602083015260a06040830152614c7560a08301866146ca565b8281036060840152614c8781866146ca565b8381036080850152614c998186614705565b9998505050505050505050565b60006001600160e01b0319861682526001600160a01b038516602083015260806040830152614cd86080830185614705565b905082606083015295945050505050565b6001600160e01b03199390931683526001600160a01b03919091166020830152604082015260600190565b60006001600160e01b03198516825260606020830152614d3760608301856146ca565b828103604084015261484b8185614673565b60006020825261184a6020830184614705565b600060808252614d6f6080830187614705565b6001600160a01b03958616602084015293909416604082015260ff9190911660609091015292915050565b6060810160048510614da857fe5b938152602081019290925260409091015290565b6060810160088510614da857fe5b60208101614dd783614f9a565b91905290565b600060808252614df06080830187614705565b602083820381850152818751808452828401915082838202850101838a01865b83811015614e3e57601f19878403018552614e2c838351614754565b94860194925090850190600101614e10565b50508681036040880152614e52818a6146ca565b945050505050828103606084015261495a8185614673565b60a08101614e788286614731565b8360608301528215156080830152949350505050565b60006020825261184a6020830184614754565b600060408252614eb46040830185614754565b90506001600160a01b03831660208301529392505050565b600060408252614edf6040830185614754565b828103602084015261190d8185614705565b918252602082015260400190565b60405181810167ffffffffffffffff81118282101715614f1e57600080fd5b604052919050565b600067ffffffffffffffff821115614f3c578081fd5b5060209081020190565b600067ffffffffffffffff821115614f5c578081fd5b50601f01601f191660200190565b60005b83811015614f85578181015183820152602001614f6d565b83811115614f94576000848401525b50505050565b6005811061075457fe5b6001600160a01b038116811461075457600080fd5b6001600160e01b03198116811461075457600080fdfea365627a7a72315820f05bfff91cf6f387ce89e4ca5ccc415a4c291e39b349e6d1c630a5574b2fee306c6578706572696d656e74616cf564736f6c63430005100040'; + '0x608060405234801561001057600080fd5b50600436106102775760003560e01c8063a5cd62ba11610160578063d186037f116100d8578063e4e6e7da1161008c578063ee18599711610071578063ee185997146105d8578063ef3bb097146105e0578063ff84e7cc146105e857610277565b8063e4e6e7da14610595578063e77286eb146105b657610277565b8063d3d862d1116100bd578063d3d862d114610540578063d469502814610553578063e25cabf71461057357610277565b8063d186037f1461051a578063d36379051461052d57610277565b8063bbb2dcf61161012f578063c82037ef11610114578063c82037ef146104dc578063ca49f47c146104e4578063d001c5dc1461050757610277565b8063bbb2dcf6146104b2578063c26cfecd146104d457610277565b8063a5cd62ba14610464578063a6627e9f14610484578063a7530f1214610497578063b43cffe11461049f57610277565b80637982653e116101f35780639baf2705116101c25780639eadc835116101a75780639eadc8351461041a578063a070cac81461043e578063a0901e511461045157610277565b80639baf2705146103fd5780639cd016051461041257610277565b80637982653e1461039657806379c9c426146103b65780637d727512146103c95780638f4ce479146103dc57610277565b80634dfdac201161024a57806363eb39921161022f57806363eb39921461033d5780636f83188e14610350578063750bdb301461037357610277565b80634dfdac20146102fd578063590aa8751461031d57610277565b806304a5618a1461027c5780630d7b7d76146102a75780632322cf76146102c857806346eb65cb146102e8575b600080fd5b61028f61028a366004614168565b6105f0565b60405161029e93929190614d64565b60405180910390f35b6102ba6102b5366004613c2c565b610689565b60405161029e929190614f6d565b6102db6102d6366004613c2c565b6106ab565b60405161029e9190614c41565b6102fb6102f6366004614168565b6106d3565b005b61031061030b366004613b47565b610757565b60405161029e9190614b99565b61033061032b366004613b2b565b6107da565b60405161029e9190614dc4565b61033061034b366004613c70565b610889565b61036361035e366004614168565b61093c565b60405161029e9493929190614e59565b610386610381366004614168565b6109dc565b60405161029e9493929190614c82565b6103a96103a43660046144b3565b610a6e565b60405161029e9190614e45565b6102db6103c43660046145bb565b610b20565b6102db6103d7366004613c2c565b610ba1565b6103ef6103ea366004614168565b611497565b60405161029e929190614c5f565b61040561152a565b60405161029e91906148c4565b610405611539565b61042d610428366004614168565b611548565b60405161029e959493929190614cbe565b6102db61044c366004614562565b6115ed565b61031061045f366004613cf2565b61166e565b610477610472366004613dc0565b6116e7565b60405161029e9190614aad565b610330610492366004613cc7565b6117a1565b610405611851565b6103306104ad366004613b95565b611860565b6104c56104c0366004614168565b611916565b60405161029e93929190614d8f565b6102db6119a6565b6104056119ac565b6104f76104f2366004614168565b6119bb565b60405161029e9493929190614d21565b610310610515366004613b47565b611a4d565b6102db610528366004613c2c565b611abb565b6103a961053b3660046144b3565b612446565b61033061054e366004613e9b565b6124a8565b610566610561366004614168565b6124fd565b60405161029e9190614c4a565b610586610581366004613e44565b6125a0565b60405161029e93929190614afa565b6105a86105a3366004613b47565b6126d8565b60405161029e929190614c1c565b6105c96105c436600461450b565b6126f1565b60405161029e93929190614ee6565b610405612960565b61040561296f565b61040561297e565b600080600073__$af40232205bf188fa8dd573e0f47eaeabc$__6304a5618a856040518263ffffffff1660e01b815260040161062c9190614dc4565b60606040518083038186803b15801561064457600080fd5b505af4158015610658573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061067c91908101906140be565b9250925092509193909250565b6000806106968484610ba1565b91506106a28484611abb565b90509250929050565b60008060006106ba8585610689565b915091506106c8828261298d565b925050505b92915050565b6040517f46eb65cb00000000000000000000000000000000000000000000000000000000815273__$af40232205bf188fa8dd573e0f47eaeabc$__906346eb65cb90610723908490600401614dc4565b60006040518083038186803b15801561073b57600080fd5b505af415801561074f573d6000803e3d6000fd5b505050505b50565b606060008251905080604051908082528060200260200182016040528015610789578160200160208202803883390190505b50915060005b8181146107d2576107b3858583815181106107a657fe5b6020026020010151611abb565b8382815181106107bf57fe5b602090810291909101015260010161078f565b505092915050565b6040517f590aa87500000000000000000000000000000000000000000000000000000000815260609073__$af40232205bf188fa8dd573e0f47eaeabc$__9063590aa8759061082d9085906004016148c4565b60006040518083038186803b15801561084557600080fd5b505af4158015610859573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610881919081019061419b565b90505b919050565b6040517f63eb399200000000000000000000000000000000000000000000000000000000815260609073__$af40232205bf188fa8dd573e0f47eaeabc$__906363eb3992906108e090879087908790600401614a2d565b60006040518083038186803b1580156108f857600080fd5b505af415801561090c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610934919081019061419b565b949350505050565b60608060608073__$d80c8447db5aca01fdd367a509db3f8167$__636f83188e866040518263ffffffff1660e01b81526004016109799190614dc4565b60006040518083038186803b15801561099157600080fd5b505af41580156109a5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109cd9190810190614209565b93509350935093509193509193565b6000806000606073__$af40232205bf188fa8dd573e0f47eaeabc$__63750bdb30866040518263ffffffff1660e01b8152600401610a1a9190614dc4565b60006040518083038186803b158015610a3257600080fd5b505af4158015610a46573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109cd9190810190613f42565b600080546040517f9caa023b00000000000000000000000000000000000000000000000000000000815273__$51238773fd6195a8a6f152a329b1854152$__91639caa023b91610ad0916001600160a01b031690889088908890600401614a5f565b60206040518083038186803b158015610ae857600080fd5b505af4158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061093491908101906141ea565b600061093484610b9c6040518060400160405280600b81526020017f30782050726f746f636f6c0000000000000000000000000000000000000000008152506040518060400160405280600581526020017f332e302e3000000000000000000000000000000000000000000000000000000081525087876129a3565b6129fa565b600080610bb4838263ffffffff612a0e16565b90506001600160e01b031981167ff47261b0000000000000000000000000000000000000000000000000000000001415610c0f576000610bfb84601063ffffffff612a4716565b9050610c078186612a7a565b925050611490565b6001600160e01b031981167f02571792000000000000000000000000000000000000000000000000000000001415610e285760008073__$af40232205bf188fa8dd573e0f47eaeabc$__6304a5618a866040518263ffffffff1660e01b8152600401610c7b9190614dc4565b60606040518083038186803b158015610c9357600080fd5b505af4158015610ca7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610ccb91908101906140be565b6040519194509250606091507f6352211e0000000000000000000000000000000000000000000000000000000090610d07908490602401614c41565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060846001600160a01b031683604051610d8291906148a8565b600060405180830381855afa9150503d8060008114610dbd576040519150601f19603f3d011682016040523d82523d6000602084013e610dc2565b606091505b50915091506000828015610dd7575081516020145b610de2576000610df3565b610df382600c63ffffffff612a4716565b9050896001600160a01b0316816001600160a01b031614610e15576000610e18565b60015b60ff169750505050505050611490565b6001600160e01b031981167fa7cb5fb70000000000000000000000000000000000000000000000000000000014156110c457600060608073__$af40232205bf188fa8dd573e0f47eaeabc$__639eadc835876040518263ffffffff1660e01b8152600401610e969190614dc4565b60006040518083038186803b158015610eae57600080fd5b505af4158015610ec2573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610eea9190810190613fac565b5081519296509094509250905060005b8181146110ba57828181518110610f0d57fe5b602002602001015160001415610f22576110b2565b83516060907efdd58e00000000000000000000000000000000000000000000000000000000908b90879085908110610f5657fe5b6020026020010151604051602401610f6f929190614a94565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060876001600160a01b031683604051610fea91906148a8565b600060405180830381855afa9150503d8060008114611025576040519150601f19603f3d011682016040523d82523d6000602084013e61102a565b606091505b5091509150600082801561103f575081516020145b61104a57600061105b565b61105b82600063ffffffff612b7216565b9050600087868151811061106b57fe5b6020026020010151828161107b57fe5b049050806110975760009b5050505050505050505050506106cd565b8b8110806110a357508b155b156110ac57809b505b50505050505b600101610efa565b5050505050611490565b6001600160e01b031981167fc339d10a0000000000000000000000000000000000000000000000000000000014156111f7576040516060907fa85e59e4000000000000000000000000000000000000000000000000000000009061113390869060009081908190602401614dd7565b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b03199094169390931790925260045491519092506000916001600160a01b03169061119a9084906148a8565b600060405180830381855afa9150503d80600081146111d5576040519150601f19603f3d011682016040523d82523d6000602084013e6111da565b606091505b50509050806111ea5760006111ee565b6000195b93505050611490565b6001600160e01b031981167fdc1600f30000000000000000000000000000000000000000000000000000000014156113205760008073__$af40232205bf188fa8dd573e0f47eaeabc$__63750bdb30866040518263ffffffff1660e01b81526004016112639190614dc4565b60006040518083038186803b15801561127b57600080fd5b505af415801561128f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526112b79190810190613f42565b5092509250506112c5612b7e565b6001600160a01b0316826001600160a01b03161480156112f257506005546001600160a01b038281169116145b1561131957600061130a611304612b96565b88612a7a565b905061131581612bae565b9450505b5050611490565b6001600160e01b031981167f94cfcdd70000000000000000000000000000000000000000000000000000000014156114905760608073__$af40232205bf188fa8dd573e0f47eaeabc$__63bbb2dcf6866040518263ffffffff1660e01b815260040161138c9190614dc4565b60006040518083038186803b1580156113a457600080fd5b505af41580156113b8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113e091908101906140fe565b80519194509250905060005b81811461148b578381815181106113ff57fe5b60200260200101516000141561141457611483565b60006114338985848151811061142657fe5b6020026020010151610ba1565b9050600085838151811061144357fe5b6020026020010151828161145357fe5b0490508061146b5760009750505050505050506106cd565b87811080611477575087155b15611480578097505b50505b6001016113ec565b505050505b5092915050565b60008073__$af40232205bf188fa8dd573e0f47eaeabc$__638f4ce479846040518263ffffffff1660e01b81526004016114d19190614dc4565b604080518083038186803b1580156114e857600080fd5b505af41580156114fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506115209190810190613f0b565b915091505b915091565b6004546001600160a01b031681565b6000546001600160a01b031681565b600080606080606073__$af40232205bf188fa8dd573e0f47eaeabc$__639eadc835876040518263ffffffff1660e01b81526004016115879190614dc4565b60006040518083038186803b15801561159f57600080fd5b505af41580156115b3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526115db9190810190613fac565b939a9299509097509550909350915050565b6000610934846116696040518060400160405280600b81526020017f30782050726f746f636f6c0000000000000000000000000000000000000000008152506040518060400160405280600581526020017f332e302e3000000000000000000000000000000000000000000000000000000081525087876129a3565b612dac565b606080825160405190808252806020026020018201604052801561169c578160200160208202803883390190505b50905060005b83518114611490578381815181106116b657fe5b60200260200101516001600160a01b0316318282815181106116d457fe5b60209081029190910101526001016116a2565b6000546040517f02cffc4500000000000000000000000000000000000000000000000000000000815260609173__$51238773fd6195a8a6f152a329b1854152$__916302cffc459161174d916001600160a01b0390911690889088908890600401614915565b60006040518083038186803b15801561176557600080fd5b505af4158015611779573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109349190810190613d25565b6040517fa6627e9f00000000000000000000000000000000000000000000000000000000815260609073__$af40232205bf188fa8dd573e0f47eaeabc$__9063a6627e9f906117f69086908690600401614a94565b60006040518083038186803b15801561180e57600080fd5b505af4158015611822573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261184a919081019061419b565b9392505050565b6006546001600160a01b031681565b6040517fb43cffe100000000000000000000000000000000000000000000000000000000815260609073__$af40232205bf188fa8dd573e0f47eaeabc$__9063b43cffe1906118b99088908890889088906004016149db565b60006040518083038186803b1580156118d157600080fd5b505af41580156118e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261190d919081019061419b565b95945050505050565b600060608073__$af40232205bf188fa8dd573e0f47eaeabc$__63bbb2dcf6856040518263ffffffff1660e01b81526004016119529190614dc4565b60006040518083038186803b15801561196a57600080fd5b505af415801561197e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261067c91908101906140fe565b60075481565b6005546001600160a01b031681565b6000806060600073__$af40232205bf188fa8dd573e0f47eaeabc$__63ca49f47c866040518263ffffffff1660e01b81526004016119f99190614dc4565b60006040518083038186803b158015611a1157600080fd5b505af4158015611a25573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109cd9190810190614056565b606060008251905080604051908082528060200260200182016040528015611a7f578160200160208202803883390190505b50915060005b8181146107d257611a9c8585838151811061142657fe5b838281518110611aa857fe5b6020908102919091010152600101611a85565b600080611ace838263ffffffff612a0e16565b90506001600160e01b031981167f94cfcdd7000000000000000000000000000000000000000000000000000000001415611c395760608073__$af40232205bf188fa8dd573e0f47eaeabc$__63bbb2dcf6866040518263ffffffff1660e01b8152600401611b3c9190614dc4565b60006040518083038186803b158015611b5457600080fd5b505af4158015611b68573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611b9091908101906140fe565b80519194509250905060005b818114611c2e57838181518110611baf57fe5b602002602001015160001415611bc457611c26565b6000611bd6898584815181106107a657fe5b90506000858381518110611be657fe5b60200260200101518281611bf657fe5b04905080611c0e5760009750505050505050506106cd565b87811080611c1a575087155b15611c23578097505b50505b600101611b9c565b506106cd9350505050565b6001600160e01b031981167ff47261b0000000000000000000000000000000000000000000000000000000001415611c9a576000611c7e84601063ffffffff612a4716565b600154909150610c0790829087906001600160a01b0316612dbb565b6001600160e01b031981167f02571792000000000000000000000000000000000000000000000000000000001415611fea5760008073__$af40232205bf188fa8dd573e0f47eaeabc$__6304a5618a866040518263ffffffff1660e01b8152600401611d069190614dc4565b60606040518083038186803b158015611d1e57600080fd5b505af4158015611d32573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d5691908101906140be565b600254604051929550909350606092507fe985e9c50000000000000000000000000000000000000000000000000000000091611da2918a916001600160a01b03909116906024016148d8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060846001600160a01b031683604051611e1d91906148a8565b600060405180830381855afa9150503d8060008114611e58576040519150601f19603f3d011682016040523d82523d6000602084013e611e5d565b606091505b5091509150811580611e7157508051602014155b80611e8d5750611e8881600063ffffffff612b7216565b600114155b15611fdb576040516060907f081812fc0000000000000000000000000000000000000000000000000000000090611ec8908790602401614c41565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050856001600160a01b031681604051611f3f91906148a8565b600060405180830381855afa9150503d8060008114611f7a576040519150601f19603f3d011682016040523d82523d6000602084013e611f7f565b606091505b509093509150828015611f93575081516020145b8015611fc257506002546001600160a01b0316611fb783600c63ffffffff612a4716565b6001600160a01b0316145b611fcd576000611fd0565b60015b60ff169750506110ba565b60001996505050505050611490565b6001600160e01b031981167fa7cb5fb7000000000000000000000000000000000000000000000000000000001415612211576040517f9eadc83500000000000000000000000000000000000000000000000000000000815260009073__$af40232205bf188fa8dd573e0f47eaeabc$__90639eadc8359061206f908790600401614dc4565b60006040518083038186803b15801561208757600080fd5b505af415801561209b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526120c39190810190613fac565b5050600354604051929450606093507fe985e9c5000000000000000000000000000000000000000000000000000000009261210d925089916001600160a01b0316906024016148d8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060006060836001600160a01b03168360405161218891906148a8565b600060405180830381855afa9150503d80600081146121c3576040519150601f19603f3d011682016040523d82523d6000602084013e6121c8565b606091505b50915091508180156121db575080516020145b80156121f757506121f381600063ffffffff612b7216565b6001145b612202576000612206565b6000195b955050505050611490565b6001600160e01b031981167fc339d10a00000000000000000000000000000000000000000000000000000000141561224d576000199150611490565b6001600160e01b031981167fdc1600f30000000000000000000000000000000000000000000000000000000014156114905760008073__$af40232205bf188fa8dd573e0f47eaeabc$__63750bdb30866040518263ffffffff1660e01b81526004016122b99190614dc4565b60006040518083038186803b1580156122d157600080fd5b505af41580156122e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261230d9190810190613f42565b50925092505061231b612b7e565b6001600160a01b0316826001600160a01b031614801561234857506005546001600160a01b038281169116145b1561239257600061236d61235a612b96565b60055489906001600160a01b0316612dbb565b905060001981146123865761238181612bae565b61238a565b6000195b94505061243d565b6006546001600160a01b038281169116141561243d5773__$8ab3d6b0b5fe290c724f8d6cfdac7eabfb$__630e70a03387836123cc612ec5565b6040518463ffffffff1660e01b81526004016123ea939291906148f2565b60206040518083038186803b15801561240257600080fd5b505af4158015612416573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061243a9190810190614673565b93505b50505092915050565b600080546040517f8dccde0400000000000000000000000000000000000000000000000000000000815273__$51238773fd6195a8a6f152a329b1854152$__91638dccde0491610ad0916001600160a01b031690889088908890600401614a5f565b6040517fd3d862d100000000000000000000000000000000000000000000000000000000815260609073__$af40232205bf188fa8dd573e0f47eaeabc$__9063d3d862d1906117f69086908690600401614bac565b6040517fd469502800000000000000000000000000000000000000000000000000000000815260009073__$af40232205bf188fa8dd573e0f47eaeabc$__9063d469502890612550908590600401614dc4565b60206040518083038186803b15801561256857600080fd5b505af415801561257c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108819190810190613ef0565b6060806060600085519050806040519080825280602002602001820160405280156125e557816020015b6125d26136a6565b8152602001906001900390816125ca5790505b50935080604051908082528060200260200182016040528015612612578160200160208202803883390190505b5092508060405190808252806020026020018201604052801561263f578160200160208202803883390190505b50915060005b8181146126cf5761267c87828151811061265b57fe5b602002602001015187838151811061266f57fe5b60200260200101516126f1565b875188908590811061268a57fe5b6020026020010187858151811061269d57fe5b602002602001018786815181106126b057fe5b9315156020948502919091019093019290925291905252600101612645565b50509250925092565b6060806126e58484611a4d565b91506106a28484610757565b6126f96136a6565b600080546040517f9d3fa4b900000000000000000000000000000000000000000000000000000000815282916001600160a01b031690639d3fa4b990612743908890600401614f0a565b60606040518083038186803b15801561275b57600080fd5b505afa15801561276f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612793919081019061446b565b85516000546040517fa12dcc6f00000000000000000000000000000000000000000000000000000000815292955090916001600160a01b039091169063a12dcc6f906127e59089908990600401614f48565b60206040518083038186803b1580156127fd57600080fd5b505afa158015612811573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506128359190810190613ed0565b9150600061284287612edd565b90506000612863886101800151896101400151612f0990919063ffffffff16565b1561289857612891826128878a60c001518b60800151612f2e90919063ffffffff16565b8a60a00151612f4a565b9050612905565b60c08801516128b4576128918289608001518a60a00151612f4a565b60006128c5848a61018001516106ab565b905060006128dc848b608001518c60a00151612f4a565b905060006128f3838c60c001518d60a00151612f4a565b90506128ff828261298d565b93505050505b61292961292387604001518a60a00151612f6c90919063ffffffff16565b8261298d565b945061293488612f8b565b61293d57600094505b60038651600681111561294c57fe5b1461295657600094505b5050509250925092565b6001546001600160a01b031681565b6002546001600160a01b031681565b6003546001600160a01b031681565b600081831061299c578161184a565b5090919050565b8351602094850120835193850193909320604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f815295860194909452928401929092526060830152608082015260a0902090565b600061184a82612a0985612ff2565b61306d565b60008160040183511015612a3457612a34612a2f60038551856004016130a7565b613116565b5001602001516001600160e01b03191690565b60008160140183511015612a6857612a68612a2f60048551856014016130a7565b5001601401516001600160a01b031690565b60405160009081906060906001600160a01b038616907f70a082310000000000000000000000000000000000000000000000000000000090612ac09087906024016148c4565b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b0319909416939093179092529051612b1391906148a8565b600060405180830381855afa9150503d8060008114612b4e576040519150601f19603f3d011682016040523d82523d6000602084013e612b53565b606091505b5091509150818015612b66575080516020145b156107d2576106c88160005b600061184a838361311e565b736b175474e89094c44da98b954eedeac495271d0f90565b7306af07097c9eeb7fd685c692751d5c66db49c21590565b600080612bb9612b96565b6001600160a01b0316634ba2363a6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612bf357600080fd5b505af1158015612c07573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612c2b91908101906141ce565b90506000816001600160a01b03166320aba08b6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612c6a57600080fd5b505af1158015612c7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612ca29190810190614673565b4211612d2057816001600160a01b031663c92aecc46040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612ce357600080fd5b505af1158015612cf7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612d1b9190810190614673565b612d93565b816001600160a01b0316639f678cca6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015612d5b57600080fd5b505af1158015612d6f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250612d939190810190614673565b9050610934816b033b2e3c9fd0803ce800000086612f4a565b600061184a82612a0985613148565b60405160009081906060906001600160a01b038716907fdd62ed3e0000000000000000000000000000000000000000000000000000000090612e0390889088906024016148d8565b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b0319909416939093179092529051612e5691906148a8565b600060405180830381855afa9150503d8060008114612e91576040519150601f19603f3d011682016040523d82523d6000602084013e612e96565b606091505b5091509150818015612ea9575080516020145b15612ebc57612eb9816000612b72565b92505b50509392505050565b731e0447b19bb6ecfdae1e4ae1694b0c3659614e4e90565b6000806000612eeb84613201565b91509150612ef9828261298d565b925061093483856080015161298d565b60008151835114801561184a5750508051602091820120825192909101919091201490565b60008282018381101561184a5761184a612a2f60008686613414565b600061093483612f60868563ffffffff61343316565b9063ffffffff61346416565b600082821115612f8557612f85612a2f60028585613414565b50900390565b6000612f9b82610140015161348e565b8015612fbc575060c08201511580612fbc5750612fbc82610180015161348e565b8015612fd15750612fd182610160015161348e565b8015610881575060e082015115806108815750610881826101a0015161348e565b608081810151825160208085015160408087015160609788015186519685019690962082517fec69816980a3a3ca4554410e60253953e9ff375ba4536a98adfa15cc7154150881529485019590955290830191909152948101949094526001600160a01b039091169183019190915260a082015260c0902090565b6040517f19010000000000000000000000000000000000000000000000000000000000008152600281019290925260228201526042902090565b6060632800659560e01b8484846040516024016130c693929190614e37565b60408051601f198184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff166001600160e01b03199093169290921790915290509392505050565b805160208201fd5b6000816020018351101561313f5761313f612a2f60058551856020016130a7565b50016020015190565b6101408101516101608201516101808301516101a08401516000937ff80322eb8376aafb64eadf8f0d7623f22130fd9491a221e902b713cb984a75349390929091602087101561319457fe5b601f1987018051610140890180516101608b0180516101808d0180516101a08f0180519d89528c5160209d8e012087528b519b8d019b909b2084528951998c01999099208152875197909a019690962088526101e085209390945290529190529252919091529050919050565b600080600483610140015151101561321e57506000905080611525565b610140830151600090613237908263ffffffff612a0e16565b90506001600160e01b031981167fdc1600f30000000000000000000000000000000000000000000000000000000014156133e4576101408401516040517f750bdb3000000000000000000000000000000000000000000000000000000000815260009173__$af40232205bf188fa8dd573e0f47eaeabc$__9163750bdb30916132c291600401614dc4565b60006040518083038186803b1580156132da57600080fd5b505af41580156132ee573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526133169190810190613f42565b506006549093506001600160a01b038085169116141591506133e290505773__$8ab3d6b0b5fe290c724f8d6cfdac7eabfb$__63d12a796086613357612ec5565b6040518363ffffffff1660e01b8152600401613374929190614f1d565b60206040518083038186803b15801561338c57600080fd5b505af41580156133a0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506133c49190810190614673565b6133d78660000151876101400151611abb565b935093505050611525565b505b6133f78460000151856101400151610ba1565b61340a8560000151866101400151611abb565b9250925050915091565b606063e946c1bb60e01b8484846040516024016130c693929190614e15565b600082613442575060006106cd565b8282028284828161344f57fe5b041461184a5761184a612a2f60018686613414565b60008161347a5761347a612a2f60038585613414565b600082848161348557fe5b04949350505050565b6000602082518161349b57fe5b066004146134ab57506000610884565b60006134bd838263ffffffff612a0e16565b90506001600160e01b031981167f94cfcdd700000000000000000000000000000000000000000000000000000000146134fa576001915050610884565b6040517fbbb2dcf600000000000000000000000000000000000000000000000000000000815260609073__$af40232205bf188fa8dd573e0f47eaeabc$__9063bbb2dcf69061354d908790600401614dc4565b60006040518083038186803b15801561356557600080fd5b505af4158015613579573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526135a191908101906140fe565b80519093509150600090505b8181146136375760006135dd60008584815181106135c757fe5b6020026020010151612a0e90919063ffffffff16565b90506001600160e01b031981167f0257179200000000000000000000000000000000000000000000000000000000141561362e5761361b8483613643565b1561362e57600095505050505050610884565b506001016135ad565b50600195945050505050565b8151600090600183015b818110156107d25761368e85828151811061366457fe5b602002602001015186868151811061367857fe5b6020026020010151612f0990919063ffffffff16565b1561369e576001925050506106cd565b60010161364d565b6040805160608101909152806000815260006020820181905260409091015290565b80356106cd81615016565b80516106cd81615016565b600082601f8301126136ee578081fd5b81356137016136fc82614fa2565b614f7b565b81815291506020808301908481018184028601820187101561372257600080fd5b60005b8481101561148b57813561373881615016565b84529282019290820190600101613725565b600082601f83011261375a578081fd5b81356137686136fc82614fa2565b8181529150602080830190840160005b838110156137a5576137908760208435890101613939565b83526020928301929190910190600101613778565b5050505092915050565b600082601f8301126137bf578081fd5b81516137cd6136fc82614fa2565b8181529150602080830190840160005b838110156137a5576137f58760208451890101613987565b835260209283019291909101906001016137dd565b600082601f83011261381a578081fd5b81356138286136fc82614fa2565b8181529150602080830190840160005b838110156137a55761385087602084358901016139dc565b83526020928301929190910190600101613838565b600082601f830112613875578081fd5b81356138836136fc82614fa2565b8181529150602080830190848101818402860182018710156138a457600080fd5b60005b8481101561148b578135845292820192908201906001016138a7565b600082601f8301126138d3578081fd5b81516138e16136fc82614fa2565b81815291506020808301908481018184028601820187101561390257600080fd5b60005b8481101561148b57815184529282019290820190600101613905565b80516001600160e01b0319811681146106cd57600080fd5b600082601f830112613949578081fd5b81356139576136fc82614fc2565b915080825283602082850101111561396e57600080fd5b8060208401602084013760009082016020015292915050565b600082601f830112613997578081fd5b81516139a56136fc82614fc2565b91508082528360208285010111156139bc57600080fd5b611490816020840160208601614fe6565b8051600581106106cd57600080fd5b60006101c08083850312156139ef578182fd5b6139f881614f7b565b915050613a0583836136c8565b8152613a1483602084016136c8565b6020820152613a2683604084016136c8565b6040820152613a3883606084016136c8565b60608201526080820135608082015260a082013560a082015260c082013560c082015260e082013560e08201526101008083013581830152506101208083013581830152506101408083013567ffffffffffffffff80821115613a9a57600080fd5b613aa686838701613939565b83850152610160925082850135915080821115613ac257600080fd5b613ace86838701613939565b83850152610180925082850135915080821115613aea57600080fd5b613af686838701613939565b838501526101a0925082850135915080821115613b1257600080fd5b50613b1f85828601613939565b82840152505092915050565b600060208284031215613b3c578081fd5b813561184a81615016565b60008060408385031215613b59578081fd5b8235613b6481615016565b9150602083013567ffffffffffffffff811115613b7f578182fd5b613b8b8582860161374a565b9150509250929050565b60008060008060808587031215613baa578182fd5b8435613bb581615016565b9350602085013567ffffffffffffffff80821115613bd1578384fd5b613bdd88838901613865565b94506040870135915080821115613bf2578384fd5b613bfe88838901613865565b93506060870135915080821115613c13578283fd5b50613c2087828801613939565b91505092959194509250565b60008060408385031215613c3e578182fd5b8235613c4981615016565b9150602083013567ffffffffffffffff811115613c64578182fd5b613b8b85828601613939565b600080600060608486031215613c84578081fd5b8335613c8f81615016565b9250602084013567ffffffffffffffff811115613caa578182fd5b613cb686828701613939565b925050604084013590509250925092565b60008060408385031215613cd9578182fd5b8235613ce481615016565b946020939093013593505050565b600060208284031215613d03578081fd5b813567ffffffffffffffff811115613d19578182fd5b610934848285016136de565b60006020808385031215613d37578182fd5b825167ffffffffffffffff811115613d4d578283fd5b80840185601f820112613d5e578384fd5b80519150613d6e6136fc83614fa2565b8281528381019082850185850284018601891015613d8a578687fd5b8693505b84841015613db457613da089826139cd565b835260019390930192918501918501613d8e565b50979650505050505050565b600080600060608486031215613dd4578081fd5b833567ffffffffffffffff80821115613deb578283fd5b613df78783880161380a565b94506020860135915080821115613e0c578283fd5b613e18878388016136de565b93506040860135915080821115613e2d578283fd5b50613e3a86828701613865565b9150509250925092565b60008060408385031215613e56578182fd5b823567ffffffffffffffff80821115613e6d578384fd5b613e798683870161380a565b93506020850135915080821115613e8e578283fd5b50613b8b8582860161374a565b60008060408385031215613ead578182fd5b823567ffffffffffffffff80821115613ec4578384fd5b613e7986838701613865565b600060208284031215613ee1578081fd5b8151801515811461184a578182fd5b600060208284031215613f01578081fd5b61184a8383613921565b60008060408385031215613f1d578182fd5b613f278484613921565b91506020830151613f3781615016565b809150509250929050565b60008060008060808587031215613f57578182fd5b8451613f628161502b565b6020860151909450613f7381615016565b6040860151909350613f8481615016565b606086015190925067ffffffffffffffff811115613fa0578182fd5b613c2087828801613987565b600080600080600060a08688031215613fc3578283fd5b613fcd8787613921565b94506020860151613fdd81615016565b604087015190945067ffffffffffffffff80821115613ffa578485fd5b61400689838a016138c3565b9450606088015191508082111561401b578283fd5b61402789838a016138c3565b9350608088015191508082111561403c578283fd5b5061404988828901613987565b9150509295509295909350565b6000806000806080858703121561406b578182fd5b6140758686613921565b9350602085015161408581615016565b604086015190935067ffffffffffffffff8111156140a1578283fd5b6140ad87828801613987565b606096909601519497939650505050565b6000806000606084860312156140d2578081fd5b6140dc8585613921565b925060208401516140ec81615016565b80925050604084015190509250925092565b600080600060608486031215614112578081fd5b835161411d8161502b565b602085015190935067ffffffffffffffff8082111561413a578283fd5b614146878388016138c3565b9350604086015191508082111561415b578283fd5b50613e3a868287016137af565b600060208284031215614179578081fd5b813567ffffffffffffffff81111561418f578182fd5b61093484828501613939565b6000602082840312156141ac578081fd5b815167ffffffffffffffff8111156141c2578182fd5b61093484828501613987565b6000602082840312156141df578081fd5b815161184a81615016565b6000602082840312156141fb578081fd5b81516005811061184a578182fd5b6000806000806080858703121561421e578182fd5b845167ffffffffffffffff811115614234578283fd5b61424087828801613987565b945050602085015167ffffffffffffffff81111561425c578283fd5b86601f828801011261426c578283fd5b8086015161427c6136fc82614fa2565b8181526020808201919089850101865b84811015614415578151868c01016101c0601f19828f030112156142ae578889fd5b6142b96101c0614f7b565b6142c68e602084016136d3565b81526142d58e604084016136d3565b60208201526142e78e606084016136d3565b60408201526142f98e608084016136d3565b606082015260a0820151608082015260c082015160a082015260e082015160c082015261010082015160e082015261012082015161010082015261014082015161012082015261016082015167ffffffffffffffff811115614359578a8bfd5b6143688f602083860101613987565b6101408301525061018082015167ffffffffffffffff811115614389578a8bfd5b6143988f602083860101613987565b610160830152506101a082015167ffffffffffffffff8111156143b9578a8bfd5b6143c88f602083860101613987565b610180830152506101c082015167ffffffffffffffff8111156143e9578a8bfd5b6143f88f602083860101613987565b6101a083015250855250602093840193919091019060010161428c565b505080965050505050604085015167ffffffffffffffff811115614437578283fd5b614443878288016138c3565b925050606085015167ffffffffffffffff81111561445f578182fd5b613c20878288016137af565b60006060828403121561447c578081fd5b6144866060614f7b565b825160078110614494578283fd5b8152602083810151908201526040928301519281019290925250919050565b6000806000606084860312156144c7578081fd5b833567ffffffffffffffff8111156144dd578182fd5b6144e9868287016139dc565b93505060208401356144fa81615016565b929592945050506040919091013590565b6000806040838503121561451d578182fd5b823567ffffffffffffffff80821115614534578384fd5b614540868387016139dc565b93506020850135915080821115614555578283fd5b50613b8b85828601613939565b600080600060608486031215614576578081fd5b833567ffffffffffffffff81111561458c578182fd5b614598868287016139dc565b9350506020840135915060408401356145b081615016565b809150509250925092565b6000806000606084860312156145cf578081fd5b833567ffffffffffffffff808211156145e6578283fd5b81860160a081890312156145f8578384fd5b61460260a0614f7b565b925080358352602081013560208401526040810135604084015261462988606083016136c8565b606084015260808101358281111561463f578485fd5b61464b89828401613939565b60808501525091945050506020840135915061466a85604086016136c8565b90509250925092565b600060208284031215614684578081fd5b5051919050565b6001600160a01b0316815260200190565b1515815260200190565b60006146b28383614784565b505060600190565b6001600160a01b03169052565b60008282518085526020808601955080818302840101818601855b8481101561471057601f198684030189526146fe838351614758565b988401989250908301906001016146e2565b5090979650505050505050565b6000815180845260208401935060208301825b8281101561474e578151865260209586019590910190600101614730565b5093949350505050565b60008151808452614770816020860160208601614fe6565b601f01601f19169290920160200192915050565b80516007811061479057fe5b825260208181015190830152604090810151910152565b60006101c06147b78484516146ba565b60208301516147c960208601826146ba565b5060408301516147dc60408601826146ba565b5060608301516147ef60608601826146ba565b506080830151608085015260a083015160a085015260c083015160c085015260e083015160e085015261010080840151818601525061012080840151818601525061014080840151828287015261484883870182614758565b915050610160915081840151858203838701526148658282614758565b9250505061018080840151858303828701526148818382614758565b9150506101a09150818401518582038387015261489e8282614758565b9695505050505050565b600082516148ba818460208701614fe6565b9190910192915050565b6001600160a01b0391909116815260200190565b6001600160a01b0392831681529116602082015260400190565b6001600160a01b0393841681529183166020830152909116604082015260600190565b6000608082016001600160a01b0387168352602060808185015281875161493c8185614c41565b91508193508281028201838a01865b838110156149755786830385526149638383516147a7565b9486019492509085019060010161494b565b50508681036040880152809450885192506149908382614c41565b94505050818701845b828110156149ba576149ac85835161468b565b945090830190600101614999565b5050505082810360608401526149d0818561471d565b979650505050505050565b60006001600160a01b0386168252608060208301526149fd608083018661471d565b8281036040840152614a0f818661471d565b8381036060850152614a218186614758565b98975050505050505050565b60006001600160a01b038516825260606020830152614a4f6060830185614758565b9050826040830152949350505050565b60006001600160a01b03808716835260806020840152614a8260808401876147a7565b94166040830152506060015292915050565b6001600160a01b03929092168252602082015260400190565b602080825282518282018190526000918401906040840190835b81811015614aef57835160058110614adb57fe5b835260209384019390920191600101614ac7565b509095945050505050565b60006060820160608352808651614b118184614c41565b9150602088019250835b81811015614b3f57614b2e8385516146a6565b602094909401939250600101614b1b565b50508381036020850152614b53818761471d565b9150508281036040840152808451614b6b8184614c41565b9150602086019250835b8181101561471057614b8883855161469c565b602094909401939250600101614b75565b60006020825261184a602083018461471d565b600060408252614bbf604083018561471d565b602083820381850152818551808452828401915082838202850101838801865b83811015614c0d57601f19878403018552614bfb838351614758565b94860194925090850190600101614bdf565b50909998505050505050505050565b600060408252614c2f604083018561471d565b828103602084015261190d818561471d565b90815260200190565b6001600160e01b031991909116815260200190565b6001600160e01b03199290921682526001600160a01b0316602082015260400190565b60006001600160e01b0319861682526001600160a01b0380861660208401528085166040840152506080606083015261489e6080830184614758565b60006001600160e01b0319871682526001600160a01b038616602083015260a06040830152614cf060a083018661471d565b8281036060840152614d02818661471d565b8381036080850152614d148186614758565b9998505050505050505050565b60006001600160e01b0319861682526001600160a01b038516602083015260806040830152614d536080830185614758565b905082606083015295945050505050565b6001600160e01b03199390931683526001600160a01b03919091166020830152604082015260600190565b60006001600160e01b03198516825260606020830152614db2606083018561471d565b828103604084015261489e81856146c7565b60006020825261184a6020830184614758565b600060808252614dea6080830187614758565b6001600160a01b03958616602084015293909416604082015260ff9190911660609091015292915050565b6060810160048510614e2357fe5b938152602081019290925260409091015290565b6060810160088510614e2357fe5b6020810160058310614e5357fe5b91905290565b600060808252614e6c6080830187614758565b602083820381850152818751808452828401915082838202850101838a01865b83811015614eba57601f19878403018552614ea88383516147a7565b94860194925090850190600101614e8c565b50508681036040880152614ece818a61471d565b94505050505082810360608401526149d081856146c7565b60a08101614ef48286614784565b8360608301528215156080830152949350505050565b60006020825261184a60208301846147a7565b600060408252614f3060408301856147a7565b90506001600160a01b03831660208301529392505050565b600060408252614f5b60408301856147a7565b828103602084015261190d8185614758565b918252602082015260400190565b60405181810167ffffffffffffffff81118282101715614f9a57600080fd5b604052919050565b600067ffffffffffffffff821115614fb8578081fd5b5060209081020190565b600067ffffffffffffffff821115614fd8578081fd5b50601f01601f191660200190565b60005b83811015615001578181015183820152602001614fe9565b83811115615010576000848401525b50505050565b6001600160a01b038116811461075457600080fd5b6001600160e01b03198116811461075457600080fdfea365627a7a7231582042d7fae961b1460c70c7ec8ff1688f8680c3323368dee844634a86b8a2f15fdb6c6578706572696d656e74616cf564736f6c63430005110040'; public static contractName = 'DevUtils'; private readonly _methodABIIndex: { [name: string]: number } = {}; public static async deployFrom0xArtifactAsync( @@ -1602,7 +1602,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1622,7 +1622,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1653,7 +1653,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1690,7 +1690,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1723,7 +1723,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1758,7 +1758,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1793,7 +1793,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1827,7 +1827,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1862,7 +1862,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1943,7 +1943,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -1986,7 +1986,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2029,7 +2029,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -2066,7 +2066,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -2100,7 +2100,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -2134,7 +2134,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -2175,7 +2175,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -2200,7 +2200,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2220,7 +2220,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2240,7 +2240,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2260,7 +2260,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2291,7 +2291,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2307,15 +2307,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2346,7 +2346,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2362,15 +2362,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2404,7 +2404,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2420,8 +2420,8 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -2431,7 +2431,7 @@ export class DevUtilsContract extends BaseContract { ): Promise<[BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2462,7 +2462,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2478,15 +2478,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2517,7 +2517,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2533,15 +2533,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2575,7 +2575,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2591,8 +2591,8 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -2602,7 +2602,7 @@ export class DevUtilsContract extends BaseContract { ): Promise<[BigNumber[], BigNumber[]]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2628,7 +2628,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2675,7 +2675,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -2729,7 +2729,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2745,8 +2745,8 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -2758,7 +2758,7 @@ export class DevUtilsContract extends BaseContract { > { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2821,7 +2821,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2837,8 +2837,8 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -2854,7 +2854,7 @@ export class DevUtilsContract extends BaseContract { > { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2913,7 +2913,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2929,15 +2929,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2994,7 +2994,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3010,15 +3010,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3076,7 +3076,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3092,15 +3092,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3137,7 +3137,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -3169,7 +3169,7 @@ export class DevUtilsContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3185,15 +3185,15 @@ export class DevUtilsContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3222,7 +3222,7 @@ export class DevUtilsContract extends BaseContract { rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); } else { rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); } @@ -3243,7 +3243,7 @@ export class DevUtilsContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/erc20_bridge_sampler.ts b/packages/contract-wrappers/src/generated-wrappers/erc20_bridge_sampler.ts index f382931e80..43af87bf3e 100644 --- a/packages/contract-wrappers/src/generated-wrappers/erc20_bridge_sampler.ts +++ b/packages/contract-wrappers/src/generated-wrappers/erc20_bridge_sampler.ts @@ -896,7 +896,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -931,7 +931,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -986,7 +986,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1042,7 +1042,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1083,7 +1083,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1121,7 +1121,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1162,7 +1162,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1208,7 +1208,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1248,7 +1248,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1280,7 +1280,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1317,7 +1317,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1356,7 +1356,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1398,7 +1398,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1437,7 +1437,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1478,7 +1478,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1524,7 +1524,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1564,7 +1564,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1596,7 +1596,7 @@ export class ERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts b/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts index 0a10c06517..ad3663cfc1 100644 --- a/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts @@ -435,7 +435,7 @@ export class ERC20TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -465,7 +465,7 @@ export class ERC20TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -481,15 +481,15 @@ export class ERC20TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -515,7 +515,7 @@ export class ERC20TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -539,7 +539,7 @@ export class ERC20TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -569,7 +569,7 @@ export class ERC20TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -585,15 +585,15 @@ export class ERC20TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -625,7 +625,7 @@ export class ERC20TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -641,15 +641,15 @@ export class ERC20TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts b/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts index 6e97f136fe..7c812416ea 100644 --- a/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts +++ b/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts @@ -534,7 +534,7 @@ export class ERC721TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -550,15 +550,15 @@ export class ERC721TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -585,7 +585,7 @@ export class ERC721TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -611,7 +611,7 @@ export class ERC721TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -633,7 +633,7 @@ export class ERC721TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -660,7 +660,7 @@ export class ERC721TokenContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -692,7 +692,7 @@ export class ERC721TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -708,15 +708,15 @@ export class ERC721TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -764,7 +764,7 @@ export class ERC721TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -780,15 +780,15 @@ export class ERC721TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -823,7 +823,7 @@ export class ERC721TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -839,15 +839,15 @@ export class ERC721TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -881,7 +881,7 @@ export class ERC721TokenContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -897,15 +897,15 @@ export class ERC721TokenContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/exchange.ts b/packages/contract-wrappers/src/generated-wrappers/exchange.ts index 3b5de54cee..bb5e048f4e 100644 --- a/packages/contract-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/contract-wrappers/src/generated-wrappers/exchange.ts @@ -3233,7 +3233,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3253,7 +3253,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3275,7 +3275,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3320,7 +3320,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3336,15 +3336,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3384,7 +3384,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3400,15 +3400,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3469,7 +3469,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3485,8 +3485,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -3504,7 +3504,7 @@ export class ExchangeContract extends BaseContract { > { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3573,7 +3573,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3589,8 +3589,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -3608,7 +3608,7 @@ export class ExchangeContract extends BaseContract { > { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3677,7 +3677,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3693,8 +3693,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -3712,7 +3712,7 @@ export class ExchangeContract extends BaseContract { > { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3811,7 +3811,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3827,8 +3827,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -3855,7 +3855,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3969,7 +3969,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3985,8 +3985,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -4013,7 +4013,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4078,7 +4078,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4094,15 +4094,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4131,7 +4131,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4147,15 +4147,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4176,7 +4176,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4196,7 +4196,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4222,7 +4222,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4238,15 +4238,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4285,7 +4285,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4301,15 +4301,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4367,7 +4367,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4383,8 +4383,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -4400,7 +4400,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4464,7 +4464,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4480,8 +4480,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -4497,7 +4497,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4524,7 +4524,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4550,7 +4550,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4595,7 +4595,7 @@ export class ExchangeContract extends BaseContract { ): Promise<{ orderStatus: number; orderHash: string; orderTakerAssetFilledAmount: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4629,7 +4629,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4676,7 +4676,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4713,7 +4713,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4772,7 +4772,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4788,8 +4788,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -4805,7 +4805,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4871,7 +4871,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4887,8 +4887,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -4904,7 +4904,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -4969,7 +4969,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4985,8 +4985,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -5002,7 +5002,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5068,7 +5068,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5084,8 +5084,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -5101,7 +5101,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5196,7 +5196,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5212,8 +5212,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -5240,7 +5240,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5351,7 +5351,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5367,8 +5367,8 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -5395,7 +5395,7 @@ export class ExchangeContract extends BaseContract { }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5439,7 +5439,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5459,7 +5459,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5487,7 +5487,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5503,15 +5503,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5533,7 +5533,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5553,7 +5553,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5573,7 +5573,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5601,7 +5601,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5617,15 +5617,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5653,7 +5653,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5669,15 +5669,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5704,7 +5704,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5720,15 +5720,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5758,7 +5758,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5774,15 +5774,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5825,7 +5825,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5841,15 +5841,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5870,7 +5870,7 @@ export class ExchangeContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -5897,7 +5897,7 @@ export class ExchangeContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5913,15 +5913,15 @@ export class ExchangeContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/forwarder.ts b/packages/contract-wrappers/src/generated-wrappers/forwarder.ts index 0816971340..4740c45472 100644 --- a/packages/contract-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/contract-wrappers/src/generated-wrappers/forwarder.ts @@ -785,7 +785,7 @@ export class ForwarderContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -805,7 +805,7 @@ export class ForwarderContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -825,7 +825,7 @@ export class ForwarderContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -856,7 +856,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -872,15 +872,15 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -943,7 +943,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -959,8 +959,8 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -970,7 +970,7 @@ export class ForwarderContract extends BaseContract { ): Promise<[BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1037,7 +1037,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1053,8 +1053,8 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -1064,7 +1064,7 @@ export class ForwarderContract extends BaseContract { ): Promise<[BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1128,7 +1128,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1144,8 +1144,8 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, @@ -1155,7 +1155,7 @@ export class ForwarderContract extends BaseContract { ): Promise<[BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1202,7 +1202,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1218,15 +1218,15 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1274,7 +1274,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1290,15 +1290,15 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1324,7 +1324,7 @@ export class ForwarderContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1351,7 +1351,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1367,15 +1367,15 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1405,7 +1405,7 @@ export class ForwarderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1421,15 +1421,15 @@ export class ForwarderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts b/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts index 67ed233daf..487085c671 100644 --- a/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts +++ b/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts @@ -296,7 +296,7 @@ export class GodsUnchainedValidatorContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts b/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts index 720383f44a..e86e231599 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts @@ -377,7 +377,7 @@ export class IAssetDataContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -393,15 +393,15 @@ export class IAssetDataContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -437,7 +437,7 @@ export class IAssetDataContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -453,15 +453,15 @@ export class IAssetDataContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -492,7 +492,7 @@ export class IAssetDataContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -508,15 +508,15 @@ export class IAssetDataContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -545,7 +545,7 @@ export class IAssetDataContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -561,15 +561,15 @@ export class IAssetDataContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -601,7 +601,7 @@ export class IAssetDataContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -617,15 +617,15 @@ export class IAssetDataContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -662,7 +662,7 @@ export class IAssetDataContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -678,15 +678,15 @@ export class IAssetDataContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/i_erc20_bridge_sampler.ts b/packages/contract-wrappers/src/generated-wrappers/i_erc20_bridge_sampler.ts index ebb3db4029..ef0c2dc001 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_erc20_bridge_sampler.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_erc20_bridge_sampler.ts @@ -865,7 +865,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -900,7 +900,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -954,7 +954,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1008,7 +1008,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1049,7 +1049,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1088,7 +1088,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1129,7 +1129,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1175,7 +1175,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1215,7 +1215,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1247,7 +1247,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1284,7 +1284,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1323,7 +1323,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1361,7 +1361,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1402,7 +1402,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1448,7 +1448,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1488,7 +1488,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1520,7 +1520,7 @@ export class IERC20BridgeSamplerContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts b/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts index 5182ba1eea..652c2b6fab 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts @@ -359,7 +359,7 @@ export class ILiquidityProviderContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -375,15 +375,15 @@ export class ILiquidityProviderContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -420,7 +420,7 @@ export class ILiquidityProviderContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -455,7 +455,7 @@ export class ILiquidityProviderContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider_registry.ts b/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider_registry.ts index 632fe6f41a..cad071c486 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider_registry.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider_registry.ts @@ -280,7 +280,7 @@ export class ILiquidityProviderRegistryContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts b/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts index 1fa812fef1..c2a9f824bf 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts @@ -36,14 +36,20 @@ import * as ethers from 'ethers'; // tslint:enable:no-unused-variable export type ITransformERC20EventArgs = + | ITransformERC20QuoteSignerUpdatedEventArgs | ITransformERC20TransformedERC20EventArgs | ITransformERC20TransformerDeployerUpdatedEventArgs; export enum ITransformERC20Events { + QuoteSignerUpdated = 'QuoteSignerUpdated', TransformedERC20 = 'TransformedERC20', TransformerDeployerUpdated = 'TransformerDeployerUpdated', } +export interface ITransformERC20QuoteSignerUpdatedEventArgs extends DecodedLogArgs { + quoteSigner: string; +} + export interface ITransformERC20TransformedERC20EventArgs extends DecodedLogArgs { taker: string; inputToken: string; @@ -173,6 +179,19 @@ export class ITransformERC20Contract extends BaseContract { */ public static ABI(): ContractAbi { const abi = [ + { + anonymous: false, + inputs: [ + { + name: 'quoteSigner', + type: 'address', + indexed: false, + }, + ], + name: 'QuoteSignerUpdated', + outputs: [], + type: 'event', + }, { anonymous: false, inputs: [ @@ -222,39 +241,49 @@ export class ITransformERC20Contract extends BaseContract { { inputs: [ { - name: 'callDataHash', - type: 'bytes32', - }, - { - name: 'taker', - type: 'address', - }, - { - name: 'inputToken', - type: 'address', - }, - { - name: 'outputToken', - type: 'address', - }, - { - name: 'inputTokenAmount', - type: 'uint256', - }, - { - name: 'minOutputTokenAmount', - type: 'uint256', - }, - { - name: 'transformations', - type: 'tuple[]', + name: 'args', + type: 'tuple', components: [ { - name: 'deploymentNonce', - type: 'uint32', + name: 'taker', + type: 'address', }, { - name: 'data', + name: 'inputToken', + type: 'address', + }, + { + name: 'outputToken', + type: 'address', + }, + { + name: 'inputTokenAmount', + type: 'uint256', + }, + { + name: 'minOutputTokenAmount', + type: 'uint256', + }, + { + name: 'transformations', + type: 'tuple[]', + components: [ + { + name: 'deploymentNonce', + type: 'uint32', + }, + { + name: 'data', + type: 'bytes', + }, + ], + }, + { + name: 'callDataHash', + type: 'bytes32', + }, + { + name: 'callDataSignature', type: 'bytes', }, ], @@ -282,6 +311,18 @@ export class ITransformERC20Contract extends BaseContract { stateMutability: 'nonpayable', type: 'function', }, + { + inputs: [], + name: 'getQuoteSigner', + outputs: [ + { + name: 'signer', + type: 'address', + }, + ], + stateMutability: 'view', + type: 'function', + }, { inputs: [], name: 'getTransformWallet', @@ -306,6 +347,18 @@ export class ITransformERC20Contract extends BaseContract { stateMutability: 'view', type: 'function', }, + { + inputs: [ + { + name: 'quoteSigner', + type: 'address', + }, + ], + name: 'setQuoteSigner', + outputs: [], + stateMutability: 'nonpayable', + type: 'function', + }, { inputs: [ { @@ -442,36 +495,22 @@ export class ITransformERC20Contract extends BaseContract { /** * Internal version of `transformERC20()`. Only callable from within. - * @param callDataHash Hash of the ingress calldata. - * @param taker The taker address. - * @param inputToken The token being provided by the taker. If - * `0xeee...`, ETH is implied and should be provided with the call.` - * @param outputToken The token to be acquired by the taker. `0xeee...` - * implies ETH. - * @param inputTokenAmount The amount of `inputToken` to take from the taker. - * @param minOutputTokenAmount The minimum amount of `outputToken` the taker - * must receive for the entire transformation to succeed. - * @param transformations The transformations to execute on the token - * balance(s) in sequence. + * @param args A `TransformERC20Args` struct. */ - public _transformERC20( - callDataHash: string, - taker: string, - inputToken: string, - outputToken: string, - inputTokenAmount: BigNumber, - minOutputTokenAmount: BigNumber, - transformations: Array<{ deploymentNonce: number | BigNumber; data: string }>, - ): ContractTxFunctionObj { + public _transformERC20(args: { + taker: string; + inputToken: string; + outputToken: string; + inputTokenAmount: BigNumber; + minOutputTokenAmount: BigNumber; + transformations: Array<{ deploymentNonce: number | BigNumber; data: string }>; + callDataHash: string; + callDataSignature: string; + }): ContractTxFunctionObj { const self = (this as any) as ITransformERC20Contract; - assert.isString('callDataHash', callDataHash); - assert.isString('taker', taker); - assert.isString('inputToken', inputToken); - assert.isString('outputToken', outputToken); - assert.isBigNumber('inputTokenAmount', inputTokenAmount); - assert.isBigNumber('minOutputTokenAmount', minOutputTokenAmount); - assert.isArray('transformations', transformations); - const functionSignature = '_transformERC20(bytes32,address,address,address,uint256,uint256,(uint32,bytes)[])'; + + const functionSignature = + '_transformERC20((address,address,address,uint256,uint256,(uint32,bytes)[],bytes32,bytes))'; return { async sendTransactionAsync( @@ -479,7 +518,7 @@ export class ITransformERC20Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -495,15 +534,15 @@ export class ITransformERC20Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -511,22 +550,14 @@ export class ITransformERC20Contract extends BaseContract { return abiEncoder.strictDecodeReturnValue(rawCallResult); }, getABIEncodedTransactionData(): string { - return self._strictEncodeArguments(functionSignature, [ - callDataHash, - taker.toLowerCase(), - inputToken.toLowerCase(), - outputToken.toLowerCase(), - inputTokenAmount, - minOutputTokenAmount, - transformations, - ]); + return self._strictEncodeArguments(functionSignature, [args]); }, }; } /** * Deploy a new flash wallet instance and replace the current one with it. * Useful if we somehow break the current wallet instance. - * Anyone can call this. + * Only callable by the owner. */ public createTransformWallet(): ContractTxFunctionObj { const self = (this as any) as ITransformERC20Contract; @@ -538,7 +569,7 @@ export class ITransformERC20Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -554,15 +585,64 @@ export class ITransformERC20Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, + defaultBlock, + ); + const abiEncoder = self._lookupAbiEncoder(functionSignature); + BaseContract._throwIfUnexpectedEmptyCallResult(rawCallResult, abiEncoder); + return abiEncoder.strictDecodeReturnValue(rawCallResult); + }, + getABIEncodedTransactionData(): string { + return self._strictEncodeArguments(functionSignature, []); + }, + }; + } + /** + * Return the optional signer for `transformERC20()` calldata. + */ + public getQuoteSigner(): ContractTxFunctionObj { + const self = (this as any) as ITransformERC20Contract; + const functionSignature = 'getQuoteSigner()'; + + return { + async sendTransactionAsync( + txData?: Partial | undefined, + opts: SendTransactionOpts = { shouldValidate: true }, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( + { data: this.getABIEncodedTransactionData(), ...txData }, + this.estimateGasAsync.bind(this), + ); + if (opts.shouldValidate !== false) { + await this.callAsync(txDataWithDefaults); + } + return self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + }, + awaitTransactionSuccessAsync( + txData?: Partial, + opts: AwaitTransactionSuccessOpts = { shouldValidate: true }, + ): PromiseWithTransactionHash { + return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); + }, + async estimateGasAsync(txData?: Partial | undefined): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + }, + async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { + BaseContract._assertCallParams(callData, defaultBlock); + const rawCallResult = await self._performCallAsync( + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -588,7 +668,7 @@ export class ITransformERC20Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -604,15 +684,15 @@ export class ITransformERC20Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -637,7 +717,7 @@ export class ITransformERC20Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -653,15 +733,15 @@ export class ITransformERC20Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -674,15 +754,14 @@ export class ITransformERC20Contract extends BaseContract { }; } /** - * Replace the allowed deployer for transformers. + * Replace the optional signer for `transformERC20()` calldata. * Only callable by the owner. - * @param transformerDeployer The address of the trusted deployer for - * transformers. + * @param quoteSigner The address of the new calldata signer. */ - public setTransformerDeployer(transformerDeployer: string): ContractTxFunctionObj { + public setQuoteSigner(quoteSigner: string): ContractTxFunctionObj { const self = (this as any) as ITransformERC20Contract; - assert.isString('transformerDeployer', transformerDeployer); - const functionSignature = 'setTransformerDeployer(address)'; + assert.isString('quoteSigner', quoteSigner); + const functionSignature = 'setQuoteSigner(address)'; return { async sendTransactionAsync( @@ -690,7 +769,7 @@ export class ITransformERC20Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -706,15 +785,68 @@ export class ITransformERC20Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, + defaultBlock, + ); + const abiEncoder = self._lookupAbiEncoder(functionSignature); + BaseContract._throwIfUnexpectedEmptyCallResult(rawCallResult, abiEncoder); + return abiEncoder.strictDecodeReturnValue(rawCallResult); + }, + getABIEncodedTransactionData(): string { + return self._strictEncodeArguments(functionSignature, [quoteSigner.toLowerCase()]); + }, + }; + } + /** + * Replace the allowed deployer for transformers. + * Only callable by the owner. + * @param transformerDeployer The address of the new trusted deployer + * for transformers. + */ + public setTransformerDeployer(transformerDeployer: string): ContractTxFunctionObj { + const self = (this as any) as ITransformERC20Contract; + assert.isString('transformerDeployer', transformerDeployer); + const functionSignature = 'setTransformerDeployer(address)'; + + return { + async sendTransactionAsync( + txData?: Partial | undefined, + opts: SendTransactionOpts = { shouldValidate: true }, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( + { data: this.getABIEncodedTransactionData(), ...txData }, + this.estimateGasAsync.bind(this), + ); + if (opts.shouldValidate !== false) { + await this.callAsync(txDataWithDefaults); + } + return self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + }, + awaitTransactionSuccessAsync( + txData?: Partial, + opts: AwaitTransactionSuccessOpts = { shouldValidate: true }, + ): PromiseWithTransactionHash { + return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); + }, + async estimateGasAsync(txData?: Partial | undefined): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + }, + async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { + BaseContract._assertCallParams(callData, defaultBlock); + const rawCallResult = await self._performCallAsync( + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -760,7 +892,7 @@ export class ITransformERC20Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -776,15 +908,15 @@ export class ITransformERC20Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts b/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts index 0a8b09e012..d3072b2e03 100644 --- a/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts +++ b/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts @@ -263,7 +263,7 @@ export class MaximumGasPriceContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -290,7 +290,7 @@ export class MaximumGasPriceContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/staking.ts b/packages/contract-wrappers/src/generated-wrappers/staking.ts index d00625ed17..c19a7802ac 100644 --- a/packages/contract-wrappers/src/generated-wrappers/staking.ts +++ b/packages/contract-wrappers/src/generated-wrappers/staking.ts @@ -1709,7 +1709,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1725,15 +1725,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1760,7 +1760,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1776,15 +1776,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1810,7 +1810,7 @@ export class StakingContract extends BaseContract { ): Promise<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1833,7 +1833,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1854,7 +1854,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1874,7 +1874,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1894,7 +1894,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1922,7 +1922,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1948,7 +1948,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1982,7 +1982,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1998,15 +1998,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2026,7 +2026,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2046,7 +2046,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2079,7 +2079,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2095,15 +2095,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2131,7 +2131,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2147,15 +2147,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2175,7 +2175,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2206,7 +2206,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2222,15 +2222,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2254,7 +2254,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2280,7 +2280,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2311,7 +2311,7 @@ export class StakingContract extends BaseContract { ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2349,7 +2349,7 @@ export class StakingContract extends BaseContract { ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2380,7 +2380,7 @@ export class StakingContract extends BaseContract { ): Promise<[BigNumber, number, BigNumber, number, number]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2416,7 +2416,7 @@ export class StakingContract extends BaseContract { ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2448,7 +2448,7 @@ export class StakingContract extends BaseContract { ): Promise<{ operator: string; operatorShare: number }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2479,7 +2479,7 @@ export class StakingContract extends BaseContract { ): Promise<{ feesCollected: BigNumber; weightedStake: BigNumber; membersStake: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2509,7 +2509,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2541,7 +2541,7 @@ export class StakingContract extends BaseContract { ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2570,7 +2570,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2595,7 +2595,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2622,7 +2622,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2638,15 +2638,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2673,7 +2673,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2689,15 +2689,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2717,7 +2717,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2737,7 +2737,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2773,7 +2773,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2789,15 +2789,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2817,7 +2817,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2855,7 +2855,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2871,15 +2871,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2904,7 +2904,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2932,7 +2932,7 @@ export class StakingContract extends BaseContract { ): Promise<[BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -2959,7 +2959,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2975,15 +2975,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3012,7 +3012,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3028,15 +3028,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3063,7 +3063,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3079,15 +3079,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3107,7 +3107,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3128,7 +3128,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3172,7 +3172,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3188,15 +3188,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3230,7 +3230,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3246,15 +3246,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3274,7 +3274,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3301,7 +3301,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3317,15 +3317,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3354,7 +3354,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3370,15 +3370,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3399,7 +3399,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3419,7 +3419,7 @@ export class StakingContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -3447,7 +3447,7 @@ export class StakingContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3463,15 +3463,15 @@ export class StakingContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts b/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts index 1f271ee273..9f0fef466a 100644 --- a/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts +++ b/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts @@ -836,7 +836,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -852,15 +852,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -886,7 +886,7 @@ export class StakingProxyContract extends BaseContract { ): Promise<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -911,7 +911,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -938,7 +938,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -954,15 +954,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -983,7 +983,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1004,7 +1004,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1032,7 +1032,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1048,15 +1048,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1076,7 +1076,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1096,7 +1096,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1116,7 +1116,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1136,7 +1136,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1161,7 +1161,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1177,15 +1177,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1205,7 +1205,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1229,7 +1229,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1249,7 +1249,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1269,7 +1269,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1289,7 +1289,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1310,7 +1310,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1338,7 +1338,7 @@ export class StakingProxyContract extends BaseContract { ): Promise<[BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1365,7 +1365,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1381,15 +1381,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1418,7 +1418,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1434,15 +1434,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1462,7 +1462,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1483,7 +1483,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1503,7 +1503,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1530,7 +1530,7 @@ export class StakingProxyContract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1546,15 +1546,15 @@ export class StakingProxyContract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1575,7 +1575,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -1595,7 +1595,7 @@ export class StakingProxyContract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); diff --git a/packages/contract-wrappers/src/generated-wrappers/weth9.ts b/packages/contract-wrappers/src/generated-wrappers/weth9.ts index e5de378a61..506aa75ceb 100644 --- a/packages/contract-wrappers/src/generated-wrappers/weth9.ts +++ b/packages/contract-wrappers/src/generated-wrappers/weth9.ts @@ -559,7 +559,7 @@ export class WETH9Contract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -583,7 +583,7 @@ export class WETH9Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -599,15 +599,15 @@ export class WETH9Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -628,7 +628,7 @@ export class WETH9Contract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -648,7 +648,7 @@ export class WETH9Contract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -670,7 +670,7 @@ export class WETH9Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -686,15 +686,15 @@ export class WETH9Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -714,7 +714,7 @@ export class WETH9Contract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -734,7 +734,7 @@ export class WETH9Contract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -754,7 +754,7 @@ export class WETH9Contract extends BaseContract { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -778,7 +778,7 @@ export class WETH9Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -794,15 +794,15 @@ export class WETH9Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -827,7 +827,7 @@ export class WETH9Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -843,15 +843,15 @@ export class WETH9Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature); @@ -874,7 +874,7 @@ export class WETH9Contract extends BaseContract { opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...txData }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -890,15 +890,15 @@ export class WETH9Contract extends BaseContract { }, async estimateGasAsync(txData?: Partial | undefined): Promise { const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ - ...txData, data: this.getABIEncodedTransactionData(), + ...txData, }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( - { ...callData, data: this.getABIEncodedTransactionData() }, + { data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock, ); const abiEncoder = self._lookupAbiEncoder(functionSignature);