Merge branch '3.0' into feat/3.0/testnet-migrations

This commit is contained in:
Amir Bandeali
2019-10-03 23:04:07 -07:00
295 changed files with 68140 additions and 46805 deletions

View File

@@ -1,6 +1,6 @@
[
{
"version": "9.0.0",
"version": "8.5.0-beta.0",
"changes": [
{
"note": "Add `chainId` `OrderValidationUtils`, `OrderFactory`",
@@ -110,7 +110,8 @@
"note": "Add `InvalidMinimumPoolStake` to `StakingRevertErrors.InvalidParamValueErrorCode`.",
"pr": 2155
}
]
],
"timestamp": 1570135330
},
{
"version": "8.4.0",

View File

@@ -5,6 +5,36 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v8.5.0-beta.0 - _October 3, 2019_
* Add `chainId` `OrderValidationUtils`, `OrderFactory` (#1742)
* Update tools to use new `Order` and `ZeroExTransaction` structure (#1742)
* Update domain schema for Exchange and Coordinator (#1742)
* Add Exchange `RevertError` types to `ExchangeRevertErrors` (#1761)
* Add `SignatureOrderValidatorError` type to `ExchangeRevertErrors` (#1774)
* Add `SignatureWalletOrderValidatorError` type to `ExchangeRevertErrors` (#1774)
* Reorder parameters of some `RevertError` types to match smart contracts. (#1790)
* Use arbitrary fee tokens instead of ZRX (ZEIP-28) for tools needed by contracts packages. (#1819)
* Update `RevertError` types for new base constructor (#1819)
* Add `Expired` TransactionErrorCode (#1832)
* Add `expirationTimeSeconds` to `ZeroExTransaction` parameters used for hashing (#1832)
* Add `validator` field to `SignatureValidatorError` `RevertError` types. (#1885)
* Remove unused `RevertError` types. (#1885)
* Add `ExchangeRevertErrors.SignatureErrorCode.InvalidSigner`. (#2042)
* Add `takerAssetFillAmount` field to `IncompleteFillError` type (#2075)
* Update `IncompleteFillError` to take an `errorCode`, `expectedAssetFillAmount`, and `actualAssetFillAmount` fields. (#2075)
* Add EIP712 types for Staking (#1910)
* Add `InvalidCobbDouglasAlphaError` `RevertError` type to `StakingRevertErrors` (#2109)
* Rename `OperatorShareMustBeBetween0And100Error` `RevertError` type to `InvalidPoolOperatorShareError`. (#2109)
* Add `TransactionGasPriceError` and `TransactionInvalidContextError` to error registry. (#2109)
* Add `EthVaultNotSetError, `RewardVaultNotSetError`, and `InvalidStakeStatusError` to error registry. (#2118)
* Add `InvalidStakeStatusError` to error registry. (#2126)
* Add `InitializationError`, `InvalidParamValue` to `StakingRevertErrors`. (#2131)
* Add `CumulativeRewardIntervalError`. (#2154)
* Remove `validateOrderFillableOrThrowAsync`, `simpleValidateOrderFillableOrThrowAsync`, `validateMakerTransferThrowIfInvalidAsync` (#2181)
* Add `PreviousEpochNotFinalizedError` to `StakingRevertErrors`. (#2155)
* Add `InvalidMinimumPoolStake` to `StakingRevertErrors.InvalidParamValueErrorCode`. (#2155)
## v8.4.0 - _September 17, 2019_
* Implement `simpleValidateOrderFillableOrThrowAsync` (#2096)

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/order-utils",
"version": "8.4.0",
"version": "8.5.0-beta.0",
"engines": {
"node": ">=6.12"
},
@@ -39,8 +39,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
"@0x/dev-utils": "^2.3.3",
"@0x/subproviders": "^5.0.4",
"@0x/dev-utils": "^2.4.0-beta.0",
"@0x/subproviders": "^5.1.0-beta.0",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^3.0.1",
"@types/bn.js": "^4.11.0",
@@ -59,18 +59,18 @@
"web3-provider-engine": "14.0.6"
},
"dependencies": {
"@0x/abi-gen-wrappers": "^5.3.2",
"@0x/assert": "^2.1.6",
"@0x/contract-addresses": "^3.2.0",
"@0x/contract-artifacts": "^2.2.2",
"@0x/json-schemas": "^4.0.2",
"@0x/types": "^2.4.3",
"@0x/typescript-typings": "^4.3.0",
"@0x/utils": "^4.5.2",
"@0x/web3-wrapper": "^6.0.13",
"@0x/abi-gen-wrappers": "^5.4.0-beta.0",
"@0x/assert": "^2.2.0-beta.0",
"@0x/contract-addresses": "^3.3.0-beta.0",
"@0x/contract-artifacts": "^2.3.0-beta.0",
"@0x/json-schemas": "^4.1.0-beta.0",
"@0x/types": "^2.5.0-beta.0",
"@0x/typescript-typings": "^4.4.0-beta.0",
"@0x/utils": "^4.6.0-beta.0",
"@0x/web3-wrapper": "^6.1.0-beta.0",
"@types/node": "*",
"bn.js": "^4.11.8",
"ethereum-types": "^2.1.6",
"ethereum-types": "^2.2.0-beta.0",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "~4.0.4",

View File

@@ -27,19 +27,6 @@ export class CompleteBuyFailedError extends RevertError {
}
}
export class MakerAssetMismatchError extends RevertError {
constructor(firstOrderMakerAssetData?: string, mismatchedMakerAssetData?: string) {
super(
'MakerAssetMismatchError',
'MakerAssetMismatchError(bytes firstOrderMakerAssetData, bytes mismatchedMakerAssetData)',
{
firstOrderMakerAssetData,
mismatchedMakerAssetData,
},
);
}
}
export class UnsupportedFeeError extends RevertError {
constructor(takerFeeAssetData?: string) {
super('UnsupportedFeeError', 'UnsupportedFeeError(bytes takerFeeAssetData)', { takerFeeAssetData });
@@ -64,10 +51,10 @@ export class InsufficientEthForFeeError extends RevertError {
}
}
export class OversoldWethError extends RevertError {
constructor(wethSold?: BigNumber | number | string, msgValue?: BigNumber | number | string) {
super('OversoldWethError', 'OversoldWethError(uint256 wethSold, uint256 msgValue)', {
wethSold,
export class OverspentWethError extends RevertError {
constructor(wethSpent?: BigNumber | number | string, msgValue?: BigNumber | number | string) {
super('OverspentWethError', 'OverspentWethError(uint256 wethSpent, uint256 msgValue)', {
wethSpent,
msgValue,
});
}
@@ -87,9 +74,9 @@ export class DefaultFunctionWethContractOnlyError extends RevertError {
}
}
export class MsgValueCantEqualZeroError extends RevertError {
export class MsgValueCannotEqualZeroError extends RevertError {
constructor() {
super('MsgValueCantEqualZeroError', 'MsgValueCantEqualZeroError()', {});
super('MsgValueCannotEqualZeroError', 'MsgValueCannotEqualZeroError()', {});
}
}
@@ -105,14 +92,13 @@ const types = [
UnregisteredAssetProxyError,
UnsupportedAssetProxyError,
CompleteBuyFailedError,
MakerAssetMismatchError,
UnsupportedFeeError,
FeePercentageTooLargeError,
InsufficientEthForFeeError,
OversoldWethError,
OverspentWethError,
TransferFailedError,
DefaultFunctionWethContractOnlyError,
MsgValueCantEqualZeroError,
MsgValueCannotEqualZeroError,
Erc721AmountMustEqualOneError,
];

View File

@@ -1,7 +1,7 @@
import * as ExchangeRevertErrors from './exchange_revert_errors';
import * as ForwarderRevertErrors from './forwarder_revert_errors';
import * as LibMathRevertErrors from './lib_math_revert_errors';
import * as StakingRevertErrors from './staking_revert_errors';
export import ExchangeRevertErrors = require('./exchange_revert_errors');
export import ForwarderRevertErrors = require('./forwarder_revert_errors');
export import LibMathRevertErrors = require('./lib_math_revert_errors');
export import StakingRevertErrors = require('./staking_revert_errors');
export { orderHashUtils } from './order_hash';
export { signatureUtils } from './signature_utils';
@@ -85,8 +85,4 @@ export {
FeeOrdersAndRemainingFeeAmount,
OrdersAndRemainingTakerFillAmount,
OrdersAndRemainingMakerFillAmount,
ValidateOrderFillableOpts,
} from './types';
export { ExchangeRevertErrors, ForwarderRevertErrors, LibMathRevertErrors, StakingRevertErrors };
export { NetworkId, ExchangeContract } from '@0x/abi-gen-wrappers';