From f2e0fa42ac399ffbc498d753e995c2fd820909fb Mon Sep 17 00:00:00 2001
From: Sophia <littlejohn.sophia@gmail.com>
Date: Fri, 6 Sep 2024 12:47:31 -0400
Subject: [PATCH 1/4] LPv2 Centrifuge Router (#2360)

* Add router ABI

* Initial attempt at using router for invest

* Update invest/redeem actions to use centrifuge router contract

* Add invest with permit

* Refactor cent router usage

* Use enableLockDepositRequest instead of enable due to errors in the enable contract

* Use centrifuge router address to check for approve amount

* Fix cancel investment txs

* Update token price in enablePoolOnDomain

* Update router ABI

* Add gmp status in invest/redeem behind debug flag

* Double check inputs for centrifuge router

* Fix update token price call

* Enable permits and set a 1 hour deadline for ERC2612 Permit

* Fix order of mutlicall for investing with permit

* Fix return types from investments.investOrders.keys()

* Replace spender with centrifuge router for investing with permit

* Use alternative to enable since it's not working yet on contract side

* Use cent router for requestDeposit

* Increase gas limit

* Clean up gmp feature

* Only show gmp on correct pool and tranche

* Clean up

* Fix form validation in mux withdrawals

* Update token prices when updating NAV and asset prices

* Fix lint warnings and error

* Clean up useGmp

* Fix lint
---
 .../src/components/DebugFlags/config.ts       |   5 +
 .../components/InvestRedeem/InvestRedeem.tsx  |   3 +
 .../InvestRedeemLiquidityPoolsProvider.tsx    |  51 ++-
 .../IssuerPool/Investors/LiquidityPools.tsx   |  12 +-
 .../src/pages/Loan/ExternalFinanceForm.tsx    |   1 +
 .../src/pages/Loan/ExternalRepayForm.tsx      |   1 +
 centrifuge-app/src/pages/Loan/FinanceForm.tsx |  45 +-
 centrifuge-app/src/pages/Loan/RepayForm.tsx   |   1 +
 .../NavManagement/NavManagementAssetTable.tsx |  23 +-
 .../src/utils/tinlake/useEvmTransaction.ts    |  16 +-
 centrifuge-app/src/utils/useGmp.tsx           | 126 ++++++
 centrifuge-app/src/utils/useLiquidityPools.ts |   2 +-
 centrifuge-app/src/utils/usePools.ts          |   6 +-
 centrifuge-js/src/modules/liquidityPools.ts   | 278 +++++++++---
 .../abi/CentrifugeRouter.abi.json             | 418 ++++++++++++++++++
 .../src/modules/liquidityPools/abi/index.ts   |   3 +-
 16 files changed, 871 insertions(+), 120 deletions(-)
 create mode 100644 centrifuge-app/src/utils/useGmp.tsx
 create mode 100644 centrifuge-js/src/modules/liquidityPools/abi/CentrifugeRouter.abi.json

diff --git a/centrifuge-app/src/components/DebugFlags/config.ts b/centrifuge-app/src/components/DebugFlags/config.ts
index 2eddcf28f3..6c365bc6d3 100644
--- a/centrifuge-app/src/components/DebugFlags/config.ts
+++ b/centrifuge-app/src/components/DebugFlags/config.ts
@@ -48,6 +48,7 @@ export type Key =
   | 'poolCreationType'
   | 'showTokenYields'
   | 'showOracleTx'
+  | 'showGmp'
 
 export const flagsConfig = {
   address: {
@@ -129,6 +130,10 @@ export const flagsConfig = {
     default: false,
     type: 'checkbox',
   },
+  showGmp: {
+    default: false,
+    type: 'checkbox',
+  },
 } satisfies Record<Key, DebugFlagConfig>
 
 export const genericFlagsConfig = flagsConfig as Record<string, DebugFlagConfig>
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
index 5d92ce4e79..9412f5a770 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
@@ -20,6 +20,7 @@ import { useTheme } from 'styled-components'
 import { ethConfig } from '../../config'
 import { formatBalance } from '../../utils/formatting'
 import { useAddress } from '../../utils/useAddress'
+import { useGmp } from '../../utils/useGmp'
 import { useActiveDomains } from '../../utils/useLiquidityPools'
 import { usePool, usePoolMetadata } from '../../utils/usePools'
 import { LiquidityRewardsContainer } from '../LiquidityRewards/LiquidityRewardsContainer'
@@ -88,6 +89,7 @@ type InputProps = {
 
 function InvestRedeemInput({ defaultView: defaultViewProp }: InputProps) {
   const { state } = useInvestRedeem()
+  const { render: renderGmp } = useGmp()
   const pool = usePool(state.poolId)
   let defaultView = defaultViewProp
   if (state.order && !defaultView) {
@@ -101,6 +103,7 @@ function InvestRedeemInput({ defaultView: defaultViewProp }: InputProps) {
 
   return (
     <Stack>
+      {renderGmp(state.poolId, state.trancheId)}
       <Flex
         style={{
           boxShadow: `inset 0 -2px 0 ${theme.colors.borderPrimary}`,
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx
index 2b066ce04b..43a5ca41a3 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx
@@ -18,8 +18,6 @@ import { usePendingCollect, usePool, usePoolMetadata } from '../../utils/usePool
 import { InvestRedeemContext } from './InvestRedeemProvider'
 import { InvestRedeemAction, InvestRedeemActions, InvestRedeemState, InvestRedeemProviderProps as Props } from './types'
 
-const PERMITS_DISABLED = true
-
 export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children }: Props) {
   const centAddress = useAddress('substrate')
   const evmAddress = useAddress('evm')
@@ -34,8 +32,7 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
   const centOrder = usePendingCollect(poolId, trancheId, centAddress)
   const pool = usePool(poolId) as Pool
   const cent = useCentrifuge()
-  const [pendingActionState, setPendingAction] = React.useState<InvestRedeemAction>()
-  // | 'investWithPermit'
+  const [pendingActionState, setPendingAction] = React.useState<InvestRedeemAction | 'investWithPermit'>()
   const { isLoading: isLpsLoading, data: lps } = useLiquidityPools(poolId, trancheId)
   const {
     data: lpInvest,
@@ -48,6 +45,7 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
   const tranche = pool.tranches.find((t) => t.id === trancheId)
   const { data: metadata, isLoading: isMetadataLoading } = usePoolMetadata(pool)
   const trancheMeta = metadata?.tranches?.[trancheId]
+  const chainId = provider?.network.chainId || 1
 
   if (!tranche) throw new Error(`Token not found. Pool id: ${poolId}, token id: ${trancheId}`)
 
@@ -77,9 +75,9 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
   const minOrder = consts.orderBook.minFulfillment.toDecimal()
 
   const invest = useEvmTransaction('Invest', (cent) => cent.liquidityPools.increaseInvestOrder)
-  // const investWithPermit = useEvmTransaction('Invest', (cent) => cent.liquidityPools.increaseInvestOrderWithPermit)
+  const investWithPermit = useEvmTransaction('Invest', (cent) => cent.liquidityPools.increaseInvestOrderWithPermit)
   const redeem = useEvmTransaction('Redeem', (cent) => cent.liquidityPools.increaseRedeemOrder)
-  const collectInvest = useEvmTransaction('Collect', (cent) => cent.liquidityPools.mint)
+  const collectInvest = useEvmTransaction('Claim', (cent) => cent.liquidityPools.mint)
   const collectRedeem = useEvmTransaction('Withdraw', (cent) => cent.liquidityPools.withdraw)
   const approve = useEvmTransaction('Approve', (cent) => cent.liquidityPools.approveForCurrency)
   const cancelInvest = useEvmTransaction('Cancel order', (cent) => cent.liquidityPools.cancelInvestOrder)
@@ -89,7 +87,7 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
 
   const txActions = {
     invest,
-    // investWithPermit,
+    investWithPermit,
     redeem,
     collect:
       collectType === 'invest'
@@ -118,10 +116,11 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
   function doAction<T = any>(
     name: InvestRedeemAction,
     fn: (arg: T) => any[] | Promise<any[]>,
-    opt?: TransactionRequest
+    opt?: TransactionRequest,
+    gmp?: { poolId: string; trancheId: string } // enable gmp to display pending Axelar messages
   ): (args?: T) => void {
     return (args) => {
-      txActions[name]?.execute(fn(args!) as any, opt)
+      txActions[name]?.execute(fn(args!) as any, opt, gmp)
       setPendingAction(name)
     }
   }
@@ -151,8 +150,7 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
     }
   }, [lps])
 
-  const supportsPermits =
-    !PERMITS_DISABLED && lpInvest?.currencySupportsPermit && !isSmartContractWallet && selectedWallet?.id !== 'finoa'
+  const supportsPermits = lpInvest?.currencySupportsPermit && !isSmartContractWallet && selectedWallet?.id !== 'finoa'
   const canChangeOrder = false // LP contracts don't support changing orders
 
   const state: InvestRedeemState = {
@@ -202,8 +200,9 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
       : Dec(0),
     collectType,
     needsToCollectBeforeOrder: true,
-    needsPoolCurrencyApproval: (amount) =>
-      lpInvest ? lpInvest.lpCurrencyAllowance.toFloat() < amount && !supportsPermits : false,
+    needsPoolCurrencyApproval: (amount) => {
+      return lpInvest ? lpInvest.lpCurrencyAllowance.toFloat() < amount && !supportsPermits : false
+    },
     needsTrancheTokenApproval: () => false,
     canChangeOrder,
     canCancelOrder: !(lpInvest?.pendingCancelDepositRequest || lpInvest?.pendingCancelRedeemRequest),
@@ -229,35 +228,35 @@ export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children
       else if (lpInvest.lpCurrencyAllowance.lt(assets) && supportsPermits && pendingAction !== 'approvePoolCurrency') {
         const signer = provider!.getSigner()
         const connectedCent = cent.connectEvm(evmAddress!, signer)
-        const permit = await connectedCent.liquidityPools.signPermit([
-          lpInvest.lpAddress,
-          lpInvest.currency.address,
-          assets,
-        ])
+        const permit = await connectedCent.liquidityPools.signPermit([lpInvest.currency.address, assets, chainId])
         console.log('permit', permit)
-        // investWithPermit.execute([lpInvest.lpAddress, assets, permit])
-        // setPendingAction('investWithPermit')
+        investWithPermit.execute(
+          [lpInvest.lpAddress, assets, lpInvest?.currency.address, permit, chainId],
+          {},
+          { poolId, trancheId }
+        )
+        setPendingAction('investWithPermit')
       } else {
-        invest.execute([lpInvest.lpAddress, assets])
+        invest.execute([lpInvest.lpAddress, assets, chainId], {}, { poolId, trancheId })
         setPendingAction('invest')
       }
     },
     redeem: async (newOrder: BN) => {
       if (!lpInvest) return
-      redeem.execute([lpInvest.lpAddress, newOrder])
+      redeem.execute([lpInvest.lpAddress, newOrder, chainId], {}, { poolId, trancheId })
       setPendingAction('redeem')
     },
     collect: doAction('collect', () =>
-      collectType === 'invest' ? [lpInvest?.lpAddress, lpInvest?.maxMint] : [lpInvest?.lpAddress, lpInvest?.maxWithdraw]
+      collectType === 'invest' ? [lpInvest?.lpAddress, chainId] : [lpInvest?.lpAddress, chainId]
     ),
     approvePoolCurrency: doAction('approvePoolCurrency', (amount) => [
-      lpInvest?.lpAddress,
       lpInvest?.currency.address,
       amount.toString(),
+      chainId,
     ]),
     approveTrancheToken: () => {},
-    cancelInvest: doAction('cancelInvest', () => [lpInvest?.lpAddress]),
-    cancelRedeem: doAction('cancelRedeem', () => [lpInvest?.lpAddress]),
+    cancelInvest: doAction('cancelInvest', () => [lpInvest?.lpAddress, chainId], undefined, { poolId, trancheId }),
+    cancelRedeem: doAction('cancelRedeem', () => [lpInvest?.lpAddress, chainId], undefined, { poolId, trancheId }),
     selectPoolCurrency(symbol) {
       setLpIndex(lps!.findIndex((lp) => lp.currency.symbol === symbol))
     },
diff --git a/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx b/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx
index c3bef66568..40349edf3c 100644
--- a/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx
@@ -175,7 +175,7 @@ function PoolDomain({ poolId, domain, refetch }: { poolId: string; domain: Domai
           </ConnectionGuard>
         ) : (
           pool.tranches.map((tranche) => (
-            <a href={explorer.address(domain.trancheTokens[tranche.id])} target="_blank">
+            <a href={explorer.address(domain.trancheTokens[tranche.id])} target="_blank" rel="noopener noreferrer">
               <Button variant="secondary" small style={{ width: '100%' }}>
                 <Shelf gap={1}>
                   <span>View {tranche.currency.symbol} token</span>
@@ -252,6 +252,10 @@ function EnableButton({ poolId, domain }: { poolId: string; domain: Domain }) {
     (cent) => cent.liquidityPools.enablePoolOnDomain
   )
 
+  const tokenPricesToUpdate = Object.entries(domain.liquidityPools).flatMap(([tid, poolsByCurrency]) => {
+    return domain.currencies.map((cur) => [tid, cur.key] satisfies [string, CurrencyKey])
+  })
+
   const currenciesToAdd = domain.currencies
     .filter((cur) => domain.currencyNeedsAdding[cur.address])
     .map((cur) => cur.key)
@@ -259,7 +263,11 @@ function EnableButton({ poolId, domain }: { poolId: string; domain: Domain }) {
   return (
     <Button
       loading={isLoading}
-      onClick={() => execute([poolId, domain.chainId, currenciesToAdd], { account: poolAdmin })}
+      onClick={() =>
+        execute([poolId, domain.chainId, currenciesToAdd, tokenPricesToUpdate, domain.chainId], {
+          account: poolAdmin,
+        })
+      }
       small
     >
       Enable
diff --git a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
index d22c6951b9..2b1bb380e7 100644
--- a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
@@ -104,6 +104,7 @@ export function ExternalFinanceForm({ loan, source }: { loan: ExternalLoan; sour
 
   React.useEffect(() => {
     financeForm.validateForm()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [source])
 
   const financeFormRef = React.useRef<HTMLFormElement>(null)
diff --git a/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx b/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx
index b193b773a3..18e8b025e8 100644
--- a/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx
+++ b/centrifuge-app/src/pages/Loan/ExternalRepayForm.tsx
@@ -146,6 +146,7 @@ export function ExternalRepayForm({ loan, destination }: { loan: ExternalLoan; d
 
   React.useEffect(() => {
     repayForm.validateForm()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [destination])
 
   const repayFormRef = React.useRef<HTMLFormElement>(null)
diff --git a/centrifuge-app/src/pages/Loan/FinanceForm.tsx b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
index 4c2e69a321..e168b2b665 100644
--- a/centrifuge-app/src/pages/Loan/FinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
@@ -163,6 +163,7 @@ function InternalFinanceForm({ loan, source }: { loan: LoanType; source: string
 
   React.useEffect(() => {
     financeForm.validateForm()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [source])
 
   const financeFormRef = React.useRef<HTMLFormElement>(null)
@@ -436,7 +437,9 @@ function Mux({
                           })),
                         ]}
                         value={index.toString()}
-                        onChange={(event) => setSelectedAddressIndex(currencyKey, parseInt(event.target.value))}
+                        onChange={(event) => {
+                          setSelectedAddressIndex(currencyKey, parseInt(event.target.value))
+                        }}
                         small
                       />
                     </Flex>
@@ -487,6 +490,30 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
   const ao = access.assetOriginators.find((a) => a.address === borrower.actingAddress)
   const withdrawAddresses = ao?.transferAllowlist ?? []
 
+  const sortedBalances = sortBalances(muxBalances?.currencies || [], pool.currency)
+  const ignoredCurrencies = Object.entries(selectedAddressIndexByCurrency).flatMap(([key, index]) => {
+    return index === -1 ? [key] : []
+  })
+  const { buckets: withdrawAmounts } = muxBalances?.currencies
+    ? divideBetweenCurrencies(amount, sortedBalances, withdrawAddresses, ignoredCurrencies)
+    : { buckets: [] }
+
+  const totalAvailable = withdrawAmounts.reduce((acc, cur) => acc.add(cur.amount), Dec(0))
+
+  React.useEffect(() => {
+    if (withdrawAddresses.length > 0 && sortedBalances.length > 0) {
+      const initialSelectedAddresses: Record<string, number> = {}
+      sortedBalances.forEach((balance) => {
+        const currencyKey = currencyToString(balance.currency.key)
+        if (!(currencyKey in initialSelectedAddresses)) {
+          initialSelectedAddresses[currencyKey] = 0
+        }
+      })
+      setSelectedAddressIndexByCurrency(initialSelectedAddresses)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [withdrawAddresses])
+
   if (!isLocalAsset) {
     return {
       render: () => <WithdrawSelect withdrawAddresses={withdrawAddresses} poolId={poolId} />,
@@ -513,17 +540,6 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
       },
     }
   }
-
-  const sortedBalances = sortBalances(muxBalances?.currencies || [], pool.currency)
-  const ignoredCurrencies = Object.entries(selectedAddressIndexByCurrency).flatMap(([key, index]) => {
-    return index === -1 ? [key] : []
-  })
-  const { buckets: withdrawAmounts } = muxBalances?.currencies
-    ? divideBetweenCurrencies(amount, sortedBalances, withdrawAddresses, ignoredCurrencies)
-    : { buckets: [] }
-
-  const totalAvailable = withdrawAmounts.reduce((acc, cur) => acc.add(cur.amount), Dec(0))
-
   return {
     render: () => (
       <Mux
@@ -540,8 +556,9 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
         amount={amount}
       />
     ),
-    isValid: ({ values }: { values: Pick<FinanceValues, 'withdraw'> }) => {
-      return source === 'reserve' ? amount.lte(totalAvailable) && !!values.withdraw : true
+    isValid: (_: { values: Pick<FinanceValues, 'withdraw'> }) => {
+      const withdrawalAddresses = Object.values(selectedAddressIndexByCurrency).filter((index) => index !== -1)
+      return source === 'reserve' ? amount.lte(totalAvailable) && !!withdrawalAddresses.length : true
     },
     getBatch: () => {
       return combineLatest(
diff --git a/centrifuge-app/src/pages/Loan/RepayForm.tsx b/centrifuge-app/src/pages/Loan/RepayForm.tsx
index 81b21a2d33..950c74896c 100644
--- a/centrifuge-app/src/pages/Loan/RepayForm.tsx
+++ b/centrifuge-app/src/pages/Loan/RepayForm.tsx
@@ -181,6 +181,7 @@ function InternalRepayForm({ loan, destination }: { loan: ActiveLoan | CreatedLo
 
   React.useEffect(() => {
     repayForm.validateForm()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [destination])
 
   const repayFormRef = React.useRef<HTMLFormElement>(null)
diff --git a/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx b/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx
index 95e4062111..3d9cacb348 100644
--- a/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx
+++ b/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx
@@ -1,4 +1,4 @@
-import { ActiveLoan, CreatedLoan, CurrencyBalance, ExternalLoan } from '@centrifuge/centrifuge-js'
+import { ActiveLoan, CreatedLoan, CurrencyBalance, CurrencyKey, ExternalLoan } from '@centrifuge/centrifuge-js'
 import { useCentrifugeApi, useCentrifugeQuery, useCentrifugeTransaction } from '@centrifuge/centrifuge-react'
 import {
   Box,
@@ -15,7 +15,7 @@ import {
 import { BN } from 'bn.js'
 import { Field, FieldProps, FormikProvider, useFormik } from 'formik'
 import * as React from 'react'
-import { switchMap } from 'rxjs'
+import { combineLatest, switchMap } from 'rxjs'
 import daiLogo from '../../assets/images/dai-logo.svg'
 import usdcLogo from '../../assets/images/usdc-logo.svg'
 import { ButtonGroup } from '../../components/ButtonGroup'
@@ -25,6 +25,7 @@ import { AssetName } from '../../components/LoanList'
 import { RouterTextLink } from '../../components/TextLink'
 import { formatBalance } from '../../utils/formatting'
 import { useLiquidity } from '../../utils/useLiquidity'
+import { useActiveDomains } from '../../utils/useLiquidityPools'
 import { useSuitableAccounts } from '../../utils/usePermissions'
 import { usePool, usePoolAccountOrders, usePoolFees } from '../../utils/usePools'
 import { usePoolsForWhichAccountIsFeeder } from '../../utils/usePoolsForWhichAccountIsFeeder'
@@ -49,6 +50,7 @@ type Row = FormValues['feed'][0] | ActiveLoan | CreatedLoan
 const MAX_COLLECT = 100 // maximum number of transactions to collect in one batch
 
 export function NavManagementAssetTable({ poolId }: { poolId: string }) {
+  const { data: domains } = useActiveDomains(poolId)
   const allowedPools = usePoolsForWhichAccountIsFeeder()
   const isFeeder = !!allowedPools?.find((p) => p.id === poolId)
   const [isEditing, setIsEditing] = React.useState(false)
@@ -91,8 +93,20 @@ export function NavManagementAssetTable({ poolId }: { poolId: string }) {
   const { execute, isLoading } = useCentrifugeTransaction(
     'Update NAV',
     (cent) => (args: [values: FormValues], options) => {
-      return cent.pools.closeEpoch([poolId, false], { batch: true }).pipe(
-        switchMap((closeTx) => {
+      const domain = domains?.find((domain) => domain.isActive && domain.hasDeployedLp)
+      const updateTokenPrices = domain
+        ? Object.entries(domain.liquidityPools).flatMap(([tid, poolsByCurrency]) => {
+            return domain.currencies
+              .filter((cur) => !!poolsByCurrency[cur.address])
+              .map((cur) => [tid, cur.key] satisfies [string, CurrencyKey])
+              .map(([tid, curKey]) =>
+                cent.liquidityPools.updateTokenPrice([poolId, tid, curKey, domain.chainId], { batch: true })
+              )
+          })
+        : []
+
+      return combineLatest([cent.pools.closeEpoch([poolId, false], { batch: true }), ...updateTokenPrices]).pipe(
+        switchMap(([closeTx, ...updateTokenPricesTxs]) => {
           const [values] = args
           const batch = [
             ...values.feed
@@ -103,6 +117,7 @@ export function NavManagementAssetTable({ poolId }: { poolId: string }) {
               }),
             api.tx.oraclePriceCollection.updateCollection(poolId),
             api.tx.loans.updatePortfolioValuation(poolId),
+            ...updateTokenPricesTxs,
           ]
 
           if (liquidityAdminAccount && orders?.length) {
diff --git a/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts b/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts
index a6f1ecf6c6..81c966a843 100644
--- a/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts
+++ b/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts
@@ -10,6 +10,7 @@ import {
 import { TransactionRequest, TransactionResponse } from '@ethersproject/providers'
 import * as React from 'react'
 import { Observable, lastValueFrom, tap } from 'rxjs'
+import { useGmp } from '../useGmp'
 
 export function useEvmTransaction<T extends Array<any>>(
   title: string,
@@ -26,8 +27,14 @@ export function useEvmTransaction<T extends Array<any>>(
   const centrifuge = useCentrifuge()
   const provider = useEvmProvider()
   const pendingTransaction = React.useRef<{ id: string; args: T; options?: TransactionRequest }>()
+  const { setGmpHash, gmpHash } = useGmp()
 
-  async function doTransaction(id: string, args: T, txOptions?: TransactionRequest) {
+  async function doTransaction(
+    id: string,
+    args: T,
+    txOptions?: TransactionRequest,
+    gmpOptions?: { poolId: string; trancheId: string }
+  ) {
     try {
       const signer = provider!.getSigner()
       const connectedCent = centrifuge.connectEvm(selectedAddress!, signer)
@@ -36,6 +43,9 @@ export function useEvmTransaction<T extends Array<any>>(
       const lastResult = await lastValueFrom(
         transaction(args, txOptions).pipe(
           tap((result) => {
+            if (!gmpHash && gmpOptions) {
+              setGmpHash(result.hash, gmpOptions.poolId, gmpOptions.trancheId, selectedAddress!)
+            }
             updateTransaction(id, { status: 'pending', hash: result.hash })
           })
         )
@@ -50,7 +60,7 @@ export function useEvmTransaction<T extends Array<any>>(
     }
   }
 
-  function execute(args: T, options?: TransactionRequest) {
+  function execute(args: T, options?: TransactionRequest, gmp?: { poolId: string; trancheId: string }) {
     const id = Math.random().toString(36).substring(2)
     const tx: Transaction = {
       id,
@@ -66,7 +76,7 @@ export function useEvmTransaction<T extends Array<any>>(
       pendingTransaction.current = { id, args, options }
       showWallets(chainId ?? 1)
     } else {
-      doTransaction(id, args, options)
+      doTransaction(id, args, options, gmp)
     }
     return id
   }
diff --git a/centrifuge-app/src/utils/useGmp.tsx b/centrifuge-app/src/utils/useGmp.tsx
new file mode 100644
index 0000000000..e7489b4ed2
--- /dev/null
+++ b/centrifuge-app/src/utils/useGmp.tsx
@@ -0,0 +1,126 @@
+import { useCentrifuge, useWallet } from '@centrifuge/centrifuge-react'
+import { IconExternalLink, InlineFeedback, Shelf, Text } from '@centrifuge/fabric'
+import React from 'react'
+import { useQuery } from 'react-query'
+import { useDebugFlags } from '../components/DebugFlags'
+
+export type Gmp = {
+  txHash: string
+  poolId: string
+  trancheId: string
+  address: string
+} | null
+
+export function useGmp() {
+  const { showGmp } = useDebugFlags()
+  const {
+    isEvmOnSubstrate,
+    evm: { selectedAddress },
+  } = useWallet()
+  const centrifuge = useCentrifuge()
+  const isDemo = centrifuge.config.centrifugeWsUrl.includes('k-f.dev')
+  const axelarApiUrl = `https://${isDemo ? 'testnet' : ''}.api.axelarscan.io/gmp/searchGMP`
+  const axelarScanUrl = `https://${isDemo ? 'testnet' : ''}.axelarscan.io/gmp/`
+
+  const [gmp, setGmp] = React.useState<Gmp | null>(null)
+
+  const setGmpHash = (txHash: string, poolId: string, trancheId: string, address: string) => {
+    const gmp = { txHash, poolId, trancheId, address }
+    sessionStorage.setItem('gmp', JSON.stringify(gmp))
+    setGmp(gmp)
+  }
+
+  const { data } = useQuery(
+    ['gmp', gmp?.txHash],
+    async () => {
+      if (!gmp?.txHash) throw new Error('No transaction hash found')
+      const data = await fetchData(gmp.txHash)
+      return data
+    },
+    {
+      enabled: !!gmp && !isEvmOnSubstrate && showGmp,
+      refetchInterval: 5000,
+      refetchOnWindowFocus: true,
+    }
+  )
+
+  const gasPaid = !!data?.[0]?.gas_paid
+  const executed = !!data?.[0]?.executed
+
+  React.useEffect(() => {
+    if (!gmp) {
+      const storedGmp = sessionStorage.getItem('gmp')
+      if (storedGmp) {
+        setGmp(JSON.parse(storedGmp))
+      }
+    }
+
+    if (executed) {
+      return () => {
+        sessionStorage.removeItem('gmp')
+      }
+    }
+  }, [gmp, executed])
+
+  async function fetchData(txHash: string) {
+    try {
+      const response = await fetch(axelarApiUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ txHash }),
+      })
+      const result = await response.json()
+      return result.data
+    } catch (error) {
+      console.error('Error fetching data:', error)
+      return []
+    }
+  }
+
+  const render = React.useCallback(
+    (poolId: string, trancheId: string) => {
+      if (gmp && showGmp && gmp.poolId === poolId && gmp.trancheId === trancheId && gmp.address === selectedAddress) {
+        return (
+          <Shelf p={1} mb={2} backgroundColor="statusWarningBg" borderRadius={1} gap={1} alignItems="center">
+            <InlineFeedback>
+              {!executed ? (
+                <Shelf gap={1}>
+                  <Text variant="body2">{gasPaid ? 'Gas paid, finalizing' : 'Awaiting gas payment'} </Text>
+                  <Shelf
+                    as="a"
+                    style={{ color: 'inherit', textDecoration: 'underline' }}
+                    href={`${axelarScanUrl}${gmp.txHash}`}
+                    target="_blank"
+                  >
+                    <Text variant="body2">on Axelar</Text>
+                    <IconExternalLink size="iconSmall" />
+                  </Shelf>
+                </Shelf>
+              ) : (
+                <Shelf gap={1}>
+                  <Text variant="body2">Transaction executed on </Text>
+                  <Shelf
+                    as="a"
+                    style={{ color: 'inherit', textDecoration: 'underline' }}
+                    href={`${axelarScanUrl}${gmp.txHash}`}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    <Text variant="body2">Axelar</Text>
+                    <IconExternalLink size="iconSmall" />
+                  </Shelf>
+                </Shelf>
+              )}
+            </InlineFeedback>
+          </Shelf>
+        )
+      } else {
+        return null
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [gasPaid, executed]
+  )
+
+  return { setGmpHash, render, gmpHash: gmp?.txHash }
+}
diff --git a/centrifuge-app/src/utils/useLiquidityPools.ts b/centrifuge-app/src/utils/useLiquidityPools.ts
index e92a9477ae..fe7bda14f2 100644
--- a/centrifuge-app/src/utils/useLiquidityPools.ts
+++ b/centrifuge-app/src/utils/useLiquidityPools.ts
@@ -103,7 +103,7 @@ export function useLiquidityPoolInvestment(poolId: string, trancheId: string, lp
   const query = useQuery(
     ['lpInvestment', chainId, lp?.lpAddress, address],
     async () => ({
-      ...(await cent.liquidityPools.getLiquidityPoolInvestment([address!, lp!], {
+      ...(await cent.liquidityPools.getLiquidityPoolInvestment([address!, lp!, chainId || 1], {
         rpcProvider: getProvider(chainId!),
       })),
       ...lp!,
diff --git a/centrifuge-app/src/utils/usePools.ts b/centrifuge-app/src/utils/usePools.ts
index 43e096976e..35a08885b2 100644
--- a/centrifuge-app/src/utils/usePools.ts
+++ b/centrifuge-app/src/utils/usePools.ts
@@ -326,11 +326,11 @@ export function usePoolAccountOrders(poolId: string) {
       switchMap(([investKeys, redeemKeys]) => {
         const keys = [...investKeys, ...redeemKeys]
           .map((k, i) => {
-            const key = k.toHuman() as [string, { poolId: string; trancheId: string }]
+            const key = k.toHuman() as [string, [poolId: string, trancheId: string]]
             return {
               accountId: addressToHex(key[0]),
-              poolId: key[1].poolId.replace(/\D/g, ''),
-              trancheId: key[1].trancheId,
+              poolId: key[1][0].replace(/\D/g, ''),
+              trancheId: key[1][1],
               type: i >= investKeys.length ? 'redeem' : 'invest',
             }
           })
diff --git a/centrifuge-js/src/modules/liquidityPools.ts b/centrifuge-js/src/modules/liquidityPools.ts
index c5d0b34b04..4a9ab127e3 100644
--- a/centrifuge-js/src/modules/liquidityPools.ts
+++ b/centrifuge-js/src/modules/liquidityPools.ts
@@ -1,3 +1,4 @@
+import { Interface } from '@ethersproject/abi'
 import { BigNumber } from '@ethersproject/bignumber'
 import { Contract, ContractInterface } from '@ethersproject/contracts'
 import type { JsonRpcProvider, TransactionRequest, TransactionResponse } from '@ethersproject/providers'
@@ -34,7 +35,7 @@ type LPConfig = {
 const config: Record<number, LPConfig> = {
   // Testnet
   11155111: {
-    centrifugeRouter: '0xe10D49F8e75DFd329E470585E81eC79C13e8B8a0',
+    centrifugeRouter: '0x723635430aa191ef5f6f856415f41b1a4d81dd7a',
   },
   // Mainnet
   1: {
@@ -69,15 +70,35 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
     )
   }
 
+  function centrifugeRouter(chainId: number) {
+    const centrifugeRouter = getCentrifugeRouterAddress(chainId)
+    const getEstimate = from(contract(centrifugeRouter, ABI.CentrifugeRouter).estimate([0]))
+    return getEstimate.pipe(
+      map((estimate) => {
+        return { estimate, centrifugeRouter }
+      })
+    )
+  }
+
+  function getCentrifugeRouterAddress(chainId: number) {
+    return config[chainId].centrifugeRouter
+  }
+
   function getProvider(options?: EvmQueryOptions) {
     return options?.rpcProvider ?? inst.config.evmSigner?.provider
   }
 
   function enablePoolOnDomain(
-    args: [poolId: string, chainId: number, currencyKeysToAdd: CurrencyKey[]],
+    args: [
+      poolId: string,
+      chainId: number,
+      currencyKeysToAdd: CurrencyKey[],
+      tokenPricesToUpdate: [string, CurrencyKey][],
+      domainChainId: number
+    ],
     options?: TransactionOptions
   ) {
-    const [poolId, chainId, currencyKeysToAdd] = args
+    const [poolId, chainId, currencyKeysToAdd, tokenPricesToUpdate, domainChainId] = args
     const $api = inst.getApi()
 
     return getDomainCurrencies([chainId]).pipe(
@@ -94,6 +115,9 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
                 api.tx.liquidityPools.addTranche(poolId, trancheId, { EVM: chainId }),
               ]),
               ...currencies.map((cur) => api.tx.liquidityPools.allowInvestmentCurrency(poolId, cur.key)),
+              ...tokenPricesToUpdate.map(([tid, curKey]) => {
+                return api.tx.liquidityPools.updateTokenPrice(poolId, tid, curKey, { EVM: domainChainId })
+              }),
               api.tx.liquidityPoolsGateway.endBatchMessage({ EVM: chainId }),
             ])
             return inst.wrapSignAndSend(api, tx, options)
@@ -142,15 +166,17 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
   }
 
   function approveForCurrency(
-    args: [address: string, currencyAddress: string, amount: BN],
+    args: [currencyAddress: string, amount: BN, chainId: number],
     options: TransactionRequest = {}
   ) {
-    const [address, currencyAddress, amount] = args
-    return pending(contract(currencyAddress, ABI.Currency).approve(address, amount, options))
+    const [currencyAddress, amount, chainId] = args
+    const centrifugeRouterAddress = getCentrifugeRouterAddress(chainId)
+
+    return pending(contract(currencyAddress, ABI.Currency).approve(centrifugeRouterAddress, amount, options))
   }
 
-  async function signPermit(args: [spender: string, currencyAddress: string, amount: BN]) {
-    const [spender, currencyAddress, amount] = args
+  async function signPermit(args: [currencyAddress: string, amount: BN, chainId: number]) {
+    const [currencyAddress, amount] = args
     if (!inst.config.evmSigner) throw new Error('EVM signer not set')
 
     let domainOrCurrency: any = currencyAddress
@@ -163,95 +189,213 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
       domainOrCurrency = { name: 'Centrifuge', version: '1', chainId, verifyingContract: currencyAddress }
     }
 
+    const centrifugeRouterAddress = getCentrifugeRouterAddress(chainId)
+    const deadline = Math.floor(Date.now() / 1000) + 3600 // 1 hour
     const permit = await signERC2612Permit(
       inst.config.evmSigner,
       domainOrCurrency,
       inst.getSignerAddress('evm'),
-      spender,
-      amount.toString()
+      centrifugeRouterAddress,
+      amount.toString(),
+      deadline
     )
     return permit as Permit
   }
 
-  function increaseInvestOrder(args: [lpAddress: string, order: BN], options: TransactionRequest = {}) {
-    const [lpAddress, order] = args
+  function increaseInvestOrder(
+    args: [lpAddress: string, order: BN, chainId: number],
+    options: TransactionRequest = {}
+  ) {
+    const [lpAddress, order, chainId] = args
     const user = inst.getSignerAddress('evm')
-    return pending(
-      contract(lpAddress, ABI.LiquidityPool).requestDeposit(order.toString(), user, user, {
-        ...options,
-        gasLimit: 300000,
+    if (!inst.config.evmSigner) throw new Error('EVM signer not set')
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        const iface = new Interface(ABI.CentrifugeRouter)
+        // TODO: add these back after contract upgrade that allows to call the enable function
+        // const requestDeposit = iface.encodeFunctionData('requestDeposit', [
+        //   lpAddress,
+        //   order.toString(),
+        //   user,
+        //   user,
+        //   estimate,
+        // ])
+        // const enable = iface.encodeFunctionData('enable', [lpAddress])
+        const enable = iface.encodeFunctionData('enableLockDepositRequest', [lpAddress, order.toString()])
+        const requestDeposit = iface.encodeFunctionData('executeLockedDepositRequest', [lpAddress, user, estimate])
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).multicall([enable, requestDeposit], {
+            ...options,
+            gasLimit: 500000,
+            value: estimate,
+          })
+        )
       })
     )
   }
 
-  function increaseRedeemOrder(args: [lpAddress: string, order: BN], options: TransactionRequest = {}) {
-    const [lpAddress, order] = args
+  function increaseRedeemOrder(
+    args: [lpAddress: string, order: BN, chainId: number],
+    options: TransactionRequest = {}
+  ) {
+    const [lpAddress, order, chainId] = args
     const user = inst.getSignerAddress('evm')
-    return pending(
-      contract(lpAddress, ABI.LiquidityPool).requestRedeem(order.toString(), user, user, {
-        ...options,
-        gasLimit: 300000,
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).requestRedeem(
+            lpAddress,
+            order.toString(),
+            user,
+            user,
+            estimate,
+            {
+              ...options,
+              gasLimit: 300000,
+              value: estimate,
+            }
+          )
+        )
       })
     )
   }
 
-  // Disabled for now, will go through the router later
-  // function increaseInvestOrderWithPermit(
-  //   args: [lpAddress: string, order: BN, permit: Permit],
-  //   options: TransactionRequest = {}
-  // ) {
-  //   const [lpAddress, order, { deadline, r, s, v }] = args
-  //   const user = inst.getSignerAddress('evm')
-  //   return pending(
-  //     contract(lpAddress, ABI.LiquidityPool).requestDepositWithPermit(order.toString(), user, [], deadline, v, r, s, {
-  //       ...options,
-  //       gasLimit: 300000,
-  //     })
-  //   )
-  // }
-
-  function cancelRedeemOrder(args: [lpAddress: string], options: TransactionRequest = {}) {
-    const [lpAddress] = args
+  function increaseInvestOrderWithPermit(
+    args: [lpAddress: string, order: BN, currencyAddress: string, permit: Permit, chainId: number],
+    options: TransactionRequest = {}
+  ) {
+    const [lpAddress, order, currencyAddress, { deadline, r, s, v }, chainId] = args
     const user = inst.getSignerAddress('evm')
-    return pending(contract(lpAddress, ABI.LiquidityPool).cancelRedeemRequest(0, user, options))
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        const iface = new Interface(ABI.CentrifugeRouter)
+        // TODO: add these back after contract upgrade that allows to call the enable function
+        // const requestDeposit = iface.encodeFunctionData('requestDeposit', [
+        //   lpAddress,
+        //   order.toString(),
+        //   user,
+        //   user,
+        //   estimate,
+        // ])
+        // const enable = iface.encodeFunctionData('enable', [lpAddress])
+        const enable = iface.encodeFunctionData('enableLockDepositRequest', [lpAddress, order.toString()])
+        const requestDeposit = iface.encodeFunctionData('executeLockedDepositRequest', [lpAddress, user, estimate])
+        const permit = iface.encodeFunctionData('permit', [
+          currencyAddress,
+          centrifugeRouter,
+          order.toString(),
+          deadline,
+          v,
+          r,
+          s,
+        ])
+
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).multicall([permit, enable, requestDeposit], {
+            ...options,
+            gasLimit: 500000,
+            value: estimate,
+          })
+        )
+      })
+    )
   }
 
-  function cancelInvestOrder(args: [lpAddress: string], options: TransactionRequest = {}) {
-    const [lpAddress] = args
-    const user = inst.getSignerAddress('evm')
-    return pending(contract(lpAddress, ABI.LiquidityPool).cancelDepositRequest(0, user, options))
+  function cancelRedeemOrder(args: [lpAddress: string, chainId: number], options: TransactionRequest = {}) {
+    const [lpAddress, chainId] = args
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).cancelRedeemRequest(lpAddress, estimate, {
+            ...options,
+            value: estimate,
+          })
+        )
+      })
+    )
   }
 
-  function claimCancelDeposit(args: [lpAddress: string], options: TransactionRequest = {}) {
-    const [lpAddress] = args
+  /** After cancelDepositRequest is executed (gas paid on Axelar) one more message (fulfilledCancelDepositRequest) has to be paid for manually on Axelar */
+  function cancelInvestOrder(args: [lpAddress: string, chainId: number], options: TransactionRequest = {}) {
+    const [lpAddress, chainId] = args
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).cancelDepositRequest(lpAddress, estimate, {
+            ...options,
+            value: estimate,
+          })
+        )
+      })
+    )
+  }
+
+  function claimCancelDeposit(args: [lpAddress: string, chainId: number], options: TransactionRequest = {}) {
+    const [lpAddress, chainId] = args
     const user = inst.getSignerAddress('evm')
-    return pending(contract(lpAddress, ABI.LiquidityPool).claimCancelDepositRequest(0, user, user, options))
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).claimCancelDepositRequest(lpAddress, user, user, {
+            ...options,
+            value: estimate,
+          })
+        )
+      })
+    )
   }
 
-  function claimCancelRedeem(args: [lpAddress: string], options: TransactionRequest = {}) {
-    const [lpAddress] = args
+  function claimCancelRedeem(args: [lpAddress: string, chainId: number], options: TransactionRequest = {}) {
+    const [lpAddress, chainId] = args
     const user = inst.getSignerAddress('evm')
-    return pending(contract(lpAddress, ABI.LiquidityPool).claimCancelRedeemRequest(0, user, user, options))
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).claimCancelRedeemRequest(lpAddress, user, user, {
+            ...options,
+            value: estimate,
+          })
+        )
+      })
+    )
   }
 
-  function mint(args: [lpAddress: string, mint: BN, receiver?: string], options: TransactionRequest = {}) {
-    const [lpAddress, mint, receiver] = args
+  function mint(args: [lpAddress: string, chainId: number, receiver?: string], options: TransactionRequest = {}) {
+    const [lpAddress, chainId, receiver] = args
     const user = inst.getSignerAddress('evm')
-    return pending(
-      contract(lpAddress, ABI.LiquidityPool).mint(mint.toString(), receiver ?? user, {
-        ...options,
-        gasLimit: 200000,
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).claimDeposit(lpAddress, receiver ?? user, user, {
+            ...options,
+            value: estimate,
+            gasLimit: 200000,
+          })
+        )
       })
     )
   }
 
-  function withdraw(args: [lpAddress: string, withdraw: BN, receiver?: string], options: TransactionRequest = {}) {
-    const [lpAddress, withdraw, receiver] = args
+  function withdraw(
+    args: [lpAddress: string, withdraw: BN, chainId: number, receiver?: string],
+    options: TransactionRequest = {}
+  ) {
+    const [lpAddress, withdraw, chainId, receiver] = args
     const user = inst.getSignerAddress('evm')
-    return pending(
-      contract(lpAddress, ABI.LiquidityPool).withdraw(withdraw.toString(), receiver ?? user, user, {
-        ...options,
-        gasLimit: 200000,
+    return centrifugeRouter(chainId).pipe(
+      switchMap(({ estimate, centrifugeRouter }) => {
+        return pending(
+          contract(centrifugeRouter, ABI.CentrifugeRouter).claimRedeem(
+            lpAddress,
+            withdraw.toString(),
+            receiver ?? user,
+            {
+              ...options,
+              value: estimate,
+              gasLimit: 200000,
+            }
+          )
+        )
       })
     )
   }
@@ -524,11 +668,13 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
         currency: CurrencyMetadata & { address: string }
         trancheTokenAddress: string
         trancheTokenDecimals: number
-      }
+      },
+      chainId: number
     ],
     options?: EvmQueryOptions
   ) {
-    const [user, lp] = args
+    const [user, lp, chainId] = args
+    const centrifugeRouterAddress = getCentrifugeRouterAddress(chainId)
 
     const currencyBalanceTransform = toCurrencyBalance(lp.currency.decimals)
     const tokenBalanceTransform = toTokenBalance(lp.trancheTokenDecimals)
@@ -551,7 +697,7 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
       },
       {
         target: lp.currency.address,
-        call: ['function allowance(address, address) view returns (uint)', user, lp.lpAddress],
+        call: ['function allowance(address, address) view returns (uint)', user, centrifugeRouterAddress],
         returns: [['lpCurrencyAllowance', currencyBalanceTransform]],
       },
       {
@@ -614,7 +760,7 @@ export function getLiquidityPoolsModule(inst: Centrifuge) {
     deployLiquidityPool,
     increaseInvestOrder,
     increaseRedeemOrder,
-    // increaseInvestOrderWithPermit,
+    increaseInvestOrderWithPermit,
     cancelInvestOrder,
     cancelRedeemOrder,
     mint,
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/CentrifugeRouter.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/CentrifugeRouter.abi.json
new file mode 100644
index 0000000000..cf633e07fd
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/CentrifugeRouter.abi.json
@@ -0,0 +1,418 @@
+[
+  {
+    "inputs": [
+      { "internalType": "address", "name": "escrow_", "type": "address" },
+      { "internalType": "address", "name": "gateway_", "type": "address" },
+      { "internalType": "address", "name": "poolManager_", "type": "address" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": true, "internalType": "address", "name": "user", "type": "address" }],
+    "name": "Deny",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "vault", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "controller", "type": "address" },
+      { "indexed": false, "internalType": "address", "name": "sender", "type": "address" }
+    ],
+    "name": "ExecuteLockedDepositRequest",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "vault", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "controller", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "owner", "type": "address" },
+      { "indexed": false, "internalType": "address", "name": "sender", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "LockDepositRequest",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": true, "internalType": "address", "name": "user", "type": "address" }],
+    "name": "Rely",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "vault", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "controller", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "receiver", "type": "address" }
+    ],
+    "name": "UnlockDepositRequest",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "INITIATOR_SLOT",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "cancelDepositRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "cancelRedeemRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "receiver", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" }
+    ],
+    "name": "claimCancelDepositRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "receiver", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" }
+    ],
+    "name": "claimCancelRedeemRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "receiver", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" }
+    ],
+    "name": "claimDeposit",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "receiver", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" }
+    ],
+    "name": "claimRedeem",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "user", "type": "address" }],
+    "name": "deny",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "vault", "type": "address" }],
+    "name": "disable",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "vault", "type": "address" }],
+    "name": "enable",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "enableLockDepositRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "escrow",
+    "outputs": [{ "internalType": "contract IEscrow", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "payload", "type": "bytes" }],
+    "name": "estimate",
+    "outputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "executeLockedDepositRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gateway",
+    "outputs": [{ "internalType": "contract IGateway", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint64", "name": "poolId", "type": "uint64" },
+      { "internalType": "bytes16", "name": "trancheId", "type": "bytes16" },
+      { "internalType": "address", "name": "asset", "type": "address" }
+    ],
+    "name": "getVault",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" }
+    ],
+    "name": "hasPermissions",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "controller", "type": "address" }
+    ],
+    "name": "isEnabled",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
+      { "internalType": "address", "name": "controller", "type": "address" },
+      { "internalType": "address", "name": "owner", "type": "address" }
+    ],
+    "name": "lockDepositRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "controller", "type": "address" },
+      { "internalType": "address", "name": "vault", "type": "address" }
+    ],
+    "name": "lockedRequests",
+    "outputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes[]", "name": "data", "type": "bytes[]" }],
+    "name": "multicall",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "asset", "type": "address" },
+      { "internalType": "address", "name": "spender", "type": "address" },
+      { "internalType": "uint256", "name": "assets", "type": "uint256" },
+      { "internalType": "uint256", "name": "deadline", "type": "uint256" },
+      { "internalType": "uint8", "name": "v", "type": "uint8" },
+      { "internalType": "bytes32", "name": "r", "type": "bytes32" },
+      { "internalType": "bytes32", "name": "s", "type": "bytes32" }
+    ],
+    "name": "permit",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "poolManager",
+    "outputs": [{ "internalType": "contract IPoolManager", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "token", "type": "address" },
+      { "internalType": "address", "name": "to", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "recoverTokens",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "user", "type": "address" }],
+    "name": "rely",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
+      { "internalType": "address", "name": "controller", "type": "address" },
+      { "internalType": "address", "name": "owner", "type": "address" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "requestDeposit",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
+      { "internalType": "address", "name": "controller", "type": "address" },
+      { "internalType": "address", "name": "owner", "type": "address" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "requestRedeem",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "asset", "type": "address" },
+      { "internalType": "address", "name": "recipient", "type": "address" },
+      { "internalType": "uint128", "name": "amount", "type": "uint128" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "transferAssets",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "transferProxy", "type": "address" },
+      { "internalType": "address", "name": "asset", "type": "address" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "transferAssets",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "asset", "type": "address" },
+      { "internalType": "bytes32", "name": "recipient", "type": "bytes32" },
+      { "internalType": "uint128", "name": "amount", "type": "uint128" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "transferAssets",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "enum Domain", "name": "domain", "type": "uint8" },
+      { "internalType": "uint64", "name": "chainId", "type": "uint64" },
+      { "internalType": "bytes32", "name": "recipient", "type": "bytes32" },
+      { "internalType": "uint128", "name": "amount", "type": "uint128" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "transferTrancheTokens",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "enum Domain", "name": "domain", "type": "uint8" },
+      { "internalType": "uint64", "name": "chainId", "type": "uint64" },
+      { "internalType": "address", "name": "recipient", "type": "address" },
+      { "internalType": "uint128", "name": "amount", "type": "uint128" },
+      { "internalType": "uint256", "name": "topUpAmount", "type": "uint256" }
+    ],
+    "name": "transferTrancheTokens",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "vault", "type": "address" },
+      { "internalType": "address", "name": "receiver", "type": "address" }
+    ],
+    "name": "unlockDepositRequest",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "wrapper", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
+      { "internalType": "address", "name": "receiver", "type": "address" }
+    ],
+    "name": "unwrap",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "wards",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "wrapper", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
+      { "internalType": "address", "name": "receiver", "type": "address" },
+      { "internalType": "address", "name": "owner", "type": "address" }
+    ],
+    "name": "wrap",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  }
+]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/index.ts b/centrifuge-js/src/modules/liquidityPools/abi/index.ts
index d40d66ef3b..3b88a90b56 100644
--- a/centrifuge-js/src/modules/liquidityPools/abi/index.ts
+++ b/centrifuge-js/src/modules/liquidityPools/abi/index.ts
@@ -1,3 +1,4 @@
+import CentrifugeRouter from './CentrifugeRouter.abi.json'
 import Currency from './Currency.abi.json'
 import Gateway from './Gateway.abi.json'
 import InvestmentManager from './InvestmentManager.abi.json'
@@ -6,4 +7,4 @@ import Permit from './Permit.abi.json'
 import PoolManager from './PoolManager.abi.json'
 import Router from './Router.abi.json'
 
-export { LiquidityPool, Currency, InvestmentManager, PoolManager, Router, Gateway, Permit }
+export { CentrifugeRouter, Currency, Gateway, InvestmentManager, LiquidityPool, Permit, PoolManager, Router }

From f6f4dfdc770560c13c345ea76561c4899db72cca Mon Sep 17 00:00:00 2001
From: Sophia <littlejohn.sophia@gmail.com>
Date: Fri, 6 Sep 2024 17:14:25 -0400
Subject: [PATCH 2/4] Hotfix: finance form validation, subql self hosted,
 withdraw batch fix (#2436) (#2437)

* Point subquery to new version

* Fix pending NAV calc

* Fix mistake in subquery urls

* Fix withdraw address validation

* Include withdraw batch only where necessary

* Undo accidental commit

* Revalidate forms when source changes
---
 centrifuge-app/.env-config/.env.ff-prod       |  2 +-
 centrifuge-app/.env-config/.env.production    |  2 +-
 .../src/pages/Loan/ExternalFinanceForm.tsx    |  5 ++++
 centrifuge-app/src/pages/Loan/FinanceForm.tsx |  2 ++
 .../NavManagement/NavManagementAssetTable.tsx | 26 ++-----------------
 .../src/pages/NavManagement/Overview.tsx      |  6 ++++-
 6 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/centrifuge-app/.env-config/.env.ff-prod b/centrifuge-app/.env-config/.env.ff-prod
index 2cd9cc716f..08482b5a59 100644
--- a/centrifuge-app/.env-config/.env.ff-prod
+++ b/centrifuge-app/.env-config/.env.ff-prod
@@ -8,7 +8,7 @@ REACT_APP_ONBOARDING_API_URL=https://europe-central2-centrifuge-production-x.clo
 REACT_APP_PINNING_API_URL=https://europe-central2-centrifuge-production-x.cloudfunctions.net/pinning-api-production
 REACT_APP_POOL_CREATION_TYPE=propose
 REACT_APP_RELAY_WSS_URL=wss://rpc.polkadot.io
-REACT_APP_SUBQUERY_URL=https://subql.embrio.tech
+REACT_APP_SUBQUERY_URL=https://api.centrifuge.io
 REACT_APP_SUBSCAN_URL=https://centrifuge.subscan.io
 REACT_APP_TINLAKE_NETWORK=mainnet
 REACT_APP_INFURA_KEY=8ed99a9a115349bbbc01dcf3a24edc96
diff --git a/centrifuge-app/.env-config/.env.production b/centrifuge-app/.env-config/.env.production
index 18d7de6e58..7dadec3d96 100644
--- a/centrifuge-app/.env-config/.env.production
+++ b/centrifuge-app/.env-config/.env.production
@@ -8,7 +8,7 @@ REACT_APP_ONBOARDING_API_URL=https://europe-central2-centrifuge-production-x.clo
 REACT_APP_PINNING_API_URL=https://europe-central2-centrifuge-production-x.cloudfunctions.net/pinning-api-production
 REACT_APP_POOL_CREATION_TYPE=propose
 REACT_APP_RELAY_WSS_URL=wss://rpc.polkadot.io
-REACT_APP_SUBQUERY_URL=https://subql.embrio.tech
+REACT_APP_SUBQUERY_URL=https://api.centrifuge.io
 REACT_APP_SUBSCAN_URL=https://centrifuge.subscan.io
 REACT_APP_TINLAKE_NETWORK=mainnet
 REACT_APP_INFURA_KEY=8ed99a9a115349bbbc01dcf3a24edc96
diff --git a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
index 2b1bb380e7..a81ce0a66f 100644
--- a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
@@ -116,6 +116,11 @@ export function ExternalFinanceForm({ loan, source }: { loan: ExternalLoan; sour
 
   const withdraw = useWithdraw(loan.poolId, account!, totalFinance, source)
 
+  React.useEffect(() => {
+    financeForm.validateForm()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [source])
+
   if (loan.status === 'Closed' || ('valuationMethod' in loan.pricing && loan.pricing.valuationMethod !== 'oracle')) {
     return null
   }
diff --git a/centrifuge-app/src/pages/Loan/FinanceForm.tsx b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
index e168b2b665..e86d084839 100644
--- a/centrifuge-app/src/pages/Loan/FinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
@@ -561,6 +561,8 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
       return source === 'reserve' ? amount.lte(totalAvailable) && !!withdrawalAddresses.length : true
     },
     getBatch: () => {
+      const withdrawalAddresses = Object.values(selectedAddressIndexByCurrency).filter((index) => index !== -1)
+      if (!withdrawalAddresses.length) return of([])
       return combineLatest(
         withdrawAmounts.flatMap((bucket) => {
           const index = selectedAddressIndexByCurrency[bucket.currencyKey] ?? 0
diff --git a/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx b/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx
index 3d9cacb348..44ebb81319 100644
--- a/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx
+++ b/centrifuge-app/src/pages/NavManagement/NavManagementAssetTable.tsx
@@ -19,7 +19,7 @@ import { combineLatest, switchMap } from 'rxjs'
 import daiLogo from '../../assets/images/dai-logo.svg'
 import usdcLogo from '../../assets/images/usdc-logo.svg'
 import { ButtonGroup } from '../../components/ButtonGroup'
-import { DataCol, DataRow, DataTable } from '../../components/DataTable'
+import { DataTable } from '../../components/DataTable'
 import { LayoutSection } from '../../components/LayoutBase/LayoutSection'
 import { AssetName } from '../../components/LoanList'
 import { RouterTextLink } from '../../components/TextLink'
@@ -386,29 +386,7 @@ export function NavManagementAssetTable({ poolId }: { poolId: string }) {
             )
           }
         >
-          <DataTable
-            data={[...reserveRow, ...cashLoans, ...form.values.feed]}
-            columns={columns}
-            footer={
-              <DataRow>
-                <DataCol align="left">
-                  <Text color="accentPrimary" variant="body2">
-                    Total
-                  </Text>
-                </DataCol>
-                <DataCol />
-                <DataCol />
-                <DataCol />
-                <DataCol />
-                {isEditing && <DataCol />}
-                <DataCol>
-                  <Text color="accentPrimary" variant="body2">
-                    {formatBalance(newNav, pool.currency.symbol)}
-                  </Text>
-                </DataCol>
-              </DataRow>
-            }
-          />
+          <DataTable data={[...reserveRow, ...cashLoans, ...form.values.feed]} columns={columns} />
         </LayoutSection>
       </FormikProvider>
     </Stack>
diff --git a/centrifuge-app/src/pages/NavManagement/Overview.tsx b/centrifuge-app/src/pages/NavManagement/Overview.tsx
index 2892d4a6e7..e8a3f78e44 100644
--- a/centrifuge-app/src/pages/NavManagement/Overview.tsx
+++ b/centrifuge-app/src/pages/NavManagement/Overview.tsx
@@ -109,7 +109,11 @@ export function NavOverviewCard({ poolId }: { poolId: string }) {
       current={pool.nav.total.toFloat()}
       change={changeInValuation ? new CurrencyBalance(changeInValuation, pool.currency.decimals).toFloat() : 0}
       pendingFees={pendingFees.toFloat()}
-      pendingNav={pool.nav.total.toFloat() - pendingFees.toFloat()}
+      pendingNav={new CurrencyBalance(changeInValuation, pool.currency.decimals)
+        .toDecimal()
+        .add(pool.nav.total.toDecimal())
+        .sub(pendingFees.toDecimal())
+        .toNumber()}
     />
   )
 }

From 985f65312cc9084215da5c0416cbd440f6d5b555 Mon Sep 17 00:00:00 2001
From: Sophia <littlejohn.sophia@gmail.com>
Date: Mon, 9 Sep 2024 09:03:29 -0400
Subject: [PATCH 3/4] Merge hotfix back into main (#2439)

* Hotfix: finance form validation, subql self hosted, withdraw batch fix (#2436)

* Point subquery to new version

* Fix pending NAV calc

* Fix mistake in subquery urls

* Fix withdraw address validation

* Include withdraw batch only where necessary

* Undo accidental commit

* Revalidate forms when source changes

* Add cursor based pagination for asset transactions (#2438)
---
 centrifuge-app/src/pages/Loan/FinanceForm.tsx |  1 +
 centrifuge-js/src/modules/pools.ts            | 87 +++++++++++++------
 2 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/centrifuge-app/src/pages/Loan/FinanceForm.tsx b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
index e86d084839..ef302606d7 100644
--- a/centrifuge-app/src/pages/Loan/FinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
@@ -540,6 +540,7 @@ export function useWithdraw(poolId: string, borrower: CombinedSubstrateAccount,
       },
     }
   }
+
   return {
     render: () => (
       <Mux
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index 9fcef9665d..1b25b22b83 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -3083,12 +3083,63 @@ export function getPoolsModule(inst: Centrifuge) {
   function getAssetTransactions(args: [poolId: string, from?: Date, to?: Date]) {
     const [poolId, from, to] = args
 
-    const $query = inst.getSubqueryObservable<{
-      assetTransactions: { nodes: SubqueryAssetTransaction[] }
+    return of({ assetTransactions: [], endCursor: null, hasNextPage: true }).pipe(
+      expand(({ assetTransactions, endCursor, hasNextPage }) => {
+        if (!hasNextPage) return EMPTY
+        return getAssetTransactionsWithCursor(poolId, endCursor, from, to).pipe(
+          map((response) => {
+            if (response?.assetTransactions) {
+              const { endCursor, hasNextPage } = response.assetTransactions.pageInfo
+
+              return {
+                endCursor,
+                hasNextPage,
+                assetTransactions: [...assetTransactions, ...response.assetTransactions.nodes],
+              }
+            }
+            return {}
+          })
+        )
+      }),
+      takeLast(1),
+      switchMap(({ assetTransactions }) => combineLatest([of(assetTransactions), getPoolCurrency([poolId])])),
+      map(([transactions, currency]) => {
+        return (
+          transactions?.map((tx) => ({
+            ...tx,
+            amount: tx.amount ? new CurrencyBalance(tx.amount, currency.decimals) : undefined,
+            principalAmount: tx.principalAmount
+              ? new CurrencyBalance(tx.principalAmount, currency.decimals)
+              : undefined,
+            interestAmount: tx.interestAmount ? new CurrencyBalance(tx.interestAmount, currency.decimals) : undefined,
+            realizedProfitFifo: tx.realizedProfitFifo
+              ? new CurrencyBalance(tx.realizedProfitFifo, currency.decimals)
+              : undefined,
+            sumRealizedProfitFifo: tx.asset.sumRealizedProfitFifo
+              ? new CurrencyBalance(tx.asset.sumRealizedProfitFifo, currency.decimals)
+              : undefined,
+            unrealizedProfitAtMarketPrice: tx.asset.unrealizedProfitAtMarketPrice
+              ? new CurrencyBalance(tx.asset.unrealizedProfitAtMarketPrice, currency.decimals)
+              : undefined,
+            timestamp: new Date(`${tx.timestamp}+00:00`),
+          })) || ([] satisfies AssetTransaction[])
+        )
+      })
+    )
+  }
+
+  function getAssetTransactionsWithCursor(poolId: string, endCursor: string | null, from?: Date, to?: Date) {
+    return inst.getSubqueryObservable<{
+      assetTransactions: {
+        nodes: SubqueryAssetTransaction[]
+        pageInfo: { hasNextPage: boolean; endCursor: string }
+      }
     }>(
-      `query($poolId: String!, $from: Datetime!, $to: Datetime!) {
+      `query($poolId: String!, $from: Datetime!, $to: Datetime!, $after: Cursor) {
         assetTransactions(
+          first: 100,
           orderBy: TIMESTAMP_ASC,
+          after: $after,
           filter: {
             poolId: { equalTo: $poolId },
             timestamp: { greaterThan: $from, lessThan: $to },
@@ -3125,38 +3176,20 @@ export function getPoolsModule(inst: Centrifuge) {
               type
             }
           }
+          pageInfo {
+            hasNextPage
+            endCursor
+          }
         }
-      }
-      `,
+      }`,
       {
         poolId,
         from: from ? from.toISOString() : getDateYearsFromNow(-10).toISOString(),
         to: to ? to.toISOString() : new Date().toISOString(),
+        after: endCursor,
       },
       false
     )
-
-    return $query.pipe(
-      switchMap(() => combineLatest([$query, getPoolCurrency([poolId])])),
-      map(([data, currency]) => {
-        return data!.assetTransactions.nodes.map((tx) => ({
-          ...tx,
-          amount: tx.amount ? new CurrencyBalance(tx.amount, currency.decimals) : undefined,
-          principalAmount: tx.principalAmount ? new CurrencyBalance(tx.principalAmount, currency.decimals) : undefined,
-          interestAmount: tx.interestAmount ? new CurrencyBalance(tx.interestAmount, currency.decimals) : undefined,
-          realizedProfitFifo: tx.realizedProfitFifo
-            ? new CurrencyBalance(tx.realizedProfitFifo, currency.decimals)
-            : undefined,
-          sumRealizedProfitFifo: tx.asset.sumRealizedProfitFifo
-            ? new CurrencyBalance(tx.asset.sumRealizedProfitFifo, currency.decimals)
-            : undefined,
-          unrealizedProfitAtMarketPrice: tx.asset.unrealizedProfitAtMarketPrice
-            ? new CurrencyBalance(tx.asset.unrealizedProfitAtMarketPrice, currency.decimals)
-            : undefined,
-          timestamp: new Date(`${tx.timestamp}+00:00`),
-        })) satisfies AssetTransaction[]
-      })
-    )
   }
 
   function getFeeTransactions(args: [poolId: string, from?: Date, to?: Date]) {

From a199cab4b25e71fd4d5d3b82c6484e8e07a70951 Mon Sep 17 00:00:00 2001
From: Katty Barroso <51223655+kattylucy@users.noreply.github.com>
Date: Tue, 10 Sep 2024 08:58:38 -0500
Subject: [PATCH 4/4] Fix date for reporting (#2393)

* Fix date for reporting

Date should always be date before submitting to subquery

* Fix date header for balance sheet

It should only show the month of the report for monthly
---
 .../components/Report/CashflowStatement.tsx   | 26 ++-----------------
 .../src/components/Report/ProfitAndLoss.tsx   | 26 ++-----------------
 .../src/components/Report/utils.tsx           | 23 ++++++++++++++++
 centrifuge-js/src/modules/pools.ts            | 24 +++++++++++++----
 centrifuge-js/src/utils/index.ts              |  6 +++++
 5 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/centrifuge-app/src/components/Report/CashflowStatement.tsx b/centrifuge-app/src/components/Report/CashflowStatement.tsx
index 56b100678d..9647f85bd0 100644
--- a/centrifuge-app/src/components/Report/CashflowStatement.tsx
+++ b/centrifuge-app/src/components/Report/CashflowStatement.tsx
@@ -17,6 +17,7 @@ import { Spinner } from '../Spinner'
 import { ReportContext } from './ReportContext'
 import { UserFeedback } from './UserFeedback'
 import type { TableDataRow } from './index'
+import { getColumnHeader } from './utils'
 
 type Row = TableDataRow & {
   formatter?: (v: any) => any
@@ -83,29 +84,6 @@ export function CashflowStatement({ pool }: { pool: Pool }) {
       return []
     }
 
-    const getColumnHeader = (timestamp: string) => {
-      if (groupBy === 'day' || groupBy === 'daily') {
-        return new Date(timestamp).toLocaleDateString('en-US', {
-          day: 'numeric',
-          month: 'short',
-          year: 'numeric',
-        })
-      } else if (groupBy === 'month') {
-        return new Date(timestamp).toLocaleDateString('en-US', {
-          month: 'long',
-          year: 'numeric',
-        })
-      } else if (groupBy === 'quarter') {
-        const date = new Date(timestamp)
-        return `Q${Math.floor(date.getMonth() / 3) + 1} ${date.getFullYear()}`
-      } else if (groupBy === 'year') {
-        return new Date(timestamp).toLocaleDateString('en-US', {
-          year: 'numeric',
-        })
-      }
-      return ''
-    }
-
     return [
       {
         align: 'left',
@@ -125,7 +103,7 @@ export function CashflowStatement({ pool }: { pool: Pool }) {
         poolStates.map((state, index) => ({
           align: 'right',
           timestamp: state.timestamp,
-          header: getColumnHeader(state.timestamp),
+          header: getColumnHeader(state.timestamp, groupBy),
           cell: (row: Row) => (
             <Text variant={row.heading ? 'heading4' : row.bold ? 'interactive2' : 'body3'}>
               {row.formatter ? row.formatter((row.value as any)[index]) : (row.value as any)[index]}
diff --git a/centrifuge-app/src/components/Report/ProfitAndLoss.tsx b/centrifuge-app/src/components/Report/ProfitAndLoss.tsx
index 565178e126..cadd57ca52 100644
--- a/centrifuge-app/src/components/Report/ProfitAndLoss.tsx
+++ b/centrifuge-app/src/components/Report/ProfitAndLoss.tsx
@@ -16,6 +16,7 @@ import { Spinner } from '../Spinner'
 import { ReportContext } from './ReportContext'
 import { UserFeedback } from './UserFeedback'
 import type { TableDataRow } from './index'
+import { getColumnHeader } from './utils'
 
 type Row = TableDataRow & {
   formatter?: (v: any) => any
@@ -75,29 +76,6 @@ export function ProfitAndLoss({ pool }: { pool: Pool }) {
       return []
     }
 
-    const getColumnHeader = (timestamp: string) => {
-      if (groupBy === 'day' || groupBy === 'daily') {
-        return new Date(timestamp).toLocaleDateString('en-US', {
-          day: 'numeric',
-          month: 'short',
-          year: 'numeric',
-        })
-      } else if (groupBy === 'month') {
-        return new Date(timestamp).toLocaleDateString('en-US', {
-          month: 'long',
-          year: 'numeric',
-        })
-      } else if (groupBy === 'quarter') {
-        const date = new Date(timestamp)
-        return `Q${Math.floor(date.getMonth() / 3) + 1} ${date.getFullYear()}`
-      } else if (groupBy === 'year') {
-        return new Date(timestamp).toLocaleDateString('en-US', {
-          year: 'numeric',
-        })
-      }
-      return ''
-    }
-
     return [
       {
         align: 'left',
@@ -117,7 +95,7 @@ export function ProfitAndLoss({ pool }: { pool: Pool }) {
         poolStates.map((state, index) => ({
           align: 'right',
           timestamp: state.timestamp,
-          header: getColumnHeader(state.timestamp),
+          header: getColumnHeader(state.timestamp, groupBy),
           cell: (row: Row) => (
             <Text variant={row.heading ? 'heading4' : row.bold ? 'interactive2' : 'body3'}>
               {row.formatter ? row.formatter((row.value as any)[index]) : (row.value as any)[index]}
diff --git a/centrifuge-app/src/components/Report/utils.tsx b/centrifuge-app/src/components/Report/utils.tsx
index e3564d6bd9..34f364ff7b 100644
--- a/centrifuge-app/src/components/Report/utils.tsx
+++ b/centrifuge-app/src/components/Report/utils.tsx
@@ -155,3 +155,26 @@ export function convertCSV(values: any[], columnConfig: any[]) {
     })
   )
 }
+
+export const getColumnHeader = (timestamp: string, groupBy: string) => {
+  if (groupBy === 'day' || groupBy === 'daily') {
+    return new Date(timestamp).toLocaleDateString('en-US', {
+      day: 'numeric',
+      month: 'short',
+      year: 'numeric',
+    })
+  } else if (groupBy === 'month') {
+    return new Date(timestamp).toLocaleDateString('en-US', {
+      month: 'long',
+      year: 'numeric',
+    })
+  } else if (groupBy === 'quarter') {
+    const date = new Date(timestamp)
+    return `Q${Math.floor(date.getMonth() / 3) + 1} ${date.getFullYear()}`
+  } else if (groupBy === 'year') {
+    return new Date(timestamp).toLocaleDateString('en-US', {
+      year: 'numeric',
+    })
+  }
+  return ''
+}
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index 1b25b22b83..065abee0aa 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -36,6 +36,7 @@ import {
   getDateYearsFromNow,
   getRandomUint,
   isSameAddress,
+  isValidDate,
 } from '../utils'
 import { CurrencyBalance, Perquintill, Price, Rate, TokenBalance } from '../utils/BN'
 import { Dec } from '../utils/Decimal'
@@ -2292,8 +2293,15 @@ export function getPoolsModule(inst: Centrifuge) {
       }
     )
   }
-
   function getPoolSnapshotsWithCursor(poolId: string, endCursor: string | null, from?: Date, to?: Date) {
+    // Default values for invalid dates
+    const defaultFrom = getDateYearsFromNow(-10).toISOString()
+    const defaultTo = getDateYearsFromNow(10).toISOString()
+
+    // Use valid dates or default values
+    const validFrom = isValidDate(from) ? from?.toISOString() : defaultFrom
+    const validTo = isValidDate(to) ? to?.toISOString() : defaultTo
+
     return inst.getSubqueryObservable<{
       poolSnapshots: { nodes: SubqueryPoolSnapshot[]; pageInfo: { hasNextPage: boolean; endCursor: string } }
     }>(
@@ -2341,8 +2349,8 @@ export function getPoolsModule(inst: Centrifuge) {
     `,
       {
         poolId,
-        from: from ? from.toISOString() : getDateYearsFromNow(-10).toISOString(),
-        to: to ? to.toISOString() : getDateYearsFromNow(10).toISOString(),
+        from: validFrom,
+        to: validTo,
         poolCursor: endCursor,
       }
     )
@@ -2354,10 +2362,16 @@ export function getPoolsModule(inst: Centrifuge) {
     from?: Date,
     to?: Date
   ) {
+    const defaultFrom = getDateYearsFromNow(-10).toISOString()
+    const defaultTo = getDateYearsFromNow(10).toISOString()
+
+    const validFrom = isValidDate(from) ? from?.toISOString() : defaultFrom
+    const validTo = isValidDate(to) ? to?.toISOString() : defaultTo
+
     const filter: any = {
       timestamp: {
-        greaterThan: from ? from.toISOString() : getDateYearsFromNow(-10).toISOString(),
-        lessThan: to ? to.toISOString() : getDateYearsFromNow(10).toISOString(),
+        greaterThan: validFrom,
+        lessThan: validTo,
       },
     }
     if ('poolId' in filterBy) {
diff --git a/centrifuge-js/src/utils/index.ts b/centrifuge-js/src/utils/index.ts
index 7950752077..a1e316970b 100644
--- a/centrifuge-js/src/utils/index.ts
+++ b/centrifuge-js/src/utils/index.ts
@@ -151,3 +151,9 @@ export function isEvm(address: string) {
   const suffix = '45564d00'
   return address.length === 66 && address.endsWith(suffix)
 }
+
+export function isValidDate(value: string | Date | undefined) {
+  if (value === undefined) return false
+  const date = new Date(value)
+  return !isNaN(date.getTime())
+}