Merge pull request #181 from credbull/deploy/v1.3/plume-liquidstone-u…

…ser-assets

Upgrade LiquidStone contract to add totalAssets(address owner)

packages/contracts/resource/plumeMainnet.toml

@@ -18,21 +18,23 @@ upgrader = "0x3E449960Ba36cB00B728A370F991c658e7cca459"
 # credbullassetmgr.cb.id asset manager (#7)
 asset_manager = "0x97BE1b79AA9dB55e7235a9dd5E686cc4A26A7959"
 
-# USDC.e token address (Fiat Proxy
-usdc_token="0x0F3B6CC558A714ecf4Cc9ec8caFF0b57ECf65890"
-# Liquid Continuous Multi Token Vault Proxy
-liquid_vault_proxy="0xb89846b74f3B190F6e00fc35B3aFfCDF5d4BB9f9"
-# Liquid Continuous Multi Token Vault Impl
-liquid_vault_impl="0x8f87E1258d645d948F270221C34202Be0583F29b"
+# USDC.e token address - Bridged USDC (Stargate) (USDC.e)
+usdc_token="0x3938A812c54304fEffD266C7E2E70B48F9475aD6"
+# Liquid Continuous Multi Token Vault Proxy - Plume Mainnet
+liquid_vault_proxy="0x2b9d2023DbF3c7473f1cec42F78713d09DdC9FBF"
+# Liquid Continuous Multi Token Vault Impl - Plume Mainnet (v2 - latest)
+liquid_vault_impl="0xD9991FC39980E4294F6953AB5aDf514Db8545658"
+# Liquid Continuous Multi Token Vault Impl - Plume Mainnet (v1)
+liquid_vault_impl_V1="0xe4a4d891f02DF7bFFc5ff9e691313DE8a9E76b91"
 
 
 [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
-# January 1, 2025 2:00:00 PM UTC = 1735740000
-vault_start_timestamp = 1735740000
+# December 4, 2024 2:00:00 PM UTC = 1733277600
+vault_start_timestamp = 1733277600
 
 [services.supabase]
 url = ""

packages/contracts/resource/plumeTestnet.toml

@@ -16,7 +16,7 @@ operator = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75"
 # devops custodian (wallet 3) - public address, okay to share
 custodian = "0x8561845F6a9511cD8e2daCae77A961e718A77cF6"
 # devops upgrader (wallet 4) - public address, okay to share
-upgrader = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75"
+upgrader = "0x77f07B5d5E03e39Dc42FBCa53F122D4c1851B939"
 # devops asset manager (wallet 7) - public address, okay to share
 asset_manager = "0xd097E901FB9B75C2d2f97E142d73fA79C31FcAb3"
 # CBL token address - Plume Testnet
@@ -25,8 +25,10 @@ cbl_token="0x931Cf9ab674bAbfa7De712EE635b75b5636b4D29"
 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"
+# Liquid Continuous Multi Token Vault Impl - Plume Testnet (v2 - latest)
+liquid_vault_impl="0xaEC1Fb92DcAc8CAf70FaCAe32682ABcBADB4F3A6"
+# Liquid Continuous Multi Token Vault Impl - Plume Testnet (v1)
+liquid_vault_impl_V1="0x9Db9df1D91c5cdE0c92cf02B9992d42f47028b4A"
 
 
 [evm.contracts.liquid_continuous_multi_token_vault]

packages/contracts/resource/testnetArbSepolia.toml

@@ -16,13 +16,19 @@ operator = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75"
 # devops custodian (wallet 3) - public address, okay to share
 custodian = "0x8561845F6a9511cD8e2daCae77A961e718A77cF6"
 # devops upgrader (wallet 4) - public address, okay to share
-upgrader = "0xaD3C004eE1f942BFDA2DA0D2DAaC94d6aC012F75"
+upgrader = "0x77f07B5d5E03e39Dc42FBCa53F122D4c1851B939"
 # 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"
+# Liquid Continuous Multi Token Vault Proxy
+liquid_vault_proxy="0x111B6a3dbacE7F0b32bAad47027907765e88ABd2"
+# Liquid Continuous Multi Token Vault Impl (v2 - latest)
+liquid_vault_impl="0xF79E37c527B9CfB3008A5eee88B0b65CD91a46fe"
+# Liquid Continuous Multi Token Vault Impl (v1)
+liquid_vault_impl_V1="0x9Db9df1D91c5cdE0c92cf02B9992d42f47028b4A"
 
 [evm.contracts.liquid_continuous_multi_token_vault]
 # rate in basis points, e.g.  10% = 1000 bps

packages/contracts/script/DeployLiquidMultiTokenVaultImplForUpgrade.s.sol

@@ -0,0 +1,27 @@
+//SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import { LiquidContinuousMultiTokenVault } from "@credbull/yield/LiquidContinuousMultiTokenVault.sol";
+
+import { Script } from "forge-std/Script.sol";
+import { console2 } from "forge-std/console2.sol";
+
+contract DeployLiquidMultiTokenVaultImplForUpgrade is Script {
+    function run() public virtual returns (LiquidContinuousMultiTokenVault vaultImpl_) {
+        vm.startBroadcast();
+
+        LiquidContinuousMultiTokenVault liquidVaultImpl = new LiquidContinuousMultiTokenVault();
+        console2.log(
+            string.concat(
+                "!!!!! Deploying LiquidContinuousMultiTokenVault Implementation [",
+                vm.toString(address(liquidVaultImpl)),
+                "] !!!!!"
+            )
+        );
+
+        vm.stopBroadcast();
+
+        return liquidVaultImpl;
+    }
+}

spikes/spike-liquid-stone/.gitignore

@@ -20,4 +20,5 @@ node_modules
 .idea
 
 # cli
-dist
+dist
+.vercel

spikes/spike-liquid-stone/package.json

@@ -29,14 +29,15 @@
     "precommit": "lint-staged",
     "start": "yarn workspace @se-2/nextjs dev",
     "test": "yarn foundry:test",
-    "vercel": "yarn workspace @se-2/nextjs vercel",
+    "vercel": "vercel",
     "vercel:yolo": "yarn workspace @se-2/nextjs vercel:yolo",
     "verify": "yarn workspace @se-2/foundry verify"
   },
   "devDependencies": {
     "@types/dotenv": "^8.2.3",
     "husky": "^9.1.4",
-    "lint-staged": "^15.2.9"
+    "lint-staged": "^15.2.9",
+    "vercel": "^39.2.0"
   },
   "packageManager": "[email protected]",
   "engines": {

spikes/spike-liquid-stone/packages/nextjs/.env.sample

@@ -6,4 +6,4 @@ NEXT_PUBLIC_ALCHEMY_API_KEY=
 
 # Required for Plume Mainnet only
 # TODO - do not check this in - API key!
-PLUME_API_KEY=
+NEXT_PUBLIC_PLUME_API_KEY=