Bindings dirs (#124)

* bindings dir for python

* rpc/wrpc/wasm -> rpc/wrpc/bindings/wasm

* wallet/core/src/wasm -> wallet/core/src/bindings/wasm/

* crypto/txscript/src/wasm -> crypto/txscript/src/bindings/wasm

* rpc/core/src/wasm -> rpc/core/src/bindings/wasm

Cargo.toml

@@ -39,8 +39,8 @@ members = [
     "rpc/wrpc/server",
     "rpc/wrpc/client",
     "rpc/wrpc/proxy",
-    "rpc/wrpc/python",
-    "rpc/wrpc/wasm",
+    "rpc/wrpc/bindings/python",
+    "rpc/wrpc/bindings/wasm",
     "rpc/wrpc/examples/subscriber",
     "rpc/wrpc/examples/simple_client",
     "mining",
@@ -137,9 +137,9 @@ kaspa-wasm = { version = "0.15.2", path = "wasm" }
 kaspa-wasm-core = { version = "0.15.2", path = "wasm/core" }
 kaspa-wrpc-client = { version = "0.15.2", path = "rpc/wrpc/client" }
 kaspa-wrpc-proxy = { version = "0.15.2", path = "rpc/wrpc/proxy" }
-kaspa-wrpc-python = { version = "0.15.2", path = "rpc/wrpc/python" }
+kaspa-wrpc-python = { version = "0.15.2", path = "rpc/wrpc/bindings/python" }
 kaspa-wrpc-server = { version = "0.15.2", path = "rpc/wrpc/server" }
-kaspa-wrpc-wasm = { version = "0.15.2", path = "rpc/wrpc/wasm" }
+kaspa-wrpc-wasm = { version = "0.15.2", path = "rpc/wrpc/bindings/wasm" }
 kaspa-wrpc-example-subscriber = { version = "0.15.2", path = "rpc/wrpc/examples/subscriber" }
 kaspad = { version = "0.15.2", path = "kaspad" }
 kaspa-alloc = { version = "0.15.2", path = "utils/alloc" }

crypto/txscript/src/bindings/mod.rs

@@ -0,0 +1,7 @@
+pub mod opcodes;
+
+#[cfg(feature = "py-sdk")]
+pub mod python;
+
+#[cfg(any(feature = "wasm32-core", feature = "wasm32-sdk"))]
+pub mod wasm;

crypto/txscript/src/python/builder.rs → crypto/txscript/src/bindings/python/builder.rs

@@ -1,4 +1,4 @@
-use crate::wasm::opcodes::Opcodes;
+use crate::bindings::opcodes::Opcodes;
 use crate::{script_builder as native, standard};
 use kaspa_consensus_core::tx::ScriptPublicKey;
 use kaspa_python_core::types::PyBinary;

crypto/txscript/src/bindings/python/mod.rs

@@ -0,0 +1,2 @@
+pub mod builder;
+pub use self::builder::*;

crypto/txscript/src/wasm/mod.rs → crypto/txscript/src/bindings/wasm/mod.rs

@@ -6,12 +6,10 @@ use cfg_if::cfg_if;
 
 cfg_if! {
     if #[cfg(any(feature = "wasm32-sdk", feature = "wasm32-core"))] {
-        pub mod opcodes;
+        // pub mod opcodes;
         pub mod builder;
 
-        pub use self::opcodes::*;
+        pub use crate::bindings::opcodes::*;
         pub use self::builder::*;
-    } else if #[cfg(feature = "py-sdk")] {
-        pub mod opcodes;
     }
 }

crypto/txscript/src/lib.rs

@@ -1,18 +1,16 @@
 extern crate alloc;
 extern crate core;
 
+#[cfg(any(feature = "wasm32-sdk", feature = "py-sdk", feature = "py-sdk"))]
+pub mod bindings;
 pub mod caches;
 mod data_stack;
 pub mod error;
 pub mod opcodes;
-#[cfg(feature = "py-sdk")]
-pub mod python;
 pub mod result;
 pub mod script_builder;
 pub mod script_class;
 pub mod standard;
-#[cfg(any(feature = "wasm32-sdk", feature = "py-sdk"))]
-pub mod wasm;
 
 use crate::caches::Cache;
 use crate::data_stack::{DataStack, Stack};

python/src/lib.rs

@@ -29,24 +29,24 @@ cfg_if::cfg_if! {
             m.add_class::<kaspa_bip32::Language>()?;
             m.add_class::<kaspa_bip32::Mnemonic>()?;
 
-            m.add_class::<kaspa_txscript::python::ScriptBuilder>()?;
-            m.add_class::<kaspa_txscript::wasm::opcodes::Opcodes>()?;
+            m.add_class::<kaspa_txscript::bindings::python::ScriptBuilder>()?;
+            m.add_class::<kaspa_txscript::bindings::opcodes::Opcodes>()?;
 
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::message::py_sign_message, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::message::py_verify_message, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::signer::py_sign_transaction, m)?)?;
-            m.add_class::<kaspa_wallet_core::python::tx::generator::generator::Generator>()?;
-            m.add_class::<kaspa_wallet_core::python::tx::generator::pending::PendingTransaction>()?;
-            m.add_class::<kaspa_wallet_core::python::tx::generator::summary::GeneratorSummary>()?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::tx::mass::calculate_unsigned_transaction_fee, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::tx::mass::calculate_unsigned_transaction_mass, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::tx::mass::update_unsigned_transaction_mass, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::tx::utils::create_transaction_py, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::tx::utils::create_transactions_py, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::tx::utils::estimate_transactions_py, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::utils::kaspa_to_sompi, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::utils::sompi_to_kaspa, m)?)?;
-            m.add_function(wrap_pyfunction!(kaspa_wallet_core::python::utils::sompi_to_kaspa_string_with_suffix, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::message::py_sign_message, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::message::py_verify_message, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::signer::py_sign_transaction, m)?)?;
+            m.add_class::<kaspa_wallet_core::bindings::python::tx::generator::generator::Generator>()?;
+            m.add_class::<kaspa_wallet_core::bindings::python::tx::generator::pending::PendingTransaction>()?;
+            m.add_class::<kaspa_wallet_core::bindings::python::tx::generator::summary::GeneratorSummary>()?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::tx::mass::calculate_unsigned_transaction_fee, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::tx::mass::calculate_unsigned_transaction_mass, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::tx::mass::update_unsigned_transaction_mass, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::tx::utils::create_transaction_py, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::tx::utils::create_transactions_py, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::tx::utils::estimate_transactions_py, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::utils::kaspa_to_sompi, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::utils::sompi_to_kaspa, m)?)?;
+            m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::utils::sompi_to_kaspa_string_with_suffix, m)?)?;
             m.add_class::<kaspa_wallet_core::tx::payment::PaymentOutput>()?;
 
             m.add_class::<kaspa_wallet_keys::derivation_path::DerivationPath>()?;

rpc/core/src/bindings/mod.rs

@@ -0,0 +1,5 @@
+#[cfg(feature = "py-sdk")]
+pub mod python;
+
+#[cfg(feature = "wasm32-sdk")]
+pub mod wasm;

rpc/core/src/lib.rs

@@ -2,13 +2,13 @@
 #![recursion_limit = "256"]
 
 pub mod api;
+#[cfg(any(feature = "wasm32-sdk", feature = "py-sdk"))]
+pub mod bindings;
 pub mod convert;
 pub mod error;
 pub mod model;
 pub mod notify;
-#[cfg(feature = "py-sdk")]
-pub mod python;
-pub mod wasm;
+// pub mod wasm;
 
 pub mod prelude {
     pub use super::api::notifications::*;

rpc/wrpc/wasm/src/client.rs → rpc/wrpc/bindings/wasm/src/client.rs

@@ -12,7 +12,7 @@ use kaspa_notify::events::EventType;
 use kaspa_notify::listener;
 use kaspa_notify::notification::Notification as NotificationT;
 use kaspa_rpc_core::api::ctl;
-pub use kaspa_rpc_core::wasm::message::*;
+pub use kaspa_rpc_core::bindings::wasm::message::*;
 pub use kaspa_rpc_macros::{
     build_wrpc_wasm_bindgen_interface, build_wrpc_wasm_bindgen_subscriptions, declare_typescript_wasm_interface as declare,
 };

wallet/core/src/bindings/mod.rs

@@ -0,0 +1,5 @@
+#[cfg(feature = "py-sdk")]
+pub mod python;
+
+#[cfg(any(feature = "wasm32-sdk", feature = "wasm32-core"))]
+pub mod wasm;

wallet/core/src/python/signer.rs → wallet/core/src/bindings/python/signer.rs

@@ -1,5 +1,5 @@
+use crate::bindings::wasm::signer::{sign_hash, sign_transaction};
 use crate::imports::*;
-use crate::wasm::signer::{sign_hash, sign_transaction};
 use kaspa_consensus_client::Transaction;
 use kaspa_consensus_core::hashing::wasm::SighashType;
 use kaspa_consensus_core::sign::sign_input;

wallet/core/src/python/tx/generator/generator.rs → wallet/core/src/bindings/python/tx/generator/generator.rs

@@ -1,6 +1,6 @@
+use crate::bindings::python::tx::generator::pending::PendingTransaction;
+use crate::bindings::python::tx::generator::summary::GeneratorSummary;
 use crate::imports::*;
-use crate::python::tx::generator::pending::PendingTransaction;
-use crate::python::tx::generator::summary::GeneratorSummary;
 use crate::tx::{generator as native, Fees, PaymentDestination, PaymentOutput, PaymentOutputs};
 
 pub struct PyUtxoEntries {

wallet/core/src/python/tx/utils.rs → wallet/core/src/bindings/python/tx/utils.rs

@@ -1,5 +1,5 @@
+use crate::bindings::python::tx::generator::{Generator, GeneratorSummary, PendingTransaction, PyOutputs, PyUtxoEntries};
 use crate::imports::*;
-use crate::python::tx::generator::{Generator, GeneratorSummary, PendingTransaction, PyOutputs, PyUtxoEntries};
 use kaspa_consensus_client::*;
 use kaspa_consensus_core::subnets::SUBNETWORK_ID_NATIVE;
 

wallet/core/src/wasm/api/message.rs → wallet/core/src/bindings/wasm/api/message.rs

@@ -3,10 +3,10 @@
 use super::extensions::*;
 use crate::account::descriptor::IAccountDescriptor;
 use crate::api::message::*;
+use crate::bindings::wasm::tx::fees::IFees;
+use crate::bindings::wasm::tx::GeneratorSummary;
 use crate::imports::*;
 use crate::tx::{Fees, PaymentDestination, PaymentOutputs};
-use crate::wasm::tx::fees::IFees;
-use crate::wasm::tx::GeneratorSummary;
 use js_sys::Array;
 use serde_wasm_bindgen::from_value;
 use workflow_wasm::serde::to_value;

wallet/core/src/wasm/tx/generator/generator.rs → wallet/core/src/bindings/wasm/tx/generator/generator.rs

@@ -1,11 +1,11 @@
+use crate::bindings::wasm::tx::generator::*;
+use crate::bindings::wasm::tx::IFees;
 use crate::imports::*;
 use crate::result::Result;
 use crate::tx::{generator as native, Fees, PaymentDestination, PaymentOutputs};
 use crate::utxo::{TryIntoUtxoEntryReferences, UtxoEntryReference};
-use crate::wasm::tx::generator::*;
-use crate::wasm::tx::IFees;
 // use crate::wasm::wallet::Account;
-use crate::wasm::UtxoContext;
+use crate::bindings::wasm::UtxoContext;
 
 // TODO-WASM fix outputs
 #[wasm_bindgen(typescript_custom_section)]

wallet/core/src/wasm/tx/generator/pending.rs → wallet/core/src/bindings/wasm/tx/generator/pending.rs

@@ -1,7 +1,7 @@
+use crate::bindings::wasm::PrivateKeyArrayT;
 use crate::imports::*;
 use crate::result::Result;
 use crate::tx::generator as native;
-use crate::wasm::PrivateKeyArrayT;
 use kaspa_consensus_client::{numeric, string};
 use kaspa_consensus_client::{Transaction, TransactionT};
 use kaspa_consensus_core::hashing::wasm::SighashType;

wallet/core/src/wasm/tx/utils.rs → wallet/core/src/bindings/wasm/tx/utils.rs

@@ -1,7 +1,7 @@
+use crate::bindings::wasm::tx::generator::*;
 use crate::imports::*;
 use crate::result::Result;
 use crate::tx::{IPaymentOutputArray, PaymentOutputs};
-use crate::wasm::tx::generator::*;
 use kaspa_consensus_client::*;
 use kaspa_consensus_core::subnets::SUBNETWORK_ID_NATIVE;
 use kaspa_wallet_macros::declare_typescript_wasm_interface as declare;

wallet/core/src/wasm/utxo/context.rs → wallet/core/src/bindings/wasm/utxo/context.rs

@@ -1,9 +1,9 @@
+use crate::bindings::wasm::utxo::UtxoProcessor;
+use crate::bindings::wasm::{Balance, BalanceStrings};
 use crate::imports::*;
 use crate::result::Result;
 use crate::utxo as native;
 use crate::utxo::{UtxoContextBinding, UtxoContextId};
-use crate::wasm::utxo::UtxoProcessor;
-use crate::wasm::{Balance, BalanceStrings};
 use kaspa_addresses::AddressOrStringArrayT;
 use kaspa_consensus_client::UtxoEntryReferenceArrayT;
 use kaspa_hashes::Hash;

wallet/core/src/wasm/utxo/processor.rs → wallet/core/src/bindings/wasm/utxo/processor.rs

@@ -1,9 +1,11 @@
+use crate::bindings::wasm::notify::{
+    UtxoProcessorEventTarget, UtxoProcessorNotificationCallback, UtxoProcessorNotificationTypeOrCallback,
+};
 use crate::error::Error;
 use crate::events::{EventKind, Events};
 use crate::imports::*;
 use crate::result::Result;
 use crate::utxo as native;
-use crate::wasm::notify::{UtxoProcessorEventTarget, UtxoProcessorNotificationCallback, UtxoProcessorNotificationTypeOrCallback};
 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};

wallet/core/src/wasm/wallet/wallet.rs → wallet/core/src/bindings/wasm/wallet/wallet.rs

@@ -1,8 +1,8 @@
+use crate::bindings::wasm::notify::{WalletEventTarget, WalletNotificationCallback, WalletNotificationTypeOrCallback};
 use crate::imports::*;
 use crate::storage::local::interface::LocalStore;
 use crate::storage::WalletDescriptor;
 use crate::wallet as native;
-use crate::wasm::notify::{WalletEventTarget, WalletNotificationCallback, WalletNotificationTypeOrCallback};
 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};

wallet/core/src/lib.rs

@@ -111,11 +111,8 @@ pub mod wallet;
 
 // }
 
-#[cfg(any(feature = "wasm32-sdk", feature = "wasm32-core"))]
-pub mod wasm;
-
-#[cfg(feature = "py-sdk")]
-pub mod python;
+#[cfg(any(feature = "wasm32-sdk", feature = "wasm32-core", feature = "py-sdk"))]
+pub mod bindings;
 
 /// Returns the version of the Wallet framework.
 pub fn version() -> String {

wasm/src/lib.rs

@@ -145,7 +145,7 @@ cfg_if::cfg_if! {
         pub use kaspa_addresses::{Address, Version as AddressVersion};
         pub use kaspa_consensus_core::tx::{ScriptPublicKey, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput};
         pub use kaspa_pow::wasm::*;
-        pub use kaspa_txscript::wasm::*;
+        pub use kaspa_txscript::bindings::wasm::*;
 
         pub mod rpc {
             //! Kaspa RPC interface
@@ -156,7 +156,7 @@ cfg_if::cfg_if! {
                 pub use kaspa_rpc_core::model::message::*;
             }
             pub use kaspa_rpc_core::api::rpc::RpcApi;
-            pub use kaspa_rpc_core::wasm::message::*;
+            pub use kaspa_rpc_core::bindings::wasm::message::*;
 
             pub use kaspa_wrpc_wasm::client::*;
             pub use kaspa_wrpc_wasm::resolver::*;
@@ -165,14 +165,14 @@ cfg_if::cfg_if! {
 
         pub use kaspa_consensus_wasm::*;
         pub use kaspa_wallet_keys::prelude::*;
-        pub use kaspa_wallet_core::wasm::*;
+        pub use kaspa_wallet_core::bindings::wasm::*;
 
     } else if #[cfg(feature = "wasm32-core")] {
 
         pub use kaspa_addresses::{Address, Version as AddressVersion};
         pub use kaspa_consensus_core::tx::{ScriptPublicKey, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput};
         pub use kaspa_pow::wasm::*;
-        pub use kaspa_txscript::wasm::*;
+        pub use kaspa_txscript::bindings::wasm::*;
 
         pub mod rpc {
             //! Kaspa RPC interface
@@ -183,7 +183,7 @@ cfg_if::cfg_if! {
                 pub use kaspa_rpc_core::model::message::*;
             }
             pub use kaspa_rpc_core::api::rpc::RpcApi;
-            pub use kaspa_rpc_core::wasm::message::*;
+            pub use kaspa_rpc_core::bindings::wasm::message::*;
 
             pub use kaspa_wrpc_wasm::client::*;
             pub use kaspa_wrpc_wasm::resolver::*;
@@ -192,13 +192,13 @@ cfg_if::cfg_if! {
 
         pub use kaspa_consensus_wasm::*;
         pub use kaspa_wallet_keys::prelude::*;
-        pub use kaspa_wallet_core::wasm::*;
+        pub use kaspa_wallet_core::bindings::wasm::*;
 
     } else if #[cfg(feature = "wasm32-rpc")] {
 
         pub use kaspa_rpc_core::api::rpc::RpcApi;
-        pub use kaspa_rpc_core::wasm::message::*;
-        pub use kaspa_rpc_core::wasm::message::IPingRequest;
+        pub use kaspa_rpc_core::bindings::wasm::message::*;
+        pub use kaspa_rpc_core::bindings::wasm::message::IPingRequest;
         pub use kaspa_wrpc_wasm::client::*;
         pub use kaspa_wrpc_wasm::resolver::*;
         pub use kaspa_wrpc_wasm::notify::*;