Fly 2075/add tests and tasks in foundry

.prettierignore

@@ -7,3 +7,5 @@ node_modules
 errorCodes.json
 coverage/
 coverage.json
+out/
+forge-cache/

eslint.config.mjs

@@ -14,6 +14,9 @@ export default [
       "artifacts/*",
       "cache/*",
       "coverage/*",
+      "broadcast/*",
+      "out/*",
+      "forge-cache/*",
     ],
   },
   pluginJs.configs.recommended,

forge-scripts/HelperConfig.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import {Script} from "forge-std/Script.sol";
+import {Script} from "lib/forge-std/src/Script.sol";
 import {BridgeMock} from "../contracts/test-contracts/BridgeMock.sol";
 
 contract HelperConfig is Script {

forge-scripts/ChangeOwnerToMultiSig.s.sol → forge-scripts/deployment/ChangeOwnerToMultiSig.s.sol

@@ -29,10 +29,10 @@ pragma solidity 0.8.25;
  * @author Generated for Liquidity Bridge Contract
  */
 
-import {Script, console} from "forge-std/Script.sol";
-import {HelperConfig} from "./HelperConfig.s.sol";
-import {LiquidityBridgeContractV2} from "../contracts/legacy/LiquidityBridgeContractV2.sol";
-import {LiquidityBridgeContractAdmin} from "../contracts/legacy/LiquidityBridgeContractAdmin.sol";
+import {Script, console} from "lib/forge-std/src/Script.sol";
+import {HelperConfig} from "../../forge-scripts/HelperConfig.s.sol";
+import {LiquidityBridgeContractV2} from "../../contracts/legacy/LiquidityBridgeContractV2.sol";
+import {LiquidityBridgeContractAdmin} from "../../contracts/legacy/LiquidityBridgeContractAdmin.sol";
 import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 interface IGnosisSafe {

forge-scripts/DeployLBC.s.sol → forge-scripts/deployment/DeployLBC.s.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import {Script, console} from "forge-std/Script.sol";
+import {Script, console} from "lib/forge-std/src/Script.sol";
 
-import {HelperConfig} from "./HelperConfig.s.sol";
+import {HelperConfig} from "../HelperConfig.s.sol";
 
-import {LiquidityBridgeContract} from "../contracts/legacy/LiquidityBridgeContract.sol";
-import {LiquidityBridgeContractProxy} from "../contracts/legacy/LiquidityBridgeContractProxy.sol";
-import {LiquidityBridgeContractAdmin} from "../contracts/legacy/LiquidityBridgeContractAdmin.sol";
+import {LiquidityBridgeContract} from "../../contracts/legacy/LiquidityBridgeContract.sol";
+import {LiquidityBridgeContractProxy} from "../../contracts/legacy/LiquidityBridgeContractProxy.sol";
+import {LiquidityBridgeContractAdmin} from "../../contracts/legacy/LiquidityBridgeContractAdmin.sol";
 
 contract DeployLBC is Script {
     function run() external {

forge-scripts/deployment/PrepareUpgrade.s.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.25;
+
+import {Script, console} from "lib/forge-std/src/Script.sol";
+
+import {HelperConfig} from "../HelperConfig.s.sol";
+import {LiquidityBridgeContractV2} from "../../contracts/legacy/LiquidityBridgeContractV2.sol";
+
+/**
+ * @title PrepareUpgrade
+ * @notice Deploys the V2 implementation WITHOUT upgrading the proxy
+ * @dev This allows for a two-step upgrade process:
+ *      1. Deploy and verify the implementation (this script)
+ *      2. Perform the actual upgrade (UpgradeLBC script)
+ *
+ * Usage:
+ *   make prepare-upgrade NETWORK=testnet
+ */
+contract PrepareUpgrade is Script {
+    function run() external {
+        HelperConfig helper = new HelperConfig();
+
+        uint256 deployerKey = helper.getDeployerPrivateKey();
+        vm.rememberKey(deployerKey);
+
+        vm.startBroadcast(deployerKey);
+
+        console.log(
+            "=== Deploying LiquidityBridgeContractV2 implementation ==="
+        );
+
+        // Deploy new V2 implementation (libraries are linked via command line)
+        LiquidityBridgeContractV2 newImplementation = new LiquidityBridgeContractV2();
+
+        console.log("IMPLEMENTATION ADDRESS:", address(newImplementation));
+        console.log("");
+        console.log("Next step:");
+        console.log(
+            "Run the upgrade script: make upgrade-lbc NETWORK=<network>"
+        );
+
+        vm.stopBroadcast();
+    }
+}

forge-scripts/deployment/UpgradeLBC.s.sol

@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.25;
+
+import {Script, console} from "lib/forge-std/src/Script.sol";
+
+import {HelperConfig} from "../HelperConfig.s.sol";
+
+import {LiquidityBridgeContractV2} from "../../contracts/legacy/LiquidityBridgeContractV2.sol";
+import {LiquidityBridgeContractAdmin} from "../../contracts/legacy/LiquidityBridgeContractAdmin.sol";
+import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+
+/**
+ * @title UpgradeLBC
+ * @notice Upgrades the LiquidityBridgeContract proxy to V2
+ * @dev Supports two workflows:
+ *      1. Deploy implementation and upgrade in one transaction (default)
+ *      2. Upgrade to a pre-deployed implementation (set IMPLEMENTATION_ADDRESS env var)
+ *
+ * Usage:
+ *   # Deploy + Upgrade:
+ *   make upgrade-lbc NETWORK=testnet
+ *
+ *   # Upgrade to existing implementation:
+ *   IMPLEMENTATION_ADDRESS=0x... make upgrade-lbc NETWORK=testnet
+ */
+contract UpgradeLBC is Script {
+    function run() external {
+        HelperConfig helper = new HelperConfig();
+        HelperConfig.NetworkConfig memory cfg = helper.getConfig();
+
+        uint256 deployerKey = helper.getDeployerPrivateKey();
+        vm.rememberKey(deployerKey);
+
+        // Get the existing proxy and admin addresses from environment or config
+        address proxyAddress = cfg.existingProxy;
+        address wrapperAddress = cfg.existingAdmin;
+
+        require(proxyAddress != address(0), "Proxy address must be provided");
+        require(
+            wrapperAddress != address(0),
+            "Admin wrapper address must be provided"
+        );
+
+        vm.startBroadcast(deployerKey);
+
+        // Check if we should use a pre-deployed implementation
+        address implementationAddress;
+        try vm.envAddress("IMPLEMENTATION_ADDRESS") returns (address addr) {
+            implementationAddress = addr;
+            console.log("=== Using pre-deployed implementation ===");
+            console.log("Implementation address:", implementationAddress);
+        } catch {
+            console.log("=== Deploying new implementation ===");
+            // Deploy new V2 implementation (libraries are linked via command line)
+            LiquidityBridgeContractV2 newImplementation = new LiquidityBridgeContractV2();
+            implementationAddress = address(newImplementation);
+            console.log(
+                "LiquidityBridgeContractV2 implementation:",
+                implementationAddress
+            );
+        }
+
+        // Get the actual ProxyAdmin address from the proxy
+        address proxyAdminAddress = address(
+            uint160(
+                uint256(
+                    vm.load(
+                        proxyAddress,
+                        bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1)
+                    )
+                )
+            )
+        );
+        console.log("ProxyAdmin address:", proxyAdminAddress);
+
+        // Get the ProxyAdmin contract instance
+        LiquidityBridgeContractAdmin admin = LiquidityBridgeContractAdmin(
+            proxyAdminAddress
+        );
+
+        // Get the owner of the ProxyAdmin (should be the wrapper)
+        address adminOwner = admin.owner();
+        console.log("ProxyAdmin owner:", adminOwner);
+
+        vm.stopBroadcast();
+
+        // Impersonate the ProxyAdmin owner to call upgradeAndCall
+        // This works in simulation/fork mode for testing
+        vm.startPrank(adminOwner);
+
+        // Upgrade the proxy to point to the new implementation
+        // Note: Pass empty bytes - no initialization needed on upgrade (initializeV2 can only be called once)
+        admin.upgradeAndCall(
+            ITransparentUpgradeableProxy(proxyAddress),
+            implementationAddress,
+            ""
+        );
+
+        vm.stopPrank();
+
+        console.log("Proxy upgraded successfully");
+        console.log("Proxy address:", proxyAddress);
+        console.log("New implementation:", implementationAddress);
+
+        // Verify the upgrade by checking the version
+        LiquidityBridgeContractV2 upgradedContract = LiquidityBridgeContractV2(
+            payable(proxyAddress)
+        );
+        console.log(
+            "Contract version after upgrade:",
+            upgradedContract.version()
+        );
+    }
+}

forge-scripts/helpers/BtcAddressParser.sol

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.25;
+
+import {Vm} from "lib/forge-std/src/Vm.sol";
+
+library BtcAddressParserLib {
+    string constant HELPER_SCRIPT_BTC_ADDRESS =
+        "forge-scripts/helpers/parse-btc-address.ts";
+
+    function parseBtcAddress(
+        Vm vm,
+        string memory btcAddress
+    ) internal returns (bytes memory) {
+        string[] memory inputs = new string[](4);
+        inputs[0] = "npx";
+        inputs[1] = "ts-node";
+        inputs[2] = HELPER_SCRIPT_BTC_ADDRESS;
+        inputs[3] = btcAddress;
+
+        bytes memory result = vm.ffi(inputs);
+        return result;
+    }
+
+    function parseFedBtcAddress(
+        Vm vm,
+        string memory btcAddress
+    ) internal returns (bytes20) {
+        bytes memory decoded = parseBtcAddress(vm, btcAddress);
+        require(decoded.length >= 21, "Invalid fedBtcAddress length");
+
+        bytes memory sliced = new bytes(20);
+        for (uint i = 0; i < 20; i++) {
+            sliced[i] = decoded[i + 1];
+        }
+
+        return bytes20(sliced);
+    }
+}
+
+abstract contract BtcAddressParser {
+    function _getVm() internal pure returns (Vm) {
+        return Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
+    }
+
+    function parseBtcAddress(
+        string memory btcAddress
+    ) internal returns (bytes memory) {
+        return BtcAddressParserLib.parseBtcAddress(_getVm(), btcAddress);
+    }
+
+    function parseFedBtcAddress(
+        string memory btcAddress
+    ) internal returns (bytes20) {
+        return BtcAddressParserLib.parseFedBtcAddress(_getVm(), btcAddress);
+    }
+}