support btc drivation path as well as rgb

Author: sheb-gregor

Makefile

@@ -73,7 +73,8 @@ ifeq ($(BITCOIN_NETWORK),testnet)
 
     # Bitcoin testnet, no legacy support
     DEFINES   += BIP32_PUBKEY_VERSION=0x043587CF
-    DEFINES   += BIP44_COIN_TYPE=1
+    DEFINES   += BIP44_COIN_TYPE=827167
+    DEFINES   += BIP44_BTC_COIN_TYPE=1
     DEFINES   += COIN_P2PKH_VERSION=111
     DEFINES   += COIN_P2SH_VERSION=196
     DEFINES   += COIN_NATIVE_SEGWIT_PREFIX=\"tb\"
@@ -91,7 +92,8 @@ else ifeq ($(BITCOIN_NETWORK),mainnet)
 
     # Bitcoin mainnet, no legacy support
     DEFINES   += BIP32_PUBKEY_VERSION=0x0488B21E
-    DEFINES   += BIP44_COIN_TYPE=0
+    DEFINES   += BIP44_COIN_TYPE=827166
+    DEFINES   += BIP44_BTC_COIN_TYPE=0
     DEFINES   += COIN_P2PKH_VERSION=0
     DEFINES   += COIN_P2SH_VERSION=5
     DEFINES   += COIN_NATIVE_SEGWIT_PREFIX=\"bc\"

bitcoin_client_rs/src/wallet.rs

@@ -296,7 +296,7 @@ mod tests {
     use core::str::FromStr;
 
     const MASTER_KEY_EXAMPLE: &str = "[5c9e228d]tpubDEGquuorgFNb8bjh5kNZQMPtABJzoWwNm78FUmeoPkfRtoPF7JLrtoZeT3J3ybq1HmC3Rn1Q8wFQ8J5usanzups5rj7PJoQLNyvq8QbJruW/**";
-    const KEY_EXAMPLE: &str = "[5c9e228d/48'/1'/0'/0']tpubDEGquuorgFNb8bjh5kNZQMPtABJzoWwNm78FUmeoPkfRtoPF7JLrtoZeT3J3ybq1HmC3Rn1Q8wFQ8J5usanzups5rj7PJoQLNyvq8QbJruW/**";
+    const KEY_EXAMPLE: &str = "[5c9e228d/48'/827167'/0'/0']tpubDEGquuorgFNb8bjh5kNZQMPtABJzoWwNm78FUmeoPkfRtoPF7JLrtoZeT3J3ybq1HmC3Rn1Q8wFQ8J5usanzups5rj7PJoQLNyvq8QbJruW/**";
 
     #[test]
     fn test_master_walletpubkey_fromstr() {
@@ -319,7 +319,7 @@ mod tests {
         );
         assert_eq!(
             key.source.as_ref().unwrap().1,
-            DerivationPath::from_str("m/48'/1'/0'/0'").unwrap()
+            DerivationPath::from_str("m/48'/827167'/0'/0'").unwrap()
         );
         assert_eq!(key.inner, Xpub::from_str("tpubDEGquuorgFNb8bjh5kNZQMPtABJzoWwNm78FUmeoPkfRtoPF7JLrtoZeT3J3ybq1HmC3Rn1Q8wFQ8J5usanzups5rj7PJoQLNyvq8QbJruW").unwrap());
         assert_eq!(key.multipath, Some("/**".to_string()));

src/handler/get_extended_pubkey.c

@@ -83,7 +83,7 @@ static bool is_path_safe_for_pubkey_export(const uint32_t bip32_path[], size_t b
     }
 
     uint32_t coin_type = bip32_path[1] & 0x7FFFFFFF;
-    if (coin_type != BIP44_COIN_TYPE) {
+    if (coin_type != BIP44_COIN_TYPE && coin_type != BIP44_BTC_COIN_TYPE) {
         return false;
     }
 

src/handler/lib/policy.c

@@ -1498,7 +1498,8 @@ bool is_wallet_policy_standard(dispatcher_context_t *dispatcher_context,
     const uint32_t H = BIP32_FIRST_HARDENED_CHILD;
     if (key_info.master_key_derivation_len != 3 ||
         key_info.master_key_derivation[0] != H + bip44_purpose ||
-        key_info.master_key_derivation[1] != H + BIP44_COIN_TYPE ||
+        (key_info.master_key_derivation[1] != H + BIP44_COIN_TYPE &&
+        key_info.master_key_derivation[1] != H + BIP44_BTC_COIN_TYPE) ||
         key_info.master_key_derivation[2] < H ||
         key_info.master_key_derivation[2] > H + MAX_BIP44_ACCOUNT_RECOMMENDED) {
         return false;

src/handler/sign_psbt.c

@@ -954,6 +954,13 @@ preprocess_outputs(dispatcher_context_t *dc,
 
         output.in_out.scriptPubKey_len = result_len;
 
+        // --- RGB/RGB OP_RETURN logic ---
+        if (is_opreturn(output.in_out.scriptPubKey, output.in_out.scriptPubKey_len)) {
+            // Allow OP_RETURN outputs (for RGB or other protocols)
+            continue;
+        }
+        // --- End RGB logic ---
+
         int is_internal = is_in_out_internal(dc, st, sign_psbt_cache, &output.in_out, false);
 
         if (is_internal < 0) {