everscale-client-ruby 1.1.43 → 1.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aefe3210301515144c6f4302e4788c1f145341805663f5a100cfacce5990ed4
-  data.tar.gz: 7dc12fd1d4e919dfd47d505c17913e99da16f987cc7af19340c9355c1cc81897
+  metadata.gz: 9ef18c6e5ec06aec7b4d2a5469980f3ba4a14d74122a72ee66f64138e08f87d8
+  data.tar.gz: ca752bcc10ae424fdf22fc8d26809df20cf9e030078bf828fa0c814fb61e0334
 SHA512:
-  metadata.gz: bbb3f882bf2a878187b91cb1a87391eaa5ab7339280899f3c74254e13e68fe363eca05f154b35bd5123bae347c6dfc37c9d96317196eb17d25851be16cf245e6
-  data.tar.gz: 2669d48d4d0fe9f840c774c61279357ebd74ff01bb960e1a0c20ecaa5bb172dadda9f2e67212f8794c4f027a6e9238f9e9bafe8f553922c4c9b8596374d9dd2f
+  metadata.gz: a51eb6ea6dc7624e8583bac6c886a58085ac49cbb38d298a8f9dc24da84506acc89338c0d1178b93ddb3f9a605f2e296a57427c265a00cc4bedcbfb8cdda0861
+  data.tar.gz: 2add7a7abf6a257a925bc40a4670a8579e6d89580753681811ac40458eb34ea427bc9ea51faa315f4b831a3e6ffeb18b3dcf81d4f797ebdacd92356c15f7f4aa

data/lib/code_generator/api.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.37.1",
+  "version": "1.37.2",
   "modules": [
     {
       "name": "client",
@@ -540,7 +540,7 @@
                 "type": "String"
               },
               "summary": "Access key to GraphQL API.",
-              "description": "You can specify here Evercloud project secret ot serialized JWT."
+              "description": "You can specify here Basic Auth secret (Evercloud project secret) in hex string\nor serialized JWT in base64 string.\nWill be passed on as Authorization: Basic ... or Authorization: Bearer ... header."
             }
           ],
           "summary": null,
@@ -1310,29 +1310,61 @@
           "enum_types": [
             {
               "name": "AES",
-              "type": "Ref",
-              "ref_name": "crypto.AesParamsEB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.AesParamsEB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             },
             {
               "name": "ChaCha20",
-              "type": "Ref",
-              "ref_name": "crypto.ChaCha20ParamsEB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.ChaCha20ParamsEB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             },
             {
               "name": "NaclBox",
-              "type": "Ref",
-              "ref_name": "crypto.NaclBoxParamsEB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.NaclBoxParamsEB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             },
             {
               "name": "NaclSecretBox",
-              "type": "Ref",
-              "ref_name": "crypto.NaclSecretBoxParamsEB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.NaclSecretBoxParamsEB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             }
@@ -1588,22 +1620,46 @@
           "enum_types": [
             {
               "name": "ChaCha20",
-              "type": "Ref",
-              "ref_name": "crypto.ChaCha20ParamsCB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.ChaCha20ParamsCB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             },
             {
               "name": "NaclBox",
-              "type": "Ref",
-              "ref_name": "crypto.NaclBoxParamsCB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.NaclBoxParamsCB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             },
             {
               "name": "NaclSecretBox",
-              "type": "Ref",
-              "ref_name": "crypto.NaclSecretBoxParamsCB",
+              "type": "Struct",
+              "struct_fields": [
+                {
+                  "name": "value",
+                  "type": "Ref",
+                  "ref_name": "crypto.NaclSecretBoxParamsCB",
+                  "summary": null,
+                  "description": null
+                }
+              ],
               "summary": null,
               "description": null
             }

data/lib/code_generator/code_generator.rb

@@ -234,18 +234,21 @@ 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\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 initialize(context_config: {})\n"
+    content << "#{TAB}#{TAB}#{TAB}@context_config = context_config\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}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}#{TAB}TonBinding.tc_destroy_context(context)\n#{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"
@@ -265,11 +268,10 @@ 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\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)\n"
     content << "#{TAB}#{TAB}#{TAB}@context = context\n"
-    content << "#{TAB}#{TAB}#{TAB}@core = core\n"
     content << "#{TAB}#{TAB}end\n\n"
 
     mod.functions.each do |func|
@@ -287,10 +289,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, 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, 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,21 +1,24 @@
+require 'byebug'
+
 module TonClient
   module TonBinding
-    @@request_id = 0
-    @@requests = {}
+    @@request_id = Concurrent::AtomicFixnum.new(1)
+    @@requests = Concurrent::Hash.new()
 
     class Response
-      attr_reader :core
       attr_accessor :result, :error, :custom_response, :finished, :request_id, :current_response
 
-      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)
+        response_hash = TonBinding.read_string_to_hash(string_data)
         self.finished = finished
         self.request_id = request_id
         self.current_response = response_hash
+        
         case response_type
         when 0
           # result
@@ -29,25 +32,27 @@ module TonClient
             self.custom_responses = response_hash
           end
         end
+
+        self
       end
     end
 
     def self.generate_request_id
-      @@request_id = 0 if @@request_id == 4294967295
-      @@request_id += 1
+      @@request_id.increment()
+      @@request_id.value
     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
     end
+
+    def self.delete_request(id)
+      @@requests[id] = nil
+    end
   end
 end
 
@@ -56,18 +61,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 +122,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,8 +146,11 @@ 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
+        string = string[:content].read_string(string[:len])
+        if is_ref
+          tc_destroy_string(tc_string_handle)
+          # free(tc_string_handle)
+        end
         return string
       end
       nil
@@ -173,26 +175,19 @@ 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: 1, 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)
-      end
-    end
-
-    # block = { |response| }
-    def self.requestLibrary(context: 1, method_name: '', payload: {}, &block)
       request_id = generate_request_id
+      method_name_string = make_string(method_name)
+      payload_string = make_string(payload.to_json)
       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)
+      tc_request(context, method_name_string, payload_string, request_id) do |request_id, string_data, response_type, finished|
+        request = get_request(request_id)
+        if request
+          request.call(Response.new(request_id, string_data, response_type, finished))
           delete_request(request_id) if finished
         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,11 @@ module TonClient
   class Abi
     include CommonInstanceHelpers
 
-    attr_reader :core, :context
+    attr_reader :context
     MODULE = self.to_s.downcase.gsub(/^(.+::|)(\w+)$/, '\2').freeze
 
-    def initialize(context: Context.new, core: TonClient::TonBinding)
+    def initialize(context: nil)
       @context = context
-      @core = core
     end
 
     # INPUT: ParamsOfEncodeMessageBody
@@ -27,7 +26,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfAttachSignatureToMessageBody
@@ -38,7 +37,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeMessage
@@ -59,7 +58,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeInternalMessage
@@ -77,7 +76,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfAttachSignature
@@ -89,7 +88,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeMessage
@@ -102,7 +101,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeMessageBody
@@ -116,7 +115,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeAccount
@@ -129,7 +128,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeAccountData
@@ -139,7 +138,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfUpdateInitialData
@@ -151,7 +150,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfEncodeInitialData
@@ -162,7 +161,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeInitialData
@@ -173,7 +172,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfDecodeBoc
@@ -183,7 +182,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfAbiEncodeBoc
@@ -193,7 +192,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
     # INPUT: ParamsOfCalcFunctionId
@@ -203,7 +202,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, method_name: full_method_name(MODULE, __method__.to_s), payload: payload, &block)
     end
 
   end