From c19fb1dffcca820e1e82b5baad4b126abda8d112 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 16 Apr 2018 17:33:55 -0700 Subject: Removed ERC20 V1 Proxy + TokenTransferProxy --- packages/contracts/src/utils/artifacts.ts | 2 -- packages/contracts/src/utils/asset_proxy_utils.ts | 8 -------- packages/contracts/src/utils/types.ts | 3 --- 3 files changed, 13 deletions(-) (limited to 'packages/contracts/src/utils') diff --git a/packages/contracts/src/utils/artifacts.ts b/packages/contracts/src/utils/artifacts.ts index fd9380d1d..87cc73cff 100644 --- a/packages/contracts/src/utils/artifacts.ts +++ b/packages/contracts/src/utils/artifacts.ts @@ -5,7 +5,6 @@ import * as MultiSigWalletWithTimeLockArtifact from '../artifacts/MultiSigWallet import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json'; import * as TokenArtifact from '../artifacts/Token.json'; import * as TokenRegistryArtifact from '../artifacts/TokenRegistry.json'; -import * as TokenTransferProxyArtifact from '../artifacts/TokenTransferProxy.json'; import * as EtherTokenArtifact from '../artifacts/WETH9.json'; import * as ZRXArtifact from '../artifacts/ZRXToken.json'; @@ -19,7 +18,6 @@ export const artifacts = { EtherTokenArtifact: (EtherTokenArtifact as any) as Artifact, TokenRegistryArtifact: (TokenRegistryArtifact as any) as Artifact, MaliciousTokenArtifact: (MaliciousTokenArtifact as any) as Artifact, - TokenTransferProxyArtifact: (TokenTransferProxyArtifact as any) as Artifact, MultiSigWalletWithTimeLockArtifact: (MultiSigWalletWithTimeLockArtifact as any) as Artifact, MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact: (MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact as any) as Artifact, }; diff --git a/packages/contracts/src/utils/asset_proxy_utils.ts b/packages/contracts/src/utils/asset_proxy_utils.ts index 8c14b2847..da610cbcc 100644 --- a/packages/contracts/src/utils/asset_proxy_utils.ts +++ b/packages/contracts/src/utils/asset_proxy_utils.ts @@ -22,14 +22,6 @@ export function encodeUint256(value: BigNumber): Buffer { return encodedValue; } -export function encodeERC20V1ProxyData(tokenAddress: string): string { - const encodedAssetProxyId = encodeAssetProxyId(AssetProxyId.ERC20V1); - const encodedAddress = encodeAddress(tokenAddress); - const encodedMetadata = Buffer.concat([encodedAssetProxyId, encodedAddress]); - const encodedMetadataHex = ethUtil.bufferToHex(encodedMetadata); - return encodedMetadataHex; -} - export function encodeERC20ProxyData(tokenAddress: string): string { const encodedAssetProxyId = encodeAssetProxyId(AssetProxyId.ERC20); const encodedAddress = encodeAddress(tokenAddress); diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts index d692bed61..5bb1a36d4 100644 --- a/packages/contracts/src/utils/types.ts +++ b/packages/contracts/src/utils/types.ts @@ -39,7 +39,6 @@ export interface CancelOrdersBefore { export enum AssetProxyId { INVALID, - ERC20V1, ERC20, ERC721, } @@ -97,7 +96,6 @@ export enum ExchangeContractErrs { } export enum ContractName { - TokenTransferProxy = 'TokenTransferProxy', TokenRegistry = 'TokenRegistry', MultiSigWalletWithTimeLock = 'MultiSigWalletWithTimeLock', Exchange = 'Exchange', @@ -111,7 +109,6 @@ export enum ContractName { Arbitrage = 'Arbitrage', AssetProxyDispatcher = 'AssetProxyDispatcher', ERC20Proxy = 'ERC20Proxy', - ERC20V1Proxy = 'ERC20Proxy_v1', ERC721Proxy = 'ERC721Proxy', DummyERC721Token = 'DummyERC721Token', } -- cgit v1.2.3