apply remaining updates for anchor upgrade (#1111)

jshiohaha · web-flow · commit 1e79b31ed0c2 · 2025-10-19T20:09:25.000-05:00
diff --git a/.github/actions/anchor/action.yml b/.github/actions/anchor/action.yml
@@ -21,10 +21,10 @@ inputs:
     default: 'v22.8.0'
   solana-version:
     description: 'The version of solana to use.'
-    default: 'v1.17.25'
+    default: 'v2.1.0'
   anchor-version:
     description: 'The version of anchor to use.'
-    default: 'v0.29.0'
+    default: 'v0.31.1'
 
 runs:
   using: "composite"
diff --git a/README.md b/README.md
@@ -37,8 +37,8 @@ This monorepo contains all the code needed to build, deploy and interact with th
 
 ### Requirements
 
-- Anchor v0.29.0
-- Solana v1.17.22
+- Anchor v0.31.1
+- Solana v2.1.0
 
 ### Getting Started
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ name: whirlpools
 services:
 
   build-solana-program:
-    image: backpackapp/build:v0.29.0
+    image: backpackapp/build:v0.31.1
     working_dir: /usr/src/whirlpools
     command: >
       anchor build
diff --git a/docs/rust/Cargo.lock b/docs/rust/Cargo.lock
diff --git a/docs/whirlpool/docs/03-SDKs/02-Environment Setup.mdx b/docs/whirlpool/docs/03-SDKs/02-Environment Setup.mdx
@@ -16,7 +16,7 @@ In your project, run:
 \`\`\`bash
 yarn add "@orca-so/whirlpools-sdk"
 yarn add "@orca-so/common-sdk"
-yarn add "@coral-xyz/anchor@0.29.0"
+yarn add "@coral-xyz/anchor@0.31.1"
 yarn add "@solana/web3.js"
 yarn add "@solana/spl-token"
 yarn add "decimal.js"
@@ -250,7 +250,7 @@ This document covers the essential setup required to start building on Orca's SD
     ```bash
     yarn add "@orca-so/whirlpools-sdk"
     yarn add "@orca-so/common-sdk"
-    yarn add "@coral-xyz/anchor@0.29.0"
+    yarn add "@coral-xyz/anchor@0.31.1"
     yarn add "@solana/web3.js"
     yarn add "@solana/spl-token"
     yarn add "decimal.js"
diff --git a/docs/whirlpool/docs/05-Examples/02-CPI.mdx b/docs/whirlpool/docs/05-Examples/02-CPI.mdx
@@ -71,7 +71,7 @@ The classic `@solana/web3.js` implementation with Anchor provides:
 
 ### Important Note on Dependencies
 
-The `@orca-so/whirlpools-sdk` is dependent on Anchor v0.29.0. For other Anchor versions, the examples include `resolutions` in the `package.json` to manage dependency conflicts.
+The `@orca-so/whirlpools-sdk` is dependent on Anchor v0.31.0. For other Anchor versions, the examples include `resolutions` in the `package.json` to manage dependency conflicts.
 
 ## Specific Use Case: Launchpad Integration
 
diff --git a/examples/rust-sdk/whirlpool_repositioning_bot/Cargo.lock b/examples/rust-sdk/whirlpool_repositioning_bot/Cargo.lock
diff --git a/examples/ts-sdk/next/package.json b/examples/ts-sdk/next/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@orca-so/whirlpools": "*",
-    "@solana/kit": "^2.1.0",
+    "@solana/kit": "^3.0.3",
     "next": "^15.2.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
diff --git a/legacy-sdk/cli/package.json b/legacy-sdk/cli/package.json
@@ -8,7 +8,7 @@
     "start": "tsx src/index.ts"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "0.31.0",
+    "@coral-xyz/anchor": "0.31.1",
     "@orca-so/common-sdk": "*",
     "@orca-so/whirlpools-sdk": "*",
     "@solana/spl-token": "^0.4.14",
diff --git a/legacy-sdk/whirlpool/README.md b/legacy-sdk/whirlpool/README.md
@@ -13,7 +13,7 @@ In your project, run:
 ```bash
 yarn add "@orca-so/whirlpools-sdk"
 yarn add "@orca-so/common-sdk"
-yarn add "@coral-xyz/anchor@0.29.0"
+yarn add "@coral-xyz/anchor@0.31.1"
 yarn add "@solana/web3.js"
 yarn add "@solana/spl-token"
 yarn add "decimal.js"
diff --git a/legacy-sdk/whirlpool/package.json b/legacy-sdk/whirlpool/package.json
@@ -6,7 +6,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "peerDependencies": {
-    "@coral-xyz/anchor": "~0.31.0",
+    "@coral-xyz/anchor": "~0.31.1",
     "@solana/spl-token": "^0.4.14",
     "@solana/web3.js": "^1.98.4"
   },
@@ -16,7 +16,7 @@
     "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
-    "@coral-xyz/anchor": "~0.31.0",
+    "@coral-xyz/anchor": "~0.31.1",
     "@orca-so/whirlpools-program": "*",
     "@solana/spl-token": "^0.4.14",
     "@solana/web3.js": "^1.98.4",
diff --git a/legacy-sdk/whirlpool/tests/integration/v1-ix/open_position_with_metadata.test.ts b/legacy-sdk/whirlpool/tests/integration/v1-ix/open_position_with_metadata.test.ts
@@ -431,7 +431,7 @@ describe("open_position_with_metadata", () => {
       await assert.rejects(
         tx.addSigner(defaultMint).buildAndExecute(),
         // InvalidProgramId
-        // https://github.com/coral-xyz/anchor/blob/v0.29.0/lang/src/error.rs#L178-L180
+        // https://github.com/coral-xyz/anchor/blob/v0.31.1/lang/src/error.rs#L229-231
         /0xbc0/,
       );
     });
@@ -450,7 +450,7 @@ describe("open_position_with_metadata", () => {
       await assert.rejects(
         tx.addSigner(defaultMint).buildAndExecute(),
         // InvalidProgramId
-        // https://github.com/coral-xyz/anchor/blob/v0.29.0/lang/src/error.rs#L178-L180
+        // https://github.com/coral-xyz/anchor/blob/v0.31.1/lang/src/error.rs#L229-L231
         /0xbc0/,
       );
     });
@@ -470,7 +470,7 @@ describe("open_position_with_metadata", () => {
       await assert.rejects(
         tx.addSigner(defaultMint).buildAndExecute(),
         // ConstraintAddress
-        // https://github.com/coral-xyz/anchor/blob/v0.29.0/lang/src/error.rs#L89-L91
+        // https://github.com/coral-xyz/anchor/blob/v0.31.1/lang/src/error.rs#L229-231
         /0x7dc/,
       );
     });
diff --git a/programs/whirlpool/src/state/adaptive_fee_tier.rs b/programs/whirlpool/src/state/adaptive_fee_tier.rs
@@ -157,7 +157,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = AdaptiveFeeTier::discriminator();
+        let discriminator: [u8; 8] = AdaptiveFeeTier::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:AdaptiveFeeTier | sha256sum | cut -c 1-16
         // 931090742f92952e
diff --git a/programs/whirlpool/src/state/config.rs b/programs/whirlpool/src/state/config.rs
@@ -107,7 +107,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = WhirlpoolsConfig::discriminator();
+        let discriminator: [u8; 8] = WhirlpoolsConfig::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:WhirlpoolsConfig | sha256sum | cut -c 1-16
         // 9d1431e0d957c1fe
diff --git a/programs/whirlpool/src/state/config_extension.rs b/programs/whirlpool/src/state/config_extension.rs
@@ -69,7 +69,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = WhirlpoolsConfigExtension::discriminator();
+        let discriminator: [u8; 8] = WhirlpoolsConfigExtension::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:WhirlpoolsConfigExtension | sha256sum | cut -c 1-16
         // 0263d7a3f01a993a
diff --git a/programs/whirlpool/src/state/fee_tier.rs b/programs/whirlpool/src/state/fee_tier.rs
@@ -46,7 +46,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = FeeTier::discriminator();
+        let discriminator: [u8; 8] = FeeTier::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:FeeTier | sha256sum | cut -c 1-16
         // 384b9f4c8e44be69
diff --git a/programs/whirlpool/src/state/fixed_tick_array.rs b/programs/whirlpool/src/state/fixed_tick_array.rs
@@ -261,7 +261,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = TickArray::discriminator();
+        let discriminator: [u8; 8] = TickArray::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:TickArray | sha256sum | cut -c 1-16
         // 4561bdbe6e0742bb
diff --git a/programs/whirlpool/src/state/lock_config.rs b/programs/whirlpool/src/state/lock_config.rs
@@ -93,7 +93,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = LockConfig::discriminator();
+        let discriminator: [u8; 8] = LockConfig::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:LockConfig | sha256sum | cut -c 1-16
         // 6a2fee9f7c0ca0c0
diff --git a/programs/whirlpool/src/state/oracle.rs b/programs/whirlpool/src/state/oracle.rs
@@ -485,7 +485,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = Oracle::discriminator();
+        let discriminator: [u8; 8] = Oracle::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:Oracle | sha256sum | cut -c 1-16
         // 8bc283b38cb3e5f4
diff --git a/programs/whirlpool/src/state/position.rs b/programs/whirlpool/src/state/position.rs
@@ -340,7 +340,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = Position::discriminator();
+        let discriminator: [u8; 8] = Position::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:Position | sha256sum | cut -c 1-16
         // aabc8fe47a40f7d0
diff --git a/programs/whirlpool/src/state/position_bundle.rs b/programs/whirlpool/src/state/position_bundle.rs
@@ -277,7 +277,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = PositionBundle::discriminator();
+        let discriminator: [u8; 8] = PositionBundle::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:PositionBundle | sha256sum | cut -c 1-16
         // 81a9af41b95f2064
diff --git a/programs/whirlpool/src/state/token_badge.rs b/programs/whirlpool/src/state/token_badge.rs
@@ -75,7 +75,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = TokenBadge::discriminator();
+        let discriminator: [u8; 8] = TokenBadge::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:TokenBadge | sha256sum | cut -c 1-16
         // 74dbcce5f974ff96
diff --git a/programs/whirlpool/src/state/whirlpool.rs b/programs/whirlpool/src/state/whirlpool.rs
@@ -566,7 +566,7 @@ mod discriminator_tests {
 
     #[test]
     fn test_discriminator() {
-        let discriminator = Whirlpool::discriminator();
+        let discriminator: [u8; 8] = Whirlpool::DISCRIMINATOR.try_into().unwrap();
         // The discriminator is determined by the struct name and not depending on the program id.
         // $ echo -n account:Whirlpool | sha256sum | cut -c 1-16
         // 3f95d10ce1806309
diff --git a/rust-sdk/client/Cargo.lock b/rust-sdk/client/Cargo.lock
diff --git a/rust-sdk/client/src/generated/mod.rs b/rust-sdk/client/src/generated/mod.rs
@@ -12,4 +12,4 @@
         pub mod shared;
         pub mod types;
   
-  pub(crate) use programs::*;
+  
diff --git a/rust-sdk/client/src/state/mod.rs b/rust-sdk/client/src/state/mod.rs
@@ -1,5 +1,4 @@
 mod dynamic_tick_array;
 mod tick_array;
 
-pub use dynamic_tick_array::*;
 pub use tick_array::*;
diff --git a/rust-sdk/integration/client/anchor v0.31/Cargo.toml b/rust-sdk/integration/client/anchor v0.31/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "orca_whirlpools_client_integration_anchor_v0_31"
+edition = "2021"
+
+[lib]
+path = "../../lib.rs"
+
+[dependencies]
+anchor-lang = { version = "~0.31.1" }
+solana-program = { version = "~2.1.0" }
+orca_whirlpools_client = { path = "../../../client", features = ["anchor"] }
diff --git a/rust-sdk/whirlpool/Cargo.lock b/rust-sdk/whirlpool/Cargo.lock
diff --git a/rust-sdk/whirlpool/src/tests/rpc.rs b/rust-sdk/whirlpool/src/tests/rpc.rs
diff --git a/scripts/setup.sh b/scripts/setup.sh
diff --git a/ts-sdk/tx-sender/tests/utils.ts b/ts-sdk/tx-sender/tests/utils.ts
diff --git a/yarn.lock b/yarn.lock
