Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgraded deps #147

Merged
merged 2 commits into from
Apr 19, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
upgraded deps
martyall committed Apr 19, 2024
commit 69129cc4b8a78b422bdac73fa2f307b14aa5bdcd
23 changes: 16 additions & 7 deletions packages.dhall
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
let upstream =
https://raw.githubusercontent.com/f-o-a-m/package-sets/9e9623711d22de73259e765f5acf8407b7332998/purs-0.15.7-web3.dhall
sha256:f0ffdb72aef1af63caf537a130b40d8f73779e82496404d9cedb66c6a699b55d
https://github.com/purescript/package-sets/releases/download/psc-0.15.15-20240416/packages.dhall
sha256:ca727657c01cc31d0e79c2113b59126b9826f4b56d20a8193be3c725599fb754

let eth-core-deps =
https://raw.githubusercontent.com/f-o-a-m/purescript-eth-core/master/packages.dhall
sha256:af2751772a729d58edf7056805007934e3687b3079f8a02ac514e705aeab8c42

let web3-deps =
https://raw.githubusercontent.com/f-o-a-m/purescript-web3/master/packages.dhall
sha256:c1bebe7e4899bd64304a84fea26f9ea635e20897f206ce6fa86bd446715c5ffc

let web3-generator-deps =
https://raw.githubusercontent.com/f-o-a-m/purescript-web3-generator/master/packages.dhall
sha256:89a7ee097ae9a095bf3bfddcb354d4c6b747d15b9b47ef0f5dc5f2280d3a8929

let additions =
{ solc =
@@ -43,7 +55,6 @@ let additions =
, "control"
, "effect"
, "either"
, "errors"
, "eth-core"
, "exceptions"
, "fixed-points"
@@ -54,11 +65,9 @@ let additions =
, "maybe"
, "language-cst-parser"
, "tidy-codegen"
, "mkdirp"
, "newtype"
, "node-buffer"
, "node-fs"
, "node-fs-aff"
, "node-path"
, "node-process"
, "ordered-collections"
@@ -73,8 +82,8 @@ let additions =
, "web3"
]
, repo = "https://github.com/f-o-a-m/purescript-web3-generator.git"
, version = "v7.0.0"
, version = "v7.1.0"
}
}

in upstream // additions
in upstream // eth-core-deps // web3-deps // web3-generator-deps // additions
7 changes: 0 additions & 7 deletions spago.dhall
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{-
Welcome to a Spago project!
You can edit this file as you like.
-}
{ name = "chanterelle"
, dependencies =
[ "aff"
@@ -17,7 +13,6 @@ You can edit this file as you like.
, "datetime"
, "effect"
, "either"
, "errors"
, "eth-core"
, "exceptions"
, "foldable-traversable"
@@ -28,11 +23,9 @@ You can edit this file as you like.
, "js-date"
, "logging"
, "maybe"
, "mkdirp"
, "newtype"
, "node-buffer"
, "node-fs"
, "node-fs-aff"
, "node-path"
, "node-process"
, "now"
4 changes: 2 additions & 2 deletions src/Chanterelle.purs
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ import Data.Show.Generic (genericShow)
import Effect.Aff (Aff)
import Effect.Class (liftEffect)
import Node.Path (resolve)
import Node.Process (cwd, exit)
import Node.Process (cwd, exit')

data SelectCLI (a :: Type) (b :: Type) = SelectCLI a

@@ -110,4 +110,4 @@ runCommand project = case _ of
eRes <- runCompileM Chanterelle.generatePS project
either terminateOnCompileError mempty eRes

terminateOnCompileError e = logCompileError e *> liftEffect (exit 1)
terminateOnCompileError e = logCompileError e *> liftEffect (exit' 1)
3 changes: 1 addition & 2 deletions src/Chanterelle/Compile.purs
Original file line number Diff line number Diff line change
@@ -12,15 +12,14 @@ import Chanterelle.Types.Compile (CompileError(..))
import Chanterelle.Types.Project (ChanterelleModule(..), ChanterelleProject(..), ChanterelleProjectSpec(..), getSolc, partitionSelectionSpecs)
import Chanterelle.Utils (assertDirectory', fileIsDirty)
import Chanterelle.Utils.Error (withExceptT')
import Control.Error.Util (note)
import Control.Monad.Error.Class (class MonadThrow, throwError)
import Control.Monad.Reader (class MonadAsk, ask)
import Data.Argonaut (decodeJson, printJsonDecodeError)
import Data.Argonaut as A
import Data.Argonaut.Parser as AP
import Data.Array (catMaybes, partition)
import Data.Bifunctor (lmap)
import Data.Either (Either(..), either, hush)
import Data.Either (Either(..), either, hush, note)
import Data.Lens ((^?))
import Data.Lens.Index (ix)
import Data.Maybe (Maybe(..), fromMaybe, maybe)
4 changes: 2 additions & 2 deletions src/Chanterelle/Utils/FS.purs
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@ import Effect.Class (liftEffect)
import Effect.Uncurried (EffectFn2, EffectFn3, runEffectFn2, runEffectFn3)
import Node.Encoding (Encoding(..))
import Node.FS.Aff as FS
import Node.FS.Perms (permsReadWrite)
import Node.FS.Stats as Stats
import Node.FS.Sync.Mkdirp (mkdirp)
import Node.Path (FilePath)
import Node.Path as Path

@@ -49,7 +49,7 @@ assertDirectory dn = do
Left _ -> do
-- assume an error means the file doesn't exist
log Debug ("creating directory " <> dn)
liftEffect $ mkdirp dn
liftAff $ FS.mkdir' dn {recursive: true, mode: permsReadWrite}
Right stats ->
if not (Stats.isDirectory stats) then throwError ("Path " <> dn <> " exists but is not a directory!")
else log Debug ("path " <> dn <> " exists and is a directory")