From 504e15e1373bb15c40f3bb49531e74916d8e78db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2026 17:38:39 +0000
Subject: [PATCH 1/2] chore(deps): bump solana-account from 3.4.0 to 4.1.0

Bumps [solana-account](https://github.com/anza-xyz/solana-sdk) from 3.4.0 to 4.1.0.
- [Release notes](https://github.com/anza-xyz/solana-sdk/releases)
- [Commits](https://github.com/anza-xyz/solana-sdk/compare/account@v3.4.0...hash@v4.1.0)

---
updated-dependencies:
- dependency-name: solana-account
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5482334..399f421 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4210,7 +4210,7 @@ name = "resq-airspace"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
- "solana-account 3.4.0",
+ "solana-account 4.1.0",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -4230,7 +4230,7 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "resq-airspace",
- "solana-account 3.4.0",
+ "solana-account 4.1.0",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
diff --git a/Cargo.toml b/Cargo.toml
index faacaf0..0790406 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ unsafe_code = "warn"
 [workspace.dependencies]
 anchor-lang = { version = "1.0.0-rc.4", features = ["init-if-needed"] }
 anchor-client = "1.0.0-rc.2"
-solana-account = "3.2.0"
+solana-account = "4.1.0"
 solana-account-info = "3.1.1"
 solana-instruction = "3.3.0"
 solana-keypair = "3.1.2"

From d7a15a3a35de8c5eb0651921a698fdacba83bb66 Mon Sep 17 00:00:00 2001
From: Mike Odnis <mike@mikeodnis.dev>
Date: Mon, 30 Mar 2026 09:42:29 -0400
Subject: [PATCH 2/2] fix(deps): pin solana-account and solana-transaction to
 3.x for test infra compat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

solana-program-test 3.1.10 (vendored) uses solana-banks-client 3.1.10
which is tied to solana-account 3.4.0 and solana-transaction 3.1.0.
Bumping the workspace deps to 4.x creates type incompatibilities in
integration tests:

- `ProgramTest::add_account` expects solana-account 3.x Account
- `BanksClient::process_transaction` expects solana-transaction 3.x
  Transaction/VersionedTransaction

Revert both to 3.x until solana-program-test is updated to a version
that uses solana-banks-client 4.x (which supports 4.x modular types).

The borsh enum discriminant fix in airspace_account.rs (from PR #11)
is retained — that code change is still required for borsh 1.x compat
regardless of solana-transaction version.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 399f421..2193a77 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4210,7 +4210,7 @@ name = "resq-airspace"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
- "solana-account 4.1.0",
+ "solana-account 3.4.0",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -4220,7 +4220,7 @@ dependencies = [
  "solana-sdk",
  "solana-signer",
  "solana-system-interface 3.1.0",
- "solana-transaction 4.0.0",
+ "solana-transaction 3.1.0",
  "tokio",
 ]
 
@@ -4230,7 +4230,7 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "resq-airspace",
- "solana-account 4.1.0",
+ "solana-account 3.4.0",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -4240,7 +4240,7 @@ dependencies = [
  "solana-sdk",
  "solana-signer",
  "solana-system-interface 3.1.0",
- "solana-transaction 4.0.0",
+ "solana-transaction 3.1.0",
  "tokio",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 0790406..deac9c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ unsafe_code = "warn"
 [workspace.dependencies]
 anchor-lang = { version = "1.0.0-rc.4", features = ["init-if-needed"] }
 anchor-client = "1.0.0-rc.2"
-solana-account = "4.1.0"
+solana-account = "3.4.0"
 solana-account-info = "3.1.1"
 solana-instruction = "3.3.0"
 solana-keypair = "3.1.2"
@@ -35,7 +35,7 @@ solana-pubkey = "4.1.0"
 solana-sdk = "4.0.1"
 solana-signer = "3.0.0"
 solana-system-interface = "3.1.0"
-solana-transaction = "4.0.0"
+solana-transaction = "3.1.0"
 tokio = { version = "1", features = ["full"] }
 
 [profile.release]