From f7b58e7f64dc5af1e4ac8e7159717c78f0767c85 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Thu, 31 Jan 2019 13:38:49 -0800 Subject: moved ZeroExTransactionDecoder into contract wrappers --- .../src/utils/zeroex_transaction_decoder.ts | 63 +++++++++++++++++++++ packages/utils/src/zeroex_transaction_decoder.ts | 64 ---------------------- 2 files changed, 63 insertions(+), 64 deletions(-) create mode 100644 packages/contract-wrappers/src/utils/zeroex_transaction_decoder.ts delete mode 100644 packages/utils/src/zeroex_transaction_decoder.ts diff --git a/packages/contract-wrappers/src/utils/zeroex_transaction_decoder.ts b/packages/contract-wrappers/src/utils/zeroex_transaction_decoder.ts new file mode 100644 index 000000000..441424e92 --- /dev/null +++ b/packages/contract-wrappers/src/utils/zeroex_transaction_decoder.ts @@ -0,0 +1,63 @@ +import { getContractAddressesForNetworkOrThrow, NetworkId } from '@0x/contract-addresses'; +import * as ContractArtifacts from '@0x/contract-artifacts'; +import { SimpleContractArtifact } from '@0x/types'; +import { AbiDefinition, ContractAbi } from 'ethereum-types'; +import * as _ from 'lodash'; + +import { DeployedContractInfo, DeployedContractInfoByName, TransactionData, TransactionDecoder, TransactionProperties } from '@0x/utils'; + +export class ZeroExTransactionDecoder extends TransactionDecoder { + private static _instance: ZeroExTransactionDecoder; + + public static addABI( + abiArray: AbiDefinition[], + contractName: string, + deploymentInfos?: DeployedContractInfo[], + ): void { + const instance = ZeroExTransactionDecoder._getInstance(); + instance.addABI(abiArray, contractName, deploymentInfos); + } + + public static decode(calldata: string, txProperties?: TransactionProperties): TransactionData { + const instance = ZeroExTransactionDecoder._getInstance(); + const decodedCalldata = instance.decode(calldata, txProperties); + return decodedCalldata; + } + + private static _getInstance(): ZeroExTransactionDecoder { + if (!ZeroExTransactionDecoder._instance) { + ZeroExTransactionDecoder._instance = new ZeroExTransactionDecoder(); + } + return ZeroExTransactionDecoder._instance; + } + + private constructor() { + super(); + // Load addresses by contract name + const deployedContractInfoByName: DeployedContractInfoByName = {}; + _.each(NetworkId, (networkId: any) => { + if (typeof networkId !== 'number') { + return; + } + const contractAddressesForNetwork = getContractAddressesForNetworkOrThrow(networkId); + _.each(contractAddressesForNetwork, (contractAddress: string, contractName: string) => { + const contractNameLowercase = _.toLower(contractName); + if (_.isUndefined(deployedContractInfoByName[contractNameLowercase])) { + deployedContractInfoByName[contractNameLowercase] = []; + } + deployedContractInfoByName[contractNameLowercase].push({ + contractAddress, + networkId, + }); + }); + }); + // Load contract artifacts + _.each(ContractArtifacts, (contractArtifactAsJson: any) => { + const conractArtifact = contractArtifactAsJson as SimpleContractArtifact; + const contractName = conractArtifact.contractName; + const contractNameLowercase = _.toLower(contractName); + const contractAbi: ContractAbi = conractArtifact.compilerOutput.abi; + this.addABI(contractAbi, contractName, deployedContractInfoByName[contractNameLowercase]); + }); + } +} diff --git a/packages/utils/src/zeroex_transaction_decoder.ts b/packages/utils/src/zeroex_transaction_decoder.ts deleted file mode 100644 index f236257cb..000000000 --- a/packages/utils/src/zeroex_transaction_decoder.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { getContractAddressesForNetworkOrThrow, NetworkId } from '@0x/contract-addresses'; -import * as ContractArtifacts from '@0x/contract-artifacts'; -import { SimpleContractArtifact } from '@0x/types'; -import { AbiDefinition, ContractAbi } from 'ethereum-types'; -import * as _ from 'lodash'; - -import { TransactionDecoder } from './transaction_decoder'; -import { DeployedContractInfo, DeployedContractInfoByName, TransactionData, TransactionProperties } from './types'; - -export class ZeroExTransactionDecoder extends TransactionDecoder { - private static _instance: ZeroExTransactionDecoder; - - public static addABI( - abiArray: AbiDefinition[], - contractName: string, - deploymentInfos?: DeployedContractInfo[], - ): void { - const instance = ZeroExTransactionDecoder._getInstance(); - instance.addABI(abiArray, contractName, deploymentInfos); - } - - public static decode(calldata: string, txProperties?: TransactionProperties): TransactionData { - const instance = ZeroExTransactionDecoder._getInstance(); - const decodedCalldata = instance.decode(calldata, txProperties); - return decodedCalldata; - } - - private static _getInstance(): ZeroExTransactionDecoder { - if (!ZeroExTransactionDecoder._instance) { - ZeroExTransactionDecoder._instance = new ZeroExTransactionDecoder(); - } - return ZeroExTransactionDecoder._instance; - } - - private constructor() { - super(); - // Load addresses by contract name - const deployedContractInfoByName: DeployedContractInfoByName = {}; - _.each(NetworkId, (networkId: any) => { - if (typeof networkId !== 'number') { - return; - } - const contractAddressesForNetwork = getContractAddressesForNetworkOrThrow(networkId); - _.each(contractAddressesForNetwork, (contractAddress: string, contractName: string) => { - const contractNameLowercase = _.toLower(contractName); - if (_.isUndefined(deployedContractInfoByName[contractNameLowercase])) { - deployedContractInfoByName[contractNameLowercase] = []; - } - deployedContractInfoByName[contractNameLowercase].push({ - contractAddress, - networkId, - }); - }); - }); - // Load contract artifacts - _.each(ContractArtifacts, (contractArtifactAsJson: any) => { - const conractArtifact = contractArtifactAsJson as SimpleContractArtifact; - const contractName = conractArtifact.contractName; - const contractNameLowercase = _.toLower(contractName); - const contractAbi: ContractAbi = conractArtifact.compilerOutput.abi; - this.addABI(contractAbi, contractName, deployedContractInfoByName[contractNameLowercase]); - }); - } -} -- cgit v1.2.3