2.0.0

Author: cmditch

README.md

@@ -3,3 +3,20 @@ Generate an [elm-ethereum](https://github.com/cmditch/elm-ethereum) binding for
 
 Example usage:
 `elm-ethereum-generator some-abi.json src/MyContract.elm`
+
+## Changelog
+
+### 2.0.0
+
+- Changed imports from Abi to AbiEncode and AbiDecode
+- Removed unsupported types for the time being.
+- De-pluralize "ies" in type alias names. Add "y" to end.
+   Helpful for properly naming data returned from functions with multiple return values (structs/tuples).
+- Manually entry of staticByte length required for time being. Need to majorly refactor type parsing.
+
+### 1.1.0
+
+- Change all occurences of Evm to Abi
+- Add "Contracts." for generated module name
+- De-pluralize "s" in type-alias names.
+    (Though not handling "ies")

changelog

@@ -1,5 +1,5 @@
 name:                elm-ethereum-generator
-version:             1.1.0
+version:             2.0.0
 -- synopsis:
 -- description:
 homepage:            https://github.com/cmditch/elm-ethereum-generator

elm-ethereum-generator.cabal

@@ -1,4 +1,4 @@
-module ERC20
+module Contracts.ERC20
     exposing
         ( allowance
         , allowed
@@ -24,8 +24,15 @@ import Json.Decode as Decode exposing (Decoder)
 import Json.Decode.Pipeline exposing (custom, decode)
 import Eth.Types exposing (..)
 import Eth.Utils as U
-import Evm.Decode as Evm exposing (evmDecode, andMap, toElmDecoder, topic, data)
-import Evm.Encode as Evm exposing (Encoding(..), evmEncode)
+import Abi.Decode as AbiDecode exposing (abiDecode, andMap, toElmDecoder, topic, data)
+import Abi.Encode as AbiEncode exposing (Encoding(..), abiEncode)
+
+
+{-
+
+   This file was generated by https://github.com/cmditch/elm-ethereum-generator
+
+-}
 
 
 {-| "allowance(address,address)" function
@@ -37,9 +44,9 @@ allowance contractAddress owner spender =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "allowance(address,address)" [ AddressE owner, AddressE spender ]
+    , data = Just <| AbiEncode.functionCall "allowance(address,address)" [ AbiEncode.address owner, AbiEncode.address spender ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.uint
+    , decoder = toElmDecoder AbiDecode.uint
     }
 
 
@@ -52,9 +59,9 @@ allowed contractAddress a b =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "allowed(address,address)" [ AddressE a, AddressE b ]
+    , data = Just <| AbiEncode.functionCall "allowed(address,address)" [ AbiEncode.address a, AbiEncode.address b ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.uint
+    , decoder = toElmDecoder AbiDecode.uint
     }
 
 
@@ -67,9 +74,9 @@ approve contractAddress spender value =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "approve(address,uint256)" [ AddressE spender, UintE value ]
+    , data = Just <| AbiEncode.functionCall "approve(address,uint256)" [ AbiEncode.address spender, AbiEncode.uint value ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.bool
+    , decoder = toElmDecoder AbiDecode.bool
     }
 
 
@@ -82,9 +89,9 @@ balanceOf contractAddress owner =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "balanceOf(address)" [ AddressE owner ]
+    , data = Just <| AbiEncode.functionCall "balanceOf(address)" [ AbiEncode.address owner ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.uint
+    , decoder = toElmDecoder AbiDecode.uint
     }
 
 
@@ -97,9 +104,9 @@ balances contractAddress a =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "balances(address)" [ AddressE a ]
+    , data = Just <| AbiEncode.functionCall "balances(address)" [ AbiEncode.address a ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.uint
+    , decoder = toElmDecoder AbiDecode.uint
     }
 
 
@@ -112,9 +119,9 @@ decimals contractAddress =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "decimals()" []
+    , data = Just <| AbiEncode.functionCall "decimals()" []
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.uint
+    , decoder = toElmDecoder AbiDecode.uint
     }
 
 
@@ -127,9 +134,9 @@ name contractAddress =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "name()" []
+    , data = Just <| AbiEncode.functionCall "name()" []
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.string
+    , decoder = toElmDecoder AbiDecode.string
     }
 
 
@@ -142,9 +149,9 @@ symbol contractAddress =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "symbol()" []
+    , data = Just <| AbiEncode.functionCall "symbol()" []
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.string
+    , decoder = toElmDecoder AbiDecode.string
     }
 
 
@@ -157,9 +164,9 @@ totalSupply contractAddress =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "totalSupply()" []
+    , data = Just <| AbiEncode.functionCall "totalSupply()" []
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.uint
+    , decoder = toElmDecoder AbiDecode.uint
     }
 
 
@@ -172,9 +179,9 @@ transfer contractAddress to value =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "transfer(address,uint256)" [ AddressE to, UintE value ]
+    , data = Just <| AbiEncode.functionCall "transfer(address,uint256)" [ AbiEncode.address to, AbiEncode.uint value ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.bool
+    , decoder = toElmDecoder AbiDecode.bool
     }
 
 
@@ -187,9 +194,9 @@ transferFrom contractAddress from to value =
     , gas = Nothing
     , gasPrice = Nothing
     , value = Nothing
-    , data = Just <| Evm.encodeFunctionCall "transferFrom(address,address,uint256)" [ AddressE from, AddressE to, UintE value ]
+    , data = Just <| AbiEncode.functionCall "transferFrom(address,address,uint256)" [ AbiEncode.address from, AbiEncode.address to, AbiEncode.uint value ]
     , nonce = Nothing
-    , decoder = toElmDecoder Evm.bool
+    , decoder = toElmDecoder AbiDecode.bool
     }
 
 
@@ -209,18 +216,18 @@ approvalEvent contractAddress owner spender =
     , address = contractAddress
     , topics = 
         [ Just <| U.keccak256 "Approval(address,address,uint256)"
-        , Maybe.map (evmEncode << AddressE) owner
-        , Maybe.map (evmEncode << AddressE) spender
+        , Maybe.map (abiEncode << AbiEncode.address) owner
+        , Maybe.map (abiEncode << AbiEncode.address) spender
         ]
     }
 
 
 approvalDecoder : Decoder Approval
 approvalDecoder = 
     decode Approval
-        |> custom (topic 1 Evm.address)
-        |> custom (topic 2 Evm.address)
-        |> custom (data 0 Evm.uint)
+        |> custom (topic 1 AbiDecode.address)
+        |> custom (topic 2 AbiDecode.address)
+        |> custom (data 0 AbiDecode.uint)
 
 
 {-| "Transfer(address,address,uint256)" event
@@ -239,17 +246,17 @@ transferEvent contractAddress from to =
     , address = contractAddress
     , topics = 
         [ Just <| U.keccak256 "Transfer(address,address,uint256)"
-        , Maybe.map (evmEncode << AddressE) from
-        , Maybe.map (evmEncode << AddressE) to
+        , Maybe.map (abiEncode << AbiEncode.address) from
+        , Maybe.map (abiEncode << AbiEncode.address) to
         ]
     }
 
 
 transferDecoder : Decoder Transfer
 transferDecoder = 
     decode Transfer
-        |> custom (topic 1 Evm.address)
-        |> custom (topic 2 Evm.address)
-        |> custom (data 0 Evm.uint)
+        |> custom (topic 1 AbiDecode.address)
+        |> custom (topic 2 AbiDecode.address)
+        |> custom (data 0 AbiDecode.uint)