chore: Revert Makefile and toml config to main revisions

credbull · Dec 3, 2024 · a86eb5c · a86eb5c
1 parent 5b543c6
commit a86eb5c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/packages/contracts/.env.sample b/packages/contracts/.env.sample
@@ -13,6 +13,3 @@ DEPLOYER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf
 
 # Supabase Dev Key (eyJhbG...81IU) - okay to share
 SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
-
-# Deploy Staking Vaults
-#DEPLOY_SCRIPT=script/DeployStakingVaults.s.sol:DeployStakingVaults
diff --git a/packages/contracts/Makefile b/packages/contracts/Makefile
@@ -31,6 +31,12 @@ deploy-plumeTestnet:
 resume-plumeTestnet:
 	$(MAKE) deploy RPC_URL=plumeTestnet EXTRA_FLAGS="--verify --verifier blockscout --verifier-url https://test-explorer.plumenetwork.xyz/api\? --legacy --skip-simulation --slow --resume"
 
+deploy-plume:
+	$(MAKE) deploy RPC_URL=plume EXTRA_FLAGS="--verify --verifier blockscout --verifier-url https://phoenix-explorer.plumenetwork.xyz/api\? --legacy --skip-simulation --slow"
+
+resume-plume:
+	$(MAKE) deploy RPC_URL=plume EXTRA_FLAGS="--verify --verifier blockscout --verifier-url https://phoenix-explorer.plumenetwork.xyz/api\? --legacy --skip-simulation --slow --resume"
+
 deploy-arbitrum:
 	$(MAKE) deploy RPC_URL=arbitrum EXTRA_FLAGS="--verify --slow"
 

diff --git a/packages/contracts/foundry.toml b/packages/contracts/foundry.toml
@@ -22,14 +22,21 @@ polygon = "https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 polygonMumbai = "https://polygon-mumbai.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 bitlayer = "https://rpc.bitlayer.org"
 bitlayerTestnet = "https://testnet-rpc.bitlayer.org"
+plume = "https://phoenix-rpc.plumenetwork.xyz/${PLUME_API_KEY}"
+plumeDevnet = "https://devnet-rpc.plumenetwork.xyz"
+plumeTestnet_old = "https://testnet-rpc.plumenetwork.xyz"
+plumeTestnet= "https://test-rpc.plumenetwork.xyz"
 
 
 [etherscan]
 localhost = { key = "" , url="http://127.0.0.1:8545"}
 base = { key = "${BASE_ETHERSCAN_API_KEY}" }
 baseSepolia = { key = "${BASE_SEPOLIA_ETHERSCAN_API_KEY}" }
-# arbitrum Endpoints: see https://docs.arbiscan.io/getting-started/endpoint-urls
 arbitrum = { key = "${ARB_ETHERSCAN_API_KEY}", url = "https://api.arbiscan.io/api", chain=42161 }
 arbitrumSepolia = { key = "${ARB_SEPOLIA_ETHERSCAN_API_KEY}", url = "https://api-sepolia.arbiscan.io/api", chain=421614 }
 bitlayer = { key = "bitlayer", url="https://rpc.bitlayer.org" }
 bitlayerTestnet = { key = "bitlayerTestnet", url="https://testnet-scan.bitlayer.org" }
+plume = { key = "plume", url = 'https://phoenix-explorer.plumenetwork.xyz/api\?', chain=98865 }
+plumeDevnet = { key = "plumeDevnet", url = 'https://devnet-explorer.plumenetwork.xyz/api\?', chain=18230 }
+plumeTestnet_old = { key = "plumeTestnet_old", url = 'https://testnet-explorer.plumenetwork.xyz/api\?', chain=161221135 }
+plumeTestnet = { key = "plumeTestnet", url = 'https://test-explorer.plumenetwork.xyz/api\?', chain=98864 }
diff --git a/packages/contracts/resource/mainnet.toml b/packages/contracts/resource/mainnet.toml
@@ -1,5 +1,5 @@
 ##
-# The Application Configuration for the Mainnet Environment.
+# The Application Configuration for the TestNet Environment.
 ##
 
 [evm]
@@ -19,11 +19,6 @@ upgrader = "0x1E2D099F4681394B0c130e7cCcc3F5275eCa81b1"
 asset_manager = "0x1DA51e4Ab5D029034Db2caB258EC4e22Be647BFB"
 # primevault Wallet [0xce..3FB2] "Credbull DeFi Vault - Treasury v1.0"
 custodian = "0xce694E94e1Ddb734f2bD32B2511D193fF2783FB2"
-# CBL token address
-cbl_token="0xD6b3d81868770083307840F513A3491960b95cb6"
-# USDC token address
-usdc_token="0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
-
 
 [evm.contracts.liquid_continuous_multi_token_vault]
 # rate in basis points, e.g.  10% = 1000 bps
@@ -39,4 +34,4 @@ collateral_percentage = 200
 url = ""
 
 # Save the contract deployment details to the database.
-update_contract_addresses = false
+update_contract_addresses = false
diff --git a/packages/contracts/resource/testnet.toml b/packages/contracts/resource/testnet.toml
@@ -4,8 +4,8 @@
 
 [evm]
 # blockchain id, e.g. baseSepolia=84532, arbSepolia=421614
-chain_id = 421614
-deploy_mocks = false
+chain_id = 84532
+deploy_mocks = true
 
 [evm.address]
 # credbull-devops wallets.  wallet numbers are 1-based (as opposed to 0-based in anvil)
@@ -19,10 +19,6 @@ custodian = "0x8561845F6a9511cD8e2daCae77A961e718A77cF6"
 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