ethlite 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed8e8c05d930dceca2c2bf5f4b2e21ebeaaef68309b0c16474b47df667da2a89
-  data.tar.gz: 203ef7c86aa93e602028b1e0450e70c1c2c3a1388273263ce1e90fc503a18b08
+  metadata.gz: a6a9601ad8c91c592541ffc721dbe9bbb8572683ef88c995a1bb810f7da79e33
+  data.tar.gz: 4ddf8c5a91c9a370e580bc9519f4d7c9832f863f31e4dfb8fa2b0505c2c6d6e0
 SHA512:
-  metadata.gz: 1527a1fccb6908164d7744e0b06772c48a18f2f67bc60068f72c7577f512d2de295e9dfe8d917c5ca3c724963396cfb02ddff0aac6611be65d79575aaa90c34f
-  data.tar.gz: 92f93f217349b9ef33b1fc1ec7c0da36e50d172e2b44e06b9b8281d008fc770b4da081ad64f46e2be1819bbb7fa423dbe14a6519da4ddae6f782d9ea9f056108
+  metadata.gz: 12d4cd45f40f8ecf3835f058e2ac5d4e9a9b361e3cd91fd5bca193e982c7fd726ff3ffab08ed7bedb543c3800e76808364c51f2992d4971816629ac170f700f6
+  data.tar.gz: 236164ce176d5b50187e7402729a895130354f929df269e3b9d7b04472300b1661b9992a5579ba53064cbe0b7aee95e21aeeaae65225519ca55707caad771533

data/Manifest.txt

@@ -10,6 +10,5 @@ lib/ethlite/abi/type.rb
 lib/ethlite/abi/utils.rb
 lib/ethlite/constant.rb
 lib/ethlite/contract.rb
-lib/ethlite/utility.rb
 lib/ethlite/version.rb
 lib/jsonrpc/jsonrpc.rb

data/Rakefile

@@ -21,7 +21,7 @@ Hoe.spec 'ethlite' do
   self.extra_deps = [
     ['cocos'],
     ## ['keccak'],  -- try using bundled ruby version for now
-    ['rlp'],
+    ['rlp-lite'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/ethlite/abi/utils.rb

@@ -56,44 +56,50 @@ module Abi
     end
 
     def to_signed(i)
-      i > Constant::INT_MAX ? (i-Constant::TT256) : i
+      i > INT_MAX ? (i-TT256) : i
     end
 
-    def base58_check_to_bytes(s)
-      leadingzbytes = s.match(/\A1*/)[0]
-      data = Constant::BYTE_ZERO * leadingzbytes.size + BaseConvert.convert(s, 58, 256)
-
-      raise ChecksumError, "double sha256 checksum doesn't match" unless double_sha256(data[0...-4])[0,4] == data[-4..-1]
-      data[1...-4]
-    end
-
-    def bytes_to_base58_check(bytes, magicbyte=0)
-      bs = "#{magicbyte.chr}#{bytes}"
-      leadingzbytes = bs.match(/\A#{Constant::BYTE_ZERO}*/)[0]
-      checksum = double_sha256(bs)[0,4]
-      '1'*leadingzbytes.size + BaseConvert.convert("#{bs}#{checksum}", 256, 58)
-    end
 
     def ceil32(x)
       x % 32 == 0 ? x : (x + 32 - x%32)
     end
 
     def encode_hex(b)
-      RLP::Utils.encode_hex b
+      raise TypeError, "Value must be an instance of String" unless b.instance_of?(String)
+      b.unpack("H*").first
+    end
+
+    def decode_hex(str)
+      raise TypeError, "Value must be an instance of string" unless sstr.instance_of?(String)
+      raise TypeError, 'Non-hexadecimal digit found' unless str =~ /\A[0-9a-fA-F]*\z/
+      [str].pack("H*")
     end
 
-    def decode_hex(s)
-      RLP::Utils.decode_hex s
+
+
+
+    def int_to_big_endian(n)
+      RLP::Sedes.big_endian_int.serialize n
     end
 
     def big_endian_to_int(s)
       RLP::Sedes.big_endian_int.deserialize s.sub(/\A(\x00)+/, '')
     end
 
-    def int_to_big_endian(n)
-      RLP::Sedes.big_endian_int.serialize n
+
+    def encode_int(n)
+      raise ArgumentError, "Integer invalid or out of range: #{n}" unless n.is_a?(Integer) && n >= 0 && n <= UINT_MAX
+      int_to_big_endian n
+    end
+
+    def decode_int(v)
+      raise ArgumentError, "No leading zero bytes allowed for integers" if v.size > 0 && (v[0] == BYTE_ZERO || v[0] == 0)
+      big_endian_to_int v
     end
 
+
+
+
     def lpad(x, symbol, l)
       return x if x.size >= l
       symbol * (l - x.size) + x
@@ -124,15 +130,6 @@ module Abi
       zpad_int x, 20
     end
 
-    def encode_int(n)
-      raise ArgumentError, "Integer invalid or out of range: #{n}" unless n.is_a?(Integer) && n >= 0 && n <= UINT_MAX
-      int_to_big_endian n
-    end
-
-    def decode_int(v)
-      raise ArgumentError, "No leading zero bytes allowed for integers" if v.size > 0 && (v[0] == Constant::BYTE_ZERO || v[0] == 0)
-      big_endian_to_int v
-    end
 
     def bytearray_to_int(arr)
       o = 0
@@ -148,6 +145,7 @@ module Abi
       bytes.unpack('C*')
     end
 
+
     def coerce_to_int(x)
       if x.is_a?(Numeric)
         x
@@ -178,19 +176,6 @@ module Abi
       end
     end
 
-    def normalize_address(x, allow_blank: false)
-      address = Address.new(x)
-      raise ValueError, "address is blank" if !allow_blank && address.blank?
-      address.to_bytes
-    end
-
-    def mk_contract_address(sender, nonce)
-      keccak256_rlp([normalize_address(sender), nonce])[12..-1]
-    end
-
-    def mk_metropolis_contract_address(sender, initcode)
-      keccak256(normalize_address(sender) + initcode)[12..-1]
-    end
 
 
     def parse_int_or_hex(s)
@@ -203,6 +188,24 @@ module Abi
       end
     end
 
+
+=begin
+  ## add? moved over from the old module Utility
+     def hex( num )
+        '0x' + num.to_s(16)
+      end
+
+      def from_hex( h )
+        h.nil? ? 0 : (h.kind_of?(String) ? h.to_i(16) : h)
+      end
+=end
+
+
+    def remove_0x_head( s )
+      return s if !s || s.length<2
+      s[0,2] == '0x' ? s[2..-1] : s
+    end
+
     def normalize_hex_without_prefix(s)
       if s[0,2] == '0x'
         (s.size % 2 == 1 ? '0' : '') + s[2..-1]
@@ -211,6 +214,7 @@ module Abi
       end
     end
 
+
     def function_signature method_name, arg_types
       "#{method_name}(#{arg_types.join(',')})"
     end

data/lib/ethlite/constant.rb

@@ -2,9 +2,15 @@
 module Ethlite
   module Constant
 
-    BYTE_EMPTY = "".freeze
-    BYTE_ZERO  = "\x00".freeze
-    BYTE_ONE   = "\x01".freeze
+
+    ## todo/check   - use encoding -ascii-8bit for source file or ? - why? why not?
+    ## use  #b/.b  to ensure binary encoding? - why? why not?
+
+    ## todo/check:  use auto-freeze string literals magic comment - why? why not?
+    BYTE_EMPTY = "".b.freeze
+    BYTE_ZERO  = "\x00".b.freeze
+    BYTE_ONE   = "\x01".b.freeze
+
 
     TT32   = 2**32
     TT40   = 2**40
@@ -17,35 +23,16 @@ module Ethlite
     INT_MAX  = 2**255 - 1
     INT_MIN  = -2**255
 
-    HASH_ZERO = ("\x00"*32).freeze
+    HASH_ZERO = ("\x00"*32).b.freeze
 
 
-    PUBKEY_ZERO = ("\x00"*32).freeze
-    PRIVKEY_ZERO = ("\x00"*32).freeze
+    PUBKEY_ZERO = ("\x00"*32).b.freeze
+    PRIVKEY_ZERO = ("\x00"*32).b.freeze
+
     PRIVKEY_ZERO_HEX = ('0'*64).freeze
 
     CONTRACT_CODE_SIZE_LIMIT = 0x6000
 
 
-=begin
-   # The RLP short length limit.
-    SHORT_LENGTH_LIMIT = 56.freeze
-
-    # The RLP long length limit.
-    LONG_LENGTH_LIMIT = (256 ** 8).freeze
-
-    # The RLP primitive type offset.
-    PRIMITIVE_PREFIX_OFFSET = 0x80.freeze
-
-    # The RLP array type offset.
-    LIST_PREFIX_OFFSET = 0xc0.freeze
-
-    # The binary encoding is ASCII (8-bit).
-    BINARY_ENCODING = "ASCII-8BIT".freeze
-
-    # Infinity as constant for convenience.
-    INFINITY = (1.0 / 0.0).freeze
-
-=end
   end  # module Constant
 end  # module Ethlite

data/lib/ethlite/contract.rb

@@ -1,7 +1,5 @@
   module Ethlite
       class ContractMethod
-        include Utility
-
 
        def self.parse_abi( abi )
          ## convenience helper -  auto-convert to json if string passed in
@@ -31,8 +29,7 @@
 
 
 
-        attr_reader :abi,
-                    :signature,
+        attr_reader :signature,
                     :name,
                     :signature_hash,
                     :input_types,
@@ -66,7 +63,7 @@
           puts "response:"
           pp response
 
-          string_data = [remove_0x_head(response)].pack('H*')
+          string_data = [Abi::Utils.remove_0x_head(response)].pack('H*')
           return nil if string_data.empty?
 
           result = Abi::AbiCoder.decode_abi( @output_types, string_data )

data/lib/ethlite/version.rb

@@ -3,7 +3,7 @@
 module Ethlite
   MAJOR = 0
   MINOR = 2
-  PATCH = 3
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/ethlite.rb

@@ -10,7 +10,7 @@ require 'openssl'
 require 'digest'
 
 ## 3rd party gems
-require 'rlp'               ## gem rlp    - see https://rubygems.org/gems/rlp
+require 'rlp-lite'
 
 ##  bundled require 'digest/keccak'     ## gem keccak - see https://rubygems.org/gems/keccak
 require_relative 'digest/keccak'
@@ -31,7 +31,6 @@ require_relative 'ethlite/abi/utils'
 require_relative 'ethlite/abi/abi_coder'
 
 
-require_relative 'ethlite/utility'
 require_relative 'ethlite/contract'
 
 

data/lib/jsonrpc/jsonrpc.rb

@@ -9,36 +9,28 @@
 
 class JsonRpc
       def initialize( uri )
-        @client_id = Random.rand( 10000000 )
-
-        @uri = URI.parse( uri )
+        @uri        = uri    ## assume uri always as string for now
+        @request_id = 1
       end
 
 
       def request( method, params=[] )
-        opts = {}
-        if @uri.instance_of?( URI::HTTPS )
-          opts[:use_ssl]     = true
-          opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
-        end
-
-        Net::HTTP.start( @uri.host, @uri.port, **opts ) do |http|
-          headers = {"Content-Type" => "application/json"}
-          request = Net::HTTP::Post.new( @uri.request_uri, headers )
 
-          json = { jsonrpc: '2.0',
+          data = { jsonrpc: '2.0',
                    method:  method,
                    params:  params,
-                   id: @client_id }.to_json
+                   id: @request_id }
+
+          @request_id += 1
 
           puts "json POST payload:"
-          puts json
+          puts data.to_json
 
-          request.body = json
-          response = http.request( request )
+          response = Webclient.post( @uri, json: data )
 
-          unless response.kind_of?( Net::HTTPOK )
-            raise "Error code #{response.code} on request #{@uri.to_s} #{request.body}"
+
+          if response.status.nok?
+            raise "Error code #{response.status.code} on request #{@uri} #{data}"
           end
 
 
@@ -47,11 +39,10 @@ class JsonRpc
           if body['result']
             body['result']
           elsif body['error']
-            raise "Error #{@uri.to_s} #{body['error']} on request #{@uri.to_s} #{request.body}"
+            raise "Error #{@uri} #{body['error']} on request #{@uri} #{data}"
           else
-            raise "No response on request #{@uri.to_s} #{request.body}"
+            raise "No response on request #{@uri} #{data}"
           end
-        end
-      end
+      end  # method request
 end  # class JsonRpc
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethlite
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rlp
+  name: rlp-lite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +94,6 @@ files:
 - lib/ethlite/abi/utils.rb
 - lib/ethlite/constant.rb
 - lib/ethlite/contract.rb
-- lib/ethlite/utility.rb
 - lib/ethlite/version.rb
 - lib/jsonrpc/jsonrpc.rb
 homepage: https://github.com/pixelartexchange/artbase

data/lib/ethlite/utility.rb

@@ -1,23 +0,0 @@
-module Ethlite
-
-    module Utility
-
-      def hex( num )
-        '0x' + num.to_s(16)
-      end
-
-      def from_hex( h )
-        h.nil? ? 0 : (h.kind_of?(String) ? h.to_i(16) : h)
-      end
-
-      def remove_0x_head( s )
-        return s if !s || s.length<2
-        s[0,2] == '0x' ? s[2..-1] : s
-      end
-
-
-      def wei_to_ether( wei )
-        1.0 * wei / 10**18
-      end
-    end
-end    # module Ethlite