From 104a2b233bc6d43ba40720d68355b04d2dc31795 Mon Sep 17 00:00:00 2001 From: Schlag <89420541+Schlagonia@users.noreply.github.com> Date: Thu, 31 Oct 2024 22:14:49 -0600 Subject: [PATCH] chore: deploy 304 (#216) * chore: deploy 304 * chore: black --- ape-config.yaml | 2 +- contracts/VaultFactory.vy | 2 +- contracts/VaultV3.vy | 2 +- contracts/interfaces/IVault.sol | 1 + scripts/deploy.py | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ape-config.yaml b/ape-config.yaml index 03d10155..fa76a593 100644 --- a/ape-config.yaml +++ b/ape-config.yaml @@ -12,7 +12,7 @@ dependencies: ref: 4.9.5 - name: tokenized-strategy github: yearn/tokenized-strategy - ref: v3.0.3 + ref: v3.0.4 config_override: contracts_folder: src diff --git a/contracts/VaultFactory.vy b/contracts/VaultFactory.vy index 4e97a8c0..4bfdaaaa 100644 --- a/contracts/VaultFactory.vy +++ b/contracts/VaultFactory.vy @@ -69,7 +69,7 @@ event UpdatePendingGovernance: # Identifier for this version of the vault. -API_VERSION: constant(String[28]) = "3.0.3" +API_VERSION: constant(String[28]) = "3.0.4" # The max amount the protocol fee can be set to. MAX_FEE_BPS: constant(uint16) = 5_000 # 50% diff --git a/contracts/VaultV3.vy b/contracts/VaultV3.vy index 239dbacd..97f4a60d 100644 --- a/contracts/VaultV3.vy +++ b/contracts/VaultV3.vy @@ -176,7 +176,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.3" +API_VERSION: constant(String[28]) = "3.0.4" # ENUMS # # Each permissioned function has its own Role. diff --git a/contracts/interfaces/IVault.sol b/contracts/interfaces/IVault.sol index e45a343d..eeec9ce1 100644 --- a/contracts/interfaces/IVault.sol +++ b/contracts/interfaces/IVault.sol @@ -23,6 +23,7 @@ interface IVault is IERC4626 { ); // ROLE UPDATES event RoleSet(address indexed account, uint256 role); + event UpdateFutureRoleManager(address indexed future_role_manager); event UpdateRoleManager(address indexed role_manager); event UpdateAccountant(address indexed accountant); diff --git a/scripts/deploy.py b/scripts/deploy.py index 391822a7..8ed6edb1 100644 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -19,7 +19,7 @@ def deploy_original_and_factory(): "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed" ) - salt_string = "v3.0.3" + salt_string = "" # Create a SHA-256 hash object hash_object = hashlib.sha256() @@ -28,7 +28,7 @@ def deploy_original_and_factory(): # Get the hexadecimal representation of the hash hex_hash = hash_object.hexdigest() # Convert the hexadecimal hash to an integer - salt = int(hex_hash, 16) + salt = 0 # int(hex_hash, 16) print(f"Salt we are using {salt}") print("Init balance:", deployer.balance / 1e18) @@ -54,7 +54,7 @@ def deploy_original_and_factory(): init_gov = "0x6f3cBE2ab3483EC4BA7B672fbdCa0E9B33F88db8" factory_constructor = vault_factory.constructor.encode_input( - "Yearn v3.0.3 Vault Factory", + "Yearn v3.0.4 Vault Factory", original_address, init_gov, )