fix(wasm-utxo): correct paygo address validation in tests

This commit fixes an issue with PayGo attestation validation by updating
the test address from "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c" to
"1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c" and its corresponding script
pubkey. Enables proper signature verification in tests that were
previously failing or ignored.

Issue: BTC-2650

Co-authored-by: llm-git <llm-git@ttll.de>

Author: OttoAllmendinger

packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/mod.rs

@@ -3979,7 +3979,7 @@ mod tests {
         psbt.unsigned_tx.output.push(miniscript::bitcoin::TxOut {
             value: miniscript::bitcoin::Amount::from_sat(10000),
             script_pubkey: miniscript::bitcoin::ScriptBuf::from_hex(
-                "76a91479b000887626b294a914501a4cd226b58b23598388ac",
+                "76a9147f90f63fed017815f1da8bea299da27945a17bda88ac",
             )
             .unwrap(),
         });
@@ -3998,7 +3998,7 @@ mod tests {
         assert!(result.is_ok(), "Should add attestation successfully");
 
         // Extract and verify
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c";
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c";
         let psbt = bitgo_psbt.psbt();
 
         // Verify it was added (with address, no verification)
@@ -4091,9 +4091,9 @@ mod tests {
         psbt.unsigned_tx.output.push(miniscript::bitcoin::TxOut {
             value: miniscript::bitcoin::Amount::from_sat(10000),
             script_pubkey: miniscript::bitcoin::ScriptBuf::from_hex(
-                "76a91479b000887626b294a914501a4cd226b58b23598388ac",
+                "76a9147f90f63fed017815f1da8bea299da27945a17bda88ac",
             )
-            .unwrap(), // Address: 1CdWUVacSQQJ617HuNWByGiisEGXGNx2c
+            .unwrap(), // Address: 1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c
         });
 
         // Add PayGo attestation
@@ -4122,15 +4122,12 @@ mod tests {
                 .unwrap();
         let pubkey = secp256k1::PublicKey::from_slice(&pubkey_bytes).unwrap();
 
-        // Note: Signature verification with bitcoinjs-message format is not fully working yet
-        // So parsing with pubkey will fail validation
-        let parsed_result = bitgo_psbt.parse_outputs_with_wallet_keys(&wallet_keys, &[pubkey]);
+        let parsed_result = bitgo_psbt
+            .parse_outputs_with_wallet_keys(&wallet_keys, &[pubkey])
+            .unwrap();
 
-        // We expect this to fail validation for now
-        assert!(
-            parsed_result.is_err(),
-            "Expected verification to fail with current signature format"
-        );
+        // The PayGo output should have paygo: true (verified)
+        assert!(parsed_result[output_index].paygo);
     }
 
     crate::test_psbt_fixtures!(test_parse_transaction_with_wallet_keys, network, format, {

packages/wasm-utxo/src/paygo/attestation.rs

@@ -65,7 +65,7 @@ mod tests {
     fn test_new_valid_entropy() {
         let entropy = vec![0u8; 64];
         let signature = vec![1u8; 65];
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c".to_string();
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c".to_string();
 
         let attestation =
             PayGoAttestation::new(entropy.clone(), signature.clone(), address.clone());
@@ -81,7 +81,7 @@ mod tests {
     fn test_new_invalid_entropy_length() {
         let entropy = vec![0u8; 32]; // Wrong length
         let signature = vec![1u8; 65];
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c".to_string();
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c".to_string();
 
         let result = PayGoAttestation::new(entropy, signature, address);
         assert!(result.is_err());
@@ -99,23 +99,23 @@ mod tests {
              b722b6d0d9adbab782d2d0d66402794b6bd6449dc26f634035ee388a2b5e7b53f6",
         )
         .unwrap();
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c".to_string();
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c".to_string();
 
         let attestation = PayGoAttestation::new(entropy, signature, address.clone()).unwrap();
         let message = attestation.to_message();
 
-        // Message should be: 64 bytes entropy + 33 bytes address + 36 bytes UUID = 133 bytes
-        assert_eq!(message.len(), 133);
+        // Message should be: 64 bytes entropy + 34 bytes address + 36 bytes UUID = 134 bytes
+        assert_eq!(message.len(), 134);
 
         // Verify components
         let entropy_part = &message[0..64];
-        let address_part = &message[64..97];
-        let uuid_part = &message[97..133];
+        let address_part = &message[64..98];
+        let uuid_part = &message[98..134];
 
         assert_eq!(entropy_part, &vec![0u8; 64][..]);
         assert_eq!(
             std::str::from_utf8(address_part).unwrap(),
-            "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c"
+            "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c"
         );
         assert_eq!(
             std::str::from_utf8(uuid_part).unwrap(),

packages/wasm-utxo/src/paygo/psbt.rs

@@ -196,7 +196,7 @@ mod tests {
     #[test]
     fn test_extract_paygo_attestation_success() {
         let output = create_test_output_with_attestation();
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c";
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c";
 
         let result = extract_paygo_attestation(&output, address);
         assert!(result.is_ok());
@@ -210,7 +210,7 @@ mod tests {
     #[test]
     fn test_extract_paygo_attestation_not_found() {
         let output = Output::default();
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c";
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c";
 
         let result = extract_paygo_attestation(&output, address);
         assert!(result.is_err());
@@ -236,7 +236,7 @@ mod tests {
             output.proprietary.insert(key, signature);
         }
 
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c";
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c";
         let result = extract_paygo_attestation(&output, address);
         assert!(result.is_err());
         assert!(result
@@ -320,7 +320,7 @@ mod tests {
              b722b6d0d9adbab782d2d0d66402794b6bd6449dc26f634035ee388a2b5e7b53f6",
         )
         .unwrap();
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c";
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c";
         let pubkey_bytes =
             hex::decode("02456f4f788b6af55eb9c54d88692cadef4babdbc34cde75218cc1d6b6de3dea2d")
                 .unwrap();
@@ -337,10 +337,8 @@ mod tests {
         assert_eq!(attestation.address, address);
 
         // Verify with pubkeys
-        // Note: Signature verification is not fully working yet with bitcoinjs-message format
-        // For now, we just verify the function runs without panic
         let result = has_paygo_attestation_verify(&output, Some(address), &[pubkey]);
-        // The verification may fail, but should not panic
-        let _ = result;
+        assert!(result.is_ok());
+        assert!(result.unwrap(), "Signature should be valid");
     }
 }

packages/wasm-utxo/src/paygo/verify.rs

@@ -106,10 +106,7 @@ mod tests {
     use super::*;
     use crate::paygo::PayGoAttestation;
 
-    // TODO: Fix signature verification test - the recovery algorithm needs adjustment
-    // to match bitcoinjs-message format
     #[test]
-    #[ignore]
     fn test_verify_valid_signature() {
         use secp256k1::PublicKey;
 
@@ -120,7 +117,7 @@ mod tests {
              b722b6d0d9adbab782d2d0d66402794b6bd6449dc26f634035ee388a2b5e7b53f6",
         )
         .unwrap();
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c".to_string();
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c".to_string();
         let pubkey_bytes =
             hex::decode("02456f4f788b6af55eb9c54d88692cadef4babdbc34cde75218cc1d6b6de3dea2d")
                 .unwrap();
@@ -144,7 +141,7 @@ mod tests {
              b722b6d0d9adbab782d2d0d66402794b6bd6449dc26f634035ee388a2b5e7b53f6",
         )
         .unwrap();
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c".to_string();
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c".to_string();
 
         // Different public key
         let wrong_pubkey_bytes =
@@ -165,7 +162,7 @@ mod tests {
 
         let entropy = vec![0u8; 64];
         let signature = vec![1u8; 32]; // Too short
-        let address = "1CdWUVacSQQJ617HuNWByGiisEGXGNx2c".to_string();
+        let address = "1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c".to_string();
         let pubkey_bytes =
             hex::decode("02456f4f788b6af55eb9c54d88692cadef4babdbc34cde75218cc1d6b6de3dea2d")
                 .unwrap();

packages/wasm-utxo/src/wasm/try_into_js_value.rs

@@ -80,6 +80,12 @@ impl<T: TryIntoJsValue> TryIntoJsValue for Option<T> {
     }
 }
 
+impl TryIntoJsValue for bool {
+    fn try_to_js_value(&self) -> Result<JsValue, WasmUtxoError> {
+        Ok(JsValue::from_bool(*self))
+    }
+}
+
 impl TryIntoJsValue for XOnlyPublicKey {
     fn try_to_js_value(&self) -> Result<JsValue, WasmUtxoError> {
         Ok(JsValue::from_str(&self.to_string()))
@@ -367,7 +373,8 @@ impl TryIntoJsValue for crate::fixed_script_wallet::bitgo_psbt::ParsedOutput {
             "address" => self.address.clone(),
             "script" => self.script.clone(),
             "value" => self.value,
-            "scriptId" => self.script_id
+            "scriptId" => self.script_id,
+            "paygo" => self.paygo
         )
     }
 }

packages/wasm-utxo/test/fixedScript/paygoAttestation.ts

@@ -11,9 +11,9 @@ describe("PayGo Attestation", function () {
       hash: Buffer.alloc(32, 0),
       index: 0,
     });
-    // Add output with script_pubkey for address 1CdWUVacSQQJ617HuNWByGiisEGXGNx2c
+    // Add output with script_pubkey for address 1CdWUVacSQQJ617HfuNWByGiisEGXGNx2c
     psbt.addOutput({
-      script: Buffer.from("76a91479b000887626b294a914501a4cd226b58b23598388ac", "hex"),
+      script: Buffer.from("76a9147f90f63fed017815f1da8bea299da27945a17bda88ac", "hex"),
       value: BigInt(10000000),
     });
 
@@ -104,23 +104,35 @@ describe("PayGo Attestation", function () {
   });
 
   it("should verify PayGo attestation with correct pubkey", function () {
-    // This test documents the expected behavior once signature verification is working
     const psbt = createSimplePsbt();
 
-    // Test fixtures
     const entropy = Buffer.alloc(64, 0);
     const signature = Buffer.from(
       "1fd62abac20bb963f5150aa4b3f4753c5f2f53ced5183ab7761d0c95c2820f6b" +
         "b722b6d0d9adbab782d2d0d66402794b6bd6449dc26f634035ee388a2b5e7b53f6",
       "hex",
     );
 
-    // Add attestation
     psbt.addPayGoAttestation(0, entropy, signature);
 
-    // Note: Verification with ECPair would be tested here once signature format is aligned
-    // For now, we just verify the attestation was added
-    const bytesWithAttestation = psbt.serialize();
-    assert.ok(bytesWithAttestation.length > 0);
+    // Verification pubkey from utxo-core test fixtures
+    const pubkey = Buffer.from(
+      "02456f4f788b6af55eb9c54d88692cadef4babdbc34cde75218cc1d6b6de3dea2d",
+      "hex",
+    );
+
+    // Parse outputs with PayGo pubkey - should set paygo: true on the attested output
+    const outputs = psbt.parseOutputsWithWalletKeys(
+      // Use dummy wallet keys - they won't match any output but PayGo verification is independent
+      [
+        "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8",
+        "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8",
+        "xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8",
+      ],
+      [pubkey],
+    );
+
+    assert.strictEqual(outputs.length, 1);
+    assert.strictEqual(outputs[0].paygo, true);
   });
 });