Merge pull request #2336 from 0xProject/feature/upgrade-instant-v3

Upgrade instant v3
0xProject · Nov 26, 2019 · 4b5f2c3 · 4b5f2c3
2 parents f15e21f + 935dca6
commit 4b5f2c3
Show file tree

Hide file tree

Showing 109 changed files with 2,584 additions and 3,882 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -93,8 +93,8 @@ jobs:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run:
-                command: yarn test:publish:circleci
-                no_output_timeout: 1800
+                  command: yarn test:publish:circleci
+                  no_output_timeout: 1800
     test-doc-generation:
         docker:
             - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -104,8 +104,8 @@ jobs:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run:
-                command: yarn test:generate_docs:circleci
-                no_output_timeout: 1200
+                  command: yarn test:generate_docs:circleci
+                  no_output_timeout: 1200
     test-rest:
         docker:
             - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -125,7 +125,7 @@ jobs:
             - run: yarn wsrun test:circleci @0x/dev-utils
             - run: yarn wsrun test:circleci @0x/json-schemas
             - run: yarn wsrun test:circleci @0x/order-utils
-            # - run: yarn wsrun test:circleci @0x/orderbook
+            - run: yarn wsrun test:circleci @0x/orderbook
             - run: yarn wsrun test:circleci @0x/sol-compiler
             - run: yarn wsrun test:circleci @0x/sol-tracing-utils
             - run: yarn wsrun test:circleci @0x/sol-doc
@@ -142,9 +142,9 @@ jobs:
                   paths:
                       - ~/repo/packages/assert/coverage/lcov.info
             - save_cache:
-                  key: coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
+                  key: coverage-asset-swapper-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
-                      - ~/repo/packages/asset-buyer/coverage/lcov.info
+                      - ~/repo/packages/asset-swapper/coverage/lcov.info
             - save_cache:
                   key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -362,7 +362,7 @@ jobs:
                       - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
-                      - coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
+                      - coverage-asset-swapper-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}

diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
@@ -19,7 +19,7 @@ contracts: ['contracts']
 @0x/sol-tracing-utils: ['packages/sol-tracing-utils']
 @0x/utils: ['packages/utils']
 @0x/tslint-config: ['packages/tslint-config']
-@0x/asset-buyer: ['packages/asset-buyer']
+@0x/asset-swapper: ['packages/asset-swapper']
 @0x/order-utils: ['packages/order-utils']
 @0x/assert: ['packages/assert']
 @0x/base-contract: ['packages/base-contract']

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -5,8 +5,8 @@
 # https://git-scm.com/docs/gitignore#_pattern_format
 
 # Website
-packages/asset-buyer/  @BMillman19 @fragosti @steveklebanoff
-packages/instant/  @BMillman19 @fragosti @steveklebanoff
+packages/asset-swapper/  @BMillman19 @fragosti @dave4506
+packages/instant/  @BMillman19 @fragosti @dave4506
 
 # Dev tools & setup
 .circleci/ @LogvinovLeon

diff --git a/README.md b/README.md
@@ -65,7 +65,6 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 | [`@0x/abi-gen-wrappers`](/packages/abi-gen-wrappers)     | [![npm](https://img.shields.io/npm/v/@0x/abi-gen-wrappers.svg)](https://www.npmjs.com/package/@0x/abi-gen-wrappers)     | Low-level 0x smart contract wrappers generated using `@0x/abi-gen`                                |
 | [`@0x/sra-spec`](/packages/sra-spec)                     | [![npm](https://img.shields.io/npm/v/@0x/sra-spec.svg)](https://www.npmjs.com/package/@0x/sra-spec)                     | OpenAPI specification for the Standard Relayer API                                                |
 | [`@0x/connect`](/packages/connect)                       | [![npm](https://img.shields.io/npm/v/@0x/connect.svg)](https://www.npmjs.com/package/@0x/connect)                       | An HTTP/WS client for interacting with the Standard Relayer API                                   |
-| [`@0x/asset-buyer`](/packages/asset-buyer)               | [![npm](https://img.shields.io/npm/v/@0x/asset-buyer.svg)](https://www.npmjs.com/package/@0x/asset-buyer)               | Convenience package for discovering and buying assets with Ether                                  |
 | [`@0x/asset-swapper`](/packages/asset-swapper)           | [![npm](https://img.shields.io/npm/v/@0x/asset-swapper.svg)](https://www.npmjs.com/package/@0x/asset-swapper)           | Convenience package for discovering and performing swaps for any ERC20 Assets                     |
 
 #### Ethereum tooling

diff --git a/contracts/asset-proxy/src/index.ts b/contracts/asset-proxy/src/index.ts
@@ -16,7 +16,7 @@ export {
 export { ERC20Wrapper } from './erc20_wrapper';
 export { ERC721Wrapper } from './erc721_wrapper';
 export { ERC1155ProxyWrapper } from './erc1155_proxy_wrapper';
-export { Erc1155Wrapper, ERC1155MintableContract } from '@0x/contracts-erc1155';
+export { ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
 export { DummyERC20TokenContract } from '@0x/contracts-erc20';
 export { DummyERC721TokenContract } from '@0x/contracts-erc721';
 export {

diff --git a/contracts/dev-utils/package.json b/contracts/dev-utils/package.json
@@ -55,11 +55,11 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "^0.15.0",
+        "ethereum-types": "^2.2.0-beta.2",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.5.0-beta.3",
-        "ethereum-types": "^2.2.0-beta.2"
+        "@0x/base-contract": "^5.5.0-beta.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/contracts/erc1155/package.json b/contracts/erc1155/package.json
@@ -63,6 +63,8 @@
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",
+        "@0x/typescript-typings": "^4.4.0-beta.2",
+        "ethereum-types": "^2.2.0-beta.2",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
@@ -80,10 +82,8 @@
     "dependencies": {
         "@0x/base-contract": "^5.5.0-beta.3",
         "@0x/contracts-test-utils": "^3.2.0-beta.3",
-        "@0x/typescript-typings": "^4.4.0-beta.2",
         "@0x/utils": "^4.6.0-beta.2",
         "@0x/web3-wrapper": "^6.1.0-beta.2",
-        "ethereum-types": "^2.2.0-beta.2",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

diff --git a/contracts/erc1155/src/erc1155_wrapper.ts b/contracts/erc1155/src/erc1155_wrapper.ts
@@ -1,27 +1,16 @@
-import { LogDecoder } from '@0x/contracts-test-utils';
 import { BigNumber } from '@0x/utils';
-import { Web3Wrapper } from '@0x/web3-wrapper';
-import * as chai from 'chai';
 import { LogWithDecodedArgs, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { ERC1155MintableContract, ERC1155TransferSingleEventArgs } from './wrappers';
 
-import { artifacts } from './artifacts';
-
-const expect = chai.expect;
-
 export class Erc1155Wrapper {
     private readonly _erc1155Contract: ERC1155MintableContract;
-    private readonly _web3Wrapper: Web3Wrapper;
     private readonly _contractOwner: string;
-    private readonly _logDecoder: LogDecoder;
 
     constructor(contractInstance: ERC1155MintableContract, provider: Provider, contractOwner: string) {
         this._erc1155Contract = contractInstance;
-        this._web3Wrapper = new Web3Wrapper(provider);
         this._contractOwner = contractOwner;
-        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
     }
     public getContract(): ERC1155MintableContract {
         return this._erc1155Contract;
@@ -40,11 +29,11 @@ export class Erc1155Wrapper {
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const spender = delegatedSpender === undefined ? from : delegatedSpender;
         const callbackDataHex = callbackData === undefined ? '0x' : callbackData;
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
-            await this._erc1155Contract.safeTransferFrom(from, to, token, value, callbackDataHex).sendTransactionAsync({
+        const tx = await this._erc1155Contract
+            .safeTransferFrom(from, to, token, value, callbackDataHex)
+            .awaitTransactionSuccessAsync({
                 from: spender,
-            }),
-        );
+            });
         return tx;
     }
     public async safeBatchTransferFromAsync(
@@ -57,11 +46,9 @@ export class Erc1155Wrapper {
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const spender = delegatedSpender === undefined ? from : delegatedSpender;
         const callbackDataHex = callbackData === undefined ? '0x' : callbackData;
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
-            await this._erc1155Contract
-                .safeBatchTransferFrom(from, to, tokens, values, callbackDataHex)
-                .sendTransactionAsync({ from: spender }),
-        );
+        const tx = await this._erc1155Contract
+            .safeBatchTransferFrom(from, to, tokens, values, callbackDataHex)
+            .awaitTransactionSuccessAsync({ from: spender });
         return tx;
     }
     public async mintFungibleTokensAsync(
@@ -70,11 +57,9 @@ export class Erc1155Wrapper {
     ): Promise<BigNumber> {
         const tokenUri = 'dummyFungibleToken';
         const tokenIsNonFungible = false;
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
-            await this._erc1155Contract.create(tokenUri, tokenIsNonFungible).sendTransactionAsync({
-                from: this._contractOwner,
-            }),
-        );
+        const tx = await this._erc1155Contract.create(tokenUri, tokenIsNonFungible).awaitTransactionSuccessAsync({
+            from: this._contractOwner,
+        });
         // tslint:disable-next-line no-unnecessary-type-assertion
         const createFungibleTokenLog = tx.logs[0] as LogWithDecodedArgs<ERC1155TransferSingleEventArgs>;
         const tokenId = createFungibleTokenLog.args.id;
@@ -99,11 +84,9 @@ export class Erc1155Wrapper {
     public async mintNonFungibleTokensAsync(beneficiaries: string[]): Promise<[BigNumber, BigNumber[]]> {
         const tokenUri = 'dummyNonFungibleToken';
         const tokenIsNonFungible = true;
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
-            await this._erc1155Contract.create(tokenUri, tokenIsNonFungible).sendTransactionAsync({
-                from: this._contractOwner,
-            }),
-        );
+        const tx = await this._erc1155Contract.create(tokenUri, tokenIsNonFungible).awaitTransactionSuccessAsync({
+            from: this._contractOwner,
+        });
         // tslint:disable-next-line no-unnecessary-type-assertion
         const createFungibleTokenLog = tx.logs[0] as LogWithDecodedArgs<ERC1155TransferSingleEventArgs>;
         const token = createFungibleTokenLog.args.id;
@@ -125,11 +108,9 @@ export class Erc1155Wrapper {
         beneficiary: string,
         isApproved: boolean,
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
-            await this._erc1155Contract.setApprovalForAll(beneficiary, isApproved).sendTransactionAsync({
-                from: owner,
-            }),
-        );
+        const tx = await this._erc1155Contract.setApprovalForAll(beneficiary, isApproved).awaitTransactionSuccessAsync({
+            from: owner,
+        });
         return tx;
     }
     public async isApprovedForAllAsync(owner: string, beneficiary: string): Promise<boolean> {
@@ -151,7 +132,9 @@ export class Erc1155Wrapper {
         });
         const balances = await this.getBalancesAsync(ownersExtended, tokensExtended);
         _.each(balances, (balance: BigNumber, i: number) => {
-            expect(balance, `${ownersExtended[i]}${tokensExtended[i]}`).to.be.bignumber.equal(expectedBalances[i]);
+            if (!balance.isEqualTo(expectedBalances[i])) {
+                throw new Error(`${ownersExtended[i]}${tokensExtended[i]} balance not equal ${expectedBalances[i]}`);
+            }
         });
     }
     public async isNonFungibleItemAsync(tokenId: BigNumber): Promise<boolean> {

diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json
@@ -61,6 +61,9 @@
         "@0x/tslint-config": "^3.1.0-beta.2",
         "@0x/utils": "^4.6.0-beta.2",
         "@0x/web3-wrapper": "^6.1.0-beta.2",
+        "@0x/types": "^2.5.0-beta.2",
+        "@0x/typescript-typings": "^4.4.0-beta.2",
+        "ethereum-types": "^2.2.0-beta.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",
@@ -79,10 +82,7 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.5.0-beta.3",
-        "@0x/types": "^2.5.0-beta.2",
-        "@0x/typescript-typings": "^4.4.0-beta.2",
-        "ethereum-types": "^2.2.0-beta.2"
+        "@0x/base-contract": "^5.5.0-beta.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json
@@ -63,6 +63,8 @@
         "@0x/types": "^2.5.0-beta.2",
         "@0x/utils": "^4.6.0-beta.2",
         "@0x/web3-wrapper": "^6.1.0-beta.2",
+        "@0x/typescript-typings": "^4.4.0-beta.2",
+        "ethereum-types": "^2.2.0-beta.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",
@@ -82,9 +84,7 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.5.0-beta.3",
-        "@0x/typescript-typings": "^4.4.0-beta.2",
-        "ethereum-types": "^2.2.0-beta.2"
+        "@0x/base-contract": "^5.5.0-beta.3"
     },
     "publishConfig": {
         "access": "public"

diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json
@@ -65,6 +65,9 @@
         "@0x/ts-doc-gen": "^0.0.22",
         "@0x/tslint-config": "^3.1.0-beta.2",
         "@0x/web3-wrapper": "^6.1.0-beta.2",
+        "@0x/types": "^2.5.0-beta.2",
+        "@0x/typescript-typings": "^4.4.0-beta.2",
+        "ethereum-types": "^2.2.0-beta.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",
@@ -91,10 +94,7 @@
         "@0x/contracts-erc20": "^2.3.0-beta.3",
         "@0x/contracts-erc721": "^2.2.0-beta.3",
         "@0x/order-utils": "^8.5.0-beta.3",
-        "@0x/types": "^2.5.0-beta.2",
-        "@0x/typescript-typings": "^4.4.0-beta.2",
         "@0x/utils": "^4.6.0-beta.2",
-        "ethereum-types": "^2.2.0-beta.2",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

diff --git a/package.json b/package.json
@@ -90,5 +90,8 @@
         "source-map-support": "^0.5.6",
         "typescript": "3.0.1",
         "wsrun": "^2.2.0"
+    },
+    "resolutions": {
+        "merkle-patricia-tree": "^2.3.2"
     }
 }
diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts