course finished

Author: Ariiellus

04 Advanced Foundry/AA/lib/forge-std/src/LibVariable.sol

@@ -48,7 +48,7 @@ enum TypeKind {
 ///                 // string memory notANumber = config.get("important_number").toString();
 ///
 ///                 // Retrieve a address array from the config.
-///                 string[] memory admins = config.get("whitelisted_admins").toAddressArray();
+///                 address[] memory admins = config.get("whitelisted_admins").toAddressArray();
 ///          }
 ///      }
 ///      ```

04 Advanced Foundry/AA/lib/forge-std/src/StdCheats.sol

@@ -392,6 +392,7 @@ abstract contract StdCheatsSafe {
     function rawToConvertedEIPTx1559(RawTx1559 memory rawTx) internal pure virtual returns (Tx1559 memory) {
         Tx1559 memory transaction;
         transaction.arguments = rawTx.arguments;
+        transaction.contractAddress = rawTx.contractAddress;
         transaction.contractName = rawTx.contractName;
         transaction.functionSig = rawTx.functionSig;
         transaction.hash = rawTx.hash;

04 Advanced Foundry/AA/lib/forge-std/src/StdConfig.sol

@@ -321,6 +321,25 @@ contract StdConfig {
         return get(vm.getChainId(), key);
     }
 
+    /// @dev    Checks the existence of a variable for a given chain ID and key, and returns a boolean.
+    ///         Example: `bool hasKey = config.exists(1, "my_key");`
+    ///
+    /// @param chain_id The chain ID to check.
+    /// @param key The variable key name.
+    /// @return `bool` indicating whether a variable with the given key exists.
+    function exists(uint256 chain_id, string memory key) public view returns (bool) {
+        return _dataOf[chain_id][key].length > 0;
+    }
+
+    /// @dev    Checks the existence of a variable for the current chain id and a given key, and returns a boolean.
+    ///         Example: `bool hasKey = config.exists("my_key");`
+    ///
+    /// @param key The variable key name.
+    /// @return `bool` indicating whether a variable with the given key exists.
+    function exists(string memory key) public view returns (bool) {
+        return exists(vm.getChainId(), key);
+    }
+
     /// @notice Returns the numerical chain ids for all configured chains.
     function getChainIds() public view returns (uint256[] memory) {
         string[] memory keys = _chainKeys;

04 Advanced Foundry/AA/lib/forge-std/src/StdStorage.sol

@@ -282,7 +282,11 @@ library stdStorageSafe {
     function bytesToBytes32(bytes memory b, uint256 offset) private pure returns (bytes32) {
         bytes32 out;
 
-        uint256 max = b.length > 32 ? 32 : b.length;
+        // Cap read length by remaining bytes from `offset`, and at most 32 bytes to avoid out-of-bounds
+        uint256 max = b.length > offset ? b.length - offset : 0;
+        if (max > 32) {
+            max = 32;
+        }
         for (uint256 i = 0; i < max; i++) {
             out |= bytes32(b[offset + i] & 0xFF) >> (i * 8);
         }

04 Advanced Foundry/AA/lib/forge-std/src/StdUtils.sol

@@ -4,14 +4,14 @@ pragma solidity >=0.6.2 <0.9.0;
 pragma experimental ABIEncoderV2;
 
 import {IMulticall3} from "./interfaces/IMulticall3.sol";
+import {StdConstants} from "./StdConstants.sol";
 import {VmSafe} from "./Vm.sol";
 
 abstract contract StdUtils {
     /*//////////////////////////////////////////////////////////////////////////
                                      CONSTANTS
     //////////////////////////////////////////////////////////////////////////*/
 
-    IMulticall3 private constant multicall = IMulticall3(0xcA11bde05977b3631167028862bE2a173976CA11);
     VmSafe private constant vm = VmSafe(address(uint160(uint256(keccak256("hevm cheat code")))));
     address private constant CONSOLE2_ADDRESS = 0x000000000000000000636F6e736F6c652e6c6f67;
     uint256 private constant INT256_MIN_ABS =
@@ -21,9 +21,6 @@ abstract contract StdUtils {
     uint256 private constant UINT256_MAX =
         115792089237316195423570985008687907853269984665640564039457584007913129639935;
 
-    // Used by default when deploying with create2, https://github.com/Arachnid/deterministic-deployment-proxy.
-    address private constant CREATE2_FACTORY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
-
     /*//////////////////////////////////////////////////////////////////////////
                                  INTERNAL FUNCTIONS
     //////////////////////////////////////////////////////////////////////////*/
@@ -148,7 +145,7 @@ abstract contract StdUtils {
         }
 
         // Make the aggregate call.
-        (, bytes[] memory returnData) = multicall.aggregate(calls);
+        (, bytes[] memory returnData) = StdConstants.MULTICALL3_ADDRESS.aggregate(calls);
 
         // ABI decode the return data and return the balances.
         balances = new uint256[](length);

04 Advanced Foundry/AA/lib/forge-std/test/Config.t.sol

@@ -125,6 +125,35 @@ contract ConfigTest is Test, Config {
         assertEq(vm.getChainId(), 10);
     }
 
+    function test_configExists() public {
+        _loadConfig("./test/fixtures/config.toml", false);
+
+        string[] memory keys = new string[](7);
+        keys[0] = "is_live";
+        keys[1] = "weth";
+        keys[2] = "word";
+        keys[3] = "number";
+        keys[4] = "signed_number";
+        keys[5] = "b";
+        keys[6] = "str";
+
+        // Read and assert RPC URL for Mainnet (chain ID 1)
+        assertEq(config.getRpcUrl(1), "https://reth-ethereum.ithaca.xyz/rpc");
+
+        for (uint256 i = 0; i < keys.length; ++i) {
+            assertTrue(config.exists(1, keys[i]));
+            assertFalse(config.exists(1, string.concat(keys[i], "_")));
+        }
+
+        // Assert RPC URL for Optimism (chain ID 10)
+        assertEq(config.getRpcUrl(10), "https://mainnet.optimism.io");
+
+        for (uint256 i = 0; i < keys.length; ++i) {
+            assertTrue(config.exists(10, keys[i]));
+            assertFalse(config.exists(10, string.concat(keys[i], "_")));
+        }
+    }
+
     function test_writeConfig() public {
         // Create a temporary copy of the config file to avoid modifying the original.
         string memory originalConfig = "./test/fixtures/config.toml";

04 Advanced Foundry/AA/lib/openzeppelin-contracts/contracts/token/ERC6909/extensions/ERC6909ContentURI.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.20;
 
 import {ERC6909} from "../ERC6909.sol";
 import {IERC6909ContentURI} from "../../../interfaces/IERC6909.sol";
+import {IERC165} from "../../../utils/introspection/IERC165.sol";
 
 /**
  * @dev Implementation of the Content URI extension defined in ERC6909.
@@ -19,6 +20,11 @@ contract ERC6909ContentURI is ERC6909, IERC6909ContentURI {
     /// @dev See {IERC1155-URI}
     event URI(string value, uint256 indexed id);
 
+    /// @inheritdoc IERC165
+    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC6909, IERC165) returns (bool) {
+        return interfaceId == type(IERC6909ContentURI).interfaceId || super.supportsInterface(interfaceId);
+    }
+
     /// @inheritdoc IERC6909ContentURI
     function contractURI() public view virtual override returns (string memory) {
         return _contractURI;

04 Advanced Foundry/AA/lib/openzeppelin-contracts/contracts/token/ERC6909/extensions/ERC6909Metadata.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.20;
 
 import {ERC6909} from "../ERC6909.sol";
 import {IERC6909Metadata} from "../../../interfaces/IERC6909.sol";
+import {IERC165} from "../../../utils/introspection/IERC165.sol";
 
 /**
  * @dev Implementation of the Metadata extension defined in ERC6909. Exposes the name, symbol, and decimals of each token id.
@@ -42,6 +43,11 @@ contract ERC6909Metadata is ERC6909, IERC6909Metadata {
         return _tokenMetadata[id].decimals;
     }
 
+    /// @inheritdoc IERC165
+    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC6909, IERC165) returns (bool) {
+        return interfaceId == type(IERC6909Metadata).interfaceId || super.supportsInterface(interfaceId);
+    }
+
     /**
      * @dev Sets the `name` for a given token of type `id`.
      *

04 Advanced Foundry/AA/lib/openzeppelin-contracts/contracts/token/ERC6909/extensions/ERC6909TokenSupply.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.20;
 
 import {ERC6909} from "../ERC6909.sol";
 import {IERC6909TokenSupply} from "../../../interfaces/IERC6909.sol";
+import {IERC165} from "../../../utils/introspection/IERC165.sol";
 
 /**
  * @dev Implementation of the Token Supply extension defined in ERC6909.
@@ -18,6 +19,11 @@ contract ERC6909TokenSupply is ERC6909, IERC6909TokenSupply {
         return _totalSupplies[id];
     }
 
+    /// @inheritdoc IERC165
+    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC6909, IERC165) returns (bool) {
+        return interfaceId == type(IERC6909TokenSupply).interfaceId || super.supportsInterface(interfaceId);
+    }
+
     /// @dev Override the `_update` function to update the total supply of each token id as necessary.
     function _update(address from, address to, uint256 id, uint256 amount) internal virtual override {
         super._update(from, to, id, amount);

04 Advanced Foundry/AA/lib/openzeppelin-contracts/test/token/ERC6909/extensions/ERC6909ContentURI.test.js

@@ -1,6 +1,7 @@
 const { ethers } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { shouldSupportInterfaces } = require('../../../utils/introspection/SupportsInterface.behavior');
 
 async function fixture() {
   const token = await ethers.deployContract('$ERC6909ContentURI');
@@ -46,4 +47,6 @@ describe('ERC6909ContentURI', function () {
         .withArgs('https://example.com/1', 1n);
     });
   });
+
+  shouldSupportInterfaces(['ERC6909', 'ERC6909ContentURI']);
 });