everscale-client-ruby 1.1.44 → 1.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ef2dee945936c8477d06c0e0dabbee92cc96ca9939eae4e0cf5bb89cab063f
-  data.tar.gz: '0649026d6e877d3e09c01aae5fe2e4280363c01843832fdaa59967c7b159ae21'
+  metadata.gz: fd5555c9c9abe1ebd8114686f13a1e9899c1c93c063df2d5cd6aa3eb187e760a
+  data.tar.gz: 479f9a3ddabc09d16e5b1087f318bab9ac397ef4820c8dd99a95fa3a67e10e4a
 SHA512:
-  metadata.gz: d2fdd97074097786bcef90bd14c9016592253b8317786557d4a2cfa96232633b429d9e675835463959ae45bda279c4154846a7d28385eec8bcbb12f9bb90b926
-  data.tar.gz: 3d1747266b06dda00fa3761782318011c94c0d8889aa1f92f3ebc34938779f095ddeccd8a10998a5b63879554f105e9531aa7ae13b11887107dacb9f756ad652
+  metadata.gz: 2b584f384a498c2fb6656c7ddb43c5538f878ce1c14f1cafd95e457d60cf748c2f21114efc6f65d19eef438b8e46fe204c5cf33ca8c7882dcf25481f8a6e13c9
+  data.tar.gz: c2fcb5bb3e0b7a4b33e1cc4cf90887a521af7d0ba0db58fe39d6af958a79564f999cad7a4e3f03886e6e92b796fc23c9028a8bdbc348256e78ce507bb9a0177b

data/lib/code_generator/code_generator.rb

@@ -234,22 +234,33 @@ cd everscale-client-ruby\n
 
   private def generateClientModule(mod, modules)
     content = "module TonClient\n\n#{TAB}class #{mod.name.capitalize}\n#{TAB}#{TAB}include CommonInstanceHelpers\n\n"
-    content << "#{TAB}#{TAB}attr_reader :core, :context\n"
+    content << "#{TAB}#{TAB}attr_reader :context, :context_config, :request_id, :requests\n"
     content << "#{TAB}#{TAB}private_accessor "
     modules.each_with_index do |m, i|
       next if m.name.downcase == 'client'
       content << ((modules.size - 1) == i ? ":_#{m.name}\n" : ":_#{m.name}, ")
     end
     content << "#{TAB}#{TAB}MODULE = self.to_s.downcase.gsub(/^(.+::|)(\\w+)$/, '\\2').freeze\n\n"
-    content << "#{TAB}#{TAB}def initialize(context: Context.new, core: TonClient::TonBinding)\n"
-    content << "#{TAB}#{TAB}#{TAB}@context = context\n"
-    content << "#{TAB}#{TAB}#{TAB}@core = core\n#{TAB}#{TAB}end\n\n"
-    content << "#{TAB}#{TAB}def destroy_context\n"
-    content << "#{TAB}#{TAB}#{TAB}core.tc_destroy_context(context.id)\n#{TAB}#{TAB}end\n\n"
+    content << "#{TAB}#{TAB}def initialize(context_config: {})\n"
+    content << "#{TAB}#{TAB}#{TAB}@context_config = context_config\n"
+    content << "#{TAB}#{TAB}#{TAB}@request_id = Concurrent::AtomicFixnum.new(1)\n"
+    content << "#{TAB}#{TAB}#{TAB}@requests = Concurrent::Hash.new()\n"
+    content << "#{TAB}#{TAB}#{TAB}config = TonBinding.make_string(context_config.to_json)\n"
+    content << "#{TAB}#{TAB}#{TAB}context_ptr = TonBinding.tc_create_context(config)\n"
+    content << "#{TAB}#{TAB}#{TAB}@context = TonBinding.read_string_to_hash(context_ptr)['result']\n"
+    content << "#{TAB}#{TAB}#{TAB}ObjectSpace.define_finalizer(self, self.class.finalize(@context))\n"
+    content << "#{TAB}#{TAB}end\n\n"
+    content << "#{TAB}#{TAB}def self.finalize(ctx)\n"
+    content << "#{TAB}#{TAB}#{TAB}Proc.new do\n"
+    content << "#{TAB}#{TAB}#{TAB}#{TAB}if (ctx != nil) && (ctx > 0)\n"
+    content << "#{TAB}#{TAB}#{TAB}#{TAB}#{TAB}TonBinding.tc_destroy_context(ctx)\n"
+    content << "#{TAB}#{TAB}#{TAB}#{TAB}end\n"
+    content << "#{TAB}#{TAB}#{TAB}end\n"
+    content << "#{TAB}#{TAB}end\n\n"
     modules.each_with_index do |m, i|
       next if m.name.downcase == 'client'
       content << "#{TAB}#{TAB}def #{m.name}\n"
-      content << "#{TAB}#{TAB}#{TAB}_#{m.name} ||= #{m.name.capitalize}.new(context: context)\n"
+      content << "#{TAB}#{TAB}#{TAB}_#{m.name} ||= #{m.name.capitalize}.new(context: context, request_id: request_id, requests: requests)\n"
       content << "#{TAB}#{TAB}end\n\n"
     end
 
@@ -265,11 +276,12 @@ cd everscale-client-ruby\n
 
   private def generateModule(mod)
     content = "module TonClient\n\n#{TAB}class #{mod.name.capitalize}\n#{TAB}#{TAB}include CommonInstanceHelpers\n\n"
-    content << "#{TAB}#{TAB}attr_reader :core, :context\n"
+    content << "#{TAB}#{TAB}attr_reader :context, :request_id, :requests\n"
     content << "#{TAB}#{TAB}MODULE = self.to_s.downcase.gsub(/^(.+::|)(\\w+)$/, '\\2').freeze\n\n"
-    content << "#{TAB}#{TAB}def initialize(context: Context.new, core: TonClient::TonBinding)\n"
+    content << "#{TAB}#{TAB}def initialize(context: nil, request_id: nil, requests: nil)\n"
     content << "#{TAB}#{TAB}#{TAB}@context = context\n"
-    content << "#{TAB}#{TAB}#{TAB}@core = core\n"
+    content << "#{TAB}#{TAB}#{TAB}@request_id = request_id\n"
+    content << "#{TAB}#{TAB}#{TAB}@requests = requests\n"
     content << "#{TAB}#{TAB}end\n\n"
 
     mod.functions.each do |func|
@@ -287,10 +299,10 @@ cd everscale-client-ruby\n
     content << "#{TAB}#{TAB}def #{function.name}"
     if function.arguments.empty?
       content << "(&block)\n"
-      content << "#{TAB}#{TAB}#{TAB}core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: {}, &block)\n"
+      content << "#{TAB}#{TAB}#{TAB}TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: {}, &block)\n"
     else
       content << "(payload, &block)\n"
-      content << "#{TAB}#{TAB}#{TAB}core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)\n"
+      content << "#{TAB}#{TAB}#{TAB}TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)\n"
     end
     content << "#{TAB}#{TAB}end\n\n"
 

data/lib/everscale-client-ruby/Binding/binding.rb

@@ -1,52 +1,45 @@
+require 'byebug'
+
 module TonClient
   module TonBinding
-    @@request_id = 0
-    @@requests = {}
-
     class Response
-      attr_reader :core
-      attr_accessor :result, :error, :custom_response, :finished, :request_id, :current_response
+      attr_accessor :result, :error, :custom_response, :finished, :request_id, :response_type
 
-      def initialize(core: TonClient::TonBinding)
-        @core = core
+      def initialize(request_id, string_data, response_type, finished)
+        update(request_id, string_data, response_type, finished)
       end
 
+      private
       def update(request_id, string_data, response_type, finished)
-        response_hash = core.read_string_to_hash(string_data)
-        self.finished = finished
-        self.request_id = request_id
-        self.current_response = response_hash
+        if response_type == -1
+          @finished = true
+          @request_id = request_id
+          @response_type = response_type
+          @error = string_data || "Client deallocated"
+          return self
+        end
+        
+        response_hash = TonBinding.read_string_to_hash(string_data)
+        @finished = finished
+        @request_id = request_id
+        @response_type = response_type
+        
         case response_type
         when 0
           # result
-          self.result = response_hash
+          @result = response_hash
         when 1
           # error
-          self.error = response_hash
+          @error = response_hash
         else
-          # another
-          if response_type >= 100
-            self.custom_responses = response_hash
-          end
+          # # another
+          # if response_type >= 100
+          @custom_response = response_hash
+          # end
         end
-      end
-    end
-
-    def self.generate_request_id
-      @@request_id = 0 if @@request_id == 4294967295
-      @@request_id += 1
-    end
-
-    def self.get_request(id)
-      @@requests[id]
-    end
-
-    def self.delete_request(id)
-      @@requests[id] = nil
-    end
 
-    def self.set_request(id, &request_block)
-      @@requests[id] = request_block
+        self
+      end
     end
   end
 end
@@ -56,18 +49,19 @@ module TonClient
   
   module TonBinding
     extend FFI::Library
-    ffi_lib FFI::Library::LIBC
+    # ffi_lib FFI::Library::LIBC
+    # ffi_lib 'ruby'
     
     # memory allocators
-    attach_function :malloc, [:size_t], :pointer
-    attach_function :calloc, [:size_t], :pointer
-    attach_function :valloc, [:size_t], :pointer
-    attach_function :realloc, [:pointer, :size_t], :pointer
-    attach_function :free, [:pointer], :void
+    # attach_function :malloc, [:size_t], :pointer
+    # attach_function :calloc, [:size_t], :pointer
+    # attach_function :valloc, [:size_t], :pointer
+    # attach_function :realloc, [:pointer, :size_t], :pointer
+    # attach_function :free, [:pointer], :void
     
-    # memory movers
-    attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
-    attach_function :bcopy, [:pointer, :pointer, :size_t], :void
+    # # memory movers
+    # attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
+    # attach_function :bcopy, [:pointer, :pointer, :size_t], :void
     
     def self.setup_bindings
 
@@ -116,28 +110,21 @@ module TonClient
     end
 
     def self.make_string(string)
+      # p 1
       result = TonBinding::TcStringDataT.new
-      result[:content] = FFI::MemoryPointer.from_string(string)
-      result[:len] = string.bytesize
+      bytes_count = string.unpack("C*").size
+      ptr1 = FFI::MemoryPointer.new(:char, bytes_count)
+      ptr1.put_bytes(0, string, 0, bytes_count)
+      # ptr1.autorelease = false
+      # p ptr1.autorelease?
+      result[:content] = ptr1
+      # result[:content] = FFI::MemoryPointer.from_string(string)
+      # result[:len] = string.bytesize
+      result[:len] = ptr1.size
+      # p 2
       result
     end
 
-    # def self.read_string(tc_string_handle)
-    #   is_ref = tc_string_handle.class == TonClient::TonBinding::TcStringHandleT
-    #   if is_ref
-    #     string = tc_read_string(tc_string_handle)
-    #   else
-    #     string = tc_string_handle
-    #   end
-
-    #   if string[:content].address > 1
-    #     string = string[:content].read_string(string[:len]).force_encoding('UTF-8') + ''
-    #     tc_destroy_string(tc_string_handle) if is_ref
-    #     return string
-    #   end
-    #   nil
-    # end
-
     def self.read_string(tc_string_handle)
       is_ref = tc_string_handle.class == FFI::Pointer
       if is_ref
@@ -147,11 +134,15 @@ module TonClient
       end
 
       if string[:content].address > 1
-        string = string[:content].read_string(string[:len]).force_encoding('UTF-8') + ''
-        tc_destroy_string(tc_string_handle) if is_ref
-        return string
+        result = string[:content].read_string(string[:len])
+        if is_ref
+          tc_destroy_string(tc_string_handle)
+          # free(tc_string_handle)
+        end
+        result
+      else
+        nil
       end
-      nil
     end
 
     def self.read_string_to_hash(tc_string_handle_t_ref)
@@ -173,29 +164,35 @@ module TonClient
       return response['error'] if response['error']
     end
 
-    def self.send_request(context: 1, method_name: '', payload: {}, request_id: 1, &block)
+    # block = { |response| }
+    def self.requestLibrary(context: nil, request_id: nil, requests: nil, sm: nil, method_name: '', payload: {}, &block)
       raise 'context not found' unless context
       raise 'method_name is empty' if method_name.empty?
-
-      if block
-        method_name_string = make_string(method_name)
-        payload_string = make_string(payload.to_json)
-        tc_request(context, method_name_string, payload_string, request_id, &block)
+      # raise "context: #{context}. request_id not is nil. Client dealloc." unless request_id
+      unless request_id
+        # p "context: #{context}. request_id is nil. Client deallocated."
+        block.call(Response.new(request_id, "Client deallocated", -1, true)) if block
+        return
       end
-    end
+      method_name_string = make_string(method_name)
+      payload_string = make_string(payload.to_json)
 
-    # block = { |response| }
-    def self.requestLibrary(context: 1, method_name: '', payload: {}, &block)
-      request_id = generate_request_id
-      set_request(request_id, &block)
-      send_request(context: context, method_name: method_name, payload: payload, request_id: request_id) do |request_id, string_data, response_type, finished|
-        if get_request(request_id)
-          response = Response.new
-          response.update(request_id, string_data, response_type, finished)
-          get_request(request_id).call(response)
-          delete_request(request_id) if finished
+      request_id = request_id.increment
+      requests[request_id] = block
+
+      tc_request(context, method_name_string, payload_string, request_id) do |request_id, string_data, response_type, finished|
+        begin
+          request = requests[request_id]
+          if request
+              request.call(Response.new(request_id, string_data, response_type, finished))
+            requests.delete(request_id) if finished
+          end
+        rescue => ex
+          block.call(Response.new(request_id, ex.message, -1, true)) if block
         end
       end
+    rescue => ex
+      block.call(Response.new(request_id, ex.message, -1, true)) if block
     end
 
   end

data/lib/everscale-client-ruby/Binding/struct.rb

@@ -9,13 +9,5 @@ module TonClient
       layout :content, :pointer,
         :len, :uint32
     end
-
-
-    # typedef struct  {
-    # } tc_string_handle_t;
-    class TcStringHandleT < FFI::Struct
-      layout :content, :pointer,
-        :len, :uint32
-    end
   end
 end

data/lib/everscale-client-ruby/Client/Abi.rb

@@ -3,12 +3,13 @@ module TonClient
   class Abi
     include CommonInstanceHelpers
 
-    attr_reader :core, :context
+    attr_reader :context, :request_id, :requests
     MODULE = self.to_s.downcase.gsub(/^(.+::|)(\w+)$/, '\2').freeze
 
-    def initialize(context: Context.new, core: TonClient::TonBinding)
+    def initialize(context: nil, request_id: nil, requests: nil)
       @context = context
-      @core = core
+      @request_id = request_id
+      @requests = requests
     end
 
     # INPUT: ParamsOfEncodeMessageBody
@@ -27,7 +28,7 @@ module TonClient
     # data_to_sign: String<Optional> -     #     # Optional data to sign.    #     # Encoded with `base64`.
     # # Presents when `message` is unsigned. Can be used for externalmessage signing. Is this case you need to sing this data andproduce signed message using `abi.attach_signature`.
     def encode_message_body(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfAttachSignatureToMessageBody
@@ -38,7 +39,7 @@ module TonClient
     # RESPONSE: ResultOfAttachSignatureToMessageBody
     # body: String - 
     def attach_signature_to_message_body(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeMessage
@@ -59,7 +60,7 @@ module TonClient
     # address: String -     #     # Destination address.
     # message_id: String -     #     # Message id.
     def encode_message(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeInternalMessage
@@ -77,7 +78,7 @@ module TonClient
     # address: String -     #     # Destination address.
     # message_id: String -     #     # Message id.
     def encode_internal_message(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfAttachSignature
@@ -89,7 +90,7 @@ module TonClient
     # message: String -     #     # Signed message BOC
     # message_id: String -     #     # Message ID
     def attach_signature(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeMessage
@@ -102,7 +103,7 @@ module TonClient
     # value: Value<Optional> -     #     # Parameters or result value.
     # header: FunctionHeader<Optional> -     #     # Function header.
     def decode_message(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeMessageBody
@@ -116,7 +117,7 @@ module TonClient
     # value: Value<Optional> -     #     # Parameters or result value.
     # header: FunctionHeader<Optional> -     #     # Function header.
     def decode_message_body(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeAccount
@@ -129,7 +130,7 @@ module TonClient
     # account: String -     #     # Account BOC encoded in `base64`.
     # id: String -     #     # Account ID  encoded in `hex`.
     def encode_account(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeAccountData
@@ -139,7 +140,7 @@ module TonClient
     # RESPONSE: ResultOfDecodeAccountData
     # data: Value -     #     # Decoded data as a JSON structure.
     def decode_account_data(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfUpdateInitialData
@@ -151,7 +152,7 @@ module TonClient
     # RESPONSE: ResultOfUpdateInitialData
     # data: String -     #     # Updated data BOC or BOC handle
     def update_initial_data(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeInitialData
@@ -162,7 +163,7 @@ module TonClient
     # RESPONSE: ResultOfEncodeInitialData
     # data: String -     #     # Updated data BOC or BOC handle
     def encode_initial_data(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeInitialData
@@ -173,7 +174,7 @@ module TonClient
     # initial_data: Value<Optional> -     #     # List of initial values of contract's public variables.    #     # Initial data is decoded if `abi` input parameter is provided
     # initial_pubkey: String -     #     # Initial account owner's public key
     def decode_initial_data(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeBoc
@@ -183,7 +184,7 @@ module TonClient
     # RESPONSE: ResultOfDecodeBoc
     # data: Value -     #     # Decoded data as a JSON structure.
     def decode_boc(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfAbiEncodeBoc
@@ -193,7 +194,7 @@ module TonClient
     # RESPONSE: ResultOfAbiEncodeBoc
     # boc: String -     #     # BOC encoded as base64
     def encode_boc(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfCalcFunctionId
@@ -203,7 +204,7 @@ module TonClient
     # RESPONSE: ResultOfCalcFunctionId
     # function_id: Number -     #     # Contract function ID
     def calc_function_id(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
   end

data/lib/everscale-client-ruby/Client/Boc.rb

@@ -3,12 +3,13 @@ module TonClient
   class Boc
     include CommonInstanceHelpers
 
-    attr_reader :core, :context
+    attr_reader :context, :request_id, :requests
     MODULE = self.to_s.downcase.gsub(/^(.+::|)(\w+)$/, '\2').freeze
 
-    def initialize(context: Context.new, core: TonClient::TonBinding)
+    def initialize(context: nil, request_id: nil, requests: nil)
       @context = context
-      @core = core
+      @request_id = request_id
+      @requests = requests
     end
 
     # INPUT: ParamsOfParse
@@ -16,7 +17,7 @@ module TonClient
     # RESPONSE: ResultOfParse
     # parsed: Value -     #     # JSON containing parsed BOC
     def parse_message(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfParse
@@ -24,7 +25,7 @@ module TonClient
     # RESPONSE: ResultOfParse
     # parsed: Value -     #     # JSON containing parsed BOC
     def parse_transaction(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfParse
@@ -32,7 +33,7 @@ module TonClient
     # RESPONSE: ResultOfParse
     # parsed: Value -     #     # JSON containing parsed BOC
     def parse_account(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfParse
@@ -40,7 +41,7 @@ module TonClient
     # RESPONSE: ResultOfParse
     # parsed: Value -     #     # JSON containing parsed BOC
     def parse_block(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfParseShardstate
@@ -50,7 +51,7 @@ module TonClient
     # RESPONSE: ResultOfParse
     # parsed: Value -     #     # JSON containing parsed BOC
     def parse_shardstate(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfGetBlockchainConfig
@@ -58,7 +59,7 @@ module TonClient
     # RESPONSE: ResultOfGetBlockchainConfig
     # config_boc: String -     #     # Blockchain config BOC encoded as base64
     def get_blockchain_config(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfGetBocHash
@@ -66,7 +67,7 @@ module TonClient
     # RESPONSE: ResultOfGetBocHash
     # hash: String -     #     # BOC root hash encoded with hex
     def get_boc_hash(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfGetBocDepth
@@ -74,7 +75,7 @@ module TonClient
     # RESPONSE: ResultOfGetBocDepth
     # depth: Number -     #     # BOC root cell depth
     def get_boc_depth(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfGetCodeFromTvc
@@ -82,7 +83,7 @@ module TonClient
     # RESPONSE: ResultOfGetCodeFromTvc
     # code: String -     #     # Contract code encoded as base64
     def get_code_from_tvc(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfBocCacheGet
@@ -90,7 +91,7 @@ module TonClient
     # RESPONSE: ResultOfBocCacheGet
     # boc: String<Optional> -     #     # BOC encoded as base64.
     def cache_get(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfBocCacheSet
@@ -99,14 +100,14 @@ module TonClient
     # RESPONSE: ResultOfBocCacheSet
     # boc_ref: String -     #     # Reference to the cached BOC
     def cache_set(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfBocCacheUnpin
     # pin: String -     #     # Pinned name
     # boc_ref: String<Optional> -     #     # Reference to the cached BOC.    #     # If it is provided then only referenced BOC is unpinned
     def cache_unpin(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeBoc
@@ -115,7 +116,7 @@ module TonClient
     # RESPONSE: ResultOfEncodeBoc
     # boc: String -     #     # Encoded cell BOC or BOC cache key.
     def encode_boc(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfGetCodeSalt
@@ -124,7 +125,7 @@ module TonClient
     # RESPONSE: ResultOfGetCodeSalt
     # salt: String<Optional> -     #     # Contract code salt if present.    #     # BOC encoded as base64 or BOC handle
     def get_code_salt(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfSetCodeSalt
@@ -134,7 +135,7 @@ module TonClient
     # RESPONSE: ResultOfSetCodeSalt
     # code: String -     #     # Contract code with salt set.    #     # BOC encoded as base64 or BOC handle
     def set_code_salt(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeTvc
@@ -153,7 +154,7 @@ module TonClient
     # split_depth: Number<Optional> -     #     # Is present and non-zero only in instances of large smart contracts
     # compiler_version: String<Optional> -     #     # Compiler version, for example 'sol 0.49.0'
     def decode_tvc(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeTvc
@@ -167,7 +168,7 @@ module TonClient
     # RESPONSE: ResultOfEncodeTvc
     # tvc: String -     #     # Contract TVC image BOC encoded as base64 or BOC handle of boc_cache parameter was specified
     def encode_tvc(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeExternalInMessage
@@ -180,7 +181,7 @@ module TonClient
     # message: String -     #     # Message BOC encoded with `base64`.
     # message_id: String -     #     # Message id.
     def encode_external_in_message(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfGetCompilerVersion
@@ -188,7 +189,7 @@ module TonClient
     # RESPONSE: ResultOfGetCompilerVersion
     # version: String<Optional> -     #     # Compiler version, for example 'sol 0.49.0'
     def get_compiler_version(payload, &block)
-      core.requestLibrary(context: context.id, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
+      TonBinding.requestLibrary(context: context, request_id: request_id, requests: requests, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
   end