Skip to content

Commit

Permalink
♻️ Install from main
Browse files Browse the repository at this point in the history
Signed-off-by: Pascal Marco Caversaccio <[email protected]>
  • Loading branch information
pcaversaccio committed Oct 4, 2023
1 parent 414c305 commit e5a0ae8
Show file tree
Hide file tree
Showing 36 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
architecture: ${{ matrix.architecture }}

- name: Install Vyper
run: pip install vyper==0.3.10rc5
run: pip install git+https://github.com/vyperlang/vyper

- name: Check userdoc and devdoc compilation
run: python scripts/compile.py
Expand Down
2 changes: 1 addition & 1 deletion lib/create-util
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 2 files
+451 −286 src/Vm.sol
+15 −0 test/Vm.t.sol
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
Submodule openzeppelin-contracts updated 37 files
+6 −0 .changeset/dull-ghosts-sip.md
+5 −0 .changeset/grumpy-poets-rush.md
+6 −0 .changeset/purple-squids-attend.md
+5 −0 .changeset/thirty-drinks-happen.md
+4 −2 .github/actions/setup/action.yml
+6 −4 .github/workflows/checks.yml
+5 −1 .github/workflows/upgradeable.yml
+1 −0 .gitignore
+8 −5 README.md
+0 −2 RELEASING.md
+1 −1 SECURITY.md
+10 −11 contracts/access/manager/AccessManaged.sol
+49 −23 contracts/access/manager/AccessManager.sol
+3 −0 contracts/governance/extensions/GovernorTimelockAccess.sol
+5 −0 contracts/mocks/AccessManagedTarget.sol
+36 −0 contracts/mocks/Stateless.sol
+1 −1 contracts/mocks/token/ERC20ForceApproveMock.sol
+1 −1 contracts/package.json
+1 −1 docs/modules/ROOT/nav.adoc
+48 −0 docs/modules/ROOT/pages/backwards-compatibility.adoc
+1 −1 docs/modules/ROOT/pages/erc4626.adoc
+2 −2 docs/modules/ROOT/pages/index.adoc
+0 −85 docs/modules/ROOT/pages/releases-stability.adoc
+7 −0 foundry.toml
+13 −1 hardhat.config.js
+186 −567 package-lock.json
+5 −4 package.json
+14 −3 scripts/prepack.sh
+0 −15 scripts/prepare-contracts-package.sh
+0 −10 scripts/prepare.sh
+1 −1 scripts/remove-ignored-artifacts.js
+15 −5 scripts/upgradeable/transpile-onto.sh
+7 −2 scripts/upgradeable/transpile.sh
+38 −20 scripts/upgradeable/upgradeable.patch
+2 −0 test/access/manager/AccessManager.test.js
+14 −1 test/governance/extensions/GovernorTimelockAccess.test.js
+1 −1 test/utils/introspection/SupportsInterface.behavior.js
2 changes: 1 addition & 1 deletion lib/solady
2 changes: 1 addition & 1 deletion lib/solmate
2 changes: 1 addition & 1 deletion src/auth/AccessControl.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Multi-Role-Based Access Control Functions
@custom:contract-name AccessControl
Expand Down
2 changes: 1 addition & 1 deletion src/auth/Ownable.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Owner-Based Access Control Functions
@custom:contract-name Ownable
Expand Down
2 changes: 1 addition & 1 deletion src/auth/Ownable2Step.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title 2-Step Ownership Transfer Functions
@custom:contract-name Ownable2Step
Expand Down
2 changes: 1 addition & 1 deletion src/auth/interfaces/IAccessControl.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title AccessControl Interface Definition
@custom:contract-name IAccessControl
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/ERC2981.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title ERC-721 and ERC-1155 Compatible ERC-2981 Reference Implementation
@custom:contract-name ERC2981
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/ERC4626.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Modern and Gas-Efficient ERC-4626 Tokenised Vault Implementation
@custom:contract-name ERC4626
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/interfaces/IERC2981.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-2981 Interface Definition
@custom:contract-name IERC2981
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/ERC1155.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Modern and Gas-Efficient ERC-1155 Implementation
@custom:contract-name ERC1155
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/ERC20.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Modern and Gas-Efficient ERC-20 + EIP-2612 Implementation
@custom:contract-name ERC20
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/ERC721.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Modern and Gas-Efficient ERC-721 + EIP-4494 Implementation
@custom:contract-name ERC721
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC1155.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-1155 Interface Definition
@custom:contract-name IERC1155
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC1155MetadataURI.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-1155 Optional Metadata Interface Definition
@custom:contract-name IERC1155MetadataURI
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC1155Receiver.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-1155 Token Receiver Interface Definition
@custom:contract-name IERC1155Receiver
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC20Permit.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-2612 Interface Definition
@custom:contract-name IERC20Permit
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC4906.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-4906 Interface Definition
@custom:contract-name IERC4906
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC721Enumerable.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-721 Optional Enumeration Interface Definition
@custom:contract-name IERC721Enumerable
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC721Metadata.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-721 Optional Metadata Interface Definition
@custom:contract-name IERC721Metadata
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC721Permit.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-4494 Interface Definition
@custom:contract-name IERC721Permit
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/interfaces/IERC721Receiver.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-721 Token Receiver Interface Definition
@custom:contract-name IERC721Receiver
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Base64.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Base64 Encoding and Decoding Functions
@custom:contract-name Base64
Expand Down
2 changes: 1 addition & 1 deletion src/utils/BatchDistributor.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Batch Sending Both Native and ERC-20 Tokens
@custom:contract-name BatchDistributor
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Create2Address.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title `CREATE2` EVM Opcode Utility Functions for Address Calculations
@custom:contract-name Create2Address
Expand Down
2 changes: 1 addition & 1 deletion src/utils/CreateAddress.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title `CREATE` EVM Opcode Utility Functions for Address Calculations
@custom:contract-name CreateAddress
Expand Down
2 changes: 1 addition & 1 deletion src/utils/ECDSA.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Elliptic Curve Digital Signature Algorithm (ECDSA) Functions
@custom:contract-name ECDSA
Expand Down
2 changes: 1 addition & 1 deletion src/utils/EIP712DomainSeparator.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-712 Domain Separator
@custom:contract-name EIP712DomainSeparator
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Math.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Standard Mathematical Utility Functions
@custom:contract-name Math
Expand Down
2 changes: 1 addition & 1 deletion src/utils/MerkleProofVerification.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Merkle Tree Proof Verification Functions
@custom:contract-name MerkleProofVerification
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Multicall.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title Multicall Functions
@custom:contract-name Multicall
Expand Down
2 changes: 1 addition & 1 deletion src/utils/SignatureChecker.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title ECDSA and EIP-1271 Signature Verification Functions
@custom:contract-name SignatureChecker
Expand Down
2 changes: 1 addition & 1 deletion src/utils/interfaces/IERC5267.vy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @version ^0.3.10rc5
# @version ^0.3.10
"""
@title EIP-5267 Interface Definition
@custom:contract-name IERC5267
Expand Down

0 comments on commit e5a0ae8

Please sign in to comment.