Merge branch 'main' into feat/etherlink - keeping both Etherlink and new chains (TAC, Lisk)

Author: Getty Hill

.github/workflows/test.yml

@@ -20,16 +20,16 @@ jobs:
           node-version-file: .nvmrc
           cache: pnpm
 
-      # - name: Restore Foundry cache
-      #   uses: actions/cache/restore@v3
-      #   with:
-      #     path: ~/.foundry/cache/rpc
-      #     key: ${{ runner.os }}-foundry-chain-fork-${{ github.job }}-${{ github.sha }}
-      #     restore-keys: ${{ runner.os }}-foundry-chain-fork-${{ github.job }}-
+      - name: Restore Foundry cache
+        uses: actions/cache/restore@v4
+        with:
+          path: ~/.foundry/cache/rpc
+          key: foundry-${{ github.job }}-${{ github.sha }}
+          restore-keys: foundry-${{ github.job }}-
 
       - uses: foundry-rs/foundry-toolchain@v1
         with:
-          cache: false
+          cache: false # Disable built-in cache to always save it.
 
       - run: pnpm install --frozen-lockfile
 
@@ -40,7 +40,7 @@ jobs:
 
       - name: Save Foundry cache
         if: always()
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: ~/.foundry/cache/rpc
-          key: ${{ runner.os }}-foundry-chain-fork-${{ github.job }}-${{ github.sha }}
+          key: foundry-${{ github.job }}-${{ github.sha }}

packages/blue-sdk/src/addresses.ts

@@ -412,6 +412,36 @@ const _addressesRegistry = {
 
     wNative: "0xc9B53AB2679f573e480d01e0f49e2B5CFB7a3EAb",
   },
+  [ChainId.TacMainnet]: {
+    morpho: "0x918B9F2E4B44E20c6423105BB6cCEB71473aD35c",
+    bundler3: {
+      bundler3: "0x84b189823D0f84c36728Bb3335dD8C833564e72f",
+      generalAdapter1: "0x6D94E7dCA6d8FAE2CF954633C2Cf9c286258E0af",
+    },
+    adaptiveCurveIrm: "0x7E82b16496fA8CC04935528dA7F5A2C684A3C7A3",
+    publicAllocator: "0x414247afcf1fE3b94C617e7E3A7adB81D8D3208F",
+    metaMorphoFactory: "0xcDA78f4979d17Ec93052A84A12001fe0088AD734",
+    chainlinkOracleFactory: "0xbf10eD52dD60C60E901BF022c3675303ad4a56b1",
+    preLiquidationFactory: "0x5851C1e423A2F93aFb821834a63cA052D19ae4Ef",
+
+    wNative: "0xB63B9f0eb4A6E6f191529D71d4D88cc8900Df2C9",
+  },
+  [ChainId.LiskMainnet]: {
+    morpho: "0x00cD58DEEbd7A2F1C55dAec715faF8aed5b27BF8",
+    bundler3: {
+      bundler3: "0xD96E5e02580C4EAfE15B5537b25eE3dEe5861e00",
+      generalAdapter1: "0x76cFE4BF840C7b461772fE7CDE399f58c4173584",
+    },
+    adaptiveCurveIrm: "0x5576629f21D528A8c3e06C338dDa907B94563902",
+    publicAllocator: "0xb1E5B1De2a54ab55C412B5ee1E38e46799588103",
+    metaMorphoFactory: "0x01dD876130690469F685a65C2B295A90a81BaD91",
+    chainlinkOracleFactory: "0x2eb4D17C2AAf1EA62Bf83Fb49Dd1128b14AF4D93",
+    preLiquidationFactory: "0xF2c325F26691b6556e6f66451bb38bDa37FEbaa7",
+
+    wNative: "0x4200000000000000000000000000000000000006",
+    // Must implement USDC permit version 2 (otherwise breaks permit signatures).
+    usdc: "0xF242275d3a6527d877f2c927a82D9b057609cc71",
+  },
 } as const;
 
 export type AddressLabel = DottedKeys<(typeof _addressesRegistry)[ChainId]>;
@@ -503,6 +533,12 @@ const _unwrappedTokensMapping: Record<number, Record<Address, Address>> = {
   [ChainId.EtherlinkMainnet]: {
     [_addressesRegistry[ChainId.EtherlinkMainnet].wNative]: NATIVE_ADDRESS,
   },
+  [ChainId.TacMainnet]: {
+    [_addressesRegistry[ChainId.TacMainnet].wNative]: NATIVE_ADDRESS,
+  },
+  [ChainId.LiskMainnet]: {
+    [_addressesRegistry[ChainId.LiskMainnet].wNative]: NATIVE_ADDRESS,
+  },
 };
 
 export function getUnwrappedToken(wrappedToken: Address, chainId: number) {

packages/blue-sdk/src/chain.ts

@@ -17,6 +17,8 @@ export enum ChainId {
   CampMainnet = 123420001114,
   KatanaMainnet = 747474,
   EtherlinkMainnet = 42793,
+  TacMainnet = 239,
+  LiskMainnet = 1135,
 }
 
 export interface ChainMetadata {
@@ -175,5 +177,19 @@ export namespace ChainUtils {
       explorerUrl: "https://explorer.etherlink.com",
       identifier: "etherlink",
     },
+    [ChainId.TacMainnet]: {
+      name: "TAC",
+      id: ChainId.TacMainnet,
+      nativeCurrency: { name: "TAC", symbol: "TAC", decimals: 18 },
+      explorerUrl: "https://explorer.tac.build/",
+      identifier: "tac",
+    },
+    [ChainId.LiskMainnet]: {
+      name: "Lisk",
+      id: ChainId.LiskMainnet,
+      nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+      explorerUrl: "https://blockscout.lisk.com",
+      identifier: "lisk",
+    },
   };
 }

packages/liquidation-sdk-viem/src/addresses.ts

@@ -121,6 +121,8 @@ export const midasConfigs: Record<ChainId, Record<Address, MidasConfig>> = {
   [ChainId.CampMainnet]: {},
   [ChainId.KatanaMainnet]: {},
   [ChainId.EtherlinkMainnet]: {},
+  [ChainId.TacMainnet]: {},
+  [ChainId.LiskMainnet]: {},
 };
 
 export const preLiquidationFactoryConfigs: Record<
@@ -199,4 +201,12 @@ export const preLiquidationFactoryConfigs: Record<
     address: addressesRegistry[ChainId.EtherlinkMainnet].preLiquidationFactory,
     startBlock: 21047448n,
   },
+  [ChainId.TacMainnet]: {
+    address: addressesRegistry[ChainId.TacMainnet].preLiquidationFactory,
+    startBlock: 978967n,
+  },
+  [ChainId.LiskMainnet]: {
+    address: addressesRegistry[ChainId.LiskMainnet].preLiquidationFactory,
+    startBlock: 15731595n,
+  },
 };

packages/liquidation-sdk-viem/src/thresholds.ts

@@ -4,4 +4,6 @@ import { parseEther } from "viem";
 export const collateralUsdThreshold: Record<number, bigint> = {
   [ChainId.EthMainnet]: parseEther("1000"),
   [ChainId.BaseMainnet]: parseEther("2"),
+  [ChainId.PolygonMainnet]: parseEther("2"),
+  [ChainId.ArbitrumMainnet]: parseEther("2"),
 };

packages/liquidation-sdk-viem/src/tokens/spectra.ts

@@ -8,6 +8,8 @@ export namespace Spectra {
         return "https://app.spectra.finance/api/v1/MAINNET/pools";
       case ChainId.BaseMainnet:
         return "https://app.spectra.finance/api/v1/BASE/pools";
+      case ChainId.ArbitrumMainnet:
+        return "https://app.spectra.finance/api/v1/ARBITRUM/pools";
       default:
         return undefined;
     }