mpp-rb 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d5c20207eb5f09b4f077cea8bdd1fb1f2acc15d12c5d00928cc7e8eddcf627
-  data.tar.gz: 1f080945c2a322985b47d184ccaf00b543931bcb6f4623c070175d03efab5cd8
+  metadata.gz: 4a9ab53da9713524d119320b1843e58948b433e213e17250cd641e90f4286083
+  data.tar.gz: 9ed02c682b99438d702cf231e97e96f0b275e84954785ef9eb2f0750b4a1a7c5
 SHA512:
-  metadata.gz: 7044c78ebef4814fce755614c194a6723c39df930071762aab94e19e944bb241f33bfd554fdc18ed0ef5f7b3f9cdc9d219923ab4a9aac6278e94896069b2634c
-  data.tar.gz: d71d6869c20d1a569a0425cde39dd39938688735d0360db47fe82f80ac454f3d4ec015624f942c1bf1760c271e9297ca848300ac63d5d0366496b57a2475efc6
+  metadata.gz: 12603bd4ec974e488a632ce3ec6d91304e4996bf218cc47638a652c2a096b73aa2124c12242effde8d711f9106e2c4138ee68ca8542c13d9341bcadb2d42b24a
+  data.tar.gz: 74a80bdc6320841a891e305ae39838156292a6656ce6d73f48b92283dfd5e639f91e415e631d2cdf4cd4ffb91c6c7871c905e30685380f4a6981f074ee11977b

data/lib/mpp/methods/evm/charge_intent.rb

@@ -136,7 +136,7 @@ module Mpp
         end
 
         def x402_credential?(credential)
-          credential.payload.is_a?(Hash) && credential.payload["_x402"] == true
+          credential.is_a?(X402Credential)
         end
 
         def addresses_equal?(left, right)

data/lib/mpp/methods/evm/evm_method.rb

@@ -99,9 +99,9 @@ module Mpp
             http_method: http_method
           )
           echo = challenge.to_echo
-          Mpp::Credential.new(
+          X402Credential.new(
             challenge: echo,
-            payload: authorization.merge("_x402" => true),
+            payload: authorization,
             source: source_for(authorization["from"])
           )
         end

data/lib/mpp/methods/evm/x402_credential.rb

@@ -0,0 +1,12 @@
+# typed: true
+# frozen_string_literal: true
+
+module Mpp
+  module Methods
+    module Evm
+      # Credential bound server-side from an x402 PAYMENT-SIGNATURE header.
+      class X402Credential < Mpp::Credential
+      end
+    end
+  end
+end

data/lib/mpp/methods/evm.rb

@@ -8,6 +8,7 @@ module Mpp
       autoload :Authorization, "mpp/methods/evm/authorization"
       autoload :ChargeIntent, "mpp/methods/evm/charge_intent"
       autoload :EvmMethod, "mpp/methods/evm/evm_method"
+      autoload :X402Credential, "mpp/methods/evm/x402_credential"
 
       # Factory for a server-side EVM charge method with inline x402 exact support.
       def self.charge(currency:, recipient:, x402:, authorization: nil, chain_id: nil, decimals: nil,

data/lib/mpp/methods/tempo/intents.rb

@@ -221,6 +221,7 @@ module Mpp
 
             receipt_data = fetch_transaction_receipt(rpc_url, reserved_tx_hash)
             verify_transaction_receipt!(receipt_data, request, credential: credential)
+            claim_settlement!(reserved_tx_hash)
             @store.put(store_key, TRANSACTION_VERIFIED)
             return Mpp::Receipt.success(reserved_tx_hash)
           end
@@ -241,6 +242,7 @@ module Mpp
             if transaction_submission_may_have_succeeded?(e)
               receipt_data = fetch_transaction_receipt(rpc_url, reserved_tx_hash)
               verify_transaction_receipt!(receipt_data, request, credential: credential)
+              claim_settlement!(reserved_tx_hash)
               @store.put(store_key, TRANSACTION_VERIFIED)
               return Mpp::Receipt.success(reserved_tx_hash)
             end
@@ -260,16 +262,26 @@ module Mpp
           # claim until verification finishes so a concurrent retry cannot
           # rebroadcast the same payload.
           raw_store_key = store_key
+          raw_tx_hash = reserved_tx_hash
           store_key, reserved_tx_hash = rebase_reservation_to_chain_hash(store_key, reserved_tx_hash, tx_hash)
 
           receipt_data = fetch_transaction_receipt(rpc_url, reserved_tx_hash)
           verify_transaction_receipt!(receipt_data, request, credential: credential)
+          claim_settlement!(raw_tx_hash, reserved_tx_hash)
           @store.put(store_key, TRANSACTION_VERIFIED)
           @store.put(raw_store_key, TRANSACTION_VERIFIED) if raw_store_key != store_key
 
           Mpp::Receipt.success(reserved_tx_hash)
         end
 
+        def claim_settlement!(*tx_hashes)
+          tx_hashes.map(&:downcase).uniq.each do |tx_hash|
+            unless @store.put_if_absent("mpp:charge:settled:#{tx_hash}", true)
+              raise Mpp::VerificationError, "Transaction hash already used"
+            end
+          end
+        end
+
         def transaction_submission_may_have_succeeded?(error)
           message = "#{error.class}: #{error.message}".downcase
 

data/lib/mpp/server/middleware.rb

@@ -33,8 +33,13 @@ module Mpp
 
       sig { params(env: T.untyped).returns(T::Array[T.untyped]) }
       def call(env)
+        original_input = env["rack.input"]
+        body_capture = capture_request_body(env)
         charge_opts = @pricing.call(env)
-        return @app.call(env) unless charge_opts
+        unless charge_opts
+          env["rack.input"] = original_input if body_capture && env["rack.input"].equal?(body_capture)
+          return @app.call(env)
+        end
 
         authorization = env["HTTP_AUTHORIZATION"]
         payment_authorization = env["HTTP_PAYMENT_AUTHORIZATION"]
@@ -42,7 +47,6 @@ module Mpp
         accept_payment = env["HTTP_ACCEPT_PAYMENT"]
         http_method = env["REQUEST_METHOD"]
         url = request_url(env)
-        body_capture = capture_request_body(env)
 
         request_body = body_capture&.materialize
         env["rack.input"] = StringIO.new(request_body || "") if body_capture
@@ -278,8 +282,11 @@ module Mpp
 
         sig { returns(T.untyped) }
         def rewind
-          @input.rewind if @input.respond_to?(:rewind)
+          return unless @input.respond_to?(:rewind)
+
+          result = @input.rewind
           @buffer = +"".b
+          result
         end
 
         sig { returns(T.untyped) }

data/lib/mpp/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Mpp
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

data/lib/mpp/x402/server.rb

@@ -150,7 +150,7 @@ module Mpp
         route_bound = !client_nonce.nil?
         route_requires_binding = !challenge.digest.nil? || !challenge.opaque.nil?
 
-        if route_requires_binding && !route_bound && route_binding == :required
+        if !route_bound && route_binding == :required
           Kernel.raise Mpp::VerificationFailedError.new(reason: "x402 payment payload does not bind required route metadata")
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mpp-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Stripe
@@ -86,6 +86,7 @@ files:
 - lib/mpp/methods/evm/authorization.rb
 - lib/mpp/methods/evm/charge_intent.rb
 - lib/mpp/methods/evm/evm_method.rb
+- lib/mpp/methods/evm/x402_credential.rb
 - lib/mpp/methods/stripe.rb
 - lib/mpp/methods/stripe/analytics_metadata.rb
 - lib/mpp/methods/stripe/charge_intent.rb