abiparser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f7d1f45a66ea6fd2deb690979c26f4289a666692bcb84c81420dbab5c2ab8b
-  data.tar.gz: 487f1407542dc6d6f5e22b2975f4a7828fc0f08f5147961dc44230486bccbe71
+  metadata.gz: 9f938a2858e7da14cc5a8b42f4691a93c4721cef9e271168de78535c64f70115
+  data.tar.gz: 8450885be9f443548be957d0815bb31e3c56862f0368eb17f574ab176ea9e4b0
 SHA512:
-  metadata.gz: 5fc14d110513a91161272beb5a9e8d41401fe8ba5407d52beb43b782ac2b173108aaea79738b4f75d00439bf17908257376100c1d4166dc34434f936019eddbf
-  data.tar.gz: ed21d7bcdbb58144832ba46c82d6fae1c1ec22f501936b34902e68c56ab44a556f219c35294cf09a836382252d77e67de231476b027724fcb60e681d3925d90f
+  metadata.gz: bc52799f38979a1e8b77b21d711e0ff935510ce7988bdec34e5ad0a09a5dde8db522df3038808f165dcd4178051ef49f7f832d1b76fc9fac0ef5c4f3331fd92b
+  data.tar.gz: 6a6d1e03041d70e7080c38ad3e534c5e57a0cd49af187c4a16dfe1f19ae7fa55d4c8a3068b12968dd64a3d23f3c08c8f4c5fd47ac96e83f9bc7da695e0dfef7b

data/Rakefile

@@ -22,6 +22,7 @@ Hoe.spec 'abiparser' do
     ['cocos'],
     ['bytes'],
     ['digest-lite'],
+    ['abicoder'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/abiparser/constructor.rb

@@ -47,14 +47,20 @@ class Constructor
   end
 
 
-  attr_reader :inputs
+  attr_reader :inputs, :input_types
 
   def initialize( inputs: [],
                   payable: false )
      @inputs  = inputs
      @payable = payable
+
+     ##  parse inputs into types
+     ##    note: use "calculated" sig(nature) and NOT the type
+     ##        (differs for tuples, that is, types with components !!!)
+     @input_types  = @inputs.map {|param| Type.parse( param.sig ) }
   end
 
+
   ##  add - why? why not?
   ## def constant?() false; end
   ## alias_method :readonly?, :constant?

data/lib/abiparser/function.rb

@@ -54,10 +54,11 @@ class Function
 
 
   attr_reader :name,
-              :inputs, :outputs
+              :inputs, :outputs,
+              :input_types, :output_types
 
   def initialize( name,
-                  inputs: [],
+                  inputs:  [],
                   outputs: [],
                   payable: false,
                   constant: false,
@@ -65,10 +66,21 @@ class Function
      @name    = name
      @inputs  = inputs
      @outputs = outputs
-
      @payable = payable
      @constant = constant
      @pure = pure
+
+     ##  parse inputs & outputs into types
+     ##    note: use "calculated" sig(nature) and NOT the type
+     ##        (differs for tuples, that is, types with components !!!)
+     @input_types  = @inputs.map do |param|
+                                     Type.parse( param.sig )
+                                 end
+     @output_types = @outputs.map do |param|
+                                       ## pp param
+                                       ## puts "sig: #{param.sig}"
+                                      Type.parse( param.sig )
+                                  end
   end
 
 

data/lib/abiparser/param.rb

@@ -1,20 +1,25 @@
 module ABI
 class Param
-    attr_reader :type, :name, :internal_type
+    attr_reader :type, :name,
+                :internal_type,
+                :components
 
     def self.parse( o )
       type          = o['type']
       internal_type = o['internalType']
       name          = o['name']
+      components    = o['components'] ? o['components'].map { |c| parse( c ) } : nil
 
       new( type, name,
-             internal_type: internal_type )
+             internal_type: internal_type,
+             components: components )
     end
 
     ### check - find a "better" name for internal_type
     ##            use a keyword param - why? why not?
     def initialize( type, name=nil,
-                    internal_type: nil )  ## note: type goes first!!!
+                     internal_type: nil,
+                     components: nil  )  ## note: type goes first!!!
       @type          = type
       ## note: convert empty string "" to nil - why? why not?
       @name          = if name && name.empty?
@@ -27,20 +32,31 @@ class Param
                        else
                           internal_type
                        end
+      @components  = components
     end
 
 
     def sig
-      buf = "#{@type}"
-      buf
+      @sig ||= begin
+                  if @components
+                     ## replace tuple with  (type,...)
+                     ##  e.g.  tuple[] becomes (type,...)[] etc.
+                     tuple = @components.map {|c| c.sig }.join(',')
+                     @type.sub( "tuple", "(#{tuple})" )
+                  else
+                    "#{@type}"
+                  end
+               end
+      @sig
     end
 
+
     def doc
         buf = ''
-        if @internal_type && @internal_type != @type
+        if @internal_type && @internal_type != sig
           buf << "#{@internal_type} "
         else
-          buf << "#{@type} "
+          buf << "#{sig} "
         end
         buf <<  (@name ?  @name : '_')
         buf
@@ -48,10 +64,10 @@ class Param
 
     def decl
       buf = ''
-      buf << "#{@type} "
+      buf << "#{sig} "
       buf <<  (@name ? @name :  '_')
       ## use inline comment - why? why not?
-      if @internal_type && @internal_type != @type
+      if @internal_type && @internal_type != sig
          buf << " /* #{@internal_type} */"
       end
       buf

data/lib/abiparser/version.rb

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

data/lib/abiparser.rb

@@ -36,9 +36,12 @@ def sig( bin )
 end
 
 
+require 'abicoder'
+
 
 ## our own code
 require_relative 'abiparser/version'    # note: let version always go first
+
 require_relative 'abiparser/param'
 require_relative 'abiparser/constructor'
 require_relative 'abiparser/function'
@@ -46,7 +49,7 @@ require_relative 'abiparser/utils'
 require_relative 'abiparser/contract'
 require_relative 'abiparser/interface'
 
-require_relative 'abiparser/export/interface.rb'
+require_relative 'abiparser/export/interface'
 
 
 
@@ -121,9 +124,6 @@ module ABI
 end  # module ABI
 
 
-## add convenience alternate spellings - why? why not?
-Abi = ABI
-
 
-puts AbiParser.banner
+puts ABIParser.banner
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abiparser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: abicoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement