Merge branch 'main' into fix/deployless-params

Author: Foulks-Plb

packages/blue-sdk-viem/src/fetch/Position.ts

@@ -43,7 +43,7 @@ export async function fetchPreLiquidationParams(
   client: Client,
   parameters: DeploylessFetchParameters = {},
 ): Promise<PreLiquidationParams> {
-  parameters.chainId = await getChainId(client);
+  parameters.chainId ??= await getChainId(client);
   const { preLltv, preLIF1, preLIF2, preLCF1, preLCF2, preLiquidationOracle } =
     await readContract(client, {
       ...parameters,
@@ -71,8 +71,8 @@ export async function fetchAccrualPosition(
   parameters.chainId ??= await getChainId(client);
 
   const [position, market] = await Promise.all([
-    await fetchPosition(user, marketId, client, parameters),
-    await fetchMarket(marketId, client, parameters),
+    fetchPosition(user, marketId, client, parameters),
+    fetchMarket(marketId, client, parameters),
   ]);
 
   return new AccrualPosition(position, market);

packages/blue-sdk/src/addresses.ts

@@ -469,6 +469,7 @@ const _addressesRegistry = {
   },
   [ChainId.LiskMainnet]: {
     morpho: "0x00cD58DEEbd7A2F1C55dAec715faF8aed5b27BF8",
+    permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
     bundler3: {
       bundler3: "0xD96E5e02580C4EAfE15B5537b25eE3dEe5861e00",
       generalAdapter1: "0x76cFE4BF840C7b461772fE7CDE399f58c4173584",
@@ -587,6 +588,8 @@ const _addressesRegistry = {
     registryList: "0xCe93fcB2849EB886F1e81d45D2747dF803f843C3",
     chainlinkOracleFactory: "0xF24C6eAB91e43EacE18a4e893a48565C09132505",
     preLiquidationFactory: "0x741A6604e974FeAF35a5FBb1416B3e01c33e5C0e",
+
+    // There is no wrapped native token because the native token USDT0 is already an ERC20.
   },
   [ChainId.CronosMainnet]: {
     morpho: "0xDF9a1DC07e5dEe5ccCCaBeC35e446C70fAF7434e",

packages/blue-sdk/src/chain.ts

@@ -238,7 +238,7 @@ export namespace ChainUtils {
     [ChainId.StableMainnet]: {
       name: "Stable",
       id: ChainId.StableMainnet,
-      nativeCurrency: { name: "gUSDT", symbol: "gUSDT", decimals: 18 },
+      nativeCurrency: { name: "USDT0", symbol: "USDT0", decimals: 18 },
       explorerUrl: "https://stablescan.xyz",
       identifier: "stable",
     },

packages/test/package.json

@@ -27,8 +27,7 @@
   "dependencies": {
     "lodash.kebabcase": "^4.1.1",
     "viem-deal": "^2.0.3",
-    "viem-tracer": "^1.7.1",
-    "get-port": "^7.1.0"
+    "viem-tracer": "^1.7.1"
   },
   "peerDependencies": {
     "@playwright/test": "^1.48.1",

packages/test/src/anvil.ts

@@ -1,5 +1,4 @@
 import { spawn } from "node:child_process";
-import getPort from "get-port";
 import _kebabCase from "lodash.kebabcase";
 
 export interface AnvilArgs {
@@ -288,26 +287,28 @@ export const spawnAnvil = async (
   rpcUrl: `http://localhost:${number}`;
   stop: () => boolean;
 }> => {
-  const port = await getPort();
-
   let started = false;
+  let port = args.port ?? 0;
 
   const stop = await new Promise<() => boolean>((resolve, reject) => {
     const subprocess = spawn("anvil", toArgs({ ...args, port }));
 
     subprocess.stdout.on("data", (data) => {
-      const message = `[port ${port}] ${data.toString()}`;
+      const dataStr = data.toString();
+
+      const listenMatch = dataStr.match(/Listening on 127.0.0.1:(\d+)/);
+      if (listenMatch) port = Number.parseInt(listenMatch[1]);
 
-      // console.debug(message);
+      // console.debug(`[port ${port || "??"}] ${dataStr}`);
 
-      if (message.includes("Listening on")) {
+      if (listenMatch) {
         started = true;
         resolve(() => subprocess.kill("SIGINT"));
       }
     });
 
     subprocess.stderr.on("data", (data) => {
-      const message = `[port ${port}] ${data.toString()}`;
+      const message = `[port ${port || "??"}] ${data.toString()}`;
 
       if (!started) reject(message);
       else console.warn(message);