bsv-wallet 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42266cef3c2585982df666f123097ea4fb4edd9f6619aacf37ed50628148ae1f
-  data.tar.gz: cec92d7893bba6a8b25439f5fd9c4d203ae7fce0cc2f63370adfc1a01d6bed61
+  metadata.gz: c1c9a3b59c2d83b14456fcdc7e4eb9f26ad8a5cd4094bc1dd192b26e69903d2b
+  data.tar.gz: 3fa4584de7d5f3ce782468aa9243ffc80ddc7106b1da6ed11b7d0a97250c2a29
 SHA512:
-  metadata.gz: b45b5c376c8c2b20ec7afffd1f57a15e89d19509ad6afecce8da8f3cdd69b9f7d8af20b5157ca380b8d0a65d9db5dc9a6aed2b8ac1518542775207534e576825
-  data.tar.gz: aae7eaec036fd2bd620551645e5a111bccfa39ac948ccb6541f24dc5e187acd1c9458a2576b4bca3adc5e31c0ec73d83af270cee8861d940af9952da429fe36c
+  metadata.gz: 500bec40cbe5fbf13f325e975522ec467a87d8ddef268a88cc6f4f35f429d75d27b1fd7adbd0f085668d21c79ddef1a19270b5502296e4dcc35fa74031f27b0f
+  data.tar.gz: b0dd2838de3f000c5dadd73cb9ce3b6e5575e7c224a4397dbdb0ce2cfd73afdd2cb0366e6805faa035a3375560d3fe2b5ede49a82ae77e494957eb9549cd7727

data/lib/bsv/wallet_interface/memory_store.rb

@@ -91,6 +91,7 @@ module BSV
 
       def filter_outputs(query)
         results = @outputs
+        results = results.select { |o| o[:outpoint] == query[:outpoint] } if query[:outpoint]
         results = results.select { |o| o[:basket] == query[:basket] } if query[:basket]
         if query[:tags]
           mode = query[:tag_query_mode] || 'any'

data/lib/bsv/wallet_interface/proto_wallet.rb

@@ -45,7 +45,7 @@ module BSV
       # @option args [Boolean] :for_self derive from own identity
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { public_key: String } hex-encoded compressed public key
-      def get_public_key(args, _originator: nil)
+      def get_public_key(args, originator: nil)
         if args[:identity_key]
           { public_key: @key_deriver.identity_key }
         else
@@ -69,7 +69,7 @@ module BSV
       # @option args [String] :counterparty public key hex, 'self', or 'anyone'
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { ciphertext: Array<Integer> }
-      def encrypt(args, _originator: nil)
+      def encrypt(args, originator: nil)
         sym_key = derive_sym_key(args)
         ciphertext = sym_key.encrypt(bytes_to_string(args[:plaintext]))
         { ciphertext: string_to_bytes(ciphertext) }
@@ -84,7 +84,7 @@ module BSV
       # @option args [String] :counterparty public key hex, 'self', or 'anyone'
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { plaintext: Array<Integer> }
-      def decrypt(args, _originator: nil)
+      def decrypt(args, originator: nil)
         sym_key = derive_sym_key(args)
         plaintext = sym_key.decrypt(bytes_to_string(args[:ciphertext]))
         { plaintext: string_to_bytes(plaintext) }
@@ -99,7 +99,7 @@ module BSV
       # @option args [String] :counterparty public key hex, 'self', or 'anyone'
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { hmac: Array<Integer> }
-      def create_hmac(args, _originator: nil)
+      def create_hmac(args, originator: nil)
         sym_key = derive_sym_key(args)
         hmac = BSV::Primitives::Digest.hmac_sha256(sym_key.to_bytes, bytes_to_string(args[:data]))
         { hmac: string_to_bytes(hmac) }
@@ -116,7 +116,7 @@ module BSV
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { valid: true }
       # @raise [InvalidHmacError] if the HMAC does not match
-      def verify_hmac(args, _originator: nil)
+      def verify_hmac(args, originator: nil)
         sym_key = derive_sym_key(args)
         expected = BSV::Primitives::Digest.hmac_sha256(sym_key.to_bytes, bytes_to_string(args[:data]))
         provided = bytes_to_string(args[:hmac])
@@ -140,7 +140,7 @@ module BSV
       # @option args [String] :counterparty public key hex, 'self', or 'anyone'
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { signature: Array<Integer> } DER-encoded signature as byte array
-      def create_signature(args, _originator: nil)
+      def create_signature(args, originator: nil)
         counterparty = args[:counterparty] || 'self'
         priv_key = @key_deriver.derive_private_key(args[:protocol_id], args[:key_id], counterparty)
 
@@ -170,7 +170,7 @@ module BSV
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] { valid: true }
       # @raise [InvalidSignatureError] if the signature does not verify
-      def verify_signature(args, _originator: nil)
+      def verify_signature(args, originator: nil)
         counterparty = args[:counterparty] || 'self'
         for_self = args[:for_self] || false
 
@@ -208,7 +208,7 @@ module BSV
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] with :prover, :verifier, :counterparty, :revelation_time,
       #   :encrypted_linkage, :encrypted_linkage_proof
-      def reveal_counterparty_key_linkage(args, _originator: nil)
+      def reveal_counterparty_key_linkage(args, originator: nil)
         counterparty = args[:counterparty]
         verifier = args[:verifier]
 
@@ -270,7 +270,7 @@ module BSV
       # @param originator [String, nil] FQDN of the originating application
       # @return [Hash] with :prover, :verifier, :counterparty, :protocol_id, :key_id,
       #   :encrypted_linkage, :encrypted_linkage_proof, :proof_type
-      def reveal_specific_key_linkage(args, _originator: nil)
+      def reveal_specific_key_linkage(args, originator: nil)
         counterparty = args[:counterparty]
         verifier = args[:verifier]
         protocol_id = args[:protocol_id]

data/lib/bsv/wallet_interface/version.rb

@@ -2,6 +2,6 @@
 
 module BSV
   module WalletInterface
-    VERSION = '0.2.0'
+    VERSION = '0.2.2'
   end
 end

data/lib/bsv/wallet_interface/wallet_client.rb

@@ -483,8 +483,17 @@ module BSV
           )
 
           wire_source(input, txid_hex, output_index, beef) if beef
-
-          input.unlocking_script = BSV::Script::Script.from_hex(spec[:unlocking_script]) if spec[:unlocking_script]
+          wire_source_from_storage(input, spec[:outpoint]) if input.source_satoshis.nil? || input.source_locking_script.nil?
+
+          case spec[:unlocking_script]
+          when BSV::Transaction::UnlockingScriptTemplate
+            input.unlocking_script_template = spec[:unlocking_script]
+          when String
+            input.unlocking_script = BSV::Script::Script.from_hex(spec[:unlocking_script])
+          when nil then nil
+          else
+            raise InvalidParameterError.new('unlocking_script', 'a hex String or UnlockingScriptTemplate')
+          end
 
           tx.add_input(input)
         end
@@ -504,6 +513,19 @@ module BSV
         input.source_locking_script = source_tx.outputs[output_index].locking_script
       end
 
+      def wire_source_from_storage(input, outpoint)
+        results = @storage.find_outputs({ outpoint: outpoint, limit: 1 })
+        stored = results.first
+        return unless stored
+
+        input.source_satoshis = stored[:satoshis]
+        input.source_locking_script = BSV::Script::Script.from_hex(stored[:locking_script])
+
+        return unless stored[:source_tx_hex]
+
+        input.source_transaction = BSV::Transaction::Transaction.from_hex(stored[:source_tx_hex])
+      end
+
       def build_outputs(tx, outputs)
         outputs.each do |spec|
           output = BSV::Transaction::TransactionOutput.new(
@@ -540,6 +562,7 @@ module BSV
       end
 
       def finalize_action(tx, args)
+        tx.sign_all if tx.inputs.any?(&:unlocking_script_template)
         txid = tx.txid_hex
         status = args.dig(:options, :no_send) ? 'nosend' : 'completed'
 
@@ -582,6 +605,8 @@ module BSV
       def store_tracked_outputs(txid, tx, output_specs)
         return unless output_specs
 
+        tx_hex = tx.to_hex
+
         output_specs.each do |spec|
           next unless spec[:basket]
 
@@ -598,7 +623,8 @@ module BSV
                                   basket: spec[:basket],
                                   tags: spec[:tags] || [],
                                   custom_instructions: spec[:custom_instructions],
-                                  spendable: true
+                                  spendable: true,
+                                  source_tx_hex: tx_hex
                                 })
         end
       end
@@ -641,6 +667,7 @@ module BSV
 
       def process_internalize_outputs(tx, output_specs)
         txid = tx.txid_hex
+        tx_hex = tx.to_hex
 
         output_specs.each do |spec|
           output_index = spec[:output_index]
@@ -649,16 +676,16 @@ module BSV
 
           case spec[:protocol]
           when 'wallet payment'
-            internalize_payment(txid, output_index, tx_output, spec[:payment_remittance])
+            internalize_payment(txid, output_index, tx_output, spec[:payment_remittance], tx_hex)
           when 'basket insertion'
-            internalize_basket(txid, output_index, tx_output, spec[:insertion_remittance])
+            internalize_basket(txid, output_index, tx_output, spec[:insertion_remittance], tx_hex)
           else
             raise InvalidParameterError.new('protocol', '"wallet payment" or "basket insertion"')
           end
         end
       end
 
-      def internalize_payment(txid, output_index, tx_output, remittance)
+      def internalize_payment(txid, output_index, tx_output, remittance, tx_hex = nil)
         unless remittance
           raise InvalidParameterError.new('payment_remittance',
                                           'present for wallet payment protocol')
@@ -686,11 +713,12 @@ module BSV
                                 spendable: true,
                                 sender_identity_key: sender_key,
                                 derivation_prefix: prefix,
-                                derivation_suffix: suffix
+                                derivation_suffix: suffix,
+                                source_tx_hex: tx_hex
                               })
       end
 
-      def internalize_basket(txid, output_index, tx_output, remittance)
+      def internalize_basket(txid, output_index, tx_output, remittance, tx_hex = nil)
         unless remittance
           raise InvalidParameterError.new('insertion_remittance',
                                           'present for basket insertion protocol')
@@ -705,7 +733,8 @@ module BSV
                                 basket: remittance[:basket],
                                 tags: remittance[:tags] || [],
                                 custom_instructions: remittance[:custom_instructions],
-                                spendable: true
+                                spendable: true,
+                                source_tx_hex: tx_hex
                               })
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bsv-wallet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Simon Bettison
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64