From 4791c120fe4d59c83e9232d1ebc8183da73ffb94 Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Wed, 26 Jun 2019 16:24:10 -0400 Subject: [PATCH] `@0x/contracts-exchange`: Run `contracts:gen` --- contracts/exchange/compiler.json | 2 +- contracts/exchange/package.json | 2 +- contracts/exchange/src/artifacts.ts | 6 ++---- contracts/exchange/src/wrappers.ts | 3 +-- contracts/exchange/tsconfig.json | 3 +-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index e9c443e3ea..d8491dc8ef 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -28,13 +28,13 @@ "examples/Whitelist.sol", "src/Exchange.sol", "src/interfaces/IAssetProxyDispatcher.sol", + "src/interfaces/IEIP1271Wallet.sol", "src/interfaces/IExchange.sol", "src/interfaces/IExchangeCore.sol", "src/interfaces/IMatchOrders.sol", "src/interfaces/ISignatureValidator.sol", "src/interfaces/ITransactions.sol", "src/interfaces/IWallet.sol", - "src/interfaces/IEIP1271Wallet.sol", "src/interfaces/IWrapperFunctions.sol", "test/ReentrantERC20Token.sol", "test/TestAssetProxyDispatcher.sol", diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 04c758eb7a..33f6e505c7 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -34,7 +34,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "./generated-artifacts/@(Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|IOrderValidator|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibExchangeRichErrorDecoder|TestSignatureValidator|TestValidatorWallet|Whitelist).json", + "abis": "./generated-artifacts/@(Exchange|ExchangeWrapper|IAssetProxyDispatcher|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IWallet|IWrapperFunctions|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibExchangeRichErrorDecoder|TestSignatureValidator|TestValidatorWallet|Whitelist).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts index 9ad86d47ea..6da04da37f 100644 --- a/contracts/exchange/src/artifacts.ts +++ b/contracts/exchange/src/artifacts.ts @@ -8,13 +8,12 @@ import { ContractArtifact } from 'ethereum-types'; import * as Exchange from '../generated-artifacts/Exchange.json'; import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json'; import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json'; +import * as IEIP1271Wallet from '../generated-artifacts/IEIP1271Wallet.json'; import * as IExchange from '../generated-artifacts/IExchange.json'; import * as IExchangeCore from '../generated-artifacts/IExchangeCore.json'; import * as IMatchOrders from '../generated-artifacts/IMatchOrders.json'; -import * as IOrderValidator from '../generated-artifacts/IOrderValidator.json'; import * as ISignatureValidator from '../generated-artifacts/ISignatureValidator.json'; import * as ITransactions from '../generated-artifacts/ITransactions.json'; -import * as IValidator from '../generated-artifacts/IValidator.json'; import * as IWallet from '../generated-artifacts/IWallet.json'; import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json'; import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json'; @@ -32,11 +31,10 @@ export const artifacts = { IExchange: IExchange as ContractArtifact, IExchangeCore: IExchangeCore as ContractArtifact, IMatchOrders: IMatchOrders as ContractArtifact, - IOrderValidator: IOrderValidator as ContractArtifact, ISignatureValidator: ISignatureValidator as ContractArtifact, ITransactions: ITransactions as ContractArtifact, - IValidator: IValidator as ContractArtifact, IWallet: IWallet as ContractArtifact, + IEIP1271Wallet: IEIP1271Wallet as ContractArtifact, IWrapperFunctions: IWrapperFunctions as ContractArtifact, ReentrantERC20Token: ReentrantERC20Token as ContractArtifact, TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact, diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts index be6cab9588..fc725b0fcf 100644 --- a/contracts/exchange/src/wrappers.ts +++ b/contracts/exchange/src/wrappers.ts @@ -6,13 +6,12 @@ export * from '../generated-wrappers/exchange'; export * from '../generated-wrappers/exchange_wrapper'; export * from '../generated-wrappers/i_asset_proxy_dispatcher'; +export * from '../generated-wrappers/i_e_i_p1271_wallet'; export * from '../generated-wrappers/i_exchange'; export * from '../generated-wrappers/i_exchange_core'; export * from '../generated-wrappers/i_match_orders'; -export * from '../generated-wrappers/i_order_validator'; export * from '../generated-wrappers/i_signature_validator'; export * from '../generated-wrappers/i_transactions'; -export * from '../generated-wrappers/i_validator'; export * from '../generated-wrappers/i_wallet'; export * from '../generated-wrappers/i_wrapper_functions'; export * from '../generated-wrappers/reentrant_erc20_token'; diff --git a/contracts/exchange/tsconfig.json b/contracts/exchange/tsconfig.json index f3c00adb56..6f878d304c 100644 --- a/contracts/exchange/tsconfig.json +++ b/contracts/exchange/tsconfig.json @@ -6,13 +6,12 @@ "generated-artifacts/Exchange.json", "generated-artifacts/ExchangeWrapper.json", "generated-artifacts/IAssetProxyDispatcher.json", + "generated-artifacts/IEIP1271Wallet.json", "generated-artifacts/IExchange.json", "generated-artifacts/IExchangeCore.json", "generated-artifacts/IMatchOrders.json", - "generated-artifacts/IOrderValidator.json", "generated-artifacts/ISignatureValidator.json", "generated-artifacts/ITransactions.json", - "generated-artifacts/IValidator.json", "generated-artifacts/IWallet.json", "generated-artifacts/IWrapperFunctions.json", "generated-artifacts/ReentrantERC20Token.json",