feat: update huffmate to target shanghai

huff-language · Jul 10, 2023 · 710d0f2 · 710d0f2
1 parent 764e151
commit 710d0f2
Show file tree

Hide file tree

Showing 65 changed files with 67 additions and 66 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -2,6 +2,7 @@
 out = 'out'
 libs = ['lib']
 ffi = true
+evm_version = "shanghai"
 fs_permissions = [
     { access = "read", path = "./test/auth/mocks/AuthWrappers.huff" },
     { access = "read", path = "./test/auth/mocks/OwnedWrappers.huff" },

diff --git a/src/tokens/ERC20.huff b/src/tokens/ERC20.huff
@@ -70,7 +70,7 @@
     [INITIAL_DOMAIN_SEPARATOR] sstore       // []
 
     // Copy the runtime bytecode with constructor argument concatenated.
-    0x67                                    // [offset] - constructor code size
+    0x66                                    // [offset] - constructor code size
     dup1                                    // [offset, offset]
     codesize                                // [total_size, offset, offset]
     sub                                     // [runtime_size, offset]

diff --git a/src/tokens/interfaces/IERC20.sol b/src/tokens/interfaces/IERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 interface TSOwnable {
     function owner() external returns (address);

diff --git a/src/utils/JumpTableUtil.huff b/src/utils/JumpTableUtil.huff
@@ -1,4 +1,3 @@
-
 /// @title JumpTableUtil
 /// @notice SPDX-License-Identifier: MIT
 /// @author clabby <https://github.com/clabby>

diff --git a/test/auth/Auth.t.sol b/test/auth/Auth.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "forge-std/console.sol";

diff --git a/test/auth/NonPayable.t.sol b/test/auth/NonPayable.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import {HuffDeployer} from "foundry-huff/HuffDeployer.sol";

diff --git a/test/auth/OnlyContract.t.sol b/test/auth/OnlyContract.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import {Test} from "forge-std/Test.sol";
 

diff --git a/test/auth/Owned.t.sol b/test/auth/Owned.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import {HuffConfig} from "foundry-huff/HuffConfig.sol";

diff --git a/test/auth/RolesAuthority.t.sol b/test/auth/RolesAuthority.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import { HuffDeployer } from "foundry-huff/HuffDeployer.sol";

diff --git a/test/data-structures/Arrays.t.sol b/test/data-structures/Arrays.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/data-structures/Bytes.t.sol b/test/data-structures/Bytes.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/data-structures/Hashmap.t.sol b/test/data-structures/Hashmap.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import {HuffConfig} from "foundry-huff/HuffConfig.sol";

diff --git a/test/factories/Factory.t.sol b/test/factories/Factory.t.sol
@@ -1,2 +1,2 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
diff --git a/test/factories/ProxyFactory.t.sol b/test/factories/ProxyFactory.t.sol
@@ -1,2 +1,2 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
diff --git a/test/math/FixedPointMath.t.sol b/test/math/FixedPointMath.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/math/Math.t.sol b/test/math/Math.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/math/SafeMath.t.sol b/test/math/SafeMath.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/math/Trigonometry.t.sol b/test/math/Trigonometry.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/mechanisms/huff-clones/HuffClone.t.sol b/test/mechanisms/huff-clones/HuffClone.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import {Test} from "forge-std/Test.sol";
 import {HuffDeployer} from "foundry-huff/HuffDeployer.sol";

diff --git a/test/mechanisms/huff-clones/HuffCloneFactory.t.sol b/test/mechanisms/huff-clones/HuffCloneFactory.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import {Test} from "forge-std/Test.sol";
 import {HuffDeployer} from "foundry-huff/HuffDeployer.sol";

diff --git a/test/mechanisms/huff-clones/Interfaces.sol b/test/mechanisms/huff-clones/Interfaces.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 interface IExampleClone {
     function param1() external pure returns (address);

diff --git a/test/mechanisms/huff-vrgda/LinearVRGDA.t.sol b/test/mechanisms/huff-vrgda/LinearVRGDA.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 

diff --git a/test/mechanisms/huff-vrgda/LogisticVRGDA.t.sol b/test/mechanisms/huff-vrgda/LogisticVRGDA.t.sol
@@ -1,6 +1,6 @@
 
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import {DSTestPlus} from "solmate/test/utils/DSTestPlus.sol";
 

diff --git a/test/mechanisms/huff-vrgda/utils/SignedWadMath.sol b/test/mechanisms/huff-vrgda/utils/SignedWadMath.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 /// @title Signed Wad Math
 /// @author transmissions11 <t11s@paradigm.xyz>

diff --git a/test/proxies/Clones.t.sol b/test/proxies/Clones.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity 0.8.19;
 
 
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/proxies/ERC1967Proxy.t.sol b/test/proxies/ERC1967Proxy.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity 0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/proxies/mocks/MockBeacon.sol b/test/proxies/mocks/MockBeacon.sol
@@ -1,5 +1,5 @@
 
-pragma solidity 0.8.15;
+pragma solidity 0.8.19;
 
 /**
  * @dev This is the interface that {BeaconProxy} expects of its beacon.

diff --git a/test/proxies/mocks/MockProxiableUUID.sol b/test/proxies/mocks/MockProxiableUUID.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.8.15;
+pragma solidity 0.8.19;
 
 import { MockERC1155 } from "solmate/test/utils/mocks/MockERC1155.sol";
 

diff --git a/test/proxies/mocks/MockReturner.sol b/test/proxies/mocks/MockReturner.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.8.15;
+pragma solidity 0.8.19;
 
 /// @dev Used to test proxies that they can both receive and return data
 contract MockReturner {

diff --git a/test/proxies/mocks/NotUUPSMockProxiableUUID.sol b/test/proxies/mocks/NotUUPSMockProxiableUUID.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.8.15;
+pragma solidity 0.8.19;
 
 
 import { MockERC1155 } from "solmate/test/utils/mocks/MockERC1155.sol";

diff --git a/test/test-utils/FuzzingUtils.sol b/test/test-utils/FuzzingUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 // adapter from: https://github.com/transmissions11/solmate/blob/main/src/test/utils/DSTestPlus.sol
 abstract contract FuzzingUtils {

diff --git a/test/test-utils/NonMatchingSelectorHelper.sol b/test/test-utils/NonMatchingSelectorHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 

diff --git a/test/tokens/ERC1155.t.sol b/test/tokens/ERC1155.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/tokens/ERC20.t.sol b/test/tokens/ERC20.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";
@@ -53,6 +53,7 @@ contract ERC20Test is Test {
 
         // Deploy the Mintable ERC20
         address mintableTokenAddress = HuffDeployer.config()
+            .with_evm_version("shanghai")
             .with_code(mintable_wrapper)
             .with_deployer(deployer)
             .with_args(bytes.concat(abi.encode("Token"), abi.encode("TKN"), abi.encode(DECIMALS)))

diff --git a/test/tokens/ERC4626.t.sol b/test/tokens/ERC4626.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/tokens/ERC721.t.sol b/test/tokens/ERC721.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/utils/BitPackLib.t.sol b/test/utils/BitPackLib.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/utils/CREATE3.t.sol b/test/utils/CREATE3.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/Calls.t.sol b/test/utils/Calls.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/utils/Constants.t.sol b/test/utils/Constants.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/utils/DateTimeLib.t.sol b/test/utils/DateTimeLib.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/console.sol";

diff --git a/test/utils/ECDSA.t.sol b/test/utils/ECDSA.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/utils/Errors.t.sol b/test/utils/Errors.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/Ethers.t.sol b/test/utils/Ethers.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "foundry-huff/HuffDeployer.sol";

diff --git a/test/utils/InsertionSort.t.sol b/test/utils/InsertionSort.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/JumpTableUtil.t.sol b/test/utils/JumpTableUtil.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";
@@ -12,15 +12,15 @@ interface IJumpTableUtil {
 }
 
 contract JumpTableUtilTest is Test {
-    uint constant FIRST_LABEL_PC = 147;
+    uint constant FIRST_LABEL_PC = 141;
 
     IJumpTableUtil jtUtil;
 
     function setUp() public {
         /// @notice deploy a new instance of IJumpTableUtil by
         /// passing in the address of the deployed Huff contract
         string memory wrapper_code = vm.readFile("test/utils/mocks/JumpTableUtilWrappers.huff");
-        jtUtil = IJumpTableUtil(HuffDeployer.deploy_with_code("utils/JumpTableUtil", wrapper_code));
+        jtUtil = IJumpTableUtil(HuffDeployer.config().with_evm_version("shanghai").with_code(wrapper_code).deploy("utils/JumpTableUtil"));
     }
 
     function testGetJumpdestFromJT_Mem() public {

diff --git a/test/utils/LibBit.t.sol b/test/utils/LibBit.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/MerkleDistributor.t.sol b/test/utils/MerkleDistributor.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/MerkleProofLib.t.sol b/test/utils/MerkleProofLib.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/Multicallable.t.sol b/test/utils/Multicallable.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/Pausable.t.sol b/test/utils/Pausable.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/ReentrancyGuard.t.sol b/test/utils/ReentrancyGuard.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/Refunded.t.sol b/test/utils/Refunded.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";

diff --git a/test/utils/SSTORE2.t.sol b/test/utils/SSTORE2.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.19;
 
 import "foundry-huff/HuffDeployer.sol";
 import "forge-std/Test.sol";