klaytn 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50c121f73a117ce320b51711e4e8e46cfbc2150598abb0c6ca2052b7c21b8aad
-  data.tar.gz: c89c246919725c7ad34ca11e0e48a25f11b9b52592469b78e61c94f5685107a5
+  metadata.gz: 1b2ecedaa55657b6727db503cd9cd03aa8042da5bda490431c75be6739f2f957
+  data.tar.gz: 4dceec99b7cba5c3622e24fa93d2b7959213de6c687824a38395fd0dfc37f097
 SHA512:
-  metadata.gz: c75da347b268c6bfd60898c8b87801e1bf6a9b4cbb12dbcc56bc36574ece135615180c0fbdc81401c285b3ef20155602eab1d996b0ca6d39f56b92cef6262d4d
-  data.tar.gz: 64e87aa587720212bf30885c46e12c723e19cd6fa7d44fe3c712226a6d576c0c88adf96a89b20319da937d688c859e2d76be800461490b092637292d703e7d67
+  metadata.gz: 5fb1d6e532804b44232fa1e889e95955987d18c043564a77c8e376be76317c749d8827f1a8427ffbcabcae6afdab01f26b9492617805758d4ed06c624b795d3a
+  data.tar.gz: 063c1e02aa2b2ad4e0c36182bd43b58459a2e80d56bdc80ef9410467378e1ef61061f61fe299cb716aa469dbbb35c311b92e1c88f6141f3b971ba78bc2b06e71

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 .env
+.ruby-version

data/Gemfile.lock

@@ -1,30 +1,27 @@
 PATH
   remote: .
   specs:
-    klaytn (0.0.6)
-      ethereum.rb (~> 2.5)
+    klaytn (0.0.9)
+      activesupport (>= 4.2)
       httparty (~> 0.20.0)
+      keccak (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.6)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.5.0)
-    digest-sha3 (1.1.0)
-    ethereum.rb (2.5)
-      activesupport (>= 4.0)
-      digest-sha3 (~> 1.1)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    keccak (1.3.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
@@ -46,7 +43,6 @@ GEM
     rspec-support (3.11.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -57,4 +53,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/klaytn.gemspec

@@ -31,7 +31,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "bin"]
 
+
   spec.add_development_dependency "rspec", "~> 3.9.1"
+
+  spec.add_dependency "activesupport", ">= 4.2"
   spec.add_dependency "httparty", "~> 0.20.0"
-  spec.add_dependency "ethereum.rb", "~> 2.5"
+  spec.add_dependency "keccak", "~> 1.3" # https://github.com/q9f/keccak.rb
+
+  # spec.add_dependency "ethereum.rb", "~> 2.5"
+
 end

data/lib/klaytn/contract.rb

@@ -17,11 +17,11 @@ module Klaytn
       super
     end
 
-    def deploy(bytecode, submit: true)
+    def deploy(bytecode, submit: true, gas: 900000)
       body = {
         from: kas_account_wallet_address, # must be created inside KAS console > Account Pool, and MUST be capital version from Klaytn Scope!
         input: bytecode,
-        gas: 900000, # needs to be high for deploy to work
+        gas: gas,
         submit: submit
       }
 
@@ -31,10 +31,10 @@ module Klaytn
 
     ## DEPRECATE: definition ex: 'addAddressToWhitelist(address)' - string literal Solidity function definition
     # definition ex: 'addAddressToWhitelist' - string literal Solidity function definition, without parameters/parens
-    # inputs ex: [ OpenStruct.new({ "internalType": "address", "name": "addr", "type": "address" }) ] - array of dot-notation object from ABI
+    # inputs ex: [OpenStruct.new({ "internalType": "address", "name": "addr", "type": "address" })] - array of dot-notation object from ABI
     # params ex: ['0x0xxxx'] - array of arguments accepted by function
 
-    def invoke_function(definition, params)
+    def invoke_function(definition, params, gas: 0)
       raise MISSING_CONTRACT if contract_address.blank?
       raise MISSING_ABI if abi.blank?
 
@@ -44,17 +44,17 @@ module Klaytn
       built_defintion = "#{definition}(#{found_function[:inputs].map {|i| i[:type]}.join(',')})"
       built_inputs = found_function[:inputs].map { |i| OpenStruct.new(i) }
 
-      body = function_body_builder(built_defintion, built_inputs, params)
+      body = function_body_builder(built_defintion, built_inputs, params, gas)
       resp = HTTParty.post(BASE_URL + '/execute', body: body.to_json, headers: headers.merge('x-krn' => kas_account_pool_krn), basic_auth: basic_auth)
       JSON.parse(resp.body)
     end
 
-    def function_body_builder(definition, inputs, params)
+    def function_body_builder(definition, inputs, params, gas)
       {
         from: kas_account_wallet_address,
         to: contract_address,
         input: encoder.encode_function(definition, inputs, params),
-        # gas: 900000, # better to exclude, otherwise 'insufficient funds' error is common
+        gas: gas,
         submit: true
       }
     end

data/lib/klaytn/decoder.rb

@@ -1,7 +1,15 @@
 module Klaytn
   class Decoder
-    def decode_uint(encoded_uint) # ex: 0x4563918244f40000 => 5000000000000000000 (5 KLAY)
-      Ethereum::Decoder.new.decode_uint(encoded_uint)
+    def decode_uint(value, subtype = "256", start = 0) # ex: 0x4563918244f40000 => 5000000000000000000 (5 KLAY)
+      trim(value, start, bitsize(subtype)).hex
+    end
+
+    def trim(value, start, bitsize = 256)
+      value[start+63-(bitsize/4-1)..start+63]
+    end
+
+    def bitsize(subtype, default = 256)
+      subtype.present? ? subtype.to_i : default
     end
   end
 end

data/lib/klaytn/encoder.rb

@@ -2,16 +2,135 @@ module Klaytn
   class Encoder
     def encode_function(definition, inputs, params)
       prefix = '0x'
-      str = Ethereum::Function.calc_id(definition) # ex: "getEarnout(uint256)"
-      num = Ethereum::Encoder.new.encode_arguments(inputs, params) # ex: [1], or [1,500]
+      str = Digest::Keccak.hexdigest(definition, 256)[0..7] # ex: "getEarnout(uint256)"
+      num = encode_arguments(inputs, params)
 
       "#{prefix}#{str}#{num}"
     end
 
-    def encode_uint(integer) # ex: 5000000000000000000 (5 KLAY) => 0x4563918244f40000
+    def encode_integer(integer) # ex: 5000000000000000000 (5 KLAY) => 0x4563918244f40000
       return '0x0' if integer.zero?
-      long = Ethereum::Encoder.new.encode_uint(integer)
+      long = encode_uint(integer)
       '0x' + long.sub!(/^[0]+/,'')
     end
+
+    # code below this point was adopted from ethereum.rb gem in order to
+    # avoid dependency issues with Digest requiring older Ruby versions
+    def encode(type, value)
+      is_array, arity, array_subtype = parse_array_type(type)
+      if is_array && arity
+        encode_static_array(arity, array_subtype, value)
+      elsif is_array
+        encode_dynamic_array(array_subtype, value)
+      else
+        core, subtype = parse_type(type)
+        method_name = "encode_#{core}".to_sym
+        self.send(method_name, value, subtype)
+      end
+    end
+
+    def encode_static_array(arity, array_subtype, array)
+      raise "Wrong number of arguments" if arity != array.size
+      array.inject("") { |a, e| a << encode(array_subtype, e) }
+    end
+
+    def encode_dynamic_array(array_subtype, array)
+      location = encode_uint(@inputs ? size_of_inputs(@inputs) + @tail.size/2 : 32)
+      size = encode_uint(array.size)
+      data = array.inject("") { |a, e| a << encode(array_subtype, e) }
+      [location, size + data]
+    end
+
+    def parse_array_type(type)
+      match = /(.+)\[(\d*)\]\z/.match(type)
+      if match
+        [true, match[2].present? ? match[2].to_i : nil, match[1]]
+      else
+        [false, nil, nil]
+      end
+    end
+
+    def parse_type(type)
+      puts "TYPE: #{type}"
+      # raise NotImplementedError if type.ends_with?("]")
+      raise NotImplementedError if type[-1] == "]"
+      match = /(\D+)(\d.*)?/.match(type)
+      [match[1], match[2]]
+    end
+
+    def encode_arguments(inputs, args)
+      raise "Wrong number of arguments" if inputs.length != args.length
+      @head = ""
+      @tail = ""
+      @inputs = inputs
+      inputs.each.with_index do |input, index|
+        encoded = encode(input.type, args[index])
+        if encoded.is_a? Array
+          @head << encoded[0]
+          @tail << encoded[1]
+        else
+          @head << encoded
+        end
+      end
+      @head + @tail
+    end
+
+    def encode_bool(value, _)
+      (value ? "1" : "0").rjust(64, '0')
+    end
+
+    def encode_fixed(value, subtype)
+      n = subtype.nil? ? 128 : /(\d+)x(\d+)/.match(subtype)[2].to_i
+      do_encode_fixed(value, n)
+    end
+
+    def do_encode_fixed(value, n)
+      encode_uint((value * 2**n).to_i)
+    end
+
+    def encode_ufixed(_value, _)
+      raise NotImplementedError
+    end
+
+    def encode_bytes(value, subtype)
+      subtype.nil? ? encode_dynamic_bytes(value) : encode_static_bytes(value)
+    end
+
+    def encode_static_bytes(value)
+      value.bytes.map {|x| x.to_s(16).rjust(2, '0')}.join("").ljust(64, '0')
+    end
+
+    def encode_dynamic_bytes(value)
+      location = encode_uint(@inputs ? size_of_inputs(@inputs) + @tail.size/2 : 32)
+      size = encode_uint(value.size)
+      content = encode_static_bytes(value)
+      [location, size + content]
+    end
+
+    def encode_string(value, _)
+      location = encode_uint(@inputs ? size_of_inputs(@inputs) + @tail.size/2 : 32)
+      size = encode_uint(value.bytes.size)
+      content = value.bytes.map {|x| x.to_s(16).rjust(2, '0')}.join("").ljust(64, '0')
+      [location, size + content]
+    end
+
+    def encode_address(value, _)
+      value = "0" * 24 + value.gsub(/^0x/,'')
+      raise ArgumentError if value.size != 64
+      value
+    end
+
+    def encode_uint(value, _ = nil)
+      raise ArgumentError if value < 0
+      encode_int(value)
+    end
+
+    def encode_int(value, _ = nil)
+      to_twos_complement(value).to_s(16).rjust(64, '0')
+    end
+
+    def to_twos_complement(number)
+      (number & ((1 << 256) - 1))
+    end
   end
 end

data/lib/klaytn/token.rb

@@ -18,7 +18,7 @@ module Klaytn
     end
 
     def encoded_token_id(token_id)
-      encoder.encode_uint(token_id)
+      encoder.encode_integer(token_id)
     end
   end
 end

data/lib/klaytn/transaction.rb

@@ -23,7 +23,7 @@ module Klaytn
       body = {
         from: kas_account_wallet_address,
         to: address,
-        value: encoder.encode_uint(amount_in_peb), # '0x0' = 0 KLAY, '0x4563918244f40000' = 5 KLAY
+        value: encoder.encode_integer(amount_in_peb), # '0x0' = 0 KLAY, '0x4563918244f40000' = 5 KLAY
         memo: opts[:memo], # can be a text note; viewable on Klaytn Scope!
         gas: opts[:gas] || 200000, # not required, default is 1,000,000 if excluded
         submit: should_submit?(opts) # create real transaction by default

data/lib/klaytn/version.rb

@@ -1,3 +1,3 @@
 module Klaytn
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/lib/klaytn.rb

@@ -1,6 +1,8 @@
 require 'klaytn/version'
 require 'httparty'
-require 'ethereum.rb'
+require 'active_support'
+require 'active_support/core_ext'
+require 'digest/keccak'
 
 module Klaytn
   require 'klaytn/authentication'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: klaytn
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Kulp
 - Ooju
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -40,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.20.0
 - !ruby/object:Gem::Dependency
-  name: ethereum.rb
+  name: keccak
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.3'
 description: Interact with transactions, smart contracts, and NFTs on the Klaytn blockchain
   in pure Ruby.
 email:
@@ -91,7 +105,7 @@ metadata:
   homepage_uri: https://github.com/OojuTeam/klaytn-ruby
   source_code_uri: https://github.com/OojuTeam/klaytn-ruby
   changelog_uri: https://github.com/usefomo/fomo-ruby-sdk/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Klaytn is a Ruby wrapper for the Klaytn blockchain.
 test_files: []