Skip to content

Commit

Permalink
🔁 Update 🐍Vyper Version pragma to v0.4.1b5 (#296)
Browse files Browse the repository at this point in the history
### 🕓 Changelog

This commit updates the version `pragma`s in all Vyper source files to
target the latest `master` version `v0.4.1b5`, aligning with the release
of Vyper's newest beta version
[`v0.4.1b4`](https://github.com/vyperlang/vyper/releases/tag/v0.4.1b4).
Additionally, the `npm` dependencies `eslint`, `@eslint/js`, and
`prettier-plugin-solidity` have been upgraded to the latest versions and
all submodules have been updated to their most recent commits.

---------

Signed-off-by: Pascal Marco Caversaccio <[email protected]>
  • Loading branch information
pcaversaccio authored Jan 12, 2025
1 parent cb04f4b commit 5137b63
Show file tree
Hide file tree
Showing 63 changed files with 289 additions and 293 deletions.
188 changes: 94 additions & 94 deletions .gas-snapshot

Large diffs are not rendered by default.

192 changes: 96 additions & 96 deletions .gas-snapshot-venom

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/create-util
Submodule create-util updated 2 files
+6 −6 package.json
+199 −203 pnpm-lock.yaml
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 1 files
+12 −0 src/StdCheats.sol
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
Submodule openzeppelin-contracts updated 52 files
+0 −5 .changeset/eighty-hounds-promise.md
+5 −0 .changeset/famous-timers-compare.md
+0 −5 .changeset/four-chairs-help.md
+5 −0 .changeset/good-cameras-serve.md
+0 −5 .changeset/great-lions-hear.md
+0 −5 .changeset/healthy-books-shout.md
+0 −5 .changeset/hot-shrimps-wait.md
+0 −5 .changeset/lovely-dodos-lay.md
+0 −5 .changeset/pink-wasps-hammer.md
+0 −5 .changeset/proud-planes-arrive.md
+0 −5 .changeset/seven-donkeys-tap.md
+0 −5 .changeset/small-seahorses-bathe.md
+0 −5 .changeset/tricky-bats-pretend.md
+0 −5 .changeset/weak-roses-bathe.md
+42 −0 CHANGELOG.md
+1 −1 contracts/access/AccessControl.sol
+4 −10 contracts/account/utils/draft-ERC4337Utils.sol
+1 −0 contracts/account/utils/draft-ERC7579Utils.sol
+1 −1 contracts/finance/VestingWallet.sol
+1 −1 contracts/governance/Governor.sol
+2 −2 contracts/governance/README.adoc
+1 −0 contracts/governance/extensions/GovernorCountingOverridable.sol
+1 −1 contracts/governance/extensions/GovernorPreventLateQuorum.sol
+1 −1 contracts/governance/utils/Votes.sol
+1 −0 contracts/governance/utils/VotesExtended.sol
+1 −0 contracts/interfaces/draft-IERC4337.sol
+3 −2 contracts/interfaces/draft-IERC7579.sol
+4 −1 contracts/metatx/ERC2771Forwarder.sol
+1 −1 contracts/package.json
+1 −1 contracts/proxy/Clones.sol
+1 −1 contracts/proxy/ERC1967/ERC1967Proxy.sol
+1 −1 contracts/proxy/ERC1967/ERC1967Utils.sol
+1 −1 contracts/proxy/beacon/BeaconProxy.sol
+1 −1 contracts/proxy/transparent/ProxyAdmin.sol
+1 −1 contracts/proxy/transparent/TransparentUpgradeableProxy.sol
+1 −1 contracts/proxy/utils/UUPSUpgradeable.sol
+1 −1 contracts/token/ERC20/ERC20.sol
+1 −1 contracts/token/ERC20/extensions/ERC1363.sol
+1 −1 contracts/token/ERC20/utils/SafeERC20.sol
+1 −1 contracts/utils/Address.sol
+1 −0 contracts/utils/Bytes.sol
+1 −0 contracts/utils/CAIP10.sol
+1 −0 contracts/utils/CAIP2.sol
+24 −0 contracts/utils/Calldata.sol
+1 −0 contracts/utils/NoncesKeyed.sol
+1 −1 contracts/utils/Packing.sol
+10 −1 contracts/utils/README.adoc
+1 −1 contracts/utils/ReentrancyGuardTransient.sol
+1 −1 contracts/utils/Strings.sol
+2 −2 contracts/utils/structs/MerkleTree.sol
+1 −1 package.json
+22 −0 test/utils/Calldata.test.js
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 37 files
+4 −2 .github/workflows/ci.yml
+6 −0 README.md
+2 −2 docs/tokens/erc20votes.md
+1 −1 docs/utils/libtransient.md
+8 −8 docs/utils/signaturecheckerlib.md
+7 −2 foundry.toml
+1 −1 package.json
+63 −0 prep/zksync-compat-analysis.js
+8 −0 src/accounts/ERC7821.sol
+2 −2 src/tokens/ERC20Votes.sol
+1,143 −0 src/tokens/ext/zksync/ERC1155.sol
+915 −0 src/tokens/ext/zksync/ERC721.sol
+4 −2 src/utils/DynamicArrayLib.sol
+1 −1 src/utils/LibTransient.sol
+3 −3 src/utils/LibZip.sol
+1 −1 src/utils/P256.sol
+78 −70 src/utils/SignatureCheckerLib.sol
+6 −60 src/utils/ext/ithaca/BLS.sol
+78 −0 src/utils/ext/zksync/ERC1967BeaconProxy.sol
+388 −0 src/utils/ext/zksync/ERC1967Factory.sol
+9 −0 src/utils/ext/zksync/ERC1967FactoryConstants.sol
+82 −0 src/utils/ext/zksync/ERC1967Proxy.sol
+381 −0 src/utils/ext/zksync/SafeTransferLib.sol
+367 −0 src/utils/ext/zksync/SignatureCheckerLib.sol
+52 −0 src/utils/ext/zksync/SingleUseETHVault.sol
+62 −0 src/utils/ext/zksync/UpgradeableBeacon.sol
+4 −2 src/utils/g/DynamicArrayLib.sol
+1 −1 src/utils/g/LibTransient.sol
+1 −1 test/P256.t.sol
+7 −3 test/SignatureCheckerLib.t.sol
+34 −6 test/ext/ithaca/BLS.t.sol
+1,221 −0 test/ext/zksync/ERC1155.t.sol
+1,005 −0 test/ext/zksync/ERC721.t.sol
+743 −0 test/ext/zksync/SafeTransferLib.t.sol
+387 −0 test/ext/zksync/SignatureCheckerLib.t.sol
+124 −0 test/utils/mocks/ext/zksync/MockERC1155.sol
+139 −0 test/utils/mocks/ext/zksync/MockERC721.sol
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
"CHANGELOG.md"
],
"devDependencies": {
"@eslint/js": "^9.17.0",
"@eslint/js": "^9.18.0",
"@openzeppelin/merkle-tree": "^1.0.7",
"eslint": "^9.17.0",
"eslint": "^9.18.0",
"eslint-config-prettier": "^9.1.0",
"ethers": "^6.13.5",
"keccak256": "^1.0.6",
"merkletreejs": "^0.4.1",
"prettier": "^3.4.2",
"prettier-plugin-sh": "^0.14.0",
"prettier-plugin-solidity": "^1.4.1",
"prettier-plugin-solidity": "^1.4.2",
"solhint": "^5.0.4"
}
}
78 changes: 37 additions & 41 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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@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.1b4
# pragma version ~=0.4.1b5
"""
@title EIP-721 Optional Metadata Interface Definition
@custom:contract-name IERC721Metadata
Expand Down
Loading

0 comments on commit 5137b63

Please sign in to comment.