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.

Sign up for GitHub

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

chore: deploy 304 #216

Merged
merged 2 commits into from
Nov 1, 2024
Merged

chore: deploy 304 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570f564
chore: deploy 304
Schlagonia Oct 31, 2024
f455e17
chore: black
Schlagonia Oct 31, 2024
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
2 changes: 1 addition & 1 deletion ape-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion contracts/VaultFactory.vy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion contracts/VaultV3.vy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions contracts/interfaces/IVault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions scripts/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand All @@ -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,
)
Expand Down
Loading