ton_sdk_client 1.9.0 → 1.15.0

data/lib/ton_sdk_client/interop.rb

@@ -132,12 +132,12 @@ module TonSdk
     def self.request_to_native_lib(
       ctx,
       function_name,
-      function_params_json = nil,
+      function_params = nil,
       client_callback: nil,
-      is_single_thread_only: trfue
+      is_single_thread_only: true
     )
       function_name_tc_str = TcStringData.from_string(function_name)
-      function_params_json_str = function_params_json || ""
+      function_params_json_str = function_params&.to_h.to_json || ""
       function_params_json_tc_str = TcStringData.from_string(function_params_json_str)
 
       @sm = Concurrent::Semaphore.new(1)

data/lib/ton_sdk_client/net.rb

@@ -18,7 +18,7 @@ module TonSdk
       WEBSOCKET_DISCONNECTED = 610
       NOT_SUPPORTED = 611
       NO_ENDPOINTS_PROVIDED = 612
-      GRAPHQL_WEBSOCKET_INIT_ERROR = 613,
+      GRAPHQL_WEBSOCKET_INIT_ERROR = 613
       NETWORK_MODULE_RESUMED = 614
     end
 
@@ -37,20 +37,15 @@ module TonSdk
       end
     end
 
-    class ParamsOfQueryCollection
-      attr_reader :collection, :filter, :result, :order, :limit
-
+    ParamsOfQueryCollection = Struct.new(:collection, :filter, :result, :order, :limit, keyword_init: true) do
       def initialize(collection: , filter: nil, result: , order: [], limit: nil)
-        @collection = collection
-        @filter = filter
-        @result = result
-        @order = order
-        @limit = limit
+        super
       end
 
       def to_h
-        ord_h_s = if !@order.nil?
-          @order.map do |x|
+        h = super
+        ord_h_s = if !self.order.nil?
+          self.order.map do |x|
             {
               path: x.path,
               direction: x.direction.to_s.upcase
@@ -58,146 +53,54 @@ module TonSdk
           end
         end
 
-        {
-          collection: @collection,
-          filter: @filter,
-          result: @result,
-          order: ord_h_s,
-          limit: @limit
-        }
+        h[:order] = ord_h_s
+        h
       end
     end
 
-    class ResultOfQueryCollection
-      attr_reader :result
-
-      def initialize(a)
-        @result = a
-      end
-    end
-
-    class ParamsOfWaitForCollection
-      attr_reader :collection, :filter, :result, :timeout
-
+    ResultOfQueryCollection = Struct.new(:result)
+    ResultOfWaitForCollection = Struct.new(:result)
+    ResultOfQuery = Struct.new(:result)
+    ResultOfBatchQuery = Struct.new(:results)
+    ParamsOfWaitForCollection = Struct.new(:collection, :filter, :result, :timeout) do
       def initialize(collection:, filter: nil, result:, timeout: nil)
-        @collection = collection
-        @filter = filter
-        @result = result
-        @timeout = timeout
-      end
-
-      def to_h
-        {
-          collection: @collection,
-          filter: @filter,
-          result: @result,
-          timeout: @timeout
-        }
-      end
-    end
-
-    class ResultOfWaitForCollection
-      attr_reader :result
-
-      def initialize(a)
-        @result = a
+        super
       end
     end
 
-    class ParamsOfSubscribeCollection
-      attr_reader :collection, :filter, :result
-
+    ParamsOfSubscribeCollection = Struct.new(:collection, :filter, :result) do
       def initialize(collection:, filter: nil, result:)
-        @collection = collection
-        @filter = filter
-        @result = result
+        super
       end
-
-      def to_h
-        {
-          collection: @collection,
-          filter: @filter,
-          result: @result
-        }
-      end
-    end
-
-    class ResultOfSubscribeCollection
-      attr_reader :handle
-
-      def initialize(a)
-        @handle = a
-      end
-
-      def to_h = { handle: @handle }
     end
 
-    class ParamsOfQuery
-      attr_reader :query, :variables
-
+    ResultOfSubscribeCollection = Struct.new(:handle)
+    ParamsOfQuery = Struct.new(:query, :variables) do
       def initialize(query:, variables: nil)
-        @query = query
-        @variables = variables
+        super
       end
-
-      def to_h
-        {
-          query: @query,
-          variables: @variables
-        }
-      end
-    end
-
-    class ResultOfQuery
-      attr_reader :result
-
-      def initialize(a)
-        @result = a
-      end
-    end
-
-    class ParamsOfFindLastShardBlock
-      attr_reader :address
-
-      def initialize(a)
-        @address = a
-      end
-
-      def to_h = { address: @address }
     end
 
-    class ResultOfFindLastShardBlock
-      attr_reader :block_id
-
-      def initialize(a)
-        @block_id = a
-      end
-    end
-
-    class EndpointsSet
-      attr_reader :endpoints
-
-      def initialize(a)
-        @endpoints = a
-      end
-
-      def to_h = { endpoints: @endpoints }
-    end
+    ParamsOfFindLastShardBlock = Struct.new(:address)
+    ResultOfFindLastShardBlock = Struct.new(:block_id)
+    EndpointsSet = Struct.new(:endpoints)
 
     class ParamsOfQueryOperation
+      private_class_method :new
+
       attr_reader :type_, :params
 
-      def new_with_type_query_collection(params)
+      def self.new_with_type_query_collection(params)
         @type_ = :query_collection
         @params = params
       end
 
-      def new_with_type_wait_for_collection(params)
+      def self.new_with_type_wait_for_collection(params)
         @type_ = :wait_for_collection
         @params = params
       end
       
-      def new_with_type_aggregate_collection(params)
+      def self.new_with_type_aggregate_collection(params)
         @type_ = :aggregate_collection
         @params = params
       end
@@ -212,41 +115,23 @@ module TonSdk
       end
     end
 
-    class ParamsOfBatchQuery
-      attr_reader :operations
-
-      def initialize(a)
-        @operations = a
-      end
-
-      def to_h = { operations: @operations.compact.map(&:to_h) }
-    end
-
-    class ResultOfBatchQuery
-      attr_reader :results
-
-      def initialize(a)
-        @results = a
+    ParamsOfBatchQuery = Struct.new(:operations) do
+      def to_h
+        {
+          operations: self.operations.compact.map(&:to_h)
+        }
       end
-
-      def to_h = { results: @results }
     end
 
-    class ParamsOfAggregateCollection
-      attr_reader :collection, :filter, :fields
-
+    ParamsOfAggregateCollection = Struct.new(:collection, :filter, :fields) do
       def initialize(collection:, filter: nil, fields: [])
-        @collection = collection
-        @filter = filter
-        @fields = fields
+        super
       end
 
       def to_h
-        {
-          collection: @collection,
-          filter: @filter,
-          fields: @fields.map(&:to_h)
-        }
+        h = super
+        h[:fields] = self.fields.map(&:to_h)
+        h
       end
     end
 
@@ -277,16 +162,15 @@ module TonSdk
       end
     end
 
-    class ResultOfAggregateCollection
-      attr_reader :values
+    ResultOfAggregateCollection = Struct.new(:values)
 
-      def initialize(a)
-        @values = a
+    ParamsOfQueryCounterparties = Struct.new(:account, :result, :first, :after, keyword_init: true) do
+      def initialize(account:, result:, first: nil, after: nil)
+        super
       end
-
-      def to_h = { values: @values }
     end
 
+    ResultOfGetEndpoints = Struct.new(:query, :endpoints, keyword_init: true)
 
 
     #
@@ -297,7 +181,7 @@ module TonSdk
       Interop::request_to_native_lib(
         ctx,
         "net.query_collection",
-        params.to_h.to_json,
+        params,
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
@@ -314,7 +198,7 @@ module TonSdk
       Interop::request_to_native_lib(
         ctx,
         "net.wait_for_collection",
-        params.to_h.to_json,
+        params,
         is_single_thread_only: false
       ) do |resp|
         if resp.success?
@@ -328,7 +212,7 @@ module TonSdk
     end
 
     def self.unsubscribe(ctx, params)
-      Interop::request_to_native_lib(ctx, "net.unsubscribe", params.to_h.to_json) do |resp|
+      Interop::request_to_native_lib(ctx, "net.unsubscribe", params) do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(
             result: ""
@@ -343,7 +227,7 @@ module TonSdk
       Interop::request_to_native_lib(
         ctx,
         "net.subscribe_collection",
-        params.to_h.to_json,
+        params,
         client_callback: client_callback,
         is_single_thread_only: false
       ) do |resp|
@@ -358,7 +242,7 @@ module TonSdk
     end
 
     def self.query(ctx, params)
-      Interop::request_to_native_lib(ctx, "net.query", params.to_h.to_json) do |resp|
+      Interop::request_to_native_lib(ctx, "net.query", params) do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(
             result: ResultOfQuery.new(resp.result["result"])
@@ -370,7 +254,7 @@ module TonSdk
     end
 
     def self.suspend(ctx)
-      Interop::request_to_native_lib(ctx, "net.suspend", "") do |resp|
+      Interop::request_to_native_lib(ctx, "net.suspend") do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(result: "")
         else
@@ -380,7 +264,7 @@ module TonSdk
     end
 
     def self.resume(ctx)
-      Interop::request_to_native_lib(ctx, "net.resume", "") do |resp|
+      Interop::request_to_native_lib(ctx, "net.resume") do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(result: "")
         else
@@ -390,7 +274,7 @@ module TonSdk
     end
 
     def self.find_last_shard_block(ctx, params)
-      Interop::request_to_native_lib(ctx, "net.find_last_shard_block", params.to_h.to_json) do |resp|
+      Interop::request_to_native_lib(ctx, "net.find_last_shard_block", params) do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(
             result: ResultOfFindLastShardBlock.new(resp.result["block_id"])
@@ -402,7 +286,7 @@ module TonSdk
     end
 
     def self.fetch_endpoints(ctx)
-      Interop::request_to_native_lib(ctx, "net.fetch_endpoints", nil) do |resp|
+      Interop::request_to_native_lib(ctx, "net.fetch_endpoints") do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(
             result: EndpointsSet.new(resp.result["endpoints"])
@@ -414,7 +298,7 @@ module TonSdk
     end
 
     def self.set_endpoints(ctx, params)
-      Interop::request_to_native_lib(ctx, "net.set_endpoints", params.to_h.to_json) do |resp|
+      Interop::request_to_native_lib(ctx, "net.set_endpoints", params) do |resp|
         if resp.success?
           yield NativeLibResponsetResult.new(
             result: nil
@@ -427,7 +311,7 @@ module TonSdk
   end
 
   def self.batch_query(ctx, params)
-    Interop::request_to_native_lib(ctx, "net.batch_query", params.to_h.to_json) do |resp|
+    Interop::request_to_native_lib(ctx, "net.batch_query", params) do |resp|
       if resp.success?
         yield NativeLibResponsetResult.new(
           result: ResultOfBatchQuery.new(resp.result["results"])
@@ -439,7 +323,7 @@ module TonSdk
   end
 
   def self.aggregate_collection(ctx, params)
-    Interop::request_to_native_lib(ctx, "net.aggregate_collection", params.to_h.to_json) do |resp|
+    Interop::request_to_native_lib(ctx, "net.aggregate_collection", params) do |resp|
       if resp.success?
         yield NativeLibResponsetResult.new(
           result: ResultOfAggregateCollection.new(resp.result["values"])
@@ -449,4 +333,31 @@ module TonSdk
       end
     end
   end
+
+  def self.query_counterparties(ctx, params)
+    Interop::request_to_native_lib(ctx, "net.query_counterparties", params) do |resp|
+      if resp.success?
+        yield NativeLibResponsetResult.new(
+          result: ResultOfQueryCollection.new(resp.result["result"])
+        )
+      else
+        yield resp
+      end
+    end
+  end
+
+  def self.get_endpoints(ctx, params)
+    Interop::request_to_native_lib(ctx, "net.get_endpoints", params) do |resp|
+      if resp.success?
+        yield NativeLibResponsetResult.new(
+          result: ResultOfGetEndpoints.new(
+            query: resp.result["query"],
+            endpoints: resp.result["endpoints"],
+          )
+        )
+      else
+        yield resp
+      end
+    end
+  end
 end

data/lib/ton_sdk_client/processing.rb

@@ -23,19 +23,7 @@ module TonSdk
       end
     end
 
-    class ResultOfSendMessage
-      attr_reader :shard_block_id
-
-      def initialize(a)
-        @shard_block_id = a
-      end
-
-      def to_h
-        {
-          shard_block_id: @shard_block_id
-        }
-      end
-    end
+    ResultOfSendMessage = Struct.new(:shard_block_id)
 
     class ParamsOfWaitForTransaction
       attr_reader :abi, :message, :shard_block_id, :send_events
@@ -141,30 +129,13 @@ module TonSdk
       end
     end
 
-    class DecodedOutput
-      attr_reader :out_messages, :output
-
+    DecodedOutput = Struct.new(:out_messages, :output) do
       def initialize(out_messages:, output: nil)
-        @out_messages = out_messages
-        @output = output
-      end
-
-      def to_h
-        {
-          out_messages: @out_messages,
-          output: @output
-        }
+        super
       end
     end
 
-    class ParamsOfProcessMessage
-      attr_reader :message_encode_params, :send_events
-
-      def initialize(message_encode_params:, send_events:)
-        @message_encode_params = message_encode_params
-        @send_events = send_events
-      end
-
+    ParamsOfProcessMessage = Struct.new(:message_encode_params, :send_events) do
       def to_h
         {
           message_encode_params: @message_encode_params.to_h,
@@ -186,7 +157,7 @@ module TonSdk
       Interop::request_to_native_lib(
         ctx,
         "processing.send_message",
-        params.to_h.to_json,
+        params,
         client_callback: client_callback,
         is_single_thread_only: false
       ) do |resp|
@@ -208,7 +179,7 @@ module TonSdk
       Interop::request_to_native_lib(
         ctx,
         "processing.wait_for_transaction",
-        params.to_h.to_json,
+        params,
         client_callback: client_callback,
         is_single_thread_only: false
       ) do |resp|
@@ -235,7 +206,7 @@ module TonSdk
       Interop::request_to_native_lib(
         ctx,
         "processing.process_message",
-        params.to_h.to_json,
+        params,
         client_callback: client_callback,
         is_single_thread_only: false
       ) do |resp|