feat: version 3.0.2

.github/workflows/test.yaml

@@ -23,8 +23,8 @@ jobs:
     - uses: ApeWorX/[email protected]
       with:
         python-version: '3.10'
-        ape-version-pin: "==0.6.3"
-        ape-plugins-list: 'solidity==0.6.0 vyper==0.6.1 hardhat==0.6.0'
+        ape-version-pin: "==0.7.0"
+        #ape-plugins-list: 'solidity==0.6.0 vyper==0.6.1 hardhat==0.6.0'
 
     - name: install vyper
       run: pip install git+https://github.com/vyperlang/vyper

ape-config.yaml

@@ -2,26 +2,23 @@ name: yearn-v3
 
 plugins:
   - name: solidity
-    version: 0.6.0
   - name: vyper
-    version: 0.6.1
   - name: hardhat
-    version: 0.6.0
 
 default_ecosystem: ethereum
 dependencies:
   - name: openzeppelin
     github: OpenZeppelin/openzeppelin-contracts
-    version: 4.7.3
+    ref: 4.7.3
   - name: tokenized-strategy
     github: yearn/tokenized-strategy
-    branch: master
+    ref: v3.0.2 
     contracts_folder: src
 
 solidity:
   import_remapping:
     - "@openzeppelin/contracts=openzeppelin/v4.7.3"
-    - "@tokenized-strategy=tokenized-strategy/master"
+    - "@tokenized-strategy=tokenized-strategy/v3.0.2"
 
 ethereum:
   local:

contracts/VaultFactory.vy

@@ -68,7 +68,7 @@ struct PFConfig:
     fee_recipient: address
 
 # Identifier for this version of the vault.
-API_VERSION: constant(String[28]) = "3.0.1"
+API_VERSION: constant(String[28]) = "3.0.2"
 
 # The max amount the protocol fee can be set to.
 MAX_FEE_BPS: constant(uint16) = 5_000 # 50%

contracts/VaultV3.vy

@@ -174,7 +174,7 @@ MAX_BPS: constant(uint256) = 10_000
 # Extended for profit locking calculations.
 MAX_BPS_EXTENDED: constant(uint256) = 1_000_000_000_000
 # The version of this vault.
-API_VERSION: constant(String[28]) = "3.0.1"
+API_VERSION: constant(String[28]) = "3.0.2"
 
 # ENUMS #
 # Each permissioned function has its own Role.

requirements.txt

@@ -1,2 +1,2 @@
 black==22.3.0
-eth-ape==0.6.3
+eth-ape>=0.7.0

scripts/deploy.py

@@ -21,7 +21,7 @@ def deploy_blueprint_and_factory():
     deployer_contract = project.IDeployer.at(
         "0x8D85e7c9A4e369E53Acc8d5426aE1568198b0112"
     )
-    salt_string = "v3.0.1"
+    salt_string = "v3.0.2"
 
     # Create a SHA-256 hash object
     hash_object = hashlib.sha256()

tests/conftest.py

@@ -1,7 +1,7 @@
 import pytest
 from ape import chain
 from ape.types import ContractLog
-from eth_account.messages import encode_structured_data
+from eth_account.messages import encode_typed_data
 from utils.constants import MAX_INT, ROLES, WEEK
 import time
 import os
@@ -459,7 +459,7 @@ def sign_vault_permit(
                 "deadline": deadline,
             },
         }
-        permit = encode_structured_data(data)
+        permit = encode_typed_data(full_message=data)
         return owner.sign_message(permit)
 
     return sign_vault_permit

tests/unit/vault/test_queue_management.py

@@ -372,7 +372,7 @@ def test__set_default_queue(create_vault, asset, gov, create_strategy):
     event_queue = list(event[0].new_default_queue)
     # Need to checksum each address to compare it correctly.
     for i in range(len(new_queue)):
-        assert Web3.toChecksumAddress(event_queue[i]) == new_queue[i]
+        assert Web3.to_checksum_address(event_queue[i]) == new_queue[i]
 
 
 def test__set_default_queue__inactive_strategy__reverts(