bsv-sdk 0.13.0 → 0.15.0

data/lib/bsv/transaction/transaction.rb

@@ -550,12 +550,30 @@ module BSV
       #    provided fee model.
       # 4. Checks that total outputs do not exceed total inputs.
       #
+      # == Semantic Divergences from Reference SDKs
+      #
+      # This implementation raises +VerificationError+ for all failure modes.
+      # The TypeScript and Python SDKs return +false+ for script failures and
+      # output overflow. The Go SDK propagates errors (not booleans) for script
+      # failures, aligning with the Ruby approach.
+      #
+      # Rationale: raising provides structured error information (+#code+,
+      # +#message+, +#cause+) that a boolean cannot convey. Consumers can
+      # rescue +VerificationError+ and inspect +#code+ for specifics.
+      #
+      # Divergence summary:
+      # - +:output_overflow+ — Ruby raises; TS/Python return +false+; Go omits the check
+      # - +:script_failure+ — Ruby raises; TS/Python return +false+; Go also propagates errors
+      # - +:missing_source+ — Ruby raises; consistent with TS/Go/Python (all raise/error)
+      #
       # @param chain_tracker [ChainTracker] chain tracker for merkle root validation
       # @param fee_model [FeeModel, nil] optional fee model to validate the root transaction's fee
       # @return [true] on successful verification
-      # @raise [ArgumentError] if a source transaction or unlocking script is missing
-      # @raise [BSV::Script::ScriptError] if script execution fails
-      # @raise [VerificationError] for merkle path failures, fee validation, or output overflow
+      # @raise [VerificationError] with code +:invalid_merkle_proof+ if a merkle proof is invalid
+      # @raise [VerificationError] with code +:insufficient_fee+ if the fee is below the model's threshold
+      # @raise [VerificationError] with code +:output_overflow+ if outputs exceed inputs
+      # @raise [VerificationError] with code +:script_failure+ if script execution fails
+      # @raise [VerificationError] with code +:missing_source+ if an input is missing required source data
       def verify(chain_tracker:, fee_model: nil)
         verified = {}
         queue = [self]
@@ -581,8 +599,26 @@ module BSV
 
           # Verify each input
           tx.inputs.each_with_index do |input, index|
+            # Populate source data from source_transaction when not already set.
+            # Matches the TS SDK pattern: sourceOutput is read directly from
+            # source_transaction.outputs[sourceOutputIndex] during verify.
+            if input.source_transaction
+              source_output = input.source_transaction.outputs[input.prev_tx_out_index]
+              if source_output
+                input.source_locking_script ||= source_output.locking_script
+                input.source_satoshis ||= source_output.satoshis
+              end
+            end
+
             verify_input_requirements(tx, input, index)
-            tx.verify_input(index)
+            begin
+              tx.verify_input(index)
+            rescue BSV::Script::ScriptError => e
+              raise VerificationError.new(
+                :script_failure,
+                "script verification failed for input #{index} of transaction #{tx.txid_hex}: #{e.message}"
+              )
+            end
 
             # Enqueue source transaction for verification if not yet verified
             source_tx = input.source_transaction
@@ -742,9 +778,18 @@ module BSV
 
       def verify_input_requirements(tx, input, index)
         tx_id = tx.txid_hex
-        raise ArgumentError, "input #{index} of transaction #{tx_id} has no unlocking script" if input.unlocking_script.nil?
-        raise ArgumentError, "input #{index} of transaction #{tx_id} has no source locking script" if input.source_locking_script.nil?
-        raise ArgumentError, "input #{index} of transaction #{tx_id} has no source satoshis" if input.source_satoshis.nil?
+        if input.unlocking_script.nil?
+          raise VerificationError.new(:missing_source,
+                                      "input #{index} of transaction #{tx_id} has no unlocking script")
+        end
+        if input.source_locking_script.nil?
+          raise VerificationError.new(:missing_source,
+                                      "input #{index} of transaction #{tx_id} has no source locking script")
+        end
+        return unless input.source_satoshis.nil?
+
+        raise VerificationError.new(:missing_source,
+                                    "input #{index} of transaction #{tx_id} has no source satoshis")
       end
 
       def verify_fee(fee_model)

data/lib/bsv/transaction/verification_error.rb

@@ -7,6 +7,15 @@ module BSV
     # Carries a machine-readable code alongside a human-readable message,
     # matching the typed error pattern used by the Go SDK
     # (ErrInvalidMerklePath, ErrFeeTooLow, ErrScriptVerificationFailed).
+    #
+    # == Error Codes
+    #
+    # - +:invalid_merkle_proof+ — merkle path verification failed against the chain tracker
+    # - +:insufficient_fee+ — transaction fee is below the fee model's requirement
+    # - +:output_overflow+ — total outputs exceed total inputs
+    # - +:script_failure+ — script interpreter rejected an input (original +ScriptError+ in +#cause+)
+    # - +:missing_source+ — required input data (unlocking script, source locking script,
+    #   or source satoshis) is absent
     class VerificationError < StandardError
       # @return [Symbol] the error code
       attr_reader :code
@@ -14,6 +23,8 @@ module BSV
       INVALID_MERKLE_PROOF = :invalid_merkle_proof
       INSUFFICIENT_FEE = :insufficient_fee
       OUTPUT_OVERFLOW = :output_overflow
+      SCRIPT_FAILURE = :script_failure
+      MISSING_SOURCE = :missing_source
 
       # @param code [Symbol] error code
       # @param message [String] human-readable description

data/lib/bsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BSV
-  VERSION = '0.13.0'
+  VERSION = '0.15.0'
 end

data/lib/bsv-sdk.rb

@@ -7,12 +7,11 @@ module BSV
   autoload :Script,      'bsv/script'
   autoload :Transaction, 'bsv/transaction'
   autoload :Network,     'bsv/network'
-  require_relative 'bsv/wallet' # eager — BSV::Wallet may be pre-defined by bsv-wallet gemspec
   autoload :Auth,        'bsv/auth'
   autoload :Overlay,     'bsv/overlay'
   autoload :Identity,    'bsv/identity'
   autoload :Registry,    'bsv/registry'
   autoload :MCP,         'bsv/mcp'
-  autoload :Messages,    'bsv/messages'
+
   autoload :WireFormat,  'bsv/wire_format'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsv-sdk
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Simon Bettison
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: secp256k1-native
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.16'
 description: A Ruby library for interacting with the BSV Blockchain — keys, scripts,
   transactions, and more.
 executables:
@@ -67,7 +81,6 @@ files:
 - lib/bsv/mcp/tools/fetch_utxos.rb
 - lib/bsv/mcp/tools/generate_key.rb
 - lib/bsv/mcp/tools/helpers.rb
-- lib/bsv/messages.rb
 - lib/bsv/network.rb
 - lib/bsv/network/arc.rb
 - lib/bsv/network/broadcast_error.rb
@@ -143,6 +156,7 @@ files:
 - lib/bsv/script/opcodes.rb
 - lib/bsv/script/push_drop_template.rb
 - lib/bsv/script/script.rb
+- lib/bsv/secp256k1_native.bundle
 - lib/bsv/transaction.rb
 - lib/bsv/transaction/beef.rb
 - lib/bsv/transaction/chain_tracker.rb
@@ -163,9 +177,6 @@ files:
 - lib/bsv/transaction/var_int.rb
 - lib/bsv/transaction/verification_error.rb
 - lib/bsv/version.rb
-- lib/bsv/wallet.rb
-- lib/bsv/wallet/insufficient_funds_error.rb
-- lib/bsv/wallet/wallet.rb
 - lib/bsv/wire_format.rb
 homepage: https://github.com/sgbett/bsv-ruby-sdk
 licenses:

data/lib/bsv/messages.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module BSV
-  # Namespace providing TS SDK naming parity for messaging primitives.
-  #
-  # Re-exports {BSV::Primitives::SignedMessage} and {BSV::Primitives::EncryptedMessage}
-  # under the +BSV::Messages+ namespace, matching the structure of the TypeScript SDK
-  # (ts-sdk/src/messages/index.ts).
-  #
-  # The canonical implementations remain in +BSV::Primitives+; this module is a
-  # lightweight re-export only.
-  module Messages
-    SignedMessage = BSV::Primitives::SignedMessage
-    EncryptedMessage = BSV::Primitives::EncryptedMessage
-  end
-end

data/lib/bsv/wallet/insufficient_funds_error.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module BSV
-  module Wallet
-    class InsufficientFundsError < StandardError
-      attr_reader :required, :available
-
-      def initialize(message = nil, required: nil, available: nil)
-        @required = required
-        @available = available
-        super(message || "insufficient funds: need #{required}, have #{available}")
-      end
-    end
-  end
-end

data/lib/bsv/wallet/wallet.rb

@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-
-module BSV
-  module Wallet
-    # Holds a private key, sources UTXOs via a chain data provider, and
-    # funds and signs P2PKH transactions.
-    #
-    # The provider is duck-typed — any object responding to
-    # #fetch_utxos(address) and #fetch_transaction(txid) qualifies.
-    class Wallet
-      DUST_THRESHOLD = 1
-
-      attr_reader :private_key, :provider
-
-      def initialize(private_key:, provider:)
-        @private_key = private_key
-        @provider = provider
-      end
-
-      def address(network: :mainnet)
-        @private_key.public_key.address(network: network)
-      end
-
-      def balance(network: :mainnet)
-        @provider.fetch_utxos(address(network: network)).sum(&:satoshis)
-      end
-
-      def fund(tx, network: :mainnet, satoshis_per_byte: 0.1)
-        utxos = @provider.fetch_utxos(address(network: network))
-        output_total = tx.total_output_satoshis
-
-        # Add a dummy change output so fee estimation accounts for its size
-        dummy_change = BSV::Transaction::TransactionOutput.new(
-          satoshis: 0, locking_script: locking_script
-        )
-        tx.add_output(dummy_change)
-
-        input_total = tx.total_input_satoshis
-        funded = false
-
-        utxos.each do |utxo|
-          tx.add_input(build_input(utxo))
-          input_total += utxo.satoshis
-
-          fee = tx.estimated_fee(satoshis_per_byte: satoshis_per_byte)
-          if input_total >= output_total + fee
-            funded = true
-            break
-          end
-        end
-
-        # Remove the dummy change output
-        tx.outputs.delete(dummy_change)
-
-        unless funded
-          fee = tx.estimated_fee(satoshis_per_byte: satoshis_per_byte)
-          raise InsufficientFundsError.new(required: output_total + fee, available: input_total)
-        end
-
-        add_change_if_needed(tx, input_total, output_total, satoshis_per_byte)
-
-        tx
-      end
-
-      def sign(tx)
-        tx.sign_all(@private_key)
-      end
-
-      def fund_and_sign(tx, network: :mainnet, satoshis_per_byte: 0.1)
-        fund(tx, network: network, satoshis_per_byte: satoshis_per_byte)
-        sign(tx)
-      end
-
-      private
-
-      def locking_script
-        @locking_script ||= BSV::Script::Script.p2pkh_lock(@private_key.public_key.hash160)
-      end
-
-      def build_input(utxo)
-        input = BSV::Transaction::TransactionInput.new(
-          prev_tx_id: BSV::Transaction::TransactionInput.txid_from_hex(utxo.tx_hash),
-          prev_tx_out_index: utxo.tx_pos
-        )
-        input.source_satoshis = utxo.satoshis
-        input.source_locking_script = locking_script
-        input.unlocking_script_template = BSV::Transaction::P2PKH.new(@private_key)
-        input
-      end
-
-      def add_change_if_needed(tx, input_total, output_total, satoshis_per_byte)
-        fee_without_change = tx.estimated_fee(satoshis_per_byte: satoshis_per_byte)
-        remainder = input_total - output_total - fee_without_change
-
-        return if remainder < DUST_THRESHOLD
-
-        change_output = BSV::Transaction::TransactionOutput.new(
-          satoshis: remainder, locking_script: locking_script
-        )
-        tx.add_output(change_output)
-
-        # Recalculate: adding the change output increases fee slightly
-        new_fee = tx.estimated_fee(satoshis_per_byte: satoshis_per_byte)
-        fee_increase = new_fee - fee_without_change
-        final_change = remainder - fee_increase
-
-        if final_change >= DUST_THRESHOLD
-          tx.outputs.delete(change_output)
-          tx.add_output(
-            BSV::Transaction::TransactionOutput.new(
-              satoshis: final_change, locking_script: locking_script
-            )
-          )
-        else
-          tx.outputs.delete(change_output) # change absorbed by fee
-        end
-      end
-    end
-  end
-end

data/lib/bsv/wallet.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module BSV
-  module Wallet
-    autoload :InsufficientFundsError, 'bsv/wallet/insufficient_funds_error'
-    autoload :Wallet,                 'bsv/wallet/wallet'
-  end
-end