near_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1e7300ba5960960eae405d29da902ce972b51e10aec298a8a438cc93fdf185
-  data.tar.gz: 84deaf2b6f1325b9d5a15241cd56e311abc3119958d809d055c9bca10813173a
+  metadata.gz: a2d52679da22f2e21379007bab1922d1977708033a6181e6b5987d59a0a5579b
+  data.tar.gz: 82aa0595f95e509277d901430f9140b9978a6369f45a107d9c6feaad4415f3eb
 SHA512:
-  metadata.gz: cc0f0cf9213c9c0b2480cbd043aea1c7c54dd61b1e6150c7db21570072f499d20c23ff2973b8738afe56f40084d6cccb0f173cd548bb3b73427a18a01dbf8030
-  data.tar.gz: 7650ee6aa625a77593f178ba0e091a30c98d1dfd6bd8622f42c29d26181c2e1699ef47b3e1f0c182b44d04e1ca26f64a299d733158a8fc5460a7dbaec427c901
+  metadata.gz: b8489f9a7889bcb819ce8155da38eabd460a7de4173d04f7b979784841d4b0a926f5fb0f4e89e8542a167eed26b5bcfa02f27ab56bcff995710efdab99471b90
+  data.tar.gz: ce6dfea367c7eef407f99e5d7d624b398469ae3065ca098434599b0177579dae2700a7c33f90b9eb46b662dff4b3179cc00120f2a349fcbb869624ffc5a50459

data/lib/near_api/action.rb

@@ -4,7 +4,7 @@ class NearApi::Action
   include Borsh
 
   borsh signer_id: :string,
-        key_pair: { key_type: :u8, public_key: 32 },
+        key: { key_type: :u8, public_key: 32 },
         nonce: :u64,
         receiver_id: :string,
         block_hash: 32,
@@ -18,48 +18,49 @@ class NearApi::Action
     new(*args).async
   end
 
-  def initialize(receiver_id, actions, config: NearApi.config)
+  def initialize(receiver_id, actions, config: NearApi.config, key: NearApi.key)
+    @key = key
     @receiver_id = receiver_id
-    @actions = Array[actions]
+    @actions = Array(actions)
     @config = config
     @api = NearApi::Api.new(config)
   end
 
   def call
-    call_api('broadcast_tx_commit')
+    signature = key.sign(message.digest)
+    call_api('broadcast_tx_commit', message.message, signature)
   end
 
   def async
-    call_api('broadcast_tx_commit')
+    signature = key.sign(message.digest)
+    call_api('broadcast_tx_async', message.message, signature)
   end
 
-  private
-
-
-  def call_api(method)
-    msg = to_borsh
-    digest = Digest::SHA256.digest(msg)
-    signature = key_pair.sign(digest)
+  def message
+    @message ||= begin
+      message = to_borsh
+      Struct.new(:message, :digest).new(message, Digest::SHA256.digest(message))
+    end
+  end
 
-    signed_transaction = msg + Borsh::Integer.new(key_pair.key_type, :u8).to_borsh + signature
+  def call_api(method, message, signature)
+    signed_transaction = message + Borsh::Integer.new(key.key_type, :u8).to_borsh + signature
     api.json_rpc(method, [Base64.strict_encode64(signed_transaction)])
   end
 
-  def signer_id
-    config.signer_id
-  end
+  private
 
-  def key_pair
-    config.key_pair
+  def signer_id
+    key.signer_id
   end
 
   def nonce
-    api.nonce + 1
+    api.nonce(key) + 1
   end
 
   def block_hash
     api.block_hash
   end
 
-  attr_reader :receiver_id, :actions, :config, :api
+  attr_reader :receiver_id, :actions, :key, :config, :api
 end

data/lib/near_api/api.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class NearApi::Api
-  def initialize(config = Config.new)
+  def initialize(config = NearApi.config)
     @config = config
   end
 
@@ -14,20 +14,20 @@ class NearApi::Api
     JSON.parse(Net::HTTP.get(uri))
   end
 
-  def view_access_key
+  def view_access_key(key)
     call(
       'query',
       {
         "request_type": "view_access_key",
-        "account_id": config.signer_id,
-        "public_key": NearApi::Base58.encode(config.key_pair.public_key),
+        "account_id": key.signer_id,
+        "public_key": NearApi::Base58.encode(key.public_key),
         "finality": 'optimistic'
       }
     )
   end
 
-  def nonce
-    view_access_key['result']['nonce']
+  def nonce(key)
+    view_access_key(key)['result']['nonce']
   end
 
   def block_hash

data/lib/near_api/config.rb

@@ -1,15 +1,9 @@
 # frozen_string_literal: true
 
 class NearApi::Config
-  def initialize(
-    signer_id: ENV.fetch('NEAR_SIGNER_ID'),
-    key_pair: ENV.fetch('NEAR_KEYPAIR'),
-    node_url: ENV.fetch('NEAR_NODE_URL')
-  )
-    @signer_id = signer_id
-    @key_pair = NearApi::KeyPair.new(key_pair)
+  def initialize(node_url: ENV.fetch('NEAR_NODE_URL'))
     @node_url = node_url
   end
 
-  attr_reader :signer_id, :key_pair, :node_url
+  attr_reader :node_url
 end

data/lib/near_api/key.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+require 'ed25519'
+
+class NearApi::Key
+  attr_reader :signer_id, :public_key
+
+  def initialize(signer_id = ENV.fetch('NEAR_SIGNER_ID'),
+                 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"
+    end
+
+    unless key_pair.nil?
+      key_value = if key_pair.include?(':')
+                    key_pair.split(':').last
+                  else
+                    key_pair
+                  end
+      bytestring = NearApi::Base58.decode(key_value)
+      @key_pair = Ed25519::SigningKey.from_keypair(bytestring)
+      @public_key = @key_pair.verify_key.to_bytes
+    end
+
+    unless public_key.nil?
+      key_value = if public_key.include?(':')
+                    public_key.split(':').last
+                  else
+                    public_key
+                  end
+      bytestring = NearApi::Base58.decode(key_value)
+      @public_key = Ed25519::VerifyKey.new(bytestring)
+    end
+  end
+
+  def key_type
+    0
+  end
+
+  def sign(msg)
+    key_pair.sign(msg)
+  end
+
+  private
+
+  attr_reader :key_pair
+end

data/lib/near_api/query.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class NearApi::Query
+  def initialize(config = NearApi.config)
+    @api = NearApi::Api.new(config)
+  end
+
+  def function(account_id, method_name, args, finality: 'final')
+    params = {
+      request_type: 'call_function',
+      finality: finality,
+      account_id: account_id,
+      method_name: method_name,
+      args_base64: Base64.strict_encode64(args.to_json)
+    }
+    call_api(params)
+  end
+
+  private
+
+  attr_reader :api
+
+  def call_api(params)
+    api.json_rpc('query', params)
+  end
+end

data/lib/near_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NearApi
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/near_api.rb

@@ -6,11 +6,12 @@ require 'json'
 require "base64"
 require 'borsh'
 require_relative "near_api/version"
-require_relative "near_api/key_pair"
+require_relative "near_api/key"
 require_relative "near_api/action"
+require_relative 'near_api/query'
 require_relative "near_api/action/function_call"
 require_relative "near_api/config"
-require_relative "near_api/api"
+require_relative 'near_api/api'
 require_relative "near_api/base58"
 
 module NearApi
@@ -23,4 +24,12 @@ module NearApi
   def config=(config)
     @config = config
   end
+
+  def self.key
+    @key ||= Key.new
+  end
+
+  def key=(key)
+    @key = key
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: near_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Serg Tyatin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: borsh-rb
@@ -87,7 +87,8 @@ files:
 - lib/near_api/api.rb
 - lib/near_api/base58.rb
 - lib/near_api/config.rb
-- lib/near_api/key_pair.rb
+- lib/near_api/key.rb
+- lib/near_api/query.rb
 - lib/near_api/version.rb
 - near_api.gemspec
 homepage: https://github.com/2rba/near_api

data/lib/near_api/key_pair.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-require 'ed25519'
-
-class NearApi::KeyPair
-  def initialize(value)
-    key_value = if value.include?(':')
-                  value.split(':').last
-                else
-                  value
-                end
-    bytestring = NearApi::Base58.decode(key_value)
-    @key_pair = Ed25519::SigningKey.from_keypair(bytestring)
-  end
-
-  def public_key
-    key_pair.verify_key.to_bytes
-  end
-
-  def key_type
-    0
-  end
-
-  def sign(msg)
-    key_pair.sign(msg)
-  end
-
-  private
-
-  attr_reader :key_pair
-end