fix(client): uncaught storage exception with incompatible runtime (po…

…lkadot-api#424)
wirednkod · Apr 16, 2024 · 4628891 · 4628891
1 parent 74da2b4
commit 4628891
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixed
+
+- client: uncaught storage exception with incompatible runtime.
+
 ## 0.2.3 - 2024-04-15
 
 ### Fixed

diff --git a/packages/client/src/storage.ts b/packages/client/src/storage.ts
@@ -106,10 +106,10 @@ export const createStorageEntry = (
       at,
       "value",
       (ctx) => {
+        if (!isCompatible(ctx)) throw checksumError()
         const codecs = ctx.dynamicBuilder.buildStorage(pallet, name)
         const actualArgs = args.length === codecs.len ? args : args.slice(0, -1)
         if (args !== actualArgs && !isLastArgOptional) throw invalidArgs(args)
-        if (!isCompatible(ctx)) throw checksumError()
         return codecs.enc(...actualArgs)
       },
       null,
@@ -132,13 +132,14 @@ export const createStorageEntry = (
       at,
       "descendantsValues",
       (ctx) => {
+        if (!isCompatible(ctx)) throw checksumError()
+
         const codecs = ctx.dynamicBuilder.buildStorage(pallet, name)
         if (args.length > codecs.len) throw invalidArgs(args)
         const actualArgs =
           args.length > 0 && isLastArgOptional ? args.slice(0, -1) : args
         if (args.length === codecs.len && actualArgs === args)
           throw invalidArgs(args)
-        if (!isCompatible(ctx)) throw checksumError()
         return codecs.enc(...actualArgs)
       },
       null,