pinetwork 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e55714fc1d6fbd13ff97e4d78e32d918a7926bc29e2e10cba93c8c9797ff9d5
-  data.tar.gz: f5dc2d60e6f0b835d677504e6ea70d0b78e21e48f3ad09a692287e5feacd7d71
+  metadata.gz: 8a84d8ec60d970ce532eaa91719ad9489df92a4d705b0fd0e9e729ec787f2b87
+  data.tar.gz: 18f1f89e4bc966b552556d8bd6c4a1569e15b6fb29612a55f41cb8aa47284ede
 SHA512:
-  metadata.gz: 68b9a5f54bab85dd97c1e358a8d7ae428e7c04b5029ebdcfe66bfb1057fc53c59126236528aaada6c8017a25050fc3bd251287eb4d132f8ebf8ece6cad467506
-  data.tar.gz: 469f3afd74061b371b27118172bc3f10955fd24e89f68c00fe26e2677e9ca3b09a69949e70babfd9d10679784c62619b44420cb50b40dc13fdf26cf1298abc05
+  metadata.gz: 5e3149e0c3bffeaf65dd395b57c51fdb87ff3667e915aa0fe9ab0cf8e3f7ec0f9d6770d0c62cf1ca855d28ed73974d83c84e38917f4c77b85e7c0ff62f9aae46
+  data.tar.gz: 6e561e7f72fafde97d68245f01ad4296b2b9c182e497978d0899ba4e827879e5e8884b74862bbac6acdae9ba3c06f0c31d27247f71a40416b60bce55ba59f338

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/*.rb"]
+end
+
+desc "Run tests"
+task default: :test

data/lib/errors.rb

@@ -3,6 +3,7 @@ class ::PiNetwork
     class APIRequestError < StandardError
       attr_reader :response_body
       attr_reader :response_status
+
       def initialize(message, response_status, response_body)
         super(message)
         @response_status = response_status
@@ -12,6 +13,7 @@ class ::PiNetwork
 
     class PaymentNotFoundError < StandardError
       attr_reader :payment_id
+
       def initialize(message, payment_id)
         super(message)
         @payment_id = payment_id
@@ -28,5 +30,16 @@ class ::PiNetwork
         @txid = txid
       end
     end
+
+    class TxSubmissionError < StandardError
+      attr_reader :tx_error_code
+      attr_reader :op_error_codes
+
+      def initialize(tx_error_code, op_error_codes)
+        super(message)
+        @tx_error_code = tx_error_code
+        @op_error_codes = op_error_codes
+      end
+    end
   end
 end

data/lib/pinetwork.rb

@@ -11,15 +11,21 @@ class PiNetwork
   attr_reader :base_url
   attr_reader :from_address
 
-  def initialize(api_key, wallet_private_key, options = {})
+  BASE_URL = "https://api.minepi.com".freeze
+  MAINNET_HOST = "api.mainnet.minepi.com".freeze
+  TESTNET_HOST = "api.testnet.minepi.com".freeze
+
+  def initialize(api_key:, wallet_private_key:, faraday: Faraday.new, options: {})
     validate_private_seed_format!(wallet_private_key)
     @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"
+    @base_url = options[:base_url] || BASE_URL
+    @mainnet_host = options[:mainnet_host] || MAINNET_HOST
+    @testnet_host = options[:testnet_host] || TESTNET_HOST
+    @faraday = faraday
 
     @open_payments = {}
+    @open_payments_mutex = Mutex.new
   end
 
   def get_payment(payment_id)
@@ -43,7 +49,7 @@ class PiNetwork
       payment: payment_data,
     }
 
-    response = Faraday.post(
+    response = @faraday.post(
       base_url + "/v2/payments",
       request_body.to_json,
       http_headers,
@@ -52,35 +58,39 @@ class PiNetwork
     parsed_response = handle_http_response(response, "An unknown error occurred while creating a payment")
     
     identifier = parsed_response["identifier"]
-    @open_payments[identifier] = parsed_response
+    @open_payments_mutex.synchronize do
+      @open_payments[identifier] = parsed_response
+    end
 
     return identifier
   end
 
   def submit_payment(payment_id)
-    payment = @open_payments[payment_id]
+    @open_payments_mutex.synchronize do
+      payment = @open_payments[payment_id]
 
-    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
+      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"])
-    @from_address = payment["from_address"]
+      set_horizon_client(payment["network"])
+      @from_address = payment["from_address"]
 
-    transaction_data = {
-      amount: payment["amount"],
-      identifier: payment["identifier"],
-      recipient: payment["to_address"]
-    }
+      transaction_data = {
+        amount: payment["amount"],
+        identifier: payment["identifier"],
+        recipient: payment["to_address"]
+      }
 
-    transaction = build_a2u_transaction(transaction_data)
-    txid = submit_transaction(transaction)
+      transaction = build_a2u_transaction(transaction_data)
+      txid = submit_transaction(transaction)
 
-    @open_payments.delete(payment_id)
+      @open_payments.delete(payment_id)
 
-    return txid
+      return txid
+    end
   end
 
   def complete_payment(payment_id, txid)
@@ -92,7 +102,10 @@ class PiNetwork
       http_headers
     )
 
-    @open_payments.delete(payment_id)
+    @open_payments_mutex.synchronize do
+      @open_payments.delete(payment_id)
+    end
+
     handle_http_response(response, "An unknown error occurred while completing the payment")
   end
 
@@ -103,7 +116,10 @@ class PiNetwork
       http_headers,
     )
 
-    @open_payments.delete(payment_id)
+    @open_payments_mutex.synchronize do
+      @open_payments.delete(payment_id)
+    end
+
     handle_http_response(response, "An unknown error occurred while cancelling the payment")
   end
 
@@ -131,7 +147,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_error_message
+      error_message = extract_error_message(response.body, unknown_error_message)
       raise Errors::APIRequestError.new(error_message, response.status, response.body)
     end
 
@@ -148,7 +164,7 @@ class PiNetwork
     host = (network.starts_with? "Pi Network") ? @mainnet_host : @testnet_host
     horizon = "https://#{host}"
 
-    client = Stellar::Client.new(host: host, horizon: horizon)
+    client = Stellar::Horizon::Client.new(host: host, horizon: horizon)
     Stellar::default_network = network
 
     @client = client
@@ -169,10 +185,7 @@ class PiNetwork
     recipient = Stellar::KeyPair.from_address(transaction_data[:recipient])
     memo = Stellar::Memo.new(:memo_text, transaction_data[:identifier])
 
-    payment_operation = Stellar::Operation.payment({
-      destination: recipient,
-      amount: amount.to_payment
-    })
+    payment_operation = Stellar::Operation.payment(destination: recipient, amount: amount.to_payment)
     
     my_public_key = self.account.address
     sequence_number = self.client.account_info(my_public_key).sequence.to_i
@@ -188,8 +201,13 @@ class PiNetwork
 
   def submit_transaction(transaction)
     envelope = transaction.to_envelope(self.account.keypair)
-    response = self.client.submit_transaction(tx_envelope: envelope)
-    txid = response._response.body["id"]
+    begin
+      response = self.client.submit_transaction(tx_envelope: envelope)
+      txid = response._response.body["id"]
+    rescue => error
+      result_codes = error.response&.dig(:body, "extras", "result_codes")
+      raise Errors::TxSubmissionError.new(result_codes&.dig("transaction"), result_codes&.dig("operations"))
+    end
   end
 
   def validate_payment_data!(data, options = {})
@@ -202,7 +220,11 @@ class PiNetwork
   end
 
   def validate_private_seed_format!(seed)
-    raise StandardError.new("Private Seed should start with \"S\"") unless seed.upcase.starts_with?("S")
+    raise StandardError.new("Private Seed should start with \"S\"") unless seed.upcase.start_with?("S")
     raise StandardError.new("Private Seed should be 56 characters") unless seed.length == 56
   end
+
+  def extract_error_message(response_body, default_message)
+    JSON.parse(response_body).dig("error_message") rescue default_message
+  end
 end

data/test/a2u_concurrency_test.rb

@@ -0,0 +1,35 @@
+require 'minitest/autorun'
+require_relative '../lib/pinetwork'
+
+class A2UConcurrencyTest < Minitest::Test
+  def test_concurrent_create_payment
+    total_threads = 10000
+    api_key = "api-key"
+    wallet_private_key = "SC2L62EYF7LYF43L4OOSKUKDESRAFJZW3UW6RFZ57UY25VAMHTL2BFER"
+
+    threads = []
+    
+    faraday_stub = Minitest::Mock.new
+    pi = PiNetwork.new(api_key: api_key, wallet_private_key: wallet_private_key, faraday: faraday_stub)
+
+    total_threads.times do
+      threads << Thread.new do
+        faraday_response = Faraday::Response.new(
+          status: 200,
+          body: {identifier: SecureRandom.alphanumeric(12)}.to_json,
+          response_headers: {}
+        )
+        faraday_stub.expect(:post, faraday_response) do |url|
+          url == "https://api.minepi.com/v2/payments"
+        end
+        
+        payment_data = { amount: 1, memo: "test", metadata: {"info": "test"}, uid: "test-uid" }
+        payment_id = pi.create_payment(payment_data)
+      end
+    end
+    threads.each(&:join)
+
+    open_payments_after = pi.instance_variable_get(:@open_payments)
+    assert_equal(total_threads, open_payments_after.values.uniq.count, "open_payments got corrupted!")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinetwork
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Pi Core Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stellar-sdk
@@ -16,42 +16,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.31.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 description: Pi Network backend library for Ruby-based webservers.
 email: support@minepi.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - lib/errors.rb
 - lib/pinetwork.rb
+- test/a2u_concurrency_test.rb
 homepage: https://github.com/pi-apps/pi-ruby
 licenses:
 - PiOS
 metadata:
   documentation_uri: https://github.com/pi-apps/pi-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,8 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Pi Network Ruby
 test_files: []