Skip to content

Commit b4107a6

Browse files
committed
feat: update huffmate to target shanghai
1 parent 8b0043a commit b4107a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+67
-66
lines changed

foundry.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
out = 'out'
33
libs = ['lib']
44
ffi = true
5+
evm_version = "shanghai"
56
fs_permissions = [
67
{ access = "read", path = "./test/auth/mocks/AuthWrappers.huff" },
78
{ access = "read", path = "./test/auth/mocks/OwnedWrappers.huff" },

src/tokens/ERC20.huff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
[INITIAL_DOMAIN_SEPARATOR] sstore // []
7171

7272
// Copy the runtime bytecode with constructor argument concatenated.
73-
0x67 // [offset] - constructor code size
73+
0x66 // [offset] - constructor code size
7474
dup1 // [offset, offset]
7575
codesize // [total_size, offset, offset]
7676
sub // [runtime_size, offset]

src/tokens/interfaces/IERC20.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
interface TSOwnable {
55
function owner() external returns (address);

src/utils/JumpTableUtil.huff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/// @title JumpTableUtil
32
/// @notice SPDX-License-Identifier: MIT
43
/// @author clabby <https://github.com/clabby>

test/auth/Auth.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "forge-std/console.sol";

test/auth/NonPayable.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import {HuffDeployer} from "foundry-huff/HuffDeployer.sol";

test/auth/OnlyContract.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import {Test} from "forge-std/Test.sol";
55

test/auth/Owned.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import {HuffConfig} from "foundry-huff/HuffConfig.sol";

test/auth/RolesAuthority.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import { HuffDeployer } from "foundry-huff/HuffDeployer.sol";

test/data-structures/Arrays.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/data-structures/Bytes.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/data-structures/Hashmap.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import {HuffConfig} from "foundry-huff/HuffConfig.sol";

test/factories/Factory.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;

test/factories/ProxyFactory.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;

test/math/FixedPointMath.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/math/Math.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/math/SafeMath.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/math/Trigonometry.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/mechanisms/huff-clones/HuffClone.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import {Test} from "forge-std/Test.sol";
55
import {HuffDeployer} from "foundry-huff/HuffDeployer.sol";

test/mechanisms/huff-clones/HuffCloneFactory.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import {Test} from "forge-std/Test.sol";
55
import {HuffDeployer} from "foundry-huff/HuffDeployer.sol";

test/mechanisms/huff-clones/Interfaces.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
interface IExampleClone {
55
function param1() external pure returns (address);

test/mechanisms/huff-vrgda/LinearVRGDA.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55

test/mechanisms/huff-vrgda/LogisticVRGDA.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
// SPDX-License-Identifier: MIT
3-
pragma solidity ^0.8.15;
3+
pragma solidity ^0.8.19;
44

55
import {DSTestPlus} from "solmate/test/utils/DSTestPlus.sol";
66

test/mechanisms/huff-vrgda/utils/SignedWadMath.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
/// @title Signed Wad Math
55
/// @author transmissions11 <[email protected]>

test/proxies/Clones.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.15;
2+
pragma solidity 0.8.19;
33

44

55
import "foundry-huff/HuffDeployer.sol";

test/proxies/ERC1967Proxy.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.15;
2+
pragma solidity 0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/proxies/mocks/MockBeacon.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
pragma solidity 0.8.15;
2+
pragma solidity 0.8.19;
33

44
/**
55
* @dev This is the interface that {BeaconProxy} expects of its beacon.

test/proxies/mocks/MockProxiableUUID.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.8.15;
1+
pragma solidity 0.8.19;
22

33
import { MockERC1155 } from "solmate/test/utils/mocks/MockERC1155.sol";
44

test/proxies/mocks/MockReturner.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.8.15;
1+
pragma solidity 0.8.19;
22

33
/// @dev Used to test proxies that they can both receive and return data
44
contract MockReturner {

test/proxies/mocks/NotUUPSMockProxiableUUID.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.8.15;
1+
pragma solidity 0.8.19;
22

33

44
import { MockERC1155 } from "solmate/test/utils/mocks/MockERC1155.sol";

test/test-utils/FuzzingUtils.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
// adapter from: https://github.com/transmissions11/solmate/blob/main/src/test/utils/DSTestPlus.sol
55
abstract contract FuzzingUtils {

test/test-utils/NonMatchingSelectorHelper.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55

test/tokens/ERC1155.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/tokens/ERC20.t.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";
@@ -53,6 +53,7 @@ contract ERC20Test is Test {
5353

5454
// Deploy the Mintable ERC20
5555
address mintableTokenAddress = HuffDeployer.config()
56+
.with_evm_version("shanghai")
5657
.with_code(mintable_wrapper)
5758
.with_deployer(deployer)
5859
.with_args(bytes.concat(abi.encode("Token"), abi.encode("TKN"), abi.encode(DECIMALS)))

test/tokens/ERC4626.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/tokens/ERC721.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/utils/BitPackLib.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/utils/CREATE3.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/Calls.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/utils/Constants.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/utils/DateTimeLib.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Unlicense
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/console.sol";

test/utils/ECDSA.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/utils/Errors.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/Ethers.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "forge-std/Test.sol";
55
import "foundry-huff/HuffDeployer.sol";

test/utils/InsertionSort.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/JumpTableUtil.t.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";
@@ -12,15 +12,15 @@ interface IJumpTableUtil {
1212
}
1313

1414
contract JumpTableUtilTest is Test {
15-
uint constant FIRST_LABEL_PC = 147;
15+
uint constant FIRST_LABEL_PC = 141;
1616

1717
IJumpTableUtil jtUtil;
1818

1919
function setUp() public {
2020
/// @notice deploy a new instance of IJumpTableUtil by
2121
/// passing in the address of the deployed Huff contract
2222
string memory wrapper_code = vm.readFile("test/utils/mocks/JumpTableUtilWrappers.huff");
23-
jtUtil = IJumpTableUtil(HuffDeployer.deploy_with_code("utils/JumpTableUtil", wrapper_code));
23+
jtUtil = IJumpTableUtil(HuffDeployer.config().with_evm_version("shanghai").with_code(wrapper_code).deploy("utils/JumpTableUtil"));
2424
}
2525

2626
function testGetJumpdestFromJT_Mem() public {

test/utils/LibBit.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/MerkleDistributor.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/MerkleProofLib.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/Multicallable.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/Pausable.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/ReentrancyGuard.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/Refunded.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

test/utils/SSTORE2.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity ^0.8.15;
2+
pragma solidity ^0.8.19;
33

44
import "foundry-huff/HuffDeployer.sol";
55
import "forge-std/Test.sol";

0 commit comments

Comments
 (0)