From e77a608f45ed29c848dc33a93ea669ace768335e Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 11 Mar 2019 19:06:06 -0700 Subject: [PATCH] Got build working on erc1155 --- contracts/erc1155/compiler.json | 6 +++--- contracts/erc1155/package.json | 2 +- contracts/erc1155/src/artifacts.ts | 12 ++++++------ contracts/erc1155/src/wrappers.ts | 4 ++-- contracts/erc1155/tsconfig.json | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json index e24bb9224b..e545f46b08 100644 --- a/contracts/erc1155/compiler.json +++ b/contracts/erc1155/compiler.json @@ -18,13 +18,13 @@ } }, "contracts": [ - "test/DummyERC1155Receiver.sol", "src/ERC1155.sol", - "src/mixins/MNonFungibleToken.sol", "src/ERC1155Mintable.sol", "src/MixinNonFungibleToken.sol", + "src/interfaces/IERC1155.sol", "src/interfaces/IERC1155Mintable.sol", "src/interfaces/IERC1155Receiver.sol", - "src/interfaces/IERC1155.sol" + "src/mixins/MNonFungibleToken.sol", + "test/DummyERC1155Receiver.sol" ] } diff --git a/contracts/erc1155/package.json b/contracts/erc1155/package.json index e988deed8f..9c26f1c275 100644 --- a/contracts/erc1155/package.json +++ b/contracts/erc1155/package.json @@ -33,7 +33,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(Address|DummyERC1155Receiver|ERC1155|ERC1155Mintable|IERC1155|IERC1155Receiver|MixinNonFungibleToken|SafeMath).json", + "abis": "generated-artifacts/@(DummyERC1155Receiver|ERC1155|ERC1155Mintable|IERC1155|IERC1155Mintable|IERC1155Receiver|MNonFungibleToken|MixinNonFungibleToken).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/erc1155/src/artifacts.ts b/contracts/erc1155/src/artifacts.ts index 1ec22628ad..3958d5d9ca 100644 --- a/contracts/erc1155/src/artifacts.ts +++ b/contracts/erc1155/src/artifacts.ts @@ -5,21 +5,21 @@ */ import { ContractArtifact } from 'ethereum-types'; -import * as Address from '../generated-artifacts/Address.json'; import * as DummyERC1155Receiver from '../generated-artifacts/DummyERC1155Receiver.json'; import * as ERC1155 from '../generated-artifacts/ERC1155.json'; import * as ERC1155Mintable from '../generated-artifacts/ERC1155Mintable.json'; import * as IERC1155 from '../generated-artifacts/IERC1155.json'; +import * as IERC1155Mintable from '../generated-artifacts/IERC1155Mintable.json'; import * as IERC1155Receiver from '../generated-artifacts/IERC1155Receiver.json'; import * as MixinNonFungibleToken from '../generated-artifacts/MixinNonFungibleToken.json'; -import * as SafeMath from '../generated-artifacts/SafeMath.json'; +import * as MNonFungibleToken from '../generated-artifacts/MNonFungibleToken.json'; export const artifacts = { + DummyERC1155Receiver: DummyERC1155Receiver as ContractArtifact, ERC1155: ERC1155 as ContractArtifact, + MNonFungibleToken: MNonFungibleToken as ContractArtifact, ERC1155Mintable: ERC1155Mintable as ContractArtifact, MixinNonFungibleToken: MixinNonFungibleToken as ContractArtifact, - IERC1155: IERC1155 as ContractArtifact, + IERC1155Mintable: IERC1155Mintable as ContractArtifact, IERC1155Receiver: IERC1155Receiver as ContractArtifact, - Address: Address as ContractArtifact, - SafeMath: SafeMath as ContractArtifact, - DummyERC1155Receiver: DummyERC1155Receiver as ContractArtifact, + IERC1155: IERC1155 as ContractArtifact, }; diff --git a/contracts/erc1155/src/wrappers.ts b/contracts/erc1155/src/wrappers.ts index 557d3dde9e..fad5514a49 100644 --- a/contracts/erc1155/src/wrappers.ts +++ b/contracts/erc1155/src/wrappers.ts @@ -3,11 +3,11 @@ * Warning: This file is auto-generated by contracts-gen. Don't edit manually. * ----------------------------------------------------------------------------- */ -export * from '../generated-wrappers/address'; export * from '../generated-wrappers/dummy_erc1155_receiver'; export * from '../generated-wrappers/erc1155'; export * from '../generated-wrappers/erc1155_mintable'; +export * from '../generated-wrappers/i_erc1155_mintable'; export * from '../generated-wrappers/i_erc1155_receiver'; export * from '../generated-wrappers/ierc1155'; +export * from '../generated-wrappers/m_non_fungible_token'; export * from '../generated-wrappers/mixin_non_fungible_token'; -export * from '../generated-wrappers/safe_math'; diff --git a/contracts/erc1155/tsconfig.json b/contracts/erc1155/tsconfig.json index b26787d056..04206336be 100644 --- a/contracts/erc1155/tsconfig.json +++ b/contracts/erc1155/tsconfig.json @@ -3,14 +3,14 @@ "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "generated-artifacts/Address.json", "generated-artifacts/DummyERC1155Receiver.json", "generated-artifacts/ERC1155.json", "generated-artifacts/ERC1155Mintable.json", "generated-artifacts/IERC1155.json", + "generated-artifacts/IERC1155Mintable.json", "generated-artifacts/IERC1155Receiver.json", - "generated-artifacts/MixinNonFungibleToken.json", - "generated-artifacts/SafeMath.json" + "generated-artifacts/MNonFungibleToken.json", + "generated-artifacts/MixinNonFungibleToken.json" ], "exclude": ["./deploy/solc/solc_bin"] }