ton_sdk_client 1.24.0 → 1.28.0

data/lib/ton_sdk_client/debot.rb

@@ -1,7 +1,4 @@
 module TonSdk
-
-  # NOTE
-  # as of 28 apr 2021, in the main repository this module is still unstable
   module Debot
 
     #
@@ -21,22 +18,23 @@ module TonSdk
       EXTERNAL_CALL_FAILED = 810
       BROWSER_CALLBACK_FAILED = 811
       OPERATION_REJECTED = 812
+      DEBOT_NO_CODE = 813
     end
 
     DebotAction = KwStruct.new(:description, :name, :action_type, :to, :attributes, :misc) do
       def to_h
         {
-          description: self.description,
-          name: self.name,
-          action_type: self.action_type,
-          to: self.to,
-          attributes: self.attributes,
-          misc: self.misc
+          description: description,
+          name: name,
+          action_type: action_type,
+          to: to,
+          attributes: attributes,
+          misc: misc
         }
       end
 
       def self.from_json(j)
-        return nil if j.nil?
+        return if j.nil?
 
         self.new(
           description: j["description"],
@@ -49,20 +47,59 @@ module TonSdk
       end
     end
 
-    ParamsOfStart = KwStruct.new(:debot_handle)
+    DebotInfo = KwStruct.new(
+      :name,
+      :version,
+      :publisher,
+      :caption,
+      :author,
+      :support,
+      :hello,
+      :language,
+      :dabi,
+      :icon,
+      :interfaces,
+      :dabi_version
+    ) do
+      def initialize(
+        name: nil,
+        version: nil,
+        publisher: nil,
+        caption: nil,
+        author: nil,
+        support: nil,
+        hello: nil,
+        language: nil,
+        dabi: nil,
+        icon: nil,
+        interfaces: [],
+        dabi_version: nil
+      )
+        super
+      end
+    end
+
+    class DebotActivity
+      attr_reader :type, :msg, :dst, :out, :fee, :setcode, :signkey, :signing_box_handle
+    end
+
+    Spending = KwStruct.new(:amount, :dst)
+
+    ParamsOfInit = KwStruct.new(:address)
 
     RegisteredDebot = KwStruct.new(:debot_handle, :debot_abi, :info) do
-      def to_h = {
-        debot_handle: @debot_handle,
-        debot_abi: @debot_abi,
-        info: @info.to_h
-      }
+      def to_h
+        {
+          debot_handle: debot_handle,
+          debot_abi: debot_abi,
+          info: info.to_h
+        }
+      end
     end
 
     class ParamsOfAppDebotBrowser
       private_class_method :new
 
-      # todo remove?
       TYPE_VALUES = [
         :log,
         :switch,
@@ -75,61 +112,61 @@ module TonSdk
         :approve
       ]
 
-      attr_reader :type_, :msg, :context_id, :action, :prompt, :debot_addr, :message, :activity
+      attr_reader :type, :msg, :context_id, :action, :prompt, :debot_addr, :message, :activity
 
       def self.new_with_type_log(msg)
-        @type_ = :log
+        @type = :log
         @msg = msg
       end
 
       def self.new_with_type_switch(context_id)
-        @type_ = :switch
+        @type = :switch
         @context_id = context_id
       end
 
       def self.new_with_type_switch_completed
-        @type_ = :switch_completed
+        @type = :switch_completed
       end
 
       def self.new_with_type_show_action(action)
-        @type_ = :show_action
+        @type = :show_action
         @action = action
       end
 
       def self.new_with_type_input(prompt)
-        @type_ = :input
+        @type = :input
         @prompt = prompt
       end
 
       def self.new_with_type_get_signing_box
-        @type_ = :get_signing_box
+        @type = :get_signing_box
       end
 
       def self.new_with_type_invoke_debot(debot_addr, action)
-        @type_ = :invoke_debot
+        @type = :invoke_debot
         @debot_addr = debot_addr
         @action = action
       end
 
       def self.new_with_type_send(message)
-        @type_ = :send
+        @type = :send
         @message = message
       end
 
       def self.new_with_type_approve(activity)
-        @type_ = :approve
+        @type = :approve
         @activity = activity
       end
 
       def to_h
         {
-          type: Helper.sym_to_capitalized_case_str(@type_),
-          msg: @msg,
-          context_id: @context_id,
-          action: @action,
-          prompt: @prompt,
-          debot_addr: @debot_addr,
-          message: @message
+          type: Helper.sym_to_capitalized_case_str(type),
+          msg: msg,
+          context_id: context_id,
+          action: action,
+          prompt: prompt,
+          debot_addr: debot_addr,
+          message: message
         }
       end
 
@@ -173,118 +210,79 @@ module TonSdk
       private
 
       def self.parse_type(type_str)
-        types_str = TYPE_VALUES.map(Helper.capitalized_case_str_to_snake_case_sym)
-        unless types_str.include?(type_str)
-          raise ArgumentError.new("type #{type_str} is unknown; known types: #{types_str}")
+        parsed_type = Helper.capitalized_case_str_to_snake_case_sym(type_str)
+
+        unless TYPE_VALUES.include?(type_str)
+          raise ArgumentError.new("type #{type_str} is unknown; known types: #{TYPE_VALUES}")
         end
 
-        Helper.capitalized_case_str_to_snake_case_sym(type_str)
+        parsed_type
       end
     end
 
     class ResultOfAppDebotBrowser
       private_class_method :new
 
-      attr_reader :type_, :value, :signing_box, :is_approved
+      attr_reader :type, :value, :signing_box, :is_approved
 
       def self.new_with_type_input(a)
-        @type_ = :input
+        @type = :input
         @value = a
       end
 
       def self.new_with_type_get_signing_box(a)
-        @type_ = :get_signing_box
+        @type = :get_signing_box
         @signing_box = signing_box
       end
 
       def self.new_with_type_invoke_debot
-        @type_ = :invoke_debot
+        @type = :invoke_debot
       end
 
       def self.new_with_type_approve(a)
-        @type_ = :approve
+        @type = :approve
         @is_approved = a
       end
     end
 
+    ParamsOfStart = KwStruct.new(:debot_handle)
+
     ParamsOfFetch = KwStruct.new(:address)
 
+    ResultOfFetch = KwStruct.new(:info)
+
     ParamsOfExecute = KwStruct.new(:debot_handle, :action) do
       def to_h
         {
-          debot_handle: @debot_handle,
-          action: @action.to_h
+          debot_handle: debot_handle,
+          action: action.to_h
         }
       end
     end
 
     ParamsOfSend = KwStruct.new(:debot_handle, :message)
-    ParamsOfInit = KwStruct.new(:address)
-    DebotInfo = KwStruct.new(
-      :name,
-      :version,
-      :publisher,
-      :caption,
-      :author,
-      :support,
-      :hello,
-      :language,
-      :dabi,
-      :icon,
-      :interfaces
-    ) do
-      def initialize(
-        name: nil,
-        version: nil,
-        publisher: nil,
-        caption: nil,
-        author: nil,
-        support: nil,
-        hello: nil,
-        language: nil,
-        dabi: nil,
-        icon: nil,
-        interfaces: []
-      )
-        super
-      end
-    end
-
-    ResultOfFetch = KwStruct.new(:info)
-    Spending = KwStruct.new(:amount, :dst)
-
-    class DebotActivity
-      private_class_method :new
-
-      attr_reader :type_, :msg, :dst, :out, :fee, :setcode, :signkey, :signing_box_handle
-
-      def self.new_with_type_transaction(msg:, dst:, out:, fee:, setcode:, signkey:, signing_box_handle:)
-        @type_ = :transaction
-        @msg = msg
-        @dst = dst
-        @out = out
-        @fee = fee
-        @setcode = setcode
-        @signkey = signkey
-        @signing_box_handle = signing_box_handle
-      end
-
-      def self.from_json(j)
-        # todo
-      end
-    end
-
 
+    ParamsOfRemove = KwStruct.new(:debot_handle)
 
     #
     # functions
     #
 
-    def self.init(ctx, params, app_browser_obj)
-      Interop::request_to_native_lib(ctx, "debot.init", params) do |resp|
+    def self.init(ctx, params, app_browser_obj = nil)
+      Interop::request_to_native_lib(
+        ctx,
+        "debot.init",
+        params
+      ) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
-            result: nil
+          debot_info = resp.result["info"].transform_keys(&:to_sym)
+          debot_info[:dabi_version] = debot_info.delete(:dabiVersion)
+          yield NativeLibResponseResult.new(
+            result: RegisteredDebot.new(
+              debot_handle: resp.result["debot_handle"],
+              debot_abi: resp.result["debot_abi"],
+              info: DebotInfo.new(**debot_info)
+            )
           )
         else
           yield resp
@@ -300,7 +298,7 @@ module TonSdk
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: nil
           )
         else
@@ -317,9 +315,12 @@ module TonSdk
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
-            # TODO: parse DebotInfo
-            result: ResultOfFetch.new(info: resp.result["info"])
+          debot_info = resp.result["info"].transform_keys(&:to_sym)
+          debot_info[:dabi_version] = debot_info.delete(:dabiVersion)
+          yield NativeLibResponseResult.new(
+            result: ResultOfFetch.new(
+              info: DebotInfo.new(**debot_info)
+            )
           )
         else
           yield resp
@@ -330,7 +331,7 @@ module TonSdk
     def self.execute(ctx, params)
       Interop::request_to_native_lib(ctx, "debot.execute", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: nil
           )
         else
@@ -342,7 +343,7 @@ module TonSdk
     def self.remove(ctx, params)
       Interop::request_to_native_lib(ctx, "debot.remove", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: nil
           )
         else
@@ -354,7 +355,7 @@ module TonSdk
     def self.send(ctx, params)
       Interop::request_to_native_lib(ctx, "debot.send", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: nil
           )
         else

data/lib/ton_sdk_client/helper.rb

@@ -17,4 +17,4 @@ module TonSdk
 
     def self.base64_from_hex(hex_digest) = [[hex_digest].pack("H*")].pack("m0")
   end
-end
+end

data/lib/ton_sdk_client/interop.rb

@@ -148,7 +148,7 @@ module TonSdk
 
       # using @@request_counter here to pass a @@request_counter and handlers and then retrieve them
       # is probably isn't needed.
-      # Thanks to the way Ruby is, the same affect can be achived by a block which is an easier way.
+      # Thanks to the way Ruby is, the same affect can be achieved by a block which is an easier way.
       # Nonetheless, @@request_counter is incremented with each request and then sent out to a server
       # in order to keep a server happy,
       # because otherwise a server will, probably, reply in a wrong way.
@@ -172,12 +172,12 @@ module TonSdk
 
           when TcResponseCodes::SUCCESS
             if block_given?
-              yield NativeLibResponsetResult.new(result: tc_data_json_content)
+              yield NativeLibResponseResult.new(result: tc_data_json_content)
             end
   
           when TcResponseCodes::ERROR
             if block_given?
-              yield NativeLibResponsetResult.new(error: tc_data_json_content)
+              yield NativeLibResponseResult.new(error: tc_data_json_content)
             end
 
           when TcResponseCodes::NOP

data/lib/ton_sdk_client/net.rb

@@ -135,7 +135,7 @@ module TonSdk
 
       def to_h
         h = super
-        h[:fields] = self.fields.map(&:to_h)
+        h[:fields] = fields.map(&:to_h)
         h
       end
     end
@@ -222,7 +222,7 @@ module TonSdk
 
       def to_h
         h = super
-        h[:abi_registry] = self.abi_registry&.map(&:to_h)
+        h[:abi_registry] = abi_registry&.map(&:to_h)
         h
       end
     end
@@ -261,7 +261,7 @@ module TonSdk
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfQueryCollection.new(result: resp.result["result"])
           )
         else
@@ -278,7 +278,7 @@ module TonSdk
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfWaitForCollection.new(result: resp.result["result"])
           )
         else
@@ -290,7 +290,7 @@ module TonSdk
     def self.unsubscribe(ctx, params)
       Interop::request_to_native_lib(ctx, "net.unsubscribe", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ""
           )
         else
@@ -308,7 +308,7 @@ module TonSdk
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfSubscribeCollection.new(handle: resp.result["handle"])
           )
         else
@@ -320,7 +320,7 @@ module TonSdk
     def self.query(ctx, params)
       Interop::request_to_native_lib(ctx, "net.query", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfQuery.new(result: resp.result["result"])
           )
         else
@@ -332,7 +332,7 @@ module TonSdk
     def self.suspend(ctx)
       Interop::request_to_native_lib(ctx, "net.suspend") do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(result: "")
+          yield NativeLibResponseResult.new(result: "")
         else
           yield resp
         end
@@ -342,7 +342,7 @@ module TonSdk
     def self.resume(ctx)
       Interop::request_to_native_lib(ctx, "net.resume") do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(result: "")
+          yield NativeLibResponseResult.new(result: "")
         else
           yield resp
         end
@@ -352,7 +352,7 @@ module TonSdk
     def self.find_last_shard_block(ctx, params)
       Interop::request_to_native_lib(ctx, "net.find_last_shard_block", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfFindLastShardBlock.new(block_id: resp.result["block_id"])
           )
         else
@@ -364,7 +364,7 @@ module TonSdk
     def self.fetch_endpoints(ctx)
       Interop::request_to_native_lib(ctx, "net.fetch_endpoints") do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: EndpointsSet.new(endpoints: resp.result["endpoints"])
           )
         else
@@ -376,7 +376,7 @@ module TonSdk
     def self.set_endpoints(ctx, params)
       Interop::request_to_native_lib(ctx, "net.set_endpoints", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: nil
           )
         else
@@ -388,7 +388,7 @@ module TonSdk
     def self.batch_query(ctx, params)
       Interop::request_to_native_lib(ctx, "net.batch_query", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfBatchQuery.new(results: resp.result["results"])
           )
         else
@@ -400,7 +400,7 @@ module TonSdk
     def self.aggregate_collection(ctx, params)
       Interop::request_to_native_lib(ctx, "net.aggregate_collection", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfAggregateCollection.new(values: resp.result["values"])
           )
         else
@@ -409,10 +409,10 @@ module TonSdk
       end
     end
 
-    def self.get_endpoints(ctx, params)
-      Interop::request_to_native_lib(ctx, "net.get_endpoints", params) do |resp|
+    def self.get_endpoints(ctx)
+      Interop::request_to_native_lib(ctx, "net.get_endpoints") do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfGetEndpoints.new(
               query: resp.result["query"],
               endpoints: resp.result["endpoints"],
@@ -427,7 +427,7 @@ module TonSdk
     def self.query_counterparties(ctx, params)
       Interop::request_to_native_lib(ctx, "net.query_counterparties", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfQueryCollection.new(result: resp.result["result"])
           )
         else
@@ -439,7 +439,7 @@ module TonSdk
     def self.query_transaction_tree(ctx, params)
       Interop::request_to_native_lib(ctx, "net.query_transaction_tree", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfQueryTransactionTree.new(
               messages: resp.result["messages"],
               transactions: resp.result["transactions"],
@@ -454,7 +454,7 @@ module TonSdk
     def self.create_block_iterator(ctx, params)
       Interop::request_to_native_lib(ctx, "net.create_block_iterator", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: RegisteredIterator.new(handle: resp.result["handle"])
           )
         else
@@ -466,7 +466,7 @@ module TonSdk
     def self.resume_block_iterator(ctx, params)
       Interop::request_to_native_lib(ctx, "net.resume_block_iterator", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: RegisteredIterator.new(handle: resp.result["handle"])
           )
         else
@@ -478,7 +478,7 @@ module TonSdk
     def self.create_transaction_iterator(ctx, params)
       Interop::request_to_native_lib(ctx, "net.create_transaction_iterator", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: RegisteredIterator.new(handle: resp.result["handle"])
           )
         else
@@ -490,7 +490,7 @@ module TonSdk
     def self.resume_transaction_iterator(ctx, params)
       Interop::request_to_native_lib(ctx, "net.resume_transaction_iterator", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: RegisteredIterator.new(handle: resp.result["handle"])
           )
         else
@@ -502,7 +502,7 @@ module TonSdk
     def self.iterator_next(ctx, params)
       Interop::request_to_native_lib(ctx, "net.iterator_next", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: ResultOfIteratorNext.new(
               items: resp.result["items"],
               has_more: resp.result["has_more"],
@@ -518,7 +518,7 @@ module TonSdk
     def self.remove_iterator(ctx, params)
       Interop::request_to_native_lib(ctx, "net.remove_iterator", params) do |resp|
         if resp.success?
-          yield NativeLibResponsetResult.new(
+          yield NativeLibResponseResult.new(
             result: nil
           )
         else