diff --git a/packages/abi-gen-templates/partials/tx.handlebars b/packages/abi-gen-templates/partials/tx.handlebars index b3eefb25f4..b2c695c87b 100644 --- a/packages/abi-gen-templates/partials/tx.handlebars +++ b/packages/abi-gen-templates/partials/tx.handlebars @@ -12,7 +12,7 @@ public {{languageSpecificName}} = { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.{{this.tsName}}.estimateGasAsync.bind( + self.{{languageSpecificName}}.estimateGasAsync.bind( self, {{> params inputs=inputs}} ), diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts b/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts index e98e8b9aed..e21bd4b40a 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts @@ -160,9 +160,8 @@ export class AssetProxyOwnerContract extends BaseContract { }; public removeOwner = { async sendTransactionAsync(owner: string, txData?: Partial | undefined): Promise { - assert.isString('owner', owner); const self = (this as any) as AssetProxyOwnerContract; - const encodedData = self._strictEncodeArguments('removeOwner(address)', [owner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeOwner(address)', [owner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -170,12 +169,18 @@ export class AssetProxyOwnerContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeOwner.estimateGasAsync.bind(self, owner.toLowerCase()), + self.removeOwner.estimateGasAsync.bind(self, owner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -201,9 +206,8 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(owner: string, txData?: Partial | undefined): Promise { - assert.isString('owner', owner); const self = (this as any) as AssetProxyOwnerContract; - const encodedData = self._strictEncodeArguments('removeOwner(address)', [owner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeOwner(address)', [owner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -215,7 +219,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -267,7 +277,6 @@ export class AssetProxyOwnerContract extends BaseContract { }; public revokeConfirmation = { async sendTransactionAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('revokeConfirmation(uint256)', [transactionId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -282,7 +291,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -308,7 +323,6 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('revokeConfirmation(uint256)', [transactionId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -322,7 +336,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -485,7 +505,6 @@ export class AssetProxyOwnerContract extends BaseContract { }; public executeRemoveAuthorizedAddressAtIndex = { async sendTransactionAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeRemoveAuthorizedAddressAtIndex(uint256)', [ transactionId, @@ -502,7 +521,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -531,7 +556,6 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeRemoveAuthorizedAddressAtIndex(uint256)', [ transactionId, @@ -547,7 +571,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -708,11 +738,9 @@ export class AssetProxyOwnerContract extends BaseContract { isRegistered: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('assetProxyContract', assetProxyContract); - assert.isBoolean('isRegistered', isRegistered); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address,bool)', [ - assetProxyContract.toLowerCase(), + assetProxyContract, isRegistered, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -722,12 +750,18 @@ export class AssetProxyOwnerContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.registerAssetProxy.estimateGasAsync.bind(self, assetProxyContract.toLowerCase(), isRegistered), + self.registerAssetProxy.estimateGasAsync.bind(self, assetProxyContract, isRegistered), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -763,11 +797,9 @@ export class AssetProxyOwnerContract extends BaseContract { isRegistered: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('assetProxyContract', assetProxyContract); - assert.isBoolean('isRegistered', isRegistered); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address,bool)', [ - assetProxyContract.toLowerCase(), + assetProxyContract, isRegistered, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -781,7 +813,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -844,9 +882,8 @@ export class AssetProxyOwnerContract extends BaseContract { }; public addOwner = { async sendTransactionAsync(owner: string, txData?: Partial | undefined): Promise { - assert.isString('owner', owner); const self = (this as any) as AssetProxyOwnerContract; - const encodedData = self._strictEncodeArguments('addOwner(address)', [owner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addOwner(address)', [owner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -854,12 +891,18 @@ export class AssetProxyOwnerContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.addOwner.estimateGasAsync.bind(self, owner.toLowerCase()), + self.addOwner.estimateGasAsync.bind(self, owner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -885,9 +928,8 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(owner: string, txData?: Partial | undefined): Promise { - assert.isString('owner', owner); const self = (this as any) as AssetProxyOwnerContract; - const encodedData = self._strictEncodeArguments('addOwner(address)', [owner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addOwner(address)', [owner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -899,7 +941,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1001,7 +1049,6 @@ export class AssetProxyOwnerContract extends BaseContract { _secondsTimeLocked: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('_secondsTimeLocked', _secondsTimeLocked); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeTimeLock(uint256)', [_secondsTimeLocked]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1016,7 +1063,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1042,7 +1095,6 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(_secondsTimeLocked: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('_secondsTimeLocked', _secondsTimeLocked); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeTimeLock(uint256)', [_secondsTimeLocked]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1056,7 +1108,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1464,7 +1522,6 @@ export class AssetProxyOwnerContract extends BaseContract { }; public changeRequirement = { async sendTransactionAsync(_required: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('_required', _required); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeRequirement(uint256)', [_required]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1479,7 +1536,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1505,7 +1568,6 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(_required: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('_required', _required); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeRequirement(uint256)', [_required]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1519,7 +1581,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1573,7 +1641,6 @@ export class AssetProxyOwnerContract extends BaseContract { }; public confirmTransaction = { async sendTransactionAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('confirmTransaction(uint256)', [transactionId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1588,7 +1655,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1614,7 +1687,6 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('confirmTransaction(uint256)', [transactionId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1628,7 +1700,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1689,12 +1767,9 @@ export class AssetProxyOwnerContract extends BaseContract { data: string, txData?: Partial | undefined, ): Promise { - assert.isString('destination', destination); - assert.isBigNumber('value', value); - assert.isString('data', data); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('submitTransaction(address,uint256,bytes)', [ - destination.toLowerCase(), + destination, value, data, ]); @@ -1705,12 +1780,18 @@ export class AssetProxyOwnerContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.submitTransaction.estimateGasAsync.bind(self, destination.toLowerCase(), value, data), + self.submitTransaction.estimateGasAsync.bind(self, destination, value, data), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1750,12 +1831,9 @@ export class AssetProxyOwnerContract extends BaseContract { data: string, txData?: Partial | undefined, ): Promise { - assert.isString('destination', destination); - assert.isBigNumber('value', value); - assert.isString('data', data); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('submitTransaction(address,uint256,bytes)', [ - destination.toLowerCase(), + destination, value, data, ]); @@ -1770,7 +1848,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1977,13 +2061,8 @@ export class AssetProxyOwnerContract extends BaseContract { newOwner: string, txData?: Partial | undefined, ): Promise { - assert.isString('owner', owner); - assert.isString('newOwner', newOwner); const self = (this as any) as AssetProxyOwnerContract; - const encodedData = self._strictEncodeArguments('replaceOwner(address,address)', [ - owner.toLowerCase(), - newOwner.toLowerCase(), - ]); + const encodedData = self._strictEncodeArguments('replaceOwner(address,address)', [owner, newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1991,12 +2070,18 @@ export class AssetProxyOwnerContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.replaceOwner.estimateGasAsync.bind(self, owner.toLowerCase(), newOwner.toLowerCase()), + self.replaceOwner.estimateGasAsync.bind(self, owner, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -2028,13 +2113,8 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(owner: string, newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('owner', owner); - assert.isString('newOwner', newOwner); const self = (this as any) as AssetProxyOwnerContract; - const encodedData = self._strictEncodeArguments('replaceOwner(address,address)', [ - owner.toLowerCase(), - newOwner.toLowerCase(), - ]); + const encodedData = self._strictEncodeArguments('replaceOwner(address,address)', [owner, newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -2046,7 +2126,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -2109,7 +2195,6 @@ export class AssetProxyOwnerContract extends BaseContract { }; public executeTransaction = { async sendTransactionAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeTransaction(uint256)', [transactionId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -2124,7 +2209,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -2150,7 +2241,6 @@ export class AssetProxyOwnerContract extends BaseContract { ); }, async estimateGasAsync(transactionId: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('transactionId', transactionId); const self = (this as any) as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeTransaction(uint256)', [transactionId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -2164,7 +2254,13 @@ export class AssetProxyOwnerContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts index 22e4b1fcb3..8039570667 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts @@ -206,20 +206,10 @@ export class CoordinatorContract extends BaseContract { approvalSignatures: string[], txData?: Partial | undefined, ): Promise { - assert.isString('txOrigin', txOrigin); - assert.isString('transactionSignature', transactionSignature); - assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds); - assert.isArray('approvalSignatures', approvalSignatures); const self = (this as any) as CoordinatorContract; const encodedData = self._strictEncodeArguments( 'executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', - [ - transaction, - txOrigin.toLowerCase(), - transactionSignature, - approvalExpirationTimeSeconds, - approvalSignatures, - ], + [transaction, txOrigin, transactionSignature, approvalExpirationTimeSeconds, approvalSignatures], ); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { @@ -231,7 +221,7 @@ export class CoordinatorContract extends BaseContract { self.executeTransaction.estimateGasAsync.bind( self, transaction, - txOrigin.toLowerCase(), + txOrigin, transactionSignature, approvalExpirationTimeSeconds, approvalSignatures, @@ -240,7 +230,13 @@ export class CoordinatorContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -287,20 +283,10 @@ export class CoordinatorContract extends BaseContract { approvalSignatures: string[], txData?: Partial | undefined, ): Promise { - assert.isString('txOrigin', txOrigin); - assert.isString('transactionSignature', transactionSignature); - assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds); - assert.isArray('approvalSignatures', approvalSignatures); const self = (this as any) as CoordinatorContract; const encodedData = self._strictEncodeArguments( 'executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', - [ - transaction, - txOrigin.toLowerCase(), - transactionSignature, - approvalExpirationTimeSeconds, - approvalSignatures, - ], + [transaction, txOrigin, transactionSignature, approvalExpirationTimeSeconds, approvalSignatures], ); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { @@ -313,7 +299,13 @@ export class CoordinatorContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, 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 7361cad4ba..3beac00652 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts @@ -40,7 +40,6 @@ export interface CoordinatorRegistryCoordinatorEndpointSetEventArgs extends Deco export class CoordinatorRegistryContract extends BaseContract { public setCoordinatorEndpoint = { async sendTransactionAsync(coordinatorEndpoint: string, txData?: Partial | undefined): Promise { - assert.isString('coordinatorEndpoint', coordinatorEndpoint); const self = (this as any) as CoordinatorRegistryContract; const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -55,7 +54,13 @@ export class CoordinatorRegistryContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -81,7 +86,6 @@ export class CoordinatorRegistryContract extends BaseContract { ); }, async estimateGasAsync(coordinatorEndpoint: string, txData?: Partial | undefined): Promise { - assert.isString('coordinatorEndpoint', coordinatorEndpoint); const self = (this as any) as CoordinatorRegistryContract; const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -95,7 +99,13 @@ export class CoordinatorRegistryContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, 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 ff8dfa2db2..7e8446a127 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 @@ -95,13 +95,8 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _spender.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -109,12 +104,18 @@ export class DummyERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.approve.estimateGasAsync.bind(self, _spender.toLowerCase(), _value), + self.approve.estimateGasAsync.bind(self, _spender, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -146,13 +147,8 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _spender.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -164,7 +160,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -275,13 +277,10 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _value, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -291,12 +290,18 @@ export class DummyERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _value), + self.transferFrom.estimateGasAsync.bind(self, _from, _to, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -336,13 +341,10 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _value, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -356,7 +358,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -602,7 +610,6 @@ export class DummyERC20TokenContract extends BaseContract { }; public mint = { async sendTransactionAsync(_value: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('mint(uint256)', [_value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -617,7 +624,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -643,7 +656,6 @@ export class DummyERC20TokenContract extends BaseContract { ); }, async estimateGasAsync(_value: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('mint(uint256)', [_value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -657,7 +669,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -711,10 +729,8 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to.toLowerCase(), _value]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -722,12 +738,18 @@ export class DummyERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transfer.estimateGasAsync.bind(self, _to.toLowerCase(), _value), + self.transfer.estimateGasAsync.bind(self, _to, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -755,10 +777,8 @@ export class DummyERC20TokenContract extends BaseContract { ); }, async estimateGasAsync(_to: string, _value: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to.toLowerCase(), _value]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -770,7 +790,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -892,13 +918,8 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_target', _target); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [ - _target.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -906,12 +927,18 @@ export class DummyERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.setBalance.estimateGasAsync.bind(self, _target.toLowerCase(), _value), + self.setBalance.estimateGasAsync.bind(self, _target, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -943,13 +970,8 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_target', _target); - assert.isBigNumber('_value', _value); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [ - _target.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -961,7 +983,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1024,9 +1052,8 @@ export class DummyERC20TokenContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1034,12 +1061,18 @@ export class DummyERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1065,9 +1098,8 @@ export class DummyERC20TokenContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as DummyERC20TokenContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1079,7 +1111,13 @@ export class DummyERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, 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 c556831557..1e33b24e7d 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 @@ -154,13 +154,8 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _approved.toLowerCase(), - _tokenId, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -168,12 +163,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.approve.estimateGasAsync.bind(self, _approved.toLowerCase(), _tokenId), + self.approve.estimateGasAsync.bind(self, _approved, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -205,13 +206,8 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _approved.toLowerCase(), - _tokenId, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -223,7 +219,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -291,13 +293,10 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -307,12 +306,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _tokenId), + self.transferFrom.estimateGasAsync.bind(self, _from, _to, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -352,13 +357,10 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -372,7 +374,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -444,10 +452,8 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to.toLowerCase(), _tokenId]); + const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -455,12 +461,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.mint.estimateGasAsync.bind(self, _to.toLowerCase(), _tokenId), + self.mint.estimateGasAsync.bind(self, _to, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -492,10 +504,8 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to.toLowerCase(), _tokenId]); + const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -507,7 +517,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -572,13 +588,10 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -588,12 +601,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.safeTransferFrom1.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _tokenId), + self.safeTransferFrom1.estimateGasAsync.bind(self, _from, _to, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -633,13 +652,10 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -653,7 +669,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -909,10 +931,8 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_owner', _owner); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner.toLowerCase(), _tokenId]); + const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -920,12 +940,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.burn.estimateGasAsync.bind(self, _owner.toLowerCase(), _tokenId), + self.burn.estimateGasAsync.bind(self, _owner, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -957,10 +983,8 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_owner', _owner); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner.toLowerCase(), _tokenId]); + const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -972,7 +996,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1036,13 +1066,8 @@ export class DummyERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator); - assert.isBoolean('_approved', _approved); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [ - _operator.toLowerCase(), - _approved, - ]); + const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1050,12 +1075,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.setApprovalForAll.estimateGasAsync.bind(self, _operator.toLowerCase(), _approved), + self.setApprovalForAll.estimateGasAsync.bind(self, _operator, _approved), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1091,13 +1122,8 @@ export class DummyERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator); - assert.isBoolean('_approved', _approved); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [ - _operator.toLowerCase(), - _approved, - ]); + const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1109,7 +1135,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1178,14 +1210,10 @@ export class DummyERC721TokenContract extends BaseContract { _data: string, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); - assert.isString('_data', _data); const self = (this as any) as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, _data, ]); @@ -1196,18 +1224,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.safeTransferFrom2.estimateGasAsync.bind( - self, - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ), + self.safeTransferFrom2.estimateGasAsync.bind(self, _from, _to, _tokenId, _data), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1251,14 +1279,10 @@ export class DummyERC721TokenContract extends BaseContract { _data: string, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); - assert.isString('_data', _data); const self = (this as any) as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, _data, ]); @@ -1273,7 +1297,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1402,9 +1432,8 @@ export class DummyERC721TokenContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1412,12 +1441,18 @@ export class DummyERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1443,9 +1478,8 @@ export class DummyERC721TokenContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as DummyERC721TokenContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1457,7 +1491,13 @@ export class DummyERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts index cbfc198033..d9ec1ad1a9 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts @@ -62,7 +62,13 @@ export class DutchAuctionContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -132,7 +138,13 @@ export class DutchAuctionContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -264,8 +276,6 @@ export class DutchAuctionContract extends BaseContract { sellSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('buySignature', buySignature); - assert.isString('sellSignature', sellSignature); const self = (this as any) as DutchAuctionContract; const encodedData = self._strictEncodeArguments( 'matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', @@ -283,7 +293,13 @@ export class DutchAuctionContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -377,8 +393,6 @@ export class DutchAuctionContract extends BaseContract { sellSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('buySignature', buySignature); - assert.isString('sellSignature', sellSignature); const self = (this as any) as DutchAuctionContract; const encodedData = self._strictEncodeArguments( 'matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', @@ -395,7 +409,13 @@ export class DutchAuctionContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts index ad1f902382..4f24e36cff 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts @@ -48,9 +48,8 @@ export interface ERC20ProxyAuthorizedAddressRemovedEventArgs extends DecodedLogA export class ERC20ProxyContract extends BaseContract { public addAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC20ProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -58,12 +57,18 @@ export class ERC20ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.addAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.addAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -89,9 +94,8 @@ export class ERC20ProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC20ProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -103,7 +107,13 @@ export class ERC20ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -204,9 +214,8 @@ export class ERC20ProxyContract extends BaseContract { }; public removeAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC20ProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -214,12 +223,18 @@ export class ERC20ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.removeAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -245,9 +260,8 @@ export class ERC20ProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC20ProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -259,7 +273,13 @@ export class ERC20ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -358,11 +378,9 @@ export class ERC20ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -372,12 +390,18 @@ export class ERC20ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target.toLowerCase(), index), + self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target, index), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -413,11 +437,9 @@ export class ERC20ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -431,7 +453,13 @@ export class ERC20ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -631,9 +659,8 @@ export class ERC20ProxyContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ERC20ProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -641,12 +668,18 @@ export class ERC20ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -672,9 +705,8 @@ export class ERC20ProxyContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ERC20ProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -686,7 +718,13 @@ export class ERC20ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, 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 b255e32335..33a49051fc 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts @@ -52,13 +52,8 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender); - assert.isBigNumber('_value', _value); const self = (this as any) as ERC20TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _spender.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -66,12 +61,18 @@ export class ERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.approve.estimateGasAsync.bind(self, _spender.toLowerCase(), _value), + self.approve.estimateGasAsync.bind(self, _spender, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -103,13 +104,8 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender); - assert.isBigNumber('_value', _value); const self = (this as any) as ERC20TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _spender.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -121,7 +117,13 @@ export class ERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -232,13 +234,10 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ERC20TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _value, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -248,12 +247,18 @@ export class ERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _value), + self.transferFrom.estimateGasAsync.bind(self, _from, _to, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -293,13 +298,10 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ERC20TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _value, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -313,7 +315,13 @@ export class ERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -434,10 +442,8 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ERC20TokenContract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to.toLowerCase(), _value]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -445,12 +451,18 @@ export class ERC20TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transfer.estimateGasAsync.bind(self, _to.toLowerCase(), _value), + self.transfer.estimateGasAsync.bind(self, _to, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -478,10 +490,8 @@ export class ERC20TokenContract extends BaseContract { ); }, async estimateGasAsync(_to: string, _value: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ERC20TokenContract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to.toLowerCase(), _value]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -493,7 +503,13 @@ export class ERC20TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts index a12a7dc967..7b8da252a0 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts @@ -48,9 +48,8 @@ export interface ERC721ProxyAuthorizedAddressRemovedEventArgs extends DecodedLog export class ERC721ProxyContract extends BaseContract { public addAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC721ProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -58,12 +57,18 @@ export class ERC721ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.addAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.addAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -89,9 +94,8 @@ export class ERC721ProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC721ProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -103,7 +107,13 @@ export class ERC721ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -204,9 +214,8 @@ export class ERC721ProxyContract extends BaseContract { }; public removeAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC721ProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -214,12 +223,18 @@ export class ERC721ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.removeAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -245,9 +260,8 @@ export class ERC721ProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as ERC721ProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -259,7 +273,13 @@ export class ERC721ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -358,11 +378,9 @@ export class ERC721ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -372,12 +390,18 @@ export class ERC721ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target.toLowerCase(), index), + self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target, index), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -413,11 +437,9 @@ export class ERC721ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -431,7 +453,13 @@ export class ERC721ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -631,9 +659,8 @@ export class ERC721ProxyContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ERC721ProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -641,12 +668,18 @@ export class ERC721ProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -672,9 +705,8 @@ export class ERC721ProxyContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ERC721ProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -686,7 +718,13 @@ export class ERC721ProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, 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 65001e08e5..2b9aeceb75 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts @@ -111,13 +111,8 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as ERC721TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _approved.toLowerCase(), - _tokenId, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -125,12 +120,18 @@ export class ERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.approve.estimateGasAsync.bind(self, _approved.toLowerCase(), _tokenId), + self.approve.estimateGasAsync.bind(self, _approved, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -162,13 +163,8 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as ERC721TokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _approved.toLowerCase(), - _tokenId, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -180,7 +176,13 @@ export class ERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -248,13 +250,10 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as ERC721TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -264,12 +263,18 @@ export class ERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _tokenId), + self.transferFrom.estimateGasAsync.bind(self, _from, _to, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -309,13 +314,10 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as ERC721TokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -329,7 +331,13 @@ export class ERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -402,13 +410,10 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as ERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -418,12 +423,18 @@ export class ERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.safeTransferFrom1.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _tokenId), + self.safeTransferFrom1.estimateGasAsync.bind(self, _from, _to, _tokenId), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -463,13 +474,10 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); const self = (this as any) as ERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -483,7 +491,13 @@ export class ERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -653,13 +667,8 @@ export class ERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator); - assert.isBoolean('_approved', _approved); const self = (this as any) as ERC721TokenContract; - const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [ - _operator.toLowerCase(), - _approved, - ]); + const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -667,12 +676,18 @@ export class ERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.setApprovalForAll.estimateGasAsync.bind(self, _operator.toLowerCase(), _approved), + self.setApprovalForAll.estimateGasAsync.bind(self, _operator, _approved), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -708,13 +723,8 @@ export class ERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator); - assert.isBoolean('_approved', _approved); const self = (this as any) as ERC721TokenContract; - const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [ - _operator.toLowerCase(), - _approved, - ]); + const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -726,7 +736,13 @@ export class ERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -795,14 +811,10 @@ export class ERC721TokenContract extends BaseContract { _data: string, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); - assert.isString('_data', _data); const self = (this as any) as ERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, _data, ]); @@ -813,18 +825,18 @@ export class ERC721TokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.safeTransferFrom2.estimateGasAsync.bind( - self, - _from.toLowerCase(), - _to.toLowerCase(), - _tokenId, - _data, - ), + self.safeTransferFrom2.estimateGasAsync.bind(self, _from, _to, _tokenId, _data), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -868,14 +880,10 @@ export class ERC721TokenContract extends BaseContract { _data: string, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_tokenId', _tokenId); - assert.isString('_data', _data); const self = (this as any) as ERC721TokenContract; const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _tokenId, _data, ]); @@ -890,7 +898,13 @@ export class ERC721TokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts index dcadb69559..f00695c6e8 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts @@ -151,9 +151,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchFillOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', @@ -171,7 +168,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -237,9 +240,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchFillOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', @@ -256,7 +256,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -418,13 +424,10 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isString('hash', hash); - assert.isString('signerAddress', signerAddress); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('preSign(bytes32,address,bytes)', [ hash, - signerAddress.toLowerCase(), + signerAddress, signature, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -434,12 +437,18 @@ export class ExchangeContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.preSign.estimateGasAsync.bind(self, hash, signerAddress.toLowerCase(), signature), + self.preSign.estimateGasAsync.bind(self, hash, signerAddress, signature), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -479,13 +488,10 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isString('hash', hash); - assert.isString('signerAddress', signerAddress); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('preSign(bytes32,address,bytes)', [ hash, - signerAddress.toLowerCase(), + signerAddress, signature, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -499,7 +505,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -599,8 +611,6 @@ export class ExchangeContract extends BaseContract { rightSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('leftSignature', leftSignature); - assert.isString('rightSignature', rightSignature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', @@ -618,7 +628,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -712,8 +728,6 @@ export class ExchangeContract extends BaseContract { rightSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('leftSignature', leftSignature); - assert.isString('rightSignature', rightSignature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', @@ -730,7 +744,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -900,8 +920,6 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'fillOrderNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', @@ -919,7 +937,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -984,8 +1008,6 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'fillOrderNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', @@ -1002,7 +1024,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1169,7 +1197,6 @@ export class ExchangeContract extends BaseContract { }>, txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchCancelOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[])', @@ -1187,7 +1214,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1242,7 +1275,6 @@ export class ExchangeContract extends BaseContract { }>, txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchCancelOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[])', @@ -1259,7 +1291,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1367,9 +1405,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchFillOrKillOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', @@ -1387,7 +1422,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1453,9 +1494,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchFillOrKillOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', @@ -1472,7 +1510,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1580,7 +1624,6 @@ export class ExchangeContract extends BaseContract { }; public cancelOrdersUpTo = { async sendTransactionAsync(targetOrderEpoch: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('targetOrderEpoch', targetOrderEpoch); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('cancelOrdersUpTo(uint256)', [targetOrderEpoch]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1595,7 +1638,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1621,7 +1670,6 @@ export class ExchangeContract extends BaseContract { ); }, async estimateGasAsync(targetOrderEpoch: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('targetOrderEpoch', targetOrderEpoch); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('cancelOrdersUpTo(uint256)', [targetOrderEpoch]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -1635,7 +1683,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -1709,9 +1763,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchFillOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', @@ -1729,7 +1780,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -1795,9 +1852,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'batchFillOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', @@ -1814,7 +1868,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -2038,8 +2098,6 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'fillOrKillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', @@ -2057,7 +2115,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -2122,8 +2186,6 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'fillOrKillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', @@ -2140,7 +2202,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -2250,11 +2318,9 @@ export class ExchangeContract extends BaseContract { approval: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('validatorAddress', validatorAddress); - assert.isBoolean('approval', approval); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('setSignatureValidatorApproval(address,bool)', [ - validatorAddress.toLowerCase(), + validatorAddress, approval, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -2264,16 +2330,18 @@ export class ExchangeContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.setSignatureValidatorApproval.estimateGasAsync.bind( - self, - validatorAddress.toLowerCase(), - approval, - ), + self.setSignatureValidatorApproval.estimateGasAsync.bind(self, validatorAddress, approval), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -2309,11 +2377,9 @@ export class ExchangeContract extends BaseContract { approval: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('validatorAddress', validatorAddress); - assert.isBoolean('approval', approval); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('setSignatureValidatorApproval(address,bool)', [ - validatorAddress.toLowerCase(), + validatorAddress, approval, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -2327,7 +2393,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -2466,9 +2538,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketSellOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -2486,7 +2555,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -2552,9 +2627,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketSellOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -2571,7 +2643,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -2948,9 +3026,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketBuyOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -2968,7 +3043,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -3034,9 +3115,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketBuyOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -3053,7 +3131,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -3179,8 +3263,6 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', @@ -3198,7 +3280,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -3258,8 +3346,6 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', @@ -3276,7 +3362,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -3388,14 +3480,10 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('salt', salt); - assert.isString('signerAddress', signerAddress); - assert.isString('data', data); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('executeTransaction(uint256,address,bytes,bytes)', [ salt, - signerAddress.toLowerCase(), + signerAddress, data, signature, ]); @@ -3406,12 +3494,18 @@ export class ExchangeContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.executeTransaction.estimateGasAsync.bind(self, salt, signerAddress.toLowerCase(), data, signature), + self.executeTransaction.estimateGasAsync.bind(self, salt, signerAddress, data, signature), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -3455,14 +3549,10 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('salt', salt); - assert.isString('signerAddress', signerAddress); - assert.isString('data', data); - assert.isString('signature', signature); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments('executeTransaction(uint256,address,bytes,bytes)', [ salt, - signerAddress.toLowerCase(), + signerAddress, data, signature, ]); @@ -3477,7 +3567,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -3548,9 +3644,8 @@ export class ExchangeContract extends BaseContract { }; public registerAssetProxy = { async sendTransactionAsync(assetProxy: string, txData?: Partial | undefined): Promise { - assert.isString('assetProxy', assetProxy); const self = (this as any) as ExchangeContract; - const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy.toLowerCase()]); + const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -3558,12 +3653,18 @@ export class ExchangeContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.registerAssetProxy.estimateGasAsync.bind(self, assetProxy.toLowerCase()), + self.registerAssetProxy.estimateGasAsync.bind(self, assetProxy), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -3589,9 +3690,8 @@ export class ExchangeContract extends BaseContract { ); }, async estimateGasAsync(assetProxy: string, txData?: Partial | undefined): Promise { - assert.isString('assetProxy', assetProxy); const self = (this as any) as ExchangeContract; - const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy.toLowerCase()]); + const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -3603,7 +3703,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -3777,7 +3883,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -3847,7 +3959,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -4052,9 +4170,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketSellOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -4072,7 +4187,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -4138,9 +4259,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketSellOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -4157,7 +4275,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -4326,9 +4450,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketBuyOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -4346,7 +4467,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -4412,9 +4539,6 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); - assert.isArray('signatures', signatures); const self = (this as any) as ExchangeContract; const encodedData = self._strictEncodeArguments( 'marketBuyOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', @@ -4431,7 +4555,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -4582,9 +4712,8 @@ export class ExchangeContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ExchangeContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -4592,12 +4721,18 @@ export class ExchangeContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -4623,9 +4758,8 @@ export class ExchangeContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ExchangeContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -4637,7 +4771,13 @@ export class ExchangeContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts index fe626d06ee..842d2ea229 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts @@ -64,25 +64,10 @@ export class ForwarderContract extends BaseContract { feeRecipient: string, txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); - assert.isArray('signatures', signatures); - assert.isArray('feeOrders', feeOrders); - assert.isArray('feeSignatures', feeSignatures); - assert.isBigNumber('feePercentage', feePercentage); - assert.isString('feeRecipient', feeRecipient); const self = (this as any) as ForwarderContract; const encodedData = self._strictEncodeArguments( 'marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', - [ - orders, - makerAssetFillAmount, - signatures, - feeOrders, - feeSignatures, - feePercentage, - feeRecipient.toLowerCase(), - ], + [orders, makerAssetFillAmount, signatures, feeOrders, feeSignatures, feePercentage, feeRecipient], ); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { @@ -99,13 +84,19 @@ export class ForwarderContract extends BaseContract { feeOrders, feeSignatures, feePercentage, - feeRecipient.toLowerCase(), + feeRecipient, ), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -213,25 +204,10 @@ export class ForwarderContract extends BaseContract { feeRecipient: string, txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); - assert.isArray('signatures', signatures); - assert.isArray('feeOrders', feeOrders); - assert.isArray('feeSignatures', feeSignatures); - assert.isBigNumber('feePercentage', feePercentage); - assert.isString('feeRecipient', feeRecipient); const self = (this as any) as ForwarderContract; const encodedData = self._strictEncodeArguments( 'marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', - [ - orders, - makerAssetFillAmount, - signatures, - feeOrders, - feeSignatures, - feePercentage, - feeRecipient.toLowerCase(), - ], + [orders, makerAssetFillAmount, signatures, feeOrders, feeSignatures, feePercentage, feeRecipient], ); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { @@ -244,7 +220,13 @@ export class ForwarderContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -434,8 +416,6 @@ export class ForwarderContract extends BaseContract { amount: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('assetData', assetData); - assert.isBigNumber('amount', amount); const self = (this as any) as ForwarderContract; const encodedData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData, amount]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -450,7 +430,13 @@ export class ForwarderContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -482,8 +468,6 @@ export class ForwarderContract extends BaseContract { amount: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('assetData', assetData); - assert.isBigNumber('amount', amount); const self = (this as any) as ForwarderContract; const encodedData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData, amount]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -497,7 +481,13 @@ export class ForwarderContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -634,16 +624,10 @@ export class ForwarderContract extends BaseContract { feeRecipient: string, txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('signatures', signatures); - assert.isArray('feeOrders', feeOrders); - assert.isArray('feeSignatures', feeSignatures); - assert.isBigNumber('feePercentage', feePercentage); - assert.isString('feeRecipient', feeRecipient); const self = (this as any) as ForwarderContract; const encodedData = self._strictEncodeArguments( 'marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', - [orders, signatures, feeOrders, feeSignatures, feePercentage, feeRecipient.toLowerCase()], + [orders, signatures, feeOrders, feeSignatures, feePercentage, feeRecipient], ); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { @@ -659,13 +643,19 @@ export class ForwarderContract extends BaseContract { feeOrders, feeSignatures, feePercentage, - feeRecipient.toLowerCase(), + feeRecipient, ), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -769,16 +759,10 @@ export class ForwarderContract extends BaseContract { feeRecipient: string, txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders); - assert.isArray('signatures', signatures); - assert.isArray('feeOrders', feeOrders); - assert.isArray('feeSignatures', feeSignatures); - assert.isBigNumber('feePercentage', feePercentage); - assert.isString('feeRecipient', feeRecipient); const self = (this as any) as ForwarderContract; const encodedData = self._strictEncodeArguments( 'marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', - [orders, signatures, feeOrders, feeSignatures, feePercentage, feeRecipient.toLowerCase()], + [orders, signatures, feeOrders, feeSignatures, feePercentage, feeRecipient], ); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { @@ -791,7 +775,13 @@ export class ForwarderContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -957,9 +947,8 @@ export class ForwarderContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ForwarderContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -967,12 +956,18 @@ export class ForwarderContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -998,9 +993,8 @@ export class ForwarderContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as ForwarderContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -1012,7 +1006,13 @@ export class ForwarderContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts index d5ec38a6fb..cdbb2aaad7 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts @@ -29,9 +29,8 @@ import * as ethers from 'ethers'; export class IAssetProxyContract extends BaseContract { public addAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as IAssetProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -39,12 +38,18 @@ export class IAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.addAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.addAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -70,9 +75,8 @@ export class IAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as IAssetProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -84,7 +88,13 @@ export class IAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -136,9 +146,8 @@ export class IAssetProxyContract extends BaseContract { }; public removeAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as IAssetProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -146,12 +155,18 @@ export class IAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.removeAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -177,9 +192,8 @@ export class IAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as IAssetProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -191,7 +205,13 @@ export class IAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -247,11 +267,9 @@ export class IAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as IAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -261,12 +279,18 @@ export class IAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target.toLowerCase(), index), + self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target, index), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -302,11 +326,9 @@ export class IAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as IAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -320,7 +342,13 @@ export class IAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -389,15 +417,11 @@ export class IAssetProxyContract extends BaseContract { amount: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('assetData', assetData); - assert.isString('from', from); - assert.isString('to', to); - assert.isBigNumber('amount', amount); const self = (this as any) as IAssetProxyContract; const encodedData = self._strictEncodeArguments('transferFrom(bytes,address,address,uint256)', [ assetData, - from.toLowerCase(), - to.toLowerCase(), + from, + to, amount, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -407,12 +431,18 @@ export class IAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, assetData, from.toLowerCase(), to.toLowerCase(), amount), + self.transferFrom.estimateGasAsync.bind(self, assetData, from, to, amount), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -456,15 +486,11 @@ export class IAssetProxyContract extends BaseContract { amount: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('assetData', assetData); - assert.isString('from', from); - assert.isString('to', to); - assert.isBigNumber('amount', amount); const self = (this as any) as IAssetProxyContract; const encodedData = self._strictEncodeArguments('transferFrom(bytes,address,address,uint256)', [ assetData, - from.toLowerCase(), - to.toLowerCase(), + from, + to, amount, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -478,7 +504,13 @@ export class IAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -635,9 +667,8 @@ export class IAssetProxyContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as IAssetProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -645,12 +676,18 @@ export class IAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -676,9 +713,8 @@ export class IAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as IAssetProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -690,7 +726,13 @@ export class IAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts index 2d454dc9da..683156bddc 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts @@ -100,9 +100,8 @@ export class MultiAssetProxyContract extends BaseContract { }; public addAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -110,12 +109,18 @@ export class MultiAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.addAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.addAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -141,9 +146,8 @@ export class MultiAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -155,7 +159,13 @@ export class MultiAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -305,9 +315,8 @@ export class MultiAssetProxyContract extends BaseContract { }; public removeAuthorizedAddress = { async sendTransactionAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -315,12 +324,18 @@ export class MultiAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddress.estimateGasAsync.bind(self, target.toLowerCase()), + self.removeAuthorizedAddress.estimateGasAsync.bind(self, target), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -346,9 +361,8 @@ export class MultiAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(target: string, txData?: Partial | undefined): Promise { - assert.isString('target', target); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target.toLowerCase()]); + const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -360,7 +374,13 @@ export class MultiAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -459,11 +479,9 @@ export class MultiAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -473,12 +491,18 @@ export class MultiAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target.toLowerCase(), index), + self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(self, target, index), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -514,11 +538,9 @@ export class MultiAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target); - assert.isBigNumber('index', index); const self = (this as any) as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [ - target.toLowerCase(), + target, index, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -532,7 +554,13 @@ export class MultiAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -689,9 +717,8 @@ export class MultiAssetProxyContract extends BaseContract { }; public registerAssetProxy = { async sendTransactionAsync(assetProxy: string, txData?: Partial | undefined): Promise { - assert.isString('assetProxy', assetProxy); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy.toLowerCase()]); + const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -699,12 +726,18 @@ export class MultiAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.registerAssetProxy.estimateGasAsync.bind(self, assetProxy.toLowerCase()), + self.registerAssetProxy.estimateGasAsync.bind(self, assetProxy), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -730,9 +763,8 @@ export class MultiAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(assetProxy: string, txData?: Partial | undefined): Promise { - assert.isString('assetProxy', assetProxy); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy.toLowerCase()]); + const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -744,7 +776,13 @@ export class MultiAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -843,9 +881,8 @@ export class MultiAssetProxyContract extends BaseContract { }; public transferOwnership = { async sendTransactionAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -853,12 +890,18 @@ export class MultiAssetProxyContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferOwnership.estimateGasAsync.bind(self, newOwner.toLowerCase()), + self.transferOwnership.estimateGasAsync.bind(self, newOwner), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -884,9 +927,8 @@ export class MultiAssetProxyContract extends BaseContract { ); }, async estimateGasAsync(newOwner: string, txData?: Partial | undefined): Promise { - assert.isString('newOwner', newOwner); const self = (this as any) as MultiAssetProxyContract; - const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner.toLowerCase()]); + const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -898,7 +940,13 @@ export class MultiAssetProxyContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts index 58d6d37c1e..825c856c17 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts @@ -107,10 +107,8 @@ export class WETH9Contract extends BaseContract { }; public approve = { async sendTransactionAsync(guy: string, wad: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('guy', guy); - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy.toLowerCase(), wad]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy, wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -118,12 +116,18 @@ export class WETH9Contract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.approve.estimateGasAsync.bind(self, guy.toLowerCase(), wad), + self.approve.estimateGasAsync.bind(self, guy, wad), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -151,10 +155,8 @@ export class WETH9Contract extends BaseContract { ); }, async estimateGasAsync(guy: string, wad: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('guy', guy); - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy.toLowerCase(), wad]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy, wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -166,7 +168,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -274,15 +282,8 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('src', src); - assert.isString('dst', dst); - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; - const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - src.toLowerCase(), - dst.toLowerCase(), - wad, - ]); + const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src, dst, wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -290,12 +291,18 @@ export class WETH9Contract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, src.toLowerCase(), dst.toLowerCase(), wad), + self.transferFrom.estimateGasAsync.bind(self, src, dst, wad), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -335,15 +342,8 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('src', src); - assert.isString('dst', dst); - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; - const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - src.toLowerCase(), - dst.toLowerCase(), - wad, - ]); + const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src, dst, wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -355,7 +355,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -423,7 +429,6 @@ export class WETH9Contract extends BaseContract { }; public withdraw = { async sendTransactionAsync(wad: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -438,7 +443,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -464,7 +475,6 @@ export class WETH9Contract extends BaseContract { ); }, async estimateGasAsync(wad: BigNumber, txData?: Partial | undefined): Promise { - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -478,7 +488,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -665,10 +681,8 @@ export class WETH9Contract extends BaseContract { }; public transfer = { async sendTransactionAsync(dst: string, wad: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('dst', dst); - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst.toLowerCase(), wad]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst, wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -676,12 +690,18 @@ export class WETH9Contract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transfer.estimateGasAsync.bind(self, dst.toLowerCase(), wad), + self.transfer.estimateGasAsync.bind(self, dst, wad), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -709,10 +729,8 @@ export class WETH9Contract extends BaseContract { ); }, async estimateGasAsync(dst: string, wad: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('dst', dst); - assert.isBigNumber('wad', wad); const self = (this as any) as WETH9Contract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst.toLowerCase(), wad]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst, wad]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -724,7 +742,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -798,7 +822,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -835,7 +865,13 @@ export class WETH9Contract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts index 8336c49894..274f5b983d 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts @@ -95,13 +95,8 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender); - assert.isBigNumber('_value', _value); const self = (this as any) as ZRXTokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _spender.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -109,12 +104,18 @@ export class ZRXTokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.approve.estimateGasAsync.bind(self, _spender.toLowerCase(), _value), + self.approve.estimateGasAsync.bind(self, _spender, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -146,13 +147,8 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender); - assert.isBigNumber('_value', _value); const self = (this as any) as ZRXTokenContract; - const encodedData = self._strictEncodeArguments('approve(address,uint256)', [ - _spender.toLowerCase(), - _value, - ]); + const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -164,7 +160,13 @@ export class ZRXTokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -275,13 +277,10 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ZRXTokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _value, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -291,12 +290,18 @@ export class ZRXTokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transferFrom.estimateGasAsync.bind(self, _from.toLowerCase(), _to.toLowerCase(), _value), + self.transferFrom.estimateGasAsync.bind(self, _from, _to, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -336,13 +341,10 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from); - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ZRXTokenContract; const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [ - _from.toLowerCase(), - _to.toLowerCase(), + _from, + _to, _value, ]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -356,7 +358,13 @@ export class ZRXTokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; }, @@ -563,10 +571,8 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ZRXTokenContract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to.toLowerCase(), _value]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -574,12 +580,18 @@ export class ZRXTokenContract extends BaseContract { data: encodedData, }, self._web3Wrapper.getContractDefaults(), - self.transfer.estimateGasAsync.bind(self, _to.toLowerCase(), _value), + self.transfer.estimateGasAsync.bind(self, _to, _value), ); if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults); return txHash; }, @@ -607,10 +619,8 @@ export class ZRXTokenContract extends BaseContract { ); }, async estimateGasAsync(_to: string, _value: BigNumber, txData?: Partial | undefined): Promise { - assert.isString('_to', _to); - assert.isBigNumber('_value', _value); const self = (this as any) as ZRXTokenContract; - const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to.toLowerCase(), _value]); + const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value]); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, @@ -622,7 +632,13 @@ export class ZRXTokenContract extends BaseContract { if (txDataWithDefaults.from !== undefined) { txDataWithDefaults.from = txDataWithDefaults.from.toLowerCase(); } - + try { + return await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); + } catch (err) { + // Try to decode ganache transaction revert Errors. + BaseContract._throwIfThrownErrorIsRevertError(err); + throw err; + } const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); return gas; },