From 028f54b1530008df9d856adc16ad887b8a1e340f Mon Sep 17 00:00:00 2001 From: Jean Marchand Date: Wed, 16 Apr 2025 14:43:14 +0700 Subject: [PATCH 1/3] Update pinocchio dependency --- Cargo.lock | 17 ++++++++--------- crates/lib/Cargo.toml | 1 - examples/anchor-cpi/Cargo.toml | 2 +- examples/counter/Cargo.toml | 2 +- examples/hello-world/Cargo.toml | 2 +- examples/instruction-data/Cargo.toml | 2 +- examples/seeded/Cargo.toml | 2 +- examples/seeds/Cargo.toml | 2 +- examples/transfer-sol/Cargo.toml | 2 +- examples/transfer-token/Cargo.toml | 2 +- 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4edb0f8b..7dec7541 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "autocfg" @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.8.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" +checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" dependencies = [ "proc-macro2", "quote", @@ -181,9 +181,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "memchr" @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -444,7 +444,6 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" name = "typhoon" version = "0.1.0-alpha.0" dependencies = [ - "pinocchio", "pinocchio-pubkey", "typhoon-account-macro", "typhoon-accounts", diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index 79e0acbd..c9641a4d 100644 --- a/crates/lib/Cargo.toml +++ b/crates/lib/Cargo.toml @@ -11,7 +11,6 @@ repository.workspace = true borsh = ["typhoon-accounts/borsh"] [dependencies] -pinocchio = { workspace = true, features = ["std"] } pinocchio-pubkey.workspace = true typhoon-accounts.workspace = true typhoon-account-macro.workspace = true diff --git a/examples/anchor-cpi/Cargo.toml b/examples/anchor-cpi/Cargo.toml index 9f0a7f37..a4f92878 100644 --- a/examples/anchor-cpi/Cargo.toml +++ b/examples/anchor-cpi/Cargo.toml @@ -3,4 +3,4 @@ members = ["programs/*", "tests"] resolver = "2" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml index 4f09cd02..5107e1a8 100644 --- a/examples/counter/Cargo.toml +++ b/examples/counter/Cargo.toml @@ -28,4 +28,4 @@ solana-system-interface = "1.0.0" solana-transaction = "2.2.1" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml index 1b0069fe..b58ae728 100644 --- a/examples/hello-world/Cargo.toml +++ b/examples/hello-world/Cargo.toml @@ -26,4 +26,4 @@ solana-system-interface = "1.0.0" solana-transaction = "2.2.1" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/instruction-data/Cargo.toml b/examples/instruction-data/Cargo.toml index e60ca66e..5cd9ca08 100644 --- a/examples/instruction-data/Cargo.toml +++ b/examples/instruction-data/Cargo.toml @@ -27,4 +27,4 @@ solana-system-interface = "1.0.0" solana-transaction = "2.2.1" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/seeded/Cargo.toml b/examples/seeded/Cargo.toml index 8e34116e..a6d9a15c 100644 --- a/examples/seeded/Cargo.toml +++ b/examples/seeded/Cargo.toml @@ -27,4 +27,4 @@ solana-system-interface = "1.0.0" solana-transaction = "2.2.1" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/seeds/Cargo.toml b/examples/seeds/Cargo.toml index 7ecc8a3d..3fed97ef 100644 --- a/examples/seeds/Cargo.toml +++ b/examples/seeds/Cargo.toml @@ -27,4 +27,4 @@ solana-system-interface = "1.0.0" solana-transaction = "2.2.1" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/transfer-sol/Cargo.toml b/examples/transfer-sol/Cargo.toml index 6111f924..1ac3be20 100644 --- a/examples/transfer-sol/Cargo.toml +++ b/examples/transfer-sol/Cargo.toml @@ -27,4 +27,4 @@ solana-system-interface = "1.0.0" solana-transaction = "2.2.1" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/transfer-token/Cargo.toml b/examples/transfer-token/Cargo.toml index 9b72470c..e11995c5 100644 --- a/examples/transfer-token/Cargo.toml +++ b/examples/transfer-token/Cargo.toml @@ -30,4 +30,4 @@ solana-transaction = "2.2.1" spl-associated-token-account-client = "2.0.0" [patch.crates-io] -pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" } +pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } From 0459341bb975fa67c7ceea10e521bcb4aeb16f58 Mon Sep 17 00:00:00 2001 From: Jean Marchand Date: Mon, 21 Apr 2025 20:20:11 +0700 Subject: [PATCH 2/3] Update pinocchio --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- examples/anchor-cpi/Cargo.toml | 3 --- examples/anchor-cpi/tests/Cargo.toml | 2 +- examples/counter/Cargo.toml | 5 +---- examples/hello-world/Cargo.toml | 5 +---- examples/instruction-data/Cargo.toml | 5 +---- examples/seeded/Cargo.toml | 5 +---- examples/seeds/Cargo.toml | 5 +---- examples/transfer-sol/Cargo.toml | 5 +---- examples/transfer-token/Cargo.toml | 7 ++----- 11 files changed, 12 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7dec7541..51a0359e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -208,9 +208,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pinocchio" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cc3d639f805724755597e62b79bf61f79162284a6f9d0475a59b52842567d1" +checksum = "81225b3b8ce092ac54e0d1c55a962be61efcad1d021030f0eb660875703db562" [[package]] name = "pinocchio-associated-token-account" diff --git a/Cargo.toml b/Cargo.toml index 9cf595b4..2355f64b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ typhoon-utility-traits = { version = "0.1.0-alpha.0", path = "crates/utility-tra heck = "0.5.0" num-traits = "0.2" paste = "1.0" -pinocchio = "0.8.2" +pinocchio = "0.8.3" pinocchio-associated-token-account = "0.1.1" pinocchio-log = "0.4.0" pinocchio-pubkey = "0.2.4" diff --git a/examples/anchor-cpi/Cargo.toml b/examples/anchor-cpi/Cargo.toml index a4f92878..b5052284 100644 --- a/examples/anchor-cpi/Cargo.toml +++ b/examples/anchor-cpi/Cargo.toml @@ -1,6 +1,3 @@ [workspace] members = ["programs/*", "tests"] resolver = "2" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/anchor-cpi/tests/Cargo.toml b/examples/anchor-cpi/tests/Cargo.toml index c39cf1bd..08f0c216 100644 --- a/examples/anchor-cpi/tests/Cargo.toml +++ b/examples/anchor-cpi/tests/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dev-dependencies] bytemuck = "1.21.0" -litesvm = "0.6.0" +litesvm = "0.6.1" podded = "0.5.2" typhoon = { path = "../../../crates/lib" } solana-instruction = "2.2.1" diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml index 5107e1a8..4a080cc8 100644 --- a/examples/counter/Cargo.toml +++ b/examples/counter/Cargo.toml @@ -18,7 +18,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] } typhoon = { path = "../../crates/lib" } [dev-dependencies] -litesvm = "0.6.0" +litesvm = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -26,6 +26,3 @@ solana-pubkey = "2.2.1" solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml index b58ae728..89c88dea 100644 --- a/examples/hello-world/Cargo.toml +++ b/examples/hello-world/Cargo.toml @@ -16,7 +16,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [ typhoon = { path = "../../crates/lib" } [dev-dependencies] -litesvm = "0.6.0" +litesvm = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -24,6 +24,3 @@ solana-pubkey = "2.2.1" solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/instruction-data/Cargo.toml b/examples/instruction-data/Cargo.toml index 5cd9ca08..4b0d3bad 100644 --- a/examples/instruction-data/Cargo.toml +++ b/examples/instruction-data/Cargo.toml @@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] } typhoon = { path = "../../crates/lib" } [dev-dependencies] -litesvm = "0.6.0" +litesvm = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -25,6 +25,3 @@ solana-pubkey = "2.2.1" solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/seeded/Cargo.toml b/examples/seeded/Cargo.toml index a6d9a15c..c8a5a0ed 100644 --- a/examples/seeded/Cargo.toml +++ b/examples/seeded/Cargo.toml @@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] } typhoon = { path = "../../crates/lib" } [dev-dependencies] -litesvm = "0.6.0" +litesvm = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -25,6 +25,3 @@ solana-pubkey = "2.2.1" solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/seeds/Cargo.toml b/examples/seeds/Cargo.toml index 3fed97ef..2117f543 100644 --- a/examples/seeds/Cargo.toml +++ b/examples/seeds/Cargo.toml @@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] } typhoon = { path = "../../crates/lib" } [dev-dependencies] -litesvm = "0.6.0" +litesvm = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -25,6 +25,3 @@ solana-pubkey = "2.2.1" solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/transfer-sol/Cargo.toml b/examples/transfer-sol/Cargo.toml index 1ac3be20..0b06ca77 100644 --- a/examples/transfer-sol/Cargo.toml +++ b/examples/transfer-sol/Cargo.toml @@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] } typhoon = { path = "../../crates/lib" } [dev-dependencies] -litesvm = "0.6.0" +litesvm = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -25,6 +25,3 @@ solana-pubkey = "2.2.1" solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } diff --git a/examples/transfer-token/Cargo.toml b/examples/transfer-token/Cargo.toml index e11995c5..7e7c3d8c 100644 --- a/examples/transfer-token/Cargo.toml +++ b/examples/transfer-token/Cargo.toml @@ -18,8 +18,8 @@ typhoon = { path = "../../crates/lib" } typhoon-token = { path = "../../crates/token" } [dev-dependencies] -litesvm = "0.6.0" -litesvm-token = "0.6.0" +litesvm = "0.6.1" +litesvm-token = "0.6.1" solana-instruction = "2.2.1" solana-keypair = "2.2.1" solana-native-token = "2.2.1" @@ -28,6 +28,3 @@ solana-signer = "2.2.1" solana-system-interface = "1.0.0" solana-transaction = "2.2.1" spl-associated-token-account-client = "2.0.0" - -[patch.crates-io] -pinocchio = { git = "https://github.com/anza-xyz/pinocchio", branch = "febo/allocator-features" } From 2e0eff6a86cd17f04358c12b367eb001876f2b8d Mon Sep 17 00:00:00 2001 From: Jean Marchand Date: Fri, 2 May 2025 11:00:16 +0700 Subject: [PATCH 3/3] Update pinocchio --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51a0359e..1620d1fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -208,9 +208,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pinocchio" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81225b3b8ce092ac54e0d1c55a962be61efcad1d021030f0eb660875703db562" +checksum = "7c33b58567c11b07749cefbb8320ac023f3387c57807aeb8e3b1262501b6e9f0" [[package]] name = "pinocchio-associated-token-account" diff --git a/Cargo.toml b/Cargo.toml index 2355f64b..8975d23f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ typhoon-utility-traits = { version = "0.1.0-alpha.0", path = "crates/utility-tra heck = "0.5.0" num-traits = "0.2" paste = "1.0" -pinocchio = "0.8.3" +pinocchio = "0.8.4" pinocchio-associated-token-account = "0.1.1" pinocchio-log = "0.4.0" pinocchio-pubkey = "0.2.4"