Merge branch 'main' into feature/dvxsdk-65-add-sdk-stable-support

Author: Foulks-Plb

package.json

@@ -42,7 +42,7 @@
     "lint-staged": "^15.4.3",
     "semver": "^7.7.1",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.39.0",
     "vitest": "^3.0.5"
   },
   "lint-staged": {

packages/blue-sdk-viem/package.json

@@ -30,7 +30,7 @@
     "@morpho-org/test": "workspace:^",
     "hardhat": "^2.22.18",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.39.0",
     "vitest": "^3.0.5"
   },
   "publishConfig": {

packages/blue-sdk-wagmi/package.json

@@ -43,7 +43,7 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.39.0",
     "vitest": "^3.0.5",
     "wagmi": "^2.14.10"
   },

packages/blue-sdk/package.json

@@ -32,7 +32,7 @@
     "@morpho-org/morpho-ts": "workspace:^",
     "@morpho-org/test": "workspace:^",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.39.0",
     "vitest": "^3.0.5"
   },
   "publishConfig": {

packages/blue-sdk/test/e2e/Market.test.ts

@@ -129,7 +129,7 @@ describe("Market", () => {
         sender:    0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 
       Docs: https://viem.sh/docs/contract/writeContract
-      Version: viem@2.33.3]
+      Version: viem@2.39.0]
     `);
 
     const hash = await client.writeContract({

packages/bundler-sdk-viem/package.json

@@ -40,7 +40,7 @@
     "@types/lodash": "^4.17.12",
     "lodash": "^4.17.21",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.39.0",
     "vitest": "^3.0.5"
   },
   "publishConfig": {

packages/bundler-sdk-viem/src/actions.ts

@@ -607,7 +607,9 @@ export const encodeOperation = (
       actions.push({
         type: "morphoSupply",
         args: [
-          market.params,
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(market.params),
           assets,
           shares,
           maxSharePrice,
@@ -644,7 +646,9 @@ export const encodeOperation = (
       actions.push({
         type: "morphoWithdraw",
         args: [
-          market.params,
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(market.params),
           assets,
           shares,
           minSharePrice,
@@ -682,7 +686,9 @@ export const encodeOperation = (
       actions.push({
         type: "morphoBorrow",
         args: [
-          market.params,
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(market.params),
           assets,
           shares,
           minSharePrice,
@@ -723,7 +729,9 @@ export const encodeOperation = (
       actions.push({
         type: "morphoRepay",
         args: [
-          market.params,
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(market.params),
           assets,
           shares,
           maxSharePrice,
@@ -761,7 +769,9 @@ export const encodeOperation = (
       actions.push({
         type: "morphoSupplyCollateral",
         args: [
-          params,
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(params),
           assets,
           onBehalf,
           callbackBundle?.actions ?? [],
@@ -778,7 +788,14 @@ export const encodeOperation = (
 
       actions.push({
         type: "morphoWithdrawCollateral",
-        args: [params, assets, receiver, operation.skipRevert],
+        args: [
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(params),
+          assets,
+          receiver,
+          operation.skipRevert,
+        ],
       });
 
       break;
@@ -906,10 +923,14 @@ export const encodeOperation = (
           operation.address,
           fee,
           withdrawals.map(({ id, assets }) => ({
-            marketParams: dataBefore.getMarket(id).params,
+            // Avoid passing the reference of a revokable proxy that would fail
+            // accessing its underlying value after revocation.
+            marketParams: getCurrent(dataBefore.getMarket(id).params),
             amount: assets,
           })),
-          dataBefore.getMarket(supplyMarketId).params,
+          // Avoid passing the reference of a revokable proxy that would fail
+          // accessing its underlying value after revocation.
+          getCurrent(dataBefore.getMarket(supplyMarketId).params),
           operation.skipRevert,
         ],
       });

packages/bundler-sdk-viem/test/helpers.ts

@@ -116,6 +116,33 @@ export const setupTestBundle = async <chain extends Chain = Chain>(
   );
   const users = new Set(keys(startData.users).filter(isDefined));
 
+  const { morpho, permit2, bundler3 } = getChainAddresses(startData.chainId);
+  const bundler3Adapters = values(bundler3).filter(isDefined);
+  const balancesBefore = new Map(
+    await Promise.all(
+      [...tokens].map(
+        async (token) =>
+          [
+            token,
+            new Map(
+              await Promise.all(
+                bundler3Adapters.map(
+                  async (adapter) =>
+                    [
+                      adapter,
+                      await client.balanceOf({
+                        erc20: token,
+                        owner: adapter,
+                      }),
+                    ] as const,
+                ),
+              ),
+            ),
+          ] as const,
+      ),
+    ),
+  );
+
   await onBundleTx?.(startData);
 
   await bundle.requirements.sign(client, account);
@@ -127,17 +154,14 @@ export const setupTestBundle = async <chain extends Chain = Chain>(
     );
   }
 
-  const { morpho, permit2, bundler3 } = getChainAddresses(startData.chainId);
-
-  const bundler3Adapters = values(bundler3).filter(isDefined);
-
   await Promise.all(
     [...tokens].map(async (token) => {
       const [balances, allowances, authorizations] = await Promise.all([
         Promise.all(
           bundler3Adapters.map(async (adapter) => ({
             adapter,
             balance: await client.balanceOf({ erc20: token, owner: adapter }),
+            balanceBefore: balancesBefore.get(token)!.get(adapter)!,
           })),
         ),
         Promise.all(
@@ -180,11 +204,11 @@ export const setupTestBundle = async <chain extends Chain = Chain>(
         ),
       ]);
 
-      for (const { balance, adapter } of balances)
+      for (const { balance, balanceBefore, adapter } of balances)
         expect(
           balance,
           `balance of "${adapter}" for token "${token}"`,
-        ).toBeLessThanOrEqual(5n);
+        ).toBeLessThanOrEqual(balanceBefore + 5n);
 
       for (const { adapter, erc20Allowance, permit2Allowance } of allowances) {
         if (token !== NATIVE_ADDRESS && adapter !== bundler3.generalAdapter1)