From 2ff3735adc87211e37bff1a95d5d9f067083ddcf Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Mon, 24 Jun 2019 13:23:41 -0400 Subject: [PATCH] Rebase against 3.0 --- contracts/exchange/test/core.ts | 2 + .../src/generated-wrappers/coordinator.ts | 82 ------------------- .../src/generated-wrappers/exchange.ts | 17 ++-- 3 files changed, 7 insertions(+), 94 deletions(-) diff --git a/contracts/exchange/test/core.ts b/contracts/exchange/test/core.ts index 891f260bd3..2d8cd21a8f 100644 --- a/contracts/exchange/test/core.ts +++ b/contracts/exchange/test/core.ts @@ -76,6 +76,8 @@ describe('Exchange core', () => { let multiAssetProxy: MultiAssetProxyContract; let validatorWallet: TestValidatorWalletContract; let erc1155Contract: ERC1155MintableContract; + let staticCallProxy: StaticCallProxyContract; + let staticCallTarget: TestStaticCallTargetContract; let signedOrder: SignedOrder; let erc20Balances: ERC20BalancesByOwner; diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts index 9ffb53a898..8039570667 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts @@ -197,62 +197,6 @@ export class CoordinatorContract extends BaseContract { return abiEncodedTransactionData; }, }; - public getTransactionHash = { - async callAsync( - transaction: {salt: BigNumber;signerAddress: string;data: string}, - callData: Partial = {}, - defaultBlock?: BlockParam, - ): Promise { - const self = this as any as CoordinatorContract; - const encodedData = self._strictEncodeArguments('getTransactionHash((uint256,address,bytes))', [transaction - ]); - const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( - { - to: self.address, - ...callData, - data: encodedData, - }, - self._web3Wrapper.getContractDefaults(), - ); - const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock); - BaseContract._throwIfRevertWithReasonCallResult(rawCallResult); - const abiEncoder = self._lookupAbiEncoder('getTransactionHash((uint256,address,bytes))'); - // tslint:disable boolean-naming - const result = abiEncoder.strictDecodeReturnValue(rawCallResult); - // tslint:enable boolean-naming - return result; - }, - }; - public getCoordinatorApprovalHash = { - async callAsync( - approval: {txOrigin: string;transactionHash: string;transactionSignature: string;approvalExpirationTimeSeconds: BigNumber}, - callData: Partial = {}, - defaultBlock?: BlockParam, - ): Promise { - const self = this as any as CoordinatorContract; - const encodedData = self._strictEncodeArguments('getCoordinatorApprovalHash((address,bytes32,bytes,uint256))', [approval - ]); - const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( - { - to: self.address, - ...callData, - data: encodedData, - }, - self._web3Wrapper.getContractDefaults(), - ); - const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock); - BaseContract._throwIfRevertWithReasonCallResult(rawCallResult); - const abiEncoder = self._lookupAbiEncoder('getCoordinatorApprovalHash((address,bytes32,bytes,uint256))'); - // tslint:disable boolean-naming - const result = abiEncoder.strictDecodeReturnValue(rawCallResult); - // tslint:enable boolean-naming - return result; - }, - }; public executeTransaction = { async sendTransactionAsync( transaction: { salt: BigNumber; signerAddress: string; data: string }, @@ -492,32 +436,6 @@ export class CoordinatorContract extends BaseContract { return abiEncodedTransactionData; }, }; - public EIP712_EXCHANGE_DOMAIN_HASH = { - async callAsync( - callData: Partial = {}, - defaultBlock?: BlockParam, - ): Promise { - const self = this as any as CoordinatorContract; - const encodedData = self._strictEncodeArguments('EIP712_EXCHANGE_DOMAIN_HASH()', []); - const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( - { - to: self.address, - ...callData, - data: encodedData, - }, - self._web3Wrapper.getContractDefaults(), - ); - const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock); - BaseContract._throwIfRevertWithReasonCallResult(rawCallResult); - const abiEncoder = self._lookupAbiEncoder('EIP712_EXCHANGE_DOMAIN_HASH()'); - // tslint:disable boolean-naming - const result = abiEncoder.strictDecodeReturnValue(rawCallResult); - // tslint:enable boolean-naming - return result; - }, - }; public assertValidCoordinatorApprovals = { async callAsync( transaction: { salt: BigNumber; signerAddress: string; data: string }, diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts index 9b41baac98..5636e400d1 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts @@ -4875,7 +4875,6 @@ export class ExchangeContract extends BaseContract { supportedProvider: SupportedProvider, txDefaults: Partial, _zrxAssetData: string, - _chainId: BigNumber, ): Promise { assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ schemas.addressSchema, @@ -4888,8 +4887,7 @@ export class ExchangeContract extends BaseContract { const provider = providerUtils.standardizeOrThrow(supportedProvider); const bytecode = artifact.compilerOutput.evm.bytecode.object; const abi = artifact.compilerOutput.abi; - return ExchangeContract.deployAsync(bytecode, abi, provider, txDefaults, _zrxAssetData, -_chainId + return ExchangeContract.deployAsync(bytecode, abi, provider, txDefaults, _zrxAssetData ); } public static async deployAsync( @@ -4898,7 +4896,6 @@ _chainId supportedProvider: SupportedProvider, txDefaults: Partial, _zrxAssetData: string, - _chainId: BigNumber, ): Promise { assert.isHexString('bytecode', bytecode); assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ @@ -4908,19 +4905,16 @@ _chainId ]); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); - [_zrxAssetData, -_chainId + [_zrxAssetData ] = BaseContract._formatABIDataItemList( constructorAbi.inputs, - [_zrxAssetData, -_chainId + [_zrxAssetData ], BaseContract._bigNumberToString, ); const iface = new ethers.utils.Interface(abi); const deployInfo = iface.deployFunction; - const txData = deployInfo.encode(bytecode, [_zrxAssetData, -_chainId + const txData = deployInfo.encode(bytecode, [_zrxAssetData ]); const web3Wrapper = new Web3Wrapper(provider); const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync( @@ -4933,8 +4927,7 @@ _chainId const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash); logUtils.log(`Exchange successfully deployed at ${txReceipt.contractAddress}`); const contractInstance = new ExchangeContract(abi, txReceipt.contractAddress as string, provider, txDefaults); - contractInstance.constructorArgs = [_zrxAssetData, -_chainId + contractInstance.constructorArgs = [_zrxAssetData ]; return contractInstance; }