From aabe74d83079c2fc621d97fbae84c2fc415fba96 Mon Sep 17 00:00:00 2001 From: Aung Nanda Oo Date: Fri, 10 Jul 2026 14:54:50 -0700 Subject: [PATCH 1/2] refactor: migrate inline dev-deps to workspace references in basics/ Replace inline-pinned `[dev-dependencies]` versions with `.workspace = true` across all 28 native, pinocchio, and asm Cargo.toml files under `basics/`. Also adds `solana-rent` and `solana-transaction-error` to the root `[workspace.dependencies]`, and migrates the CPI hand/lever programs' inline `[dependencies]` (borsh, solana-program) to workspace references. Co-Authored-By: Claude Sonnet 4.6 --- Cargo.toml | 2 ++ basics/account-data/native/program/Cargo.toml | 10 +++++----- .../account-data/pinocchio/program/Cargo.toml | 10 +++++----- basics/checking-accounts/asm/Cargo.toml | 14 ++++++------- .../native/program/Cargo.toml | 10 +++++----- .../pinocchio/program/Cargo.toml | 10 +++++----- .../close-account/native/program/Cargo.toml | 12 +++++------ .../pinocchio/program/Cargo.toml | 10 +++++----- basics/counter/native/program/Cargo.toml | 14 ++++++------- basics/counter/pinocchio/program/Cargo.toml | 14 ++++++------- basics/create-account/asm/Cargo.toml | 12 +++++------ .../create-account/native/program/Cargo.toml | 12 +++++------ .../pinocchio/program/Cargo.toml | 12 +++++------ .../native/programs/hand/Cargo.toml | 20 +++++++++---------- .../native/programs/lever/Cargo.toml | 8 ++++---- basics/favorites/native/program/Cargo.toml | 12 +++++------ basics/favorites/pinocchio/program/Cargo.toml | 12 +++++------ basics/hello-solana/native/program/Cargo.toml | 12 +++++------ .../native/program/Cargo.toml | 12 +++++------ .../pinocchio/program/Cargo.toml | 12 +++++------ .../native/program/Cargo.toml | 14 ++++++------- .../pinocchio/program/Cargo.toml | 14 ++++++------- basics/realloc/native/program/Cargo.toml | 12 +++++------ basics/realloc/pinocchio/program/Cargo.toml | 12 +++++------ basics/rent/native/program/Cargo.toml | 14 ++++++------- basics/rent/pinocchio/program/Cargo.toml | 14 ++++++------- .../native/program/Cargo.toml | 18 ++++++++--------- .../pinocchio/program/Cargo.toml | 12 +++++------ basics/transfer-sol/native/program/Cargo.toml | 12 +++++------ .../transfer-sol/pinocchio/program/Cargo.toml | 12 +++++------ 30 files changed, 183 insertions(+), 181 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5532155de..364f56492 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,5 +101,7 @@ solana-instruction = "3.0.0" solana-keypair = "3.0.1" solana-pubkey = "3.0.0" solana-transaction = "3.0.1" +solana-transaction-error = "3.2.0" solana-native-token = "3.0.0" +solana-rent = "4.1.0" solana-address = "2.6.0" diff --git a/basics/account-data/native/program/Cargo.toml b/basics/account-data/native/program/Cargo.toml index bb79994c1..873cb6c0f 100644 --- a/basics/account-data/native/program/Cargo.toml +++ b/basics/account-data/native/program/Cargo.toml @@ -20,10 +20,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-keypair = "3.0.1" +litesvm.workspace = true +solana-keypair.workspace = true solana-message = "4.0.0" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" +solana-native-token.workspace = true +solana-pubkey.workspace = true solana-signer = "3.0.0" -solana-transaction = "3.0.1" +solana-transaction.workspace = true diff --git a/basics/account-data/pinocchio/program/Cargo.toml b/basics/account-data/pinocchio/program/Cargo.toml index 756dbbc01..e4842acc7 100644 --- a/basics/account-data/pinocchio/program/Cargo.toml +++ b/basics/account-data/pinocchio/program/Cargo.toml @@ -9,13 +9,13 @@ pinocchio-log.workspace = true pinocchio-system.workspace = true [dev-dependencies] -litesvm = "0.11.0" -solana-keypair = "3.0.1" +litesvm.workspace = true +solana-keypair.workspace = true solana-message = "4.0.0" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" +solana-native-token.workspace = true +solana-pubkey.workspace = true solana-signer = "3.0.0" -solana-transaction = "3.0.1" +solana-transaction.workspace = true solana-system-interface.workspace = true [lib] diff --git a/basics/checking-accounts/asm/Cargo.toml b/basics/checking-accounts/asm/Cargo.toml index 86c433065..fd767509e 100644 --- a/basics/checking-accounts/asm/Cargo.toml +++ b/basics/checking-accounts/asm/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" [dependencies] [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true solana-system-interface.workspace = true -solana-transaction-error = "3.2.0" +solana-transaction-error.workspace = true [features] test-sbf = [] diff --git a/basics/checking-accounts/native/program/Cargo.toml b/basics/checking-accounts/native/program/Cargo.toml index 665516c54..393e0286a 100644 --- a/basics/checking-accounts/native/program/Cargo.toml +++ b/basics/checking-accounts/native/program/Cargo.toml @@ -19,9 +19,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" +litesvm.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true solana-sdk = "4.0.1" -solana-transaction = "3.0.1" +solana-transaction.workspace = true diff --git a/basics/checking-accounts/pinocchio/program/Cargo.toml b/basics/checking-accounts/pinocchio/program/Cargo.toml index ea2451116..9d5785a5c 100644 --- a/basics/checking-accounts/pinocchio/program/Cargo.toml +++ b/basics/checking-accounts/pinocchio/program/Cargo.toml @@ -9,12 +9,12 @@ pinocchio-system.workspace = true pinocchio-log.workspace = true [dev-dependencies] -litesvm = "0.11.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" +litesvm.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true solana-sdk = "4.0.1" -solana-transaction = "3.0.1" +solana-transaction.workspace = true solana-system-interface.workspace = true [lib] diff --git a/basics/close-account/native/program/Cargo.toml b/basics/close-account/native/program/Cargo.toml index ca3d566e6..03fc5de78 100644 --- a/basics/close-account/native/program/Cargo.toml +++ b/basics/close-account/native/program/Cargo.toml @@ -20,9 +20,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/close-account/pinocchio/program/Cargo.toml b/basics/close-account/pinocchio/program/Cargo.toml index af5308d90..2f06d5c96 100644 --- a/basics/close-account/pinocchio/program/Cargo.toml +++ b/basics/close-account/pinocchio/program/Cargo.toml @@ -10,13 +10,13 @@ pinocchio-pubkey.workspace = true pinocchio-system.workspace = true [dev-dependencies] -litesvm = "0.11.0" -solana-keypair = "3.0.1" +litesvm.workspace = true +solana-keypair.workspace = true solana-message = "4.0.0" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" +solana-native-token.workspace = true +solana-pubkey.workspace = true solana-signer = "3.0.0" -solana-transaction = "3.0.1" +solana-transaction.workspace = true solana-system-interface.workspace = true solana-instruction.workspace = true diff --git a/basics/counter/native/program/Cargo.toml b/basics/counter/native/program/Cargo.toml index c928d7806..3ae950a31 100644 --- a/basics/counter/native/program/Cargo.toml +++ b/basics/counter/native/program/Cargo.toml @@ -22,11 +22,11 @@ solana-program.workspace = true unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-rent = "4.1.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-rent.workspace = true solana-system-interface.workspace = true diff --git a/basics/counter/pinocchio/program/Cargo.toml b/basics/counter/pinocchio/program/Cargo.toml index 2df97c688..2b01c6422 100644 --- a/basics/counter/pinocchio/program/Cargo.toml +++ b/basics/counter/pinocchio/program/Cargo.toml @@ -22,11 +22,11 @@ pinocchio-pubkey.workspace = true unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-rent = "4.1.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-rent.workspace = true solana-system-interface.workspace = true diff --git a/basics/create-account/asm/Cargo.toml b/basics/create-account/asm/Cargo.toml index 07b92124c..3f39d80c6 100644 --- a/basics/create-account/asm/Cargo.toml +++ b/basics/create-account/asm/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" [dependencies] [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true solana-system-interface.workspace = true [features] diff --git a/basics/create-account/native/program/Cargo.toml b/basics/create-account/native/program/Cargo.toml index bde26597a..066129e15 100644 --- a/basics/create-account/native/program/Cargo.toml +++ b/basics/create-account/native/program/Cargo.toml @@ -18,9 +18,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/create-account/pinocchio/program/Cargo.toml b/basics/create-account/pinocchio/program/Cargo.toml index 609d465c2..c0960bd40 100644 --- a/basics/create-account/pinocchio/program/Cargo.toml +++ b/basics/create-account/pinocchio/program/Cargo.toml @@ -20,10 +20,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true solana-system-interface.workspace = true diff --git a/basics/cross-program-invocation/native/programs/hand/Cargo.toml b/basics/cross-program-invocation/native/programs/hand/Cargo.toml index e3df0a5b1..ec64b4a0e 100644 --- a/basics/cross-program-invocation/native/programs/hand/Cargo.toml +++ b/basics/cross-program-invocation/native/programs/hand/Cargo.toml @@ -10,22 +10,22 @@ custom-heap = [] custom-panic = [] [dependencies] -borsh = "1.6.1" -borsh-derive = "1.6.1" -solana-program = "4.0" +borsh.workspace = true +borsh-derive.workspace = true +solana-program.workspace = true cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] } [lib] crate-type = ["cdylib", "lib"] [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-system-interface = {version = "2.0.0", features = ["bincode"]} +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-system-interface.workspace = true [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } diff --git a/basics/cross-program-invocation/native/programs/lever/Cargo.toml b/basics/cross-program-invocation/native/programs/lever/Cargo.toml index 388363be5..630fdafff 100644 --- a/basics/cross-program-invocation/native/programs/lever/Cargo.toml +++ b/basics/cross-program-invocation/native/programs/lever/Cargo.toml @@ -10,10 +10,10 @@ custom-heap = [] custom-panic = [] [dependencies] -borsh = "1.6.1" -borsh-derive = "1.6.1" -solana-program = "4.0" -solana-system-interface = {version = "2.0.0", features = ["bincode"]} +borsh.workspace = true +borsh-derive.workspace = true +solana-program.workspace = true +solana-system-interface.workspace = true [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/favorites/native/program/Cargo.toml b/basics/favorites/native/program/Cargo.toml index 416af7197..f8182fecb 100644 --- a/basics/favorites/native/program/Cargo.toml +++ b/basics/favorites/native/program/Cargo.toml @@ -20,9 +20,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/favorites/pinocchio/program/Cargo.toml b/basics/favorites/pinocchio/program/Cargo.toml index 2842e5f8c..4fac4a63e 100644 --- a/basics/favorites/pinocchio/program/Cargo.toml +++ b/basics/favorites/pinocchio/program/Cargo.toml @@ -21,10 +21,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true solana-system-interface.workspace = true diff --git a/basics/hello-solana/native/program/Cargo.toml b/basics/hello-solana/native/program/Cargo.toml index a51e82ffa..f41076334 100644 --- a/basics/hello-solana/native/program/Cargo.toml +++ b/basics/hello-solana/native/program/Cargo.toml @@ -17,9 +17,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/processing-instructions/native/program/Cargo.toml b/basics/processing-instructions/native/program/Cargo.toml index d3af395c4..e348596c4 100644 --- a/basics/processing-instructions/native/program/Cargo.toml +++ b/basics/processing-instructions/native/program/Cargo.toml @@ -19,9 +19,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-native-token = "3.0.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-native-token.workspace = true diff --git a/basics/processing-instructions/pinocchio/program/Cargo.toml b/basics/processing-instructions/pinocchio/program/Cargo.toml index 5e202b590..6f1536a0f 100644 --- a/basics/processing-instructions/pinocchio/program/Cargo.toml +++ b/basics/processing-instructions/pinocchio/program/Cargo.toml @@ -18,9 +18,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-native-token = "3.0.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-native-token.workspace = true diff --git a/basics/program-derived-addresses/native/program/Cargo.toml b/basics/program-derived-addresses/native/program/Cargo.toml index 1251e8d8a..544875820 100644 --- a/basics/program-derived-addresses/native/program/Cargo.toml +++ b/basics/program-derived-addresses/native/program/Cargo.toml @@ -20,10 +20,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-native-token = "3.0.0" -solana-rent = "4.1.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-native-token.workspace = true +solana-rent.workspace = true diff --git a/basics/program-derived-addresses/pinocchio/program/Cargo.toml b/basics/program-derived-addresses/pinocchio/program/Cargo.toml index e803884e6..0b4e75df2 100644 --- a/basics/program-derived-addresses/pinocchio/program/Cargo.toml +++ b/basics/program-derived-addresses/pinocchio/program/Cargo.toml @@ -19,11 +19,11 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-native-token = "3.0.0" -solana-rent = "4.1.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-native-token.workspace = true +solana-rent.workspace = true solana-system-interface.workspace = true diff --git a/basics/realloc/native/program/Cargo.toml b/basics/realloc/native/program/Cargo.toml index 8a763a8e1..857fc3c17 100644 --- a/basics/realloc/native/program/Cargo.toml +++ b/basics/realloc/native/program/Cargo.toml @@ -20,9 +20,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/realloc/pinocchio/program/Cargo.toml b/basics/realloc/pinocchio/program/Cargo.toml index 35d0043d1..6450882dd 100644 --- a/basics/realloc/pinocchio/program/Cargo.toml +++ b/basics/realloc/pinocchio/program/Cargo.toml @@ -20,10 +20,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true solana-system-interface.workspace = true diff --git a/basics/rent/native/program/Cargo.toml b/basics/rent/native/program/Cargo.toml index dcbff7dc9..ce79dc241 100644 --- a/basics/rent/native/program/Cargo.toml +++ b/basics/rent/native/program/Cargo.toml @@ -20,10 +20,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-rent = "4.1.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-rent.workspace = true +solana-transaction.workspace = true diff --git a/basics/rent/pinocchio/program/Cargo.toml b/basics/rent/pinocchio/program/Cargo.toml index 486190ede..39ccc025e 100644 --- a/basics/rent/pinocchio/program/Cargo.toml +++ b/basics/rent/pinocchio/program/Cargo.toml @@ -19,11 +19,11 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-rent = "4.1.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-rent.workspace = true +solana-transaction.workspace = true solana-system-interface .workspace = true diff --git a/basics/repository-layout/native/program/Cargo.toml b/basics/repository-layout/native/program/Cargo.toml index 44f37d83c..a75a1e2e6 100644 --- a/basics/repository-layout/native/program/Cargo.toml +++ b/basics/repository-layout/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "1.6.1" -borsh-derive = "1.6.1" -solana-program = "4.0" +borsh.workspace = true +borsh-derive.workspace = true +solana-program.workspace = true [lib] crate-type = ["cdylib", "lib"] @@ -19,9 +19,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/repository-layout/pinocchio/program/Cargo.toml b/basics/repository-layout/pinocchio/program/Cargo.toml index 2f6424aa4..1e1221259 100644 --- a/basics/repository-layout/pinocchio/program/Cargo.toml +++ b/basics/repository-layout/pinocchio/program/Cargo.toml @@ -18,9 +18,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" -solana-native-token = "3.0.0" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true +solana-native-token.workspace = true diff --git a/basics/transfer-sol/native/program/Cargo.toml b/basics/transfer-sol/native/program/Cargo.toml index 9202a2596..134db6bce 100644 --- a/basics/transfer-sol/native/program/Cargo.toml +++ b/basics/transfer-sol/native/program/Cargo.toml @@ -20,9 +20,9 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true diff --git a/basics/transfer-sol/pinocchio/program/Cargo.toml b/basics/transfer-sol/pinocchio/program/Cargo.toml index 570467285..d0119b658 100644 --- a/basics/transfer-sol/pinocchio/program/Cargo.toml +++ b/basics/transfer-sol/pinocchio/program/Cargo.toml @@ -18,10 +18,10 @@ custom-panic = [] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } [dev-dependencies] -litesvm = "0.11.0" -solana-instruction = "3.0.0" -solana-keypair = "3.0.1" -solana-native-token = "3.0.0" -solana-pubkey = "3.0.0" -solana-transaction = "3.0.1" +litesvm.workspace = true +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-native-token.workspace = true +solana-pubkey.workspace = true +solana-transaction.workspace = true solana-system-interface.workspace = true From 7b5a98db0b4d7d430fc954038af7a290e6e52175 Mon Sep 17 00:00:00 2001 From: Aung Nanda Oo Date: Fri, 10 Jul 2026 15:04:34 -0700 Subject: [PATCH 2/2] fix: revert CPI hand/lever to inline deps (sub-workspace can't inherit) basics/cross-program-invocation/native/ is its own sub-workspace with no [workspace.dependencies], so .workspace = true fails to resolve for hand and lever. Keep their deps inline. Co-Authored-By: Claude Sonnet 4.6 --- .../native/programs/hand/Cargo.toml | 20 +++++++++---------- .../native/programs/lever/Cargo.toml | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/basics/cross-program-invocation/native/programs/hand/Cargo.toml b/basics/cross-program-invocation/native/programs/hand/Cargo.toml index ec64b4a0e..e3df0a5b1 100644 --- a/basics/cross-program-invocation/native/programs/hand/Cargo.toml +++ b/basics/cross-program-invocation/native/programs/hand/Cargo.toml @@ -10,22 +10,22 @@ custom-heap = [] custom-panic = [] [dependencies] -borsh.workspace = true -borsh-derive.workspace = true -solana-program.workspace = true +borsh = "1.6.1" +borsh-derive = "1.6.1" +solana-program = "4.0" cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] } [lib] crate-type = ["cdylib", "lib"] [dev-dependencies] -litesvm.workspace = true -solana-instruction.workspace = true -solana-keypair.workspace = true -solana-native-token.workspace = true -solana-pubkey.workspace = true -solana-transaction.workspace = true -solana-system-interface.workspace = true +litesvm = "0.11.0" +solana-instruction = "3.0.0" +solana-keypair = "3.0.1" +solana-native-token = "3.0.0" +solana-pubkey = "3.0.0" +solana-transaction = "3.0.1" +solana-system-interface = {version = "2.0.0", features = ["bincode"]} [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("solana"))'] } diff --git a/basics/cross-program-invocation/native/programs/lever/Cargo.toml b/basics/cross-program-invocation/native/programs/lever/Cargo.toml index 630fdafff..388363be5 100644 --- a/basics/cross-program-invocation/native/programs/lever/Cargo.toml +++ b/basics/cross-program-invocation/native/programs/lever/Cargo.toml @@ -10,10 +10,10 @@ custom-heap = [] custom-panic = [] [dependencies] -borsh.workspace = true -borsh-derive.workspace = true -solana-program.workspace = true -solana-system-interface.workspace = true +borsh = "1.6.1" +borsh-derive = "1.6.1" +solana-program = "4.0" +solana-system-interface = {version = "2.0.0", features = ["bincode"]} [lib] crate-type = ["cdylib", "lib"]