Merge branch 'next' into feature/integ-1208-liquidate-all-positions-w…

…ith-bad-debt
morpho-org · Dec 18, 2024 · 108ac15 · 108ac15
2 parents af268ec + a091134
commit 108ac15
Show file tree

Hide file tree

Showing 6 changed files with 308 additions and 320 deletions.
diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json
@@ -26,7 +26,7 @@
     "@graphql-codegen/typescript": "^4.1.2",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/morpho-ts": "workspace:^",
-    "graphql": "^16.9.0",
+    "graphql": "^16.10.0",
     "typescript": "^5.7.2"
   },
   "publishConfig": {

diff --git a/packages/bundler-sdk-viem/src/types/actions.ts b/packages/bundler-sdk-viem/src/types/actions.ts
@@ -3,7 +3,7 @@ import type {
   Chain,
   Client,
   Hex,
-  SendTransactionRequest,
+  TransactionRequest,
   Transport,
 } from "viem";
 
@@ -250,7 +250,7 @@ export type Requirements = {
   [T in TransactionRequirementType]: {
     type: T;
     args: TransactionRequirementArgs[T];
-    tx: SendTransactionRequest;
+    tx: TransactionRequest & { to: Address; data: Hex };
   };
 };
 
@@ -273,5 +273,5 @@ export interface ActionBundle {
     signatures: SignatureRequirement[];
     txs: TransactionRequirement[];
   };
-  tx: () => SendTransactionRequest;
+  tx: () => TransactionRequest & { to: Address; data: Hex };
 }
diff --git a/packages/liquidation-sdk-viem/package.json b/packages/liquidation-sdk-viem/package.json
@@ -20,24 +20,24 @@
   },
   "dependencies": {
     "@paraswap/sdk": "^7.0.0",
-    "executooor-viem": "^1.3.3",
-    "graphql": "^16.9.0",
-    "graphql-request": "^6.1.0",
-    "graphql-tag": "2.11.0"
+    "executooor-viem": "^1.3.3"
   },
   "peerDependencies": {
     "@morpho-org/blue-api-sdk": "workspace:^",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/morpho-ts": "workspace:^",
     "evm-maths": "^7.0.0",
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
+    "graphql-request": "^6.1.0",
+    "graphql-tag": "^2.12.6",
     "viem": "^2.0.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.3",
     "@graphql-codegen/import-types-preset": "^3.0.0",
     "@graphql-codegen/typescript": "^4.1.2",
     "@graphql-codegen/typescript-graphql-request": "^6.2.0",
-    "@graphql-codegen/typescript-operations": "^4.3.1",
+    "@graphql-codegen/typescript-operations": "^4.4.0",
     "@morpho-org/blue-api-sdk": "workspace:^",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/blue-sdk-viem": "workspace:^",
@@ -49,6 +49,7 @@
     "evm-maths": "^7.0.1",
     "executooor-viem": "^1.3.3",
     "fetch-mock": "^11.1.5",
+    "graphql": "^16.10.0",
     "hardhat": "^2.22.17",
     "nock": "beta",
     "typescript": "^5.7.2",

diff --git a/packages/liquidity-sdk-ethers/package.json b/packages/liquidity-sdk-ethers/package.json
@@ -17,26 +17,24 @@
     "build": "tsc --build tsconfig.build.json",
     "codegen": "graphql-codegen --config codegen.ts"
   },
-  "dependencies": {
-    "dataloader": "^2.2.3",
-    "graphql": "^16.9.0",
-    "graphql-request": "^6.1.0",
-    "graphql-tag": "2.11.0"
-  },
   "peerDependencies": {
     "@morpho-org/blue-api-sdk": "workspace:^",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/blue-sdk-ethers": "workspace:^",
     "@morpho-org/morpho-ts": "workspace:^",
     "@morpho-org/simulation-sdk": "workspace:^",
-    "ethers": "^6.0.0"
+    "dataloader": "^2.2.3",
+    "ethers": "^6.0.0",
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
+    "graphql-request": "^6.1.0",
+    "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.3",
     "@graphql-codegen/import-types-preset": "^3.0.0",
     "@graphql-codegen/typescript": "^4.1.2",
     "@graphql-codegen/typescript-graphql-request": "^6.2.0",
-    "@graphql-codegen/typescript-operations": "^4.3.1",
+    "@graphql-codegen/typescript-operations": "^4.4.0",
     "@morpho-org/blue-api-sdk": "workspace:^",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/blue-sdk-ethers": "workspace:^",
@@ -45,6 +43,7 @@
     "@morpho-org/simulation-sdk": "workspace:^",
     "@morpho-org/test": "workspace:^",
     "@types/node": "^22.10.1",
+    "graphql": "^16.10.0",
     "nock": "beta",
     "typescript": "^5.7.2",
     "ethers": "^6.0.0",

diff --git a/packages/liquidity-sdk-viem/package.json b/packages/liquidity-sdk-viem/package.json
@@ -17,26 +17,24 @@
     "build": "tsc --build tsconfig.build.json",
     "codegen": "graphql-codegen --config codegen.ts"
   },
-  "dependencies": {
-    "dataloader": "^2.2.3",
-    "graphql": "^16.9.0",
-    "graphql-request": "^6.1.0",
-    "graphql-tag": "2.11.0"
-  },
   "peerDependencies": {
     "@morpho-org/blue-api-sdk": "workspace:^",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/blue-sdk-viem": "workspace:^",
     "@morpho-org/morpho-ts": "workspace:^",
     "@morpho-org/simulation-sdk": "workspace:^",
+    "dataloader": "^2.2.3",
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
+    "graphql-request": "^6.1.0",
+    "graphql-tag": "^2.12.6",
     "viem": "^2.0.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.3",
     "@graphql-codegen/import-types-preset": "^3.0.0",
     "@graphql-codegen/typescript": "^4.1.2",
     "@graphql-codegen/typescript-graphql-request": "^6.2.0",
-    "@graphql-codegen/typescript-operations": "^4.3.1",
+    "@graphql-codegen/typescript-operations": "^4.4.0",
     "@morpho-org/blue-api-sdk": "workspace:^",
     "@morpho-org/blue-sdk": "workspace:^",
     "@morpho-org/blue-sdk-viem": "workspace:^",
@@ -45,6 +43,7 @@
     "@morpho-org/simulation-sdk": "workspace:^",
     "@morpho-org/test": "workspace:^",
     "@types/node": "^22.10.1",
+    "graphql": "^16.10.0",
     "nock": "beta",
     "typescript": "^5.7.2",
     "viem": "^2.21.54",