Complete archive manual merge follow-ups and secure relay env handling

Apply clean archive patches (WETH CREATE2 doc, DeployKeeper script),
restore emoney unit tests from .bak, add keeper npm scripts without
replacing the Hardhat package.json, untrack relay lane secret env files,
and document superseded patch hunks in SIBLING_WIP_IMPORT.md.
This commit is contained in:
defiQUG
2026-06-24 21:54:05 -07:00
parent a6f88f75c2
commit 2c17c7cd08
15 changed files with 1042 additions and 200 deletions
+17 -18
View File
@@ -40,33 +40,32 @@ contract DeployKeeper is Script {
address usdcAsset = vm.envOr("USDC_ASSET", address(0));
address ethAsset = vm.envOr("ETH_ASSET", address(0));
// Note: Asset tracking and role granting should be done after deployment
// via separate transactions to avoid prank issues in broadcast mode
address keeperAddress = vm.envOr("KEEPER_ADDRESS", deployer);
// Grant keeper role (admin is deployer, so we can call directly)
if (admin == deployer) {
keeper.grantRole(keeper.KEEPER_ROLE(), keeperAddress);
console.log("Keeper role granted to:", keeperAddress);
} else {
console.log("Note: Grant keeper role manually to:", keeperAddress);
}
// Note: Track assets after deployment via separate script or manual calls
if (xauAsset != address(0) || usdcAsset != address(0) || ethAsset != address(0)) {
console.log("");
console.log("Tracking assets...");
console.log("Note: Track assets after deployment:");
if (xauAsset != address(0)) {
vm.prank(admin);
keeper.trackAsset(xauAsset);
console.log("XAU tracked:", xauAsset);
console.log(" keeper.trackAsset(", xauAsset, ")");
}
if (usdcAsset != address(0)) {
vm.prank(admin);
keeper.trackAsset(usdcAsset);
console.log("USDC tracked:", usdcAsset);
console.log(" keeper.trackAsset(", usdcAsset, ")");
}
if (ethAsset != address(0)) {
vm.prank(admin);
keeper.trackAsset(ethAsset);
console.log("ETH tracked:", ethAsset);
console.log(" keeper.trackAsset(", ethAsset, ")");
}
}
// Grant keeper role to deployer (or specified keeper address)
address keeperAddress = vm.envOr("KEEPER_ADDRESS", deployer);
vm.prank(admin);
keeper.grantRole(keeper.KEEPER_ROLE(), keeperAddress);
console.log("");
console.log("Keeper role granted to:", keeperAddress);