near_api 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3321406fa6e93eb872d618a950f3d8e38f50a7f20c8398038b03ed0a11a286b7
-  data.tar.gz: c861d3af27c33b26d3b40f9e36c964cf703a41e73d6866ff7b9a8fb7eb123964
+  metadata.gz: e1b94b217159dc9e689e1608c1f72c0d626418a6aaa71ec48be30cb38ce132f8
+  data.tar.gz: d0723e5fe8c9f55e8f3c284d2de2a1398c0df06b478b09b45d291849d1f4d24f
 SHA512:
-  metadata.gz: 0d2cf490753804dcaf32ec7f3b2503e8588fe58ecaa11978f5b384cbc72ca778202da6b452b7ede3f541ed517fb8851cad92fcabfef0f02734e076d6c5884e41
-  data.tar.gz: '0338419ebd09175aaa6644011f45be6e371851ca46c2f3a3f1153b8873ddecbc1fcb919012be8373f6a5c5b1dfa4f917082fafe1b234956ddda16f80b20f31a6'
+  metadata.gz: 6fd97f233fa84796cf260fb56e46f8207cd5e9791076d9b8244d3031ecea1f8d53972b5c52a494892798fb7d898508b01cbaee4800ad6800beeaddd048d0c8c3
+  data.tar.gz: c079748efc12a9064594e964c5da76c9aa4ec08b86d680061b8fa126374dbaf08d2671fc3e7e671cde9228e31316e40b12e68cc79ed6687c4b3cffd74e97d40e

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change Log
+
+## 0.3.1
+- removed NearApi::Status#final_transaction_status method
+- added NearApi::Status#transaction_status_with_receipts method
+- updated NearApi::Status#transaction_status arguments

data/lib/near_api/key.rb

@@ -9,8 +9,8 @@ class NearApi::Key
                  key_pair: ENV.fetch('NEAR_KEYPAIR', nil),
                  public_key: ENV.fetch('NEAR_PUBLIC_KEY', nil))
     @signer_id = signer_id
-    if (!key_pair.nil? && !public_key.nil?) || (key_pair.nil? && public_key.nil?)
-      raise ArgumentError, 'please specify one of: key_pair or public_key'
+    if key_pair.nil? && public_key.nil?
+      raise ArgumentError, 'please specify key_pair or public_key'
     end
 
     unless key_pair.nil?
@@ -31,7 +31,11 @@ class NearApi::Key
                     public_key
                   end
       bytestring = NearApi::Base58.decode(key_value)
-      @public_key = Ed25519::VerifyKey.new(bytestring).to_bytes
+      verify_key = Ed25519::VerifyKey.new(bytestring).to_bytes
+      unless @public_key.nil?
+        raise ArgumentError, 'public_key does not match keypair' if @public_key != verify_key
+      end
+      @public_key = verify_key
     end
   end
 

data/lib/near_api/status.rb

@@ -1,17 +1,42 @@
 # frozen_string_literal: true
 
 class NearApi::Status
+  STATUSES = [
+    # Transaction is waiting to be included into the block
+    NONE = 'NONE',
+
+    # Transaction is included into the block. The block may be not finalized yet
+    INCLUDED = 'INCLUDED',
+
+    # Transaction is included into the block +
+    # All non-refund transaction receipts finished their execution.
+    # The corresponding blocks for tx and each receipt may be not finalized yet
+    EXECUTED_OPTIMISTIC = 'EXECUTED_OPTIMISTIC',
+
+    # Transaction is included into finalized block
+    INCLUDED_FINAL = 'INCLUDED_FINAL',
+
+    # Transaction is included into finalized block +
+    #  All non-refund transaction receipts finished their execution.
+    #  The corresponding blocks for each receipt may be not finalized yet
+    EXECUTED = 'EXECUTED',
+
+    # Transaction is included into finalized block +
+    # Execution of all transaction receipts is finalized, including refund receipts
+    FINAL = 'FINAL'
+  ].freeze
+
   def initialize(config = NearApi.config)
     @api = NearApi::Api.new(config)
   end
 
-  def transaction_status(transaction_hash, key: NearApi.key)
-    params = [transaction_hash, key.signer_id]
+  def transaction_status(transaction_hash, wait_until: EXECUTED_OPTIMISTIC, key: NearApi.key)
+    params = { tx_hash: transaction_hash, sender_account_id: key.signer_id, wait_until: wait_until }
     call_api('tx', params)
   end
 
-  def final_transaction_status(transaction_hash, key: NearApi.key)
-    params = [transaction_hash, key.signer_id]
+  def transaction_status_with_receipts(transaction_hash, wait_until: EXECUTED_OPTIMISTIC, key: NearApi.key)
+    params = { tx_hash: transaction_hash, sender_account_id: key.signer_id, wait_until: wait_until }
     call_api('EXPERIMENTAL_tx_status', params)
   end
 

data/lib/near_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NearApi
-  VERSION = '0.2.2'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: near_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Serg Tyatin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: borsh-rb
@@ -76,6 +76,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md