Skip to content

fix: Handle falsy bigints in json-rpc #2403

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
sirasistant merged 2 commits into from
Sep 19, 2023
Merged

fix: Handle falsy bigints in json-rpc #2403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81887f8
fix: Handle falsy bigints in json-rpc
Sep 19, 2023
a3aa9bf
Merge branch 'master' into arv/fix_bigint_rpc
sirasistant Sep 19, 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
15 changes: 8 additions & 7 deletions yarn-project/foundation/src/json-rpc/convert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@ export function convertFromJsonObj(cc: ClassConverter, obj: any): any {
* @returns The encoded object.
*/
export function convertToJsonObj(cc: ClassConverter, obj: any): any {
// Bigint is a primitive type that needs special handling since it's not serialisable
if (typeof obj === 'bigint') {
return {
type: 'bigint',
data: obj.toString(),
};
}

if (!obj) {
return obj; // Primitive type
}
Expand All @@ -126,13 +134,6 @@ export function convertToJsonObj(cc: ClassConverter, obj: any): any {
return { type: 'Buffer', data: obj.toString('base64') };
}

if (typeof obj === 'bigint') {
return {
type: 'bigint',
data: obj.toString(),
};
}

// Is this a convertible type?
if (cc.isRegisteredClass(obj.constructor)) {
return cc.toJsonObj(obj);
Expand Down