johba/harb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: BootstrapVWAPPhase2.s.sol hardcodes .secret file dependency (#769)' (#988) from fix/issue-769 into master

Browse source
This commit is contained in:
johba 2026-03-19 02:03:37 +01:00
commit e37a93e0e2
4 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
onchain/script/BaseDeploy.sol
View file

@ -3,10 +3,14 @@ pragma solidity ^0.8.19;
import "forge-std/Script.sol";
contract BaseDeploy is Script {
function run() public view {
function run() public {
// Base data
string memory seedPhrase = vm.readFile(".secret");
uint256 privateKey = vm.deriveKey(seedPhrase, 0);
// PRIVATE_KEY=0 / empty silently falls back to .secret (0 is an invalid secp256k1 key).
uint256 privateKey = vm.envOr("PRIVATE_KEY", uint256(0));
if (privateKey == 0) {
string memory seedPhrase = vm.readFile(".secret");
privateKey = vm.deriveKey(seedPhrase, 0);
}
address sender = vm.addr(privateKey);
console.log(sender);
}

16
onchain/script/BootstrapVWAPPhase2.s.sol
View file

@ -20,6 +20,14 @@ import "forge-std/Script.sol";
*
* Usage:
* export LM_ADDRESS=<deployed LiquidityManager address>
*
* # Option A — env-var key (CI/CD):
* export PRIVATE_KEY=0x<hex-private-key>
* forge script script/BootstrapVWAPPhase2.s.sol --tc BootstrapVWAPPhase2 \
* --fork-url $BASE_RPC --broadcast
*
* # Option B — .secret seed-phrase file (local):
* echo "<seed phrase>" > .secret
* forge script script/BootstrapVWAPPhase2.s.sol --tc BootstrapVWAPPhase2 \
* --fork-url $BASE_RPC --broadcast
*/
@ -28,8 +36,12 @@ contract BootstrapVWAPPhase2 is Script {
address lmAddress = vm.envAddress("LM_ADDRESS");
LiquidityManager lm = LiquidityManager(payable(lmAddress));
string memory seedPhrase = vm.readFile(".secret");
uint256 privateKey = vm.deriveKey(seedPhrase, 0);
// PRIVATE_KEY=0 / empty silently falls back to .secret (0 is an invalid secp256k1 key).
uint256 privateKey = vm.envOr("PRIVATE_KEY", uint256(0));
if (privateKey == 0) {
string memory seedPhrase = vm.readFile(".secret");
privateKey = vm.deriveKey(seedPhrase, 0);
}
vm.startBroadcast(privateKey);
console.log("Running VWAP bootstrap phase 2 on LiquidityManager:", lmAddress);

8
onchain/script/DeployBase.sol
View file

@ -37,8 +37,12 @@ contract DeployBase is Script {
IUniswapV3Pool public pool;
function run() public {
string memory seedPhrase = vm.readFile(".secret");
uint256 privateKey = vm.deriveKey(seedPhrase, 0);
// PRIVATE_KEY=0 / empty silently falls back to .secret (0 is an invalid secp256k1 key).
uint256 privateKey = vm.envOr("PRIVATE_KEY", uint256(0));
if (privateKey == 0) {
string memory seedPhrase = vm.readFile(".secret");
privateKey = vm.deriveKey(seedPhrase, 0);
}
vm.startBroadcast(privateKey);
address sender = vm.addr(privateKey);

12
onchain/script/UpgradeOptimizer.sol
View file

@ -12,6 +12,10 @@ import "forge-std/Script.sol";
* OPTIMIZER_PROXY=0x... forge script script/UpgradeOptimizer.sol \
* --rpc-url <RPC_URL> --broadcast
*
* Key injection (checked in order):
* 1. PRIVATE_KEY env var (hex private key — for CI/CD)
* 2. .secret file (BIP-39 seed phrase — for local use)
*
* The caller must be the proxy admin (the address that called initialize()).
*/
contract UpgradeOptimizer is Script {
@ -19,8 +23,12 @@ contract UpgradeOptimizer is Script {
address proxyAddress = vm.envAddress("OPTIMIZER_PROXY");
require(proxyAddress != address(0), "OPTIMIZER_PROXY env var required");
string memory seedPhrase = vm.readFile(".secret");
uint256 privateKey = vm.deriveKey(seedPhrase, 0);
// PRIVATE_KEY=0 / empty silently falls back to .secret (0 is an invalid secp256k1 key).
uint256 privateKey = vm.envOr("PRIVATE_KEY", uint256(0));
if (privateKey == 0) {
string memory seedPhrase = vm.readFile(".secret");
privateKey = vm.deriveKey(seedPhrase, 0);
}
vm.startBroadcast(privateKey);
address sender = vm.addr(privateKey);