chore: merging conflicts when rebasing from main

Author: smol-ninja

.github/workflows/ci-deep.yml

@@ -76,15 +76,7 @@ jobs:
 
   notify-on-failure:
     if: failure()
-    needs:
-      [
-        "lint",
-        "build",
-        "test-unit",
-        "test-integration",
-        "test-invariant",
-        "test-fork",
-      ]
+    needs: ["check", "build", "test-unit", "test-integration", "test-invariant", "test-fork"]
     runs-on: "ubuntu-latest"
     steps:
       - name: "Send Slack notification"

.github/workflows/ci-multibuild.yml

@@ -16,6 +16,7 @@ jobs:
         uses: "oven-sh/setup-bun@v2"
         with:
           bun-version: "latest"
+
       - name: "Install the Node.js dependencies"
         run: "bun install --frozen-lockfile"
 

CONTRIBUTING.md

@@ -92,8 +92,8 @@ populate it with the appropriate environment values. You need to provide your mn
 To make CI work in your pull request, ensure that the necessary environment variables are configured in your forked
 repository's secrets. Please add the following variable in your GitHub Secrets:
 
-- `API_KEY_INFURA`: sign up on [Infura](https://infura.io/)
-- `MAINNET_RPC_URL`: sign up on [Alchemy](https://alchemy.com/)
+- MAINNET_RPC_URL
+- ROUTEMESH_API_KEY
 
 ## Integration with VSCode
 

scripts/solidity/Init.s.sol

@@ -10,6 +10,7 @@ import { ISablierLockup } from "../../src/interfaces/ISablierLockup.sol";
 import { Lockup } from "../../src/types/Lockup.sol";
 import { LockupDynamic } from "../../src/types/LockupDynamic.sol";
 import { LockupLinear } from "../../src/types/LockupLinear.sol";
+import { LockupTranched } from "../../src/types/LockupTranched.sol";
 
 interface IERC20Mint {
     function mint(address beneficiary, uint256 value) external;
@@ -100,12 +101,11 @@ contract Init is BaseScript {
             Lockup.CreateWithDurations({
                 sender: sender,
                 recipient: recipient,
-                totalAmount: 2.5e18,
+                depositAmount: 2.5e18,
                 token: token,
                 cancelable: true,
                 transferable: true,
-                shape: "Two Tranches",
-                broker: Broker(address(0), ud60x18(0))
+                shape: "Two Tranches"
             }),
             tranches
         );

scripts/solidity/LockupNFTDescriptorAddresses.sol

@@ -34,7 +34,6 @@ abstract contract LockupNFTDescriptorAddresses {
         if (chainId == ChainId.SONIC) return 0x955dC7A2170782344FA9Ac11De0C0C42C05De2Fc;
         if (chainId == ChainId.SOPHON) return 0xAc2E42b520364940c90Ce164412Ca9BA212d014B;
         if (chainId == ChainId.SUPERSEED) return 0xa4576b58Ec760A8282D081dc94F3dc716DFc61e9;
-        // if (chainId == ChainId.TANGLE) return 0x92FC05e49c27884d554D98a5C01Ff0894a9DC29a;
         if (chainId == ChainId.UNICHAIN) return 0xa5F12D63E18a28C9BE27B6f3d91ce693320067ba;
         if (chainId == ChainId.XDC) return 0x4c1311a9d88BFb7023148aB04F7321C2E91c29bf;
         if (chainId == ChainId.ZKSYNC) return 0x955dC7A2170782344FA9Ac11De0C0C42C05De2Fc;