v0.14 (#146)

* Support purescript v0.14

Author: kejace

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-dist: trusty
+dist: focal
 sudo: required
 node_js: stable
 services:
@@ -8,7 +8,6 @@ install:
   - npm install
   - npm run build
 
-
 jobs:
   include:
 
@@ -23,8 +22,8 @@ jobs:
     name: "Ensure that code matches style guidleines for PRs to master (Purescript)"
     if: branch = master
     script:
-    - echo "test formatting"
-    - npm run purty-check
+    - echo "test formatting disabled since purty isn't up-to-date with purescript v0.14"
+    # - npm run purty-check
 
 after_success:
 - >-

README.md

@@ -1,10 +1,9 @@
 # purescript-web3
 <img src=https://github.com/f-o-a-m/purescript-web3/blob/master/purescript-web3-logo.png width="75">
 
-
 [![Latest release](http://img.shields.io/github/release/f-o-a-m/purescript-web3.svg?branch=master)](https://github.com/f-o-a-m/purescript-web3/releases)
 [![purescript-web3 on Pursuit](https://pursuit.purescript.org/packages/purescript-web3/badge)](https://pursuit.purescript.org/packages/purescript-web3)
-[![Build status](https://travis-ci.org/f-o-a-m/purescript-web3.svg?branch=master)](https://travis-ci.org/f-o-a-m/purescript-web3?branch=master)
+[![Build status](https://travis-ci.com/f-o-a-m/purescript-web3.svg?branch=master)](https://travis-ci.com/f-o-a-m/purescript-web3?branch=master)
 
 # A Purescript Client for the Web3 API
 

package.json

@@ -14,10 +14,9 @@
     "secp256k1": "^3.0.1"
   },
   "devDependencies": {
-    "pulp": "^15.0.0",
-    "purescript": "^0.13.8",
-    "purescript-psa": "^0.7.3",
+    "purescript": "^0.14.2",
+    "purescript-psa": "^0.8.2",
     "purty": "^7.0.0",
-    "spago": "^0.16.0"
+    "spago": "^0.20.3"
   }
 }

packages.dhall

@@ -1,133 +1,18 @@
-{-
-Welcome to your new Dhall package-set!
-
-Below are instructions for how to edit this file for most use
-cases, so that you don't need to know Dhall to use it.
-
-## Warning: Don't Move This Top-Level Comment!
-
-Due to how `dhall format` currently works, this comment's
-instructions cannot appear near corresponding sections below
-because `dhall format` will delete the comment. However,
-it will not delete a top-level comment like this one.
-
-## Use Cases
-
-Most will want to do one or both of these options:
-1. Override/Patch a package's dependency
-2. Add a package not already in the default package set
-
-This file will continue to work whether you use one or both options.
-Instructions for each option are explained below.
-
-### Overriding/Patching a package
-
-Purpose:
-- Change a package's dependency to a newer/older release than the
-    default package set's release
-- Use your own modified version of some dependency that may
-    include new API, changed API, removed API by
-    using your custom git repo of the library rather than
-    the package set's repo
-
-Syntax:
-where `entityName` is one of the following:
-- dependencies
-- repo
-- version
--------------------------------
-let upstream = --
-in  upstream
-  with packageName.entityName = "new value"
--------------------------------
-
-Example:
--------------------------------
-let upstream = --
-in  upstream
-  with halogen.version = "master"
-  with halogen.repo = "https://example.com/path/to/git/repo.git"
-
-  with halogen-vdom.version = "v4.0.0"
--------------------------------
-
-### Additions
-
-Purpose:
-- Add packages that aren't already included in the default package set
-
-Syntax:
-where `<version>` is:
-- a tag (i.e. "v4.0.0")
-- a branch (i.e. "master")
-- commit hash (i.e. "701f3e44aafb1a6459281714858fadf2c4c2a977")
--------------------------------
-let upstream = --
-in  upstream
-  with new-package-name =
-    { dependencies =
-       [ "dependency1"
-       , "dependency2"
-       ]
-    , repo =
-       "https://example.com/path/to/git/repo.git"
-    , version =
-        "<version>"
-    }
--------------------------------
-
-Example:
--------------------------------
-let upstream = --
-in  upstream
-  with benchotron =
-      { dependencies =
-          [ "arrays"
-          , "exists"
-          , "profunctor"
-          , "strings"
-          , "quickcheck"
-          , "lcg"
-          , "transformers"
-          , "foldable-traversable"
-          , "exceptions"
-          , "node-fs"
-          , "node-buffer"
-          , "node-readline"
-          , "datetime"
-          , "now"
-          ]
-      , repo =
-          "https://github.com/hdgarrood/purescript-benchotron.git"
-      , version =
-          "v7.0.0"
-      }
--------------------------------
--}
-
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200922/packages.dhall sha256:5edc9af74593eab8834d7e324e5868a3d258bbab75c5531d2eb770d4324a2900
-
-
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.2-20210629/packages.dhall sha256:534c490bb73cae75adb5a39871142fd8db5c2d74c90509797a80b8bb0d5c3f7b
 
 let overrides = {=}
 
 let additions =
-  { coroutine-transducers =
-      { dependencies =
-          [ "aff"
-          , "coroutines"
-          , "effect"
-          , "maybe"
-          , "psci-support"
-          ]
-      , repo =
-          "https://github.com/blinky3713/purescript-coroutine-transducers"
-      , version =
-          "v1.0.0"
-      }
-  , eth-core =
-      { dependencies =
+      { coroutine-transducers =
+        { dependencies =
+          [ "aff", "coroutines", "effect", "maybe", "psci-support" ]
+        , repo =
+            "https://github.com/blinky3713/purescript-coroutine-transducers"
+        , version = "v1.0.0"
+        }
+      , eth-core =
+        { dependencies =
           [ "argonaut"
           , "bytestrings"
           , "console"
@@ -141,21 +26,14 @@ let additions =
           , "ring-modules"
           , "simple-json"
           ]
-      , repo =
-          "https://github.com/f-o-a-m/purescript-eth-core.git"
-      , version =
-          "v6.0.0"
-      }
-  , tagged =
-      { dependencies =
-          [ "identity"
-          , "profunctor"
-          ]
-      , repo =
-          "https://github.com/LiamGoodacre/purescript-tagged"
-      , version =
-          "v3.0.0"
+        , repo = "https://github.com/f-o-a-m/purescript-eth-core.git"
+        , version = "v7.0.0"
+        }
+      , tagged =
+        { dependencies = [ "identity", "profunctor" ]
+        , repo = "https://github.com/kejace/purescript-tagged"
+        , version = "v0.14"
+        }
       }
-  }
 
 in  upstream // overrides // additions

spago.dhall

@@ -5,29 +5,44 @@ You can edit this file as you like.
 { name = "web3"
 , dependencies =
   [ "aff"
-  , "avar"
-  , "console"
   , "coroutines"
   , "coroutine-transducers"
-  , "debug"
   , "effect"
   , "errors"
   , "eth-core"
   , "foreign"
   , "foreign-generic"
   , "fork"
-  , "free"
   , "heterogeneous"
-  , "identity"
   , "parsing"
   , "partial"
   , "profunctor-lenses"
-  , "proxy"
   , "psci-support"
   , "tagged"
   , "transformers"
   , "typelevel-prelude"
   , "variant"
+  , "argonaut"
+  , "arrays"
+  , "bifunctors"
+  , "bytestrings"
+  , "control"
+  , "either"
+  , "exceptions"
+  , "foldable-traversable"
+  , "foreign-object"
+  , "integers"
+  , "maybe"
+  , "newtype"
+  , "parallel"
+  , "prelude"
+  , "record"
+  , "ring-modules"
+  , "simple-json"
+  , "strings"
+  , "tailrec"
+  , "tuples"
+  , "unfoldable"
   ]
 , packages = ./packages.dhall
 , sources = [ "src/**/*.purs" ]

src/Network/Ethereum/Web3.purs

@@ -6,7 +6,7 @@ module Network.Ethereum.Web3
   , module Network.Ethereum.Web3.Types.Provider
   ) where
 
-import Network.Ethereum.Web3.Contract (class EventFilter, eventFilter, event, call, sendTx, deployContract, mkDataField)
+import Network.Ethereum.Web3.Contract (class EventFilter, event, eventFilter, call, sendTx, deployContract, mkDataField)
 import Network.Ethereum.Web3.Contract.Events (event', EventHandler, MultiFilterStreamState(..), FilterStreamState, ChangeReceipt)
 import Network.Ethereum.Web3.Solidity
   ( D0

src/Network/Ethereum/Web3/Api.purs

@@ -3,7 +3,7 @@ module Network.Ethereum.Web3.Api where
 import Data.Maybe (Maybe, fromMaybe)
 import Network.Ethereum.Types (Address, HexString, BigNumber)
 import Network.Ethereum.Web3.JsonRPC (remote)
-import Network.Ethereum.Web3.Types (Block, BlockNumber, ChainCursor, Change, FalseOrObject, Filter, FilterId, NoPay, SyncStatus, Transaction, TransactionOptions, TransactionReceipt, Web3)
+import Network.Ethereum.Web3.Types (Block, BlockNumber, ChainCursor, Change, FalseOrObject, Filter, FilterId, SyncStatus, Transaction, TransactionOptions, TransactionReceipt, Web3)
 import Network.Ethereum.Web3.Types.TokenUnit (MinorUnit)
 
 -- | Returns current node version string.

src/Network/Ethereum/Web3/Contract.purs

@@ -17,19 +17,21 @@ import Data.Functor.Tagged (Tagged, untagged)
 import Data.Generic.Rep (class Generic, Constructor)
 import Data.Lens ((.~), (%~), (?~))
 import Data.Maybe (Maybe(..))
-import Data.Symbol (class IsSymbol, SProxy(..), reflectSymbol)
+import Type.Proxy (Proxy(..))
+import Data.Symbol (class IsSymbol, reflectSymbol)
 import Effect.Exception (error)
 import Network.Ethereum.Core.Keccak256 (toSelector)
 import Network.Ethereum.Types (Address, HexString)
 import Network.Ethereum.Web3.Api (eth_call, eth_sendTransaction)
 import Network.Ethereum.Web3.Contract.Events (MultiFilterStreamState(..), event', FilterStreamState, ChangeReceipt, EventHandler)
 import Network.Ethereum.Web3.Solidity (class DecodeEvent, class GenericABIDecode, class GenericABIEncode, class RecordFieldsIso, genericABIEncode, genericFromData, genericFromRecordFields)
 import Network.Ethereum.Web3.Types (class TokenUnit, CallError(..), ChainCursor, ETHER, Filter, NoPay, TransactionOptions, Value, Web3, _data, _value, convert, throwWeb3)
-import Type.Proxy (Proxy)
+
 
 --------------------------------------------------------------------------------
--- * Events
---------------------------------------------------------------------------------
+  -- * Events
+  --------------------------------------------------------------------------------
+class EventFilter :: forall k. k -> Constraint
 class EventFilter e where
   -- | Event filter structure used by low-level subscription methods
   eventFilter :: Proxy e -> Address -> Filter e
@@ -68,7 +70,7 @@ class TxMethod (selector :: Symbol) a where
     TokenUnit (Value (u ETHER)) =>
     IsSymbol selector =>
     TransactionOptions u ->
-    Tagged (SProxy selector) a ->
+    Tagged (Proxy selector) a ->
     Web3 HexString
 
 -- ^ 'Web3' wrapped tx hash
@@ -78,7 +80,7 @@ class CallMethod (selector :: Symbol) a b where
     IsSymbol selector =>
     TransactionOptions NoPay ->
     ChainCursor ->
-    Tagged (SProxy selector) a ->
+    Tagged (Proxy selector) a ->
     Web3 (Either CallError b)
 
 -- ^ 'Web3' wrapped result
@@ -95,11 +97,11 @@ _sendTransaction ::
   GenericABIEncode rep =>
   TokenUnit (Value (u ETHER)) =>
   TransactionOptions u ->
-  Tagged (SProxy selector) a ->
+  Tagged (Proxy selector) a ->
   Web3 HexString
 _sendTransaction txOptions dat = do
   let
-    sel = toSelector <<< reflectSymbol $ (SProxy :: SProxy selector)
+    sel = toSelector <<< reflectSymbol $ (Proxy :: Proxy selector)
   eth_sendTransaction $ txdata $ sel <> (genericABIEncode <<< untagged $ dat)
   where
   txdata d =
@@ -116,11 +118,11 @@ _call ::
   GenericABIDecode brep =>
   TransactionOptions NoPay ->
   ChainCursor ->
-  Tagged (SProxy selector) a ->
+  Tagged (Proxy selector) a ->
   Web3 (Either CallError b)
 _call txOptions cursor dat = do
   let
-    sig = reflectSymbol $ (SProxy :: SProxy selector)
+    sig = reflectSymbol $ (Proxy :: Proxy selector)
 
     sel = toSelector sig
 
@@ -163,12 +165,12 @@ mkDataField ::
   Generic a (Constructor name args) =>
   RecordFieldsIso args fields l =>
   GenericABIEncode (Constructor name args) =>
-  Proxy (Tagged (SProxy selector) a) ->
+  Proxy (Tagged (Proxy selector) a) ->
   Record fields ->
   HexString
 mkDataField _ r =
   let
-    sig = reflectSymbol (SProxy :: SProxy selector)
+    sig = reflectSymbol (Proxy :: Proxy selector)
 
     sel = toSelector sig