Skip to content

fix: Fix ABI array/struct decoding #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludamad merged 5 commits into from
Jul 4, 2023
Merged

fix: Fix ABI array/struct decoding #956

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd378b3
Update decoder.ts
ludamad Jul 4, 2023
e06f7f3
Update decoder.ts
ludamad Jul 4, 2023
c67ed06
Update decoder.ts
ludamad Jul 4, 2023
b40172a
Update decoder.ts
ludamad Jul 4, 2023
a5b5aa1
Update decoder.ts
ludamad Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions yarn-project/acir-simulator/src/abi_coder/decoder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { Fr } from '@aztec/foundation/fields';
import { ABIType, FunctionAbi } from '@aztec/foundation/abi';

/**
* The type of our decoded ABI.
*/
type DecodedReturn = bigint | boolean | DecodedReturn[] | { [key: string]: DecodedReturn };

/**
* Decodes return values from a function call.
* Missing support for integer and string.
Expand All @@ -13,7 +18,7 @@ class ReturnValuesDecoder {
* @param abiType - The type of the return value.
* @returns The decoded return value.
*/
private decodeReturn(abiType: ABIType): any {
private decodeReturn(abiType: ABIType): DecodedReturn {
switch (abiType.kind) {
case 'field':
return this.getNextField().value;
Expand All @@ -24,14 +29,14 @@ class ReturnValuesDecoder {
for (let i = 0; i < abiType.length; i += 1) {
array.push(this.decodeReturn(abiType.type));
}
break;
return array;
}
case 'struct': {
const struct: any = {};
const struct: { [key: string]: DecodedReturn } = {};
for (const field of abiType.fields) {
struct[field.name] = this.decodeReturn(field.type);
}
break;
return struct;
}
default:
throw new Error(`Unsupported type: ${abiType.kind}`);
Expand Down