Update forge std, git submodule command & nix flake for solidity comp…

…iler (#1368) * include solc_0_8_19 in nix flake * use latest forge-std * fix git:submodule:sync command
superfluid-finance · Apr 21, 2023 · 932e2e6 · 932e2e6
1 parent b2711c3
commit 932e2e6
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.3.0
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,21 +4,34 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    foundry.url = "github:shazow/foundry.nix/monthly";
-    foundry.inputs.nixpkgs.follows = "nixpkgs";
+    foundry = {
+      url = "github:shazow/foundry.nix/monthly";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    solc = {
+      url = "github:hellwolf/solc.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, foundry } :
+  outputs = { self, nixpkgs, flake-utils, foundry, solc } :
   flake-utils.lib.eachDefaultSystem (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs {
+      inherit system;
+      overlays = [
+        foundry.overlay
+        solc.overlay
+      ];
+    };
     # minimem development shell
     minimumEVMDevInputs = with pkgs; [
       # for nodejs ecosystem
       yarn
-      nodejs-16_x
+      nodejs-18_x
       # for solidity development
-      foundry.defaultPackage.${system}
+      foundry-bin
+      solc_0_8_19
     ];
     # additional tooling for whitehat hackers
     whitehatInputs = with pkgs; [
@@ -77,8 +90,8 @@
     };
     devShells.full = with pkgs; mkShell {
       buildInputs = minimumEVMDevInputs
-      ++ whitehatInputs
-      ++ specInputs;
+        ++ whitehatInputs
+        ++ specInputs;
     };
     devShells.ci-spec-ghc925 = ci-spec "ghc925";
     devShells.ci-spec-ghc944 = ci-spec "ghc944";

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
         "prepare": "yarn git:submodule:init",
         "git:submodule:init": "git submodule update --init --recursive",
         "git:submodule:update": "git submodule update --recursive",
-        "git:submodule:sync": "git submodule update --remote --recursive;git submodule sync",
+        "git:submodule:sync": "git submodule update --remote --recursive;git submodule sync --recursive",
         "git:submodule:deinit": "git submodule deinit --all --force",
         "lint": "run-s lint:*",
         "lint:shellcheck": "tasks/shellcheck-all-tasks.sh",
+1 −1		foundry.toml
+1 −1		lib/ds-test
+2 −2		package.json
+91 −40		src/StdAssertions.sol
+29 −21		src/StdChains.sol
+93 −26		src/StdCheats.sol
+5 −5		src/StdInvariant.sol
+28 −28		src/StdJson.sol
+333 −0		src/StdStyle.sol
+27 −3		src/StdUtils.sol
+5 −1		src/Test.sol
+29 −1		src/Vm.sol
+176 −0		test/StdAssertions.t.sol
+16 −3		test/StdChains.t.sol
+92 −3		test/StdCheats.t.sol
+110 −0		test/StdStyle.t.sol
+8 −0		test/StdUtils.t.sol