diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-07-19 18:06:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 18:06:37 +0800 |
| commit | 886a03fdcd4893a57f88fa407de94852cb0a2285 (patch) | |
| tree | 4b9dec2ac9e6fa810e1ec3e6cd96f7a2d607479c | |
| parent | 55336f96d70d05f07725564bf6aec573dc3246c2 (diff) | |
| parent | 81007c453c8885dd1d7c89d22a20d0785bf17c88 (diff) | |
| download | dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.tar dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.tar.gz dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.tar.bz2 dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.tar.lz dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.tar.xz dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.tar.zst dexon-sol-tools-886a03fdcd4893a57f88fa407de94852cb0a2285.zip | |
Merge pull request #894 from 0xProject/bug/minor-fixes-json-schema-order-utils
Rename json schema call data id to CallData.
| -rw-r--r-- | packages/json-schemas/CHANGELOG.json | 4 | ||||
| -rw-r--r-- | packages/json-schemas/schemas/call_data_schema.ts | 2 | ||||
| -rw-r--r-- | packages/order-utils/CHANGELOG.json | 4 | ||||
| -rw-r--r-- | packages/order-utils/src/crypto.ts | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 2f8f2573f..b69b440cf 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Added CallData schema", "pr": 821 + }, + { + "note": "Update CallData schema id to CallData", + "pr": 894 } ] }, diff --git a/packages/json-schemas/schemas/call_data_schema.ts b/packages/json-schemas/schemas/call_data_schema.ts index e8fcc7512..b9d00ad2a 100644 --- a/packages/json-schemas/schemas/call_data_schema.ts +++ b/packages/json-schemas/schemas/call_data_schema.ts @@ -1,5 +1,5 @@ export const callDataSchema = { - id: '/TxData', + id: '/CallData', properties: { from: { $ref: '/Address' }, to: { $ref: '/Address' }, diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 4358c2c9c..e61033c53 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Export parseECSignature method", "pr": 684 + }, + { + "note": "Handle Typed Arrays when hashing data", + "pr": 894 } ] }, diff --git a/packages/order-utils/src/crypto.ts b/packages/order-utils/src/crypto.ts index 517ca2840..0f1504a72 100644 --- a/packages/order-utils/src/crypto.ts +++ b/packages/order-utils/src/crypto.ts @@ -32,7 +32,7 @@ export const crypto = { argTypes.push('address'); } else if (_.isString(arg)) { argTypes.push('string'); - } else if (_.isBuffer(arg)) { + } else if (_.isBuffer(arg) || _.isTypedArray(arg)) { argTypes.push('bytes'); } else if (_.isBoolean(arg)) { argTypes.push('bool'); |