diff --git a/context/atomicContext.tsx b/context/atomicContext.tsx
index 7ebb74fbc..c4f9229ff 100644
--- a/context/atomicContext.tsx
+++ b/context/atomicContext.tsx
@@ -1,4 +1,4 @@
-import { Context, createContext, useContext, useEffect, useState } from 'react'
+import { Context, createContext, useContext, useEffect, useMemo, useState } from 'react'
import { useRouter } from 'next/router';
import { useSettingsState } from './settings';
import { Commit } from '../Models/PHTLC';
@@ -9,6 +9,17 @@ import { CommitFromApi } from '../lib/layerSwapApiClient';
import { toHex } from 'viem';
import LightClient from '../lib/lightClient';
+export enum CommitStatus {
+ Commit = 'commit',
+ Commited = 'commited',
+ LpLockDetected = 'lpLockDetected',
+ UserLocked = 'userLocked',
+ AssetsLocked = 'assetsLocked',
+ RedeemCompleted = 'redeemCompleted',
+ TimelockExpired = 'timelockExpired',
+ Refunded = 'refunded',
+}
+
const AtomicStateContext = createContext
(null);
type DataContextType = {
@@ -23,11 +34,11 @@ type DataContextType = {
destinationDetails?: Commit & { fetchedByLightClient?: boolean },
userLocked?: boolean,
sourceDetails?: Commit,
- isTimelockExpired?: boolean,
completedRefundHash?: string,
error: string | undefined,
commitFromApi?: CommitFromApi,
lightClient: LightClient | undefined,
+ commitStatus: CommitStatus,
onCommit: (commitId: string, txId: string) => void;
setDestinationDetails: (data: Commit & { fetchedByLightClient?: boolean }) => void;
setSourceDetails: (data: Commit) => void;
@@ -71,7 +82,9 @@ export function AtomicProvider({ children }) {
const fetcher = (args) => fetch(args).then(res => res.json())
const url = process.env.NEXT_PUBLIC_LS_API
const parsedCommitId = commitId ? toHex(BigInt(commitId)) : undefined
- const { data } = useSWR>((parsedCommitId && commitFromApi?.transactions.length !== 3 && destinationDetails?.claimed !== 3) ? `${url}/api/swap/${parsedCommitId}` : null, fetcher, { refreshInterval: 5000 })
+ const { data } = useSWR>((parsedCommitId && commitFromApi?.transactions.length !== 4 && destinationDetails?.claimed !== 3) ? `${url}/api/swap/${parsedCommitId}` : null, fetcher, { refreshInterval: 5000 })
+
+ const status = useMemo(() => statusResolver({ commitFromApi, sourceDetails, destinationDetails, destination_network, timelockExpired: isTimelockExpired, userLocked }), [commitFromApi, sourceDetails, destinationDetails, destination_network, isTimelockExpired, userLocked])
useEffect(() => {
if (data?.data) {
@@ -83,12 +96,14 @@ export function AtomicProvider({ children }) {
if (destination_network && destination_network.chain_id === '11155111') {
(async () => {
const lightClient = new LightClient()
+ console.log('init')
await lightClient.initProvider({ network: destination_network })
setLightClient(lightClient)
})()
}
}, [destination_network])
+
useEffect(() => {
let timer: NodeJS.Timeout;
@@ -137,11 +152,11 @@ export function AtomicProvider({ children }) {
sourceDetails,
destinationDetails,
userLocked,
- isTimelockExpired,
completedRefundHash,
error,
commitFromApi,
lightClient,
+ commitStatus: status,
setDestinationDetails,
setSourceDetails,
setUserLocked,
@@ -153,6 +168,23 @@ export function AtomicProvider({ children }) {
)
}
+const statusResolver = ({ commitFromApi, sourceDetails, destinationDetails, destination_network, timelockExpired, userLocked }: { commitFromApi: CommitFromApi | undefined, sourceDetails: Commit | undefined, destinationDetails: Commit | undefined, destination_network: Network | undefined, timelockExpired: boolean, userLocked: boolean }) => {
+ const lpRedeemTransaction = commitFromApi?.transactions.find(t => t.type === 'redeem' && t.network === destination_network?.name)
+
+ const commited = sourceDetails ? true : false;
+ const lpLockDetected = destinationDetails?.hashlock ? true : false;
+ const assetsLocked = sourceDetails?.hashlock && destinationDetails?.hashlock ? true : false;
+ const redeemCompleted = (destinationDetails?.claimed == 3 ? true : false) || lpRedeemTransaction?.hash;
+
+ if (timelockExpired) return CommitStatus.TimelockExpired
+ else if (redeemCompleted) return CommitStatus.RedeemCompleted
+ else if (assetsLocked) return CommitStatus.AssetsLocked
+ else if (userLocked) return CommitStatus.UserLocked
+ else if (lpLockDetected) return CommitStatus.LpLockDetected
+ else if (commited) return CommitStatus.Commited
+ else return CommitStatus.Commit
+}
+
export function useAtomicState() {
const data = useContext(AtomicStateContext as Context);
diff --git a/lib/layerSwapApiClient.ts b/lib/layerSwapApiClient.ts
index ca679cbf7..2dbf11954 100644
--- a/lib/layerSwapApiClient.ts
+++ b/lib/layerSwapApiClient.ts
@@ -133,7 +133,7 @@ export type CommitFromApi = {
receive_amount: number,
fee_amount: number,
transactions: {
- type: 'lock' | 'redeem',
+ type: 'lock' | 'redeem' | 'addlocksig',
hash: string,
network: string
}[]
diff --git a/lib/lightClient/providers/evm/index.ts b/lib/lightClient/providers/evm/index.ts
index 4d88db4e9..002c2e93a 100644
--- a/lib/lightClient/providers/evm/index.ts
+++ b/lib/lightClient/providers/evm/index.ts
@@ -94,9 +94,9 @@ export default class EVMLightClient extends _LightClient {
const result = event.data.data
const parsedResult: Commit = result ? {
...result,
- // secret: Number(hexToBigInt(result.secret._hex)) !== 1 ? result.secret : null,
- // amount: formatAmount(Number(hexToBigInt(result.amount._hex)), token.decimals),
- // timelock: Number(result.timelock)
+ secret: Number(hexToBigInt(result.secret._hex)) !== 1 ? result.secret : null,
+ amount: formatAmount(Number(hexToBigInt(result.amount._hex)), token.decimals),
+ timelock: Number(result.timelock)
} : undefined
console.log('Worker event:', event)
resolve(parsedResult)