env and justfile fixes

Author: RafalMagrys

.env.example

@@ -12,10 +12,11 @@ FILECOIN_PAY=<filecoin_pay_address>
 ALLOCATOR=<llocator_address>
 TERMINATION_ORACLE=<termination_oracle_address>
 ORACLE=<oracle_address>
+
 # Upgradeable contract envs
 UPGRADE_PROXY_ADDRESS_TEST=0x2871dc22C60479cc89896EBA2bEb150130171230
 UPGRADE_PROXY_ADDRESS_CALIBNET=
 UPGRADE_PROXY_ADDRESS_MAINNET=
 UPGRADE_CONTRACT_NAME=Client
-UPGRADE_CALLDATA=0x0
+UPGRADE_CALLDATA=0x
 

justfile

@@ -33,21 +33,27 @@ coverage:
 check-coverage:
     ./ci/check-full-coverage.sh
 
+deploy flags='':
+    forge script script/Deploy.s.sol:Deploy --gas-estimate-multiplier 100000 --disable-block-gas-limit -vvvv --broadcast --rpc-url $RPC_URL --private-key $PRIVATE_KEY {{flags}}
+
+upgrade flags='':
+    forge script script/Upgrade.s.sol:Upgrade --gas-estimate-multiplier 100000 --disable-block-gas-limit -vvvv --broadcast --rpc-url $RPC_URL --private-key $PRIVATE_KEY {{flags}}
+
 devnet_deploy:
 	forge clean && forge build
-	forge script script/Deploy.s.sol --gas-estimate-multiplier 100000 --disable-block-gas-limit -vvvv --broadcast --rpc-url $RPC_TEST --private-key $PRIVATE_KEY_TEST
+	RPC_URL=$RPC_TEST PRIVATE_KEY=$PRIVATE_KEY_TEST just deploy 
+
+calibnet_deploy:
+    # forge clean && forge build
+    RPC_URL=$RPC_CALIBNET PRIVATE_KEY=$PRIVATE_KEY_CALIBNET just deploy --slow
 
 devnet_upgrade:
 	forge clean && forge build
-	forge script script/Upgrade.s.sol:Upgrade --gas-estimate-multiplier 100000 --disable-block-gas-limit -vvvv --broadcast --rpc-url $RPC_TEST --private-key $PRIVATE_KEY_TEST
-
-calibnet_deploy:
-    forge clean && forge build
-    forge script script/Deploy.s.sol --gas-estimate-multiplier 100000 --disable-block-gas-limit -vvvv --broadcast --slow --rpc-url $RPC_CALIBNET --private-key $PRIVATE_KEY_CALIBNET
+	RPC_URL=$RPC_TEST PRIVATE_KEY=$PRIVATE_KEY_TEST PROXY_ADDRESS=$UPGRADE_PROXY_ADDRESS_TEST just upgrade
 
 calibnet_upgrade:
 	forge clean && forge build
-	forge script script/Upgrade.s.sol:Upgrade --gas-estimate-multiplier 100000 --disable-block-gas-limit -vvvv --broadcast --rpc-url $RPC_CALIBNET --private-key $PRIVATE_KEY_CALIBNET
+	RPC_URL=$RPC_CALIBNET PRIVATE_KEY=$PRIVATE_KEY_CALIBNET PROXY_ADDRESS=$UPGRADE_PROXY_ADDRESS_CALIBNET just upgrade --slow
 
 # CI equivalent check
 check: fmt-check lint test check-coverage build check-abis

script/Deploy.s.sol

@@ -45,15 +45,15 @@ contract Deploy is Script, DeployUtils {
     error InvalidEnv();
 
     function run() external {
-        admin = vm.addr(vm.envUint("PRIVATE_KEY_TEST"));
+        admin = vm.addr(vm.envUint("PRIVATE_KEY"));
         allocator = vm.envAddress("ALLOCATOR");
         terminationOracle = vm.envAddress("TERMINATION_ORACLE");
         filecoinPay = vm.envAddress("FILECOIN_PAY");
         oracleAddress = vm.envAddress("ORACLE");
         poRepService = vm.envAddress("POREP_SERVICE");
         operatorAddress = vm.envOr("OPERATOR_ADDR", address(0));
 
-        vm.startBroadcast(vm.envUint("PRIVATE_KEY_TEST"));
+        vm.startBroadcast(admin);
 
         (validatorFactory, validatorFactoryImpl, validatorImpl) = _deployValidatorFactory(admin);
         (poRepMarket, poRepMarketImpl) = _deployPoRepMarket(admin, validatorFactory, spRegistry);

script/Upgrade.s.sol

@@ -13,6 +13,7 @@ interface IUpgradeable {
 contract Upgrade is Script, DeployUtils {
     using stdJson for string;
 
+    address internal admin;
     address internal proxy;
     address internal prevImpl;
     address internal impl;
@@ -23,7 +24,8 @@ contract Upgrade is Script, DeployUtils {
     error ContractAlreadyDeployed();
 
     function run() external {
-        proxy = vm.envAddress("UPGRADE_PROXY_ADDRESS_TEST");
+        admin = vm.addr(vm.envUint("PRIVATE_KEY"));
+        proxy = vm.envAddress("PROXY_ADDRESS");
         name = vm.envString("UPGRADE_CONTRACT_NAME");
         cd = vm.envOr("UPGRADE_CALLDATA", bytes(""));
 
@@ -35,7 +37,7 @@ contract Upgrade is Script, DeployUtils {
             revert ContractAlreadyDeployed();
         }
 
-        vm.startBroadcast(vm.envUint("PRIVATE_KEY_TEST"));
+        vm.startBroadcast(admin);
 
         impl = vm.deployCode(string.concat(name, ".sol:", name));
         IUpgradeable(proxy).upgradeToAndCall(impl, cd);