feat: update ide settings

roderik · roderik · commit 619f863a8a5c · 2025-03-12T12:19:52.000+01:00
diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml
@@ -82,7 +82,7 @@ jobs:
           PAT_TOKEN: op://platform/github-commit-pat/credential
 
       - name: Checkout
-        uses: namespacelabs/nscloud-checkout-action@v5
+        uses: namespacelabs/nscloud-checkout-action@v6
         with:
           token: ${{ env.PAT_TOKEN }}
 
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,10 +1,18 @@
 {
   "recommendations": [
     "nomicfoundation.hardhat-solidity",
-    "genieai.chatgpt-vscode",
     "esbenp.prettier-vscode",
     "cnshenj.vscode-task-manager",
     "catppuccin.catppuccin-vsc-icons",
-    "catppuccin.catppuccin-vsc"
+    "catppuccin.catppuccin-vsc",
+    "oven.bun-vscode",
+    "editorconfig.editorconfig",
+    "dbaeumer.vscode-eslint",
+    "golang.go",
+    "graphql.vscode-graphql-syntax",
+    "yoavbls.pretty-ts-errors",
+    "rooveterinaryinc.roo-cline",
+    "bradlc.vscode-tailwindcss",
+    "shardulm94.trailing-spaces"
   ]
 }
diff --git a/lib/forge-std/README.md b/lib/forge-std/README.md
@@ -13,7 +13,7 @@ forge install foundry-rs/forge-std
 ## Contracts
 ### stdError
 
-This is a helper contract for errors and reverts. In Forge, this contract is particularly helpful for the `expectRevert` cheatcode, as it provides all compiler builtin errors.
+This is a helper contract for errors and reverts. In Forge, this contract is particularly helpful for the `expectRevert` cheatcode, as it provides all compiler built-in errors.
 
 See the contract itself for all error codes.
 
diff --git a/lib/forge-std/foundry.toml b/lib/forge-std/foundry.toml
@@ -5,7 +5,7 @@ optimizer_runs = 200
 
 [rpc_endpoints]
 # The RPC URLs are modified versions of the default for testing initialization.
-mainnet = "https://eth-mainnet.alchemyapi.io/v2/WV407BEiBmjNJfKo9Uo_55u0z0ITyCOX" # Different API key.
+mainnet = "https://eth.merkle.io" # Different API key.
 optimism_sepolia = "https://sepolia.optimism.io/" # Adds a trailing slash.
 arbitrum_one_sepolia = "https://sepolia-rollup.arbitrum.io/rpc/" # Adds a trailing slash.
 needs_undefined_env_var = "${UNDEFINED_RPC_URL_PLACEHOLDER}"
diff --git a/lib/forge-std/src/Base.sol b/lib/forge-std/src/Base.sol
@@ -5,19 +5,26 @@ import {StdStorage} from "./StdStorage.sol";
 import {Vm, VmSafe} from "./Vm.sol";
 
 abstract contract CommonBase {
-    // Cheat code address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
-    address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
-    // console.sol and console2.sol work by executing a staticcall to this address.
+    /// @dev Cheat code address.
+    /// Calculated as `address(uint160(uint256(keccak256("hevm cheat code"))))`.
+    address internal constant VM_ADDRESS = 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D;
+    /// @dev console.sol and console2.sol work by executing a staticcall to this address.
+    /// Calculated as `address(uint160(uint88(bytes11("console.log"))))`.
     address internal constant CONSOLE = 0x000000000000000000636F6e736F6c652e6c6f67;
-    // Used when deploying with create2, https://github.com/Arachnid/deterministic-deployment-proxy.
+    /// @dev Used when deploying with create2.
+    /// Taken from https://github.com/Arachnid/deterministic-deployment-proxy.
     address internal constant CREATE2_FACTORY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
-    // Default address for tx.origin and msg.sender, 0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38.
-    address internal constant DEFAULT_SENDER = address(uint160(uint256(keccak256("foundry default caller"))));
-    // Address of the test contract, deployed by the DEFAULT_SENDER.
+    /// @dev The default address for tx.origin and msg.sender.
+    /// Calculated as `address(uint160(uint256(keccak256("foundry default caller"))))`.
+    address internal constant DEFAULT_SENDER = 0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38;
+    /// @dev The address of the first contract `CREATE`d by a running test contract.
+    /// When running tests, each test contract is `CREATE`d by `DEFAULT_SENDER` with nonce 1.
+    /// Calculated as `VM.computeCreateAddress(VM.computeCreateAddress(DEFAULT_SENDER, 1), 1)`.
     address internal constant DEFAULT_TEST_CONTRACT = 0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f;
-    // Deterministic deployment address of the Multicall3 contract.
+    /// @dev Deterministic deployment address of the Multicall3 contract.
+    /// Taken from https://www.multicall3.com.
     address internal constant MULTICALL3_ADDRESS = 0xcA11bde05977b3631167028862bE2a173976CA11;
-    // The order of the secp256k1 curve.
+    /// @dev The order of the secp256k1 curve.
     uint256 internal constant SECP256K1_ORDER =
         115792089237316195423570985008687907852837564279074904382605163141518161494337;
 
diff --git a/lib/forge-std/src/Script.sol b/lib/forge-std/src/Script.sol
@@ -10,6 +10,7 @@ import {console2} from "./console2.sol";
 import {safeconsole} from "./safeconsole.sol";
 import {StdChains} from "./StdChains.sol";
 import {StdCheatsSafe} from "./StdCheats.sol";
+import {StdConstants} from "./StdConstants.sol";
 import {stdJson} from "./StdJson.sol";
 import {stdMath} from "./StdMath.sol";
 import {StdStorage, stdStorageSafe} from "./StdStorage.sol";
diff --git a/lib/forge-std/src/StdChains.sol b/lib/forge-std/src/StdChains.sol
@@ -196,9 +196,7 @@ abstract contract StdChains {
 
         // If adding an RPC here, make sure to test the default RPC URL in `test_Rpcs` in `StdChains.t.sol`
         setChainWithDefaultRpcUrl("anvil", ChainData("Anvil", 31337, "http://127.0.0.1:8545"));
-        setChainWithDefaultRpcUrl(
-            "mainnet", ChainData("Mainnet", 1, "https://eth-mainnet.alchemyapi.io/v2/pwc5rmJhrdoaSEfimoKEmsvOjKSmPDrP")
-        );
+        setChainWithDefaultRpcUrl("mainnet", ChainData("Mainnet", 1, "https://eth.llamarpc.com"));
         setChainWithDefaultRpcUrl(
             "sepolia", ChainData("Sepolia", 11155111, "https://sepolia.infura.io/v3/b9794ad1ddf84dfb8c34d6bb5dca2001")
         );
diff --git a/lib/forge-std/src/StdConstants.sol b/lib/forge-std/src/StdConstants.sol
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.2 <0.9.0;
+
+import {IMulticall3} from "./interfaces/IMulticall3.sol";
+import {Vm} from "./Vm.sol";
+
+library StdConstants {
+    /// @dev Cheat code address.
+    /// Calculated as `address(uint160(uint256(keccak256("hevm cheat code"))))`.
+    Vm internal constant VM = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
+    /// @dev console.sol and console2.sol work by executing a staticcall to this address.
+    /// Calculated as `address(uint160(uint88(bytes11("console.log"))))`.
+    address internal constant CONSOLE = 0x000000000000000000636F6e736F6c652e6c6f67;
+    /// @dev Used when deploying with create2.
+    /// Taken from https://github.com/Arachnid/deterministic-deployment-proxy.
+    address internal constant CREATE2_FACTORY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
+    /// @dev The default address for tx.origin and msg.sender.
+    /// Calculated as `address(uint160(uint256(keccak256("foundry default caller"))))`.
+    address internal constant DEFAULT_SENDER = 0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38;
+    /// @dev The address of the first contract `CREATE`d by a running test contract.
+    /// When running tests, each test contract is `CREATE`d by `DEFAULT_SENDER` with nonce 1.
+    /// Calculated as `VM.computeCreateAddress(VM.computeCreateAddress(DEFAULT_SENDER, 1), 1)`.
+    address internal constant DEFAULT_TEST_CONTRACT = 0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f;
+    /// @dev Deterministic deployment address of the Multicall3 contract.
+    /// Taken from https://www.multicall3.com.
+    IMulticall3 internal constant MULTICALL3_ADDRESS = IMulticall3(0xcA11bde05977b3631167028862bE2a173976CA11);
+    /// @dev The order of the secp256k1 curve.
+    uint256 internal constant SECP256K1_ORDER =
+        115792089237316195423570985008687907852837564279074904382605163141518161494337;
+}
diff --git a/lib/forge-std/src/Test.sol b/lib/forge-std/src/Test.sol
@@ -13,6 +13,7 @@ import {safeconsole} from "./safeconsole.sol";
 import {StdAssertions} from "./StdAssertions.sol";
 import {StdChains} from "./StdChains.sol";
 import {StdCheats} from "./StdCheats.sol";
+import {StdConstants} from "./StdConstants.sol";
 import {stdError} from "./StdError.sol";
 import {StdInvariant} from "./StdInvariant.sol";
 import {stdJson} from "./StdJson.sol";
diff --git a/lib/forge-std/src/interfaces/IERC1155.sol b/lib/forge-std/src/interfaces/IERC1155.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC165.sol";
+import {IERC165} from "./IERC165.sol";
 
 /// @title ERC-1155 Multi Token Standard
 /// @dev See https://eips.ethereum.org/EIPS/eip-1155
diff --git a/lib/forge-std/src/interfaces/IERC4626.sol b/lib/forge-std/src/interfaces/IERC4626.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC20.sol";
+import {IERC20} from "./IERC20.sol";
 
 /// @dev Interface of the ERC4626 "Tokenized Vault Standard", as defined in
 /// https://eips.ethereum.org/EIPS/eip-4626
diff --git a/lib/forge-std/src/interfaces/IERC6909.sol b/lib/forge-std/src/interfaces/IERC6909.sol
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.2;
+
+import {IERC165} from "./IERC165.sol";
+
+/// @dev Required interface of an ERC-6909 compliant contract, as defined in
+/// https://eips.ethereum.org/EIPS/eip-6909
+interface IERC6909 is IERC165 {
+    /// @dev Emitted when the allowance of a `spender` for an `owner` is set for a token of type `id`.
+    event Approval(address indexed owner, address indexed spender, uint256 indexed id, uint256 amount);
+
+    /// @dev Emitted when `owner` grants or revokes operator status for a `spender`.
+    event OperatorSet(address indexed owner, address indexed spender, bool approved);
+
+    /// @dev Emitted when `amount` tokens of type `id` are moved from `sender` to `receiver` initiated by `caller`.
+    event Transfer(
+        address caller, address indexed sender, address indexed receiver, uint256 indexed id, uint256 amount
+    );
+
+    ///@dev Returns the amount of tokens of type `id` owned by `owner`.
+    function balanceOf(address owner, uint256 id) external view returns (uint256);
+
+    /// @dev Returns the amount of tokens of type `id` that `spender` is allowed to spend on behalf of `owner`.
+    /// NOTE: Does not include operator allowances.
+    function allowance(address owner, address spender, uint256 id) external view returns (uint256);
+
+    /// @dev Returns true if `spender` is set as an operator for `owner`.
+    function isOperator(address owner, address spender) external view returns (bool);
+
+    /// @dev Sets an approval to `spender` for `amount` tokens of type `id` from the caller's tokens.
+    /// Must return true.
+    function approve(address spender, uint256 id, uint256 amount) external returns (bool);
+
+    /// @dev Grants or revokes unlimited transfer permission of any token id to `spender` for the caller's tokens.
+    /// Must return true.
+    function setOperator(address spender, bool approved) external returns (bool);
+
+    /// @dev Transfers `amount` of token type `id` from the caller's account to `receiver`.
+    /// Must return true.
+    function transfer(address receiver, uint256 id, uint256 amount) external returns (bool);
+
+    /// @dev Transfers `amount` of token type `id` from `sender` to `receiver`.
+    /// Must return true.
+    function transferFrom(address sender, address receiver, uint256 id, uint256 amount) external returns (bool);
+}
+
+/// @dev Optional extension of {IERC6909} that adds metadata functions.
+interface IERC6909Metadata is IERC6909 {
+    /// @dev Returns the name of the token of type `id`.
+    function name(uint256 id) external view returns (string memory);
+
+    /// @dev Returns the ticker symbol of the token of type `id`.
+    function symbol(uint256 id) external view returns (string memory);
+
+    /// @dev Returns the number of decimals for the token of type `id`.
+    function decimals(uint256 id) external view returns (uint8);
+}
+
+/// @dev Optional extension of {IERC6909} that adds content URI functions.
+interface IERC6909ContentURI is IERC6909 {
+    /// @dev Returns URI for the contract.
+    function contractURI() external view returns (string memory);
+
+    /// @dev Returns the URI for the token of type `id`.
+    function tokenURI(uint256 id) external view returns (string memory);
+}
+
+/// @dev Optional extension of {IERC6909} that adds a token supply function.
+interface IERC6909TokenSupply is IERC6909 {
+    /// @dev Returns the total supply of the token of type `id`.
+    function totalSupply(uint256 id) external view returns (uint256);
+}
diff --git a/lib/forge-std/src/interfaces/IERC721.sol b/lib/forge-std/src/interfaces/IERC721.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC165.sol";
+import {IERC165} from "./IERC165.sol";
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
diff --git a/lib/forge-std/src/interfaces/IERC7540.sol b/lib/forge-std/src/interfaces/IERC7540.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC7575.sol";
+import {IERC7575} from "./IERC7575.sol";
 
 /// @dev Interface of the base operator logic of ERC7540, as defined in
 /// https://eips.ethereum.org/EIPS/eip-7540
diff --git a/lib/forge-std/src/interfaces/IERC7575.sol b/lib/forge-std/src/interfaces/IERC7575.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC165.sol";
+import {IERC165} from "./IERC165.sol";
 
 /// @dev Interface of the ERC7575 "Multi-Asset ERC-4626 Vaults", as defined in
 /// https://eips.ethereum.org/EIPS/eip-7575
diff --git a/lib/forge-std/test/CommonBase.t.sol b/lib/forge-std/test/CommonBase.t.sol
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.7.0 <0.9.0;
+
+import {CommonBase} from "../src/Base.sol";
+import {StdConstants} from "../src/StdConstants.sol";
+import {Test} from "../src/Test.sol";
+
+contract CommonBaseTest is Test {
+    function testVmAddressValue() public pure {
+        assertEq(VM_ADDRESS, address(StdConstants.VM));
+    }
+
+    function testConsoleValue() public pure {
+        assertEq(CONSOLE, StdConstants.CONSOLE);
+    }
+
+    function testCreate2FactoryValue() public pure {
+        assertEq(CREATE2_FACTORY, StdConstants.CREATE2_FACTORY);
+    }
+
+    function testDefaultSenderValue() public pure {
+        assertEq(DEFAULT_SENDER, StdConstants.DEFAULT_SENDER);
+    }
+
+    function testDefaultTestContractValue() public pure {
+        assertEq(DEFAULT_TEST_CONTRACT, StdConstants.DEFAULT_TEST_CONTRACT);
+    }
+
+    function testMulticall3AddressValue() public pure {
+        assertEq(MULTICALL3_ADDRESS, address(StdConstants.MULTICALL3_ADDRESS));
+    }
+
+    function testSecp256k1OrderValue() public pure {
+        assertEq(SECP256K1_ORDER, StdConstants.SECP256K1_ORDER);
+    }
+
+    function testUint256MaxValue() public pure {
+        assertEq(UINT256_MAX, type(uint256).max);
+    }
+
+    function testVmValue() public pure {
+        assertEq(address(vm), address(StdConstants.VM));
+    }
+}
diff --git a/lib/forge-std/test/StdChains.t.sol b/lib/forge-std/test/StdChains.t.sol
@@ -24,7 +24,7 @@ contract StdChainsMock is Test {
 contract StdChainsTest is Test {
     function test_ChainRpcInitialization() public {
         // RPCs specified in `foundry.toml` should be updated.
-        assertEq(getChain(1).rpcUrl, "https://eth-mainnet.alchemyapi.io/v2/WV407BEiBmjNJfKo9Uo_55u0z0ITyCOX");
+        assertEq(getChain(1).rpcUrl, "https://eth.merkle.io");
         assertEq(getChain("optimism_sepolia").rpcUrl, "https://sepolia.optimism.io/");
         assertEq(getChain("arbitrum_one_sepolia").rpcUrl, "https://sepolia-rollup.arbitrum.io/rpc/");
 
@@ -36,7 +36,7 @@ contract StdChainsTest is Test {
 
         // Cannot override RPCs defined in `foundry.toml`
         vm.setEnv("MAINNET_RPC_URL", "myoverride2");
-        assertEq(getChain("mainnet").rpcUrl, "https://eth-mainnet.alchemyapi.io/v2/WV407BEiBmjNJfKo9Uo_55u0z0ITyCOX");
+        assertEq(getChain("mainnet").rpcUrl, "https://eth.merkle.io");
 
         // Other RPCs should remain unchanged.
         assertEq(getChain(31337).rpcUrl, "http://127.0.0.1:8545");
diff --git a/lib/forge-std/test/StdCheats.t.sol b/lib/forge-std/test/StdCheats.t.sol
diff --git a/lib/forge-std/test/StdConstants.t.sol b/lib/forge-std/test/StdConstants.t.sol
diff --git a/lib/forge-std/test/compilation/CompilationScript.sol b/lib/forge-std/test/compilation/CompilationScript.sol
diff --git a/lib/forge-std/test/compilation/CompilationScriptBase.sol b/lib/forge-std/test/compilation/CompilationScriptBase.sol
diff --git a/lib/forge-std/test/compilation/CompilationTest.sol b/lib/forge-std/test/compilation/CompilationTest.sol
diff --git a/lib/forge-std/test/compilation/CompilationTestBase.sol b/lib/forge-std/test/compilation/CompilationTestBase.sol
