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

.github/workflows/build.yml

@@ -22,20 +22,18 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # v12
-      - uses: cachix/install-nix-action@v14.1
+      - uses: cachix/install-nix-action@v18
         with:
           # https://discourse.nixos.org/t/understanding-binutils-darwin-wrapper-nix-support-bad-substitution/11475/2
           nix_path: nixpkgs=channel:nixos-unstable
       # v8
-      - uses: cachix/cachix-action@v10
+      - uses: cachix/cachix-action@v12
         with:
           name: dapp
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
       - name: run dapp tests
         run: nix-shell --pure src/dapp-tests/shell.nix --command 'make ci --directory src/dapp-tests'
-      - name: run hevm symbolic tests
-        run: nix-build -j 1 -A hevm-tests
       - run: nix-collect-garbage
       - run: nix-build release.nix -A dapphub.${{ matrix.os_attr }}.stable

.github/workflows/flake.yml

@@ -0,0 +1,20 @@
+name: Flake
+on:
+  pull_request:
+  push:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v18
+      - run: nix build --accept-flake-config .#{dapp,ethsign,hevm,seth,solc}

ARCHITECTURE.md

@@ -15,60 +15,3 @@ The main entrypoint for any invocation of `seth` or `dapp` is a dispatch script,
 `./src/seth/libexec/seth/seth` and `./src/dapp/libexec/dapp/dapp` respectively, which parses any
 flags given, setting their values to the appropriate environment variable, and dispatches to the
 appropriate subcommand.
-
-# hevm
-
-The core evm semnatics in hevm can be found in `EVM.hs`. EVM state is contained in the `VM` record,
-and the `exec1` function executes a single opcode inside the monad `type EVM a = State VM a`.
-
-The core semantics are pure, and should information from the outside world be required to continue
-execution (rpc queries, smt queires, user input), execution will halt, and the `result` field of the
-VM will be an instance of `VMFailure (Query _)`.
-
-Multiple steps of EVM execution are orchestrated via interpreters for a meta language. Programs in
-the meta language are called Steppers. The instructions in the meta language can be found in
-`Stepper.hs`.
-
-There are many different interpreters with different
-features, e.g. a concrete interpreter, a symbolic interpreter, an interpreter that collects coverage
-information, a debug interpreter that can accept user input. Interpreters can handle Queries in
-different ways, for example in the symbolic inerpreter, both sides of a branch point will be
-explored, while in the symbolic debug interpreter, user input will be requested to determine which
-side of the branch point will be taken.
-
-Interpreters are parameterized by a `Fetcher` that can handle rpc and smt queries, and can be
-instantiated with fetchers that could have different fetching strategies (e.g. caching).
-
-Interpreters execute Steppers and use their Fetcher to handle any Queries that need to be resolved.
-
-This architecure is very modular and pluggable, and allows the core semantics to be shared between
-different interpreters, as well as the reuse of steppers between different interpreters, making it
-easy to e.g. replay a failed test in the debug interpreter, or to share the same test execution
-strategy between concrete and symbolic interpreters.
-
-```mermaid
-graph LR
-    subgraph meta-language
-    A[Stepper]
-    end
-    subgraph interpreters
-    A --> B[Concrete]
-    A --> C[Symbolic]
-    A --> D[Coverage]
-    A --> E[Debug]
-    end
-    subgraph fetchers
-    F[Fetch.hs]
-    B --> F
-    C --> F
-    D --> F
-    E --> F
-    end
-    subgraph EVM Semantics
-    G[EVM.hs]
-    B --> G
-    C --> G
-    D --> G
-    E --> G
-    end
-```

README.md

@@ -10,7 +10,6 @@ hand-crafted and maintained by DappHub, along with dependency management, courte
 
 - [dapp](./src/dapp) - All you need Ethereum development tool. Build, test, fuzz, formally verify, debug & deploy solidity contracts.
 - [seth](./src/seth) - Ethereum CLI. Query contracts, send transactions, follow logs, slice & dice data.
-- [hevm](./src/hevm) - Testing oriented EVM implementation. Debug, fuzz, or symbolically execute code against local or mainnet state.
 - [ethsign](./src/ethsign) - Sign Ethereum transactions from a local keystore or hardware wallet.
 
 ## Development Status
@@ -19,14 +18,18 @@ dapptools is currently in a stage of clandestine development where support for t
 be deprived. The software can now be considered free as in free puppy. Users seeking guidance can
 explore using foundry as an alternative
 
+hevm was previously maintained as a part of this repository, but has since been forked out by the
+formal methods team at the ethereum foundation, and is now developed at
+[ethereum/hevm](https://github.com/ethereum/hevm).
+
 ## Installation
 
 Install Nix if you haven't already ([instructions](https://nixos.org/download.html)). Then install dapptools:
 
 ### With flakes
 
 ```
-nix profile install github:dapphub/dapptools#{dapp,ethsign,hevm,seth}
+nix profile install github:dapphub/dapptools#{dapp,ethsign,hevm,seth,solc}
 ```
 
 Nix will offer to use the dapptools binary cache, which will speed up installs,
@@ -52,20 +55,12 @@ nix-env -iA <tool> -f $(curl -sS https://api.github.com/repos/dapphub/dapptools/
 
 If you instead want to build from `master`, change the url to `https://github.com/dapphub/dapptools/archive/master.tar.gz`.
 
-### Prebuilt hevm binary
-
-Static binaries for linux and macos of hevm are available for each release at https://github.com/dapphub/dapptools/releases.
-
-Most functionality is available out of the box, but for symbolic execution you will need
-[`solc`](https://github.com/ethereum/solidity) and ([`z3`](https://github.com/Z3Prover/z3/) or [`cvc4`](https://github.com/CVC4/CVC4) (or both)).
-
 ## Getting started
 
 For more information about the tools, consult the individual README pages:
 
 - [seth](./src/seth/README.md)
 - [dapp](./src/dapp/README.md)
-- [hevm](./src/hevm/README.md)
 - [ethsign](./src/ethsign/README.md)
 
 or use the `--help` flag for any tool.
@@ -95,12 +90,6 @@ export ETH_RPC_URL=https://mainnet.infura.io/v3/$YOUR_API_KEY
 dapp address 0xab5801a7d398351b8be11c439e05c5b3259aec9b $(seth nonce 0xab5801a7d398351b8be11c439e05c5b3259aec9b)
 ```
 
-Symbolically explore the possible execution paths of a call to `dai.transfer(address,uint)`:
-```sh
-seth bundle-source 0x6b175474e89094c44da98b954eedeac495271d0f > daisrc.json && \
-hevm symbolic --address 0x6b175474e89094c44da98b954eedeac495271d0f --rpc $ETH_RPC_URL  --debug --sig "transfer(address,uint256)" --json-file daisrc.json
-```
-
 ## Contributing
 
 Contributions are always welcome! You may be interested in the

default.nix

@@ -1,16 +1,28 @@
-{ system ? builtins.currentSystem , ... }:
+{ system ? builtins.currentSystem, ... }:
 
 let
-  rev = "aa576357673d609e618d87db43210e49d4bb1789";
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+
   nixpkgs = builtins.fetchTarball {
     name = "nixpkgs-release-21.05";
-    url = "https://github.com/nixos/nixpkgs/tarball/${rev}";
-    sha256 = "1868s3mp0lwg1jpxsgmgijzddr90bjkncf6k6zhdjqihf0i1n2np";
+    url = "https://github.com/nixos/nixpkgs/tarball/${lock.nodes.nixpkgs_2.locked.rev}";
+    sha256 = lock.nodes.nixpkgs_2.locked.narHash;
   };
+  ethereum-hevm = import (builtins.fetchTarball {
+    name = "ethereum-hevm";
+    url = "https://github.com/ethereum/hevm/tarball/${lock.nodes.ethereum-hevm.locked.rev}";
+    sha256 = lock.nodes.ethereum-hevm.locked.narHash;
+  });
 in
-  # Now return the Nixpkgs configured to use our overlay.
-  import nixpkgs {
-    inherit system;
 
-    overlays = [(import ./overlay.nix)];
-  }
+# Now return the Nixpkgs configured to use our overlay.
+import nixpkgs {
+  inherit system;
+
+  overlays = [
+    (import ./overlay.nix)
+    (final: prev: {
+      hevm = ethereum-hevm.packages.${system}.hevm;
+    })
+  ];
+}