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.

Sign up for GitHub

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

Jump to bottom

Fix dapp---use and solc---use for flakes #977

Draft
wants to merge 76 commits into
base: master
Choose a base branch
from
Draft

Fix dapp---use and solc---use for flakes #977

wants to merge 76 commits into from

Conversation

asymmetric
Copy link
Contributor

@asymmetric asymmetric commented Feb 24, 2023 •
edited
Loading

Description

The main goal of this PR is to allow dapp --use and seth --use for flake users. This requires a series of internal changes:

  • bumping the nix version (as the previously pinned one was pre-flakes), which in turn required
  • bumping the nixpkgs version, which in turn required
  • switching to ethereum/hevm (as there was no hope of getting the in-tree hevm to compile with a newer nixpkgs).

So to summarize:

  • Fixes usage of dapptools with flakes
  • Switches to ethereum/hevm (incorporating work from Use ethereum hevm #968)
  • Fixes a bug in seth---use where seth would be run twice
  • Adds a devShell to flake
  • Adds a CI job that runs nix build (in the future, it should supplant the existing one, and run nix flake check)
  • And a few other minor tweaks

Checklist

  • tested locally
  • added automated tests
  • updated the docs
  • updated the changelog

closes #968

asymmetric and others added 30 commits February 24, 2023 15:42
@asymmetric
flake: add solc
986d54a
@asymmetric
solc: prettyfiy expression
bc43430
@asymmetric
ci: add flake job
ad47ed6
@asymmetric
ci: no need to install cachix
35cceb4 
The cache config is in the flake itself.
@asymmetric
flake: add solc-static-versions to packages
30635b9 
Allows running:

nix profile install .#solc-static-versions.solc_0_8_16
@asymmetric
nixpkgs: 21.11 -> 22.11
c2b8059 
We need a recent nix command to have flakes, so we might as well update
to the latest stable release.

This introduces some build errors, which are fixed in the following
commits.
@asymmetric
ethsign: fix build
2cfc326
@asymmetric
jays: fix build
64c678b
@asymmetric
nix: increase log lines
17298da
@asymmetric
solc-static: fix darwin build
383ceb4
@asymmetric
hevm: use ethereum-hevm
93f16ab 
Ours doesn't build with 22.11 anymore, and is unmaintained anyway.
@asymmetric
flake: remove aarch64-linux support
2cf129f 
Not actually supported by our solc-versions infra
@asymmetric
dapp: silence shellcheck SC2309 warning
5330b12 
The hexadecimal `x` is tripping shellcheck into thinking we're comparing
against a string.
@asymmetric
dapp/seth: add support for nix3 profiles
2f0bbc1 
These are a new, incompatible type of profile that is queried with the
experimental `nix profile` subcommand.
@asymmetric
dapp/seth: format
37e3139
@asymmetric
flake: add solc-versions to packages
230e9ca 
nix profile install .#solc-versions.solc_0_5_15
@d-xo @asymmetric
remove mention of hevm
5c823de
@asymmetric
wip eth-hevm
5ebcfff
@asymmetric
default: get revs from flake.lock
2db390e
@asymmetric
ci: remove hevm tests
ef4caf3
@asymmetric
default: use fetchTarball
6114609
@asymmetric
release: remove ethereum-test-suite
85b9dc6 
Unused
@asymmetric
ci: update actions
ab7687a
@d-xo @asymmetric
rename: hevm -> eth-utils
191dd7c
@d-xo @asymmetric
eth-utils: rm unused files
d32b0a2
@d-xo @asymmetric
eth-utils: compiles
da0274f
@d-xo @asymmetric
eth-utils: integrate into dapp & seth
2664a89
@d-xo @asymmetric
eth-utils: rm .envrc
764d442
@asymmetric
geth: fix nix run invocations
c6e46a5
@asymmetric
seth/dapp: fix nix run invocations
44cff2b
@asymmetric
Copy link
Contributor Author

looks like ci is still failing because of: ethereum/hevm#198? this should be fixed in main

For the record, there's still a failing test, pending a fix on hevm.

@asymmetric
Revert "haskell.nix: remove unneeded patching"
229ff5e 
This reverts commit 7c8d238.
@asymmetric
tests: integration: disable tx_source_fetching pending hevm fix
ceda76e
@asymmetric
tests: integration: test dapp---use and seth---use
93cbab4
@asymmetric
tests: integration: test dapp---nix-run
eea352c
@asymmetric
dapp: update CHANGELOG
c15e020
@asymmetric
seth: update CHANGELOG
79d6c11
@asymmetric
dapp/seth: fix --use and --nix-use
59afe3a 
According to the new CLI docs, by using --expr we're saying that the
installable (in our case `out`) is an attribute in the attribute set
that the expression evaluates to.

So it should always be there, and therefore callers don't need to add
it.
@asymmetric asymmetric marked this pull request as draft March 30, 2023 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@d-xo d-xo d-xo left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@asymmetric @d-xo