eth/abi: allow encoding address types (#242)

* eth/abi: allow encoding address types * eth/abi: add test
q9f · Jun 16, 2023 · 6f19a28 · 6f19a28
1 parent 4b09acc
commit 6f19a28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/eth/abi/encoder.rb b/lib/eth/abi/encoder.rb
@@ -257,7 +257,11 @@ def hash(arg, type)
 
       # Properly encodes addresses.
       def address(arg)
-        if arg.is_a? Integer
+        if arg.is_a? Address
+
+          # from checksummed address with 0x prefix
+          Util.zpad_hex arg.to_s[2..-1]
+        elsif arg.is_a? Integer
 
           # address from integer
           Util.zpad_int arg
@@ -267,11 +271,11 @@ def address(arg)
           Util.zpad arg, 32
         elsif arg.size == 40
 
-          # address from hexadecimal address with 0x prefix
+          # address from hexadecimal address
           Util.zpad_hex arg
         elsif arg.size == 42 and arg[0, 2] == "0x"
 
-          # address from hexadecimal address
+          # address from hexadecimal address with 0x prefix
           Util.zpad_hex arg[2..-1]
         else
           raise EncodingError, "Could not parse address: #{arg}"

diff --git a/spec/eth/abi/encoder_spec.rb b/spec/eth/abi/encoder_spec.rb
@@ -50,6 +50,7 @@
     expect(Abi::Encoder.type t_address, "\xff" * 20).to eq Util.zpad("\xff" * 20, 32)
     expect(Abi::Encoder.type t_address, "ff" * 20).to eq Util.zpad("\xff" * 20, 32)
     expect(Abi::Encoder.type t_address, "0x" + "ff" * 20).to eq Util.zpad("\xff" * 20, 32)
+    expect(Abi::Encoder.type t_address, Address.new("0x" + "ff" * 20)).to eq Util.zpad("\xff" * 20, 32)
   end
 
   it "can encode primitive types" do

diff --git a/spec/fixtures/ethereum/tests b/spec/fixtures/ethereum/tests