Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔁 Update Vyper to v0.4.1b1 and Solidity to v0.8.28 #285

Merged
merged 3 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 103 additions & 103 deletions .gas-snapshot

Large diffs are not rendered by default.

1,120 changes: 560 additions & 560 deletions .gas-snapshot-venom

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cache = true # Enable cachin
cache_path = "cache" # Set the path to the cache.
force = false # Do not ignore the cache.
skip = ["src/snekmate/**/*[!c][!k].vy", "src/snekmate/**/*.vyi"] # Skip the compilation of non-mock and interface files.
solc_version = "0.8.27" # Set the Solidity compiler version.
solc_version = "0.8.28" # Set the Solidity compiler version.
evm_version = "cancun" # Set the EVM target version.
optimizer = true # Enable the Solidity compiler optimiser.
optimizer_runs = 200 # Configure the number of optimiser runs.
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/VyperDeployer.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: WTFPL
pragma solidity ^0.8.27;
pragma solidity ^0.8.28;

import {Create} from "create-util/Create.sol";
import {console, StdStyle} from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@openzeppelin/merkle-tree": "^1.0.7",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"ethers": "^6.13.3",
"ethers": "^6.13.4",
"keccak256": "^1.0.6",
"merkletreejs": "^0.4.0",
"prettier": "^3.3.3",
Expand Down
71 changes: 39 additions & 32 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/snekmate/auth/access_control.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Multi-Role-Based Access Control Functions
@custom:contract-name access_control
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/auth/interfaces/IAccessControl.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `access_control` Interface Definition
@custom:contract-name IAccessControl
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/auth/mocks/access_control_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `access_control` Module Reference Implementation
@custom:contract-name access_control_mock
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/auth/mocks/ownable_2step_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `ownable_2step` Module Reference Implementation
@custom:contract-name ownable_2step_mock
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/auth/mocks/ownable_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `ownable` Module Reference Implementation
@custom:contract-name ownable_mock
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/auth/ownable.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Owner-Based Access Control Functions
@custom:contract-name ownable
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/auth/ownable_2step.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title 2-Step Ownership Transfer Functions
@custom:contract-name ownable_2step
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/extensions/erc2981.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title ERC-721 and ERC-1155 Compatible ERC-2981 Reference Implementation
@custom:contract-name erc2981
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/extensions/erc4626.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Modern and Gas-Efficient ERC-4626 Tokenised Vault Implementation
@custom:contract-name erc4626
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/extensions/interfaces/IERC2981.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-2981 Interface Definition
@custom:contract-name IERC2981
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/extensions/mocks/erc2981_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `erc2981` Module Reference Implementation
@custom:contract-name erc2981_mock
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/extensions/mocks/erc4626_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `erc4626` Module Reference Implementation
@custom:contract-name erc4626_mock
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/governance/mocks/timelock_controller_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `timelock_controller` Module Reference Implementation
@custom:contract-name timelock_controller_mock
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/governance/timelock_controller.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Multi-Role-Based Timelock Controller Reference Implementation
@custom:contract-name timelock_controller
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/erc1155.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Modern and Gas-Efficient ERC-1155 Implementation
@custom:contract-name erc1155
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/erc20.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Modern and Gas-Efficient ERC-20 + EIP-2612 Implementation
@custom:contract-name erc20
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/erc721.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title Modern and Gas-Efficient ERC-721 + EIP-4494 Implementation
@custom:contract-name erc721
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC1155.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-1155 Interface Definition
@custom:contract-name IERC1155
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC1155MetadataURI.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-1155 Optional Metadata Interface Definition
@custom:contract-name IERC1155MetadataURI
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC1155Receiver.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-1155 Token Receiver Interface Definition
@custom:contract-name IERC1155Receiver
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC20Permit.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-2612 Interface Definition
@custom:contract-name IERC20Permit
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC4906.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-4906 Interface Definition
@custom:contract-name IERC4906
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC721Enumerable.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-721 Optional Enumeration Interface Definition
@custom:contract-name IERC721Enumerable
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC721Metadata.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-721 Optional Metadata Interface Definition
@custom:contract-name IERC721Metadata
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC721Permit.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-4494 Interface Definition
@custom:contract-name IERC721Permit
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/interfaces/IERC721Receiver.vyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title EIP-721 Token Receiver Interface Definition
@custom:contract-name IERC721Receiver
Expand Down
2 changes: 1 addition & 1 deletion src/snekmate/tokens/mocks/erc1155_mock.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pragma version ~=0.4.1
# pragma version ~=0.4.1b2
"""
@title `erc1155` Module Reference Implementation
@custom:contract-name erc1155_mock
Expand Down
Loading