ton_sdk_client 1.26.0 → 1.34.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?
+          debot_info = resp.result["info"].transform_keys(&:to_sym)
+          debot_info[:dabi_version] = debot_info.delete(:dabiVersion)
           yield NativeLibResponseResult.new(
-            result: nil
+            result: RegisteredDebot.new(
+              debot_handle: resp.result["debot_handle"],
+              debot_abi: resp.result["debot_abi"],
+              info: DebotInfo.new(**debot_info)
+            )
           )
         else
           yield resp
@@ -317,9 +315,12 @@ module TonSdk
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
+          debot_info = resp.result["info"].transform_keys(&:to_sym)
+          debot_info[:dabi_version] = debot_info.delete(:dabiVersion)
           yield NativeLibResponseResult.new(
-            # TODO: parse DebotInfo
-            result: ResultOfFetch.new(info: resp.result["info"])
+            result: ResultOfFetch.new(
+              info: DebotInfo.new(**debot_info)
+            )
           )
         else
           yield resp

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.

data/lib/ton_sdk_client/net.rb

@@ -74,7 +74,10 @@ module TonSdk
       end
     end
 
+    ParamsOfSubscribe = KwStruct.new(:subscription, :variables)
+
     ResultOfSubscribeCollection = KwStruct.new(:handle)
+
     ParamsOfQuery = KwStruct.new(:query, :variables) do
       def initialize(query:, variables: nil)
         super
@@ -135,7 +138,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 +225,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
@@ -317,6 +320,24 @@ module TonSdk
       end
     end
 
+    def self.subscribe(ctx, params, client_callback: nil)
+      Interop::request_to_native_lib(
+        ctx,
+        "net.subscribe",
+        params,
+        client_callback: client_callback,
+        is_single_thread_only: false
+      ) do |resp|
+        if resp.success?
+          yield NativeLibResponseResult.new(
+            result: ResultOfSubscribeCollection.new(handle: resp.result["handle"])
+          )
+        else
+          yield resp
+        end
+      end
+    end
+
     def self.query(ctx, params)
       Interop::request_to_native_lib(ctx, "net.query", params) do |resp|
         if resp.success?
@@ -409,8 +430,8 @@ 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 NativeLibResponseResult.new(
             result: ResultOfGetEndpoints.new(
@@ -526,6 +547,5 @@ module TonSdk
         end
       end
     end
-
   end
 end

data/lib/ton_sdk_client/processing.rb

@@ -1,10 +1,28 @@
 module TonSdk
   module Processing
-
     #
     # types
     #
 
+    module ErrorCode
+      MESSAGE_ALREADY_EXPIRED = 501
+      MESSAGE_HAS_NOT_DESTINATION_ADDRESS = 502
+      CAN_NOT_BUILD_MESSAGE_CELL = 503
+      FETCH_BLOCK_FAILED = 504
+      SEND_MESSAGE_FAILED = 505
+      INVALID_MESSAGE_BOC = 506
+      MESSAGE_EXPIRED = 507
+      TRANSACTION_WAIT_TIMEOUT = 508
+      INVALID_BLOCK_RECEIVED = 509
+      CAN_NOT_CHECK_BLOCK_SHARD = 510
+      BLOCK_NOT_FOUND = 511
+      INVALID_DATA = 512
+      EXTERNAL_SIGNER_MUST_NOT_BE_USED = 513
+      MESSAGE_REJECTED = 514
+      INVALID_REMP_STATUS = 515
+      NEXT_REMP_STATUS_TIMEOUT = 516
+    end
+
     class ParamsOfSendMessage
       attr_reader :message, :abi, :send_events
 
@@ -16,9 +34,9 @@ module TonSdk
 
       def to_h
         {
-          message: @message,
-          abi: @abi.nil? ? nil : @abi.to_h,
-          send_events: @send_events
+          message: message,
+          abi: abi&.to_h,
+          send_events: send_events
         }
       end
     end
@@ -37,10 +55,10 @@ module TonSdk
 
       def to_h
         {
-          abi: @abi.nil? ? nil : @abi.to_h,
-          message: @message,
-          shard_block_id: @shard_block_id,
-          send_events: @send_events
+          abi: abi&.to_h,
+          message: message,
+          shard_block_id: shard_block_id,
+          send_events: send_events
         }
       end
     end
@@ -57,29 +75,34 @@ module TonSdk
 
       def to_h
         {
-          transaction: @transaction,
-          out_messages: @out_messages,
-          decoded: @decoded,
-          fees: @fees
+          transaction: transaction,
+          out_messages: out_messages,
+          decoded: decoded,
+          fees: fees
         }
       end
     end
 
     class ProcessingEvent
-      TYPES = [
-        :will_fetch_first_block,
-        :fetch_first_block_failed,
-        :will_send,
-        :did_send,
-        :send_failed,
-        :will_fetch_next_block,
-        :fetch_next_block_failed,
-        :message_expired
+      TYPES = %i[
+        will_fetch_first_block
+        fetch_first_block_failed
+        will_send
+        did_send
+        send_failed
+        will_fetch_next_block
+        fetch_next_block_failed
+        message_expired
+        remp_sent_to_validators
+        remp_included_into_block
+        remp_included_into_accepted_block
+        remp_other
+        remp_error
       ]
 
-      attr_reader :type_, :error, :shard_block_id, :message_id, :message
+      attr_reader :type_, :error, :shard_block_id, :message_id, :message, :args
 
-      def initialize(type_:, error: nil, shard_block_id: nil, message_id: nil, message: nil)
+      def initialize(type_:, error: nil, shard_block_id: nil, message_id: nil, message: nil, **args)
         unless TYPES.include?(type_)
           raise ArgumentError.new("type #{type_} is unknown; known types: #{TYPES}")
         end
@@ -88,6 +111,7 @@ module TonSdk
         @shard_block_id = shard_block_id
         @message_id = message_id
         @message = message
+        @args = args
       end
 
       def to_h
@@ -96,34 +120,40 @@ module TonSdk
         }
 
         h2 = case @type_
-        when :will_fetch_first_block
-          { }
-        when :fetch_first_block_failed
-          { 
-            error: @error
-          }
-        when :will_send, :did_send, :will_fetch_next_block
-          {
-            shard_block_id: @shard_block_id,
-            message_id: @message_id,
-            message: @message
-          }
-        when :send_failed, :fetch_next_block_failed
-          {
-            shard_block_id: @shard_block_id,
-            message_id: @message_id,
-            message: @message,
-            error: @error
-          }
-        when :message_expired
-          {
-            message_id: @message_id,
-            message: @message,
-            error: @error
-          }
-        else
-          raise ArgumentError.new("unsupported type: #{@type_}")
-        end
+             when :will_fetch_first_block
+               { }
+             when :fetch_first_block_failed
+               {
+                 error: @error
+               }
+             when :will_send, :did_send, :will_fetch_next_block
+               {
+                 shard_block_id: @shard_block_id,
+                 message_id: @message_id,
+                 message: @message
+               }
+             when :send_failed, :fetch_next_block_failed
+               {
+                 shard_block_id: @shard_block_id,
+                 message_id: @message_id,
+                 message: @message,
+                 error: @error
+               }
+             when :message_expired
+               {
+                 message_id: @message_id,
+                 message: @message,
+                 error: @error
+               }
+             when :remp_sent_to_validators, :remp_included_into_block, :remp_included_into_accepted_block, :remp_other, :remp_error
+               {
+                 message_id: message_id,
+                 timestamp: args[:timestamp],
+                 json: args[:json]
+               }
+             else
+               raise ArgumentError.new("unsupported type: #{@type_}")
+             end
 
         h1.merge(h2)
       end
@@ -136,6 +166,10 @@ module TonSdk
     end
 
     ParamsOfProcessMessage = KwStruct.new(:message_encode_params, :send_events) do
+      def initialize(message_encode_params:, send_events:)
+        super
+      end
+
       def to_h
         {
           message_encode_params: message_encode_params.to_h,
@@ -188,8 +222,11 @@ module TonSdk
             result: ResultOfProcessMessage.new(
               transaction: resp.result["transaction"],
               out_messages: resp.result["out_messages"],
-              decoded: resp.result["decoded"],
-              fees: resp.result["fees"]
+              decoded: DecodedOutput.new(
+                out_messages: resp.result.dig("decoded", "out_messages"),
+                output: resp.result.dig("decoded", "output")
+              ),
+              fees: Tvm::TransactionFees.new(**resp.result["fees"].transform_keys(&:to_sym))
             )
           )
         else
@@ -215,8 +252,11 @@ module TonSdk
             result: ResultOfProcessMessage.new(
               transaction: resp.result["transaction"],
               out_messages: resp.result["out_messages"],
-              decoded: resp.result["decoded"],
-              fees: resp.result["fees"]
+              decoded: DecodedOutput.new(
+                out_messages: resp.result.dig("decoded", "out_messages"),
+                output: resp.result.dig("decoded", "output")
+              ),
+              fees: Tvm::TransactionFees.new(**resp.result["fees"].transform_keys(&:to_sym))
             )
           )
         else

data/lib/ton_sdk_client/tvm.rb

@@ -162,7 +162,10 @@ module TonSdk
       :gas_fee,
       :out_msgs_fwd_fee,
       :total_account_fees,
-      :total_output
+      :total_output,
+      :ext_in_msg_fee,
+      :total_fwd_fees,
+      :account_fees
     ) do
       def initialize(
         in_msg_fwd_fee:,
@@ -170,7 +173,10 @@ module TonSdk
         gas_fee:,
         out_msgs_fwd_fee:,
         total_account_fees:,
-        total_output:
+        total_output:,
+        ext_in_msg_fee:,
+        total_fwd_fees:,
+        account_fees:
       )
         super
       end

data/lib/ton_sdk_client/version.rb

@@ -1,4 +1,4 @@
 module TonSdk
-  VERSION = "1.26.0"
-  NATIVE_SDK_VERSION = "1.26.0"
+  VERSION = "1.34.0"
+  NATIVE_SDK_VERSION = "1.34.0"
 end