feature

Author: RafalMagrys

.env.example

@@ -14,9 +14,9 @@ ALLOCATOR=<llocator_address>
 TERMINATION_ORACLE=<termination_oracle_address>
 ORACLE=<oracle_address>
 # Upgradeable contract envs
-UPGRADE_PROXY_ADDRESS_TEST=
+UPGRADE_PROXY_ADDRESS_TEST=0x2871dc22C60479cc89896EBA2bEb150130171230
 UPGRADE_PROXY_ADDRESS_CALIBNET=
 UPGRADE_PROXY_ADDRESS_MAINNET=
-UPGRADE_CONTRACT_NAME=
-UPGRADE_CALLDATA=
+UPGRADE_CONTRACT_NAME=Client
+UPGRADE_CALLDATA=0x0
 

foundry.toml

@@ -1,5 +1,11 @@
 [profile.default]
-src = "src"
+solc_version = "0.8.25"
+evm_version = "cancun"
+optimizer_runs = 200
+fs_permissions = [
+    { access = "read-write", path = "./deployments/" }
+]
+src = "src" 
 out = "out"
 libs = ["lib"]
 via_ir = true

justfile

@@ -39,7 +39,7 @@ devnet_deploy:
 
 upgrade:
 	forge clean && forge build
-	forge script script/Upgrade.s.sol:Upgrade --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast
+    forge script script/Upgrade.s.sol:Upgrade --rpc-url $RPC_TEST --private-key $PRIVATE_KEY_TEST --broadcast
 
 # CI equivalent check
 check: fmt-check lint test check-coverage build check-abis

script/Upgrade.s.sol

@@ -3,12 +3,16 @@
 pragma solidity ^0.8.25;
 
 import {Script} from "forge-std/Script.sol";
+import {DeployUtils} from "./utils/DeployUtils.sol";
+import {stdJson} from "forge-std/StdJson.sol";
 
 interface IUpgradeable {
     function upgradeToAndCall(address newImpl, bytes calldata data) external;
 }
 
-contract Upgrade is Script {
+contract Upgrade is Script, DeployUtils {
+    using stdJson for string;
+
     address internal proxy;
     string internal name;
     bytes internal cd;
@@ -18,6 +22,14 @@ contract Upgrade is Script {
         name = vm.envString("UPGRADE_CONTRACT_NAME");
         cd = vm.envOr("UPGRADE_CALLDATA", bytes(""));
 
+        string memory json = readLatestDeploymentArtifact(name);
+        (,,, bytes memory deployedCodeHash) = deserializeContract(json, name);
+        bytes32 hash = generateContractHash(name);
+
+        if (hash == abi.decode(deployedCodeHash, (bytes32))) {
+            revert("Code hash is unchanged, upgrade skipped");
+        }
+
         vm.startBroadcast(vm.envUint("PRIVATE_KEY_TEST"));
 
         address impl = vm.deployCode(string.concat(name, ".sol:", name));

script/utils/DeployUtils.sol

@@ -30,6 +30,24 @@ contract DeployUtils is Script {
         json.serialize(contractName, serialized);
     }
 
+    function readLatestDeploymentArtifact(string memory contractName) internal view returns (string memory json) {
+        json = vm.readFile(string.concat("./deployments/", network(), "/latest.json"));
+    }
+
+    function deserializeContract(string memory json, string memory contractName)
+        internal
+        returns (bytes memory proxy, bytes memory impl, bytes memory codeHash, bytes memory deployedCodeHash)
+    {
+        proxy = json.parseRaw(string.concat(".", contractName, ".proxy"));
+        impl = json.parseRaw(string.concat(".", contractName, ".impl"));
+        codeHash = json.parseRaw(string.concat(".", contractName, ".codeHash"));
+        deployedCodeHash = json.parseRaw(string.concat(".", contractName, ".deployedCodeHash"));
+    }
+
+    function generateContractHash(string memory contractName) internal view returns (bytes32 hash) {
+        hash = keccak256(vm.getDeployedCode(string.concat(contractName, ".sol:", contractName)));
+    }
+
     function network() internal view returns (string memory) {
         if (block.chainid == 31415926) return "devnet";
         else if (block.chainid == 314159) return "calibnet";