Merge branch 'gamma' into gamma-dev

aspectron · Dec 9, 2024 · 36d3ea2 · 36d3ea2
2 parents 8112be1 + 79cebc0
commit 36d3ea2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/rpc/wrpc/wasm/src/client.rs b/rpc/wrpc/wasm/src/client.rs
@@ -351,8 +351,8 @@ impl RpcClient {
     /// Set the network id for the RPC client.
     /// This setting will take effect on the next connection.
     #[wasm_bindgen(js_name = setNetworkId)]
-    pub fn set_network_id(&self, network_id: &NetworkId) -> Result<()> {
-        self.inner.client.set_network_id(network_id)?;
+    pub fn set_network_id(&self, network_id: &NetworkIdT) -> Result<()> {
+        self.inner.client.set_network_id(&network_id.try_into_owned()?)?;
         Ok(())
     }
 

diff --git a/wallet/core/src/wasm/wallet/wallet.rs b/wallet/core/src/wasm/wallet/wallet.rs
@@ -3,6 +3,7 @@ use crate::storage::local::interface::LocalStore;
 use crate::storage::WalletDescriptor;
 use crate::wallet as native;
 use crate::wasm::notify::{WalletEventTarget, WalletNotificationCallback, WalletNotificationTypeOrCallback};
+use kaspa_consensus_core::network::NetworkIdT;
 use kaspa_wallet_macros::declare_typescript_wasm_interface as declare;
 use kaspa_wasm_core::events::{get_event_targets, Sink};
 use kaspa_wrpc_wasm::{IConnectOptions, Resolver, RpcClient, RpcConfig, WrpcEncoding};
@@ -264,6 +265,12 @@ impl Wallet {
         }
         Ok(())
     }
+
+    #[wasm_bindgen(js_name = "setNetworkId")]
+    pub fn set_network_id(&self, network_id: NetworkIdT) -> Result<()> {
+        self.inner.wallet.set_network_id(&network_id.try_into_owned()?)?;
+        Ok(())
+    }
 }
 
 impl Wallet {