diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts index 39222f3829..27696cb802 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts @@ -491,8 +491,7 @@ export class CoordinatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [hash, signature]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -518,8 +517,10 @@ export class CoordinatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [transaction]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -536,8 +537,10 @@ export class CoordinatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [approval]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -560,15 +563,8 @@ export class CoordinatorContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - transaction, - txOrigin.toLowerCase(), - transactionSignature, - approvalExpirationTimeSeconds, - approvalSignatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -583,26 +579,18 @@ export class CoordinatorContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - transaction, - txOrigin.toLowerCase(), - transactionSignature, - approvalExpirationTimeSeconds, - approvalSignatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - transaction, - txOrigin.toLowerCase(), - transactionSignature, - approvalExpirationTimeSeconds, - approvalSignatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -624,8 +612,10 @@ export class CoordinatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -669,14 +659,10 @@ export class CoordinatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - transaction, - txOrigin.toLowerCase(), - transactionSignature, - approvalExpirationTimeSeconds, - approvalSignatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -743,8 +729,7 @@ export class CoordinatorContract extends BaseContract { }> > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [data]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< Array<{ @@ -934,8 +919,10 @@ export class CoordinatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts index 4c9677ec43..cf802969ae 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts @@ -292,9 +292,8 @@ export class CoordinatorRegistryContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [coordinatorEndpoint]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -309,14 +308,18 @@ export class CoordinatorRegistryContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [coordinatorEndpoint]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [coordinatorEndpoint]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -337,8 +340,10 @@ export class CoordinatorRegistryContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [coordinatorOperator.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts index 183a31d260..09b080e3b0 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts @@ -1526,8 +1526,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[number, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[number, string, string]>(rawCallResult); }, @@ -1549,8 +1548,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string]>(rawCallResult); }, @@ -1573,8 +1571,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1599,8 +1596,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, string]>(rawCallResult); }, @@ -1625,8 +1621,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, string, string]>(rawCallResult); }, @@ -1654,8 +1649,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, BigNumber[], BigNumber[], string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, BigNumber[], BigNumber[], string]>( rawCallResult, @@ -1679,8 +1673,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string]>(rawCallResult); }, @@ -1706,8 +1699,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, BigNumber]>(rawCallResult); }, @@ -1732,8 +1724,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[number, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[number, string, string]>(rawCallResult); }, @@ -1755,8 +1746,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[number, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[number, string]>(rawCallResult); }, @@ -1781,8 +1771,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[number, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[number, BigNumber, BigNumber]>(rawCallResult); }, @@ -1807,8 +1796,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, BigNumber[], string[]]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, BigNumber[], string[]]>(rawCallResult); }, @@ -1830,8 +1818,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string]>(rawCallResult); }, @@ -1856,8 +1843,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, BigNumber]>(rawCallResult); }, @@ -1879,8 +1865,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[string, number]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, number]>(rawCallResult); }, @@ -1905,8 +1890,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[number, string, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[number, string, string, string]>(rawCallResult); }, @@ -1928,8 +1912,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string]>(rawCallResult); }, @@ -1954,8 +1937,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, string, string]>(rawCallResult); }, @@ -1981,8 +1963,7 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[string, string, string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string, string, string]>(rawCallResult); }, @@ -2004,8 +1985,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[number, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[number, string]>(rawCallResult); }, @@ -2027,8 +2007,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise<[string, string]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [encoded]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[string, string]>(rawCallResult); }, @@ -2100,8 +2079,7 @@ export class DevUtilsContract extends BaseContract { ] > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [transactionData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< [ @@ -2158,13 +2136,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - tokenAddress.toLowerCase(), - tokenIds, - tokenValues, - callbackData, - ]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2192,8 +2164,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [tokenAddress.toLowerCase()]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2218,11 +2189,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - tokenAddress.toLowerCase(), - tokenId, - ]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2247,8 +2214,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [amounts, nestedAssetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2280,12 +2246,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - staticCallTargetAddress.toLowerCase(), - staticCallData, - expectedReturnDataHash, - ]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2314,11 +2275,10 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2343,11 +2303,10 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2378,11 +2337,10 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber]>(rawCallResult); }, @@ -2407,11 +2365,10 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2436,11 +2393,10 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2471,11 +2427,10 @@ export class DevUtilsContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber[], BigNumber[]]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber[], BigNumber[]]>(rawCallResult); }, @@ -2497,8 +2452,10 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [addresses]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2550,8 +2507,10 @@ export class DevUtilsContract extends BaseContract { [{ orderStatus: number; orderHash: string; orderTakerAssetFilledAmount: BigNumber }, BigNumber, boolean] > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [order, signature]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< [ @@ -2617,8 +2576,10 @@ export class DevUtilsContract extends BaseContract { ] > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [orders, signatures]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< [ @@ -2673,13 +2634,8 @@ export class DevUtilsContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAddress.toLowerCase(), - takerAssetFillAmount, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2694,22 +2650,18 @@ export class DevUtilsContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAddress.toLowerCase(), - takerAssetFillAmount, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAddress.toLowerCase(), - takerAssetFillAmount, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2763,13 +2715,8 @@ export class DevUtilsContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAddresses, - takerAssetFillAmounts, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2784,22 +2731,18 @@ export class DevUtilsContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAddresses, - takerAssetFillAmounts, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAddresses, - takerAssetFillAmounts, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2824,11 +2767,10 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - ownerAddress.toLowerCase(), - assetData, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2845,8 +2787,7 @@ export class DevUtilsContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts index 714c44791e..e2ad6f1302 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts @@ -509,8 +509,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -528,11 +530,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _owner.toLowerCase(), - _spender.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -558,9 +559,8 @@ export class DummyERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_spender.toLowerCase(), _value]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -575,14 +575,18 @@ export class DummyERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_spender.toLowerCase(), _value]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_spender.toLowerCase(), _value]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -604,8 +608,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -621,8 +627,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -645,9 +653,8 @@ export class DummyERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_value]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -662,14 +669,18 @@ export class DummyERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_value]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_value]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -685,8 +696,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -702,8 +715,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -728,9 +743,8 @@ export class DummyERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_target.toLowerCase(), _value]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -745,14 +759,18 @@ export class DummyERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_target.toLowerCase(), _value]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_target.toLowerCase(), _value]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -768,8 +786,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -789,8 +809,10 @@ export class DummyERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -816,9 +838,8 @@ export class DummyERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _value]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -833,14 +854,18 @@ export class DummyERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _value]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _value]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -868,13 +893,8 @@ export class DummyERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _value, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -889,22 +909,18 @@ export class DummyERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _value, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _value, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -923,9 +939,8 @@ export class DummyERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -940,14 +955,18 @@ export class DummyERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts index 17534768db..2c47baa76d 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts @@ -572,9 +572,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_approved.toLowerCase(), _tokenId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -589,14 +588,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_approved.toLowerCase(), _tokenId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_approved.toLowerCase(), _tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -619,8 +622,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -646,9 +651,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase(), _tokenId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -663,14 +667,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase(), _tokenId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase(), _tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -692,8 +700,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -711,11 +721,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _owner.toLowerCase(), - _operator.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -741,9 +750,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _tokenId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -758,14 +766,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _tokenId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -781,8 +793,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -798,8 +812,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -822,8 +838,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -851,13 +869,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -872,22 +885,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -931,14 +940,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -953,24 +956,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1001,12 +998,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _operator.toLowerCase(), - _approved, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1021,20 +1014,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _operator.toLowerCase(), - _approved, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _operator.toLowerCase(), - _approved, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1050,8 +1041,10 @@ export class DummyERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1081,13 +1074,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1102,22 +1090,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1140,9 +1124,8 @@ export class DummyERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1157,14 +1140,18 @@ export class DummyERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc1155_mintable.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc1155_mintable.ts index d1db4884f8..589410378e 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc1155_mintable.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc1155_mintable.ts @@ -728,8 +728,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -745,8 +747,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -764,8 +768,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [owner.toLowerCase(), id]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -783,8 +789,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [owners, ids]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -810,9 +818,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [uri, isNF]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -827,14 +834,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [uri, isNF]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [uri, isNF]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -859,9 +870,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [type_, uri]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -876,14 +886,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [type_, uri]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [type_, uri]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -900,8 +914,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -921,8 +937,7 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -942,8 +957,7 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -961,11 +975,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - owner.toLowerCase(), - operator.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -985,8 +998,7 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1006,8 +1018,7 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1027,8 +1038,7 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1048,8 +1058,7 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1066,8 +1075,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1094,9 +1105,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [id, to, quantities]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1111,14 +1121,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [id, to, quantities]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id, to, quantities]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1143,9 +1157,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [type_, to]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1160,14 +1173,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [type_, to]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [type_, to]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1187,8 +1204,10 @@ export class ERC1155MintableContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [id]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1225,15 +1244,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - from.toLowerCase(), - to.toLowerCase(), - ids, - values, - data, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1248,26 +1260,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - from.toLowerCase(), - to.toLowerCase(), - ids, - values, - data, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - from.toLowerCase(), - to.toLowerCase(), - ids, - values, - data, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1310,15 +1314,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - from.toLowerCase(), - to.toLowerCase(), - id, - value, - data, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1333,26 +1330,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - from.toLowerCase(), - to.toLowerCase(), - id, - value, - data, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - from.toLowerCase(), - to.toLowerCase(), - id, - value, - data, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1383,9 +1372,8 @@ export class ERC1155MintableContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [operator.toLowerCase(), approved]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1400,14 +1388,18 @@ export class ERC1155MintableContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [operator.toLowerCase(), approved]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [operator.toLowerCase(), approved]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts index 8ddd25e203..5aec763f06 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts @@ -357,9 +357,8 @@ export class ERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_spender.toLowerCase(), _value]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -374,14 +373,18 @@ export class ERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_spender.toLowerCase(), _value]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_spender.toLowerCase(), _value]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -401,8 +404,10 @@ export class ERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -430,13 +435,8 @@ export class ERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _value, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -451,22 +451,18 @@ export class ERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _value, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _value, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -488,8 +484,10 @@ export class ERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -515,9 +513,8 @@ export class ERC20TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _value]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -532,14 +529,18 @@ export class ERC20TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _value]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_to.toLowerCase(), _value]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -557,11 +558,10 @@ export class ERC20TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _owner.toLowerCase(), - _spender.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts index d08bc95935..cebc74b735 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts @@ -448,9 +448,8 @@ export class ERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_approved.toLowerCase(), _tokenId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -465,14 +464,18 @@ export class ERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_approved.toLowerCase(), _tokenId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_approved.toLowerCase(), _tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -495,8 +498,10 @@ export class ERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_owner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -518,8 +523,10 @@ export class ERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -537,11 +544,10 @@ export class ERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _owner.toLowerCase(), - _operator.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -564,8 +570,10 @@ export class ERC721TokenContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -593,13 +601,8 @@ export class ERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -614,22 +617,18 @@ export class ERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -673,14 +672,8 @@ export class ERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -695,24 +688,18 @@ export class ERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -743,12 +730,8 @@ export class ERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _operator.toLowerCase(), - _approved, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -763,20 +746,18 @@ export class ERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _operator.toLowerCase(), - _approved, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _operator.toLowerCase(), - _approved, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -806,13 +787,8 @@ export class ERC721TokenContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -827,22 +803,18 @@ export class ERC721TokenContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts index f58ec431fb..3863204eba 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts @@ -3112,8 +3112,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3129,8 +3131,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3148,11 +3152,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - index_0.toLowerCase(), - index_1.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3193,9 +3196,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [orders]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3210,14 +3212,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [orders]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [orders]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3253,9 +3259,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [transactions, signatures]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3270,14 +3275,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [transactions, signatures]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [transactions, signatures]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3334,13 +3343,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3355,12 +3359,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -3376,12 +3378,10 @@ export class ExchangeContract extends BaseContract { }> > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< Array<{ @@ -3446,13 +3446,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3467,12 +3462,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -3488,12 +3481,10 @@ export class ExchangeContract extends BaseContract { }> > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< Array<{ @@ -3558,13 +3549,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3579,12 +3565,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -3600,12 +3584,10 @@ export class ExchangeContract extends BaseContract { }> > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmounts, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< Array<{ @@ -3700,14 +3682,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrders, - rightOrders, - leftSignatures, - rightSignatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3722,13 +3698,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrders, - rightOrders, - leftSignatures, - rightSignatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -3753,13 +3726,10 @@ export class ExchangeContract extends BaseContract { profitInRightMakerAsset: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrders, - rightOrders, - leftSignatures, - rightSignatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ left: Array<{ @@ -3869,14 +3839,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrders, - rightOrders, - leftSignatures, - rightSignatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3891,13 +3855,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrders, - rightOrders, - leftSignatures, - rightSignatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -3922,13 +3883,10 @@ export class ExchangeContract extends BaseContract { profitInRightMakerAsset: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrders, - rightOrders, - leftSignatures, - rightSignatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ left: Array<{ @@ -3989,9 +3947,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [order]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4006,14 +3963,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [order]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [order]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4038,9 +3999,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [targetOrderEpoch]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4055,14 +4015,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [targetOrderEpoch]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [targetOrderEpoch]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4079,8 +4043,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4096,8 +4062,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4132,9 +4100,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [transaction, signature]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4149,14 +4116,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [transaction, signature]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [transaction, signature]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4209,13 +4180,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAssetFillAmount, - signature, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4230,12 +4196,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAssetFillAmount, - signature, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -4249,12 +4213,10 @@ export class ExchangeContract extends BaseContract { protocolFeePaid: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAssetFillAmount, - signature, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerAssetFilledAmount: BigNumber; @@ -4314,13 +4276,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAssetFillAmount, - signature, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4335,12 +4292,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAssetFillAmount, - signature, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -4354,12 +4309,10 @@ export class ExchangeContract extends BaseContract { protocolFeePaid: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - order, - takerAssetFillAmount, - signature, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerAssetFilledAmount: BigNumber; @@ -4382,8 +4335,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4405,8 +4360,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetProxyId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4447,8 +4404,10 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ orderStatus: number; orderHash: string; orderTakerAssetFilledAmount: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [order]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ orderStatus: number; @@ -4478,12 +4437,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - hash, - signerAddress.toLowerCase(), - signature, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4526,8 +4483,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [order, signature]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4560,8 +4519,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [transaction, signature]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -4616,13 +4577,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetFillAmount, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4637,12 +4593,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetFillAmount, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -4656,12 +4610,10 @@ export class ExchangeContract extends BaseContract { protocolFeePaid: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetFillAmount, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerAssetFilledAmount: BigNumber; @@ -4723,13 +4675,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetFillAmount, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4744,12 +4691,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetFillAmount, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -4763,12 +4708,10 @@ export class ExchangeContract extends BaseContract { protocolFeePaid: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetFillAmount, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerAssetFilledAmount: BigNumber; @@ -4829,13 +4772,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmount, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4850,12 +4788,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmount, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -4869,12 +4805,10 @@ export class ExchangeContract extends BaseContract { protocolFeePaid: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmount, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerAssetFilledAmount: BigNumber; @@ -4936,13 +4870,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmount, - signatures, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -4957,12 +4886,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmount, - signatures, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -4976,12 +4903,10 @@ export class ExchangeContract extends BaseContract { protocolFeePaid: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - takerAssetFillAmount, - signatures, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerAssetFilledAmount: BigNumber; @@ -5072,14 +4997,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrder, - rightOrder, - leftSignature, - rightSignature, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5094,13 +5013,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrder, - rightOrder, - leftSignature, - rightSignature, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -5125,13 +5041,10 @@ export class ExchangeContract extends BaseContract { profitInRightMakerAsset: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrder, - rightOrder, - leftSignature, - rightSignature, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ left: { @@ -5238,14 +5151,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrder, - rightOrder, - leftSignature, - rightSignature, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5260,13 +5167,10 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrder, - rightOrder, - leftSignature, - rightSignature, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -5291,13 +5195,10 @@ export class ExchangeContract extends BaseContract { profitInRightMakerAsset: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - leftOrder, - rightOrder, - leftSignature, - rightSignature, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ left: { @@ -5337,11 +5238,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - index_0.toLowerCase(), - index_1.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5357,8 +5257,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5382,9 +5284,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [hash]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5399,14 +5300,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [hash]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [hash]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5424,8 +5329,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0, index_1.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5441,8 +5348,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5458,8 +5367,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5483,9 +5394,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [assetProxy.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5500,14 +5410,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [assetProxy.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetProxy.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5531,11 +5445,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - updatedProtocolFeeCollector.toLowerCase(), - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5550,18 +5461,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - updatedProtocolFeeCollector.toLowerCase(), - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - updatedProtocolFeeCollector.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5584,9 +5495,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [updatedProtocolFeeMultiplier]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5601,14 +5511,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [updatedProtocolFeeMultiplier]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [updatedProtocolFeeMultiplier]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5634,12 +5548,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - validatorAddress.toLowerCase(), - approval, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5654,20 +5564,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - validatorAddress.toLowerCase(), - approval, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - validatorAddress.toLowerCase(), - approval, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5706,14 +5614,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - assetData, - fromAddresses, - toAddresses, - amounts, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5728,24 +5630,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - assetData, - fromAddresses, - toAddresses, - amounts, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - assetData, - fromAddresses, - toAddresses, - amounts, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5762,8 +5658,10 @@ export class ExchangeContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -5782,9 +5680,8 @@ export class ExchangeContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -5799,14 +5696,18 @@ export class ExchangeContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts index 44bac875ca..af5c8ad561 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts @@ -458,9 +458,8 @@ export class ForwarderContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -475,14 +474,18 @@ export class ForwarderContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -541,15 +544,8 @@ export class ForwarderContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetBuyAmount, - signatures, - feePercentage, - feeRecipient.toLowerCase(), - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -564,14 +560,10 @@ export class ForwarderContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetBuyAmount, - signatures, - feePercentage, - feeRecipient.toLowerCase(), - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -579,14 +571,10 @@ export class ForwarderContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - makerAssetBuyAmount, - signatures, - feePercentage, - feeRecipient.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber, BigNumber]>(rawCallResult); }, @@ -646,14 +634,8 @@ export class ForwarderContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - signatures, - feePercentage, - feeRecipient.toLowerCase(), - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -668,13 +650,10 @@ export class ForwarderContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - signatures, - feePercentage, - feeRecipient.toLowerCase(), - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync( @@ -682,13 +661,10 @@ export class ForwarderContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - orders, - signatures, - feePercentage, - feeRecipient.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber, BigNumber]>(rawCallResult); }, @@ -709,8 +685,10 @@ export class ForwarderContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -729,9 +707,8 @@ export class ForwarderContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -746,14 +723,18 @@ export class ForwarderContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -780,9 +761,8 @@ export class ForwarderContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [assetData, amount]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -797,14 +777,18 @@ export class ForwarderContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [assetData, amount]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [assetData, amount]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts index ebae55c344..7923f1478f 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts @@ -187,12 +187,10 @@ export class IValidatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - hash, - signerAddress.toLowerCase(), - signature, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts index a049228b46..84a3815a4a 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts @@ -181,8 +181,10 @@ export class IWalletContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [hash, signature]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts index 58ca0c6753..5ee04254ef 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts @@ -773,8 +773,10 @@ export class OrderValidatorContract extends BaseContract { ] > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [order, takerAddress.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< [ @@ -809,8 +811,10 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), assetData]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber]>(rawCallResult); }, @@ -876,8 +880,10 @@ export class OrderValidatorContract extends BaseContract { ] > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [orders, takerAddresses]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< [ @@ -951,8 +957,10 @@ export class OrderValidatorContract extends BaseContract { }> > { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [orders, takerAddresses]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue< Array<{ @@ -981,8 +989,10 @@ export class OrderValidatorContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [token.toLowerCase(), tokenId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1006,8 +1016,10 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber[], BigNumber[]]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), assetData]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber[], BigNumber[]]>(rawCallResult); }, @@ -1063,8 +1075,10 @@ export class OrderValidatorContract extends BaseContract { takerZrxAllowance: BigNumber; }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [order, takerAddress.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ makerBalance: BigNumber; diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/staking.ts b/packages/abi-gen-wrappers/src/generated-wrappers/staking.ts index 51699faedf..7031228a7e 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/staking.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/staking.ts @@ -1655,9 +1655,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1672,14 +1671,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1702,9 +1705,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [addr.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1719,14 +1721,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [addr.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [addr.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1748,8 +1754,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]>( rawCallResult, @@ -1768,8 +1776,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1786,8 +1796,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1803,8 +1815,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1820,8 +1834,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1845,8 +1861,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId, member.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1868,8 +1886,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1899,9 +1919,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [operatorShare, addOperatorAsMaker]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1916,14 +1935,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [operatorShare, addOperatorAsMaker]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [operatorShare, addOperatorAsMaker]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1939,8 +1962,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1956,8 +1981,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1986,9 +2013,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId, newOperatorShare]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2003,14 +2029,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId, newOperatorShare]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId, newOperatorShare]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2034,9 +2064,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2051,14 +2080,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2074,8 +2107,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2102,9 +2137,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2119,14 +2153,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2146,8 +2184,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2169,8 +2209,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2197,8 +2239,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [stakeStatus]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ currentEpoch: BigNumber; @@ -2232,8 +2276,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [staker.toLowerCase(), stakeStatus]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ currentEpoch: BigNumber; @@ -2260,8 +2306,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, number, BigNumber, number, number]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, number, BigNumber, number, number]>( rawCallResult, @@ -2293,8 +2341,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [staker.toLowerCase(), poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ currentEpoch: BigNumber; @@ -2322,8 +2372,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ operator: string; operatorShare: number }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ operator: string; operatorShare: number }>(rawCallResult); }, @@ -2350,8 +2402,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ feesCollected: BigNumber; weightedStake: BigNumber; membersStake: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ feesCollected: BigNumber; @@ -2377,8 +2431,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [staker.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2406,8 +2462,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{ currentEpoch: BigNumber; @@ -2431,8 +2489,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2452,8 +2512,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2476,9 +2538,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2493,14 +2554,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2523,9 +2588,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2540,14 +2604,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2563,8 +2631,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2580,8 +2650,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2613,9 +2685,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [from, to, amount]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2630,14 +2701,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [from, to, amount]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [from, to, amount]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2653,8 +2728,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2688,13 +2765,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - makerAddress.toLowerCase(), - payerAddress.toLowerCase(), - protocolFee, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2709,22 +2781,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - makerAddress.toLowerCase(), - payerAddress.toLowerCase(), - protocolFee, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - makerAddress.toLowerCase(), - payerAddress.toLowerCase(), - protocolFee, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2745,8 +2813,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2770,8 +2840,10 @@ export class StakingContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0, index_1]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber, BigNumber]>(rawCallResult); }, @@ -2794,9 +2866,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2811,14 +2882,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2843,9 +2918,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), index]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2860,14 +2934,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), index]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), index]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2890,9 +2968,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [addr.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -2907,14 +2984,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [addr.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [addr.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2930,8 +3011,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2948,8 +3031,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -2989,15 +3074,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _epochDurationInSeconds, - _rewardDelegatedStakeWeight, - _minimumPoolStake, - _cobbDouglasAlphaNumerator, - _cobbDouglasAlphaDenominator, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3012,26 +3090,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - _epochDurationInSeconds, - _rewardDelegatedStakeWeight, - _minimumPoolStake, - _cobbDouglasAlphaNumerator, - _cobbDouglasAlphaDenominator, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - _epochDurationInSeconds, - _rewardDelegatedStakeWeight, - _minimumPoolStake, - _cobbDouglasAlphaNumerator, - _cobbDouglasAlphaDenominator, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3061,9 +3131,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [amount]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3078,14 +3147,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [amount]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [amount]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3101,8 +3174,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3121,9 +3196,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3138,14 +3212,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3170,9 +3248,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [amount]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3187,14 +3264,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [amount]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [amount]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3211,8 +3292,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3228,8 +3311,10 @@ export class StakingContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -3253,9 +3338,8 @@ export class StakingContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -3270,14 +3354,18 @@ export class StakingContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [poolId]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/staking_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/staking_proxy.ts index dc61f900c8..8ebbef8792 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/staking_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/staking_proxy.ts @@ -742,9 +742,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -759,14 +758,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -788,8 +791,10 @@ export class StakingProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]>( rawCallResult, @@ -810,8 +815,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -834,9 +841,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_stakingContract.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -851,14 +857,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [_stakingContract.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [_stakingContract.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -875,8 +885,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -893,8 +905,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -918,9 +932,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [data]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -935,14 +948,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [data]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [data]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -958,8 +975,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -975,8 +994,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -992,8 +1013,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1009,8 +1032,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1031,9 +1056,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1048,14 +1072,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1071,8 +1099,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1092,8 +1122,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1109,8 +1141,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1126,8 +1160,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1143,8 +1179,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1161,8 +1199,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1186,8 +1226,10 @@ export class StakingProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber, BigNumber]> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0, index_1]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber, BigNumber]>(rawCallResult); }, @@ -1210,9 +1252,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1227,14 +1268,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1259,9 +1304,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), index]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1276,14 +1320,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), index]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [target.toLowerCase(), index]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1299,8 +1347,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1317,8 +1367,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1334,8 +1386,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1354,9 +1408,8 @@ export class StakingProxyContract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -1371,14 +1424,18 @@ export class StakingProxyContract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [newOwner.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1395,8 +1452,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -1412,8 +1471,10 @@ export class StakingProxyContract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts index b4252473d7..889af3dd01 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts @@ -471,8 +471,10 @@ export class WETH9Contract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -492,9 +494,8 @@ export class WETH9Contract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [guy.toLowerCase(), wad]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -509,14 +510,18 @@ export class WETH9Contract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [guy.toLowerCase(), wad]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [guy.toLowerCase(), wad]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -532,8 +537,10 @@ export class WETH9Contract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -554,13 +561,8 @@ export class WETH9Contract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - src.toLowerCase(), - dst.toLowerCase(), - wad, - ]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -575,22 +577,18 @@ export class WETH9Contract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [ - src.toLowerCase(), - dst.toLowerCase(), - wad, - ]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - src.toLowerCase(), - dst.toLowerCase(), - wad, - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -609,9 +607,8 @@ export class WETH9Contract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [wad]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -626,14 +623,18 @@ export class WETH9Contract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [wad]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [wad]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -649,8 +650,10 @@ export class WETH9Contract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -667,8 +670,10 @@ export class WETH9Contract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [index_0.toLowerCase()]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -684,8 +689,10 @@ export class WETH9Contract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -705,9 +712,8 @@ export class WETH9Contract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [dst.toLowerCase(), wad]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -722,14 +728,18 @@ export class WETH9Contract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [dst.toLowerCase(), wad]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [dst.toLowerCase(), wad]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -747,9 +757,8 @@ export class WETH9Contract extends BaseContract { txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -764,14 +773,18 @@ export class WETH9Contract extends BaseContract { return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts); }, async estimateGasAsync(txData?: Partial | undefined): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, []); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + ...txData, + data: this.getABIEncodedTransactionData(), + }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, []); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, @@ -789,11 +802,10 @@ export class WETH9Contract extends BaseContract { return { async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [ - index_0.toLowerCase(), - index_1.toLowerCase(), - ]); - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync( + { ...callData, data: this.getABIEncodedTransactionData() }, + defaultBlock, + ); const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue(rawCallResult); }, diff --git a/packages/abi-gen/templates/TypeScript/contract.handlebars b/packages/abi-gen/templates/TypeScript/contract.handlebars index c2a76e1d2b..0cc88b8309 100644 --- a/packages/abi-gen/templates/TypeScript/contract.handlebars +++ b/packages/abi-gen/templates/TypeScript/contract.handlebars @@ -65,7 +65,7 @@ export class {{contractName}}Contract extends BaseContract { {{else~}} public static deployedBytecode = '{{this.deployedBytecode}}'; {{/ifEquals~}} - private readonly _methodABIIndex: { [name:string]: number } = {}; + private readonly _methodABIIndex: { [name: string]: number } = {}; {{#if events~}} private readonly _subscriptionManager: SubscriptionManager<{{contractName}}EventArgs, {{contractName}}Events>; {{/if~}} diff --git a/packages/abi-gen/templates/TypeScript/partials/method_call.handlebars b/packages/abi-gen/templates/TypeScript/partials/method_call.handlebars index c1c1e5438b..687c8488a9 100644 --- a/packages/abi-gen/templates/TypeScript/partials/method_call.handlebars +++ b/packages/abi-gen/templates/TypeScript/partials/method_call.handlebars @@ -3,11 +3,10 @@ async callAsync( defaultBlock?: BlockParam, ): Promise<{{> return_type outputs=outputs}}> { BaseContract._assertCallParams(callData, defaultBlock); - const encodedData = self._strictEncodeArguments(functionSignature, [{{> normalized_params inputs=inputs}}]); {{#ifEquals this.stateMutability "pure"}} - const rawCallResult = await self._evmExecAsync(encodedData); + const rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData()); {{else}} - const rawCallResult = await self._performCallAsync({ ...callData, data: encodedData }, defaultBlock); + const rawCallResult = await self._performCallAsync({ ...callData, data: this.getABIEncodedTransactionData() }, defaultBlock); {{/ifEquals}} const abiEncoder = self._lookupAbiEncoder(functionSignature); return abiEncoder.strictDecodeReturnValue<{{> return_type outputs=outputs}}>(rawCallResult); diff --git a/packages/abi-gen/templates/TypeScript/partials/method_tx.handlebars b/packages/abi-gen/templates/TypeScript/partials/method_tx.handlebars index dc920e22ee..25f3a27dba 100644 --- a/packages/abi-gen/templates/TypeScript/partials/method_tx.handlebars +++ b/packages/abi-gen/templates/TypeScript/partials/method_tx.handlebars @@ -2,9 +2,8 @@ async sendTransactionAsync( txData?: Partial | undefined, opts: SendTransactionOpts = { shouldValidate: true }, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [{{> normalized_params inputs=inputs}}]); const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - { ...txData, data: encodedData }, + { ...txData, data: this.getABIEncodedTransactionData() }, this.estimateGasAsync.bind(this), ); if (opts.shouldValidate !== false) { @@ -21,7 +20,8 @@ awaitTransactionSuccessAsync( async estimateGasAsync( txData?: Partial | undefined, ): Promise { - const encodedData = self._strictEncodeArguments(functionSignature, [{{> normalized_params inputs=inputs}}]); - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ ...txData, data: encodedData, }); + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( + { ...txData, data: this.getABIEncodedTransactionData() } + ); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, diff --git a/packages/base-contract/src/subscription_manager.ts b/packages/base-contract/src/subscription_manager.ts index 9b7bfe942d..1bbad65356 100644 --- a/packages/base-contract/src/subscription_manager.ts +++ b/packages/base-contract/src/subscription_manager.ts @@ -108,8 +108,7 @@ export class SubscriptionManager marshaller.unmarshalLog(rawLog)); logs.forEach(log => { - Object.keys(this._filters).forEach((filterToken: string) => { - const filter = this._filters[filterToken]; + Object.entries(this._filters).forEach(([filterToken, filter]) => { if (filterUtils.matchesFilter(log, filter)) { const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs; const logEvent = {