Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ jobs:
unzip bitwuzla.zip && rm bitwuzla.zip
echo BITWUZLA_PATH="$PWD/Bitwuzla-Win64-x86_64-static/bin" >> "$GITHUB_ENV"
# evm
go install github.com/ethereum/go-ethereum/cmd/evm@latest
go install github.com/ethereum/go-ethereum/cmd/evm@v1.16.1
echo EVM_PATH="$(cygpath -u "$(go env GOPATH)/bin")" >> "$GITHUB_ENV"
# cvc5
curl --retry 5 -fsSL https://github.com/cvc5/cvc5/releases/download/cvc5-1.3.0/cvc5-Win64-x86_64-static.zip -o cvc5.zip
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/check-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ jobs:
- name: lookup nix versions
id: nixpkgs
run: |
NIXPKGS_REV="$(jq -r '.nodes.nixpkgs_2.locked.rev' < flake.lock)"
NIXPKGS_REV="$(jq -r '.nodes.nixpkgs.locked.rev' < flake.lock)"
VERSIONS="$(nix eval -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/$NIXPKGS_REV.tar.gz" --impure --json \
--expr 'let pkgs = (import <nixpkgs> {}); in { "secp256k1" = pkgs.secp256k1.version; "ff" = pkgs.libff.version; }')"
--expr 'let pkgs = (import <nixpkgs> {}); in { "secp256k1" = pkgs.secp256k1.version; "ff" = pkgs.libff.version; "geth" = pkgs.go-ethereum.version; }')"
LIBFF_REV="$(jq .ff -r <<<"$VERSIONS")"
LIBSECP256K1_REV="$(jq .secp256k1 -r <<<"$VERSIONS")"
{ echo "nixpkgs=$NIXPKGS_REV"; echo "libff=$LIBFF_REV"; echo "libsecp256k1=$LIBSECP256K1_REV"; } >> "$GITHUB_OUTPUT"
GETH_VERSION="$(jq .geth -r <<<"$VERSIONS")"
{ echo "nixpkgs=$NIXPKGS_REV"; echo "libff=$LIBFF_REV"; echo "libsecp256k1=$LIBSECP256K1_REV"; echo "geth=$GETH_VERSION"; } >> "$GITHUB_OUTPUT"
- name: lookup local versions
id: local
run: |
Expand All @@ -36,13 +37,15 @@ jobs:
SOLIDITY_REV_BUILD="$(grep -A2 'repository: argotorg/solidity' .github/workflows/build.yml | grep 'ref:' | tr -d ' ' | cut -f2 -d:)"
SOLC_VERSION_FLAKE="$(grep -oP 'solc_\K[0-9_]+' flake.nix | head -1 | tr '_' '.')"
SOLC_VERSION_BUILD="$(grep -oP 'solidity/releases/download/v\K[0-9.]+' .github/workflows/build.yml)"
GETH_VERSION_BUILD="$(grep -oP 'go-ethereum/cmd/evm@v\K[0-9.]+' .github/workflows/build.yml)"
{
echo "libff=$LIBFF_REV"
echo "libsecp256k1=$LIBSECP256K1_REV"
echo "solidity_rev_flake=$SOLIDITY_REV_FLAKE"
echo "solidity_rev_build=$SOLIDITY_REV_BUILD"
echo "solc_version_flake=$SOLC_VERSION_FLAKE"
echo "solc_version_build=$SOLC_VERSION_BUILD"
echo "geth=$GETH_VERSION_BUILD"
} >> "$GITHUB_OUTPUT"
- name: compare versions
run: |
Expand All @@ -54,6 +57,10 @@ jobs:
echo "libsecp256k1 versions do not match! nix=$LIBSECP256K1_NIXPKGS local=$LIBSECP256K1_LOCAL"
exit 1
fi
if [ "$GETH_NIXPKGS" != "$GETH_LOCAL" ]; then
echo "go-ethereum versions do not match! nix=$GETH_NIXPKGS local=$GETH_LOCAL"
exit 1
fi
if [ "$SOLIDITY_REV_FLAKE" != "$SOLIDITY_REV_BUILD" ]; then
echo "solidity repo revisions do not match! flake.lock=$SOLIDITY_REV_FLAKE build.yml=$SOLIDITY_REV_BUILD"
exit 1
Expand All @@ -67,6 +74,8 @@ jobs:
LIBFF_LOCAL: ${{ steps.local.outputs.libff }}
LIBSECP256K1_NIXPKGS: ${{ steps.nixpkgs.outputs.libsecp256k1 }}
LIBSECP256K1_LOCAL: ${{ steps.local.outputs.libsecp256k1 }}
GETH_NIXPKGS: ${{ steps.nixpkgs.outputs.geth }}
GETH_LOCAL: ${{ steps.local.outputs.geth }}
SOLIDITY_REV_FLAKE: ${{ steps.local.outputs.solidity_rev_flake }}
SOLIDITY_REV_BUILD: ${{ steps.local.outputs.solidity_rev_build }}
SOLC_VERSION_FLAKE: ${{ steps.local.outputs.solc_version_flake }}
Expand Down
137 changes: 17 additions & 120 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
foundry.url = "github:shazow/foundry.nix/stable";
foundry = {
url = "github:shazow/foundry.nix/stable";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
solidity = {
url = "github:argotorg/solidity/fd3a22656ebe9c91a96ebd846ab7699b5f2e053c";
flake = false;
Expand All @@ -15,11 +19,13 @@
};
empty-smt-solver = {
url = "github:msooseth/empty-smt-solver/74bd120fdb730fde8e44243305e669e5e8a3e02a";
flake = true;
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
solc-pkgs = {
url = "github:hellwolf/solc.nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
};

Expand Down
Loading