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

All 71 tests passing. Both for function encoding and individual types.

Browse Source
This commit is contained in:
Greg Hysen
2018-11-19 13:07:34 -08:00
parent b213cb3974
commit 0c0bcb44d3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/utils/src/abi_encoder/data_type.ts
View File

@@ -40,8 +40,8 @@ export abstract class DataType {
return calldataHex; return calldataHex;
} }
public decode(calldata: string, rules?: DecodingRules): any { public decode(calldata: string, rules?: DecodingRules, hasSelector: boolean = false): any {
const rawCalldata = new RawCalldata(calldata, true); // @TODO Sohuld not hardcode false here const rawCalldata = new RawCalldata(calldata, hasSelector);
const rules_ = rules ? rules : DataType.DEFAULT_DECODING_RULES; const rules_ = rules ? rules : DataType.DEFAULT_DECODING_RULES;
const value = this.generateValue(rawCalldata, rules_); const value = this.generateValue(rawCalldata, rules_);
return value; return value;

3
packages/utils/src/abi_encoder/evm_data_types.ts
View File

@@ -515,7 +515,8 @@ export class Method extends MemberDataType {
if (!calldata.startsWith(this.selector)) { if (!calldata.startsWith(this.selector)) {
throw new Error(`Tried to decode calldata, but it was missing the function selector. Expected '${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; return value;
} }