Remove pubkey crate

febo · febo · commit baa8beb99870 · 2025-09-21T10:58:39.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
     "sdk/log/crate",
     "sdk/log/macro",
     "sdk/pinocchio",
-    "sdk/pubkey",
 ]
 
 [workspace.package]
@@ -22,10 +21,9 @@ rust-version = "1.84"
 five8_const = "0.1.4"
 pinocchio = { version = "0.9", path = "sdk/pinocchio" }
 pinocchio-log-macro = { version = "0.5", path = "sdk/log/macro" }
-pinocchio-pubkey = { version = "0.3", path = "sdk/pubkey" }
 quote = "1.0"
 regex = "1"
-solana-address = { version = "1.0", git = "https://github.com/anza-xyz/solana-sdk.git" }
+solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "derive-address" }
 syn = "1.0"
 
 [workspace.metadata.cli]
diff --git a/programs/associated-token-account/Cargo.toml b/programs/associated-token-account/Cargo.toml
@@ -13,4 +13,4 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
-pinocchio-pubkey = { workspace = true }
+solana-address = { workspace = true, features = ["decode"] }
diff --git a/programs/associated-token-account/src/lib.rs b/programs/associated-token-account/src/lib.rs
@@ -2,4 +2,4 @@
 
 pub mod instructions;
 
-pinocchio_pubkey::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+solana_address::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
diff --git a/programs/memo/Cargo.toml b/programs/memo/Cargo.toml
@@ -13,4 +13,4 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
-pinocchio-pubkey = { workspace = true }
+solana-address = { workspace = true, features = ["decode"] }
diff --git a/programs/memo/src/lib.rs b/programs/memo/src/lib.rs
@@ -4,7 +4,7 @@ pub mod instructions;
 
 /// Legacy symbols from Memo version 1
 pub mod v1 {
-    pinocchio_pubkey::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
+    solana_address::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
 }
 
-pinocchio_pubkey::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
+solana_address::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
diff --git a/programs/system/Cargo.toml b/programs/system/Cargo.toml
@@ -13,4 +13,4 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
-pinocchio-pubkey = { workspace = true }
+solana-address = { workspace = true, features = ["decode"] }
diff --git a/programs/system/src/lib.rs b/programs/system/src/lib.rs
@@ -2,4 +2,4 @@
 
 pub mod instructions;
 
-pinocchio_pubkey::declare_id!("11111111111111111111111111111111");
+solana_address::declare_id!("11111111111111111111111111111111");
diff --git a/programs/token-2022/Cargo.toml b/programs/token-2022/Cargo.toml
@@ -12,4 +12,4 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
-pinocchio-pubkey = { workspace = true }
+solana-address = { workspace = true, features = ["decode"] }
diff --git a/programs/token-2022/src/lib.rs b/programs/token-2022/src/lib.rs
@@ -3,10 +3,10 @@
 pub mod instructions;
 pub mod state;
 
-pinocchio_pubkey::declare_id!("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
-
 use core::mem::MaybeUninit;
 
+solana_address::declare_id!("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
+
 const UNINIT_BYTE: MaybeUninit<u8> = MaybeUninit::<u8>::uninit();
 
 #[inline(always)]
diff --git a/programs/token/Cargo.toml b/programs/token/Cargo.toml
@@ -13,4 +13,4 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
-pinocchio-pubkey = { workspace = true }
+solana-address = { workspace = true, features = ["decode"] }
diff --git a/programs/token/src/lib.rs b/programs/token/src/lib.rs
@@ -3,10 +3,10 @@
 pub mod instructions;
 pub mod state;
 
-pinocchio_pubkey::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
-
 use core::mem::MaybeUninit;
 
+solana_address::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+
 const UNINIT_BYTE: MaybeUninit<u8> = MaybeUninit::<u8>::uninit();
 
 #[inline(always)]
diff --git a/sdk/pubkey/Cargo.toml b/sdk/pubkey/Cargo.toml
diff --git a/sdk/pubkey/README.md b/sdk/pubkey/README.md
diff --git a/sdk/pubkey/src/lib.rs b/sdk/pubkey/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`pub mod instructions;`
`4`	`4`
`5`		`-pinocchio_pubkey::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");`
	`5`	`+solana_address::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ pub mod instructions;`
`4`	`4`
`5`	`5`	`/// Legacy symbols from Memo version 1`
`6`	`6`	`pub mod v1 {`
`7`		`- pinocchio_pubkey::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");`
	`7`	`+ solana_address::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");`
`8`	`8`	`}`
`9`	`9`
`10`		`-pinocchio_pubkey::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");`
	`10`	`+solana_address::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`pub mod instructions;`
`4`	`4`
`5`		`-pinocchio_pubkey::declare_id!("11111111111111111111111111111111");`
	`5`	`+solana_address::declare_id!("11111111111111111111111111111111");`