Refactor function signatures for node-litesvm

Author: Aursen

Cargo.lock

@@ -23,8 +23,8 @@ itertools = "0.14"
 libsecp256k1 = "0.6.0"
 litesvm = { path = "crates/litesvm", version = "0.6" }
 log = "0.4"
-napi = { version = "3.2.3", default-features = false }
-napi-derive = "3.2.3"
+napi = { version = "3.2.4", default-features = false }
+napi-derive = "3.2.4"
 qualifier_attr = "0.2.2"
 serde = "1.0"
 smallvec = "1.13"

Cargo.toml

@@ -24,7 +24,7 @@
 	},
 	"devDependencies": {
 		"@algolia/client-search": ">= 4.9.1 < 6",
-		"@napi-rs/cli": "^3.1.4",
+		"@napi-rs/cli": "^3.1.5",
 		"@solana/spl-token": "^0.4.13",
 		"@swc/core": "^1.10.7",
 		"@types/markdown-it": "^14.1.0",

crates/node-litesvm/package.json

@@ -1,7 +1,6 @@
 use {
     crate::{to_string_js, util::convert_pubkey},
     agave_feature_set::FeatureSet as FeatureSetOriginal,
-    napi::bindgen_prelude::*,
 };
 
 #[derive(Debug, Clone)]
@@ -21,12 +20,12 @@ impl FeatureSet {
     }
 
     #[napi]
-    pub fn is_active(&self, feature_id: Uint8Array) -> bool {
+    pub fn is_active(&self, feature_id: &[u8]) -> bool {
         self.0.is_active(&convert_pubkey(feature_id))
     }
 
     #[napi]
-    pub fn activated_slot(&self, feature_id: Uint8Array) -> Option<u64> {
+    pub fn activated_slot(&self, feature_id: &[u8]) -> Option<u64> {
         self.0.activated_slot(&convert_pubkey(feature_id))
     }
 }

crates/node-litesvm/src/feature_set.rs

@@ -180,21 +180,21 @@ impl LiteSvm {
 
     #[napi]
     /// Returns all information associated with the account of the provided pubkey.
-    pub fn get_account(&self, pubkey: Uint8Array) -> Option<Account> {
+    pub fn get_account(&self, pubkey: &[u8]) -> Option<Account> {
         self.0.get_account(&convert_pubkey(pubkey)).map(Account)
     }
 
     #[napi]
     /// Sets all information associated with the account of the provided pubkey.
-    pub fn set_account(&mut self, pubkey: Uint8Array, data: &Account) -> Result<()> {
+    pub fn set_account(&mut self, pubkey: &[u8], data: &Account) -> Result<()> {
         self.0
             .set_account(convert_pubkey(pubkey), data.0.clone())
             .map_err(|e| to_js_error(e, "Failed to set account"))
     }
 
     #[napi]
     /// Gets the balance of the provided account pubkey.
-    pub fn get_balance(&self, pubkey: Uint8Array) -> Option<u64> {
+    pub fn get_balance(&self, pubkey: &[u8]) -> Option<u64> {
         self.0.get_balance(&convert_pubkey(pubkey))
     }
 
@@ -206,15 +206,15 @@ impl LiteSvm {
 
     #[napi(ts_return_type = "TransactionMetadata | FailedTransactionMetadata | null")]
     /// Gets a transaction from the transaction history.
-    pub fn get_transaction(&self, signature: Uint8Array) -> Option<TransactionResult> {
+    pub fn get_transaction(&self, signature: &[u8]) -> Option<TransactionResult> {
         self.0
-            .get_transaction(&Signature::try_from(signature.as_ref()).unwrap())
+            .get_transaction(&Signature::try_from(signature).unwrap())
             .map(|x| convert_transaction_result(x.clone()))
     }
 
     #[napi(ts_return_type = "TransactionMetadata | FailedTransactionMetadata | null")]
     /// Airdrops the account with the lamports specified.
-    pub fn airdrop(&mut self, pubkey: Uint8Array, lamports: BigInt) -> Result<TransactionResult> {
+    pub fn airdrop(&mut self, pubkey: &[u8], lamports: BigInt) -> Result<TransactionResult> {
         Ok(convert_transaction_result(self.0.airdrop(
             &convert_pubkey(pubkey),
             bigint_to_u64(&lamports)?,
@@ -223,7 +223,7 @@ impl LiteSvm {
 
     #[napi]
     /// Adds am SBF program to the test environment from the file specified.
-    pub fn add_program_from_file(&mut self, program_id: Uint8Array, path: String) -> Result<()> {
+    pub fn add_program_from_file(&mut self, program_id: &[u8], path: String) -> Result<()> {
         self.0
             .add_program_from_file(convert_pubkey(program_id), path)
             .map_err(|e| {
@@ -236,7 +236,7 @@ impl LiteSvm {
 
     #[napi]
     /// Adds am SBF program to the test environment.
-    pub fn add_program(&mut self, program_id: Uint8Array, program_bytes: &[u8]) -> Result<()> {
+    pub fn add_program(&mut self, program_id: &[u8], program_bytes: &[u8]) -> Result<()> {
         self.0
             .add_program(convert_pubkey(program_id), program_bytes)
             .map_err(|e| {
@@ -248,29 +248,29 @@ impl LiteSvm {
     }
 
     #[napi(ts_return_type = "TransactionMetadata | FailedTransactionMetadata")]
-    pub fn send_legacy_transaction(&mut self, tx_bytes: Uint8Array) -> TransactionResult {
-        let tx: Transaction = deserialize(&tx_bytes).unwrap();
+    pub fn send_legacy_transaction(&mut self, tx_bytes: &[u8]) -> TransactionResult {
+        let tx: Transaction = deserialize(tx_bytes).unwrap();
         let res = self.0.send_transaction(tx);
         convert_transaction_result(res)
     }
 
     #[napi(ts_return_type = "TransactionMetadata | FailedTransactionMetadata")]
-    pub fn send_versioned_transaction(&mut self, tx_bytes: Uint8Array) -> TransactionResult {
-        let tx: VersionedTransaction = deserialize(&tx_bytes).unwrap();
+    pub fn send_versioned_transaction(&mut self, tx_bytes: &[u8]) -> TransactionResult {
+        let tx: VersionedTransaction = deserialize(tx_bytes).unwrap();
         let res = self.0.send_transaction(tx);
         convert_transaction_result(res)
     }
 
     #[napi(ts_return_type = "SimulatedTransactionInfo | FailedTransactionMetadata")]
-    pub fn simulate_legacy_transaction(&mut self, tx_bytes: Uint8Array) -> SimulateResult {
-        let tx: Transaction = deserialize(&tx_bytes).unwrap();
+    pub fn simulate_legacy_transaction(&mut self, tx_bytes: &[u8]) -> SimulateResult {
+        let tx: Transaction = deserialize(tx_bytes).unwrap();
         let res = self.0.simulate_transaction(tx);
         convert_sim_result(res)
     }
 
     #[napi(ts_return_type = "SimulatedTransactionInfo | FailedTransactionMetadata")]
-    pub fn simulate_versioned_transaction(&mut self, tx_bytes: Uint8Array) -> SimulateResult {
-        let tx: VersionedTransaction = deserialize(&tx_bytes).unwrap();
+    pub fn simulate_versioned_transaction(&mut self, tx_bytes: &[u8]) -> SimulateResult {
+        let tx: VersionedTransaction = deserialize(tx_bytes).unwrap();
         let res = self.0.simulate_transaction(tx);
         convert_sim_result(res)
     }

crates/node-litesvm/src/lib.rs

@@ -1,7 +1,7 @@
 use {napi::bindgen_prelude::*, solana_hash::Hash, solana_pubkey::Pubkey, std::str::FromStr};
 
-pub(crate) fn convert_pubkey(address: Uint8Array) -> Pubkey {
-    Pubkey::try_from(address.as_ref()).unwrap()
+pub(crate) fn convert_pubkey(address: &[u8]) -> Pubkey {
+    Pubkey::try_from(address).unwrap()
 }
 
 pub(crate) fn try_parse_hash(raw: &str) -> Result<Hash> {

crates/node-litesvm/src/util.rs

@@ -525,10 +525,10 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@napi-rs/cli@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-3.1.4.tgz#13000ad4fab5a8f4ad39145ad352c64511367c83"
-  integrity sha512-XwYu7XB9KfL0ChFc90j9/XQJzbSGlMa5Alhgx7J13r+hxo/INS0lp1jRy1dQa7pb7Tr7fPLX6fR6JH78qfXqqg==
+"@napi-rs/cli@^3.1.5":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-3.1.5.tgz#6c3c297b3b0e7b1ad08393f124e438e8c930dae7"
+  integrity sha512-Wn6ZPw27qJiEWglGjkaAa70AHuLtyPya6FvjINYJ5U20uvbRhoB0Ta2+bFTAFfUb9R+wvuFvog9JQdy65OmFAQ==
   dependencies:
     "@inquirer/prompts" "^7.4.0"
     "@napi-rs/cross-toolchain" "^1.0.0"