Merge pull request #32 from akanoce/fix-aave-comntract-imports

chore: fix aave imports for contract helpers
akanoce · Jan 21, 2024 · c502908 · c502908
2 parents f2c0fa1 + f4f38a3
commit c502908
Show file tree

Hide file tree

Showing 10 changed files with 92 additions and 92 deletions.
diff --git a/apps/web/src/api/aave/data.ts b/apps/web/src/api/aave/data.ts
@@ -5,7 +5,7 @@ import {
  UiIncentiveDataProvider,
  UiPoolDataProvider,
  UserReserveDataHumanized
-} from '@aave/aave-utilities/packages/contract-helpers';
+} from '@aave/aave-utilities';
 import {
  FormatReserveUSDResponse,
  FormatUserSummaryResponse,

diff --git a/apps/web/src/api/aave/utils.ts b/apps/web/src/api/aave/utils.ts
@@ -4,7 +4,7 @@ import {
  BaseDebtToken,
  ERC20Service,
  ApproveDelegationType
-} from '@aave/aave-utilities/packages/contract-helpers';
+} from '@aave/aave-utilities';
 import {
  LPBorrowParamsType,
  LPRepayParamsType,

diff --git a/apps/web/src/api/index.ts b/apps/web/src/api/index.ts
@@ -1,5 +1,5 @@
 import { BigNumber } from 'ethers';
-import { EthereumTransactionTypeExtended } from '@aave/aave-utilities/packages/contract-helpers';
+import { EthereumTransactionTypeExtended } from '@aave/aave-utilities';
 import { WalletClient } from 'viem';
 import { PublicClient } from 'wagmi';
 

diff --git a/apps/web/src/components/BorrowUnderlyingAssetButton.tsx b/apps/web/src/components/BorrowUnderlyingAssetButton.tsx
@@ -16,7 +16,7 @@ import {
  PopoverTrigger,
  Portal
 } from '@chakra-ui/react';
-import { ReserveDataHumanized } from '@aave/aave-utilities/packages/contract-helpers';
+import { ReserveDataHumanized } from '@aave/aave-utilities';
 import {
  FormatReserveUSDResponse,
  FormatUserSummaryAndIncentivesResponse

diff --git a/apps/web/src/hooks/useAccountAdapter.ts b/apps/web/src/hooks/useAccountAdapter.ts
@@ -1,5 +1,5 @@
 import { submitTransaction } from '@/api';
-import { EthereumTransactionTypeExtended } from '@aave/aave-utilities/packages/contract-helpers';
+import { EthereumTransactionTypeExtended } from '@aave/aave-utilities';
 import {
  useAuth,
  useCounterFactualAddress,

diff --git a/apps/web/src/hooks/useBorrowAsset.ts b/apps/web/src/hooks/useBorrowAsset.ts
@@ -1,8 +1,8 @@
 import { useMutation } from 'wagmi';
 import { createBorrowTx } from '@/api';
-import { LPBorrowParamsType } from '@aave/aave-utilities/packages/contract-helpers/dist/esm/v3-pool-contract/lendingPoolTypes';
+import { LPBorrowParamsType } from '@aave/aave-utilities/dist/esm/v3-pool-contract/lendingPoolTypes';
 import { useAaveContracts } from '@/providers';
-import { InterestRate } from '@aave/aave-utilities/packages/contract-helpers';
+import { InterestRate } from '@aave/aave-utilities';
 import { useAccountAdapter } from './useAccountAdapter';
 
 type Props = {

diff --git a/apps/web/src/hooks/useSupplyAsset.ts b/apps/web/src/hooks/useSupplyAsset.ts
@@ -1,6 +1,6 @@
 import { useMutation } from 'wagmi';
 import { createSupplyTxs } from '@/api';
-import { LPSignERC20ApprovalType } from '@aave/aave-utilities/packages/contract-helpers/dist/esm/v3-pool-contract/lendingPoolTypes';
+import { LPSignERC20ApprovalType } from '@aave/aave-utilities/dist/esm/v3-pool-contract/lendingPoolTypes';
 import dayjs from 'dayjs';
 import { useAaveContracts } from '@/providers';
 import { useAccountAdapter } from './useAccountAdapter';

diff --git a/apps/web/src/providers/AaveContractsProvider.tsx b/apps/web/src/providers/AaveContractsProvider.tsx
@@ -2,7 +2,7 @@ import {
  Pool,
  UiIncentiveDataProvider,
  UiPoolDataProvider
-} from '@aave/aave-utilities/packages/contract-helpers';
+} from '@aave/aave-utilities';
 import { AaveV3Sepolia } from '@bgd-labs/aave-address-book';
 import { createContext, useContext, useMemo } from 'react';
 import { useLfghoClients } from '@repo/lfgho-sdk';

diff --git a/packages/lfgho-sdk/src/hooks/useTransactions.ts b/packages/lfgho-sdk/src/hooks/useTransactions.ts
@@ -16,7 +16,7 @@ import { erc20abi, simpleAccountABI } from '../_pimlico/util';
 import {
  EthereumTransactionTypeExtended,
  transactionType
-} from '@aave/aave-utilities/packages/contract-helpers';
+} from '@aave/aave-utilities';
 
 export const useTransactions = () => {
  const {

diff --git a/yarn.lock b/yarn.lock
@@ -8,8 +8,8 @@
  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
 "@aave/aave-utilities@https://github.com/grenos/aave-utilities.git#master":
- version "1.0.0"
- resolved "https://github.com/grenos/aave-utilities.git#ba805724b08c75156ccfc43a0cb4933041063eb5"
+ version "4.2.0"
+ resolved "https://github.com/grenos/aave-utilities.git#7e34aa47f6e5b4754e2aea74cee2d81ee157f998"
 
 "@adraffy/[email protected]":
  version "1.10.0"
@@ -2859,70 +2859,70 @@
  estree-walker "^2.0.2"
  picomatch "^2.3.1"
 
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz#b752b6c88a14ccfcbdf3f48c577ccc3a7f0e66b9"
- integrity sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz#33757c3a448b9ef77b6f6292d8b0ec45c87e9c1a"
- integrity sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz#5234ba62665a3f443143bc8bcea9df2cc58f55fb"
- integrity sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz#981256c054d3247b83313724938d606798a919d1"
- integrity sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz#120678a5a2b3a283a548dbb4d337f9187a793560"
- integrity sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz#c99d857e2372ece544b6f60b85058ad259f64114"
- integrity sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz#3064060f568a5718c2a06858cd6e6d24f2ff8632"
- integrity sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz#987d30b5d2b992fff07d055015991a57ff55fbad"
- integrity sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz#85946ee4d068bd12197aeeec2c6f679c94978a49"
- integrity sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz#fe0b20f9749a60eb1df43d20effa96c756ddcbd4"
- integrity sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz#422661ef0e16699a234465d15b2c1089ef963b2a"
- integrity sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz#7b73a145891c202fbcc08759248983667a035d85"
- integrity sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==
-
-"@rollup/[email protected].5":
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz#10491ccf4f63c814d4149e0316541476ea603602"
- integrity sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz#66b8d9cb2b3a474d115500f9ebaf43e2126fe496"
+ integrity sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.6.tgz#46327d5b86420d2307946bec1535fdf00356e47d"
+ integrity sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.6.tgz#166987224d2f8b1e2fd28ee90c447d52271d5e90"
+ integrity sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz#a2e6e096f74ccea6e2f174454c26aef6bcdd1274"
+ integrity sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.6.tgz#09fcd4c55a2d6160c5865fec708a8e5287f30515"
+ integrity sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.6.tgz#19a3c0b6315c747ca9acf86e9b710cc2440f83c9"
+ integrity sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.6.tgz#94aaf95fdaf2ad9335983a4552759f98e6b2e850"
+ integrity sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.6.tgz#160510e63f4b12618af4013bddf1761cf9fc9880"
+ integrity sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.6.tgz#5ac5d068ce0726bd0a96ca260d5bd93721c0cb98"
+ integrity sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.6.tgz#bafa759ab43e8eab9edf242a8259ffb4f2a57a5d"
+ integrity sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.6.tgz#1cc3416682e5a20d8f088f26657e6e47f8db468e"
+ integrity sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.6.tgz#7d2251e1aa5e8a1e47c86891fe4547a939503461"
+ integrity sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==
+
+"@rollup/[email protected].6":
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz#2c1fb69e02a3f1506f52698cfdc3a8b6386df9a6"
+ integrity sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==
 
 "@safe-global/safe-apps-provider@^0.18.1":
  version "0.18.2"
@@ -7358,25 +7358,25 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
  inherits "^2.0.1"
 
 rollup@^4.2.0:
- version "4.9.5"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.5.tgz#62999462c90f4c8b5d7c38fc7161e63b29101b05"
- integrity sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==
+ version "4.9.6"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.6.tgz#4515facb0318ecca254a2ee1315e22e09efc50a0"
+ integrity sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==
  dependencies:
  "@types/estree" "1.0.5"
  optionalDependencies:
- "@rollup/rollup-android-arm-eabi" "4.9.5"
- "@rollup/rollup-android-arm64" "4.9.5"
- "@rollup/rollup-darwin-arm64" "4.9.5"
- "@rollup/rollup-darwin-x64" "4.9.5"
- "@rollup/rollup-linux-arm-gnueabihf" "4.9.5"
- "@rollup/rollup-linux-arm64-gnu" "4.9.5"
- "@rollup/rollup-linux-arm64-musl" "4.9.5"
- "@rollup/rollup-linux-riscv64-gnu" "4.9.5"
- "@rollup/rollup-linux-x64-gnu" "4.9.5"
- "@rollup/rollup-linux-x64-musl" "4.9.5"
- "@rollup/rollup-win32-arm64-msvc" "4.9.5"
- "@rollup/rollup-win32-ia32-msvc" "4.9.5"
- "@rollup/rollup-win32-x64-msvc" "4.9.5"
+ "@rollup/rollup-android-arm-eabi" "4.9.6"
+ "@rollup/rollup-android-arm64" "4.9.6"
+ "@rollup/rollup-darwin-arm64" "4.9.6"
+ "@rollup/rollup-darwin-x64" "4.9.6"
+ "@rollup/rollup-linux-arm-gnueabihf" "4.9.6"
+ "@rollup/rollup-linux-arm64-gnu" "4.9.6"
+ "@rollup/rollup-linux-arm64-musl" "4.9.6"
+ "@rollup/rollup-linux-riscv64-gnu" "4.9.6"
+ "@rollup/rollup-linux-x64-gnu" "4.9.6"
+ "@rollup/rollup-linux-x64-musl" "4.9.6"
+ "@rollup/rollup-win32-arm64-msvc" "4.9.6"
+ "@rollup/rollup-win32-ia32-msvc" "4.9.6"
+ "@rollup/rollup-win32-x64-msvc" "4.9.6"
  fsevents "~2.3.2"
 
 rpc-websockets@^7.5.1: