Update generated wrappers for coordinator and exchange.
This commit is contained in:
committed by
Amir Bandeali
parent
77ed54f64d
commit
1295de4c78
@@ -182,6 +182,62 @@ export class CoordinatorContract extends BaseContract {
|
|||||||
return abiEncodedTransactionData;
|
return abiEncodedTransactionData;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
public getTransactionHash = {
|
||||||
|
async callAsync(
|
||||||
|
transaction: {salt: BigNumber;signerAddress: string;data: string},
|
||||||
|
callData: Partial<CallData> = {},
|
||||||
|
defaultBlock?: BlockParam,
|
||||||
|
): Promise<string
|
||||||
|
> {
|
||||||
|
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<string
|
||||||
|
>(rawCallResult);
|
||||||
|
// tslint:enable boolean-naming
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
public getCoordinatorApprovalHash = {
|
||||||
|
async callAsync(
|
||||||
|
approval: {txOrigin: string;transactionHash: string;transactionSignature: string;approvalExpirationTimeSeconds: BigNumber},
|
||||||
|
callData: Partial<CallData> = {},
|
||||||
|
defaultBlock?: BlockParam,
|
||||||
|
): Promise<string
|
||||||
|
> {
|
||||||
|
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<string
|
||||||
|
>(rawCallResult);
|
||||||
|
// tslint:enable boolean-naming
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
};
|
||||||
public executeTransaction = {
|
public executeTransaction = {
|
||||||
async sendTransactionAsync(
|
async sendTransactionAsync(
|
||||||
transaction: { salt: BigNumber; signerAddress: string; data: string },
|
transaction: { salt: BigNumber; signerAddress: string; data: string },
|
||||||
@@ -419,6 +475,32 @@ export class CoordinatorContract extends BaseContract {
|
|||||||
return abiEncodedTransactionData;
|
return abiEncodedTransactionData;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
public EIP712_EXCHANGE_DOMAIN_HASH = {
|
||||||
|
async callAsync(
|
||||||
|
callData: Partial<CallData> = {},
|
||||||
|
defaultBlock?: BlockParam,
|
||||||
|
): Promise<string
|
||||||
|
> {
|
||||||
|
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<string
|
||||||
|
>(rawCallResult);
|
||||||
|
// tslint:enable boolean-naming
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
};
|
||||||
public assertValidCoordinatorApprovals = {
|
public assertValidCoordinatorApprovals = {
|
||||||
async callAsync(
|
async callAsync(
|
||||||
transaction: { salt: BigNumber; signerAddress: string; data: string },
|
transaction: { salt: BigNumber; signerAddress: string; data: string },
|
||||||
|
|||||||
@@ -4559,7 +4559,8 @@ export class ExchangeContract extends BaseContract {
|
|||||||
artifact: ContractArtifact | SimpleContractArtifact,
|
artifact: ContractArtifact | SimpleContractArtifact,
|
||||||
supportedProvider: SupportedProvider,
|
supportedProvider: SupportedProvider,
|
||||||
txDefaults: Partial<TxData>,
|
txDefaults: Partial<TxData>,
|
||||||
_zrxAssetData: string,
|
_zrxAssetData: string,
|
||||||
|
_chainId: BigNumber,
|
||||||
): Promise<ExchangeContract> {
|
): Promise<ExchangeContract> {
|
||||||
assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [
|
assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [
|
||||||
schemas.addressSchema,
|
schemas.addressSchema,
|
||||||
@@ -4572,14 +4573,17 @@ export class ExchangeContract extends BaseContract {
|
|||||||
const provider = providerUtils.standardizeOrThrow(supportedProvider);
|
const provider = providerUtils.standardizeOrThrow(supportedProvider);
|
||||||
const bytecode = artifact.compilerOutput.evm.bytecode.object;
|
const bytecode = artifact.compilerOutput.evm.bytecode.object;
|
||||||
const abi = artifact.compilerOutput.abi;
|
const abi = artifact.compilerOutput.abi;
|
||||||
return ExchangeContract.deployAsync(bytecode, abi, provider, txDefaults, _zrxAssetData);
|
return ExchangeContract.deployAsync(bytecode, abi, provider, txDefaults, _zrxAssetData,
|
||||||
|
_chainId
|
||||||
|
);
|
||||||
}
|
}
|
||||||
public static async deployAsync(
|
public static async deployAsync(
|
||||||
bytecode: string,
|
bytecode: string,
|
||||||
abi: ContractAbi,
|
abi: ContractAbi,
|
||||||
supportedProvider: SupportedProvider,
|
supportedProvider: SupportedProvider,
|
||||||
txDefaults: Partial<TxData>,
|
txDefaults: Partial<TxData>,
|
||||||
_zrxAssetData: string,
|
_zrxAssetData: string,
|
||||||
|
_chainId: BigNumber,
|
||||||
): Promise<ExchangeContract> {
|
): Promise<ExchangeContract> {
|
||||||
assert.isHexString('bytecode', bytecode);
|
assert.isHexString('bytecode', bytecode);
|
||||||
assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [
|
assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [
|
||||||
@@ -4589,14 +4593,20 @@ export class ExchangeContract extends BaseContract {
|
|||||||
]);
|
]);
|
||||||
const provider = providerUtils.standardizeOrThrow(supportedProvider);
|
const provider = providerUtils.standardizeOrThrow(supportedProvider);
|
||||||
const constructorAbi = BaseContract._lookupConstructorAbi(abi);
|
const constructorAbi = BaseContract._lookupConstructorAbi(abi);
|
||||||
[_zrxAssetData] = BaseContract._formatABIDataItemList(
|
[_zrxAssetData,
|
||||||
|
_chainId
|
||||||
|
] = BaseContract._formatABIDataItemList(
|
||||||
constructorAbi.inputs,
|
constructorAbi.inputs,
|
||||||
[_zrxAssetData],
|
[_zrxAssetData,
|
||||||
|
_chainId
|
||||||
|
],
|
||||||
BaseContract._bigNumberToString,
|
BaseContract._bigNumberToString,
|
||||||
);
|
);
|
||||||
const iface = new ethers.utils.Interface(abi);
|
const iface = new ethers.utils.Interface(abi);
|
||||||
const deployInfo = iface.deployFunction;
|
const deployInfo = iface.deployFunction;
|
||||||
const txData = deployInfo.encode(bytecode, [_zrxAssetData]);
|
const txData = deployInfo.encode(bytecode, [_zrxAssetData,
|
||||||
|
_chainId
|
||||||
|
]);
|
||||||
const web3Wrapper = new Web3Wrapper(provider);
|
const web3Wrapper = new Web3Wrapper(provider);
|
||||||
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
|
const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
|
||||||
{ data: txData },
|
{ data: txData },
|
||||||
@@ -4607,8 +4617,10 @@ export class ExchangeContract extends BaseContract {
|
|||||||
logUtils.log(`transactionHash: ${txHash}`);
|
logUtils.log(`transactionHash: ${txHash}`);
|
||||||
const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash);
|
const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash);
|
||||||
logUtils.log(`Exchange successfully deployed at ${txReceipt.contractAddress}`);
|
logUtils.log(`Exchange successfully deployed at ${txReceipt.contractAddress}`);
|
||||||
const contractInstance = new ExchangeContract(txReceipt.contractAddress as string, provider, txDefaults);
|
const contractInstance = new ExchangeContract(abi, txReceipt.contractAddress as string, provider, txDefaults);
|
||||||
contractInstance.constructorArgs = [_zrxAssetData];
|
contractInstance.constructorArgs = [_zrxAssetData,
|
||||||
|
_chainId
|
||||||
|
];
|
||||||
return contractInstance;
|
return contractInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user