codama-idl · lorisleiva · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024
diff --git a/.changeset/spicy-books-remain.md b/.changeset/spicy-books-remain.md
@@ -0,0 +1,9 @@
+---
+'@codama/renderers-js-umi': minor
+'@codama/dynamic-parsers': minor
+'@codama/dynamic-codecs': minor
+'@codama/renderers-rust': minor
+'@codama/renderers-js': minor
+---
+
+Update usage of `IInstructionWithData` and bump web3.js dependencies
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
 env:
   # Among other things, opts out of Turborepo telemetry. See https://consoledonottrack.com/.
   DO_NOT_TRACK: '1'
-  NODE_VERSION: 18
+  NODE_VERSION: 20
   CODAMA_VERSION: 1.x
   SOLANA_VERSION: 1.18.12
 

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
         "zx": "^8.2.2"
     },
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
     },
     "packageManager": "[email protected]",
     "prettier": "@solana/prettier-config-solana"

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,12 @@
   },
   "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",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
@@ -35,9 +34,6 @@
     "typescript": "^5.4.2"
   },
   "ava": {
-    "require": [
-      "@solana/webcrypto-ed25519-polyfill"
-    ],
     "typescript": {
       "compile": false,
       "rewritePaths": {

diff --git a/packages/renderers-js/e2e/anchor/pnpm-lock.yaml b/packages/renderers-js/e2e/anchor/pnpm-lock.yaml
diff --git a/packages/renderers-js/e2e/anchor/src/generated/instructions/createGuard.ts b/packages/renderers-js/e2e/anchor/src/generated/instructions/createGuard.ts
@@ -94,7 +94,7 @@ export type CreateGuardInstruction<
     | IAccountMeta<string> = '11111111111111111111111111111111',
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
+  IInstructionWithData<ReadonlyUint8Array> &
   IInstructionWithAccounts<
     [
       TAccountGuard extends string
@@ -510,7 +510,7 @@ export function parseCreateGuardInstruction<
 >(
   instruction: IInstruction<TProgram> &
     IInstructionWithAccounts<TAccountMetas> &
-    IInstructionWithData<Uint8Array>
+    IInstructionWithData<ReadonlyUint8Array>
 ): ParsedCreateGuardInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 8) {
     // TODO: Coded error.

diff --git a/packages/renderers-js/e2e/anchor/src/generated/instructions/execute.ts b/packages/renderers-js/e2e/anchor/src/generated/instructions/execute.ts
@@ -58,7 +58,7 @@ export type ExecuteInstruction<
     | IAccountMeta<string> = 'Sysvar1nstructions1111111111111111111111111',
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
+  IInstructionWithData<ReadonlyUint8Array> &
   IInstructionWithAccounts<
     [
       TAccountSourceAccount extends string
@@ -389,7 +389,7 @@ export function parseExecuteInstruction<
 >(
   instruction: IInstruction<TProgram> &
     IInstructionWithAccounts<TAccountMetas> &
-    IInstructionWithData<Uint8Array>
+    IInstructionWithData<ReadonlyUint8Array>
 ): ParsedExecuteInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 7) {
     // TODO: Coded error.

diff --git a/packages/renderers-js/e2e/anchor/src/generated/instructions/initialize.ts b/packages/renderers-js/e2e/anchor/src/generated/instructions/initialize.ts
@@ -59,7 +59,7 @@ export type InitializeInstruction<
   TAccountPayer extends string | IAccountMeta<string> = string,
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
+  IInstructionWithData<ReadonlyUint8Array> &
   IInstructionWithAccounts<
     [
       TAccountExtraMetasAccount extends string
@@ -347,7 +347,7 @@ export function parseInitializeInstruction<
 >(
   instruction: IInstruction<TProgram> &
     IInstructionWithAccounts<TAccountMetas> &
-    IInstructionWithData<Uint8Array>
+    IInstructionWithData<ReadonlyUint8Array>
 ): ParsedInitializeInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 6) {
     // TODO: Coded error.

diff --git a/packages/renderers-js/e2e/anchor/src/generated/instructions/updateGuard.ts b/packages/renderers-js/e2e/anchor/src/generated/instructions/updateGuard.ts
@@ -83,7 +83,7 @@ export type UpdateGuardInstruction<
     | IAccountMeta<string> = '11111111111111111111111111111111',
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
+  IInstructionWithData<ReadonlyUint8Array> &
   IInstructionWithAccounts<
     [
       TAccountGuard extends string
@@ -420,7 +420,7 @@ export function parseUpdateGuardInstruction<
 >(
   instruction: IInstruction<TProgram> &
     IInstructionWithAccounts<TAccountMetas> &
-    IInstructionWithData<Uint8Array>
+    IInstructionWithData<ReadonlyUint8Array>
 ): ParsedUpdateGuardInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 6) {
     // TODO: Coded error.

diff --git a/packages/renderers-js/e2e/dummy/package.json b/packages/renderers-js/e2e/dummy/package.json
@@ -16,13 +16,12 @@
   },
   "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",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "ava": "^6.1.2",
@@ -35,9 +34,6 @@
     "typescript": "^5.4.2"
   },
   "ava": {
-    "require": [
-      "@solana/webcrypto-ed25519-polyfill"
-    ],
     "typescript": {
       "compile": false,
       "rewritePaths": {