diff options
Diffstat (limited to 'contracts/erc721')
| -rw-r--r-- | contracts/erc721/compiler.json | 19 | ||||
| -rw-r--r-- | contracts/erc721/package.json | 5 | ||||
| -rw-r--r-- | contracts/erc721/src/artifacts.ts | 19 | ||||
| -rw-r--r-- | contracts/erc721/src/artifacts/index.ts | 20 | ||||
| -rw-r--r-- | contracts/erc721/src/wrappers.ts | 8 | ||||
| -rw-r--r-- | contracts/erc721/src/wrappers/index.ts | 7 | ||||
| -rw-r--r-- | contracts/erc721/tsconfig.json | 20 |
7 files changed, 47 insertions, 51 deletions
diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index db8589016..09d79ba28 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,12 +17,12 @@ } }, "contracts": [ - "DummyERC721Receiver", - "InvalidERC721Receiver", - "DummyERC721Token", - "ERC721Token", - "IERC721Receiver", - "IERC721Token", - "MintableERC721Token" + "src/ERC721Token.sol", + "src/MintableERC721Token.sol", + "src/interfaces/IERC721Receiver.sol", + "src/interfaces/IERC721Token.sol", + "test/DummyERC721Receiver.sol", + "test/DummyERC721Token.sol", + "test/InvalidERC721Receiver.sol" ] } diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 096e1025e..54f261a80 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(DummyERC721Receiver|InvalidERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|MintableERC721Token).json" + "abis": "./generated-artifacts/@(DummyERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|InvalidERC721Receiver|MintableERC721Token).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -49,6 +51,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/erc721/src/artifacts.ts b/contracts/erc721/src/artifacts.ts new file mode 100644 index 000000000..daa29a83c --- /dev/null +++ b/contracts/erc721/src/artifacts.ts @@ -0,0 +1,19 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json'; +import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json'; +import * as ERC721Token from '../generated-artifacts/ERC721Token.json'; +import * as IERC721Receiver from '../generated-artifacts/IERC721Receiver.json'; +import * as IERC721Token from '../generated-artifacts/IERC721Token.json'; +import * as InvalidERC721Receiver from '../generated-artifacts/InvalidERC721Receiver.json'; +import * as MintableERC721Token from '../generated-artifacts/MintableERC721Token.json'; +export const artifacts = { + ERC721Token: ERC721Token as ContractArtifact, + MintableERC721Token: MintableERC721Token as ContractArtifact, + IERC721Receiver: IERC721Receiver as ContractArtifact, + IERC721Token: IERC721Token as ContractArtifact, + DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact, +}; diff --git a/contracts/erc721/src/artifacts/index.ts b/contracts/erc721/src/artifacts/index.ts deleted file mode 100644 index 8d5ec8a46..000000000 --- a/contracts/erc721/src/artifacts/index.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as DummyERC721Receiver from '../../generated-artifacts/DummyERC721Receiver.json'; -import * as DummyERC721Token from '../../generated-artifacts/DummyERC721Token.json'; -import * as ERC721Token from '../../generated-artifacts/ERC721Token.json'; -import * as IERC721Receiver from '../../generated-artifacts/IERC721Receiver.json'; -import * as IERC721Token from '../../generated-artifacts/IERC721Token.json'; -import * as InvalidERC721Receiver from '../../generated-artifacts/InvalidERC721Receiver.json'; -import * as MintableERC721Token from '../../generated-artifacts/MintableERC721Token.json'; - -// tslint:disable:no-unnecessary-type-assertion -export const artifacts = { - DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, - InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact, - DummyERC721Token: DummyERC721Token as ContractArtifact, - ERC721Token: ERC721Token as ContractArtifact, - IERC721Receiver: IERC721Receiver as ContractArtifact, - IERC721Token: IERC721Token as ContractArtifact, - MintableERC721Token: MintableERC721Token as ContractArtifact, -}; diff --git a/contracts/erc721/src/wrappers.ts b/contracts/erc721/src/wrappers.ts new file mode 100644 index 000000000..909e05868 --- /dev/null +++ b/contracts/erc721/src/wrappers.ts @@ -0,0 +1,8 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/dummy_erc721_receiver'; +export * from '../generated-wrappers/dummy_erc721_token'; +export * from '../generated-wrappers/erc721_token'; +export * from '../generated-wrappers/i_erc721_receiver'; +export * from '../generated-wrappers/i_erc721_token'; +export * from '../generated-wrappers/invalid_erc721_receiver'; +export * from '../generated-wrappers/mintable_erc721_token'; diff --git a/contracts/erc721/src/wrappers/index.ts b/contracts/erc721/src/wrappers/index.ts deleted file mode 100644 index ba6c51885..000000000 --- a/contracts/erc721/src/wrappers/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from '../../generated-wrappers/mintable_erc721_token'; -export * from '../../generated-wrappers/invalid_erc721_receiver'; -export * from '../../generated-wrappers/i_erc721_token'; -export * from '../../generated-wrappers/i_erc721_receiver'; -export * from '../../generated-wrappers/erc721_token'; -export * from '../../generated-wrappers/dummy_erc721_token'; -export * from '../../generated-wrappers/dummy_erc721_receiver'; diff --git a/contracts/erc721/tsconfig.json b/contracts/erc721/tsconfig.json index 098c3a7f3..3b218affe 100644 --- a/contracts/erc721/tsconfig.json +++ b/contracts/erc721/tsconfig.json @@ -1,19 +1,15 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/DummyERC721Receiver.json", - "./generated-artifacts/InvalidERC721Receiver.json", - "./generated-artifacts/DummyERC721Token.json", - "./generated-artifacts/ERC721Token.json", - "./generated-artifacts/IERC721Receiver.json", - "./generated-artifacts/IERC721Token.json", - "./generated-artifacts/MintableERC721Token.json" + "generated-artifacts/DummyERC721Receiver.json", + "generated-artifacts/DummyERC721Token.json", + "generated-artifacts/ERC721Token.json", + "generated-artifacts/IERC721Receiver.json", + "generated-artifacts/IERC721Token.json", + "generated-artifacts/InvalidERC721Receiver.json", + "generated-artifacts/MintableERC721Token.json" ], "exclude": ["./deploy/solc/solc_bin"] } |