From d9846117cba431d9ec425f8d986935d48f3835b9 Mon Sep 17 00:00:00 2001 From: Ian Lucas Date: Fri, 8 Nov 2024 10:32:59 -0500 Subject: [PATCH] chore: Update Deploy LiquidStone config. --- packages/contracts/resource/plumeTestnet.toml | 11 +++- .../contracts/resource/testnetArbSepolia.toml | 50 +++++++++++++++++++ .../script/DeployLiquidMultiTokenVault.s.sol | 5 +- .../contracts/script/utils/generateTsAbis.js | 2 +- 4 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 packages/contracts/resource/testnetArbSepolia.toml diff --git a/packages/contracts/resource/plumeTestnet.toml b/packages/contracts/resource/plumeTestnet.toml index 950e7ac3..1c8251ab 100644 --- a/packages/contracts/resource/plumeTestnet.toml +++ b/packages/contracts/resource/plumeTestnet.toml @@ -5,7 +5,7 @@ [evm] # blockchain id, e.g. plumeTestnet=98864, plumeTestnet_old=161221135, plumeDevnet=18230 chain_id = 98864 -deploy_mocks = true +deploy_mocks = false [evm.address] # credbull-devops wallets. wallet numbers are 1-based (as opposed to 0-based in anvil) @@ -19,6 +19,15 @@ custodian = "0x8561845F6a9511cD8e2daCae77A961e718A77cF6" upgrader = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75" # devops asset manager (wallet 7) - public address, okay to share asset_manager = "0xd097E901FB9B75C2d2f97E142d73fA79C31FcAb3" +# CBL token address - Plume Testnet +cbl_token="0x931Cf9ab674bAbfa7De712EE635b75b5636b4D29" +# USDC.e token address - Plume Testnet +usdc_token="0x401eCb1D350407f13ba348573E5630B83638E30D" +# Liquid Continuous Multi Token Vault Proxy - Plume Testnet +liquid_vault_proxy="0x4B1fC984F324D2A0fDD5cD83925124b61175f5C6" +# Liquid Continuous Multi Token Vault Impl - Plume Testnet +liquid_vault_impl="0x9Db9df1D91c5cdE0c92cf02B9992d42f47028b4A" + [evm.contracts.liquid_continuous_multi_token_vault] # rate in basis points, e.g. 10% = 1000 bps diff --git a/packages/contracts/resource/testnetArbSepolia.toml b/packages/contracts/resource/testnetArbSepolia.toml new file mode 100644 index 00000000..e7b476e4 --- /dev/null +++ b/packages/contracts/resource/testnetArbSepolia.toml @@ -0,0 +1,50 @@ +## +# The Application Configuration for the TestNet Environment. +## + +[evm] +# blockchain id, e.g. baseSepolia=84532, arbSepolia=421614 +chain_id = 421614 +deploy_mocks = false + +[evm.address] +# credbull-devops wallets. wallet numbers are 1-based (as opposed to 0-based in anvil) +# devops admin/owner (wallet 1) - public address, okay to share +owner = "0xD79Be36f61fce3B8EF2FBF22b13B2b9a68eE15A2" +# devops operator (wallet 2) - public address, okay to share +operator = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75" +# devops custodian (wallet 3) - public address, okay to share +custodian = "0x8561845F6a9511cD8e2daCae77A961e718A77cF6" +# devops upgrader (wallet 4) - public address, okay to share +upgrader = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75" +# devops asset manager (wallet 7) - public address, okay to share +asset_manager = "0xd097E901FB9B75C2d2f97E142d73fA79C31FcAb3" +# CBL token address - Arbitrum Sepolia +cbl_token="0x3Dd53Ec7DFff8cf774391867C83583E634363345" +# USDC token address - Arbitrum Sepolia +usdc_token="0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d" + +[evm.contracts.liquid_continuous_multi_token_vault] +# rate in basis points, e.g. 10% = 1000 bps +full_rate_bps = 10_00 +# rate in basis points, e.g. 5.5% = 550 bps +reduced_rate_bps = 5_50 + +[evm.contracts.upside_vault] +# 2 decimal place percentage (meaining value divided by 100) as integer. +collateral_percentage = 200 + +[evm.contracts.cbl] +# CBL token params +# devops admin/owner (wallet 1) - public address, okay to share +owner = "0xD79Be36f61fce3B8EF2FBF22b13B2b9a68eE15A2" +# devops operator (wallet 2) - public address, okay to share +minter = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75" +# CBL token params +max_supply = 10_000_000 # 10 million in wei + +[services.supabase] +url = "" + +# Save the contract deployment details to the database. +update_contract_addresses = false diff --git a/packages/contracts/script/DeployLiquidMultiTokenVault.s.sol b/packages/contracts/script/DeployLiquidMultiTokenVault.s.sol index 7f9e647b..634a526c 100644 --- a/packages/contracts/script/DeployLiquidMultiTokenVault.s.sol +++ b/packages/contracts/script/DeployLiquidMultiTokenVault.s.sol @@ -108,7 +108,8 @@ contract DeployLiquidMultiTokenVault is TomlConfig { uint256 reducedRateBasisPoints = _tomlConfig.readUint(string.concat(CONTRACT_TOML_KEY, ".reduced_rate_bps")); uint256 startTimestamp = _startTimestamp(); - uint256 scale = 10 ** asset.decimals(); + uint256 decimals = asset.decimals(); + uint256 scale = 10 ** decimals; TripleRateContext.ContextParams memory contextParams = TripleRateContext.ContextParams({ fullRateScaled: fullRateBasisPoints * scale / 100, @@ -118,7 +119,7 @@ contract DeployLiquidMultiTokenVault is TomlConfig { }), frequency: 360, tenor: 30, - decimals: asset.decimals() + decimals: decimals }); LiquidContinuousMultiTokenVault.VaultParams memory vaultParams = LiquidContinuousMultiTokenVault.VaultParams({ diff --git a/packages/contracts/script/utils/generateTsAbis.js b/packages/contracts/script/utils/generateTsAbis.js index 6577cdd7..5c65fbb1 100644 --- a/packages/contracts/script/utils/generateTsAbis.js +++ b/packages/contracts/script/utils/generateTsAbis.js @@ -67,7 +67,7 @@ function getInheritedFunctions(mainArtifact) { } function main() { - const current_path_to_broadcast = path.join(__dirname, '../..', 'broadcast/DeployAndLoadLiquidMultiTokenVault.s.sol'); // data loading variant + const current_path_to_broadcast = path.join(__dirname, '../..', 'broadcast/DeployLiquidMultiTokenVault.s.sol'); // data loading variant const current_path_to_deployments = path.join(__dirname, '../..', 'broadcast'); const chains = getDirectories(current_path_to_broadcast);