Update to Anchor v0.24 (#103)

* Update to Anchor v0.24 * 12
saber-hq · Apr 17, 2022 · 4b453d4 · 4b453d4
1 parent 382a832
commit 4b453d4
Show file tree

Hide file tree

Showing 17 changed files with 1,416 additions and 905 deletions.
diff --git a/.github/workflows/programs-e2e.yml b/.github/workflows/programs-e2e.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  SOLANA_VERSION: "1.9.9"
+  SOLANA_VERSION: "1.9.12"
 
 jobs:
   sdk:

diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.11.0-sdk",
+  "version": "8.13.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.5.1-sdk",
+  "version": "2.6.2-sdk",
   "main": "./index.js",
   "type": "commonjs"
 }
diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js
@@ -61,18 +61,26 @@ const moduleWrapper = tsserver => {
           //
           // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
           //
-          // Update Oct 8 2021: VSCode changed their format in 1.61.
+          // Update 2021-10-08: VSCode changed their format in 1.61.
           // Before | ^zip:/c:/foo/bar.zip/package.json
           // After  | ^/zip//c:/foo/bar.zip/package.json
           //
+          // Update 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
           case `vscode <1.61`: {
             str = `^zip:${str}`;
           } break;
 
-          case `vscode`: {
+          case `vscode <1.66`: {
             str = `^/zip/${str}`;
           } break;
 
+          case `vscode`: {
+            str = `^/zip${str}`;
+          } break;
+
           // To make "go to definition" work,
           // We have to resolve the actual file system path from virtual path
           // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
@@ -160,8 +168,12 @@ const moduleWrapper = tsserver => {
         typeof parsedMessage.arguments.hostInfo === `string`
       ) {
         hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
-          hostInfo += ` <1.61`;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.61`;
+          } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.66`;
+          }
         }
       }
 

diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -61,18 +61,26 @@ const moduleWrapper = tsserver => {
           //
           // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
           //
-          // Update Oct 8 2021: VSCode changed their format in 1.61.
+          // Update 2021-10-08: VSCode changed their format in 1.61.
           // Before | ^zip:/c:/foo/bar.zip/package.json
           // After  | ^/zip//c:/foo/bar.zip/package.json
           //
+          // Update 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
           case `vscode <1.61`: {
             str = `^zip:${str}`;
           } break;
 
-          case `vscode`: {
+          case `vscode <1.66`: {
             str = `^/zip/${str}`;
           } break;
 
+          case `vscode`: {
+            str = `^/zip${str}`;
+          } break;
+
           // To make "go to definition" work,
           // We have to resolve the actual file system path from virtual path
           // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
@@ -160,8 +168,12 @@ const moduleWrapper = tsserver => {
         typeof parsedMessage.arguments.hostInfo === `string`
       ) {
         hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
-          hostInfo += ` <1.61`;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.61`;
+          } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.66`;
+          }
         }
       }
 

diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.6.2-sdk",
+  "version": "4.6.3-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }
diff --git a/Anchor.toml b/Anchor.toml
@@ -1,5 +1,5 @@
-anchor_version = "0.22.1"
-solana_version = "1.9.9"
+anchor_version = "0.24.2"
+solana_version = "1.9.12"
 
 [features]
 seeds = true