near_api 0.2.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0178927f06a7b596da0c8080f4893136fc151fea0c554bc98c6875e69e5ce989'
-  data.tar.gz: 8b2767b1c427ebe6028efa2337088aa7513d53fad440afac6ec6e7e53acb6be7
+  metadata.gz: a142f691dbf68db8700b6e48684f97e8d9106126b56aea18543750f359e56058
+  data.tar.gz: 2a33e90389472f591fe1517e09546bd8172740d6867951381769c72398381302
 SHA512:
-  metadata.gz: 202b1e0c31d69c5c49eb95b57d78fdec369b01a28e8f5d963b4b18acdcd9d790c24983663e4dd94c695ca63d029657a8be13dc0a2511e44d5cd1e95fe7263a43
-  data.tar.gz: ca770893644ba4aa94c1c5b857aa0363b8e66c7e2b655a2b326d05261dde96025a1089c1f3036eb737bbe272d8f3528a8648dae291cb45d4edd40b641982bb6c
+  metadata.gz: d4509b0f43f7de4f2f01944dd901c23c2f1594d09ef797e0e3c6a3aaf8dfcd1722d4c5d6c5541e1bbed37dfdc37d3b7143f76451374df79d5fc14d38e37d2f2c
+  data.tar.gz: 89b0cfc6ada035f32ac3bc633ec2cfb07d0212844de46e5715ef48e92b241d880e29bb4e1b5ef4218ed7d1b4363936a6d0e866d23a2aadf13d69a78fcf9f5ac7

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# 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
+
+## 0.4.1
+- refactor NearApi::Transaction, replace deprecated `broadcast_tx_async` with `send_tx`
+- breaking change NearApi::Transaction#call_api arguments 

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/transaction.rb

@@ -27,14 +27,9 @@ module NearApi
       @api = NearApi::Api.new(config)
     end
 
-    def call
+    def call(wait_until: Status::EXECUTED_OPTIMISTIC)
       signature = key.sign(message.digest)
-      call_api('broadcast_tx_commit', message.message, signature)
-    end
-
-    def async
-      signature = key.sign(message.digest)
-      call_api('broadcast_tx_async', message.message, signature)
+      call_api(message.message, signature, wait_until: wait_until)
     end
 
     def message
@@ -48,9 +43,10 @@ module NearApi
       NearApi::Base58.encode(message.digest)
     end
 
-    def call_api(method, message, signature)
+    def call_api(message, signature, wait_until: Status::EXECUTED_OPTIMISTIC)
       signed_transaction = message + Borsh::Integer.new(key.key_type, :u8).to_borsh + signature
-      api.json_rpc(method, [Base64.strict_encode64(signed_transaction)])
+      params = { signed_tx_base64: Base64.strict_encode64(signed_transaction), wait_until: wait_until }
+      api.json_rpc('send_tx', params)
     end
 
     private

data/lib/near_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: near_api
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Serg Tyatin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-07 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