Update pinocchio dependencies

febo · febo · commit d522f1f484d5 · 2025-03-19T00:53:15.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/interface/Cargo.toml b/interface/Cargo.toml
@@ -12,8 +12,8 @@ readme = "./README.md"
 crate-type = ["rlib"]
 
 [dependencies]
-pinocchio = { version = "0.7", git = "https://github.com/febo/pinocchio.git", branch = "febo/error-to-str" }
-pinocchio-pubkey = { version = "0.2", git = "https://github.com/febo/pinocchio.git", branch = "febo/error-to-str" }
+pinocchio = "0.8"
+pinocchio-pubkey = "0.2"
 
 [dev-dependencies]
 strum = "0.27"
diff --git a/p-token/Cargo.toml b/p-token/Cargo.toml
@@ -15,8 +15,8 @@ crate-type = ["cdylib"]
 logging = []
 
 [dependencies]
-pinocchio = { version = "0.7", git = "https://github.com/febo/pinocchio.git", branch = "febo/error-to-str" }
-pinocchio-log = { version = "0.3", git = "https://github.com/febo/pinocchio.git", branch = "febo/error-to-str" }
+pinocchio = "0.8"
+pinocchio-log = { version = "0.4", default-features = false }
 spl-token-interface = { version = "^0", path = "../interface" }
 
 [dev-dependencies]
@@ -27,3 +27,6 @@ solana-sdk = "2.1"
 spl-token = { version="^4", features=["no-entrypoint"] }
 spl-token-2022 = { version="^7", features=["no-entrypoint"] }
 test-case = "3.3.1"
+
+[lints]
+workspace = true
diff --git a/p-token/src/processor/mod.rs b/p-token/src/processor/mod.rs
@@ -81,10 +81,10 @@ const MAX_FORMATTED_DIGITS: usize = u8::MAX as usize + 2;
 /// Checks that the account is owned by the expected program.
 #[inline(always)]
 fn check_account_owner(account_info: &AccountInfo) -> ProgramResult {
-    if &TOKEN_PROGRAM_ID != account_info.owner() {
-        Err(ProgramError::IncorrectProgramId)
-    } else {
+    if account_info.is_owned_by(&TOKEN_PROGRAM_ID) {
         Ok(())
+    } else {
+        Err(ProgramError::IncorrectProgramId)
     }
 }
 
@@ -104,7 +104,7 @@ fn validate_owner(
     }
 
     if owner_account_info.data_len() == Multisig::LEN
-        && owner_account_info.owner() == &TOKEN_PROGRAM_ID
+        && owner_account_info.is_owned_by(&TOKEN_PROGRAM_ID)
     {
         // SAFETY: the caller guarantees that there are no mutable borrows of `owner_account_info`
         // account data and the `load` validates that the account is initialized; additionally,

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ const MAX_FORMATTED_DIGITS: usize = u8::MAX as usize + 2;`
`81`	`81`	`/// Checks that the account is owned by the expected program.`
`82`	`82`	`#[inline(always)]`
`83`	`83`	`fn check_account_owner(account_info: &AccountInfo) -> ProgramResult {`
`84`		`- if &TOKEN_PROGRAM_ID != account_info.owner() {`
`85`		`- Err(ProgramError::IncorrectProgramId)`
`86`		`- } else {`
	`84`	`+ if account_info.is_owned_by(&TOKEN_PROGRAM_ID) {`
`87`	`85`	`Ok(())`
	`86`	`+ } else {`
	`87`	`+ Err(ProgramError::IncorrectProgramId)`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -104,7 +104,7 @@ fn validate_owner(`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if owner_account_info.data_len() == Multisig::LEN`
`107`		`- && owner_account_info.owner() == &TOKEN_PROGRAM_ID`
	`107`	`+ && owner_account_info.is_owned_by(&TOKEN_PROGRAM_ID)`
`108`	`108`	`{`
`109`	`109`	// SAFETY: the caller guarantees that there are no mutable borrows of `owner_account_info`
`110`	`110`	// account data and the `load` validates that the account is initialized; additionally,