x402-rack 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04961db3ca1280873324aa191fc39d968e52b79ff90819569851811354106398'
-  data.tar.gz: 4a90ebc4e88fc7c55412059687d19751ffb58db90767973a18a666d560a6020d
+  metadata.gz: 98f4be71b3158fb9a60f48c7fd22fab18bf11f7e299bbd482a34ed1ff0d43f5b
+  data.tar.gz: 52abd02a198410c35b10d07247a290c1e2d1ec6c971758b160be7c5956d01fa7
 SHA512:
-  metadata.gz: 7996d498aa4230ad84a2b02912c05347ac53830dd159ff36666a92268f6eb4dcbcf5e9acacb60c1be8fc8f1b930d6e7a942f852c6e4f87c4908022e314b59130
-  data.tar.gz: a75ee1bd1e2017b53aab6a204164825c6ffc06bd9ee6f312f2b5c7f560178e96afaf220199bf51b6fbc63f1fa7243e3a2360426774b899418ff408e66826c7e8
+  metadata.gz: 22f092945c96c25969074be4f70d9af80ced8e2a60fff3ff02d4b851e77758a754cfca4b337e341abcb7fcb6c0eb8623ee0aa9b46526991ea406579ed9c3e483
+  data.tar.gz: ce2373b9e168bf1dea3d5f39a97b870007f58d1b74fe6cec8c7dd172b10c4daa4dda1bbe9156fe94ca43cd1dc3399db67f92db1b4e92e860d0ac982f682cff1f

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.1] - 2026-04-04
+
+### Fixed
+
+- **PaymentObserver now protocol-agnostic** — `extract_and_validate` no longer hardcodes the Coinbase v2 envelope format. Pluggable `extractor:` parameter (duck-typed `#call(proof_payload)` → `Transaction` or `nil`) enables BRC-105 and custom payment formats. Default `CoinbaseV2Extractor` preserves backwards compatibility. (#84)
+
 ## [0.5.0] - 2026-04-04
 
 ### Changed
@@ -127,6 +133,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Operations docs** — deployment, performance, treasury/nonce lifecycle.
 - **Ecosystem docs** — Coinbase v2, merkleworks, BRC-105 positioning and header namespace reservations.
 
+[0.5.1]: https://github.com/sgbett/x402-rack/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/sgbett/x402-rack/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/sgbett/x402-rack/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/sgbett/x402-rack/compare/v0.2.0...v0.3.0

data/lib/x402/payment_observer.rb

@@ -39,14 +39,18 @@ module X402
     # @param payee_locking_script_hex [String, nil] static payee script hex
     # @param recogniser [#ours?, nil] object that recognises derived payment addresses.
     #   Takes precedence over +payee_locking_script_hex+ when both are provided.
+    # @param extractor [#call, nil] extracts a +BSV::Transaction::Transaction+ from a
+    #   raw proof header value. Returns a Transaction or +nil+ to skip.
+    #   Defaults to +CoinbaseV2Extractor+ (Base64-JSON envelope with +payload.rawtx+).
     # @param proof_headers [Array<String>] HTTP header names to watch for payments
     # @param on_payment [#call, nil] optional callback invoked with the raw tx
     #   binary after successful enqueue, for application-level tracking
     def initialize(app, worker:, payee_locking_script_hex: nil, recogniser: nil,
-                   proof_headers: DEFAULT_PROOF_HEADERS, on_payment: nil)
+                   extractor: nil, proof_headers: DEFAULT_PROOF_HEADERS, on_payment: nil)
       @app = app
       @worker = worker
       @recogniser = build_recogniser(recogniser, payee_locking_script_hex)
+      @extractor = build_extractor(extractor)
       @proof_headers = proof_headers
       @on_payment = on_payment
     end
@@ -75,6 +79,17 @@ module X402
       StaticRecogniser.new(payee_hex)
     end
 
+    def build_extractor(extractor)
+      return CoinbaseV2Extractor.new unless extractor
+
+      unless extractor.respond_to?(:call)
+        raise ConfigurationError,
+              "PaymentObserver extractor must respond to #call(proof_payload)"
+      end
+
+      extractor
+    end
+
     def observe_payment(env)
       @proof_headers.each do |header_name|
         rack_key = "HTTP_#{header_name.upcase.tr("-", "_")}"
@@ -97,16 +112,11 @@ module X402
     end
 
     def extract_and_validate(proof_payload)
-      json = Base64.strict_decode64(proof_payload)
-      payload = JSON.parse(json)
-      rawtx_hex = payload.dig("payload", "rawtx")
-      return unless rawtx_hex
-
-      tx_binary = [rawtx_hex].pack("H*")
-      tx = ::BSV::Transaction::Transaction.from_binary(tx_binary)
-      return unless recognised?(tx)
+      transaction = @extractor.call(proof_payload)
+      return unless transaction
+      return unless recognised?(transaction)
 
-      tx_binary
+      transaction.to_binary
     rescue StandardError
       nil
     end
@@ -117,6 +127,23 @@ module X402
       end
     end
 
+    # Built-in extractor for the Coinbase v2 envelope format.
+    # Decodes +Base64(JSON({ payload: { rawtx: "hex" } }))+.
+    # Returns a +BSV::Transaction::Transaction+ or +nil+.
+    class CoinbaseV2Extractor
+      def call(proof_payload)
+        json = Base64.strict_decode64(proof_payload)
+        payload = JSON.parse(json)
+        rawtx_hex = payload.dig("payload", "rawtx")
+        return unless rawtx_hex
+
+        tx_binary = [rawtx_hex].pack("H*")
+        ::BSV::Transaction::Transaction.from_binary(tx_binary)
+      rescue StandardError
+        nil
+      end
+    end
+
     # Built-in recogniser for a single static payee address.
     # Used when +payee_locking_script_hex+ is provided without a custom recogniser.
     class StaticRecogniser

data/lib/x402/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module X402
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x402-rack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Simon Bettison