From e926f2739614d885d094c1c7f5fe3f3c4973d7b9 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Tue, 30 Apr 2024 12:40:42 -0700 Subject: [PATCH] Update SDK encoding/decoding for Cadence 1.0 --- packages/sdk/src/decode/decode.js | 24 ++++-------------------- packages/types/src/types.ts | 1 + 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/packages/sdk/src/decode/decode.js b/packages/sdk/src/decode/decode.js index 23a041b9d..90ffb47fc 100644 --- a/packages/sdk/src/decode/decode.js +++ b/packages/sdk/src/decode/decode.js @@ -27,26 +27,9 @@ const decodeType = async type => { return type.staticType } -const decodePath = async path => { - return { - domain: path.domain, - identifier: path.identifier, - } -} - -const decodeCapability = async cap => { - return { - path: cap.path, - address: cap.address, - borrowType: cap.borrowType, - } -} - const decodeOptional = async (optional, decoders, stack) => optional ? await recurseDecode(optional, decoders, stack) : null -const decodeReference = async v => ({address: v.address, type: v.type}) - const decodeArray = async (array, decoders, stack) => await Promise.all( array.map( @@ -102,7 +85,7 @@ const defaultDecoders = { Address: decodeImplicit, Void: decodeVoid, Optional: decodeOptional, - Reference: decodeReference, + Reference: decodeImplicit, Array: decodeArray, Dictionary: decodeDictionary, Event: decodeComposite, @@ -110,8 +93,9 @@ const defaultDecoders = { Struct: decodeComposite, Enum: decodeComposite, Type: decodeType, - Path: decodePath, - Capability: decodeCapability, + Path: decodeImplicit, + Capability: decodeImplicit, + InclusiveRange: decodeImplicit, } const decoderLookup = (decoders, lookup) => { diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts index 9617d6993..7d86be48e 100644 --- a/packages/types/src/types.ts +++ b/packages/types/src/types.ts @@ -638,6 +638,7 @@ export const Optional = < v => v ) +// todo: this doesn't look right export const Reference = typedef( "Reference", (v: ReferenceValue) => {