crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move contents of examples and interfaces packages into corresponding packages

Browse Source
This commit is contained in:
Amir Bandeali 2019-01-21 12:06:44 -08:00
parent 174daa97c3
commit 9fa8619590
143 changed files with 344 additions and 1944 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -84,13 +84,11 @@ packages/testnet-faucets/server/
# generated contract artifacts/ # generated contract artifacts/
contracts/exchange/generated-artifacts/ contracts/exchange/generated-artifacts/
contracts/asset-proxy/genrated-artifacts/ contracts/asset-proxy/generated-artifacts/
contracts/multisig/generated-artifacts/ contracts/multisig/generated-artifacts/
contracts/utils/generated-artifacts/ contracts/utils/generated-artifacts/
contracts/exchange-libs/generated-artifacts/ contracts/exchange-libs/generated-artifacts/
contracts/interfaces/generated-artifacts/
contracts/tokens/generated-artifacts/ contracts/tokens/generated-artifacts/
contracts/examples/generated-artifacts/
contracts/extensions/generated-artifacts/ contracts/extensions/generated-artifacts/
packages/sol-tracing-utils/test/fixtures/artifacts/ packages/sol-tracing-utils/test/fixtures/artifacts/
packages/metacoin/artifacts/ packages/metacoin/artifacts/
@ -102,9 +100,7 @@ contracts/asset-proxy/generated-wrappers/
contracts/multisig/generated-wrappers/ contracts/multisig/generated-wrappers/
contracts/utils/generated-wrappers/ contracts/utils/generated-wrappers/
contracts/exchange-libs/generated-wrappers/ contracts/exchange-libs/generated-wrappers/
contracts/interfaces/generated-wrappers/
contracts/tokens/generated-wrappers/ contracts/tokens/generated-wrappers/
contracts/examples/generated-wrappers/
contracts/extensions/generated-wrappers/ contracts/extensions/generated-wrappers/
packages/metacoin/src/contract_wrappers packages/metacoin/src/contract_wrappers

14
.prettierignore
View File

@ -1,19 +1,17 @@
lib lib
.nyc_output .nyc_output
/contracts/protocol/generated-wrappers /contracts/exchange/generated-wrappers
/contracts/protocol/generated-artifacts /contracts/exchange/generated-artifacts
/contracts/asset-proxy/generated-wrappers
/contracts/asset-proxy/generated-artifacts
/contracts/multisig/generated-wrappers /contracts/multisig/generated-wrappers
/contracts/multisig/generated-artifacts /contracts/multisig/generated-artifacts
/contracts/utils/generated-wrappers /contracts/utils/generated-wrappers
/contracts/utils/generated-artifacts /contracts/utils/generated-artifacts
/contracts/libs/generated-wrappers /contracts/exchange-libs/generated-wrappers
/contracts/libs/generated-artifacts /contracts/exchange-libs/generated-artifacts
/contracts/interfaces/generated-wrappers
/contracts/interfaces/generated-artifacts
/contracts/tokens/generated-wrappers /contracts/tokens/generated-wrappers
/contracts/tokens/generated-artifacts /contracts/tokens/generated-artifacts
/contracts/examples/generated-wrappers
/contracts/examples/generated-artifacts
/contracts/extensions/generated-wrappers /contracts/extensions/generated-wrappers
/contracts/extensions/generated-artifacts /contracts/extensions/generated-artifacts
/packages/abi-gen-wrappers/src/generated-wrappers /packages/abi-gen-wrappers/src/generated-wrappers

10
contracts/asset-proxy/compiler.json
View File

@ -18,5 +18,13 @@
} }
} }
}, },
"contracts": ["ERC20Proxy", "ERC721Proxy", "MixinAuthorizable", "MultiAssetProxy"] "contracts": [
"IAssetData",
"IAssetProxy",
"IAuthorizable",
"ERC20Proxy",
"ERC721Proxy",
"MixinAuthorizable",
"MultiAssetProxy"
]
} }

0
contracts/asset-proxy/contracts/asset-proxy/ERC20Proxy.sol → contracts/asset-proxy/contracts/src/ERC20Proxy.sol
View File

0
contracts/asset-proxy/contracts/asset-proxy/ERC721Proxy.sol → contracts/asset-proxy/contracts/src/ERC721Proxy.sol
View File

4
contracts/asset-proxy/contracts/asset-proxy/MixinAssetProxyDispatcher.sol → contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol
View File

@ -18,9 +18,9 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./mixins/MAssetProxyDispatcher.sol"; import "./mixins/MAssetProxyDispatcher.sol";
import "@0x/contracts-interfaces/contracts/protocol/AssetProxy/IAssetProxy.sol"; import "./interfaces/IAssetProxy.sol";
contract MixinAssetProxyDispatcher is contract MixinAssetProxyDispatcher is

2
contracts/asset-proxy/contracts/asset-proxy/MixinAuthorizable.sol → contracts/asset-proxy/contracts/src/MixinAuthorizable.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./mixins/MAuthorizable.sol"; import "./mixins/MAuthorizable.sol";

0
contracts/asset-proxy/contracts/asset-proxy/MultiAssetProxy.sol → contracts/asset-proxy/contracts/src/MultiAssetProxy.sol
View File

0
contracts/interfaces/contracts/protocol/AssetProxy/IAssetData.sol → contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol
View File

0
contracts/interfaces/contracts/protocol/AssetProxy/IAssetProxy.sol → contracts/asset-proxy/contracts/src/interfaces/IAssetProxy.sol
View File

0
contracts/interfaces/contracts/protocol/Exchange/IAssetProxyDispatcher.sol → contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol
View File

2
contracts/interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol → contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/interfaces/IOwnable.sol"; import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";
contract IAuthorizable is contract IAuthorizable is

2
contracts/asset-proxy/contracts/asset-proxy/mixins/MAssetProxyDispatcher.sol → contracts/asset-proxy/contracts/src/mixins/MAssetProxyDispatcher.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IAssetProxyDispatcher.sol"; import "../interfaces/IAssetProxyDispatcher.sol";
contract MAssetProxyDispatcher is contract MAssetProxyDispatcher is

2
contracts/asset-proxy/contracts/asset-proxy/mixins/MAuthorizable.sol → contracts/asset-proxy/contracts/src/mixins/MAuthorizable.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol"; import "../interfaces/IAuthorizable.sol";
contract MAuthorizable is contract MAuthorizable is

252
contracts/asset-proxy/generated-artifacts/ERC20Proxy.json
View File

File diff suppressed because one or more lines are too long

252
contracts/asset-proxy/generated-artifacts/ERC721Proxy.json
View File

File diff suppressed because one or more lines are too long

229
contracts/asset-proxy/generated-artifacts/MixinAuthorizable.json
View File

File diff suppressed because one or more lines are too long

337
contracts/asset-proxy/generated-artifacts/MultiAssetProxy.json
View File

File diff suppressed because one or more lines are too long

2
contracts/asset-proxy/package.json
View File

@ -32,7 +32,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "config": {
"abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|MixinAuthorizable|MultiAssetProxy).json" "abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

6
contracts/asset-proxy/src/artifacts/index.ts
View File

@ -2,10 +2,16 @@ import { ContractArtifact } from 'ethereum-types';
import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json'; import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json';
import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json'; import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json';
import * as IAssetData from '../../generated-artifacts/IAssetData.json';
import * as IAssetProxy from '../../generated-artifacts/IAssetProxy.json';
import * as IAuthorizable from '../../generated-artifacts/IAuthorizable.json';
import * as MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json'; import * as MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json';
import * as MultiAssetProxy from '../../generated-artifacts/MultiAssetProxy.json'; import * as MultiAssetProxy from '../../generated-artifacts/MultiAssetProxy.json';
export const artifacts = { export const artifacts = {
IAuthorizable: IAuthorizable as ContractArtifact,
IAssetData: IAssetData as ContractArtifact,
IAssetProxy: IAssetProxy as ContractArtifact,
ERC20Proxy: ERC20Proxy as ContractArtifact, ERC20Proxy: ERC20Proxy as ContractArtifact,
ERC721Proxy: ERC721Proxy as ContractArtifact, ERC721Proxy: ERC721Proxy as ContractArtifact,
MixinAuthorizable: MixinAuthorizable as ContractArtifact, MixinAuthorizable: MixinAuthorizable as ContractArtifact,

3
contracts/asset-proxy/src/wrappers/index.ts
View File

@ -1,4 +1,7 @@
export * from '../../generated-wrappers/i_asset_data';
export * from '../../generated-wrappers/i_asset_proxy';
export * from '../../generated-wrappers/erc20_proxy'; export * from '../../generated-wrappers/erc20_proxy';
export * from '../../generated-wrappers/erc721_proxy'; export * from '../../generated-wrappers/erc721_proxy';
export * from '../../generated-wrappers/mixin_authorizable'; export * from '../../generated-wrappers/mixin_authorizable';
export * from '../../generated-wrappers/multi_asset_proxy'; export * from '../../generated-wrappers/multi_asset_proxy';
export * from '../../generated-wrappers/i_authorizable';

3
contracts/asset-proxy/tsconfig.json
View File

@ -7,6 +7,9 @@
}, },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "files": [
"./generated-artifacts/IAssetData.json",
"./generated-artifacts/IAssetProxy.json",
"./generated-artifacts/IAuthorizable.json",
"./generated-artifacts/ERC20Proxy.json", "./generated-artifacts/ERC20Proxy.json",
"./generated-artifacts/ERC721Proxy.json", "./generated-artifacts/ERC721Proxy.json",
"./generated-artifacts/MixinAuthorizable.json", "./generated-artifacts/MixinAuthorizable.json",

56
contracts/examples/CHANGELOG.json
View File

@ -1,56 +0,0 @@
[
{
"version": "2.0.0",
"changes": [
{
"note": "Upgrade the bignumber.js to v8.0.2",
"pr": 1517
}
]
},
{
"timestamp": 1547747677,
"version": "1.0.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1547561734,
"version": "1.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1547225310,
"version": "1.0.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1544741676,
"version": "1.0.2",
"changes": [
{
"note": "Dependencies updated"
}
]
}
]

26
contracts/examples/CHANGELOG.md
View File

@ -1,26 +0,0 @@
<!--
changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
Edit the package's CHANGELOG.json file only.
-->
CHANGELOG
## v1.0.6 - _January 17, 2019_
* Dependencies updated
## v1.0.5 - _January 15, 2019_
* Dependencies updated
## v1.0.4 - _January 11, 2019_
* Dependencies updated
## v1.0.3 - _January 9, 2019_
* Dependencies updated
## v1.0.2 - _December 13, 2018_
* Dependencies updated

56
contracts/examples/README.md
View File

@ -1,56 +0,0 @@
## Contract examples
Example smart contracts that interact with 0x protocol.
## Usage
Contracts can be found in the [contracts](./contracts) directory.
This package contains example implementations of contracts that interact with the protocol but are _not_ intended for use in production. Examples include [filter](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#filter-contracts) contracts, a [Wallet](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#wallet) contract, and a [Validator](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#validator) contract, among others.
## Contributing
We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
### Install Dependencies
If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
```bash
yarn config set workspaces-experimental true
```
Then install dependencies
```bash
yarn install
```
### Build
To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
```bash
PKG=@0x/contracts-examples yarn build
```
Or continuously rebuild on change:
```bash
PKG=@0x/contracts-examples yarn watch
```
### Clean
```bash
yarn clean
```
### Lint
```bash
yarn lint
```

22
contracts/examples/compiler.json
View File

@ -1,22 +0,0 @@
{
"artifactsDir": "./generated-artifacts",
"contractsDir": "./contracts",
"compilerSettings": {
"optimizer": {
"enabled": true,
"runs": 1000000
},
"outputSelection": {
"*": {
"*": [
"abi",
"evm.bytecode.object",
"evm.bytecode.sourceMap",
"evm.deployedBytecode.object",
"evm.deployedBytecode.sourceMap"
]
}
}
},
"contracts": ["ExchangeWrapper", "Validator", "Wallet", "Whitelist"]
}

80
contracts/examples/package.json
View File

@ -1,80 +0,0 @@
{
"name": "@0x/contracts-examples",
"version": "1.0.6",
"engines": {
"node": ">=6.12"
},
"description": "Smart contract examples of 0x protocol",
"main": "lib/src/index.js",
"directories": {
"test": "test"
},
"scripts": {
"build": "yarn pre_build && tsc -b",
"build:ci": "yarn build",
"pre_build": "run-s compile generate_contract_wrappers",
"compile": "sol-compiler",
"watch": "sol-compiler -w",
"clean": "shx rm -rf lib generated-artifacts generated-wrappers",
"generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
"lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
},
"config": {
"abis": "generated-artifacts/@(ExchangeWrapper|Validator|Wallet|Whitelist).json"
},
"repository": {
"type": "git",
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/0xProject/0x-monorepo/issues"
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",
"devDependencies": {
"@0x/abi-gen": "^1.0.22",
"@0x/contracts-test-utils": "^2.0.1",
"@0x/dev-utils": "^1.0.24",
"@0x/sol-compiler": "^2.0.2",
"@0x/subproviders": "^2.1.11",
"@0x/tslint-config": "^2.0.2",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1",
"ethereumjs-abi": "0.6.5",
"make-promises-safe": "^1.1.0",
"mocha": "^4.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"solhint": "^1.4.1",
"tslint": "5.11.0",
"typescript": "3.0.1",
"yargs": "^10.0.3"
},
"dependencies": {
"@0x/base-contract": "^3.0.13",
"@0x/contracts-interfaces": "^1.0.6",
"@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-tokens": "^1.0.6",
"@0x/contracts-utils": "^1.0.6",
"@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
"@0x/utils": "^3.0.1",
"@0x/web3-wrapper": "^3.2.4",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
"ethereum-types": "^1.1.6",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
"publishConfig": {
"access": "public"
}
}

13
contracts/examples/src/artifacts/index.ts
View File

@ -1,13 +0,0 @@
import { ContractArtifact } from 'ethereum-types';
import * as ExchangeWrapper from '../../generated-artifacts/ExchangeWrapper.json';
import * as Validator from '../../generated-artifacts/Validator.json';
import * as Wallet from '../../generated-artifacts/Wallet.json';
import * as Whitelist from '../../generated-artifacts/Whitelist.json';
export const artifacts = {
ExchangeWrapper: ExchangeWrapper as ContractArtifact,
Validator: Validator as ContractArtifact,
Wallet: Wallet as ContractArtifact,
Whitelist: Whitelist as ContractArtifact,
};

2
contracts/examples/src/index.ts
View File

@ -1,2 +0,0 @@
export * from './artifacts';
export * from './wrappers';

4
contracts/examples/src/wrappers/index.ts
View File

@ -1,4 +0,0 @@
export * from '../../generated-wrappers/exchange_wrapper';
export * from '../../generated-wrappers/validator';
export * from '../../generated-wrappers/wallet';
export * from '../../generated-wrappers/whitelist';

16
contracts/examples/tsconfig.json
View File

@ -1,16 +0,0 @@
{
"extends": "../../tsconfig",
"compilerOptions": {
"outDir": "lib",
"rootDir": ".",
"resolveJsonModule": true
},
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [
"./generated-artifacts/ExchangeWrapper.json",
"./generated-artifacts/Validator.json",
"./generated-artifacts/Wallet.json",
"./generated-artifacts/Whitelist.json"
],
"exclude": ["./deploy/solc/solc_bin"]
}

6
contracts/examples/tslint.json
View File

@ -1,6 +0,0 @@
{
"extends": ["@0x/tslint-config"],
"rules": {
"custom-no-magic-numbers": false
}
}

0
contracts/exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol → contracts/exchange-libs/contracts/src/LibAbiEncoder.sol
View File

0
contracts/exchange-libs/contracts/exchange-libs/LibAssetProxyErrors.sol → contracts/exchange-libs/contracts/src/LibAssetProxyErrors.sol
View File

0
contracts/exchange-libs/contracts/exchange-libs/LibConstants.sol → contracts/exchange-libs/contracts/src/LibConstants.sol
View File

0
contracts/exchange-libs/contracts/exchange-libs/LibEIP712.sol → contracts/exchange-libs/contracts/src/LibEIP712.sol
View File

0
contracts/exchange-libs/contracts/exchange-libs/LibExchangeErrors.sol → contracts/exchange-libs/contracts/src/LibExchangeErrors.sol
View File

0
contracts/exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol → contracts/exchange-libs/contracts/src/LibExchangeSelectors.sol
View File

2
contracts/exchange-libs/contracts/exchange-libs/LibFillResults.sol → contracts/exchange-libs/contracts/src/LibFillResults.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/SafeMath.sol"; import "@0x/contracts-utils/contracts/src/SafeMath.sol";
contract LibFillResults is contract LibFillResults is

2
contracts/exchange-libs/contracts/exchange-libs/LibMath.sol → contracts/exchange-libs/contracts/src/LibMath.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/SafeMath.sol"; import "@0x/contracts-utils/contracts/src/SafeMath.sol";
contract LibMath is contract LibMath is

0
contracts/exchange-libs/contracts/exchange-libs/LibOrder.sol → contracts/exchange-libs/contracts/src/LibOrder.sol
View File

8
contracts/exchange-libs/contracts/test/TestLibs.sol
View File

@ -19,10 +19,10 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "../exchange-libs/LibMath.sol"; import "../src/LibMath.sol";
import "../exchange-libs/LibOrder.sol"; import "../src/LibOrder.sol";
import "../exchange-libs/LibFillResults.sol"; import "../src/LibFillResults.sol";
import "../exchange-libs/LibAbiEncoder.sol"; import "../src/LibAbiEncoder.sol";
contract TestLibs is contract TestLibs is

15
contracts/exchange/compiler.json
View File

@ -20,9 +20,22 @@
}, },
"contracts": [ "contracts": [
"Exchange", "Exchange",
"IAssetProxyDispatcher",
"IExchange",
"IExchangeCore",
"IMatchOrders",
"ISignatureValidator",
"ITransactions",
"IValidator",
"IWallet",
"IWrapperFunctions",
"TestAssetProxyDispatcher", "TestAssetProxyDispatcher",
"TestExchangeInternals", "TestExchangeInternals",
"TestSignatureValidator", "TestSignatureValidator",
"TestStaticCallReceiver" "TestStaticCallReceiver",
"ExchangeWrapper",
"Validator",
"Wallet",
"Whitelist"
] ]
} }

4
contracts/examples/contracts/examples/ExchangeWrapper.sol → contracts/exchange/contracts/examples/ExchangeWrapper.sol
View File

@ -19,8 +19,8 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "../src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
contract ExchangeWrapper { contract ExchangeWrapper {

2
contracts/examples/contracts/examples/Validator.sol → contracts/exchange/contracts/examples/Validator.sol
View File

@ -18,7 +18,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IValidator.sol"; import "../src/interfaces/IValidator.sol";
contract Validator is contract Validator is

4
contracts/examples/contracts/examples/Wallet.sol → contracts/exchange/contracts/examples/Wallet.sol
View File

@ -18,8 +18,8 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IWallet.sol"; import "../src/interfaces/IWallet.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
contract Wallet is contract Wallet is

6
contracts/examples/contracts/examples/Whitelist.sol → contracts/exchange/contracts/examples/Whitelist.sol
View File

@ -19,9 +19,9 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "../src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
contract Whitelist is contract Whitelist is

2
contracts/exchange/contracts/exchange/Exchange.sol → contracts/exchange/contracts/src/Exchange.sol
View File

@ -19,7 +19,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibConstants.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibConstants.sol";
import "./MixinExchangeCore.sol"; import "./MixinExchangeCore.sol";
import "./MixinSignatureValidator.sol"; import "./MixinSignatureValidator.sol";
import "./MixinWrapperFunctions.sol"; import "./MixinWrapperFunctions.sol";

4
contracts/exchange/contracts/exchange/MixinAssetProxyDispatcher.sol → contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol
View File

@ -18,9 +18,9 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./mixins/MAssetProxyDispatcher.sol"; import "./mixins/MAssetProxyDispatcher.sol";
import "@0x/contracts-interfaces/contracts/protocol/AssetProxy/IAssetProxy.sol"; import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetProxy.sol";
contract MixinAssetProxyDispatcher is contract MixinAssetProxyDispatcher is

10
contracts/exchange/contracts/exchange/MixinExchangeCore.sol → contracts/exchange/contracts/src/MixinExchangeCore.sol
View File

@ -19,11 +19,11 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard.sol"; import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibConstants.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibConstants.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "./mixins/MExchangeCore.sol"; import "./mixins/MExchangeCore.sol";
import "./mixins/MSignatureValidator.sol"; import "./mixins/MSignatureValidator.sol";
import "./mixins/MTransactions.sol"; import "./mixins/MTransactions.sol";

10
contracts/exchange/contracts/exchange/MixinMatchOrders.sol → contracts/exchange/contracts/src/MixinMatchOrders.sol
View File

@ -14,11 +14,11 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard.sol"; import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibConstants.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibConstants.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "./mixins/MExchangeCore.sol"; import "./mixins/MExchangeCore.sol";
import "./mixins/MMatchOrders.sol"; import "./mixins/MMatchOrders.sol";
import "./mixins/MTransactions.sol"; import "./mixins/MTransactions.sol";

8
contracts/exchange/contracts/exchange/MixinSignatureValidator.sol → contracts/exchange/contracts/src/MixinSignatureValidator.sol
View File

@ -18,12 +18,12 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard.sol"; import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "./mixins/MSignatureValidator.sol"; import "./mixins/MSignatureValidator.sol";
import "./mixins/MTransactions.sol"; import "./mixins/MTransactions.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IWallet.sol"; import "./interfaces/IWallet.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IValidator.sol"; import "./interfaces/IValidator.sol";
contract MixinSignatureValidator is contract MixinSignatureValidator is

4
contracts/exchange/contracts/exchange/MixinTransactions.sol → contracts/exchange/contracts/src/MixinTransactions.sol
View File

@ -17,10 +17,10 @@
*/ */
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibExchangeErrors.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibExchangeErrors.sol";
import "./mixins/MSignatureValidator.sol"; import "./mixins/MSignatureValidator.sol";
import "./mixins/MTransactions.sol"; import "./mixins/MTransactions.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibEIP712.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibEIP712.sol";
contract MixinTransactions is contract MixinTransactions is

10
contracts/exchange/contracts/exchange/MixinWrapperFunctions.sol → contracts/exchange/contracts/src/MixinWrapperFunctions.sol
View File

@ -19,11 +19,11 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard.sol"; import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibAbiEncoder.sol";
import "./mixins/MExchangeCore.sol"; import "./mixins/MExchangeCore.sol";
import "./mixins/MWrapperFunctions.sol"; import "./mixins/MWrapperFunctions.sol";

37
contracts/exchange/contracts/src/interfaces/IAssetProxyDispatcher.sol Normal file
View File

@ -0,0 +1,37 @@
/*
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.4.24;
contract IAssetProxyDispatcher {
/// @dev Registers an asset proxy to its asset proxy id.
/// Once an asset proxy is registered, it cannot be unregistered.
/// @param assetProxy Address of new asset proxy to register.
function registerAssetProxy(address assetProxy)
external;
/// @dev Gets an asset proxy.
/// @param assetProxyId Id of the asset proxy.
/// @return The asset proxy registered to assetProxyId. Returns 0x0 if no proxy is registered.
function getAssetProxy(bytes4 assetProxyId)
external
view
returns (address);
}

0
contracts/interfaces/contracts/protocol/Exchange/IExchange.sol → contracts/exchange/contracts/src/interfaces/IExchange.sol
View File

4
contracts/interfaces/contracts/protocol/Exchange/IExchangeCore.sol → contracts/exchange/contracts/src/interfaces/IExchangeCore.sol
View File

@ -19,8 +19,8 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
contract IExchangeCore { contract IExchangeCore {

4
contracts/interfaces/contracts/protocol/Exchange/IMatchOrders.sol → contracts/exchange/contracts/src/interfaces/IMatchOrders.sol
View File

@ -18,8 +18,8 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
contract IMatchOrders { contract IMatchOrders {

0
contracts/interfaces/contracts/protocol/Exchange/ISignatureValidator.sol → contracts/exchange/contracts/src/interfaces/ISignatureValidator.sol
View File

0
contracts/interfaces/contracts/protocol/Exchange/ITransactions.sol → contracts/exchange/contracts/src/interfaces/ITransactions.sol
View File

0
contracts/interfaces/contracts/protocol/Exchange/IValidator.sol → contracts/exchange/contracts/src/interfaces/IValidator.sol
View File

0
contracts/interfaces/contracts/protocol/Exchange/IWallet.sol → contracts/exchange/contracts/src/interfaces/IWallet.sol
View File

4
contracts/interfaces/contracts/protocol/Exchange/IWrapperFunctions.sol → contracts/exchange/contracts/src/interfaces/IWrapperFunctions.sol
View File

@ -19,8 +19,8 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
contract IWrapperFunctions { contract IWrapperFunctions {

2
contracts/exchange/contracts/exchange/mixins/MAssetProxyDispatcher.sol → contracts/exchange/contracts/src/mixins/MAssetProxyDispatcher.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IAssetProxyDispatcher.sol"; import "../interfaces/IAssetProxyDispatcher.sol";
contract MAssetProxyDispatcher is contract MAssetProxyDispatcher is

6
contracts/exchange/contracts/exchange/mixins/MExchangeCore.sol → contracts/exchange/contracts/src/mixins/MExchangeCore.sol
View File

@ -19,9 +19,9 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchangeCore.sol"; import "../interfaces/IExchangeCore.sol";
contract MExchangeCore is contract MExchangeCore is

6
contracts/exchange/contracts/exchange/mixins/MMatchOrders.sol → contracts/exchange/contracts/src/mixins/MMatchOrders.sol
View File

@ -18,9 +18,9 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IMatchOrders.sol"; import "../interfaces/IMatchOrders.sol";
contract MMatchOrders is contract MMatchOrders is

2
contracts/exchange/contracts/exchange/mixins/MSignatureValidator.sol → contracts/exchange/contracts/src/mixins/MSignatureValidator.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/ISignatureValidator.sol"; import "../interfaces/ISignatureValidator.sol";
contract MSignatureValidator is contract MSignatureValidator is

2
contracts/exchange/contracts/exchange/mixins/MTransactions.sol → contracts/exchange/contracts/src/mixins/MTransactions.sol
View File

@ -17,7 +17,7 @@
*/ */
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/ITransactions.sol"; import "../interfaces/ITransactions.sol";
contract MTransactions is contract MTransactions is

6
contracts/exchange/contracts/exchange/mixins/MWrapperFunctions.sol → contracts/exchange/contracts/src/mixins/MWrapperFunctions.sol
View File

@ -19,9 +19,9 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IWrapperFunctions.sol"; import "../interfaces/IWrapperFunctions.sol";
contract MWrapperFunctions is contract MWrapperFunctions is

2
contracts/exchange/contracts/test/TestAssetProxyDispatcher.sol
View File

@ -18,7 +18,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "../exchange/MixinAssetProxyDispatcher.sol"; import "../src/MixinAssetProxyDispatcher.sol";
contract TestAssetProxyDispatcher is contract TestAssetProxyDispatcher is

2
contracts/exchange/contracts/test/TestExchangeInternals.sol
View File

@ -19,7 +19,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "../exchange/Exchange.sol"; import "../src/Exchange.sol";
// solhint-disable no-empty-blocks // solhint-disable no-empty-blocks

4
contracts/exchange/contracts/test/TestSignatureValidator.sol
View File

@ -18,8 +18,8 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "../exchange/MixinSignatureValidator.sol"; import "../src/MixinSignatureValidator.sol";
import "../exchange/MixinTransactions.sol"; import "../src/MixinTransactions.sol";
contract TestSignatureValidator is contract TestSignatureValidator is

2
contracts/exchange/contracts/test/TestStaticCallReceiver.sol
View File

@ -18,7 +18,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
// solhint-disable no-unused-vars // solhint-disable no-unused-vars

6
contracts/exchange/package.json
View File

@ -32,7 +32,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "config": {
"abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver).json" "abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|Exchange|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IWrapperFunctions|IValidator|IWallet|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver|ExchangeWrapper|Validator|Wallet|Whitelist).json"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -69,10 +69,8 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-examples": "^1.0.6",
"@0x/contracts-asset-proxy": "^2.2.3", "@0x/contracts-asset-proxy": "^2.2.3",
"@0x/contracts-interfaces": "^1.0.6", "@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-libs": "^1.0.6",
"@0x/contracts-multisig": "^1.0.6", "@0x/contracts-multisig": "^1.0.6",
"@0x/contracts-test-utils": "^2.0.1", "@0x/contracts-test-utils": "^2.0.1",
"@0x/contracts-tokens": "^1.0.6", "@0x/contracts-tokens": "^1.0.6",

26
contracts/exchange/src/artifacts/index.ts
View File

@ -1,10 +1,23 @@
import { ContractArtifact } from 'ethereum-types'; import { ContractArtifact } from 'ethereum-types';
import * as Exchange from '../../generated-artifacts/Exchange.json'; 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 IExchange from '../../generated-artifacts/IExchange.json';
import * as IExchangeCore from '../../generated-artifacts/IExchangeCore.json';
import * as IMatchOrders from '../../generated-artifacts/IMatchOrders.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 TestAssetProxyDispatcher from '../../generated-artifacts/TestAssetProxyDispatcher.json'; import * as TestAssetProxyDispatcher from '../../generated-artifacts/TestAssetProxyDispatcher.json';
import * as TestExchangeInternals from '../../generated-artifacts/TestExchangeInternals.json'; import * as TestExchangeInternals from '../../generated-artifacts/TestExchangeInternals.json';
import * as TestSignatureValidator from '../../generated-artifacts/TestSignatureValidator.json'; import * as TestSignatureValidator from '../../generated-artifacts/TestSignatureValidator.json';
import * as TestStaticCallReceiver from '../../generated-artifacts/TestStaticCallReceiver.json'; import * as TestStaticCallReceiver from '../../generated-artifacts/TestStaticCallReceiver.json';
import * as Validator from '../../generated-artifacts/Validator.json';
import * as Wallet from '../../generated-artifacts/Wallet.json';
import * as Whitelist from '../../generated-artifacts/Whitelist.json';
export const artifacts = { export const artifacts = {
Exchange: Exchange as ContractArtifact, Exchange: Exchange as ContractArtifact,
@ -12,4 +25,17 @@ export const artifacts = {
TestExchangeInternals: TestExchangeInternals as ContractArtifact, TestExchangeInternals: TestExchangeInternals as ContractArtifact,
TestSignatureValidator: TestSignatureValidator as ContractArtifact, TestSignatureValidator: TestSignatureValidator as ContractArtifact,
TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact, TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
IExchange: IExchange as ContractArtifact,
IExchangeCore: IExchangeCore as ContractArtifact,
IMatchOrders: IMatchOrders as ContractArtifact,
ISignatureValidator: ISignatureValidator as ContractArtifact,
ITransactions: ITransactions as ContractArtifact,
IWrapperFunctions: IWrapperFunctions as ContractArtifact,
IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
IValidator: IValidator as ContractArtifact,
IWallet: IWallet as ContractArtifact,
ExchangeWrapper: ExchangeWrapper as ContractArtifact,
Validator: Validator as ContractArtifact,
Wallet: Wallet as ContractArtifact,
Whitelist: Whitelist as ContractArtifact,
}; };

13
contracts/exchange/src/wrappers/index.ts
View File

@ -3,3 +3,16 @@ export * from '../../generated-wrappers/test_asset_proxy_dispatcher';
export * from '../../generated-wrappers/test_exchange_internals'; export * from '../../generated-wrappers/test_exchange_internals';
export * from '../../generated-wrappers/test_signature_validator'; export * from '../../generated-wrappers/test_signature_validator';
export * from '../../generated-wrappers/test_static_call_receiver'; export * from '../../generated-wrappers/test_static_call_receiver';
export * from '../../generated-wrappers/i_asset_proxy_dispatcher';
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_signature_validator';
export * from '../../generated-wrappers/i_transactions';
export * from '../../generated-wrappers/i_wrapper_functions';
export * from '../../generated-wrappers/i_validator';
export * from '../../generated-wrappers/i_wallet';
export * from '../../generated-wrappers/exchange_wrapper';
export * from '../../generated-wrappers/validator';
export * from '../../generated-wrappers/wallet';
export * from '../../generated-wrappers/whitelist';

7
contracts/exchange/test/signature_validator.ts
View File

@ -1,4 +1,3 @@
import { artifacts as examplesArtifacts, ValidatorContract, WalletContract } from '@0x/contracts-examples';
import { import {
addressUtils, addressUtils,
chaiSetup, chaiSetup,
@ -23,6 +22,8 @@ import {
TestSignatureValidatorContract, TestSignatureValidatorContract,
TestSignatureValidatorSignatureValidatorApprovalEventArgs, TestSignatureValidatorSignatureValidatorApprovalEventArgs,
TestStaticCallReceiverContract, TestStaticCallReceiverContract,
ValidatorContract,
WalletContract,
} from '../src'; } from '../src';
chaiSetup.configure(); chaiSetup.configure();
@ -61,13 +62,13 @@ describe('MixinSignatureValidator', () => {
txDefaults, txDefaults,
); );
testWallet = await WalletContract.deployFrom0xArtifactAsync( testWallet = await WalletContract.deployFrom0xArtifactAsync(
examplesArtifacts.Wallet, artifacts.Wallet,
provider, provider,
txDefaults, txDefaults,
signerAddress, signerAddress,
); );
testValidator = await ValidatorContract.deployFrom0xArtifactAsync( testValidator = await ValidatorContract.deployFrom0xArtifactAsync(
examplesArtifacts.Validator, artifacts.Validator,
provider, provider,
txDefaults, txDefaults,
signerAddress, signerAddress,

7
contracts/exchange/test/transactions.ts
View File

@ -1,5 +1,4 @@
import { ERC20ProxyContract } from '@0x/contracts-asset-proxy'; import { ERC20ProxyContract } from '@0x/contracts-asset-proxy';
import { artifacts as examplesArtifacts, ExchangeWrapperContract, WhitelistContract } from '@0x/contracts-examples';
import { import {
chaiSetup, chaiSetup,
constants, constants,
@ -22,7 +21,7 @@ import * as chai from 'chai';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { ExchangeContract } from '../generated-wrappers/exchange'; import { ExchangeContract } from '../generated-wrappers/exchange';
import { artifacts } from '../src/artifacts'; import { artifacts, ExchangeWrapperContract, WhitelistContract } from '../src/';
import { ERC20Wrapper } from './utils/erc20_wrapper'; import { ERC20Wrapper } from './utils/erc20_wrapper';
import { ExchangeWrapper } from './utils/exchange_wrapper'; import { ExchangeWrapper } from './utils/exchange_wrapper';
@ -222,7 +221,7 @@ describe('Exchange transactions', () => {
before(async () => { before(async () => {
exchangeWrapperContract = await ExchangeWrapperContract.deployFrom0xArtifactAsync( exchangeWrapperContract = await ExchangeWrapperContract.deployFrom0xArtifactAsync(
examplesArtifacts.ExchangeWrapper, artifacts.ExchangeWrapper,
provider, provider,
txDefaults, txDefaults,
exchange.address, exchange.address,
@ -336,7 +335,7 @@ describe('Exchange transactions', () => {
before(async () => { before(async () => {
whitelist = await WhitelistContract.deployFrom0xArtifactAsync( whitelist = await WhitelistContract.deployFrom0xArtifactAsync(
examplesArtifacts.Whitelist, artifacts.Whitelist,
provider, provider,
txDefaults, txDefaults,
exchange.address, exchange.address,

15
contracts/exchange/tsconfig.json
View File

@ -7,11 +7,24 @@
}, },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "files": [
"./generated-artifacts/IAssetProxyDispatcher.json",
"./generated-artifacts/IExchange.json",
"./generated-artifacts/IExchangeCore.json",
"./generated-artifacts/IMatchOrders.json",
"./generated-artifacts/ISignatureValidator.json",
"./generated-artifacts/ITransactions.json",
"./generated-artifacts/IValidator.json",
"./generated-artifacts/IWallet.json",
"./generated-artifacts/IWrapperFunctions.json",
"./generated-artifacts/Exchange.json", "./generated-artifacts/Exchange.json",
"./generated-artifacts/TestAssetProxyDispatcher.json", "./generated-artifacts/TestAssetProxyDispatcher.json",
"./generated-artifacts/TestExchangeInternals.json", "./generated-artifacts/TestExchangeInternals.json",
"./generated-artifacts/TestSignatureValidator.json", "./generated-artifacts/TestSignatureValidator.json",
"./generated-artifacts/TestStaticCallReceiver.json" "./generated-artifacts/TestStaticCallReceiver.json",
"./generated-artifacts/ExchangeWrapper.json",
"./generated-artifacts/Validator.json",
"./generated-artifacts/Wallet.json",
"./generated-artifacts/Whitelist.json"
], ],
"exclude": ["./deploy/solc/solc_bin"] "exclude": ["./deploy/solc/solc_bin"]
} }

2
contracts/extensions/contracts/BalanceThresholdFilter/BalanceThresholdFilter.sol
View File

@ -18,7 +18,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "./interfaces/IThresholdAsset.sol"; import "./interfaces/IThresholdAsset.sol";
import "./MixinBalanceThresholdFilterCore.sol"; import "./MixinBalanceThresholdFilterCore.sol";

4
contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
View File

@ -18,8 +18,8 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "./mixins/MBalanceThresholdFilterCore.sol"; import "./mixins/MBalanceThresholdFilterCore.sol";
import "./MixinExchangeCalldata.sol"; import "./MixinExchangeCalldata.sol";

2
contracts/extensions/contracts/BalanceThresholdFilter/MixinExchangeCalldata.sol
View File

@ -20,7 +20,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "./mixins/MExchangeCalldata.sol"; import "./mixins/MExchangeCalldata.sol";
import "@0x/contracts-utils/contracts/utils/LibAddressArray.sol"; import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
contract MixinExchangeCalldata is contract MixinExchangeCalldata is

2
contracts/extensions/contracts/BalanceThresholdFilter/mixins/MBalanceThresholdFilterCore.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "../interfaces/IThresholdAsset.sol"; import "../interfaces/IThresholdAsset.sol";
import "../interfaces/IBalanceThresholdFilterCore.sol"; import "../interfaces/IBalanceThresholdFilterCore.sol";

10
contracts/extensions/contracts/DutchAuction/DutchAuction.sol
View File

@ -19,11 +19,11 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/SafeMath.sol"; import "@0x/contracts-utils/contracts/src/SafeMath.sol";
contract DutchAuction is contract DutchAuction is

8
contracts/extensions/contracts/Forwarder/MixinAssets.sol
View File

@ -18,10 +18,10 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol"; import "@0x/contracts-tokens/contracts/ERC721Token/IERC721Token.sol";
import "./libs/LibConstants.sol"; import "./libs/LibConstants.sol";
import "./mixins/MAssets.sol"; import "./mixins/MAssets.sol";

8
contracts/extensions/contracts/Forwarder/MixinExchangeWrapper.sol
View File

@ -21,10 +21,10 @@ pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol"; import "./libs/LibConstants.sol";
import "./mixins/MExchangeWrapper.sol"; import "./mixins/MExchangeWrapper.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibAbiEncoder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
contract MixinExchangeWrapper is contract MixinExchangeWrapper is

8
contracts/extensions/contracts/Forwarder/MixinForwarderCore.sol
View File

@ -24,10 +24,10 @@ import "./mixins/MWeth.sol";
import "./mixins/MAssets.sol"; import "./mixins/MAssets.sol";
import "./mixins/MExchangeWrapper.sol"; import "./mixins/MExchangeWrapper.sol";
import "./interfaces/IForwarderCore.sol"; import "./interfaces/IForwarderCore.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
contract MixinForwarderCore is contract MixinForwarderCore is

2
contracts/extensions/contracts/Forwarder/MixinWeth.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "./libs/LibConstants.sol"; import "./libs/LibConstants.sol";
import "./mixins/MWeth.sol"; import "./mixins/MWeth.sol";

4
contracts/extensions/contracts/Forwarder/interfaces/IForwarderCore.sol
View File

@ -19,8 +19,8 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
contract IForwarderCore { contract IForwarderCore {

8
contracts/extensions/contracts/Forwarder/libs/LibConstants.sol
View File

@ -18,10 +18,10 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-tokens/contracts/tokens/EtherToken/IEtherToken.sol"; import "@0x/contracts-tokens/contracts/EtherToken/IEtherToken.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
contract LibConstants { contract LibConstants {

4
contracts/extensions/contracts/Forwarder/mixins/MExchangeWrapper.sol
View File

@ -19,8 +19,8 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
contract MExchangeWrapper { contract MExchangeWrapper {

8
contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
View File

@ -18,10 +18,10 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol"; import "@0x/contracts-tokens/contracts/ERC721Token/IERC721Token.sol";
import "./mixins/MAssets.sol"; import "./mixins/MAssets.sol";
import "./libs/LibConstants.sol"; import "./libs/LibConstants.sol";

6
contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
View File

@ -20,9 +20,9 @@ pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol"; import "./libs/LibConstants.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
contract MixinMatchOrders is contract MixinMatchOrders is

2
contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
View File

@ -19,7 +19,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/Ownable.sol"; import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./libs/LibConstants.sol"; import "./libs/LibConstants.sol";
import "./MixinMatchOrders.sol"; import "./MixinMatchOrders.sol";
import "./MixinAssets.sol"; import "./MixinAssets.sol";

2
contracts/extensions/contracts/OrderMatcher/interfaces/IMatchOrders.sol
View File

@ -19,7 +19,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
contract IMatchOrders { contract IMatchOrders {

2
contracts/extensions/contracts/OrderMatcher/interfaces/IOrderMatcher.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contract-utils/contracts/utils/Ownable/IOwnable.sol"; import "@0x/contract-utils/contracts/src/interfaces/IOwnable.sol";
import "./IMatchOrders.sol"; import "./IMatchOrders.sol";
import "./IAssets.sol"; import "./IAssets.sol";

2
contracts/extensions/contracts/OrderMatcher/libs/LibConstants.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
contract LibConstants { contract LibConstants {

10
contracts/extensions/contracts/OrderValidator/OrderValidator.sol
View File

@ -19,11 +19,11 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol"; import "@0x/contracts-tokens/contracts/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol";
contract OrderValidator { contract OrderValidator {

1
contracts/extensions/package.json
View File

@ -72,7 +72,6 @@
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-asset-proxy": "^2.2.3", "@0x/contracts-asset-proxy": "^2.2.3",
"@0x/contracts-interfaces": "^1.0.6",
"@0x/contracts-exchange-libs": "^1.0.6", "@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-exchange": "^2.2.3", "@0x/contracts-exchange": "^2.2.3",
"@0x/contracts-tokens": "^1.0.6", "@0x/contracts-tokens": "^1.0.6",

56
contracts/interfaces/CHANGELOG.json
View File

@ -1,56 +0,0 @@
[
{
"version": "2.0.0",
"changes": [
{
"note": "Upgrade the bignumber.js to v8.0.2",
"pr": 1517
}
]
},
{
"timestamp": 1547747677,
"version": "1.0.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1547561734,
"version": "1.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1547225310,
"version": "1.0.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1544741676,
"version": "1.0.2",
"changes": [
{
"note": "Dependencies updated"
}
]
}
]

Some files were not shown because too many files have changed in this diff Show More