Update usage of IInstructionWithData

lorisleiva · lorisleiva · commit a1af5e6e1d39 · 2024-11-28T17:15:21.000Z
diff --git a/packages/dynamic-codecs/package.json b/packages/dynamic-codecs/package.json
@@ -53,7 +53,7 @@
         "@codama/errors": "workspace:*",
         "@codama/nodes": "workspace:*",
         "@codama/visitors-core": "workspace:*",
-        "@solana/codecs": "2.0.0"
+        "@solana/codecs": "2.1.0-canary-20241128134801"
     },
     "license": "MIT",
     "repository": {
diff --git a/packages/dynamic-parsers/package.json b/packages/dynamic-parsers/package.json
@@ -54,10 +54,10 @@
         "@codama/errors": "workspace:*",
         "@codama/nodes": "workspace:*",
         "@codama/visitors-core": "workspace:*",
-        "@solana/instructions": "2.0.0"
+        "@solana/instructions": "2.1.0-canary-20241128134801"
     },
     "devDependencies": {
-        "@solana/codecs": "2.0.0"
+        "@solana/codecs": "2.1.0-canary-20241128134801"
     },
     "license": "MIT",
     "repository": {
diff --git a/packages/dynamic-parsers/src/parsers.ts b/packages/dynamic-parsers/src/parsers.ts
@@ -49,7 +49,7 @@ export function parseInstruction(
     root: RootNode,
     instruction: IInstruction &
         IInstructionWithAccounts<readonly (IAccountLookupMeta | IAccountMeta)[]> &
-        IInstructionWithData<Uint8Array>,
+        IInstructionWithData<ReadonlyUint8Array>,
 ): ParsedInstruction | undefined {
     const parsedData = parseInstructionData(root, instruction.data);
     if (!parsedData) return undefined;
diff --git a/packages/renderers-js-umi/package.json b/packages/renderers-js-umi/package.json
@@ -48,7 +48,7 @@
         "@codama/renderers-core": "workspace:*",
         "@codama/validators": "workspace:*",
         "@codama/visitors-core": "workspace:*",
-        "@solana/codecs-strings": "rc",
+        "@solana/codecs-strings": "2.1.0-canary-20241128134801",
         "nunjucks": "^3.2.4",
         "prettier": "^3.4.1"
     },
diff --git a/packages/renderers-js/e2e/anchor/package.json b/packages/renderers-js/e2e/anchor/package.json
@@ -16,13 +16,13 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-rc.0"
+    "@solana/web3.js": "2.1.0-canary-20241128134801"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@solana/eslint-config-solana": "^3.0.0",
-    "@solana/web3.js": "rc",
-    "@solana/webcrypto-ed25519-polyfill": "rc",
+    "@solana/web3.js": "2.1.0-canary-20241128134801",
+    "@solana/webcrypto-ed25519-polyfill": "2.1.0-canary-20241128134801",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
diff --git a/packages/renderers-js/e2e/dummy/package.json b/packages/renderers-js/e2e/dummy/package.json
@@ -16,13 +16,13 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-rc.0"
+    "@solana/web3.js": "2.1.0-canary-20241128134801"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@solana/eslint-config-solana": "^3.0.0",
-    "@solana/web3.js": "rc",
-    "@solana/webcrypto-ed25519-polyfill": "rc",
+    "@solana/web3.js": "2.1.0-canary-20241128134801",
+    "@solana/webcrypto-ed25519-polyfill": "2.1.0-canary-20241128134801",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
diff --git a/packages/renderers-js/e2e/memo/package.json b/packages/renderers-js/e2e/memo/package.json
@@ -16,13 +16,13 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-rc.0"
+    "@solana/web3.js": "2.1.0-canary-20241128134801"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@solana/eslint-config-solana": "^3.0.0",
-    "@solana/web3.js": "rc",
-    "@solana/webcrypto-ed25519-polyfill": "rc",
+    "@solana/web3.js": "2.1.0-canary-20241128134801",
+    "@solana/webcrypto-ed25519-polyfill": "2.1.0-canary-20241128134801",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
diff --git a/packages/renderers-js/e2e/system/package.json b/packages/renderers-js/e2e/system/package.json
@@ -16,13 +16,13 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-rc.0"
+    "@solana/web3.js": "2.1.0-canary-20241128134801"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@solana/eslint-config-solana": "^3.0.0",
-    "@solana/web3.js": "rc",
-    "@solana/webcrypto-ed25519-polyfill": "rc",
+    "@solana/web3.js": "2.1.0-canary-20241128134801",
+    "@solana/webcrypto-ed25519-polyfill": "2.1.0-canary-20241128134801",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
diff --git a/packages/renderers-js/e2e/token/package.json b/packages/renderers-js/e2e/token/package.json
@@ -16,13 +16,13 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-rc.0"
+    "@solana/web3.js": "2.1.0-canary-20241128134801"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@solana/eslint-config-solana": "^3.0.0",
-    "@solana/web3.js": "rc",
-    "@solana/webcrypto-ed25519-polyfill": "rc",
+    "@solana/web3.js": "2.1.0-canary-20241128134801",
+    "@solana/webcrypto-ed25519-polyfill": "2.1.0-canary-20241128134801",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
diff --git a/packages/renderers-js/package.json b/packages/renderers-js/package.json
@@ -48,7 +48,7 @@
         "@codama/nodes-from-anchor": "workspace:*",
         "@codama/renderers-core": "workspace:*",
         "@codama/visitors-core": "workspace:*",
-        "@solana/codecs-strings": "rc",
+        "@solana/codecs-strings": "2.1.0-canary-20241128134801",
         "nunjucks": "^3.2.4",
         "prettier": "^3.4.1"
     },
diff --git a/packages/renderers-js/public/templates/fragments/instructionParseFunction.njk b/packages/renderers-js/public/templates/fragments/instructionParseFunction.njk
@@ -33,7 +33,7 @@ export function {{ instructionParseFunction }}<
       & IInstructionWithAccounts<TAccountMetas>
     {% endif %}
     {% if hasData %}
-      & IInstructionWithData<Uint8Array>
+      & IInstructionWithData<ReadonlyUint8Array>
     {% endif %}
 ): {{ instructionParsedType }}<TProgram {{ ', TAccountMetas' if hasAccounts }}> {
   {% if hasAccounts %}
diff --git a/packages/renderers-js/public/templates/fragments/instructionType.njk b/packages/renderers-js/public/templates/fragments/instructionType.njk
@@ -8,7 +8,7 @@ export type {{ instructionType }}<
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram>
   {% if hasData %}
-    & IInstructionWithData<Uint8Array>
+    & IInstructionWithData<ReadonlyUint8Array>
   {% endif %}
   {% if hasAccounts %}
     & IInstructionWithAccounts<[{{ accountMetas }}, ...TRemainingAccounts]>
diff --git a/packages/renderers-js/src/fragments/instructionParseFunction.ts b/packages/renderers-js/src/fragments/instructionParseFunction.ts
@@ -51,5 +51,6 @@ export function getInstructionParseFunctionFragment(
         .addImports('generatedPrograms', [programAddressConstant])
         .addImports('solanaInstructions', ['type IInstruction'])
         .addImports('solanaInstructions', hasAccounts ? ['type IInstructionWithAccounts', 'type IAccountMeta'] : [])
-        .addImports('solanaInstructions', hasData ? ['type IInstructionWithData'] : []);
+        .addImports('solanaInstructions', hasData ? ['type IInstructionWithData'] : [])
+        .addImports('solanaCodecsCore', hasData ? ['type ReadonlyUint8Array'] : []);
 }
diff --git a/packages/renderers-js/src/fragments/instructionType.ts b/packages/renderers-js/src/fragments/instructionType.ts
@@ -56,6 +56,7 @@ export function getInstructionTypeFragment(
     })
         .mergeImportsWith(accountTypeParamsFragment, accountMetasFragment)
         .addImports('generatedPrograms', [programAddressConstant])
+        .addImports('solanaCodecsCore', hasData ? ['type ReadonlyUint8Array'] : [])
         .addImports('solanaInstructions', [
             'type IAccountMeta',
             'type IInstruction',
diff --git a/packages/renderers-rust/package.json b/packages/renderers-rust/package.json
@@ -46,7 +46,7 @@
         "@codama/nodes": "workspace:*",
         "@codama/renderers-core": "workspace:*",
         "@codama/visitors-core": "workspace:*",
-        "@solana/codecs-strings": "rc",
+        "@solana/codecs-strings": "2.1.0-canary-20241128134801",
         "nunjucks": "^3.2.4"
     },
     "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
