ethlite 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cd659223f8049ca63302c5bb595da6faf483d29d776ed747b5970dde11b415e
-  data.tar.gz: fde6fca03683dac98d474d82bc520a82dc45e74b08eaabbc0c521e2635ca3d3b
+  metadata.gz: f4c28e1b125fefa2964c88a020a14de2d0e95c412e16f50ba5a329382465ccf8
+  data.tar.gz: 324e941a6825091bbf88539eb31acd03b80e8732c61442580a092bbdefe4e845
 SHA512:
-  metadata.gz: 050226ff51c20a38cb8f1db254e246a555d07baf8a6e12766985850400749a463698e89818780cd031e5ed3cab6bb05e2afae37588149084160138d5e6783e0f
-  data.tar.gz: 0d16770efc489cf88f08ec8ef471563905b2197c1d8330c58558348f1a9076dd717f654b5c221ea78052d31855bb458105c79f2f7ec1021a04451a202088b722
+  metadata.gz: df7dae52f733638a324dceb46371e1ecf6043f75515dc75ced197dfe1e24194b91e75f693f441861a122294e5d2408338584ee2b41a94ff64a277c0739fc9f8f
+  data.tar.gz: 171eea690f22474462316642eea60971eed702b6604681c3126b5900a134c196eb7cd07111d304086410e3ff46ccf7d73c61b2570c3430e563502ee6bf7e55ba

data/Manifest.txt

@@ -5,10 +5,10 @@ Rakefile
 lib/digest/keccak.rb
 lib/digest/sha3.rb
 lib/ethlite.rb
-lib/ethlite/abi/abi_coder.rb
+lib/ethlite/abi/codec.rb
 lib/ethlite/abi/type.rb
-lib/ethlite/abi/utils.rb
 lib/ethlite/constant.rb
 lib/ethlite/contract.rb
+lib/ethlite/utils.rb
 lib/ethlite/version.rb
 lib/jsonrpc/jsonrpc.rb

data/README.md

@@ -44,7 +44,7 @@ token_ids = (0..9)
 token_ids.each do |token_id|
 
   puts "==> calling tokenURI(#{token_id})..."
-  tokenURI = eth_call( contract_address,
+  tokenURI = eth_call( ETH_NODE, contract_address,
                          'tokenURI', ['uint256'], ['string'],
                          [token_id] )
   puts "   ...returns: #{tokenURI}"
@@ -56,14 +56,15 @@ And the "magic"  hand-coded to-the-metal `eth_call` machinery:
 
 ```ruby
 ## construct a json-rpc call from scratch
-def eth_call( contract_address,
+def eth_call( rpc,
+              contract_address,
               name, inputs, outputs,
               args )
 
   ## binary encode method sig(nature)
   signature      = "#{name}(#{inputs.join(',')})"
-  signature_hash =  Ethlite::Abi::Utils.encode_hex(
-                        Ethlite::Abi::Utils.keccak256(signature))[0..7]
+  signature_hash =  Ethlite::Utils.encode_hex(
+                        Ethlite::Utils.keccak256(signature))[0..7]
 
   pp signature
   # => "tokenURI(uint256)"
@@ -71,8 +72,8 @@ def eth_call( contract_address,
   # => "c87b56dd"
 
   ## binary encode method arg(ument)s
-  args_encoded = Ethlite::Abi::Utils.encode_hex(
-                   Ethlite::Abi::AbiCoder.encode_abi( inputs, args) )
+  args_encoded = Ethlite::Utils.encode_hex(
+                   Ethlite::Abi.encode_abi( inputs, args) )
 
   data = '0x' + signature_hash + args_encoded
 
@@ -84,15 +85,15 @@ def eth_call( contract_address,
             ]
 
   ## do the json-rpc request
-  response = ETH_NODE.request( method, params )
+  response = rpc.request( method, params )
 
   puts "response:"
   pp response
 
   ## decode binary result
-  string_data = Ethlite::Abi::Utils.decode_hex(
-                     Ethlite::Abi::Utils.remove_0x_head(response))
-  result = Ethlite::Abi::AbiCoder.decode_abi( outputs, string_data )
+  string_data = Ethlite::Utils.decode_hex(
+                     Ethlite::Utils.remove_0x_head(response))
+  result = Ethlite::Abi.decode_abi( outputs, string_data )
   result.length  == 1 ? result[0] : result
 end
 ```

data/lib/ethlite/abi/{abi_coder.rb → codec.rb}

@@ -2,19 +2,16 @@
 
 module Ethlite
   module Abi
+    extend self
 
   ##
   # Contract ABI encoding and decoding.
   #
   # @see https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI
   #
-  module AbiCoder
-
+  module Codec
     extend self
 
-    include Constant
-
-
     class EncodingError < StandardError; end
     class DecodingError < StandardError; end
     class ValueError < StandardError; end
@@ -43,7 +40,6 @@ module Ethlite
 
       "#{head}#{tail}"
     end
-    alias :encode :encode_abi
 
     ##
     # Encodes a single value (static or dynamic).
@@ -263,7 +259,7 @@ module Ethlite
 
       parsed_types.zip(outputs).map {|(type, out)| decode_type(type, out) }
     end
-    alias :decode :decode_abi
+
 
     def zero_padding data, pos, count, start_positions
       if pos >= data.size
@@ -416,8 +412,21 @@ module Ethlite
         raise EncodingError, "Cannot decode int: #{n}"
       end
     end
+end # module Codec
+
+
+
+
+
+
+def encode_abi(types, args)
+    Codec.encode_abi( types, args )
+end
+
+def decode_abi(types, data, raise_errors = false)
+    Codec.decode_abi( types, data, raise_errors )
+end
 
-  end
 
 end  # module Abi
 end  # module Ethlite

data/lib/ethlite/constant.rb

@@ -1,6 +1,5 @@
 
 module Ethlite
-  module Constant
 
 
     ## todo/check   - use encoding -ascii-8bit for source file or ? - why? why not?
@@ -33,6 +32,4 @@ module Ethlite
 
     CONTRACT_CODE_SIZE_LIMIT = 0x6000
 
-
-  end  # module Constant
 end  # module Ethlite

data/lib/ethlite/contract.rb

@@ -9,12 +9,10 @@
          constant       = !!abi['constant'] || abi['stateMutability']=='view'
          input_types    = abi['inputs']  ? abi['inputs'].map{|a| _parse_component_type( a ) } : []
          output_types   = abi['outputs'] ? abi['outputs'].map{|a| _parse_component_type( a ) } : []
-         type           = abi['type'] || 'function'
 
          new( name, inputs: input_types,
                     outputs: output_types,
-                    constant: constant,
-                    type: type )
+                    constant: constant )
        end
 
        def self._parse_component_type( argument )
@@ -38,20 +36,19 @@
 
         def initialize( name, inputs:,
                               outputs:  [],
-                              constant: true,
-                              type:     'function' )
+                              constant: true )
           @name         = name
           @constant     = constant
           @input_types  = inputs
           @output_types = outputs
-
-          @signature      = Abi::Utils.function_signature( @name, @input_types )
-          @signature_hash = Abi::Utils.signature_hash( @signature, type=='event' ? 64 : 8)
+          @signature      = "#{@name}(#{@input_types.join(',')})"
+          @signature_hash = Utils.signature_hash( @signature, 8 )
         end
 
+
         def do_call( rpc, contract_address, args )
-          data = '0x' + @signature_hash + Abi::Utils.encode_hex(
-                                           Abi::AbiCoder.encode_abi(@input_types, args) )
+          data = '0x' + @signature_hash + Utils.encode_hex(
+                                           Abi.encode_abi(@input_types, args) )
 
           method = 'eth_call'
           params = [{ to:   contract_address,
@@ -63,11 +60,11 @@
           puts "response:"
           pp response
 
-          string_data = Abi::Utils.decode_hex(
-                           Abi::Utils.remove_0x_head(response))
+          string_data = Utils.decode_hex(
+                           Utils.remove_0x_head(response))
           return nil if string_data.empty?
 
-          result = Abi::AbiCoder.decode_abi( @output_types, string_data )
+          result = Abi.decode_abi( @output_types, string_data )
           puts
           puts "result decode_abi:"
           pp result

data/lib/ethlite/{abi/utils.rb → utils.rb}

@@ -1,11 +1,8 @@
 module Ethlite
-module Abi
-  module Utils
+module Utils
 
     extend self
 
-    include Constant
-
     ##
     # Not the keccak in sha3, although it's underlying lib named SHA3
     #
@@ -215,15 +212,11 @@ module Abi
     end
 
 
-    def function_signature method_name, arg_types
-      "#{method_name}(#{arg_types.join(',')})"
-    end
 
-    def signature_hash signature, length=64
-      encode_hex(keccak256(signature))[0...length]
+    def signature_hash( signature, length=8 )
+      encode_hex( keccak256(signature) )[0...length]
     end
-  end
 
-end  # module Abi
+end  # module Utils
 end  # module Ethlite
 

data/lib/ethlite/version.rb

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

data/lib/ethlite.rb

@@ -24,11 +24,11 @@ require_relative 'jsonrpc/jsonrpc'
 require_relative 'ethlite/version'    # note: let version always go first
 
 require_relative 'ethlite/constant'
+require_relative 'ethlite/utils'
 
 
 require_relative 'ethlite/abi/type'
-require_relative 'ethlite/abi/utils'
-require_relative 'ethlite/abi/abi_coder'
+require_relative 'ethlite/abi/codec'
 
 
 require_relative 'ethlite/contract'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethlite
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
@@ -89,11 +89,11 @@ files:
 - lib/digest/keccak.rb
 - lib/digest/sha3.rb
 - lib/ethlite.rb
-- lib/ethlite/abi/abi_coder.rb
+- lib/ethlite/abi/codec.rb
 - lib/ethlite/abi/type.rb
-- lib/ethlite/abi/utils.rb
 - lib/ethlite/constant.rb
 - lib/ethlite/contract.rb
+- lib/ethlite/utils.rb
 - lib/ethlite/version.rb
 - lib/jsonrpc/jsonrpc.rb
 homepage: https://github.com/pixelartexchange/artbase