pinetwork 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5311a129438bce41fecb124d0219f81cf25ae8899b59c6980086d325534c43b
-  data.tar.gz: 656d30b971902743cb36ba07c1e14bda8a8d7c5c6de482b47773bb5d4bbb2a57
+  metadata.gz: 1e55714fc1d6fbd13ff97e4d78e32d918a7926bc29e2e10cba93c8c9797ff9d5
+  data.tar.gz: f5dc2d60e6f0b835d677504e6ea70d0b78e21e48f3ad09a692287e5feacd7d71
 SHA512:
-  metadata.gz: fecf24a60329e59e937ecd264549c8a51cd469c73aef34fb651fb43fe6f98043e97e336d0ef0898c7a6a542f5bfb55b90de2c2fcc3505269c5a7b7669a50e5bc
-  data.tar.gz: 753c7acd80fc212f5e2a334660c39dd26e71ec4087c8d359ada67ba1fc3d023cc0921ced468a38b9cce8647d5636522216c0c9cdc9e946b6399d4f4e9b798018
+  metadata.gz: 68b9a5f54bab85dd97c1e358a8d7ae428e7c04b5029ebdcfe66bfb1057fc53c59126236528aaada6c8017a25050fc3bd251287eb4d132f8ebf8ece6cad467506
+  data.tar.gz: 469f3afd74061b371b27118172bc3f10955fd24e89f68c00fe26e2677e9ca3b09a69949e70babfd9d10679784c62619b44420cb50b40dc13fdf26cf1298abc05

data/lib/errors.rb

@@ -0,0 +1,32 @@
+class ::PiNetwork
+  module Errors
+    class APIRequestError < StandardError
+      attr_reader :response_body
+      attr_reader :response_status
+      def initialize(message, response_status, response_body)
+        super(message)
+        @response_status = response_status
+        @response_body = response_body
+      end
+    end
+
+    class PaymentNotFoundError < StandardError
+      attr_reader :payment_id
+      def initialize(message, payment_id)
+        super(message)
+        @payment_id = payment_id
+      end
+    end
+
+    class TxidAlreadyLinkedError < StandardError
+      attr_reader :payment_id
+      attr_reader :txid
+
+      def initialize(message, payment_id, txid)
+        super(message)
+        @payment_id = payment_id
+        @txid = txid
+      end
+    end
+  end
+end

data/lib/{pi_network.rb → pinetwork.rb}

@@ -1,5 +1,4 @@
-gem_dir = Gem::Specification.find_by_name("pi_network").gem_dir
-require "#{gem_dir}/lib/errors"
+require_relative 'errors'
 
 class PiNetwork
   require 'faraday'
@@ -17,6 +16,8 @@ class PiNetwork
     @api_key = api_key
     @account = load_account(wallet_private_key)
     @base_url = options[:base_url] || "https://api.minepi.com"
+    @mainnet_host = options[:mainnet_host] || "api.mainnet.minepi.com"
+    @testnet_host = options[:testnet_host] || "api.testnet.minepi.com"
 
     @open_payments = {}
   end
@@ -59,8 +60,10 @@ class PiNetwork
   def submit_payment(payment_id)
     payment = @open_payments[payment_id]
 
-    if payment.nil?
+    if payment.nil? || payment["identifier"] != payment_id
       payment = get_payment(payment_id)
+      txid = payment["transaction"]&.dig("txid")
+      raise Errors::TxidAlreadyLinkedError.new("This payment already has a linked txid", payment_id, txid) if txid.present?
     end
 
     set_horizon_client(payment["network"])
@@ -80,25 +83,27 @@ class PiNetwork
     return txid
   end
 
-  def complete_payment(identifier, txid)
+  def complete_payment(payment_id, txid)
     body = {"txid": txid}
 
     response = Faraday.post(
-      base_url + "/v2/payments/#{identifier}/complete",
+      base_url + "/v2/payments/#{payment_id}/complete",
       body.to_json,
       http_headers
     )
 
+    @open_payments.delete(payment_id)
     handle_http_response(response, "An unknown error occurred while completing the payment")
   end
 
-  def cancel_payment(identifier)
+  def cancel_payment(payment_id)
     response = Faraday.post(
-      base_url + "/v2/payments/#{identifier}/cancel",
+      base_url + "/v2/payments/#{payment_id}/cancel",
       {}.to_json,
       http_headers,
     )
 
+    @open_payments.delete(payment_id)
     handle_http_response(response, "An unknown error occurred while cancelling the payment")
   end
 
@@ -126,7 +131,7 @@ class PiNetwork
 
   def handle_http_response(response, unknown_error_message = "An unknown error occurred while making an API request")
     unless response.status == 200
-      error_message = JSON.parse(response.body).dig("error_message") rescue unknown_err_message
+      error_message = JSON.parse(response.body).dig("error_message") rescue unknown_error_message
       raise Errors::APIRequestError.new(error_message, response.status, response.body)
     end
 
@@ -140,8 +145,9 @@ class PiNetwork
   end
 
   def set_horizon_client(network)
-    host = network == "Pi Network" ? "api.mainnet.minepi.com" : "api.staging-testnet.socialchainapp.com"
-    horizon = network == "Pi Network" ? "https://api.mainnet.minepi.com" : "https://api.staging-testnet.socialchainapp.com"
+    host = (network.starts_with? "Pi Network") ? @mainnet_host : @testnet_host
+    horizon = "https://#{host}"
+
     client = Stellar::Client.new(host: host, horizon: horizon)
     Stellar::default_network = network
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinetwork
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Pi Core Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stellar-sdk
@@ -44,7 +44,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/pi_network.rb
+- lib/errors.rb
+- lib/pinetwork.rb
 homepage: https://github.com/pi-apps/pi-ruby
 licenses:
 - PiOS