- Upgrade anchor 0.29.0

- Update Solana cli CI version 1.14.17 -> 1.17.18 - Update node CI version 18 -> 22 - Add rust toolchain to fix CI runner to rust 1.74.1 - Enable overflow-checks as required by anchor 0.30.0 - Error on alias types - they are broken in anchor 0.29.0 anyway
Kamino-Finance · Dec 8, 2024 · c7594f9 · c7594f9
1 parent 2ad59e3
commit c7594f9
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 83 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -8,8 +8,8 @@ on:
     branches:
       - master
 env:
-  SOLANA_CLI_VERSION: 1.14.17
-  NODE_VERSION: 18
+  SOLANA_CLI_VERSION: 1.17.18
+  NODE_VERSION: 22
 
 jobs:
   example-program-tests:

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.74.1"
diff --git a/src/common.ts b/src/common.ts
@@ -40,7 +40,6 @@ export function jsonInterfaceName(typeName: string) {
 export function isComplexType(
   ty: IdlType
 ): ty is
-  | IdlTypeDefined
   | IdlTypeArray
   | IdlTypeVec
   | IdlTypeOption
@@ -125,6 +124,9 @@ export function tsTypeFromIdl(
             const name = kindInterfaceName(ty.defined)
             return `${definedTypesPrefix}${name}`
           }
+          case "alias": {
+            throw new Error("alias layout support not implemented")
+          }
         }
       }
       if (isComplexType(ty) && "array" in ty) {
@@ -306,6 +308,9 @@ export function fieldToEncodable(
           case "enum": {
             return `${valPrefix}${ty.name}.toEncodable()`
           }
+          case "alias": {
+            throw new Error("alias layout support not implemented")
+          }
         }
       }
       if (isComplexType(ty.type) && "array" in ty.type) {
@@ -402,6 +407,8 @@ export function fieldFromDecoded(
           case "struct":
           case "enum":
             return `${definedTypesPrefix}${ty.type.defined}.fromDecoded(${valPrefix}${ty.name})`
+          case "alias":
+            throw new Error("alias layout support not implemented")
           default: {
             unreachable(filtered[0].type)
             throw new Error("Unreachable.")
@@ -469,6 +476,8 @@ export function structFieldInitializer(
           case "enum":
             filtered[0].type.kind
             return `${prefix}${field.name}`
+          case "alias":
+            throw new Error("alias layout support not implemented")
           default:
             unreachable(filtered[0].type)
             return
@@ -618,6 +627,8 @@ export function fieldToJSON(idl: Idl, ty: IdlField, valPrefix = ""): string {
           case "struct":
           case "enum":
             return `${valPrefix}${ty.name}.toJSON()`
+          case "alias":
+            throw new Error("alias layout support not implemented")
           default: {
             unreachable(filtered[0].type)
             throw new Error("Unreachable.")

diff --git a/src/types.ts b/src/types.ts
@@ -84,6 +84,8 @@ function genIndexFile(
             .join(" | "),
         })
         return
+      case "alias":
+        throw new Error("alias layout support not implemented")
       default:
         unreachable(ty.type)
     }
@@ -109,6 +111,8 @@ function genTypeFiles(
         genEnum(idl, src, ty.name, ty.type.variants)
         return
       }
+      case "alias":
+        throw new Error("alias layout support not implemented")
       default:
         unreachable(ty.type)
     }

diff --git a/tests/example-program-gen/exp/accounts/index.ts b/tests/example-program-gen/exp/accounts/index.ts
@@ -1,6 +1,6 @@
+export { OptionalState } from "./OptionalState"
+export type { OptionalStateFields, OptionalStateJSON } from "./OptionalState"
 export { State } from "./State"
 export type { StateFields, StateJSON } from "./State"
 export { State2 } from "./State2"
 export type { State2Fields, State2JSON } from "./State2"
-export { OptionalState } from "./OptionalState"
-export type { OptionalStateFields, OptionalStateJSON } from "./OptionalState"
diff --git a/tests/example-program-gen/exp/types/index.ts b/tests/example-program-gen/exp/types/index.ts
@@ -2,8 +2,6 @@ import * as FooEnum from "./FooEnum"
 
 export { BarStruct } from "./BarStruct"
 export type { BarStructFields, BarStructJSON } from "./BarStruct"
-export { FooStruct } from "./FooStruct"
-export type { FooStructFields, FooStructJSON } from "./FooStruct"
 export { FooEnum }
 
 /** Enum type */
@@ -23,3 +21,6 @@ export type FooEnumJSON =
   | FooEnum.OptionStructJSON
   | FooEnum.VecStructJSON
   | FooEnum.NoFieldsJSON
+
+export { FooStruct } from "./FooStruct"
+export type { FooStructFields, FooStructJSON } from "./FooStruct"
diff --git a/tests/example-program-gen/idl.json b/tests/example-program-gen/idl.json
@@ -310,6 +310,30 @@
     }
   ],
   "accounts": [
+    {
+      "name": "OptionalState",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "readonlySignerOption",
+            "type": "bool"
+          },
+          {
+            "name": "mutableSignerOption",
+            "type": "bool"
+          },
+          {
+            "name": "readonlyOption",
+            "type": "bool"
+          },
+          {
+            "name": "mutableOption",
+            "type": "bool"
+          }
+        ]
+      }
+    },
     {
       "name": "State",
       "docs": [
@@ -470,30 +494,6 @@
           }
         ]
       }
-    },
-    {
-      "name": "OptionalState",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "readonlySignerOption",
-            "type": "bool"
-          },
-          {
-            "name": "mutableSignerOption",
-            "type": "bool"
-          },
-          {
-            "name": "readonlyOption",
-            "type": "bool"
-          },
-          {
-            "name": "mutableOption",
-            "type": "bool"
-          }
-        ]
-      }
     }
   ],
   "types": [
@@ -519,54 +519,6 @@
         ]
       }
     },
-    {
-      "name": "FooStruct",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "field1",
-            "type": "u8"
-          },
-          {
-            "name": "field2",
-            "type": "u16"
-          },
-          {
-            "name": "nested",
-            "type": {
-              "defined": "BarStruct"
-            }
-          },
-          {
-            "name": "vecNested",
-            "type": {
-              "vec": {
-                "defined": "BarStruct"
-              }
-            }
-          },
-          {
-            "name": "optionNested",
-            "type": {
-              "option": {
-                "defined": "BarStruct"
-              }
-            }
-          },
-          {
-            "name": "enumField",
-            "type": {
-              "defined": "FooEnum"
-            }
-          },
-          {
-            "name": "pubkeyField",
-            "type": "publicKey"
-          }
-        ]
-      }
-    },
     {
       "name": "FooEnum",
       "docs": [
@@ -648,6 +600,54 @@
           }
         ]
       }
+    },
+    {
+      "name": "FooStruct",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "field1",
+            "type": "u8"
+          },
+          {
+            "name": "field2",
+            "type": "u16"
+          },
+          {
+            "name": "nested",
+            "type": {
+              "defined": "BarStruct"
+            }
+          },
+          {
+            "name": "vecNested",
+            "type": {
+              "vec": {
+                "defined": "BarStruct"
+              }
+            }
+          },
+          {
+            "name": "optionNested",
+            "type": {
+              "option": {
+                "defined": "BarStruct"
+              }
+            }
+          },
+          {
+            "name": "enumField",
+            "type": {
+              "defined": "FooEnum"
+            }
+          },
+          {
+            "name": "pubkeyField",
+            "type": "publicKey"
+          }
+        ]
+      }
     }
   ],
   "errors": [

diff --git a/tests/example-program/Cargo.lock b/tests/example-program/Cargo.lock
diff --git a/tests/example-program/Cargo.toml b/tests/example-program/Cargo.toml
@@ -2,3 +2,6 @@
 members = [
     "programs/*"
 ]
+
+[profile.release]
+overflow-checks = true
diff --git a/tests/example-program/programs/example-program/Cargo.toml b/tests/example-program/programs/example-program/Cargo.toml
@@ -14,6 +14,7 @@ no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
+idl-build = ["anchor-lang/idl-build"]
 
 [dependencies]
 anchor-lang = "^0.29.0"

diff --git a/tests/test.ts b/tests/test.ts
@@ -677,7 +677,7 @@ it("tx error", async () => {
       "Program 3rTQ3R4B2PxZrAyx7EUefySPgZY8RhJf16cZajbmrzp8 invoke [1]",
       "Program log: Instruction: CauseError",
       "Program log: AnchorError thrown in programs/example-program/src/lib.rs:90. Error Code: SomeError. Error Number: 6000. Error Message: Example error..",
-      "Program 3rTQ3R4B2PxZrAyx7EUefySPgZY8RhJf16cZajbmrzp8 consumed 2293 of 200000 compute units",
+      "Program 3rTQ3R4B2PxZrAyx7EUefySPgZY8RhJf16cZajbmrzp8 consumed 2304 of 200000 compute units",
       "Program 3rTQ3R4B2PxZrAyx7EUefySPgZY8RhJf16cZajbmrzp8 failed: custom program error: 0x1770",
     ])
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -9,7 +9,8 @@
         "sourceMap": true,
         "moduleResolution": "node",
         "noEmit": true,
-        "isolatedModules": true
+        "isolatedModules": true,
+        "skipLibCheck": true
     },
     "include": ["src", "tests", "examples"],
 }