Merge pull request #70 from diba-io/rgb-core-HT-api-changes

Embedded RGB fixes

Author: cryptoquick

Cargo.lock

@@ -21,22 +21,23 @@ web = []
 
 [dependencies]
 anyhow = "1.0.44"
+base64 = { package = "base64-compat", version = "1.0.0" }
 bip39 = "1.0.1"
 bitcoin = "0.28.1"
 console_error_panic_hook = "0.1.6"
 descriptor-wallet = { version = "0.8.3", features = ["descriptors", "serde"] }
 directories = "4.0"
 futures = "0.3.17"
 getrandom = { version = "0.2.3", features = ["js"] }
-base64 = { package = "base64-compat", version = "1.0.0" }
+hex = "0.4.3"
 lazy_static = "1.4.0"
 log = "0.4.17"
 once_cell = "1.9.0"
 regex = "1"
 serde = "1.0.130"
 serde_json = "1.0.68"
 serde-encrypt = "0.7.0"
-tokio = { version = "1.20.1" }
+tokio = { version = "1.20.1", features = ["macros"] }
 pretty_env_logger = "0.4.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -85,4 +86,4 @@ strict_encoding = { version = "0.8.1", features = [
 wasm-bindgen-test = "0.3.13"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1.20.1", features = ["full"] }

Cargo.toml

@@ -44,12 +44,11 @@ pub static NODE_SERVER_BASE_URL: Lazy<String> = Lazy::new(|| dot_env("NODE_SERVE
 
 // Descriptor strings
 // For SATS
-pub const BTC_PATH: &str = "m/86h/1h/0h/0";
-pub const BTC_CHANGE_PATH: &str = "m/86h/1h/0h/1";
+pub const BTC_PATH: &str = "m/86h/1h/0h";
 // For TOKENS ---> that's provisional, it will be replace for RGB final guidelines
-pub const RGB_TOKENS_PATH: &str = "m/168h/20h/0h/0h";
+pub const RGB_ASSETS_PATH: &str = "m/168h/20h/0h";
 // For UDAS ---> that's provisional, it will be replace for RGB final guidelines
-pub const RGB_NFTS_PATH: &str = "m/168h/21h/0h/0h";
+pub const RGB_UDAS_PATH: &str = "m/168h/21h/0h";
 
 pub static NETWORK: Lazy<RwLock<Network>> = Lazy::new(|| {
     RwLock::new(Network::Testnet) // TODO: Change default to mainnet

src/data/constants.rs

@@ -1,6 +1,26 @@
 use bitcoin::{util::address::Address, OutPoint, Txid};
 use serde::{Deserialize, Serialize};
 
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct VaultData {
+    pub btc_descriptor: String,
+    pub btc_change_descriptor: String,
+    pub rgb_assets_descriptor: String,
+    pub rgb_udas_descriptor: String,
+    pub xpubkh: String,
+    pub mnemonic: String,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct FundVaultDetails {
+    pub txid: String,
+    pub assets: String,
+    pub assets_change: String,
+    pub udas: String,
+    pub udas_change: String,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Issue {
     pub id: String,