diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-04-11 12:53:59 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:17 +0800 |
commit | 1ab70f130db37860319b0d3b81a52af85e7cb52f (patch) | |
tree | 49e724872b8b1b97c9c452c992b73056b1edf9bc | |
parent | 86f79949eaa45b5ab6a46f1643a193aa270746e7 (diff) | |
download | dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.tar dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.tar.gz dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.tar.bz2 dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.tar.lz dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.tar.xz dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.tar.zst dexon-0x-contracts-1ab70f130db37860319b0d3b81a52af85e7cb52f.zip |
Renaming TransferProxy to Proxy
10 files changed, 56 insertions, 56 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index be65787d5..fbe87e18e 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -26,8 +26,8 @@ "test:circleci": "yarn test:coverage" }, "config": { - "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|AssetProxyDispatcher|ERC20TransferProxy_v1|ERC20TransferProxy|ERC721TransferProxy|DummyERC721Token).json", - "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,AssetProxyDispatcher,ERC20TransferProxy_v1,ERC20TransferProxy,ERC721TransferProxy,DummyERC721Token", + "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|AssetProxyDispatcher|ERC20Proxy_v1|ERC20Proxy|ERC721Proxy|DummyERC721Token).json", + "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,AssetProxyDispatcher,ERC20Proxy_v1,ERC20Proxy,ERC721Proxy,DummyERC721Token", "dirs": "src/contracts,zeppelin:../../node_modules/zeppelin-solidity" }, "repository": { diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20TransferProxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol index 535bfba24..a471d5812 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20TransferProxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy.sol @@ -23,7 +23,7 @@ import "../../../utils/LibBytes/LibBytes.sol"; import "../../../utils/Authorizable/Authorizable.sol"; import { Token_v1 as ERC20Token } from "../../../../previous/Token/Token_v1.sol"; -contract ERC20TransferProxy is +contract ERC20Proxy is LibBytes, Authorizable, IAssetProxy diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20TransferProxy_v1.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol index b6a986a66..e83a92284 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20TransferProxy_v1.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC20Proxy_v1.sol @@ -23,7 +23,7 @@ import "../../../utils/LibBytes/LibBytes.sol"; import "../../../utils/Authorizable/Authorizable.sol"; import { ITokenTransferProxy as ITokenTransferProxy_v1 } from "../../TokenTransferProxy/ITokenTransferProxy.sol"; -contract ERC20TransferProxy_v1 is +contract ERC20Proxy_v1 is LibBytes, Authorizable, IAssetProxy @@ -32,7 +32,7 @@ contract ERC20TransferProxy_v1 is /// @dev Contract constructor. /// @param tokenTransferProxyContract erc20 token transfer proxy contract. - function ERC20TransferProxy_v1(ITokenTransferProxy_v1 tokenTransferProxyContract) + function ERC20Proxy_v1(ITokenTransferProxy_v1 tokenTransferProxyContract) public { TRANSFER_PROXY = tokenTransferProxyContract; diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721TransferProxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol index 8b7a131cb..8b7a131cb 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721TransferProxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts index f1636929b..dc12e927a 100644 --- a/packages/contracts/src/utils/types.ts +++ b/packages/contracts/src/utils/types.ts @@ -110,9 +110,9 @@ export enum ContractName { EtherDelta = 'EtherDelta', Arbitrage = 'Arbitrage', AssetProxyDispatcher = 'AssetProxyDispatcher', - ERC20TransferProxy = 'ERC20TransferProxy', - ERC20TransferProxy_V1 = 'ERC20TransferProxy_v1', - ERC721TransferProxy = 'ERC721TransferProxy', + ERC20Proxy = 'ERC20Proxy', + ERC20Proxy_V1 = 'ERC20Proxy_v1', + ERC721Proxy = 'ERC721Proxy', DummyERC721Token = 'DummyERC721Token', } diff --git a/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts b/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts index 6cb9f2bc1..bea168543 100644 --- a/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts +++ b/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts @@ -8,9 +8,9 @@ import * as Web3 from 'web3'; import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher'; import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; -import { ERC20TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; -import { ERC721TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy'; -import { ERC20TransferProxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; +import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; +import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy'; +import { ERC20Proxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; import { encodeERC20ProxyMetadata, @@ -39,9 +39,9 @@ describe('AssetProxyDispatcher', () => { let dmyBalances: Balances; let tokenTransferProxy: TokenTransferProxyContract; let assetProxyDispatcher: AssetProxyDispatcherContract; - let erc20TransferProxyV1: ERC20TransferProxy_v1Contract; - let erc20TransferProxy: ERC20TransferProxyContract; - let erc721TransferProxy: ERC721TransferProxyContract; + let erc20TransferProxyV1: ERC20Proxy_v1Contract; + let erc20TransferProxy: ERC20ProxyContract; + let erc721TransferProxy: ERC721ProxyContract; const nilAddress = '0x0000000000000000000000000000000000000000'; const INITIAL_BALANCE = new BigNumber(10000); @@ -59,24 +59,24 @@ describe('AssetProxyDispatcher', () => { provider, ); - const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [ + const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [ tokenTransferProxy.address, ]); - erc20TransferProxyV1 = new ERC20TransferProxy_v1Contract( + erc20TransferProxyV1 = new ERC20Proxy_v1Contract( erc20TransferProxyV1Instance.abi, erc20TransferProxyV1Instance.address, provider, ); - const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy); - erc20TransferProxy = new ERC20TransferProxyContract( + const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy); + erc20TransferProxy = new ERC20ProxyContract( erc20TransferProxyInstance.abi, erc20TransferProxyInstance.address, provider, ); - const erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721TransferProxy); - erc721TransferProxy = new ERC721TransferProxyContract( + const erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy); + erc721TransferProxy = new ERC721ProxyContract( erc721TransferProxyInstance.abi, erc721TransferProxyInstance.address, provider, @@ -167,8 +167,8 @@ describe('AssetProxyDispatcher', () => { expect(proxyAddress).to.be.equal(erc20TransferProxy.address); // Deploy a new version of the ERC20 Transfer Proxy contract - const newErc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy); - const newErc20TransferProxy = new ERC20TransferProxyContract( + const newErc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy); + const newErc20TransferProxy = new ERC20ProxyContract( newErc20TransferProxyInstance.abi, newErc20TransferProxyInstance.address, provider, diff --git a/packages/contracts/test/asset_proxy_dispatcher/proxies.ts b/packages/contracts/test/asset_proxy_dispatcher/proxies.ts index da1bb170c..d5800b7eb 100644 --- a/packages/contracts/test/asset_proxy_dispatcher/proxies.ts +++ b/packages/contracts/test/asset_proxy_dispatcher/proxies.ts @@ -8,9 +8,9 @@ import * as Web3 from 'web3'; import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher'; import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; -import { ERC20TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; -import { ERC721TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy'; -import { ERC20TransferProxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; +import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; +import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy'; +import { ERC20Proxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; import { encodeERC20ProxyMetadata, @@ -40,9 +40,9 @@ describe('Asset Transfer Proxies', () => { let dmyBalances: Balances; let tokenTransferProxy: TokenTransferProxyContract; let assetProxyDispatcher: AssetProxyDispatcherContract; - let erc20TransferProxyV1: ERC20TransferProxy_v1Contract; - let erc20TransferProxy: ERC20TransferProxyContract; - let erc721TransferProxy: ERC721TransferProxyContract; + let erc20TransferProxyV1: ERC20Proxy_v1Contract; + let erc20TransferProxy: ERC20ProxyContract; + let erc721TransferProxy: ERC721ProxyContract; const nilAddress = '0x0000000000000000000000000000000000000000'; const makerTokenId = new BigNumber('0x1010101010101010101010101010101010101010101010101010101010101010'); const INITIAL_BALANCE = new BigNumber(10000); @@ -61,24 +61,24 @@ describe('Asset Transfer Proxies', () => { provider, ); - const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [ + const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [ tokenTransferProxy.address, ]); - erc20TransferProxyV1 = new ERC20TransferProxy_v1Contract( + erc20TransferProxyV1 = new ERC20Proxy_v1Contract( erc20TransferProxyV1Instance.abi, erc20TransferProxyV1Instance.address, provider, ); - const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy); - erc20TransferProxy = new ERC20TransferProxyContract( + const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy); + erc20TransferProxy = new ERC20ProxyContract( erc20TransferProxyInstance.abi, erc20TransferProxyInstance.address, provider, ); - const erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721TransferProxy); - erc721TransferProxy = new ERC721TransferProxyContract( + const erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy); + erc721TransferProxy = new ERC721ProxyContract( erc721TransferProxyInstance.abi, erc721TransferProxyInstance.address, provider, diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index 1277a88f3..004f9d53f 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -10,9 +10,9 @@ import * as Web3 from 'web3'; import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher'; import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; -import { ERC20TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; -import { ERC721TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy'; -import { ERC20TransferProxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; +import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; +import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_transfer_proxy'; +import { ERC20Proxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; import { CancelContractEventArgs, ExchangeContract, @@ -64,9 +64,9 @@ describe('Exchange', () => { let exchange: ExchangeContract; let tokenTransferProxy: TokenTransferProxyContract; let assetProxyDispatcher: AssetProxyDispatcherContract; - let erc20TransferProxyV1: ERC20TransferProxy_v1Contract; - let erc20TransferProxy: ERC20TransferProxyContract; - let erc721TransferProxy: ERC721TransferProxyContract; + let erc20TransferProxyV1: ERC20Proxy_v1Contract; + let erc20TransferProxy: ERC20ProxyContract; + let erc721TransferProxy: ERC721ProxyContract; let signedOrder: SignedOrder; let balances: BalancesByOwner; @@ -101,24 +101,24 @@ describe('Exchange', () => { provider, ); - const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [ + const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [ tokenTransferProxy.address, ]); - erc20TransferProxyV1 = new ERC20TransferProxy_v1Contract( + erc20TransferProxyV1 = new ERC20Proxy_v1Contract( erc20TransferProxyV1Instance.abi, erc20TransferProxyV1Instance.address, provider, ); - const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy); - erc20TransferProxy = new ERC20TransferProxyContract( + const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy); + erc20TransferProxy = new ERC20ProxyContract( erc20TransferProxyInstance.abi, erc20TransferProxyInstance.address, provider, ); - erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721TransferProxy); - erc721TransferProxy = new ERC721TransferProxyContract( + erc721TransferProxyInstance = await deployer.deployAsync(ContractName.ERC721Proxy); + erc721TransferProxy = new ERC721ProxyContract( erc721TransferProxyInstance.abi, erc721TransferProxyInstance.address, provider, diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts index 37e53630e..32e06e988 100644 --- a/packages/contracts/test/exchange/helpers.ts +++ b/packages/contracts/test/exchange/helpers.ts @@ -40,10 +40,10 @@ describe('Exchange', () => { const tokenRegistry = await deployer.deployAsync(ContractName.TokenRegistry); const tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy); const assetProxyDispatcher = await deployer.deployAsync(ContractName.AssetProxyDispatcher); - const erc20TransferProxyV1 = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [ + const erc20TransferProxyV1 = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [ tokenTransferProxy.address, ]); - const erc20TransferProxy = await deployer.deployAsync(ContractName.ERC20TransferProxy); + const erc20TransferProxy = await deployer.deployAsync(ContractName.ERC20Proxy); const [rep, dgd, zrx] = await Promise.all([ deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index a58568adb..168c50f2a 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -8,8 +8,8 @@ import * as Web3 from 'web3'; import { AssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/asset_proxy_dispatcher'; import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; -import { ERC20TransferProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; -import { ERC20TransferProxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; +import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_transfer_proxy'; +import { ERC20Proxy_v1Contract } from '../../src/contract_wrappers/generated/erc20transferproxy_v1'; import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; import { TokenRegistryContract } from '../../src/contract_wrappers/generated/token_registry'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; @@ -48,8 +48,8 @@ describe('Exchange', () => { let tokenRegistry: TokenRegistryContract; let tokenTransferProxy: TokenTransferProxyContract; let assetProxyDispatcher: AssetProxyDispatcherContract; - let erc20TransferProxyV1: ERC20TransferProxy_v1Contract; - let erc20TransferProxy: ERC20TransferProxyContract; + let erc20TransferProxyV1: ERC20Proxy_v1Contract; + let erc20TransferProxy: ERC20ProxyContract; let balances: BalancesByOwner; @@ -77,16 +77,16 @@ describe('Exchange', () => { tokenTransferProxyInstance.address, provider, ); - const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20TransferProxy_V1, [ + const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [ tokenTransferProxy.address, ]); - erc20TransferProxyV1 = new ERC20TransferProxy_v1Contract( + erc20TransferProxyV1 = new ERC20Proxy_v1Contract( erc20TransferProxyV1Instance.abi, erc20TransferProxyV1Instance.address, provider, ); - const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20TransferProxy); - erc20TransferProxy = new ERC20TransferProxyContract( + const erc20TransferProxyInstance = await deployer.deployAsync(ContractName.ERC20Proxy); + erc20TransferProxy = new ERC20ProxyContract( erc20TransferProxyInstance.abi, erc20TransferProxyInstance.address, provider, |