From 69776aea42743315f4503e347faf7b760be786fb Mon Sep 17 00:00:00 2001
From: Ben DiFrancesco <ben@scopelift.co>
Date: Mon, 8 Jun 2026 10:06:00 -0400
Subject: [PATCH 1/2] Bump various versions and switch lines to multi mode

* Bump to solc 0.8.35
* Bump to forge-std v1.16.1
* Bump evm version to prague
* Switch default setting for single statements to multi-line
---
 foundry.lock        | 4 ++--
 foundry.toml        | 6 +++---
 lib/forge-std       | 2 +-
 script/Deploy.s.sol | 2 +-
 src/Counter.sol     | 2 +-
 test/Counter.t.sol  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/foundry.lock b/foundry.lock
index fee8a95..7521bfd 100644
--- a/foundry.lock
+++ b/foundry.lock
@@ -1,8 +1,8 @@
 {
   "lib/forge-std": {
     "tag": {
-      "name": "v1.11.0",
-      "rev": "8e40513d678f392f398620b3ef2b418648b33e89"
+      "name": "v1.16.1",
+      "rev": "620536fa5277db4e3fd46772d5cbc1ea0696fb43"
     }
   }
 }
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index 86b1a95..7be1cae 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -1,8 +1,8 @@
 [profile.default]
-  evm_version = "cancun"
+  evm_version = "prague"
   optimizer = true
   optimizer_runs = 10_000_000
-  solc_version = "0.8.30"
+  solc_version = "0.8.35"
   verbosity = 3
 
 [profile.ci]
@@ -26,6 +26,6 @@
   multiline_func_header = "attributes_first"
   number_underscore = "thousands"
   quote_style = "double"
-  single_line_statement_blocks = "single"
+  single_line_statement_blocks = "multi"
   tab_width = 2
   wrap_comments = true
diff --git a/lib/forge-std b/lib/forge-std
index 8e40513..620536f 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit 8e40513d678f392f398620b3ef2b418648b33e89
+Subproject commit 620536fa5277db4e3fd46772d5cbc1ea0696fb43
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
index f009f18..f34f2bd 100644
--- a/script/Deploy.s.sol
+++ b/script/Deploy.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 // slither-disable-start reentrancy-benign
 
-pragma solidity 0.8.30;
+pragma solidity 0.8.35;
 
 import {Script} from "forge-std/Script.sol";
 import {Counter} from "src/Counter.sol";
diff --git a/src/Counter.sol b/src/Counter.sol
index 5a58b55..0aab393 100644
--- a/src/Counter.sol
+++ b/src/Counter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.30;
+pragma solidity 0.8.35;
 
 contract Counter {
   uint256 public number;
diff --git a/test/Counter.t.sol b/test/Counter.t.sol
index 651040f..9e2c9c7 100644
--- a/test/Counter.t.sol
+++ b/test/Counter.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.30;
+pragma solidity 0.8.35;
 
 /// forge-lint: disable-next-line(unused-import)
 import {console2} from "forge-std/Test.sol";

From f38a6f0410d858a93d119f0844f97067a852e6ab Mon Sep 17 00:00:00 2001
From: Ben DiFrancesco <ben@scopelift.co>
Date: Mon, 8 Jun 2026 10:18:31 -0400
Subject: [PATCH 2/2] Linting fixes for the latest scopelint version

---
 src/Counter.sol    |  6 +++---
 test/Counter.t.sol | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Counter.sol b/src/Counter.sol
index 0aab393..ca06325 100644
--- a/src/Counter.sol
+++ b/src/Counter.sol
@@ -4,11 +4,11 @@ pragma solidity 0.8.35;
 contract Counter {
   uint256 public number;
 
-  function setNumber(uint256 newNumber) public {
-    number = newNumber;
+  function setNumber(uint256 _newNumber) public {
+    number = _newNumber;
   }
 
   function increment() public {
-    number++;
+    number += 1;
   }
 }
diff --git a/test/Counter.t.sol b/test/Counter.t.sol
index 9e2c9c7..c3be441 100644
--- a/test/Counter.t.sol
+++ b/test/Counter.t.sol
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.35;
 
-/// forge-lint: disable-next-line(unused-import)
+// forge-lint: disable-start(unused-import)
+// scopelint: ignore-import-next-line
 import {console2} from "forge-std/Test.sol";
+// forge-lint: disable-end(unused-import)
+
 import {Test} from "forge-std/Test.sol";
 import {Deploy} from "script/Deploy.s.sol";
 import {Counter} from "src/Counter.sol";
@@ -23,8 +26,8 @@ contract Increment is CounterTest {
 }
 
 contract SetNumber is CounterTest {
-  function testFuzz_NumberIsSet(uint256 x) public {
-    counter.setNumber(x);
-    assertEq(counter.number(), x);
+  function testFuzz_NumberIsSet(uint256 _newNumber) public {
+    counter.setNumber(_newNumber);
+    assertEq(counter.number(), _newNumber);
   }
 }