From 0c0bcb44d3ef6d68c9c7c05be25641ef57a7287a Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 19 Nov 2018 13:07:34 -0800 Subject: All 71 tests passing. Both for function encoding and individual types. --- packages/utils/src/abi_encoder/data_type.ts | 4 ++-- packages/utils/src/abi_encoder/evm_data_types.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/utils/src/abi_encoder/data_type.ts b/packages/utils/src/abi_encoder/data_type.ts index 21c08ef54..243b221ef 100644 --- a/packages/utils/src/abi_encoder/data_type.ts +++ b/packages/utils/src/abi_encoder/data_type.ts @@ -40,8 +40,8 @@ export abstract class DataType { return calldataHex; } - public decode(calldata: string, rules?: DecodingRules): any { - const rawCalldata = new RawCalldata(calldata, true); // @TODO Sohuld not hardcode false here + public decode(calldata: string, rules?: DecodingRules, hasSelector: boolean = false): any { + const rawCalldata = new RawCalldata(calldata, hasSelector); const rules_ = rules ? rules : DataType.DEFAULT_DECODING_RULES; const value = this.generateValue(rawCalldata, rules_); return value; diff --git a/packages/utils/src/abi_encoder/evm_data_types.ts b/packages/utils/src/abi_encoder/evm_data_types.ts index b6a62a5d4..2895ee00f 100644 --- a/packages/utils/src/abi_encoder/evm_data_types.ts +++ b/packages/utils/src/abi_encoder/evm_data_types.ts @@ -515,7 +515,8 @@ export class Method extends MemberDataType { if (!calldata.startsWith(this.selector)) { throw new Error(`Tried to decode calldata, but it was missing the function selector. Expected '${this.selector}'.`); } - const value = super.decode(calldata, rules); + const hasSelector = true; + const value = super.decode(calldata, rules, hasSelector); return value; } -- cgit v1.2.3