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

Unpin deps when unnecessary

Browse Source
This commit is contained in:
Amir Bandeali 2019-02-26 13:29:05 -08:00
parent c522d611d1
commit b47886416e
21 changed files with 114 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@
"devDependencies": {
"@0x/abi-gen": "^2.0.4",
"@0x/contracts-gen": "^1.0.3",
"@0x/contracts-test-utils": "^3.0.5",
"@0x/dev-utils": "^2.1.1",
"@0x/sol-compiler": "^3.1.0",
"@0x/tslint-config": "^3.0.0",
@ -67,9 +68,8 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.0",
"@0x/contracts-erc20": "1.0.2",
"@0x/contracts-erc721": "1.0.2",
"@0x/contracts-test-utils": "^3.0.5",
"@0x/contracts-erc20": "^1.0.6",
"@0x/contracts-erc721": "^1.0.6",
"@0x/contracts-utils": "2.0.1",
"@0x/order-utils": "^7.0.0",
"@0x/types": "^2.1.0",

7
contracts/asset-proxy/test/utils/erc20_wrapper.ts
View File

@ -1,7 +1,8 @@
import { constants, ERC20BalancesByOwner, txDefaults, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
import { assetDataUtils } from '@0x/order-utils';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
import { ZeroExProvider } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, DummyERC20TokenContract, ERC20ProxyContract } from '../../src';
@ -10,7 +11,7 @@ export class ERC20Wrapper {
private readonly _tokenOwnerAddresses: string[];
private readonly _contractOwnerAddress: string;
private readonly _web3Wrapper: Web3Wrapper;
private readonly _provider: Web3ProviderEngine;
private readonly _provider: ZeroExProvider;
private readonly _dummyTokenContracts: DummyERC20TokenContract[];
private _proxyContract?: ERC20ProxyContract;
private _proxyIdIfExists?: string;
@ -21,7 +22,7 @@ export class ERC20Wrapper {
* @param contractOwnerAddress Desired owner of the contract
* Instance of ERC20Wrapper
*/
constructor(provider: Web3ProviderEngine, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
constructor(provider: ZeroExProvider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
this._dummyTokenContracts = [];
this._web3Wrapper = new Web3Wrapper(provider);
this._provider = provider;

7
contracts/asset-proxy/test/utils/erc721_wrapper.ts
View File

@ -1,7 +1,8 @@
import { constants, ERC721TokenIdsByOwner, txDefaults, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
import { generatePseudoRandomSalt } from '@0x/order-utils';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
import { ZeroExProvider } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, DummyERC721TokenContract, ERC721ProxyContract } from '../../src';
@ -10,12 +11,12 @@ export class ERC721Wrapper {
private readonly _tokenOwnerAddresses: string[];
private readonly _contractOwnerAddress: string;
private readonly _web3Wrapper: Web3Wrapper;
private readonly _provider: Web3ProviderEngine;
private readonly _provider: ZeroExProvider;
private readonly _dummyTokenContracts: DummyERC721TokenContract[];
private _proxyContract?: ERC721ProxyContract;
private _proxyIdIfExists?: string;
private _initialTokenIdsByOwner: ERC721TokenIdsByOwner = {};
constructor(provider: Web3ProviderEngine, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
constructor(provider: ZeroExProvider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
this._web3Wrapper = new Web3Wrapper(provider);
this._provider = provider;
this._dummyTokenContracts = [];

6
contracts/exchange-forwarder/package.json
View File

@ -69,9 +69,9 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.0",
"@0x/contracts-asset-proxy": "1.0.2",
"@0x/contracts-erc20": "1.0.2",
"@0x/contracts-erc721": "1.0.2",
"@0x/contracts-asset-proxy": "^1.0.6",
"@0x/contracts-erc20": "^1.0.6",
"@0x/contracts-erc721": "^1.0.6",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",

19
contracts/exchange-forwarder/test/forwarder.ts
View File

@ -1,5 +1,10 @@
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { ExchangeWrapper } from '@0x/contracts-exchange';
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20Wrapper,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import {
chaiSetup,
constants,
@ -21,15 +26,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import {
artifacts,
DummyERC20TokenContract,
DummyERC721TokenContract,
ExchangeContract,
ForwarderContract,
ForwarderWrapper,
WETH9Contract,
} from '../src';
import { artifacts, ForwarderContract, ForwarderWrapper, WETH9Contract } from '../src';
chaiSetup.configure();
const expect = chai.expect;

6
contracts/exchange/package.json
View File

@ -68,9 +68,9 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.0",
"@0x/contracts-asset-proxy": "1.0.2",
"@0x/contracts-erc20": "1.0.2",
"@0x/contracts-erc721": "1.0.2",
"@0x/contracts-asset-proxy": "^1.0.6",
"@0x/contracts-erc20": "^1.0.6",
"@0x/contracts-erc721": "^1.0.6",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",
"@0x/order-utils": "^7.0.0",

19
contracts/exchange/test/core.ts
View File

@ -1,4 +1,14 @@
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import {
DummyERC20TokenContract,
DummyERC20TokenTransferEventArgs,
DummyERC721TokenContract,
DummyNoReturnERC20TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
MultiAssetProxyContract,
} from '@0x/contracts-asset-proxy';
import {
chaiSetup,
constants,
@ -24,16 +34,9 @@ import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC20TokenTransferEventArgs,
DummyERC721TokenContract,
DummyNoReturnERC20TokenContract,
ERC20ProxyContract,
ERC721ProxyContract,
ExchangeCancelEventArgs,
ExchangeContract,
ExchangeWrapper,
MultiAssetProxyContract,
ReentrantERC20TokenContract,
TestStaticCallReceiverContract,
} from '../src';

11
contracts/exchange/test/dispatcher.ts
View File

@ -1,4 +1,10 @@
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import {
DummyERC20TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import {
chaiSetup,
constants,
@ -18,9 +24,6 @@ import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
ERC20ProxyContract,
ERC721ProxyContract,
TestAssetProxyDispatcherAssetProxyRegisteredEventArgs,
TestAssetProxyDispatcherContract,
} from '../src';

13
contracts/exchange/test/match_orders.ts
View File

@ -1,4 +1,11 @@
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import {
chaiSetup,
constants,
@ -20,10 +27,6 @@ import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC721ProxyContract,
ExchangeContract,
ExchangeWrapper,
MatchOrderTester,

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

@ -1,5 +1,4 @@
import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC20TokenContract, ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import {
chaiSetup,
constants,

20
contracts/exchange/test/wrapper.ts
View File

@ -1,4 +1,11 @@
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import {
chaiSetup,
constants,
@ -20,16 +27,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai';
import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC721ProxyContract,
ExchangeContract,
ExchangeWrapper,
ReentrantERC20TokenContract,
} from '../src';
import { artifacts, ExchangeContract, ExchangeWrapper, ReentrantERC20TokenContract } from '../src';
chaiSetup.configure();
const expect = chai.expect;

6
contracts/extensions/package.json
View File

@ -69,9 +69,9 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.0",
"@0x/contracts-asset-proxy": "1.0.2",
"@0x/contracts-erc20": "1.0.2",
"@0x/contracts-erc721": "1.0.2",
"@0x/contracts-asset-proxy": "^1.0.6",
"@0x/contracts-erc20": "^1.0.6",
"@0x/contracts-erc721": "^1.0.6",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",

4
contracts/extensions/test/balance_threshold_filter.ts
View File

@ -1,4 +1,4 @@
import { ExchangeWrapper } from '@0x/contracts-exchange';
import { ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils } from '@0x/order-utils';
import { Order, RevertReason, SignedOrder } from '@0x/types';
@ -24,7 +24,7 @@ import {
web3Wrapper,
} from '@0x/contracts-test-utils';
import { artifacts, BalanceThresholdFilterContract, BalanceThresholdWrapper, ExchangeContract } from '../src';
import { artifacts, BalanceThresholdFilterContract, BalanceThresholdWrapper } from '../src';
chaiSetup.configure();
const expect = chai.expect;

19
contracts/extensions/test/dutch_auction.ts
View File

@ -1,6 +1,11 @@
import { DutchAuctionWrapper } from '@0x/contract-wrappers';
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { ExchangeWrapper } from '@0x/contracts-exchange';
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20Wrapper,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import {
chaiSetup,
constants,
@ -21,15 +26,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai';
import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC721TokenContract,
DutchAuctionContract,
DutchAuctionTestWrapper,
ExchangeContract,
WETH9Contract,
} from '../src';
import { artifacts, DutchAuctionContract, DutchAuctionTestWrapper, WETH9Contract } from '../src';
chaiSetup.configure();
const expect = chai.expect;

21
contracts/extensions/test/order_matcher.ts
View File

@ -1,5 +1,11 @@
import { ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { ExchangeWrapper } from '@0x/contracts-exchange';
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
} from '@0x/contracts-asset-proxy';
import { ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import {
chaiSetup,
constants,
@ -22,16 +28,7 @@ import * as chai from 'chai';
import { LogWithDecodedArgs } from 'ethereum-types';
import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC721ProxyContract,
ExchangeContract,
ExchangeFillEventArgs,
OrderMatcherContract,
} from '../src';
import { artifacts, ExchangeFillEventArgs, OrderMatcherContract } from '../src';
const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
chaiSetup.configure();

21
contracts/extensions/test/order_validator.ts
View File

@ -1,5 +1,12 @@
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
import { ExchangeWrapper } from '@0x/contracts-exchange';
import {
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper,
} from '@0x/contracts-asset-proxy';
import { ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
import {
chaiSetup,
constants,
@ -16,15 +23,7 @@ import { BigNumber } from '@0x/utils';
import * as chai from 'chai';
import * as _ from 'lodash';
import {
artifacts,
DummyERC20TokenContract,
DummyERC721TokenContract,
ERC20ProxyContract,
ERC721ProxyContract,
ExchangeContract,
OrderValidatorContract,
} from '../src';
import { artifacts, OrderValidatorContract } from '../src';
chaiSetup.configure();
const expect = chai.expect;

3
contracts/extensions/test/utils/balance_threshold_wrapper.ts
View File

@ -1,3 +1,4 @@
import { ExchangeContract } from '@0x/contracts-exchange';
import {
FillResults,
formatters,
@ -13,7 +14,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, BalanceThresholdFilterContract, ExchangeContract } from '../../src';
import { artifacts, BalanceThresholdFilterContract } from '../../src';
export class BalanceThresholdWrapper {
private readonly _balanceThresholdFilter: BalanceThresholdFilterContract;

4
contracts/multisig/package.json
View File

@ -68,8 +68,8 @@
},
"dependencies": {
"@0x/base-contract": "^5.0.0",
"@0x/contracts-asset-proxy": "1.0.2",
"@0x/contracts-erc20": "1.0.2",
"@0x/contracts-asset-proxy": "^1.0.6",
"@0x/contracts-erc20": "^1.0.6",
"@0x/contracts-utils": "2.0.1",
"@0x/types": "^2.1.0",
"@0x/typescript-typings": "^4.1.0",

32
contracts/tec/package.json
View File

@ -46,11 +46,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.3",
"@0x/contracts-gen": "^1.0.2",
"@0x/contracts-test-utils": "^3.0.4",
"@0x/dev-utils": "^2.1.0",
"@0x/sol-compiler": "^3.0.3",
"@0x/abi-gen": "^2.0.4",
"@0x/contracts-gen": "^1.0.3",
"@0x/contracts-test-utils": "^3.0.5",
"@0x/dev-utils": "^2.1.1",
"@0x/sol-compiler": "^3.1.0",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -67,19 +67,19 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^4.0.3",
"@0x/contracts-asset-proxy": "1.0.2",
"@0x/contracts-exchange-libs": "^1.0.5",
"@0x/base-contract": "^5.0.0",
"@0x/contracts-asset-proxy": "^1.0.6",
"@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-erc20": "1.0.2",
"@0x/contracts-utils": "^2.0.4",
"@0x/order-utils": "^6.1.0",
"@0x/types": "^2.0.2",
"@0x/typescript-typings": "^4.0.0",
"@0x/utils": "^4.1.0",
"@0x/web3-wrapper": "^5.0.0",
"@0x/contracts-erc20": "^1.0.6",
"@0x/contracts-utils": "^2.0.5",
"@0x/order-utils": "^7.0.0",
"@0x/types": "^2.1.0",
"@0x/typescript-typings": "^4.1.0",
"@0x/utils": "^4.2.0",
"@0x/web3-wrapper": "^6.0.0",
"ethereumjs-util": "^5.1.1",
"ethereum-types": "^2.0.0",
"ethereum-types": "^2.1.0",
"lodash": "^4.17.11"
},
"publishConfig": {

3
contracts/tec/test/tec.ts
View File

@ -1,5 +1,4 @@
import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { DummyERC20TokenContract, ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
import {
artifacts as exchangeArtifacts,
ExchangeCancelEventArgs,

44
yarn.lock
View File

@ -472,50 +472,6 @@
npmlog "^4.1.2"
write-file-atomic "^2.3.0"
"@0x/contracts-asset-proxy@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@0x/contracts-asset-proxy/-/contracts-asset-proxy-1.0.2.tgz#48a432a52a019ee632e50456f2687c85a5b57535"
dependencies:
"@0x/base-contract" "^4.0.1"
"@0x/contracts-erc20" "^1.0.2"
"@0x/contracts-erc721" "^1.0.2"
"@0x/contracts-test-utils" "^3.0.1"
"@0x/contracts-utils" "^2.0.1"
"@0x/order-utils" "^5.0.0"
"@0x/types" "^2.0.1"
"@0x/typescript-typings" "^4.0.0"
"@0x/utils" "^4.0.2"
"@0x/web3-wrapper" "^4.0.1"
ethereum-types "^2.0.0"
lodash "^4.17.5"
"@0x/contracts-erc20@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@0x/contracts-erc20/-/contracts-erc20-1.0.2.tgz#67cfefd4458b262d575bb1b07f63bc3dfed4daeb"
dependencies:
"@0x/base-contract" "^4.0.1"
"@0x/contracts-exchange-libs" "^1.0.2"
"@0x/contracts-utils" "^2.0.1"
"@0x/types" "^2.0.1"
"@0x/typescript-typings" "^4.0.0"
"@0x/utils" "^4.0.2"
"@0x/web3-wrapper" "^4.0.1"
ethereum-types "^2.0.0"
lodash "^4.17.5"
"@0x/contracts-erc721@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@0x/contracts-erc721/-/contracts-erc721-1.0.2.tgz#e7309ae57de266bb9c4947de50ba16a89203ad08"
dependencies:
"@0x/base-contract" "^4.0.1"
"@0x/contracts-utils" "^2.0.1"
"@0x/types" "^2.0.1"
"@0x/typescript-typings" "^4.0.0"
"@0x/utils" "^4.0.2"
"@0x/web3-wrapper" "^4.0.1"
ethereum-types "^2.0.0"
lodash "^4.17.5"
"@0x/contracts-exchange-libs@1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@0x/contracts-exchange-libs/-/contracts-exchange-libs-1.0.2.tgz#0682c01cdb3e36100bda0ffbdf9badb5b8a01fc4"