chore: update scale dependency to 0.10.0

deps/scale.ts

@@ -1 +1 @@
-export * from "https://deno.land/x/scale@v0.9.1/mod.ts"
+export * from "https://deno.land/x/scale@v0.10.0/mod.ts"

effects/contracts/events.ts

@@ -11,13 +11,15 @@ export function events(inkMetadata: Z.$<InkMetadata>, events: Z.$<ExtrinsicEvent
       $.taggedUnion(
         "type",
         inkMetadata.V3.spec.events
-          .map((e) => [
-            e.label,
-            [
-              "value",
-              $.tuple(...e.args.map((a) => DeriveCodec(inkMetadata.V3.types)(a.type.type))),
-            ],
-          ]),
+          .map((e) =>
+            $.variant(
+              e.label,
+              $.field(
+                "value",
+                $.tuple(...e.args.map((a) => DeriveCodec(inkMetadata.V3.types)(a.type.type))),
+              ),
+            )
+          ),
       )
     )
   return Z.ls(events, $events).next(([events, $events]) =>

frame_metadata/Metadata.ts

@@ -1,5 +1,5 @@
 import * as $ from "../deps/scale.ts"
-import { $tyId, $tys, Ty } from "../scale_info/Ty.ts"
+import { $field, $tyId, $tys, Ty } from "../scale_info/Ty.ts"
 import * as U from "../util/mod.ts"
 
 export type HasherKind = $.Native<typeof $hasherKind>
@@ -34,13 +34,13 @@ export interface MapStorageEntryType {
 export type StorageEntryType = PlainStorageEntryType | MapStorageEntryType
 
 export const $storageEntryType: $.Codec<StorageEntryType> = $.taggedUnion("type", [
-  ["Plain", ["value", $tyId]],
-  [
+  $.variant("Plain", $.field("value", $tyId)),
+  $.variant(
     "Map",
-    ["hashers", $.array($hasherKind)],
-    ["key", $tyId],
-    ["value", $tyId],
-  ],
+    $.field("hashers", $.array($hasherKind)),
+    $.field("key", $tyId),
+    $.field("value", $tyId),
+  ),
 ])
 
 export type StorageEntry = {
@@ -50,17 +50,17 @@ export type StorageEntry = {
   docs: string[]
 } & StorageEntryType
 
-export const $storageEntry: $.Codec<StorageEntry> = $.spread(
-  $.spread(
+export const $storageEntry: $.Codec<StorageEntry> = $.object(
+  $.object(
     $.object(
-      ["name", $.str],
-      ["modifier", $storageEntryModifier],
+      $.field("name", $.str),
+      $.field("modifier", $storageEntryModifier),
     ),
     $storageEntryType,
   ),
   $.object(
-    ["default", $.uint8Array],
-    ["docs", $.array($.str)],
+    $.field("default", $.uint8Array),
+    $.field("docs", $.array($.str)),
   ),
 )
 
@@ -69,8 +69,8 @@ export interface Storage {
   entries: StorageEntry[]
 }
 export const $storage: $.Codec<Storage> = $.object(
-  ["prefix", $.str],
-  ["entries", $.array($storageEntry)],
+  $.field("prefix", $.str),
+  $.field("entries", $.array($storageEntry)),
 )
 
 export interface Constant {
@@ -80,29 +80,29 @@ export interface Constant {
   docs: string[]
 }
 export const $constant: $.Codec<Constant> = $.object(
-  ["name", $.str],
-  ["ty", $tyId],
-  ["value", $.uint8Array],
-  ["docs", $.array($.str)],
+  $.field("name", $.str),
+  $.field("ty", $tyId),
+  $.field("value", $.uint8Array),
+  $.field("docs", $.array($.str)),
 )
 
 export interface Pallet {
   name: string
-  storage: Storage | undefined
-  calls: Ty | undefined
-  event: Ty | undefined
+  storage?: Storage
+  calls?: Ty
+  event?: Ty
   constants: Constant[]
-  error: Ty | undefined
+  error?: Ty
   i: number
 }
 export const $pallet: $.Codec<Pallet> = $.object(
-  ["name", $.str],
-  ["storage", $.option($storage)],
-  ["calls", $.option($tyId)],
-  ["event", $.option($tyId)],
-  ["constants", $.array($constant)],
-  ["error", $.option($tyId)],
-  ["i", $.u8],
+  $.field("name", $.str),
+  $.optionalField("storage", $storage),
+  $.optionalField("calls", $tyId),
+  $.optionalField("event", $tyId),
+  $.field("constants", $.array($constant)),
+  $.optionalField("error", $tyId),
+  $.field("i", $.u8),
 )
 
 export interface SignedExtensionMetadata {
@@ -111,9 +111,9 @@ export interface SignedExtensionMetadata {
   additionalSigned: Ty
 }
 export const $signedExtensionMetadata: $.Codec<SignedExtensionMetadata> = $.object(
-  ["ident", $.str],
-  ["ty", $tyId],
-  ["additionalSigned", $tyId],
+  $.field("ident", $.str),
+  $.field("ty", $tyId),
+  $.field("additionalSigned", $tyId),
 )
 
 export interface ExtrinsicDef {
@@ -122,9 +122,9 @@ export interface ExtrinsicDef {
   signedExtensions: SignedExtensionMetadata[]
 }
 export const $extrinsicDef: $.Codec<ExtrinsicDef> = $.object(
-  ["ty", $tyId],
-  ["version", $.u8],
-  ["signedExtensions", $.array($signedExtensionMetadata)],
+  $.field("ty", $tyId),
+  $.field("version", $.u8),
+  $.field("signedExtensions", $.array($signedExtensionMetadata)),
 )
 
 // https://docs.substrate.io/build/application-development/#metadata-system
@@ -138,11 +138,11 @@ export interface Metadata {
   extrinsic: ExtrinsicDef
 }
 export const $metadata: $.Codec<Metadata> = $.object(
-  ["magicNumber", $.constant<typeof magicNumber>(magicNumber, $.u32)],
-  ["version", $.constant<14>(14, $.u8)],
-  ["tys", $tys],
-  ["pallets", $.array($pallet)],
-  ["extrinsic", $extrinsicDef],
+  $.field("magicNumber", $.constant<typeof magicNumber>(magicNumber, $.u32)),
+  $.field("version", $.constant<14>(14, $.u8)),
+  $.field("tys", $tys),
+  $.field("pallets", $.array($pallet)),
+  $.field("extrinsic", $extrinsicDef),
 )
 
 export function fromPrefixedHex(scaleEncoded: string): Metadata {

ink_metadata/known.ts

@@ -7,8 +7,8 @@ export interface Weight {
   proofSize: bigint
 }
 const $weightCodec: $.Codec<Weight> = $.object(
-  ["refTime", $.compact($.u64)],
-  ["proofSize", $.compact($.u64)],
+  $.field("refTime", $.compact($.u64)),
+  $.field("proofSize", $.compact($.u64)),
 )
 
 export type ContractsApiCallArgs = [
@@ -51,29 +51,24 @@ export interface ContractsApiCallResult {
   }
 }
 export const $contractsApiCallResult: $.Codec<ContractsApiCallResult> = $.object(
-  // gas_consumed
-  ["gasConsumed", $weightCodec],
-  // gas_required
-  ["gasRequired", $weightCodec],
-  // storage_deposit
-  [
+  $.field("gasConsumed", $weightCodec),
+  $.field("gasRequired", $weightCodec),
+  $.field(
     "storageDeposit",
     $.taggedUnion("type", [
-      ["Refund", ["value", $balanceCodec]],
-      ["Charge", ["value", $balanceCodec]],
+      $.variant("Refund", $.field("value", $balanceCodec)),
+      $.variant("Charge", $.field("value", $balanceCodec)),
     ]),
-  ],
-  // debug_message
-  ["debugMessage", $.str],
-  // result
-  [
+  ),
+  $.field("debugMessage", $.str),
+  $.field(
     "result",
     $.object(
-      ["flags", $.u32],
+      $.field("flags", $.u32),
       // TODO: improve result error coded
-      ["data", $.result($.uint8Array, $.never)],
+      $.field("data", $.result($.uint8Array, $.never)),
     ),
-  ],
+  ),
 )
 
 export type ContractsApiInstantiateArgs = [
@@ -89,24 +84,17 @@ export type ContractsApiInstantiateArgs = [
   salt: Uint8Array,
 ]
 export const $contractsApiInstantiateArgs: $.Codec<ContractsApiInstantiateArgs> = $.tuple(
-  // origin
   $.sizedUint8Array(32),
-  // balance
   $balanceCodec,
-  // gasLimit
   $.option($weightCodec),
-  // storageDepositLimit
   $.option($balanceCodec),
-  // codeOrHash
   $.taggedUnion("type", [
     // code
-    ["Upload", ["value", $.uint8Array]],
+    $.variant("Upload", $.field("value", $.uint8Array)),
     // hash
-    ["Existing", ["value", $.sizedUint8Array(32)]],
+    $.variant("Existing", $.field("value", $.sizedUint8Array(32))),
   ]),
-  // data
   $.uint8Array,
-  // salt
   $.uint8Array,
 )
 
@@ -130,33 +118,28 @@ export interface ContractsApiInstantiateResult {
   }
 }
 export const $contractsApiInstantiateResult: $.Codec<ContractsApiInstantiateResult> = $.object(
-  // gas_consumed
-  ["gasConsumed", $weightCodec],
-  // gas_required
-  ["gasRequired", $weightCodec],
-  // storage_deposit
-  [
+  $.field("gasConsumed", $weightCodec),
+  $.field("gasRequired", $weightCodec),
+  $.field(
     "storageDeposit",
     $.taggedUnion("type", [
-      ["Refund", ["value", $balanceCodec]],
-      ["Charge", ["value", $balanceCodec]],
+      $.variant("Refund", $.field("value", $balanceCodec)),
+      $.variant("Charge", $.field("value", $balanceCodec)),
     ]),
-  ],
-  // debug_message
-  ["debugMessage", $.str],
-  // result
-  [
+  ),
+  $.field("debugMessage", $.str),
+  $.field(
     "result",
     $.object(
-      [
+      $.field(
         "result",
         $.object(
-          ["flags", $.u32],
+          $.field("flags", $.u32),
           // TODO: improve result error coded
-          ["data", $.result($.uint8Array, $.never)],
+          $.field("data", $.result($.uint8Array, $.never)),
         ),
-      ],
-      ["accountId", $.sizedUint8Array(32)],
+      ),
+      $.field("accountId", $.sizedUint8Array(32)),
     ),
-  ],
+  ),
 )

primitives/MultiAddress.ts

@@ -2,11 +2,11 @@ import * as $ from "../deps/scale.ts"
 import { $null } from "../scale_info/Codec.ts"
 
 export const $multiAddress: $.Codec<MultiAddress> = $.taggedUnion("type", {
-  0: ["Id", ["value", $.sizedUint8Array(32)]],
-  1: ["Index", ["value", $null]],
-  2: ["Raw", ["value", $.uint8Array]],
-  3: ["Address32", ["value", $.sizedUint8Array(32)]],
-  4: ["Address20", ["value", $.sizedUint8Array(20)]],
+  0: $.variant("Id", $.field("value", $.sizedUint8Array(32))),
+  1: $.variant("Index", $.field("value", $null)),
+  2: $.variant("Raw", $.field("value", $.uint8Array)),
+  3: $.variant("Address32", $.field("value", $.sizedUint8Array(32))),
+  4: $.variant("Address20", $.field("value", $.sizedUint8Array(20))),
 })
 
 export type MultiAddress =

primitives/MultiSignature.ts

@@ -35,7 +35,7 @@ export namespace MultiSignature {
 }
 
 export const $multiSignature: $.Codec<MultiSignature> = $.taggedUnion("type", {
-  0: ["Ed25519", ["value", $.sizedUint8Array(64)]],
-  1: ["Sr25519", ["value", $.sizedUint8Array(64)]],
-  2: ["Ecdsa", ["value", $.sizedUint8Array(65)]],
+  0: $.variant("Ed25519", $.field("value", $.sizedUint8Array(64))),
+  1: $.variant("Sr25519", $.field("value", $.sizedUint8Array(64))),
+  2: $.variant("Ecdsa", $.field("value", $.sizedUint8Array(65))),
 })

scale_info/Codec.ts

@@ -26,14 +26,17 @@ export function DeriveCodec(tys: Ty[]): DeriveCodec {
     },
     objectStruct(ty) {
       return $.object(
-        ...ty.fields.map((x): $.AnyField => [normalizeCase(x.name!), this.visit(x.ty)]),
+        ...ty.fields.map((x) => $.field(normalizeCase(x.name!), this.visit(x.ty))),
       )
     },
     option(_ty, some) {
       return $.option(this.visit(some))
     },
     result(_ty, ok, err) {
-      return $.result(this.visit(ok), $.instance(ChainError, ["value", this.visit(err)]))
+      return $.result(
+        this.visit(ok),
+        $.instance(ChainError, $.tuple(this.visit(err)), (x) => x.value),
+      )
     },
     never() {
       return $.never as any
@@ -46,27 +49,24 @@ export function DeriveCodec(tys: Ty[]): DeriveCodec {
       return $.stringUnion(members)
     },
     taggedUnion(ty) {
-      const members: Record<number, $.AnyTaggedUnionMember> = {}
+      const members: Record<number, $.Variant<any, any>> = {}
       for (const { fields, name, index } of ty.members) {
-        let member: $.AnyTaggedUnionMember
+        let member: $.Variant<any, any>
         const type = normalizeCase(name)
         if (fields.length === 0) {
-          member = [type]
+          member = $.variant(type)
         } else if (fields[0]!.name === undefined) {
           // Tuple variant
           const $value = fields.length === 1
             ? this.visit(fields[0]!.ty)
             : $.tuple(...fields.map((f) => this.visit(f.ty)))
-          member = [type, ["value", $value]]
+          member = $.variant(type, $.field("value", $value))
         } else {
           // Object variant
           const memberFields = fields.map((field) => {
-            return [
-              normalizeCase(field.name!),
-              this.visit(field.ty),
-            ] as [string, $.Codec<unknown>]
+            return $.field(normalizeCase(field.name!), this.visit(field.ty))
           })
-          member = [type, ...memberFields]
+          member = $.variant(type, ...memberFields)
         }
         members[index] = member
       }