diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-06-01 01:14:23 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-06-01 02:04:05 +0800 |
| commit | fa3d011f68630e36b1a3812dd493a5144ebc6c53 (patch) | |
| tree | 61bb2d6030e573f4777f477fa94ecc0533cf9f8b | |
| parent | a7fc9caacb7b98c7d79333e60ee9862945a67ecc (diff) | |
| download | dexon-0x-contracts-fa3d011f68630e36b1a3812dd493a5144ebc6c53.tar.gz dexon-0x-contracts-fa3d011f68630e36b1a3812dd493a5144ebc6c53.tar.zst dexon-0x-contracts-fa3d011f68630e36b1a3812dd493a5144ebc6c53.zip | |
Add ethereum-types to extraFileIncludes
| -rw-r--r-- | packages/0x.js/package.json | 1 | ||||
| -rw-r--r-- | packages/contracts/src/utils/log_decoder.ts | 11 | ||||
| -rw-r--r-- | packages/json-schemas/package.json | 3 | ||||
| -rw-r--r-- | packages/order-utils/package.json | 3 | ||||
| -rw-r--r-- | packages/sol-compiler/package.json | 3 | ||||
| -rw-r--r-- | packages/sol-cov/package.json | 3 | ||||
| -rw-r--r-- | packages/subproviders/package.json | 3 | ||||
| -rw-r--r-- | packages/web3-wrapper/package.json | 3 |
8 files changed, 22 insertions, 8 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index e4f7a1d03..9ecc78882 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -44,6 +44,7 @@ "docPublishConfigs": { "extraFileIncludes": [ "../types/src/index.ts", + "../ethereum-types/src/index.ts", "../contract-wrappers/src/types.ts", "../contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts", "../contract-wrappers/src/contract_wrappers/exchange_wrapper.ts", diff --git a/packages/contracts/src/utils/log_decoder.ts b/packages/contracts/src/utils/log_decoder.ts index 2839cfe84..07d10e69d 100644 --- a/packages/contracts/src/utils/log_decoder.ts +++ b/packages/contracts/src/utils/log_decoder.ts @@ -1,7 +1,14 @@ import { ContractArtifact } from '@0xproject/sol-compiler'; import { AbiDecoder, BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; -import { AbiDefinition, LogEntry, LogWithDecodedArgs, RawLog, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; +import { + AbiDefinition, + DecodedLogArgs, + LogEntry, + LogWithDecodedArgs, + RawLog, + TransactionReceiptWithDecodedLogs, +} from 'ethereum-types'; import * as _ from 'lodash'; import { artifacts } from './artifacts'; @@ -30,7 +37,7 @@ export class LogDecoder { }); this._abiDecoder = new AbiDecoder(abiArrays); } - public decodeLogOrThrow<ArgsType>(log: LogEntry): LogWithDecodedArgs<ArgsType> | RawLog { + public decodeLogOrThrow<ArgsType extends DecodedLogArgs>(log: LogEntry): LogWithDecodedArgs<ArgsType> | RawLog { const logWithDecodedArgsOrLog = this._abiDecoder.tryToDecodeLogOrNoop(log); if (_.isUndefined((logWithDecodedArgsOrLog as LogWithDecodedArgs<ArgsType>).args)) { throw new Error(`Unable to decode log: ${JSON.stringify(log)}`); diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 1612bbc0a..60a79d165 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -27,7 +27,8 @@ "assets": [], "docPublishConfigs": { "extraFileIncludes": [ - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/json-schemas/", "s3StagingBucketPath": "s3://staging-doc-jsons/json-schemas/" diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index ec8074b9d..ddb95ba3f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -26,7 +26,8 @@ "postpublish": { "docPublishConfigs": { "extraFileIncludes": [ - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/order-utils/", "s3StagingBucketPath": "s3://staging-doc-jsons/order-utils/" diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index c719b751d..60ed3655f 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -28,7 +28,8 @@ "assets": [], "docPublishConfigs": { "extraFileIncludes": [ - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/sol-compiler/", "s3StagingBucketPath": "s3://staging-doc-jsons/sol-compiler/" diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 8f272a00c..4d92a610b 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -29,7 +29,8 @@ "docPublishConfigs": { "extraFileIncludes": [ "../subproviders/src/types.ts", - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/sol-cov/", "s3StagingBucketPath": "s3://staging-doc-jsons/sol-cov/" diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index e08b462f1..3a28e5e8d 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -31,7 +31,8 @@ "assets": [], "docPublishConfigs": { "extraFileIncludes": [ - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/subproviders/", "s3StagingBucketPath": "s3://staging-doc-jsons/subproviders/" diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index a633bd674..9baaba391 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -26,7 +26,8 @@ "postpublish": { "docPublishConfigs": { "extraFileIncludes": [ - "../types/src/index.ts" + "../types/src/index.ts", + "../ethereum-types/src/index.ts" ], "s3BucketPath": "s3://doc-jsons/web3-wrapper/", "s3StagingBucketPath": "s3://staging-doc-jsons/web3-wrapper/" |