d-bis/smom-dbis-138
4
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Add Oracle Aggregator and CCIP Integration

Browse Source 
- Introduced Aggregator.sol for Chainlink-compatible oracle functionality, including round-based updates and access control.
- Added OracleWithCCIP.sol to extend Aggregator with CCIP cross-chain messaging capabilities.
- Created .gitmodules to include OpenZeppelin contracts as a submodule.
- Developed a comprehensive deployment guide in NEXT_STEPS_COMPLETE_GUIDE.md for Phase 2 and smart contract deployment.
- Implemented Vite configuration for the orchestration portal, supporting both Vue and React frameworks.
- Added server-side logic for the Multi-Cloud Orchestration Portal, including API endpoints for environment management and monitoring.
- Created scripts for resource import and usage validation across non-US regions.
- Added tests for CCIP error handling and integration to ensure robust functionality.
- Included various new files and directories for the orchestration portal and deployment scripts.
This commit is contained in:
defiQUG
2025-12-12 14:57:48 -08:00
parent a1466e4005
commit 1fb7266469
1720 changed files with 241279 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
script/reserve/ConfigureInitialReserves.s.sol Normal file
View File

@@ -0,0 +1,168 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
import "forge-std/Script.sol";
import "../../contracts/reserve/ReserveSystem.sol";
import "../../contracts/reserve/IReserveSystem.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
/**
* @title ConfigureInitialReserves
* @notice Script to configure initial reserve assets for Reserve System
* @dev Sets up supported assets, liquidity flags, and initial deposits
*/
contract ConfigureInitialReserves is Script {
function run() external {
uint256 chainId = block.chainid;
require(chainId == 138, "This script is for ChainID 138 only");
uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(deployerPrivateKey);
address deployer = vm.addr(deployerPrivateKey);
console.log("=== Configure Initial Reserves (ChainID 138) ===");
console.log("Deployer:", deployer);
console.log("");
// Load addresses from environment
address reserveSystem = vm.envAddress("RESERVE_SYSTEM");
address admin = vm.envOr("RESERVE_ADMIN", deployer);
address reserveManager = vm.envOr("RESERVE_MANAGER", deployer);
ReserveSystem reserve = ReserveSystem(reserveSystem);
console.log("=== Adding Supported Assets ===");
// Asset 1: Gold (XAU) - Liquid asset
address xauAsset = vm.envOr("XAU_ASSET", address(0));
if (xauAsset != address(0)) {
console.log("Adding XAU asset:", xauAsset);
vm.prank(admin);
reserve.addSupportedAsset(xauAsset, true); // Liquid
console.log("XAU added as liquid asset");
}
// Asset 2: USDC - Liquid asset
address usdcAsset = vm.envOr("USDC_ASSET", address(0));
if (usdcAsset != address(0)) {
console.log("Adding USDC asset:", usdcAsset);
vm.prank(admin);
reserve.addSupportedAsset(usdcAsset, true); // Liquid
console.log("USDC added as liquid asset");
}
// Asset 3: ETH - Liquid asset
address ethAsset = vm.envOr("ETH_ASSET", address(0));
if (ethAsset != address(0)) {
console.log("Adding ETH asset:", ethAsset);
vm.prank(admin);
reserve.addSupportedAsset(ethAsset, true); // Liquid
console.log("ETH added as liquid asset");
}
// Asset 4: WETH (if different from ETH)
address wethAsset = vm.envOr("WETH_ASSET", address(0));
if (wethAsset != address(0) && wethAsset != ethAsset) {
console.log("Adding WETH asset:", wethAsset);
vm.prank(admin);
reserve.addSupportedAsset(wethAsset, true); // Liquid
console.log("WETH added as liquid asset");
}
// Asset 5: Sovereign Instruments (example - less liquid)
address sovereignAsset = vm.envOr("SOVEREIGN_ASSET", address(0));
if (sovereignAsset != address(0)) {
console.log("Adding Sovereign Instrument asset:", sovereignAsset);
vm.prank(admin);
reserve.addSupportedAsset(sovereignAsset, false); // Less liquid
console.log("Sovereign Instrument added as less liquid asset");
}
console.log("");
console.log("=== Initial Reserve Deposits ===");
console.log("Note: Ensure assets are approved and sufficient balance exists");
// Deposit XAU reserves (if configured)
if (xauAsset != address(0)) {
uint256 xauAmount = vm.envOr("XAU_INITIAL_DEPOSIT", uint256(0));
if (xauAmount > 0) {
console.log("Depositing XAU reserves:", xauAmount);
IERC20(xauAsset).approve(reserveSystem, xauAmount);
vm.prank(reserveManager);
reserve.depositReserve(xauAsset, xauAmount);
console.log("XAU deposit complete");
}
}
// Deposit USDC reserves (if configured)
if (usdcAsset != address(0)) {
uint256 usdcAmount = vm.envOr("USDC_INITIAL_DEPOSIT", uint256(0));
if (usdcAmount > 0) {
console.log("Depositing USDC reserves:", usdcAmount);
IERC20(usdcAsset).approve(reserveSystem, usdcAmount);
vm.prank(reserveManager);
reserve.depositReserve(usdcAsset, usdcAmount);
console.log("USDC deposit complete");
}
}
// Deposit ETH reserves (if configured)
if (ethAsset != address(0)) {
uint256 ethAmount = vm.envOr("ETH_INITIAL_DEPOSIT", uint256(0));
if (ethAmount > 0) {
console.log("Depositing ETH reserves:", ethAmount);
IERC20(ethAsset).approve(reserveSystem, ethAmount);
vm.prank(reserveManager);
reserve.depositReserve(ethAsset, ethAmount);
console.log("ETH deposit complete");
}
}
// Deposit WETH reserves (if configured)
if (wethAsset != address(0)) {
uint256 wethAmount = vm.envOr("WETH_INITIAL_DEPOSIT", uint256(0));
if (wethAmount > 0) {
console.log("Depositing WETH reserves:", wethAmount);
IERC20(wethAsset).approve(reserveSystem, wethAmount);
vm.prank(reserveManager);
reserve.depositReserve(wethAsset, wethAmount);
console.log("WETH deposit complete");
}
}
console.log("");
console.log("=== Reserve Balances ===");
if (xauAsset != address(0)) {
uint256 xauBalance = reserve.getReserveBalance(xauAsset);
console.log("XAU Reserve Balance:", xauBalance);
}
if (usdcAsset != address(0)) {
uint256 usdcBalance = reserve.getReserveBalance(usdcAsset);
console.log("USDC Reserve Balance:", usdcBalance);
}
if (ethAsset != address(0)) {
uint256 ethBalance = reserve.getReserveBalance(ethAsset);
console.log("ETH Reserve Balance:", ethBalance);
}
if (wethAsset != address(0)) {
uint256 wethBalance = reserve.getReserveBalance(wethAsset);
console.log("WETH Reserve Balance:", wethBalance);
}
console.log("");
console.log("=== Configuration Complete ===");
console.log("");
console.log("=== Supported Assets ===");
address[] memory supportedAssets = reserve.getSupportedAssets();
for (uint256 i = 0; i < supportedAssets.length; i++) {
console.log("Asset", i, ":", supportedAssets[i]);
}
vm.stopBroadcast();
}
}

54
script/reserve/DeployReserveSystem.s.sol Normal file
View File

@@ -0,0 +1,54 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
import "forge-std/Script.sol";
import "../../contracts/reserve/ReserveSystem.sol";
import "../../contracts/reserve/ReserveTokenIntegration.sol";
import "@emoney/interfaces/ITokenFactory138.sol";
/**
* @title DeployReserveSystem
* @notice Deployment script for Reserve System on ChainID 138
*/
contract DeployReserveSystem is Script {
function run() external {
uint256 chainId = block.chainid;
require(chainId == 138, "This script is for ChainID 138 only");
uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(deployerPrivateKey);
address deployer = vm.addr(deployerPrivateKey);
console.log("=== Reserve System Deployment (ChainID 138) ===");
console.log("Deployer:", deployer);
console.log("");
// Load addresses from environment
address admin = vm.envOr("RESERVE_ADMIN", deployer);
address tokenFactory = vm.envAddress("TOKEN_FACTORY");
console.log("Deploying ReserveSystem...");
ReserveSystem reserveSystem = new ReserveSystem(admin);
console.log("ReserveSystem deployed at:", address(reserveSystem));
console.log("Deploying ReserveTokenIntegration...");
ReserveTokenIntegration integration = new ReserveTokenIntegration(
admin,
address(reserveSystem),
tokenFactory
);
console.log("ReserveTokenIntegration deployed at:", address(integration));
console.log("");
console.log("=== Deployment Summary ===");
console.log("ReserveSystem:", address(reserveSystem));
console.log("ReserveTokenIntegration:", address(integration));
console.log("");
console.log("=== Export to .env ===");
console.log("export RESERVE_SYSTEM=", vm.toString(address(reserveSystem)));
console.log("export RESERVE_INTEGRATION=", vm.toString(address(integration)));
vm.stopBroadcast();
}
}

34
script/reserve/SetupComplete.s.sol Normal file
View File

@@ -0,0 +1,34 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
import "forge-std/Script.sol";
/**
* @title SetupComplete
* @notice Complete setup script for Reserve System
* @dev This script should be run as a bash script that calls the individual scripts
*
* Usage:
* # Step 1: Setup Price Feeds
* forge script script/reserve/SetupPriceFeeds.s.sol:SetupPriceFeeds --rpc-url chain138 --broadcast
*
* # Step 2: Configure Initial Reserves
* forge script script/reserve/ConfigureInitialReserves.s.sol:ConfigureInitialReserves --rpc-url chain138 --broadcast
*/
contract SetupComplete is Script {
function run() external {
console.log("=== Complete Reserve System Setup ===");
console.log("");
console.log("This script is a placeholder.");
console.log("Please run the setup scripts individually:");
console.log("");
console.log("Step 1: Setup Price Feeds");
console.log(" forge script script/reserve/SetupPriceFeeds.s.sol:SetupPriceFeeds --rpc-url chain138 --broadcast");
console.log("");
console.log("Step 2: Configure Initial Reserves");
console.log(" forge script script/reserve/ConfigureInitialReserves.s.sol:ConfigureInitialReserves --rpc-url chain138 --broadcast");
console.log("");
console.log("Or use the bash script: scripts/reserve/setup-complete.sh");
}
}

144
script/reserve/SetupPriceFeeds.s.sol Normal file
View File

@@ -0,0 +1,144 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
import "forge-std/Script.sol";
import "../../contracts/reserve/OraclePriceFeed.sol";
import "../../contracts/reserve/MockPriceFeed.sol";
import "../../contracts/reserve/IReserveSystem.sol";
/**
* @title SetupPriceFeeds
* @notice Script to set up price feeds for Reserve System
* @dev Configures aggregators and initial prices for supported assets
*/
contract SetupPriceFeeds is Script {
function run() external {
uint256 chainId = block.chainid;
require(chainId == 138, "This script is for ChainID 138 only");
uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(deployerPrivateKey);
address deployer = vm.addr(deployerPrivateKey);
console.log("=== Setup Price Feeds (ChainID 138) ===");
console.log("Deployer:", deployer);
console.log("");
// Load addresses from environment
address reserveSystem = vm.envAddress("RESERVE_SYSTEM");
address oraclePriceFeed = vm.envOr("ORACLE_PRICE_FEED", address(0));
address admin = vm.envOr("RESERVE_ADMIN", deployer);
// Deploy OraclePriceFeed if not provided
if (oraclePriceFeed == address(0)) {
console.log("Deploying OraclePriceFeed...");
OraclePriceFeed priceFeed = new OraclePriceFeed(admin, reserveSystem);
oraclePriceFeed = address(priceFeed);
console.log("OraclePriceFeed deployed at:", oraclePriceFeed);
} else {
console.log("Using existing OraclePriceFeed:", oraclePriceFeed);
}
OraclePriceFeed priceFeedContract = OraclePriceFeed(oraclePriceFeed);
// Configuration: Asset addresses and initial prices
// For production, use real Chainlink aggregators
// For testing, deploy MockPriceFeed contracts
bool useMockFeeds = vm.envOr("USE_MOCK_FEEDS", true);
if (useMockFeeds) {
console.log("");
console.log("=== Deploying Mock Price Feeds ===");
// Example assets with mock prices (in 8 decimals for Chainlink compatibility)
// Gold (XAU) - $2000 per ounce
address xauAsset = vm.envOr("XAU_ASSET", address(0x1111111111111111111111111111111111111111));
if (xauAsset != address(0)) {
console.log("Setting up XAU price feed...");
MockPriceFeed xauFeed = new MockPriceFeed(2000 * 1e8, 8);
// Multiplier: 1e10 to convert 8 decimals to 18 decimals
vm.prank(admin);
priceFeedContract.setAggregator(xauAsset, address(xauFeed), 1e10);
console.log("XAU MockPriceFeed:", address(xauFeed));
}
// Example: USDC - $1 per token
address usdcAsset = vm.envOr("USDC_ASSET", address(0x2222222222222222222222222222222222222222));
if (usdcAsset != address(0)) {
console.log("Setting up USDC price feed...");
MockPriceFeed usdcFeed = new MockPriceFeed(1 * 1e8, 8);
vm.prank(admin);
priceFeedContract.setAggregator(usdcAsset, address(usdcFeed), 1e10);
console.log("USDC MockPriceFeed:", address(usdcFeed));
}
// Example: ETH - $3000 per token
address ethAsset = vm.envOr("ETH_ASSET", address(0x3333333333333333333333333333333333333333));
if (ethAsset != address(0)) {
console.log("Setting up ETH price feed...");
MockPriceFeed ethFeed = new MockPriceFeed(3000 * 1e8, 8);
vm.prank(admin);
priceFeedContract.setAggregator(ethAsset, address(ethFeed), 1e10);
console.log("ETH MockPriceFeed:", address(ethFeed));
}
console.log("");
console.log("=== Updating Price Feeds ===");
// Update all price feeds
address[] memory assets = new address[](3);
if (xauAsset != address(0)) assets[0] = xauAsset;
if (usdcAsset != address(0)) assets[1] = usdcAsset;
if (ethAsset != address(0)) assets[2] = ethAsset;
vm.prank(admin);
priceFeedContract.updateMultiplePriceFeeds(assets);
console.log("Price feeds updated successfully");
} else {
console.log("");
console.log("=== Configuring Real Chainlink Aggregators ===");
console.log("Set USE_MOCK_FEEDS=false and provide aggregator addresses");
console.log("Example environment variables:");
console.log(" XAU_AGGREGATOR=<chainlink_xau_usd_aggregator>");
console.log(" USDC_AGGREGATOR=<chainlink_usdc_usd_aggregator>");
console.log(" ETH_AGGREGATOR=<chainlink_eth_usd_aggregator>");
// Configure real aggregators if provided
address xauAggregator = vm.envOr("XAU_AGGREGATOR", address(0));
address xauAsset = vm.envOr("XAU_ASSET", address(0));
if (xauAggregator != address(0) && xauAsset != address(0)) {
vm.prank(admin);
priceFeedContract.setAggregator(xauAsset, xauAggregator, 1e10);
console.log("XAU aggregator configured:", xauAggregator);
}
address usdcAggregator = vm.envOr("USDC_AGGREGATOR", address(0));
address usdcAsset = vm.envOr("USDC_ASSET", address(0));
if (usdcAggregator != address(0) && usdcAsset != address(0)) {
vm.prank(admin);
priceFeedContract.setAggregator(usdcAsset, usdcAggregator, 1e10);
console.log("USDC aggregator configured:", usdcAggregator);
}
address ethAggregator = vm.envOr("ETH_AGGREGATOR", address(0));
address ethAsset = vm.envOr("ETH_ASSET", address(0));
if (ethAggregator != address(0) && ethAsset != address(0)) {
vm.prank(admin);
priceFeedContract.setAggregator(ethAsset, ethAggregator, 1e10);
console.log("ETH aggregator configured:", ethAggregator);
}
}
console.log("");
console.log("=== Setup Complete ===");
console.log("OraclePriceFeed:", oraclePriceFeed);
console.log("");
console.log("=== Export to .env ===");
console.log("export ORACLE_PRICE_FEED=", vm.toString(oraclePriceFeed));
vm.stopBroadcast();
}
}