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 2d995a1666..6737621b0f 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 @@ -156,10 +156,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('removeOwner(address)', [owner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -201,10 +202,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('removeOwner(address)', [owner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -266,10 +268,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('revokeConfirmation(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -311,10 +314,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('revokeConfirmation(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -412,7 +416,8 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isBigNumber('index_0', index_0);assert.isString('index_1', index_1); + assert.isBigNumber('index_0', index_0); + assert.isString('index_1', index_1); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -452,10 +457,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeRemoveAuthorizedAddressAtIndex(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -497,10 +503,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeRemoveAuthorizedAddressAtIndex(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -559,7 +566,6 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -596,7 +602,8 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isBoolean('pending', pending);assert.isBoolean('executed', executed); + assert.isBoolean('pending', pending); + assert.isBoolean('executed', executed); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -633,15 +640,17 @@ export class AssetProxyOwnerContract extends BaseContract { isRegistered: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('assetProxyContract', assetProxyContract);assert.isBoolean('isRegistered', isRegistered); + assert.isString('assetProxyContract', assetProxyContract); + assert.isBoolean('isRegistered', isRegistered); const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address,bool)', [assetProxyContract, isRegistered ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -661,7 +670,8 @@ export class AssetProxyOwnerContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('assetProxyContract', assetProxyContract);assert.isBoolean('isRegistered', isRegistered); + assert.isString('assetProxyContract', assetProxyContract); + assert.isBoolean('isRegistered', isRegistered); const self = this as any as AssetProxyOwnerContract; const txHashPromise = self.registerAssetProxy.sendTransactionAsync(assetProxyContract, isRegistered @@ -683,15 +693,17 @@ export class AssetProxyOwnerContract extends BaseContract { isRegistered: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('assetProxyContract', assetProxyContract);assert.isBoolean('isRegistered', isRegistered); + assert.isString('assetProxyContract', assetProxyContract); + assert.isBoolean('isRegistered', isRegistered); const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address,bool)', [assetProxyContract, isRegistered ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -703,7 +715,8 @@ export class AssetProxyOwnerContract extends BaseContract { assetProxyContract: string, isRegistered: boolean, ): string { - assert.isString('assetProxyContract', assetProxyContract);assert.isBoolean('isRegistered', isRegistered); + assert.isString('assetProxyContract', assetProxyContract); + assert.isBoolean('isRegistered', isRegistered); const self = this as any as AssetProxyOwnerContract; const abiEncodedTransactionData = self._strictEncodeArguments('registerAssetProxy(address,bool)', [assetProxyContract, isRegistered @@ -717,7 +730,8 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('assetProxyContract', assetProxyContract);assert.isBoolean('isRegistered', isRegistered); + assert.isString('assetProxyContract', assetProxyContract); + assert.isBoolean('isRegistered', isRegistered); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -757,10 +771,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('addOwner(address)', [owner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -802,10 +817,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('addOwner(address)', [owner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -904,10 +920,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeTimeLock(uint256)', [_secondsTimeLocked ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -949,10 +966,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeTimeLock(uint256)', [_secondsTimeLocked ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1122,7 +1140,6 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1161,7 +1178,10 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isBigNumber('from', from);assert.isBigNumber('to', to);assert.isBoolean('pending', pending);assert.isBoolean('executed', executed); + assert.isBigNumber('from', from); + assert.isBigNumber('to', to); + assert.isBoolean('pending', pending); + assert.isBoolean('executed', executed); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1237,7 +1257,6 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1275,10 +1294,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeRequirement(uint256)', [_required ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1320,10 +1340,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('changeRequirement(uint256)', [_required ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1385,10 +1406,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('confirmTransaction(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1430,10 +1452,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('confirmTransaction(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1493,16 +1516,19 @@ export class AssetProxyOwnerContract extends BaseContract { data: string, txData?: Partial | undefined, ): Promise { - assert.isString('destination', destination);assert.isBigNumber('value', value);assert.isString('data', data); + 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, value, data ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1524,7 +1550,9 @@ export class AssetProxyOwnerContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('destination', destination);assert.isBigNumber('value', value);assert.isString('data', data); + assert.isString('destination', destination); + assert.isBigNumber('value', value); + assert.isString('data', data); const self = this as any as AssetProxyOwnerContract; const txHashPromise = self.submitTransaction.sendTransactionAsync(destination, value, @@ -1548,16 +1576,19 @@ export class AssetProxyOwnerContract extends BaseContract { data: string, txData?: Partial | undefined, ): Promise { - assert.isString('destination', destination);assert.isBigNumber('value', value);assert.isString('data', data); + 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, value, data ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1570,7 +1601,9 @@ export class AssetProxyOwnerContract extends BaseContract { value: BigNumber, data: string, ): string { - assert.isString('destination', destination);assert.isBigNumber('value', value);assert.isString('data', data); + assert.isString('destination', destination); + assert.isBigNumber('value', value); + assert.isString('data', data); const self = this as any as AssetProxyOwnerContract; const abiEncodedTransactionData = self._strictEncodeArguments('submitTransaction(address,uint256,bytes)', [destination, value, @@ -1586,7 +1619,9 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('destination', destination);assert.isBigNumber('value', value);assert.isString('data', data); + assert.isString('destination', destination); + assert.isBigNumber('value', value); + assert.isString('data', data); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1661,7 +1696,6 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1696,7 +1730,6 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1731,15 +1764,17 @@ export class AssetProxyOwnerContract extends BaseContract { newOwner: string, txData?: Partial | undefined, ): Promise { - assert.isString('owner', owner);assert.isString('newOwner', newOwner); + assert.isString('owner', owner); + assert.isString('newOwner', newOwner); const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('replaceOwner(address,address)', [owner, newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1759,7 +1794,8 @@ export class AssetProxyOwnerContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('owner', owner);assert.isString('newOwner', newOwner); + assert.isString('owner', owner); + assert.isString('newOwner', newOwner); const self = this as any as AssetProxyOwnerContract; const txHashPromise = self.replaceOwner.sendTransactionAsync(owner, newOwner @@ -1781,15 +1817,17 @@ export class AssetProxyOwnerContract extends BaseContract { newOwner: string, txData?: Partial | undefined, ): Promise { - assert.isString('owner', owner);assert.isString('newOwner', newOwner); + assert.isString('owner', owner); + assert.isString('newOwner', newOwner); const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('replaceOwner(address,address)', [owner, newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1801,7 +1839,8 @@ export class AssetProxyOwnerContract extends BaseContract { owner: string, newOwner: string, ): string { - assert.isString('owner', owner);assert.isString('newOwner', newOwner); + assert.isString('owner', owner); + assert.isString('newOwner', newOwner); const self = this as any as AssetProxyOwnerContract; const abiEncodedTransactionData = self._strictEncodeArguments('replaceOwner(address,address)', [owner, newOwner @@ -1815,7 +1854,8 @@ export class AssetProxyOwnerContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('owner', owner);assert.isString('newOwner', newOwner); + assert.isString('owner', owner); + assert.isString('newOwner', newOwner); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1855,10 +1895,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeTransaction(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1900,10 +1941,11 @@ export class AssetProxyOwnerContract extends BaseContract { const self = this as any as AssetProxyOwnerContract; const encodedData = self._strictEncodeArguments('executeTransaction(uint256)', [transactionId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1992,7 +2034,7 @@ _secondsTimeLocked _required: BigNumber, _secondsTimeLocked: BigNumber, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts index e5055ed90f..aba9856c7f 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts @@ -36,7 +36,8 @@ export class CoordinatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('hash', hash);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -150,7 +151,11 @@ 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); + + 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, @@ -158,10 +163,11 @@ export class CoordinatorContract extends BaseContract { approvalExpirationTimeSeconds, approvalSignatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -187,7 +193,11 @@ export class CoordinatorContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('txOrigin', txOrigin);assert.isString('transactionSignature', transactionSignature);assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds);assert.isArray('approvalSignatures', approvalSignatures); + + assert.isString('txOrigin', txOrigin); + assert.isString('transactionSignature', transactionSignature); + assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds); + assert.isArray('approvalSignatures', approvalSignatures); const self = this as any as CoordinatorContract; const txHashPromise = self.executeTransaction.sendTransactionAsync(transaction, txOrigin, @@ -215,7 +225,11 @@ 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); + + 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, @@ -223,10 +237,11 @@ export class CoordinatorContract extends BaseContract { approvalExpirationTimeSeconds, approvalSignatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -241,7 +256,11 @@ export class CoordinatorContract extends BaseContract { approvalExpirationTimeSeconds: BigNumber[], approvalSignatures: string[], ): string { - assert.isString('txOrigin', txOrigin);assert.isString('transactionSignature', transactionSignature);assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds);assert.isArray('approvalSignatures', approvalSignatures); + + assert.isString('txOrigin', txOrigin); + assert.isString('transactionSignature', transactionSignature); + assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds); + assert.isArray('approvalSignatures', approvalSignatures); const self = this as any as CoordinatorContract; const abiEncodedTransactionData = self._strictEncodeArguments('executeTransaction((uint256,address,bytes),address,bytes,uint256[],bytes[])', [transaction, txOrigin, @@ -261,7 +280,11 @@ export class CoordinatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('txOrigin', txOrigin);assert.isString('transactionSignature', transactionSignature);assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds);assert.isArray('approvalSignatures', approvalSignatures); + + assert.isString('txOrigin', txOrigin); + assert.isString('transactionSignature', transactionSignature); + assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds); + assert.isArray('approvalSignatures', approvalSignatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -301,7 +324,6 @@ export class CoordinatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -341,7 +363,11 @@ export class CoordinatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('txOrigin', txOrigin);assert.isString('transactionSignature', transactionSignature);assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds);assert.isArray('approvalSignatures', approvalSignatures); + + assert.isString('txOrigin', txOrigin); + assert.isString('transactionSignature', transactionSignature); + assert.isArray('approvalExpirationTimeSeconds', approvalExpirationTimeSeconds); + assert.isArray('approvalSignatures', approvalSignatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -418,7 +444,6 @@ export class CoordinatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -474,7 +499,7 @@ export class CoordinatorContract extends BaseContract { txDefaults: Partial, _exchange: string, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 d8e68f6ec1..509366ddc6 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts @@ -49,10 +49,11 @@ export class CoordinatorRegistryContract extends BaseContract { const self = this as any as CoordinatorRegistryContract; const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -94,10 +95,11 @@ export class CoordinatorRegistryContract extends BaseContract { const self = this as any as CoordinatorRegistryContract; const encodedData = self._strictEncodeArguments('setCoordinatorEndpoint(string)', [coordinatorEndpoint ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), 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 c7a1e6624b..54d6b2f9ad 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 @@ -55,7 +55,6 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -90,15 +89,17 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -118,7 +119,8 @@ export class DummyERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const txHashPromise = self.approve.sendTransactionAsync(_spender, _value @@ -140,15 +142,17 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -160,7 +164,8 @@ export class DummyERC20TokenContract extends BaseContract { _spender: string, _value: BigNumber, ): string { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value @@ -174,7 +179,8 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -211,7 +217,6 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -247,16 +252,19 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + 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, _to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -278,7 +286,9 @@ export class DummyERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const txHashPromise = self.transferFrom.sendTransactionAsync(_from, _to, @@ -302,16 +312,19 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + 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, _to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -324,7 +337,9 @@ export class DummyERC20TokenContract extends BaseContract { _to: string, _value: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from, _to, @@ -340,7 +355,9 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -378,7 +395,6 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -450,7 +466,6 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -485,7 +500,6 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -523,10 +537,11 @@ export class DummyERC20TokenContract extends BaseContract { const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('mint(uint256)', [_value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -568,10 +583,11 @@ export class DummyERC20TokenContract extends BaseContract { const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('mint(uint256)', [_value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -630,15 +646,17 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -658,7 +676,8 @@ export class DummyERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const txHashPromise = self.transfer.sendTransactionAsync(_to, _value @@ -680,15 +699,17 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -700,7 +721,8 @@ export class DummyERC20TokenContract extends BaseContract { _to: string, _value: BigNumber, ): string { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value @@ -714,7 +736,8 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -753,7 +776,8 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_owner', _owner);assert.isString('_spender', _spender); + assert.isString('_owner', _owner); + assert.isString('_spender', _spender); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -790,15 +814,17 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_target', _target);assert.isBigNumber('_value', _value); + assert.isString('_target', _target); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -818,7 +844,8 @@ export class DummyERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_target', _target);assert.isBigNumber('_value', _value); + assert.isString('_target', _target); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const txHashPromise = self.setBalance.sendTransactionAsync(_target, _value @@ -840,15 +867,17 @@ export class DummyERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_target', _target);assert.isBigNumber('_value', _value); + assert.isString('_target', _target); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -860,7 +889,8 @@ export class DummyERC20TokenContract extends BaseContract { _target: string, _value: BigNumber, ): string { - assert.isString('_target', _target);assert.isBigNumber('_value', _value); + assert.isString('_target', _target); + assert.isBigNumber('_value', _value); const self = this as any as DummyERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('setBalance(address,uint256)', [_target, _value @@ -874,7 +904,8 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_target', _target);assert.isBigNumber('_value', _value); + assert.isString('_target', _target); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -914,10 +945,11 @@ export class DummyERC20TokenContract extends BaseContract { const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -959,10 +991,11 @@ export class DummyERC20TokenContract extends BaseContract { const self = this as any as DummyERC20TokenContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1021,7 +1054,6 @@ export class DummyERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1086,7 +1118,7 @@ _totalSupply _decimals: BigNumber, _totalSupply: BigNumber, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 2af2b8facb..4f089aee0f 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 @@ -63,7 +63,6 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -135,15 +134,17 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -163,7 +164,8 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.approve.sendTransactionAsync(_approved, _tokenId @@ -185,15 +187,17 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -205,7 +209,8 @@ export class DummyERC721TokenContract extends BaseContract { _approved: string, _tokenId: BigNumber, ): string { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId @@ -219,7 +224,8 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -257,16 +263,19 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -288,7 +297,9 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.transferFrom.sendTransactionAsync(_from, _to, @@ -312,16 +323,19 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -334,7 +348,9 @@ export class DummyERC721TokenContract extends BaseContract { _to: string, _tokenId: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from, _to, @@ -350,7 +366,9 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -388,15 +406,17 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -416,7 +436,8 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.mint.sendTransactionAsync(_to, _tokenId @@ -438,15 +459,17 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -458,7 +481,8 @@ export class DummyERC721TokenContract extends BaseContract { _to: string, _tokenId: BigNumber, ): string { - assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('mint(address,uint256)', [_to, _tokenId @@ -472,7 +496,8 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -510,16 +535,19 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -541,7 +569,9 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.safeTransferFrom1.sendTransactionAsync(_from, _to, @@ -565,16 +595,19 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -587,7 +620,9 @@ export class DummyERC721TokenContract extends BaseContract { _to: string, _tokenId: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from, _to, @@ -603,7 +638,9 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -715,7 +752,6 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -750,7 +786,6 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -785,15 +820,17 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_owner', _owner);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_owner', _owner); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -813,7 +850,8 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_owner', _owner);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_owner', _owner); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.burn.sendTransactionAsync(_owner, _tokenId @@ -835,15 +873,17 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_owner', _owner);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_owner', _owner); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -855,7 +895,8 @@ export class DummyERC721TokenContract extends BaseContract { _owner: string, _tokenId: BigNumber, ): string { - assert.isString('_owner', _owner);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_owner', _owner); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('burn(address,uint256)', [_owner, _tokenId @@ -869,7 +910,8 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_owner', _owner);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_owner', _owner); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -906,15 +948,17 @@ export class DummyERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -934,7 +978,8 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.setApprovalForAll.sendTransactionAsync(_operator, _approved @@ -956,15 +1001,17 @@ export class DummyERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -976,7 +1023,8 @@ export class DummyERC721TokenContract extends BaseContract { _operator: string, _approved: boolean, ): string { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved @@ -990,7 +1038,8 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1029,17 +1078,21 @@ 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); + 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, _to, _tokenId, _data ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1063,7 +1116,10 @@ export class DummyERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId);assert.isString('_data', _data); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_data', _data); const self = this as any as DummyERC721TokenContract; const txHashPromise = self.safeTransferFrom2.sendTransactionAsync(_from, _to, @@ -1089,17 +1145,21 @@ 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); + 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, _to, _tokenId, _data ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1113,7 +1173,10 @@ export class DummyERC721TokenContract extends BaseContract { _tokenId: BigNumber, _data: string, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId);assert.isString('_data', _data); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_data', _data); const self = this as any as DummyERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from, _to, @@ -1131,7 +1194,10 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId);assert.isString('_data', _data); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_data', _data); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1172,7 +1238,8 @@ export class DummyERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_owner', _owner);assert.isString('_operator', _operator); + assert.isString('_owner', _owner); + assert.isString('_operator', _operator); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1212,10 +1279,11 @@ export class DummyERC721TokenContract extends BaseContract { const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1257,10 +1325,11 @@ export class DummyERC721TokenContract extends BaseContract { const self = this as any as DummyERC721TokenContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1343,7 +1412,7 @@ _symbol _name: string, _symbol: string, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 c522f1e58d..8b200502db 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts @@ -37,10 +37,11 @@ export class DutchAuctionContract extends BaseContract { const self = this as any as DutchAuctionContract; const encodedData = self._strictEncodeArguments('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -82,10 +83,11 @@ export class DutchAuctionContract extends BaseContract { const self = this as any as DutchAuctionContract; const encodedData = self._strictEncodeArguments('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -146,17 +148,21 @@ export class DutchAuctionContract extends BaseContract { sellSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('buySignature', buySignature);assert.isString('sellSignature', sellSignature); + + + 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)', [buyOrder, sellOrder, buySignature, sellSignature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -180,7 +186,10 @@ export class DutchAuctionContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('buySignature', buySignature);assert.isString('sellSignature', sellSignature); + + + assert.isString('buySignature', buySignature); + assert.isString('sellSignature', sellSignature); const self = this as any as DutchAuctionContract; const txHashPromise = self.matchOrders.sendTransactionAsync(buyOrder, sellOrder, @@ -206,17 +215,21 @@ export class DutchAuctionContract extends BaseContract { sellSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('buySignature', buySignature);assert.isString('sellSignature', sellSignature); + + + 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)', [buyOrder, sellOrder, buySignature, sellSignature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -230,7 +243,10 @@ export class DutchAuctionContract extends BaseContract { buySignature: string, sellSignature: string, ): string { - assert.isString('buySignature', buySignature);assert.isString('sellSignature', sellSignature); + + + assert.isString('buySignature', buySignature); + assert.isString('sellSignature', sellSignature); const self = this as any as DutchAuctionContract; const abiEncodedTransactionData = 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)', [buyOrder, sellOrder, @@ -248,7 +264,10 @@ export class DutchAuctionContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{left: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};right: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};leftMakerAssetSpreadAmount: BigNumber} > { - assert.isString('buySignature', buySignature);assert.isString('sellSignature', sellSignature); + + + assert.isString('buySignature', buySignature); + assert.isString('sellSignature', sellSignature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -308,7 +327,7 @@ export class DutchAuctionContract extends BaseContract { txDefaults: Partial, _exchange: string, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 02a17adad3..b3fb513be6 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts @@ -56,10 +56,11 @@ export class ERC20ProxyContract extends BaseContract { const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -101,10 +102,11 @@ export class ERC20ProxyContract extends BaseContract { const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -203,10 +205,11 @@ export class ERC20ProxyContract extends BaseContract { const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -248,10 +251,11 @@ export class ERC20ProxyContract extends BaseContract { const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -310,7 +314,6 @@ export class ERC20ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -345,15 +348,17 @@ export class ERC20ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -373,7 +378,8 @@ export class ERC20ProxyContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC20ProxyContract; const txHashPromise = self.removeAuthorizedAddressAtIndex.sendTransactionAsync(target, index @@ -395,15 +401,17 @@ export class ERC20ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -415,7 +423,8 @@ export class ERC20ProxyContract extends BaseContract { target: string, index: BigNumber, ): string { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC20ProxyContract; const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index @@ -429,7 +438,8 @@ export class ERC20ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -466,7 +476,6 @@ export class ERC20ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -538,7 +547,6 @@ export class ERC20ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -576,10 +584,11 @@ export class ERC20ProxyContract extends BaseContract { const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -621,10 +630,11 @@ export class ERC20ProxyContract extends BaseContract { const self = this as any as ERC20ProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -701,7 +711,7 @@ export class ERC20ProxyContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 d46dbd23f1..1ff75c446d 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts @@ -55,15 +55,17 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -83,7 +85,8 @@ export class ERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const txHashPromise = self.approve.sendTransactionAsync(_spender, _value @@ -105,15 +108,17 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -125,7 +130,8 @@ export class ERC20TokenContract extends BaseContract { _spender: string, _value: BigNumber, ): string { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value @@ -139,7 +145,8 @@ export class ERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -176,7 +183,6 @@ export class ERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -212,16 +218,19 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + 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, _to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -243,7 +252,9 @@ export class ERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const txHashPromise = self.transferFrom.sendTransactionAsync(_from, _to, @@ -267,16 +278,19 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + 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, _to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -289,7 +303,9 @@ export class ERC20TokenContract extends BaseContract { _to: string, _value: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from, _to, @@ -305,7 +321,9 @@ export class ERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -380,15 +398,17 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -408,7 +428,8 @@ export class ERC20TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const txHashPromise = self.transfer.sendTransactionAsync(_to, _value @@ -430,15 +451,17 @@ export class ERC20TokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -450,7 +473,8 @@ export class ERC20TokenContract extends BaseContract { _to: string, _value: BigNumber, ): string { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ERC20TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value @@ -464,7 +488,8 @@ export class ERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -503,7 +528,8 @@ export class ERC20TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_owner', _owner);assert.isString('_spender', _spender); + assert.isString('_owner', _owner); + assert.isString('_spender', _spender); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -558,7 +584,7 @@ export class ERC20TokenContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 9308a1c779..1b4d87b8cf 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts @@ -56,10 +56,11 @@ export class ERC721ProxyContract extends BaseContract { const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -101,10 +102,11 @@ export class ERC721ProxyContract extends BaseContract { const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -203,10 +205,11 @@ export class ERC721ProxyContract extends BaseContract { const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -248,10 +251,11 @@ export class ERC721ProxyContract extends BaseContract { const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -310,7 +314,6 @@ export class ERC721ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -345,15 +348,17 @@ export class ERC721ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -373,7 +378,8 @@ export class ERC721ProxyContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC721ProxyContract; const txHashPromise = self.removeAuthorizedAddressAtIndex.sendTransactionAsync(target, index @@ -395,15 +401,17 @@ export class ERC721ProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -415,7 +423,8 @@ export class ERC721ProxyContract extends BaseContract { target: string, index: BigNumber, ): string { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as ERC721ProxyContract; const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index @@ -429,7 +438,8 @@ export class ERC721ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -466,7 +476,6 @@ export class ERC721ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -538,7 +547,6 @@ export class ERC721ProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -576,10 +584,11 @@ export class ERC721ProxyContract extends BaseContract { const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -621,10 +630,11 @@ export class ERC721ProxyContract extends BaseContract { const self = this as any as ERC721ProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -701,7 +711,7 @@ export class ERC721ProxyContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 72a7fad7ef..2a11c5f2ac 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts @@ -100,15 +100,17 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -128,7 +130,8 @@ export class ERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const txHashPromise = self.approve.sendTransactionAsync(_approved, _tokenId @@ -150,15 +153,17 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -170,7 +175,8 @@ export class ERC721TokenContract extends BaseContract { _approved: string, _tokenId: BigNumber, ): string { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_approved, _tokenId @@ -184,7 +190,8 @@ export class ERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_approved', _approved);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_approved', _approved); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -222,16 +229,19 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -253,7 +263,9 @@ export class ERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const txHashPromise = self.transferFrom.sendTransactionAsync(_from, _to, @@ -277,16 +289,19 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -299,7 +314,9 @@ export class ERC721TokenContract extends BaseContract { _to: string, _tokenId: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from, _to, @@ -315,7 +332,9 @@ export class ERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -354,16 +373,19 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -385,7 +407,9 @@ export class ERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const txHashPromise = self.safeTransferFrom1.sendTransactionAsync(_from, _to, @@ -409,16 +433,19 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + 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, _to, _tokenId ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -431,7 +458,9 @@ export class ERC721TokenContract extends BaseContract { _to: string, _tokenId: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); const self = this as any as ERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from, _to, @@ -447,7 +476,9 @@ export class ERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -559,15 +590,17 @@ export class ERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as ERC721TokenContract; const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -587,7 +620,8 @@ export class ERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as ERC721TokenContract; const txHashPromise = self.setApprovalForAll.sendTransactionAsync(_operator, _approved @@ -609,15 +643,17 @@ export class ERC721TokenContract extends BaseContract { _approved: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as ERC721TokenContract; const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -629,7 +665,8 @@ export class ERC721TokenContract extends BaseContract { _operator: string, _approved: boolean, ): string { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); const self = this as any as ERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator, _approved @@ -643,7 +680,8 @@ export class ERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_operator', _operator);assert.isBoolean('_approved', _approved); + assert.isString('_operator', _operator); + assert.isBoolean('_approved', _approved); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -682,17 +720,21 @@ 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); + 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, _to, _tokenId, _data ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -716,7 +758,10 @@ export class ERC721TokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId);assert.isString('_data', _data); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_data', _data); const self = this as any as ERC721TokenContract; const txHashPromise = self.safeTransferFrom2.sendTransactionAsync(_from, _to, @@ -742,17 +787,21 @@ 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); + 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, _to, _tokenId, _data ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -766,7 +815,10 @@ export class ERC721TokenContract extends BaseContract { _tokenId: BigNumber, _data: string, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId);assert.isString('_data', _data); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_data', _data); const self = this as any as ERC721TokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from, _to, @@ -784,7 +836,10 @@ export class ERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_tokenId', _tokenId);assert.isString('_data', _data); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_tokenId', _tokenId); + assert.isString('_data', _data); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -825,7 +880,8 @@ export class ERC721TokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_owner', _owner);assert.isString('_operator', _operator); + assert.isString('_owner', _owner); + assert.isString('_operator', _operator); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -880,7 +936,7 @@ export class ERC721TokenContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts index 534d79d2a3..1537f2f10c 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts @@ -127,16 +127,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmounts, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -158,7 +161,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.batchFillOrders.sendTransactionAsync(orders, takerAssetFillAmounts, @@ -182,16 +187,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmounts, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -204,7 +212,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmounts: BigNumber[], signatures: string[], ): string { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('batchFillOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', [orders, takerAssetFillAmounts, @@ -220,7 +230,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -296,16 +308,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + 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, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -327,7 +342,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signerAddress', signerAddress); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const txHashPromise = self.preSign.sendTransactionAsync(hash, signerAddress, @@ -351,16 +368,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + 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, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -373,7 +393,9 @@ export class ExchangeContract extends BaseContract { signerAddress: string, signature: string, ): string { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signerAddress', signerAddress); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('preSign(bytes32,address,bytes)', [hash, signerAddress, @@ -389,7 +411,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signerAddress', signerAddress); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -429,17 +453,21 @@ export class ExchangeContract extends BaseContract { rightSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('leftSignature', leftSignature);assert.isString('rightSignature', rightSignature); + + + 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)', [leftOrder, rightOrder, leftSignature, rightSignature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -463,7 +491,10 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('leftSignature', leftSignature);assert.isString('rightSignature', rightSignature); + + + assert.isString('leftSignature', leftSignature); + assert.isString('rightSignature', rightSignature); const self = this as any as ExchangeContract; const txHashPromise = self.matchOrders.sendTransactionAsync(leftOrder, rightOrder, @@ -489,17 +520,21 @@ export class ExchangeContract extends BaseContract { rightSignature: string, txData?: Partial | undefined, ): Promise { - assert.isString('leftSignature', leftSignature);assert.isString('rightSignature', rightSignature); + + + 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)', [leftOrder, rightOrder, leftSignature, rightSignature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -513,7 +548,10 @@ export class ExchangeContract extends BaseContract { leftSignature: string, rightSignature: string, ): string { - assert.isString('leftSignature', leftSignature);assert.isString('rightSignature', rightSignature); + + + assert.isString('leftSignature', leftSignature); + assert.isString('rightSignature', rightSignature); const self = this as any as ExchangeContract; const abiEncodedTransactionData = 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)', [leftOrder, rightOrder, @@ -531,7 +569,10 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{left: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};right: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};leftMakerAssetSpreadAmount: BigNumber} > { - assert.isString('leftSignature', leftSignature);assert.isString('rightSignature', rightSignature); + + + assert.isString('leftSignature', leftSignature); + assert.isString('rightSignature', rightSignature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -571,16 +612,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + 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)', [order, takerAssetFillAmount, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -602,7 +646,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const txHashPromise = self.fillOrderNoThrow.sendTransactionAsync(order, takerAssetFillAmount, @@ -626,16 +672,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + 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)', [order, takerAssetFillAmount, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -648,7 +697,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmount: BigNumber, signature: string, ): string { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('fillOrderNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', [order, takerAssetFillAmount, @@ -664,7 +715,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -742,10 +795,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('batchCancelOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[])', [orders ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -787,10 +841,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('batchCancelOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[])', [orders ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -850,16 +905,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmounts, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -881,7 +939,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.batchFillOrKillOrders.sendTransactionAsync(orders, takerAssetFillAmounts, @@ -905,16 +965,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmounts, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -927,7 +990,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmounts: BigNumber[], signatures: string[], ): string { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('batchFillOrKillOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', [orders, takerAssetFillAmounts, @@ -943,7 +1008,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -984,10 +1051,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('cancelOrdersUpTo(uint256)', [targetOrderEpoch ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1029,10 +1097,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('cancelOrdersUpTo(uint256)', [targetOrderEpoch ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1092,16 +1161,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmounts, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1123,7 +1195,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.batchFillOrdersNoThrow.sendTransactionAsync(orders, takerAssetFillAmounts, @@ -1147,16 +1221,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmounts, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1169,7 +1246,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmounts: BigNumber[], signatures: string[], ): string { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('batchFillOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256[],bytes[])', [orders, takerAssetFillAmounts, @@ -1185,7 +1264,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isArray('takerAssetFillAmounts', takerAssetFillAmounts); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1298,16 +1379,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + 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)', [order, takerAssetFillAmount, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1329,7 +1413,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const txHashPromise = self.fillOrKillOrder.sendTransactionAsync(order, takerAssetFillAmount, @@ -1353,16 +1439,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + 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)', [order, takerAssetFillAmount, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1375,7 +1464,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmount: BigNumber, signature: string, ): string { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('fillOrKillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', [order, takerAssetFillAmount, @@ -1391,7 +1482,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1429,15 +1522,17 @@ export class ExchangeContract extends BaseContract { approval: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('validatorAddress', validatorAddress);assert.isBoolean('approval', approval); + assert.isString('validatorAddress', validatorAddress); + assert.isBoolean('approval', approval); const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('setSignatureValidatorApproval(address,bool)', [validatorAddress, approval ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1457,7 +1552,8 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('validatorAddress', validatorAddress);assert.isBoolean('approval', approval); + assert.isString('validatorAddress', validatorAddress); + assert.isBoolean('approval', approval); const self = this as any as ExchangeContract; const txHashPromise = self.setSignatureValidatorApproval.sendTransactionAsync(validatorAddress, approval @@ -1479,15 +1575,17 @@ export class ExchangeContract extends BaseContract { approval: boolean, txData?: Partial | undefined, ): Promise { - assert.isString('validatorAddress', validatorAddress);assert.isBoolean('approval', approval); + assert.isString('validatorAddress', validatorAddress); + assert.isBoolean('approval', approval); const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('setSignatureValidatorApproval(address,bool)', [validatorAddress, approval ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1499,7 +1597,8 @@ export class ExchangeContract extends BaseContract { validatorAddress: string, approval: boolean, ): string { - assert.isString('validatorAddress', validatorAddress);assert.isBoolean('approval', approval); + assert.isString('validatorAddress', validatorAddress); + assert.isBoolean('approval', approval); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('setSignatureValidatorApproval(address,bool)', [validatorAddress, approval @@ -1513,7 +1612,8 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('validatorAddress', validatorAddress);assert.isBoolean('approval', approval); + assert.isString('validatorAddress', validatorAddress); + assert.isBoolean('approval', approval); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1552,7 +1652,8 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('index_0', index_0);assert.isString('index_1', index_1); + assert.isString('index_0', index_0); + assert.isString('index_1', index_1); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1590,16 +1691,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1621,7 +1725,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.marketSellOrders.sendTransactionAsync(orders, takerAssetFillAmount, @@ -1645,16 +1751,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1667,7 +1776,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmount: BigNumber, signatures: string[], ): string { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('marketSellOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', [orders, takerAssetFillAmount, @@ -1683,7 +1794,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1760,7 +1873,8 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('index_0', index_0);assert.isString('index_1', index_1); + assert.isString('index_0', index_0); + assert.isString('index_1', index_1); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1797,7 +1911,6 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1835,7 +1948,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signerAddress', signerAddress); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -1874,16 +1989,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, makerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1905,7 +2023,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.marketBuyOrdersNoThrow.sendTransactionAsync(orders, makerAssetFillAmount, @@ -1929,16 +2049,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, makerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -1951,7 +2074,9 @@ export class ExchangeContract extends BaseContract { makerAssetFillAmount: BigNumber, signatures: string[], ): string { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('marketBuyOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', [orders, makerAssetFillAmount, @@ -1967,7 +2092,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2006,16 +2133,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + 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)', [order, takerAssetFillAmount, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2037,7 +2167,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const txHashPromise = self.fillOrder.sendTransactionAsync(order, takerAssetFillAmount, @@ -2061,16 +2193,19 @@ export class ExchangeContract extends BaseContract { signature: string, txData?: Partial | undefined, ): Promise { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + 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)', [order, takerAssetFillAmount, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2083,7 +2218,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmount: BigNumber, signature: string, ): string { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)', [order, takerAssetFillAmount, @@ -2099,7 +2236,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isString('signature', signature); + + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2139,17 +2278,21 @@ 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); + 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, data, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2173,7 +2316,10 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isBigNumber('salt', salt);assert.isString('signerAddress', signerAddress);assert.isString('data', data);assert.isString('signature', signature); + assert.isBigNumber('salt', salt); + assert.isString('signerAddress', signerAddress); + assert.isString('data', data); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const txHashPromise = self.executeTransaction.sendTransactionAsync(salt, signerAddress, @@ -2199,17 +2345,21 @@ 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); + 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, data, signature ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2223,7 +2373,10 @@ export class ExchangeContract extends BaseContract { data: string, signature: string, ): string { - assert.isBigNumber('salt', salt);assert.isString('signerAddress', signerAddress);assert.isString('data', data);assert.isString('signature', signature); + assert.isBigNumber('salt', salt); + assert.isString('signerAddress', signerAddress); + assert.isString('data', data); + assert.isString('signature', signature); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('executeTransaction(uint256,address,bytes,bytes)', [salt, signerAddress, @@ -2241,7 +2394,10 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isBigNumber('salt', salt);assert.isString('signerAddress', signerAddress);assert.isString('data', data);assert.isString('signature', signature); + assert.isBigNumber('salt', salt); + assert.isString('signerAddress', signerAddress); + assert.isString('data', data); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2283,10 +2439,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2328,10 +2485,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2430,10 +2588,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('cancelOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2475,10 +2634,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('cancelOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2539,7 +2699,8 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('index_0', index_0);assert.isString('index_1', index_1); + assert.isString('index_0', index_0); + assert.isString('index_1', index_1); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2576,7 +2737,6 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2612,16 +2772,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2643,7 +2806,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.marketSellOrdersNoThrow.sendTransactionAsync(orders, takerAssetFillAmount, @@ -2667,16 +2832,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, takerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2689,7 +2857,9 @@ export class ExchangeContract extends BaseContract { takerAssetFillAmount: BigNumber, signatures: string[], ): string { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('marketSellOrdersNoThrow((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', [orders, takerAssetFillAmount, @@ -2705,7 +2875,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('takerAssetFillAmount', takerAssetFillAmount); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2743,7 +2915,6 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2779,16 +2950,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, makerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2810,7 +2984,9 @@ export class ExchangeContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const txHashPromise = self.marketBuyOrders.sendTransactionAsync(orders, makerAssetFillAmount, @@ -2834,16 +3010,19 @@ export class ExchangeContract extends BaseContract { signatures: string[], txData?: Partial | undefined, ): Promise { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + 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[])', [orders, makerAssetFillAmount, signatures ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2856,7 +3035,9 @@ export class ExchangeContract extends BaseContract { makerAssetFillAmount: BigNumber, signatures: string[], ): string { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); + assert.isArray('signatures', signatures); const self = this as any as ExchangeContract; const abiEncodedTransactionData = self._strictEncodeArguments('marketBuyOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[])', [orders, makerAssetFillAmount, @@ -2872,7 +3053,9 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber} > { - assert.isArray('orders', orders);assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount);assert.isArray('signatures', signatures); + assert.isArray('orders', orders); + assert.isBigNumber('makerAssetFillAmount', makerAssetFillAmount); + assert.isArray('signatures', signatures); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2910,7 +3093,6 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -2948,10 +3130,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -2993,10 +3176,11 @@ export class ExchangeContract extends BaseContract { const self = this as any as ExchangeContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -3055,7 +3239,6 @@ export class ExchangeContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -3111,7 +3294,7 @@ export class ExchangeContract extends BaseContract { txDefaults: Partial, _zrxAssetData: string, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts index 04e5f9815e..24ac5c4e9f 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts @@ -39,7 +39,13 @@ 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); + 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, @@ -49,10 +55,11 @@ export class ForwarderContract extends BaseContract { feePercentage, feeRecipient ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -82,7 +89,13 @@ export class ForwarderContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - 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); + 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 txHashPromise = self.marketBuyOrdersWithEth.sendTransactionAsync(orders, makerAssetFillAmount, @@ -114,7 +127,13 @@ 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); + 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, @@ -124,10 +143,11 @@ export class ForwarderContract extends BaseContract { feePercentage, feeRecipient ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -144,7 +164,13 @@ export class ForwarderContract extends BaseContract { feePercentage: BigNumber, feeRecipient: string, ): string { - 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); + 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 abiEncodedTransactionData = 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, @@ -168,7 +194,13 @@ export class ForwarderContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}, {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}] > { - 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); + 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); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -210,15 +242,17 @@ export class ForwarderContract extends BaseContract { amount: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('assetData', assetData);assert.isBigNumber('amount', amount); + 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 passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -238,7 +272,8 @@ export class ForwarderContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('assetData', assetData);assert.isBigNumber('amount', amount); + assert.isString('assetData', assetData); + assert.isBigNumber('amount', amount); const self = this as any as ForwarderContract; const txHashPromise = self.withdrawAsset.sendTransactionAsync(assetData, amount @@ -260,15 +295,17 @@ export class ForwarderContract extends BaseContract { amount: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('assetData', assetData);assert.isBigNumber('amount', amount); + 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 passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -280,7 +317,8 @@ export class ForwarderContract extends BaseContract { assetData: string, amount: BigNumber, ): string { - assert.isString('assetData', assetData);assert.isBigNumber('amount', amount); + assert.isString('assetData', assetData); + assert.isBigNumber('amount', amount); const self = this as any as ForwarderContract; const abiEncodedTransactionData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData, amount @@ -294,7 +332,8 @@ export class ForwarderContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('assetData', assetData);assert.isBigNumber('amount', amount); + assert.isString('assetData', assetData); + assert.isBigNumber('amount', amount); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -331,7 +370,6 @@ export class ForwarderContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -370,7 +408,12 @@ 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); + 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, @@ -379,10 +422,11 @@ export class ForwarderContract extends BaseContract { feePercentage, feeRecipient ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -410,7 +454,12 @@ export class ForwarderContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isArray('orders', orders);assert.isArray('signatures', signatures);assert.isArray('feeOrders', feeOrders);assert.isArray('feeSignatures', feeSignatures);assert.isBigNumber('feePercentage', feePercentage);assert.isString('feeRecipient', feeRecipient); + 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 txHashPromise = self.marketSellOrdersWithEth.sendTransactionAsync(orders, signatures, @@ -440,7 +489,12 @@ 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); + 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, @@ -449,10 +503,11 @@ export class ForwarderContract extends BaseContract { feePercentage, feeRecipient ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -468,7 +523,12 @@ export class ForwarderContract extends BaseContract { feePercentage: BigNumber, feeRecipient: string, ): string { - assert.isArray('orders', orders);assert.isArray('signatures', signatures);assert.isArray('feeOrders', feeOrders);assert.isArray('feeSignatures', feeSignatures);assert.isBigNumber('feePercentage', feePercentage);assert.isString('feeRecipient', feeRecipient); + 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 abiEncodedTransactionData = 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, @@ -490,7 +550,12 @@ export class ForwarderContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}, {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}] > { - assert.isArray('orders', orders);assert.isArray('signatures', signatures);assert.isArray('feeOrders', feeOrders);assert.isArray('feeSignatures', feeSignatures);assert.isBigNumber('feePercentage', feePercentage);assert.isString('feeRecipient', feeRecipient); + assert.isArray('orders', orders); + assert.isArray('signatures', signatures); + assert.isArray('feeOrders', feeOrders); + assert.isArray('feeSignatures', feeSignatures); + assert.isBigNumber('feePercentage', feePercentage); + assert.isString('feeRecipient', feeRecipient); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -534,10 +599,11 @@ export class ForwarderContract extends BaseContract { const self = this as any as ForwarderContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -579,10 +645,11 @@ export class ForwarderContract extends BaseContract { const self = this as any as ForwarderContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -668,7 +735,7 @@ _wethAssetData _zrxAssetData: string, _wethAssetData: string, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 25ed17bb1a..ef28c9e4dc 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 @@ -37,10 +37,11 @@ export class IAssetProxyContract extends BaseContract { const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -82,10 +83,11 @@ export class IAssetProxyContract extends BaseContract { const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -147,10 +149,11 @@ export class IAssetProxyContract extends BaseContract { const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -192,10 +195,11 @@ export class IAssetProxyContract extends BaseContract { const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -254,15 +258,17 @@ export class IAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -282,7 +288,8 @@ export class IAssetProxyContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as IAssetProxyContract; const txHashPromise = self.removeAuthorizedAddressAtIndex.sendTransactionAsync(target, index @@ -304,15 +311,17 @@ export class IAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -324,7 +333,8 @@ export class IAssetProxyContract extends BaseContract { target: string, index: BigNumber, ): string { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as IAssetProxyContract; const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index @@ -338,7 +348,8 @@ export class IAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -377,17 +388,21 @@ 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); + 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, to, amount ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -411,7 +426,10 @@ export class IAssetProxyContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('assetData', assetData);assert.isString('from', from);assert.isString('to', to);assert.isBigNumber('amount', amount); + assert.isString('assetData', assetData); + assert.isString('from', from); + assert.isString('to', to); + assert.isBigNumber('amount', amount); const self = this as any as IAssetProxyContract; const txHashPromise = self.transferFrom.sendTransactionAsync(assetData, from, @@ -437,17 +455,21 @@ 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); + 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, to, amount ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -461,7 +483,10 @@ export class IAssetProxyContract extends BaseContract { to: string, amount: BigNumber, ): string { - assert.isString('assetData', assetData);assert.isString('from', from);assert.isString('to', to);assert.isBigNumber('amount', amount); + assert.isString('assetData', assetData); + assert.isString('from', from); + assert.isString('to', to); + assert.isBigNumber('amount', amount); const self = this as any as IAssetProxyContract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(bytes,address,address,uint256)', [assetData, from, @@ -479,7 +504,10 @@ export class IAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('assetData', assetData);assert.isString('from', from);assert.isString('to', to);assert.isBigNumber('amount', amount); + assert.isString('assetData', assetData); + assert.isString('from', from); + assert.isString('to', to); + assert.isBigNumber('amount', amount); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -518,7 +546,6 @@ export class IAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -553,7 +580,6 @@ export class IAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -591,10 +617,11 @@ export class IAssetProxyContract extends BaseContract { const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -636,10 +663,11 @@ export class IAssetProxyContract extends BaseContract { const self = this as any as IAssetProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -716,7 +744,7 @@ export class IAssetProxyContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts index e739e54ac9..ca3d141155 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts @@ -37,7 +37,9 @@ export class IValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('hash', hash);assert.isString('signerAddress', signerAddress);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signerAddress', signerAddress); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -93,7 +95,7 @@ export class IValidatorContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts index da1964aa10..55694f5bba 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts @@ -36,7 +36,8 @@ export class IWalletContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('hash', hash);assert.isString('signature', signature); + assert.isString('hash', hash); + assert.isString('signature', signature); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -91,7 +92,7 @@ export class IWalletContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 42d6dd8a9f..4dd8a0cb86 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,10 +100,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -145,10 +146,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -284,10 +286,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -329,10 +332,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -391,7 +395,6 @@ export class MultiAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -426,15 +429,17 @@ export class MultiAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -454,7 +459,8 @@ export class MultiAssetProxyContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as MultiAssetProxyContract; const txHashPromise = self.removeAuthorizedAddressAtIndex.sendTransactionAsync(target, index @@ -476,15 +482,17 @@ export class MultiAssetProxyContract extends BaseContract { index: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -496,7 +504,8 @@ export class MultiAssetProxyContract extends BaseContract { target: string, index: BigNumber, ): string { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); const self = this as any as MultiAssetProxyContract; const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target, index @@ -510,7 +519,8 @@ export class MultiAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('target', target);assert.isBigNumber('index', index); + assert.isString('target', target); + assert.isBigNumber('index', index); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -547,7 +557,6 @@ export class MultiAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -622,10 +631,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -667,10 +677,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('registerAssetProxy(address)', [assetProxy ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -729,7 +740,6 @@ export class MultiAssetProxyContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -767,10 +777,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -812,10 +823,11 @@ export class MultiAssetProxyContract extends BaseContract { const self = this as any as MultiAssetProxyContract; const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -892,7 +904,7 @@ export class MultiAssetProxyContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts index f23493e612..117e7f76e2 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts @@ -75,7 +75,8 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber, BigNumber] > { - assert.isString('target', target);assert.isString('assetData', assetData); + assert.isString('target', target); + assert.isString('assetData', assetData); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -114,7 +115,8 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[Array<{orderStatus: number;orderHash: string;orderTakerAssetFilledAmount: BigNumber}>, Array<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}>] > { - assert.isArray('orders', orders);assert.isArray('takerAddresses', takerAddresses); + assert.isArray('orders', orders); + assert.isArray('takerAddresses', takerAddresses); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -153,7 +155,8 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise > { - assert.isArray('orders', orders);assert.isArray('takerAddresses', takerAddresses); + assert.isArray('orders', orders); + assert.isArray('takerAddresses', takerAddresses); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -192,7 +195,8 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('token', token);assert.isBigNumber('tokenId', tokenId); + assert.isString('token', token); + assert.isBigNumber('tokenId', tokenId); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -231,7 +235,8 @@ export class OrderValidatorContract extends BaseContract { defaultBlock?: BlockParam, ): Promise<[BigNumber[], BigNumber[]] > { - assert.isString('target', target);assert.isArray('assetData', assetData); + assert.isString('target', target); + assert.isArray('assetData', assetData); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -331,7 +336,7 @@ _zrxAssetData _exchange: string, _zrxAssetData: string, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts index 6354ba67b3..d4999a056a 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts @@ -69,7 +69,6 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -104,15 +103,17 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('guy', guy);assert.isBigNumber('wad', wad); + assert.isString('guy', guy); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy, wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -132,7 +133,8 @@ export class WETH9Contract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('guy', guy);assert.isBigNumber('wad', wad); + assert.isString('guy', guy); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const txHashPromise = self.approve.sendTransactionAsync(guy, wad @@ -154,15 +156,17 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('guy', guy);assert.isBigNumber('wad', wad); + assert.isString('guy', guy); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy, wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -174,7 +178,8 @@ export class WETH9Contract extends BaseContract { guy: string, wad: BigNumber, ): string { - assert.isString('guy', guy);assert.isBigNumber('wad', wad); + assert.isString('guy', guy); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [guy, wad @@ -188,7 +193,8 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('guy', guy);assert.isBigNumber('wad', wad); + assert.isString('guy', guy); + assert.isBigNumber('wad', wad); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -225,7 +231,6 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -261,16 +266,19 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('src', src);assert.isString('dst', dst);assert.isBigNumber('wad', wad); + 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, dst, wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -292,7 +300,9 @@ export class WETH9Contract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('src', src);assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('src', src); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const txHashPromise = self.transferFrom.sendTransactionAsync(src, dst, @@ -316,16 +326,19 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('src', src);assert.isString('dst', dst);assert.isBigNumber('wad', wad); + 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, dst, wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -338,7 +351,9 @@ export class WETH9Contract extends BaseContract { dst: string, wad: BigNumber, ): string { - assert.isString('src', src);assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('src', src); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src, dst, @@ -354,7 +369,9 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('src', src);assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('src', src); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -395,10 +412,11 @@ export class WETH9Contract extends BaseContract { const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -440,10 +458,11 @@ export class WETH9Contract extends BaseContract { const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -502,7 +521,6 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -574,7 +592,6 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -609,15 +626,17 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst, wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -637,7 +656,8 @@ export class WETH9Contract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const txHashPromise = self.transfer.sendTransactionAsync(dst, wad @@ -659,15 +679,17 @@ export class WETH9Contract extends BaseContract { wad: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst, wad ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -679,7 +701,8 @@ export class WETH9Contract extends BaseContract { dst: string, wad: BigNumber, ): string { - assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); const self = this as any as WETH9Contract; const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [dst, wad @@ -693,7 +716,8 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('dst', dst);assert.isBigNumber('wad', wad); + assert.isString('dst', dst); + assert.isBigNumber('wad', wad); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -731,10 +755,11 @@ export class WETH9Contract extends BaseContract { const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('deposit()', []); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -750,7 +775,6 @@ export class WETH9Contract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - const self = this as any as WETH9Contract; const txHashPromise = self.deposit.sendTransactionAsync(txData); return new PromiseWithTransactionHash( @@ -771,10 +795,11 @@ export class WETH9Contract extends BaseContract { const self = this as any as WETH9Contract; const encodedData = self._strictEncodeArguments('deposit()', []); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -794,7 +819,6 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -831,7 +855,8 @@ export class WETH9Contract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('index_0', index_0);assert.isString('index_1', index_1); + assert.isString('index_0', index_0); + assert.isString('index_1', index_1); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -886,7 +911,7 @@ export class WETH9Contract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema, 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 a4f09685f6..2cb5e4e136 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts @@ -55,7 +55,6 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -90,15 +89,17 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -118,7 +119,8 @@ export class ZRXTokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const txHashPromise = self.approve.sendTransactionAsync(_spender, _value @@ -140,15 +142,17 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -160,7 +164,8 @@ export class ZRXTokenContract extends BaseContract { _spender: string, _value: BigNumber, ): string { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_spender, _value @@ -174,7 +179,8 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_spender', _spender);assert.isBigNumber('_value', _value); + assert.isString('_spender', _spender); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -211,7 +217,6 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -247,16 +252,19 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + 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, _to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -278,7 +286,9 @@ export class ZRXTokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const txHashPromise = self.transferFrom.sendTransactionAsync(_from, _to, @@ -302,16 +312,19 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + 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, _to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -324,7 +337,9 @@ export class ZRXTokenContract extends BaseContract { _to: string, _value: BigNumber, ): string { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from, _to, @@ -340,7 +355,9 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_from', _from);assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_from', _from); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -378,7 +395,6 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -450,7 +466,6 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -485,15 +500,17 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -513,7 +530,8 @@ export class ZRXTokenContract extends BaseContract { pollingIntervalMs?: number, timeoutMs?: number, ): PromiseWithTransactionHash { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const txHashPromise = self.transfer.sendTransactionAsync(_to, _value @@ -535,15 +553,17 @@ export class ZRXTokenContract extends BaseContract { _value: BigNumber, txData?: Partial | undefined, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value ]); + const passedInTxData = txData === undefined ? {} : txData; const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( { to: self.address, - ...txData, + ...passedInTxData, data: encodedData, }, self._web3Wrapper.getContractDefaults(), @@ -555,7 +575,8 @@ export class ZRXTokenContract extends BaseContract { _to: string, _value: BigNumber, ): string { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); const self = this as any as ZRXTokenContract; const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [_to, _value @@ -569,7 +590,8 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_to', _to);assert.isBigNumber('_value', _value); + assert.isString('_to', _to); + assert.isBigNumber('_value', _value); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -608,7 +630,8 @@ export class ZRXTokenContract extends BaseContract { defaultBlock?: BlockParam, ): Promise { - assert.isString('_owner', _owner);assert.isString('_spender', _spender); + assert.isString('_owner', _owner); + assert.isString('_spender', _spender); assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ schemas.addressSchema, schemas.numberSchema, @@ -663,7 +686,7 @@ export class ZRXTokenContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, ): Promise { - assert.isHexString('bytecode', bytecode); + assert.isString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, schemas.numberSchema,