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

Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/erc-721-support

Browse Source
This commit is contained in:
fragosti 2019-04-19 11:31:52 -05:00
commit de62a0f8ed
421 changed files with 2387 additions and 1601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/asset-proxy/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "2.1.0",
"changes": [

4
contracts/asset-proxy/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.1 - _April 11, 2019_
* Dependencies updated
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

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

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-asset-proxy",
"version": "2.1.0",
"version": "2.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,17 +68,17 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-erc1155": "^1.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-erc721": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-erc1155": "^1.1.1",
"@0x/contracts-erc20": "^2.2.0",
"@0x/contracts-erc721": "^2.1.1",
"@0x/contracts-utils": "^3.1.1",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

33
contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts
View File

@ -115,7 +115,7 @@ export class ERC1155ProxyWrapper {
valuesToTransfer,
receiverCallbackData,
);
if (!_.isUndefined(extraData)) {
if (extraData !== undefined) {
encodedAssetData = `${encodedAssetData}${extraData}`;
}
const data = this._assetProxyInterface.transferFrom.getABIEncodedTransactionData(
@ -199,10 +199,10 @@ export class ERC1155ProxyWrapper {
// Mint tokens for each owner for this token
for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
// tslint:disable-next-line:no-unused-variable
if (_.isUndefined(fungibleHoldingsByOwner[tokenOwnerAddress])) {
if (fungibleHoldingsByOwner[tokenOwnerAddress] === undefined) {
fungibleHoldingsByOwner[tokenOwnerAddress] = {};
}
if (_.isUndefined(fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress])) {
if (fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] === undefined) {
fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] = {};
}
fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString] =
@ -221,13 +221,13 @@ export class ERC1155ProxyWrapper {
const tokenIdAsString = tokenId.toString();
this._nonFungibleTokenIds.push(tokenIdAsString);
_.each(this._tokenOwnerAddresses, async (tokenOwnerAddress: string, i: number) => {
if (_.isUndefined(nonFungibleHoldingsByOwner[tokenOwnerAddress])) {
if (nonFungibleHoldingsByOwner[tokenOwnerAddress] === undefined) {
nonFungibleHoldingsByOwner[tokenOwnerAddress] = {};
}
if (_.isUndefined(nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress])) {
if (nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] === undefined) {
nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] = {};
}
if (_.isUndefined(nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString])) {
if (nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString] === undefined) {
nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString] = [];
}
this._nfts.push({ id: nftIds[i], tokenId });
@ -278,26 +278,25 @@ export class ERC1155ProxyWrapper {
for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
// Fungible tokens
for (const tokenId of this._fungibleTokenIds) {
if (_.isUndefined(tokenHoldingsByOwner[tokenOwnerAddress])) {
if (tokenHoldingsByOwner[tokenOwnerAddress] === undefined) {
tokenHoldingsByOwner[tokenOwnerAddress] = {};
}
if (_.isUndefined(tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress])) {
if (tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress] === undefined) {
tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress] = {};
}
tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress][tokenId] = balances[i++];
}
// Non-fungible tokens
for (const nft of this._nfts) {
if (_.isUndefined(nonFungibleHoldingsByOwner[tokenOwnerAddress])) {
if (nonFungibleHoldingsByOwner[tokenOwnerAddress] === undefined) {
nonFungibleHoldingsByOwner[tokenOwnerAddress] = {};
}
if (_.isUndefined(nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress])) {
if (nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress] === undefined) {
nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress] = {};
}
if (
_.isUndefined(
nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress][nft.tokenId.toString()],
)
nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress][nft.tokenId.toString()] ===
undefined
) {
nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress][nft.tokenId.toString()] = [];
}
@ -348,25 +347,25 @@ export class ERC1155ProxyWrapper {
const tokenWrapper = _.find(this._dummyTokenWrappers, (wrapper: Erc1155Wrapper) => {
return wrapper.getContract().address === contractAddress;
});
if (_.isUndefined(tokenWrapper)) {
if (tokenWrapper === undefined) {
throw new Error(`Contract: ${contractAddress} was not deployed through ERC1155ProxyWrapper`);
}
return tokenWrapper;
}
private _getContractFromAddress(tokenAddress: string): ERC1155MintableContract {
const tokenContractIfExists = _.find(this._dummyTokenWrappers, c => c.getContract().address === tokenAddress);
if (_.isUndefined(tokenContractIfExists)) {
if (tokenContractIfExists === undefined) {
throw new Error(`Token: ${tokenAddress} was not deployed through ERC1155ProxyWrapper`);
}
return tokenContractIfExists.getContract();
}
private _validateDummyTokenContractsExistOrThrow(): void {
if (_.isUndefined(this._dummyTokenWrappers)) {
if (this._dummyTokenWrappers === undefined) {
throw new Error('Dummy ERC1155 tokens not yet deployed, please call "deployDummyTokensAsync"');
}
}
private _validateProxyContractExistsOrThrow(): void {
if (_.isUndefined(this._proxyContract)) {
if (this._proxyContract === undefined) {
throw new Error('ERC1155 proxy contract not yet deployed, please call "deployProxyAsync"');
}
}

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

@ -133,7 +133,7 @@ export class ERC20Wrapper {
_.forEach(balances, (balance, balanceIndex) => {
const tokenAddress = balanceInfo[balanceIndex].tokenAddress;
const tokenOwnerAddress = balanceInfo[balanceIndex].tokenOwnerAddress;
if (_.isUndefined(balancesByOwner[tokenOwnerAddress])) {
if (balancesByOwner[tokenOwnerAddress] === undefined) {
balancesByOwner[tokenOwnerAddress] = {};
}
const wrappedBalance = new BigNumber(balance);
@ -142,7 +142,7 @@ export class ERC20Wrapper {
return balancesByOwner;
}
public addDummyTokenContract(dummy: DummyERC20TokenContract): void {
if (!_.isUndefined(this._dummyTokenContracts)) {
if (this._dummyTokenContracts !== undefined) {
this._dummyTokenContracts.push(dummy);
}
}
@ -160,18 +160,18 @@ export class ERC20Wrapper {
const erc20ProxyData = assetDataUtils.decodeERC20AssetData(assetData);
const tokenAddress = erc20ProxyData.tokenAddress;
const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
if (_.isUndefined(tokenContractIfExists)) {
if (tokenContractIfExists === undefined) {
throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
}
return tokenContractIfExists;
}
private _validateDummyTokenContractsExistOrThrow(): void {
if (_.isUndefined(this._dummyTokenContracts)) {
if (this._dummyTokenContracts === undefined) {
throw new Error('Dummy ERC20 tokens not yet deployed, please call "deployDummyTokensAsync"');
}
}
private _validateProxyContractExistsOrThrow(): void {
if (_.isUndefined(this._proxyContract)) {
if (this._proxyContract === undefined) {
throw new Error('ERC20 proxy contract not yet deployed, please call "deployProxyAsync"');
}
}

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

@ -62,12 +62,12 @@ export class ERC721Wrapper {
for (const i of _.times(constants.NUM_ERC721_TOKENS_TO_MINT)) {
const tokenId = generatePseudoRandomSalt();
await this.mintAsync(dummyTokenContract.address, tokenId, tokenOwnerAddress);
if (_.isUndefined(this._initialTokenIdsByOwner[tokenOwnerAddress])) {
if (this._initialTokenIdsByOwner[tokenOwnerAddress] === undefined) {
this._initialTokenIdsByOwner[tokenOwnerAddress] = {
[dummyTokenContract.address]: [],
};
}
if (_.isUndefined(this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address])) {
if (this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address] === undefined) {
this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address] = [];
}
this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address].push(tokenId);
@ -189,12 +189,12 @@ export class ERC721Wrapper {
_.forEach(tokenOwnerAddresses, (tokenOwnerAddress, ownerIndex) => {
const tokenAddress = tokenInfo[ownerIndex].tokenAddress;
const tokenId = tokenInfo[ownerIndex].tokenId;
if (_.isUndefined(tokenIdsByOwner[tokenOwnerAddress])) {
if (tokenIdsByOwner[tokenOwnerAddress] === undefined) {
tokenIdsByOwner[tokenOwnerAddress] = {
[tokenAddress]: [],
};
}
if (_.isUndefined(tokenIdsByOwner[tokenOwnerAddress][tokenAddress])) {
if (tokenIdsByOwner[tokenOwnerAddress][tokenAddress] === undefined) {
tokenIdsByOwner[tokenOwnerAddress][tokenAddress] = [];
}
tokenIdsByOwner[tokenOwnerAddress][tokenAddress].push(tokenId);
@ -210,18 +210,18 @@ export class ERC721Wrapper {
}
private _getTokenContractFromAssetData(tokenAddress: string): DummyERC721TokenContract {
const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
if (_.isUndefined(tokenContractIfExists)) {
if (tokenContractIfExists === undefined) {
throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
}
return tokenContractIfExists;
}
private _validateDummyTokenContractsExistOrThrow(): void {
if (_.isUndefined(this._dummyTokenContracts)) {
if (this._dummyTokenContracts === undefined) {
throw new Error('Dummy ERC721 tokens not yet deployed, please call "deployDummyTokensAsync"');
}
}
private _validateProxyContractExistsOrThrow(): void {
if (_.isUndefined(this._proxyContract)) {
if (this._proxyContract === undefined) {
throw new Error('ERC721 proxy contract not yet deployed, please call "deployProxyAsync"');
}
}

3
contracts/coordinator/CHANGELOG.json
View File

@ -10,7 +10,8 @@
"note": "Make `assertValidTransactionOrdersApproval` internal",
"pr": 1729
}
]
],
"timestamp": 1554997931
},
{
"version": "1.1.0",

5
contracts/coordinator/CHANGELOG.md
View File

@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.0 - _April 11, 2019_
* Make `decodeOrdersFromFillData`, `getCoordinatorApprovalHash`, and `getTransactionHash` public (#1729)
* Make `assertValidTransactionOrdersApproval` internal (#1729)
## v1.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

37
contracts/coordinator/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-coordinator",
"version": "1.1.0",
"version": "2.0.0",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,18 +68,18 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-asset-proxy": "^2.1.1",
"@0x/contracts-erc20": "^2.2.0",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/contracts-exchange-libs": "^2.1.1",
"@0x/contracts-utils": "^3.1.1",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11"
},

5
contracts/coordinator/test/utils/coordinator_registry_wrapper.ts
View File

@ -1,7 +1,6 @@
import { LogDecoder, txDefaults } from '@0x/contracts-test-utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs, ZeroExProvider } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, CoordinatorRegistryContract } from '../../src';
@ -26,7 +25,7 @@ export class CoordinatorRegistryWrapper {
this._provider,
txDefaults,
);
if (_.isUndefined(this._coordinatorRegistryContract)) {
if (this._coordinatorRegistryContract === undefined) {
throw new Error(`Failed to deploy Coordinator Registry contract.`);
}
return this._coordinatorRegistryContract;
@ -56,7 +55,7 @@ export class CoordinatorRegistryWrapper {
return coordinatorEndpoint;
}
private _assertCoordinatorRegistryDeployed(): void {
if (_.isUndefined(this._coordinatorRegistryContract)) {
if (this._coordinatorRegistryContract === undefined) {
throw new Error(
'The Coordinator Registry contract was not deployed through the CoordinatorRegistryWrapper. Call `deployCoordinatorRegistryAsync` to deploy.',
);

9
contracts/erc1155/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "1.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "1.1.0",
"changes": [

4
contracts/erc1155/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.1.1 - _April 11, 2019_
* Dependencies updated
## v1.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

29
contracts/erc1155/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc1155",
"version": "1.1.0",
"version": "1.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,11 +47,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -66,14 +67,14 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/contracts-utils": "^3.1.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/contracts-utils": "^3.1.1",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

8
contracts/erc1155/test/utils/erc1155_wrapper.ts
View File

@ -36,8 +36,8 @@ export class Erc1155Wrapper {
callbackData?: string,
delegatedSpender?: string,
): Promise<TransactionReceiptWithDecodedLogs> {
const spender = _.isUndefined(delegatedSpender) ? from : delegatedSpender;
const callbackDataHex = _.isUndefined(callbackData) ? '0x' : callbackData;
const spender = delegatedSpender === undefined ? from : delegatedSpender;
const callbackDataHex = callbackData === undefined ? '0x' : callbackData;
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
await this._erc1155Contract.safeTransferFrom.sendTransactionAsync(from, to, token, value, callbackDataHex, {
from: spender,
@ -53,8 +53,8 @@ export class Erc1155Wrapper {
callbackData?: string,
delegatedSpender?: string,
): Promise<TransactionReceiptWithDecodedLogs> {
const spender = _.isUndefined(delegatedSpender) ? from : delegatedSpender;
const callbackDataHex = _.isUndefined(callbackData) ? '0x' : callbackData;
const spender = delegatedSpender === undefined ? from : delegatedSpender;
const callbackDataHex = callbackData === undefined ? '0x' : callbackData;
const tx = await this._logDecoder.getTxWithDecodedLogsAsync(
await this._erc1155Contract.safeBatchTransferFrom.sendTransactionAsync(
from,

3
contracts/erc20/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Added UntransferrableDummyERC20Token",
"pr": 1714
}
]
],
"timestamp": 1554997931
},
{
"version": "2.1.0",

4
contracts/erc20/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.2.0 - _April 11, 2019_
* Added UntransferrableDummyERC20Token (#1714)
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

31
contracts/erc20/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20",
"version": "2.1.0",
"version": "2.2.0",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,14 +68,14 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-exchange-libs": "^2.1.1",
"@0x/contracts-utils": "^3.1.1",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

9
contracts/erc721/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "2.1.0",
"changes": [

4
contracts/erc721/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.1 - _April 11, 2019_
* Dependencies updated
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

29
contracts/erc721/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc721",
"version": "2.1.0",
"version": "2.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,13 +68,13 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-utils": "^3.1.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-utils": "^3.1.1",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

9
contracts/exchange-forwarder/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "2.1.0",
"changes": [

4
contracts/exchange-forwarder/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.1 - _April 11, 2019_
* Dependencies updated
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

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

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-forwarder",
"version": "2.1.0",
"version": "2.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,13 +47,13 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contract-wrappers": "^8.0.5",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contract-wrappers": "^9.0.0",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -68,19 +69,19 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-asset-proxy": "^2.1.1",
"@0x/contracts-erc20": "1.0.8",
"@0x/contracts-erc721": "1.0.8",
"@0x/contracts-exchange": "1.0.2",
"@0x/contracts-exchange-libs": "1.0.2",
"@0x/contracts-utils": "2.0.1",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

8
contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
View File

@ -76,8 +76,8 @@ export class ForwarderWrapper {
): Promise<TransactionReceiptWithDecodedLogs> {
const params = ForwarderWrapper._createOptimizedOrders(orders);
const feeParams = ForwarderWrapper._createOptimizedZrxOrders(feeOrders);
const feePercentage = _.isUndefined(opts.feePercentage) ? constants.ZERO_AMOUNT : opts.feePercentage;
const feeRecipient = _.isUndefined(opts.feeRecipient) ? constants.NULL_ADDRESS : opts.feeRecipient;
const feePercentage = opts.feePercentage === undefined ? constants.ZERO_AMOUNT : opts.feePercentage;
const feeRecipient = opts.feeRecipient === undefined ? constants.NULL_ADDRESS : opts.feeRecipient;
const txHash = await this._forwarderContract.marketSellOrdersWithEth.sendTransactionAsync(
params.orders,
params.signatures,
@ -99,8 +99,8 @@ export class ForwarderWrapper {
): Promise<TransactionReceiptWithDecodedLogs> {
const params = ForwarderWrapper._createOptimizedOrders(orders);
const feeParams = ForwarderWrapper._createOptimizedZrxOrders(feeOrders);
const feePercentage = _.isUndefined(opts.feePercentage) ? constants.ZERO_AMOUNT : opts.feePercentage;
const feeRecipient = _.isUndefined(opts.feeRecipient) ? constants.NULL_ADDRESS : opts.feeRecipient;
const feePercentage = opts.feePercentage === undefined ? constants.ZERO_AMOUNT : opts.feePercentage;
const feeRecipient = opts.feeRecipient === undefined ? constants.NULL_ADDRESS : opts.feeRecipient;
const txHash = await this._forwarderContract.marketBuyOrdersWithEth.sendTransactionAsync(
params.orders,
makerAssetFillAmount,

9
contracts/exchange-libs/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "2.1.0",
"changes": [

4
contracts/exchange-libs/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.1 - _April 11, 2019_
* Dependencies updated
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

31
contracts/exchange-libs/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-libs",
"version": "2.1.0",
"version": "2.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,14 +68,14 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-utils": "^3.1.1",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

9
contracts/exchange/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "2.1.0",
"changes": [

4
contracts/exchange/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.1 - _April 11, 2019_
* Dependencies updated
## v2.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

41
contracts/exchange/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange",
"version": "2.1.0",
"version": "2.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,19 +68,19 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc1155": "^1.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-erc721": "^2.1.0",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-asset-proxy": "^2.1.1",
"@0x/contracts-erc1155": "^1.1.1",
"@0x/contracts-erc20": "^2.2.0",
"@0x/contracts-erc721": "^2.1.1",
"@0x/contracts-exchange-libs": "^2.1.1",
"@0x/contracts-utils": "^3.1.1",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11"
},

2
contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
View File

@ -437,7 +437,7 @@ export class FillOrderCombinatorialUtils {
lazyStore: BalanceAndProxyAllowanceLazyStore,
fillRevertReasonIfExists: RevertReason | undefined,
): Promise<void> {
if (!_.isUndefined(fillRevertReasonIfExists)) {
if (fillRevertReasonIfExists !== undefined) {
return expectTransactionFailedAsync(
this.exchangeWrapper.fillOrderAsync(signedOrder, this.takerAddress, { takerAssetFillAmount }),
fillRevertReasonIfExists,

9
contracts/extensions/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "3.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "3.1.0",
"changes": [

4
contracts/extensions/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.1 - _April 11, 2019_
* Dependencies updated
## v3.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

43
contracts/extensions/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-extensions",
"version": "3.1.0",
"version": "3.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,13 +47,13 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contract-wrappers": "^8.0.5",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contract-wrappers": "^9.0.0",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -68,19 +69,19 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/contracts-erc721": "^2.1.0",
"@0x/contracts-exchange": "^2.1.0",
"@0x/contracts-exchange-libs": "^2.1.0",
"@0x/contracts-utils": "^3.1.0",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-asset-proxy": "^2.1.1",
"@0x/contracts-erc20": "^2.2.0",
"@0x/contracts-erc721": "^2.1.1",
"@0x/contracts-exchange": "^2.1.1",
"@0x/contracts-exchange-libs": "^2.1.1",
"@0x/contracts-utils": "^3.1.1",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

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

@ -12,7 +12,6 @@ import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash';
import { artifacts, BalanceThresholdFilterContract } from '../../src';
@ -264,7 +263,7 @@ export class BalanceThresholdWrapper {
gas?: number,
): Promise<TransactionReceiptWithDecodedLogs> {
const signedExchangeTx = this._signerTransactionFactory.newSignedTransaction(abiEncodedExchangeTxData);
const txOpts = _.isUndefined(gas) ? { from } : { from, gas };
const txOpts = gas === undefined ? { from } : { from, gas };
const txHash = await this._balanceThresholdFilter.executeTransaction.sendTransactionAsync(
signedExchangeTx.salt,
signedExchangeTx.signerAddress,

9
contracts/multisig/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "3.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "3.1.0",
"changes": [

4
contracts/multisig/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.1 - _April 11, 2019_
* Dependencies updated
## v3.1.0 - _March 21, 2019_
* Run Web3ProviderEngine without excess block polling (#1695)

31
contracts/multisig/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
"version": "3.1.0",
"version": "3.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"clean": "shx rm -rf lib generated-artifacts generated-wrappers",
"generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../../packages/abi-gen-templates/contract.handlebars --partials '../../packages/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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/node": "*",
"chai": "^4.0.1",
@ -67,15 +68,15 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/contracts-asset-proxy": "^2.1.0",
"@0x/contracts-erc20": "^2.1.0",
"@0x/base-contract": "^5.0.5",
"@0x/contracts-asset-proxy": "^2.1.1",
"@0x/contracts-erc20": "^2.2.0",
"@0x/contracts-utils": "2.0.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"publishConfig": {

4
contracts/multisig/test/multi_sig_with_time_lock.ts
View File

@ -70,7 +70,7 @@ describe('MultiSigWalletWithTimeLock', () => {
REQUIRED_APPROVALS,
secondsTimeLocked,
);
expect(_.isUndefined((multiSig as any).external_call)).to.be.equal(true);
expect((multiSig as any).external_call === undefined).to.be.equal(true);
});
});
describe('confirmTransaction', () => {
@ -271,7 +271,7 @@ describe('MultiSigWalletWithTimeLock', () => {
const blockNum = await web3Wrapper.getBlockNumberAsync();
const blockInfo = await web3Wrapper.getBlockIfExistsAsync(blockNum);
if (_.isUndefined(blockInfo)) {
if (blockInfo === undefined) {
throw new Error(`Unexpectedly failed to fetch block at #${blockNum}`);
}
const timestamp = new BigNumber(blockInfo.timestamp);

3
contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts
View File

@ -3,7 +3,6 @@ import { LogDecoder, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash';
import { AssetProxyOwnerContract } from '../../generated-wrappers/asset_proxy_owner';
import { artifacts } from '../../src/artifacts';
@ -23,7 +22,7 @@ export class AssetProxyOwnerWrapper {
from: string,
opts: { value?: BigNumber } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const value = _.isUndefined(opts.value) ? new BigNumber(0) : opts.value;
const value = opts.value === undefined ? new BigNumber(0) : opts.value;
const txHash = await this._assetProxyOwner.submitTransaction.sendTransactionAsync(destination, value, data, {
from,
});

3
contracts/multisig/test/utils/multi_sig_wrapper.ts
View File

@ -2,7 +2,6 @@ import { LogDecoder, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash';
import { MultiSigWalletContract } from '../../generated-wrappers/multi_sig_wallet';
import { artifacts } from '../../src/artifacts';
@ -22,7 +21,7 @@ export class MultiSigWrapper {
from: string,
opts: { value?: BigNumber } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const value = _.isUndefined(opts.value) ? new BigNumber(0) : opts.value;
const value = opts.value === undefined ? new BigNumber(0) : opts.value;
const txHash = await this._multiSig.submitTransaction.sendTransactionAsync(destination, value, data, {
from,
});

9
contracts/test-utils/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "3.1.2",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"timestamp": 1553183790,
"version": "3.1.1",

4
contracts/test-utils/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.2 - _April 11, 2019_
* Dependencies updated
## v3.1.1 - _March 21, 2019_
* Dependencies updated

31
contracts/test-utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
"version": "3.1.1",
"version": "3.1.2",
"engines": {
"node": ">=6.12"
},
@ -17,6 +17,7 @@
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
"clean": "shx rm -rf lib",
"lint": "tslint --format stylish --project tsconfig.lint.json",
"fix": "tslint --fix --format stylish --project tsconfig.lint.json",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -40,19 +41,19 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/dev-utils": "^2.2.0",
"@0x/order-utils": "^7.1.1",
"@0x/sol-compiler": "^3.1.5",
"@0x/sol-coverage": "^3.0.2",
"@0x/sol-profiler": "^3.1.4",
"@0x/sol-trace": "^2.0.10",
"@0x/subproviders": "^4.0.4",
"@0x/tslint-config": "^3.0.0",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@0x/abi-gen": "^2.0.9",
"@0x/dev-utils": "^2.2.1",
"@0x/order-utils": "^7.2.0",
"@0x/sol-compiler": "^3.1.6",
"@0x/sol-coverage": "^3.0.3",
"@0x/sol-profiler": "^3.1.5",
"@0x/sol-trace": "^2.0.11",
"@0x/subproviders": "^4.0.5",
"@0x/tslint-config": "^3.0.1",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"@types/bn.js": "^4.11.0",
"@types/js-combinatorics": "^0.5.29",
"@types/lodash": "4.14.104",
@ -62,7 +63,7 @@
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^3.0.0",
"dirty-chai": "^2.0.1",
"ethereum-types": "^2.1.1",
"ethereum-types": "^2.1.2",
"ethereumjs-util": "^5.1.1",
"ethers": "~4.0.4",
"js-combinatorics": "^0.5.3",

4
contracts/test-utils/src/assertions.ts
View File

@ -24,7 +24,7 @@ export type sendTransactionResult = Promise<TransactionReceipt | TransactionRece
* node.
*/
async function _getGanacheOrGethErrorAsync(ganacheError: string, gethError: string): Promise<string> {
if (_.isUndefined(nodeType)) {
if (nodeType === undefined) {
nodeType = await web3Wrapper.getNodeTypeAsync();
}
switch (nodeType) {
@ -99,7 +99,7 @@ export async function expectTransactionFailedAsync(p: sendTransactionResult, rea
_.noop(e);
});
if (_.isUndefined(nodeType)) {
if (nodeType === undefined) {
nodeType = await web3Wrapper.getNodeTypeAsync();
}
switch (nodeType) {

6
contracts/test-utils/src/block_timestamp.ts
View File

@ -1,5 +1,3 @@
import * as _ from 'lodash';
import { constants } from './constants';
import { web3Wrapper } from './web3_wrapper';
@ -13,7 +11,7 @@ let firstAccount: string | undefined;
* reject if the time could not be increased.
*/
export async function increaseTimeAndMineBlockAsync(seconds: number): Promise<number> {
if (_.isUndefined(firstAccount)) {
if (firstAccount === undefined) {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
firstAccount = accounts[0];
}
@ -36,7 +34,7 @@ export async function increaseTimeAndMineBlockAsync(seconds: number): Promise<nu
*/
export async function getLatestBlockTimestampAsync(): Promise<number> {
const currentBlockIfExists = await web3Wrapper.getBlockIfExistsAsync('latest');
if (_.isUndefined(currentBlockIfExists)) {
if (currentBlockIfExists === undefined) {
throw new Error(`Unable to fetch latest block.`);
}
return currentBlockIfExists.timestamp;

4
contracts/test-utils/src/coverage.ts
View File

@ -1,12 +1,10 @@
import { devConstants } from '@0x/dev-utils';
import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-coverage';
import * as _ from 'lodash';
let coverageSubprovider: CoverageSubprovider;
export const coverage = {
getCoverageSubproviderSingleton(): CoverageSubprovider {
if (_.isUndefined(coverageSubprovider)) {
if (coverageSubprovider === undefined) {
coverageSubprovider = coverage._getCoverageSubprovider();
}
return coverageSubprovider;

2
contracts/test-utils/src/log_decoder.ts
View File

@ -37,7 +37,7 @@ export class LogDecoder {
public decodeLogOrThrow<ArgsType extends DecodedLogArgs>(log: LogEntry): LogWithDecodedArgs<ArgsType> | RawLog {
const logWithDecodedArgsOrLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
// tslint:disable-next-line:no-unnecessary-type-assertion
if (_.isUndefined((logWithDecodedArgsOrLog as LogWithDecodedArgs<ArgsType>).args)) {
if ((logWithDecodedArgsOrLog as LogWithDecodedArgs<ArgsType>).args === undefined) {
throw new Error(`Unable to decode log: ${JSON.stringify(log)}`);
}
LogDecoder.wrapLogBigNumbers(logWithDecodedArgsOrLog);

3
contracts/test-utils/src/profiler.ts
View File

@ -1,6 +1,5 @@
import { devConstants } from '@0x/dev-utils';
import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-profiler';
import * as _ from 'lodash';
let profilerSubprovider: ProfilerSubprovider;
@ -12,7 +11,7 @@ export const profiler = {
profiler.getProfilerSubproviderSingleton().stop();
},
getProfilerSubproviderSingleton(): ProfilerSubprovider {
if (_.isUndefined(profilerSubprovider)) {
if (profilerSubprovider === undefined) {
profilerSubprovider = profiler._getProfilerSubprovider();
}
return profilerSubprovider;

3
contracts/test-utils/src/revert_trace.ts
View File

@ -1,12 +1,11 @@
import { devConstants } from '@0x/dev-utils';
import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-trace';
import * as _ from 'lodash';
let revertTraceSubprovider: RevertTraceSubprovider;
export const revertTrace = {
getRevertTraceSubproviderSingleton(): RevertTraceSubprovider {
if (_.isUndefined(revertTraceSubprovider)) {
if (revertTraceSubprovider === undefined) {
revertTraceSubprovider = revertTrace._getRevertTraceSubprovider();
}
return revertTraceSubprovider;

9
contracts/utils/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "3.1.1",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"version": "3.1.0",
"changes": [

4
contracts/utils/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.1 - _April 11, 2019_
* Dependencies updated
## v3.1.0 - _March 21, 2019_
* Added `startProviderEngine` to `providerUtils`. Preventing excess block polling (#1695)

29
contracts/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
"version": "3.1.0",
"version": "3.1.1",
"engines": {
"node": ">=6.12"
},
@ -24,6 +24,7 @@
"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",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
@ -46,12 +47,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/contracts-gen": "^1.0.7",
"@0x/contracts-test-utils": "^3.1.1",
"@0x/dev-utils": "^2.2.0",
"@0x/sol-compiler": "^3.1.5",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen": "^2.0.9",
"@0x/contracts-gen": "^1.0.8",
"@0x/contracts-test-utils": "^3.1.2",
"@0x/dev-utils": "^2.2.1",
"@0x/sol-compiler": "^3.1.6",
"@0x/tslint-config": "^3.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@ -68,14 +69,14 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^5.0.4",
"@0x/order-utils": "^7.1.1",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@0x/base-contract": "^5.0.5",
"@0x/order-utils": "^7.2.0",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"bn.js": "^4.11.8",
"ethereum-types": "^2.1.1",
"ethereum-types": "^2.1.2",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.11"
},

1
package.json
View File

@ -10,6 +10,7 @@
],
"scripts": {
"deps_versions:ci": "node ./packages/monorepo-scripts/lib/deps_versions.js",
"fix": "wsrun fix $PKG --fast-exit --parallel --exclude-missing",
"ganache": "ganache-cli -p 8545 --gasLimit 10000000 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
"prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc",
"prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",

9
packages/0x.js/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "6.0.6",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"timestamp": 1553183790,
"version": "6.0.5",

4
packages/0x.js/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.0.6 - _April 11, 2019_
* Dependencies updated
## v6.0.5 - _March 21, 2019_
* Dependencies updated

35
packages/0x.js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "6.0.5",
"version": "6.0.6",
"engines": {
"node": ">=6.12"
},
@ -19,6 +19,7 @@
"build:ci": "yarn build:commonjs",
"build:all": "run-p build:umd:prod build:commonjs",
"lint": "tslint --format stylish --project .",
"fix": "tslint --fix --format stylish --project .",
"test:circleci": "run-s test:coverage",
"rebuild_and_test": "run-s build test",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@ -42,11 +43,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/abi-gen-wrappers": "^4.1.0",
"@0x/contract-addresses": "^2.3.0",
"@0x/dev-utils": "^2.2.0",
"@0x/migrations": "^4.1.0",
"@0x/tslint-config": "^3.0.0",
"@0x/abi-gen-wrappers": "^4.2.0",
"@0x/contract-addresses": "^2.3.1",
"@0x/dev-utils": "^2.2.1",
"@0x/migrations": "^4.1.1",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",
@ -72,18 +73,18 @@
"webpack": "^4.20.2"
},
"dependencies": {
"@0x/assert": "^2.0.8",
"@0x/base-contract": "^5.0.4",
"@0x/contract-wrappers": "^8.0.5",
"@0x/order-utils": "^7.1.1",
"@0x/order-watcher": "^4.0.5",
"@0x/subproviders": "^4.0.4",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"@0x/assert": "^2.0.9",
"@0x/base-contract": "^5.0.5",
"@0x/contract-wrappers": "^9.0.0",
"@0x/order-utils": "^7.2.0",
"@0x/order-watcher": "^4.0.6",
"@0x/subproviders": "^4.0.5",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"@types/web3-provider-engine": "^14.0.0",
"ethereum-types": "^2.1.1",
"ethereum-types": "^2.1.2",
"ethers": "~4.0.4",
"lodash": "^4.17.11",
"web3-provider-engine": "14.0.6"

9
packages/abi-gen-templates/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.0.2",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"timestamp": 1551130135,
"version": "2.0.1",

4
packages/abi-gen-templates/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.2 - _April 11, 2019_
* Dependencies updated
## v2.0.1 - _February 25, 2019_
* Dependencies updated

3
packages/abi-gen-templates/contract.handlebars
View File

@ -7,7 +7,6 @@ import { BigNumber, classUtils, logUtils, providerUtils } from '@0x/utils';
import { SimpleContractArtifact } from '@0x/types';
import { Web3Wrapper } from '@0x/web3-wrapper';
import * as ethers from 'ethers';
import * as _ from 'lodash';
// tslint:enable:no-unused-variable
{{#if events}}
@ -46,7 +45,7 @@ export class {{contractName}}Contract extends BaseContract {
txDefaults: Partial<TxData>,
{{> typed_params inputs=ctor.inputs}}
): Promise<{{contractName}}Contract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen-templates",
"version": "2.0.1",
"version": "2.0.2",
"engines": {
"node": ">=6.12"
},

3
packages/abi-gen-wrappers/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Added IAssetProxy wrapper",
"pr": 1714
}
]
],
"timestamp": 1554997931
},
{
"version": "4.1.0",

4
packages/abi-gen-wrappers/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.2.0 - _April 11, 2019_
* Added IAssetProxy wrapper (#1714)
## v4.1.0 - _March 21, 2019_
* Add Coordinator and CoordinatorRegistry contract wrappers (#1689)

19
packages/abi-gen-wrappers/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen-wrappers",
"version": "4.1.0",
"version": "4.2.0",
"engines": {
"node": ">=6.12"
},
@ -13,6 +13,7 @@
"build": "yarn pre_build && tsc -b",
"build:ci": "yarn build",
"lint": "tslint --format stylish --project .",
"fix": "tslint --fix --format stylish --project .",
"pre_build": "yarn generate_contract_wrappers",
"clean": "shx rm -rf lib 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 src/generated-wrappers --backend ethers"
@ -30,19 +31,19 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
"devDependencies": {
"@0x/abi-gen": "^2.0.8",
"@0x/abi-gen-templates": "^2.0.1",
"@0x/tslint-config": "^3.0.0",
"@0x/types": "^2.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/abi-gen": "^2.0.9",
"@0x/abi-gen-templates": "^2.0.2",
"@0x/tslint-config": "^3.0.1",
"@0x/types": "^2.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"ethers": "~4.0.4",
"lodash": "^4.17.11",
"shx": "^0.2.2"
},
"dependencies": {
"@0x/base-contract": "^5.0.4"
"@0x/base-contract": "^5.0.5"
},
"publishConfig": {
"access": "public"

2
packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts
View File

@ -1426,7 +1426,7 @@ export class AssetProxyOwnerContract extends BaseContract {
_required: BigNumber,
_secondsTimeLocked: BigNumber,
): Promise<AssetProxyOwnerContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts
View File

@ -263,7 +263,7 @@ export class CoordinatorContract extends BaseContract {
txDefaults: Partial<TxData>,
_exchange: string,
): Promise<CoordinatorContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts
View File

@ -136,7 +136,7 @@ export class CoordinatorRegistryContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<CoordinatorRegistryContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts
View File

@ -760,7 +760,7 @@ export class DummyERC20TokenContract extends BaseContract {
_decimals: BigNumber,
_totalSupply: BigNumber,
): Promise<DummyERC20TokenContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts
View File

@ -950,7 +950,7 @@ export class DummyERC721TokenContract extends BaseContract {
_name: string,
_symbol: string,
): Promise<DummyERC721TokenContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts
View File

@ -200,7 +200,7 @@ export class DutchAuctionContract extends BaseContract {
txDefaults: Partial<TxData>,
_exchange: string,
): Promise<DutchAuctionContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts
View File

@ -486,7 +486,7 @@ export class ERC20ProxyContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<ERC20ProxyContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts
View File

@ -389,7 +389,7 @@ export class ERC20TokenContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<ERC20TokenContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts
View File

@ -486,7 +486,7 @@ export class ERC721ProxyContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<ERC721ProxyContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts
View File

@ -624,7 +624,7 @@ export class ERC721TokenContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<ERC721TokenContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts
View File

@ -2229,7 +2229,7 @@ export class ExchangeContract extends BaseContract {
txDefaults: Partial<TxData>,
_zrxAssetData: string,
): Promise<ExchangeContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts
View File

@ -461,7 +461,7 @@ export class ForwarderContract extends BaseContract {
_zrxAssetData: string,
_wethAssetData: string,
): Promise<ForwarderContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts
View File

@ -488,7 +488,7 @@ export class IAssetProxyContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<IAssetProxyContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts
View File

@ -52,7 +52,7 @@ export class IValidatorContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<IValidatorContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts
View File

@ -50,7 +50,7 @@ export class IWalletContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<IWalletContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts
View File

@ -625,7 +625,7 @@ export class MultiAssetProxyContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<MultiAssetProxyContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts
View File

@ -232,7 +232,7 @@ export class OrderValidatorContract extends BaseContract {
_exchange: string,
_zrxAssetData: string,
): Promise<OrderValidatorContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts
View File

@ -624,7 +624,7 @@ export class WETH9Contract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<WETH9Contract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

2
packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts
View File

@ -467,7 +467,7 @@ export class ZRXTokenContract extends BaseContract {
supportedProvider: SupportedProvider,
txDefaults: Partial<TxData>,
): Promise<ZRXTokenContract> {
if (_.isUndefined(artifact.compilerOutput)) {
if (artifact.compilerOutput === undefined) {
throw new Error('Compiler output not found in the artifact file');
}
const provider = providerUtils.standardizeOrThrow(supportedProvider);

9
packages/abi-gen/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.0.9",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"timestamp": 1553183790,
"version": "2.0.8",

4
packages/abi-gen/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.9 - _April 11, 2019_
* Dependencies updated
## v2.0.8 - _March 21, 2019_
* Dependencies updated

11
packages/abi-gen/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen",
"version": "2.0.8",
"version": "2.0.9",
"engines": {
"node": ">=6.12"
},
@ -9,6 +9,7 @@
"types": "lib/src/index.d.ts",
"scripts": {
"lint": "tslint --format stylish --project .",
"fix": "tslint --fix --format stylish --project .",
"clean": "shx rm -rf lib",
"build": "tsc -b",
"build:ci": "yarn build",
@ -31,10 +32,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"chalk": "^2.3.0",
"ethereum-types": "^2.1.1",
"ethereum-types": "^2.1.2",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
"lodash": "^4.17.11",
@ -45,7 +46,7 @@
"yargs": "^10.0.3"
},
"devDependencies": {
"@0x/tslint-config": "^3.0.0",
"@0x/tslint-config": "^3.0.1",
"@types/glob": "5.0.35",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.2",

8
packages/abi-gen/src/index.ts
View File

@ -92,12 +92,12 @@ for (const abiFileName of abiFileNames) {
let ABI;
if (_.isArray(parsedContent)) {
ABI = parsedContent; // ABI file
} else if (!_.isUndefined(parsedContent.abi)) {
} else if (parsedContent.abi !== undefined) {
ABI = parsedContent.abi; // Truffle artifact
} else if (!_.isUndefined(parsedContent.compilerOutput.abi)) {
} else if (parsedContent.compilerOutput.abi !== undefined) {
ABI = parsedContent.compilerOutput.abi; // 0x artifact
}
if (_.isUndefined(ABI)) {
if (ABI === undefined) {
logUtils.log(`${chalk.red(`ABI not found in ${abiFileName}.`)}`);
logUtils.log(
`Please make sure your ABI file is either an array with ABI entries or a truffle artifact or 0x sol-compiler artifact`,
@ -114,7 +114,7 @@ for (const abiFileName of abiFileNames) {
}
let ctor = ABI.find((abi: AbiDefinition) => abi.type === ABI_TYPE_CONSTRUCTOR) as ConstructorAbi;
if (_.isUndefined(ctor)) {
if (ctor === undefined) {
ctor = utils.getEmptyConstructor(); // The constructor exists, but it's implicit in JSON's ABI definition
}

9
packages/assert/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "2.0.9",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"timestamp": 1553183790,
"version": "2.0.8",

4
packages/assert/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.9 - _April 11, 2019_
* Dependencies updated
## v2.0.8 - _March 21, 2019_
* Dependencies updated

11
packages/assert/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/assert",
"version": "2.0.8",
"version": "2.0.9",
"engines": {
"node": ">=6.12"
},
@ -12,6 +12,7 @@
"build:ci": "yarn build",
"clean": "shx rm -rf lib test_temp",
"lint": "tslint --format stylish --project .",
"fix": "tslint --fix --format stylish --project .",
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
@ -29,7 +30,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
"devDependencies": {
"@0x/tslint-config": "^3.0.0",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
@ -44,9 +45,9 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/json-schemas": "^3.0.8",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/json-schemas": "^3.0.9",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"lodash": "^4.17.11",
"valid-url": "^1.0.9"
},

8
packages/assert/src/index.ts
View File

@ -65,11 +65,11 @@ export const assert = {
assert.assert(isWeb3Provider, assert.typeAssertionMessage(variableName, 'Provider', value));
},
doesConformToSchema(variableName: string, value: any, schema: Schema, subSchemas?: Schema[]): void {
if (_.isUndefined(value)) {
if (value === undefined) {
throw new Error(`${variableName} can't be undefined`);
}
const schemaValidator = new SchemaValidator();
if (!_.isUndefined(subSchemas)) {
if (subSchemas !== undefined) {
_.map(subSchemas, schemaValidator.addSchema.bind(schemaValidator));
}
const validationResult = schemaValidator.validate(value, schema);
@ -80,11 +80,11 @@ Validation errors: ${validationResult.errors.join(', ')}`;
assert.assert(!hasValidationErrors, msg);
},
isWebUri(variableName: string, value: any): void {
const isValidUrl = !_.isUndefined(validUrl.isWebUri(value));
const isValidUrl = validUrl.isWebUri(value) !== undefined;
assert.assert(isValidUrl, assert.typeAssertionMessage(variableName, 'web uri', value));
},
isUri(variableName: string, value: any): void {
const isValidUri = !_.isUndefined(validUrl.isUri(value));
const isValidUri = validUrl.isUri(value) !== undefined;
assert.assert(isValidUri, assert.typeAssertionMessage(variableName, 'uri', value));
},
assert(condition: boolean, message: string): void {

3
packages/asset-buyer/CHANGELOG.json
View File

@ -6,7 +6,8 @@
"note": "Moved order_utils into `@0x/order-utils` package as `orderCalculationUtils`",
"pr": 1714
}
]
],
"timestamp": 1554997931
},
{
"timestamp": 1553183790,

4
packages/asset-buyer/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.1.0 - _April 11, 2019_
* Moved order_utils into `@0x/order-utils` package as `orderCalculationUtils` (#1714)
## v6.0.5 - _March 21, 2019_
* Dependencies updated

27
packages/asset-buyer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/asset-buyer",
"version": "6.0.5",
"version": "6.1.0",
"engines": {
"node": ">=6.12"
},
@ -11,6 +11,7 @@
"build": "yarn tsc -b",
"build:ci": "yarn build",
"lint": "tslint --format stylish --project .",
"fix": "tslint --fix --format stylish --project .",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@ -36,21 +37,21 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
"dependencies": {
"@0x/assert": "^2.0.8",
"@0x/connect": "^5.0.4",
"@0x/contract-wrappers": "^8.0.5",
"@0x/json-schemas": "^3.0.8",
"@0x/order-utils": "^7.1.1",
"@0x/subproviders": "^4.0.4",
"@0x/types": "^2.2.1",
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/assert": "^2.0.9",
"@0x/connect": "^5.0.5",
"@0x/contract-wrappers": "^9.0.0",
"@0x/json-schemas": "^3.0.9",
"@0x/order-utils": "^7.2.0",
"@0x/subproviders": "^4.0.5",
"@0x/types": "^2.2.2",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"lodash": "^4.17.11"
},
"devDependencies": {
"@0x/tslint-config": "^3.0.0",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",

14
packages/asset-buyer/src/asset_buyer.ts
View File

@ -234,29 +234,29 @@ export class AssetBuyer {
options,
);
assert.isValidBuyQuote('buyQuote', buyQuote);
if (!_.isUndefined(ethAmount)) {
if (ethAmount !== undefined) {
assert.isBigNumber('ethAmount', ethAmount);
}
if (!_.isUndefined(takerAddress)) {
if (takerAddress !== undefined) {
assert.isETHAddressHex('takerAddress', takerAddress);
}
assert.isETHAddressHex('feeRecipient', feeRecipient);
if (!_.isUndefined(gasLimit)) {
if (gasLimit !== undefined) {
assert.isNumber('gasLimit', gasLimit);
}
if (!_.isUndefined(gasPrice)) {
if (gasPrice !== undefined) {
assert.isBigNumber('gasPrice', gasPrice);
}
const { orders, feeOrders, feePercentage, assetBuyAmount, worstCaseQuoteInfo } = buyQuote;
// if no takerAddress is provided, try to get one from the provider
let finalTakerAddress;
if (!_.isUndefined(takerAddress)) {
if (takerAddress !== undefined) {
finalTakerAddress = takerAddress;
} else {
const web3Wrapper = new Web3Wrapper(this.provider);
const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
const firstAvailableAddress = _.head(availableAddresses);
if (!_.isUndefined(firstAvailableAddress)) {
if (firstAvailableAddress !== undefined) {
finalTakerAddress = firstAvailableAddress;
} else {
throw new Error(AssetBuyerError.NoAddressAvailable);
@ -314,7 +314,7 @@ export class AssetBuyer {
// we are forced to OR
// we have some last refresh time AND that time was sufficiently long ago
const shouldRefresh =
_.isUndefined(ordersEntryIfExists) ||
ordersEntryIfExists === undefined ||
shouldForceOrderRefresh ||
// tslint:disable:restrict-plus-operands
ordersEntryIfExists.lastRefreshTime + this.orderRefreshIntervalMs < Date.now();

3
packages/asset-buyer/src/utils/assert.ts
View File

@ -1,6 +1,5 @@
import { assert as sharedAssert } from '@0x/assert';
import { schemas } from '@0x/json-schemas';
import * as _ from 'lodash';
import { BuyQuote, BuyQuoteInfo, OrderProvider, OrderProviderRequest } from '../types';
@ -13,7 +12,7 @@ export const assert = {
assert.isValidBuyQuoteInfo(`${variableName}.bestCaseQuoteInfo`, buyQuote.bestCaseQuoteInfo);
assert.isValidBuyQuoteInfo(`${variableName}.worstCaseQuoteInfo`, buyQuote.worstCaseQuoteInfo);
sharedAssert.isBigNumber(`${variableName}.assetBuyAmount`, buyQuote.assetBuyAmount);
if (!_.isUndefined(buyQuote.feePercentage)) {
if (buyQuote.feePercentage !== undefined) {
sharedAssert.isNumber(`${variableName}.feePercentage`, buyQuote.feePercentage);
}
},

2
packages/asset-buyer/src/utils/order_provider_response_processor.ts
View File

@ -41,7 +41,7 @@ export const orderProviderResponseProcessor = {
// set the orders to be sorted equal to the filtered orders
let unsortedOrders = filteredOrders;
// if an orderValidator is provided, use on chain information to calculate remaining fillable makerAsset amounts
if (!_.isUndefined(orderValidator)) {
if (orderValidator !== undefined) {
const takerAddresses = _.map(filteredOrders, () => constants.NULL_ADDRESS);
try {
const ordersAndTradersInfo = await orderValidator.getOrdersAndTradersInfoAsync(

9
packages/base-contract/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[
{
"version": "5.0.5",
"changes": [
{
"note": "Dependencies updated"
}
],
"timestamp": 1554997931
},
{
"timestamp": 1553183790,
"version": "5.0.4",

4
packages/base-contract/CHANGELOG.md
View File

@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.0.5 - _April 11, 2019_
* Dependencies updated
## v5.0.4 - _March 21, 2019_
* Dependencies updated

15
packages/base-contract/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@0x/base-contract",
"version": "5.0.4",
"version": "5.0.5",
"engines": {
"node": ">=6.12"
},
@ -17,7 +17,8 @@
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"lint": "tslint --format stylish --project ."
"lint": "tslint --format stylish --project .",
"fix": "tslint --format stylish --fix --project ."
},
"license": "Apache-2.0",
"repository": {
@ -29,7 +30,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
"devDependencies": {
"@0x/tslint-config": "^3.0.0",
"@0x/tslint-config": "^3.0.1",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"make-promises-safe": "^1.1.0",
@ -40,10 +41,10 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/typescript-typings": "^4.2.1",
"@0x/utils": "^4.3.0",
"@0x/web3-wrapper": "^6.0.4",
"ethereum-types": "^2.1.1",
"@0x/typescript-typings": "^4.2.2",
"@0x/utils": "^4.3.1",
"@0x/web3-wrapper": "^6.0.5",
"ethereum-types": "^2.1.2",
"ethers": "~4.0.4",
"lodash": "^4.17.11"
},

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