From fa3be77646fc64f318440d4fdc821af5a7540664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?=
 <55331875+clement-ux@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:50:36 +0200
Subject: [PATCH] Fix contract verification & update Makefile (#37)

* fix: remove etherscan setting from config.

* chore: update forge version.

* chore: exclude invariant from classic test.
---
 Makefile     | 12 +++++++++---
 foundry.toml |  7 ++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d125703..886fa46 100644
--- a/Makefile
+++ b/Makefile
@@ -26,14 +26,20 @@ snapshot:
 	@forge snapshot
 
 # Tests
+test-std:
+	forge test --summary --fail-fast --show-progress
+
 test:
-	@forge test --summary --fail-fast --show-progress
+	@FOUNDRY_NO_MATCH_CONTRACT=Invariant make test-std
 
 test-f-%:
-	@FOUNDRY_MATCH_TEST=$* make test
+	@FOUNDRY_MATCH_TEST=$* make test-std
 
 test-c-%:
-	@FOUNDRY_MATCH_CONTRACT=$* make test
+	@FOUNDRY_MATCH_CONTRACT=$* make test-std
+
+test-all:
+	@make test-std
 
 # Coverage
 coverage:
diff --git a/foundry.toml b/foundry.toml
index 04bad5f..a576e61 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -15,7 +15,7 @@ remappings = [
   "script/=./script",
   "test/=./test",
   "utils/=./src/contracts/utils",
-  "forge-std/=dependencies/forge-std-1.9.2/src/",
+  "forge-std/=dependencies/forge-std-1.9.3/src/",
   "@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.0.2/",
   "@openzeppelin/contracts-upgradeable/=dependencies/@openzeppelin-contracts-upgradeable-5.0.2/",
   "@solmate/=dependencies/solmate-6.7.0/src/",
@@ -33,8 +33,8 @@ shrink_run_limit = 5_000
 [dependencies]
 "@openzeppelin-contracts" = "5.0.2"
 "@openzeppelin-contracts-upgradeable" = "5.0.2"
-forge-std = { version = "1.9.2", git = "https://github.com/foundry-rs/forge-std.git", rev = "5a802d7c10abb4bbfb3e7214c75052ef9e6a06f8" }
 solmate = "6.7.0"
+forge-std = "1.9.3"
 
 [soldeer]
 recursive_deps = false
@@ -47,7 +47,4 @@ remappings_location = "config"
 [rpc_endpoints]
 mainnet = "${PROVIDER_URL}"
 
-[etherscan]
-mainnet = { key = "${ETHERSCAN_API_KEY}", url = "https://etherscan.io/", chain = "mainnet" }
-
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options