diff --git a/apollo/src/aggregation/aggregation.history.graphql b/apollo/src/aggregation/aggregation.history.graphql
index 38f9868..c67321e 100644
--- a/apollo/src/aggregation/aggregation.history.graphql
+++ b/apollo/src/aggregation/aggregation.history.graphql
@@ -94,7 +94,7 @@ type HealthInfo {
 
 type Query {
   historyRecordById(id: String): HistoryRecord
-  historyRecordByNonce(fromChain: String, toChain: String, bridge: String, nonce: Int): HistoryRecord
+  previousHistoryRecord(fromChain: String, toChain: String, bridge: String, relayer: String, token: String, nonce: Int): HistoryRecord
   historyRecordByTxHash(txHash: String): HistoryRecord
   firstHistoryRecord(fromChain: String, toChain: String, bridge: String, results: [Int], relayer: String, token: String, order: String, notsubmited: Boolean): HistoryRecord
   historyRecords(sender: String, recipient: String, relayer: String, needWithdrawLiquidity: Boolean, fromChains: [String], toChains: [String], bridges: [String], row: Int, page: Int, results: [Int], recvTokenAddress: String,  order: String): HistoryRecords
diff --git a/apollo/src/aggregation/aggregation.resolver.ts b/apollo/src/aggregation/aggregation.resolver.ts
index 0339d8a..79b8a65 100644
--- a/apollo/src/aggregation/aggregation.resolver.ts
+++ b/apollo/src/aggregation/aggregation.resolver.ts
@@ -68,18 +68,30 @@ export class AggregationResolver {
   }
 
   @Query()
-  async historyRecordByNonce(
+  async previousHistoryRecord(
     @Args('fromChain') fromChain: string,
     @Args('toChain') toChain: string,
     @Args('bridge') bridge: string,
-    @Args('nonce') nonce: number 
+    @Args('relayer') relayer: string,
+    @Args('token') token: string,
+    @Args('nonce') nonce: number
   ) {
-    return this.aggregationService.queryHistoryRecordFirst({
-      fromChain,
-      toChain,
-      bridge,
-      nonce
-    });
+    const orderBy = { nonce: Prisma.SortOrder.desc };
+    return this.aggregationService.queryHistoryRecordFirst(
+      {
+        AND: {
+          fromChain: fromChain,
+          toChain: toChain,
+          bridge: bridge,
+          relayer: relayer,
+          sendTokenAddress: token,
+          nonce: {
+            lt: nonce,
+          },
+        },
+      },
+      orderBy
+    );
   }
 
   // query by source tx hash
diff --git a/apollo/src/graphql.ts b/apollo/src/graphql.ts
index a3e04cc..0b425d0 100644
--- a/apollo/src/graphql.ts
+++ b/apollo/src/graphql.ts
@@ -1,4 +1,3 @@
-
 /*
  * -------------------------------------------------------
  * THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
@@ -9,128 +8,226 @@
 /* eslint-disable */
 
 export class HistoryRecord {
-    id: string;
-    fromChain: string;
-    toChain: string;
-    bridge: string;
-    reason?: Nullable<string>;
-    nonce: BigInt;
-    requestTxHash: string;
-    responseTxHash?: Nullable<string>;
-    sender: string;
-    recipient: string;
-    sendToken: string;
-    recvToken: string;
-    sendAmount: string;
-    recvAmount?: Nullable<string>;
-    startTime: number;
-    endTime?: Nullable<number>;
-    result: number;
-    fee: string;
-    feeToken: string;
-    messageNonce?: Nullable<string>;
-    sendTokenAddress?: Nullable<string>;
-    recvTokenAddress?: Nullable<string>;
-    sendOuterTokenAddress?: Nullable<string>;
-    recvOuterTokenAddress?: Nullable<string>;
-    guardSignatures?: Nullable<string>;
-    relayer?: Nullable<string>;
-    endTxHash?: Nullable<string>;
-    confirmedBlocks?: Nullable<string>;
-    needWithdrawLiquidity?: Nullable<boolean>;
-    lastRequestWithdraw?: Nullable<BigInt>;
-    extData?: Nullable<string>;
+  id: string;
+  fromChain: string;
+  toChain: string;
+  bridge: string;
+  reason?: Nullable<string>;
+  nonce: BigInt;
+  requestTxHash: string;
+  responseTxHash?: Nullable<string>;
+  sender: string;
+  recipient: string;
+  sendToken: string;
+  recvToken: string;
+  sendAmount: string;
+  recvAmount?: Nullable<string>;
+  startTime: number;
+  endTime?: Nullable<number>;
+  result: number;
+  fee: string;
+  feeToken: string;
+  messageNonce?: Nullable<string>;
+  sendTokenAddress?: Nullable<string>;
+  recvTokenAddress?: Nullable<string>;
+  sendOuterTokenAddress?: Nullable<string>;
+  recvOuterTokenAddress?: Nullable<string>;
+  guardSignatures?: Nullable<string>;
+  relayer?: Nullable<string>;
+  endTxHash?: Nullable<string>;
+  confirmedBlocks?: Nullable<string>;
+  needWithdrawLiquidity?: Nullable<boolean>;
+  lastRequestWithdraw?: Nullable<BigInt>;
+  extData?: Nullable<string>;
 }
 
 export class HistoryRecords {
-    total: number;
-    records?: Nullable<Nullable<HistoryRecord>[]>;
+  total: number;
+  records?: Nullable<Nullable<HistoryRecord>[]>;
 }
 
 export class LnBridgeRelayInfo {
-    id: string;
-    version: string;
-    nonce: BigInt;
-    targetNonce?: Nullable<BigInt>;
-    fromChain: string;
-    toChain: string;
-    bridge: string;
-    relayer: string;
-    sendToken?: Nullable<string>;
-    tokenKey?: Nullable<string>;
-    transactionHash: string;
-    timestamp: number;
-    margin?: Nullable<string>;
-    protocolFee?: Nullable<string>;
-    baseFee?: Nullable<string>;
-    liquidityFeeRate?: Nullable<number>;
-    slashCount?: Nullable<number>;
-    withdrawNonce?: Nullable<BigInt>;
-    lastTransferId?: Nullable<string>;
-    cost?: Nullable<string>;
-    profit?: Nullable<string>;
-    heartbeatTimestamp?: Nullable<number>;
-    messageChannel?: Nullable<string>;
-    transferLimit?: Nullable<string>;
-    softTransferLimit?: Nullable<string>;
-    paused?: Nullable<boolean>;
-    dynamicFee?: Nullable<string>;
-    dynamicFeeExpire?: Nullable<string>;
-    dynamicFeeSignature?: Nullable<string>;
+  id: string;
+  version: string;
+  nonce: BigInt;
+  targetNonce?: Nullable<BigInt>;
+  fromChain: string;
+  toChain: string;
+  bridge: string;
+  relayer: string;
+  sendToken?: Nullable<string>;
+  tokenKey?: Nullable<string>;
+  transactionHash: string;
+  timestamp: number;
+  margin?: Nullable<string>;
+  protocolFee?: Nullable<string>;
+  baseFee?: Nullable<string>;
+  liquidityFeeRate?: Nullable<number>;
+  slashCount?: Nullable<number>;
+  withdrawNonce?: Nullable<BigInt>;
+  lastTransferId?: Nullable<string>;
+  cost?: Nullable<string>;
+  profit?: Nullable<string>;
+  heartbeatTimestamp?: Nullable<number>;
+  messageChannel?: Nullable<string>;
+  transferLimit?: Nullable<string>;
+  softTransferLimit?: Nullable<string>;
+  paused?: Nullable<boolean>;
+  dynamicFee?: Nullable<string>;
+  dynamicFeeExpire?: Nullable<string>;
+  dynamicFeeSignature?: Nullable<string>;
 }
 
 export class LnBridgeRelayInfos {
-    total: number;
-    records?: Nullable<Nullable<LnBridgeRelayInfo>[]>;
+  total: number;
+  records?: Nullable<Nullable<LnBridgeRelayInfo>[]>;
 }
 
 export class SortedLnBridgeRelayInfos {
-    transferLimit: BigInt;
-    records?: Nullable<Nullable<LnBridgeRelayInfo>[]>;
+  transferLimit: BigInt;
+  records?: Nullable<Nullable<LnBridgeRelayInfo>[]>;
 }
 
 export class SupportChains {
-    fromChain: string;
-    toChains?: Nullable<Nullable<string>[]>;
+  fromChain: string;
+  toChains?: Nullable<Nullable<string>[]>;
 }
 
 export class HealthInfo {
-    name?: Nullable<string>;
-    callTimes?: Nullable<number>;
+  name?: Nullable<string>;
+  callTimes?: Nullable<number>;
 }
 
 export abstract class IQuery {
-    abstract historyRecordById(id?: Nullable<string>): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
-
-    abstract historyRecordByNonce(fromChain?: Nullable<string>, toChain?: Nullable<string>, bridge?: Nullable<string>, nonce?: Nullable<number>): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
-
-    abstract historyRecordByTxHash(txHash?: Nullable<string>): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
-
-    abstract firstHistoryRecord(fromChain?: Nullable<string>, toChain?: Nullable<string>, bridge?: Nullable<string>, results?: Nullable<Nullable<number>[]>, relayer?: Nullable<string>, token?: Nullable<string>, order?: Nullable<string>, notsubmited?: Nullable<boolean>): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
-
-    abstract historyRecords(sender?: Nullable<string>, recipient?: Nullable<string>, relayer?: Nullable<string>, needWithdrawLiquidity?: Nullable<boolean>, fromChains?: Nullable<Nullable<string>[]>, toChains?: Nullable<Nullable<string>[]>, bridges?: Nullable<Nullable<string>[]>, row?: Nullable<number>, page?: Nullable<number>, results?: Nullable<Nullable<number>[]>, recvTokenAddress?: Nullable<string>, order?: Nullable<string>): Nullable<HistoryRecords> | Promise<Nullable<HistoryRecords>>;
-
-    abstract checkLnBridgeExist(fromChainId?: Nullable<number>, toChainId?: Nullable<number>, fromToken?: Nullable<string>, toToken?: Nullable<string>, version?: Nullable<string>): Nullable<boolean> | Promise<Nullable<boolean>>;
-
-    abstract tasksHealthCheck(name?: Nullable<string>): Nullable<Nullable<HealthInfo>[]> | Promise<Nullable<Nullable<HealthInfo>[]>>;
-
-    abstract queryRelayRecords(fromChain?: Nullable<string>, toChain?: Nullable<string>, bridge?: Nullable<string>, relayer?: Nullable<string>, row?: Nullable<number>): Nullable<HistoryRecords> | Promise<Nullable<HistoryRecords>>;
-
-    abstract queryLnBridgeRelayInfos(fromChain?: Nullable<string>, toChain?: Nullable<string>, version?: Nullable<string>, bridge?: Nullable<string>, relayer?: Nullable<string>, row?: Nullable<number>, page?: Nullable<number>): Nullable<LnBridgeRelayInfos> | Promise<Nullable<LnBridgeRelayInfos>>;
-
-    abstract sortedLnBridgeRelayInfos(fromChain?: Nullable<string>, toChain?: Nullable<string>, version?: Nullable<string>, bridge?: Nullable<string>, token?: Nullable<string>, row?: Nullable<number>, amount?: Nullable<string>, decimals?: Nullable<number>): Nullable<SortedLnBridgeRelayInfos> | Promise<Nullable<SortedLnBridgeRelayInfos>>;
-
-    abstract queryLnBridgeSupportChains(tokenKey?: Nullable<string>): Nullable<Nullable<SupportChains>[]> | Promise<Nullable<Nullable<SupportChains>[]>>;
-
-    abstract queryMaxTransfer(fromChain?: Nullable<string>, toChain?: Nullable<string>, bridge?: Nullable<string>, token?: Nullable<string>, balance?: Nullable<string>): Nullable<BigInt> | Promise<Nullable<BigInt>>;
+  abstract historyRecordById(
+    id?: Nullable<string>
+  ): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
+
+  abstract previousHistoryRecord(
+    fromChain?: Nullable<string>,
+    toChain?: Nullable<string>,
+    bridge?: Nullable<string>,
+    relayer?: Nullable<string>,
+    token?: Nullable<string>,
+    nonce?: Nullable<number>
+  ): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
+
+  abstract historyRecordByTxHash(
+    txHash?: Nullable<string>
+  ): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
+
+  abstract firstHistoryRecord(
+    fromChain?: Nullable<string>,
+    toChain?: Nullable<string>,
+    bridge?: Nullable<string>,
+    results?: Nullable<Nullable<number>[]>,
+    relayer?: Nullable<string>,
+    token?: Nullable<string>,
+    order?: Nullable<string>,
+    notsubmited?: Nullable<boolean>
+  ): Nullable<HistoryRecord> | Promise<Nullable<HistoryRecord>>;
+
+  abstract historyRecords(
+    sender?: Nullable<string>,
+    recipient?: Nullable<string>,
+    relayer?: Nullable<string>,
+    needWithdrawLiquidity?: Nullable<boolean>,
+    fromChains?: Nullable<Nullable<string>[]>,
+    toChains?: Nullable<Nullable<string>[]>,
+    bridges?: Nullable<Nullable<string>[]>,
+    row?: Nullable<number>,
+    page?: Nullable<number>,
+    results?: Nullable<Nullable<number>[]>,
+    recvTokenAddress?: Nullable<string>,
+    order?: Nullable<string>
+  ): Nullable<HistoryRecords> | Promise<Nullable<HistoryRecords>>;
+
+  abstract checkLnBridgeExist(
+    fromChainId?: Nullable<number>,
+    toChainId?: Nullable<number>,
+    fromToken?: Nullable<string>,
+    toToken?: Nullable<string>,
+    version?: Nullable<string>
+  ): Nullable<boolean> | Promise<Nullable<boolean>>;
+
+  abstract tasksHealthCheck(
+    name?: Nullable<string>
+  ): Nullable<Nullable<HealthInfo>[]> | Promise<Nullable<Nullable<HealthInfo>[]>>;
+
+  abstract queryRelayRecords(
+    fromChain?: Nullable<string>,
+    toChain?: Nullable<string>,
+    bridge?: Nullable<string>,
+    relayer?: Nullable<string>,
+    row?: Nullable<number>
+  ): Nullable<HistoryRecords> | Promise<Nullable<HistoryRecords>>;
+
+  abstract queryLnBridgeRelayInfos(
+    fromChain?: Nullable<string>,
+    toChain?: Nullable<string>,
+    version?: Nullable<string>,
+    bridge?: Nullable<string>,
+    relayer?: Nullable<string>,
+    row?: Nullable<number>,
+    page?: Nullable<number>
+  ): Nullable<LnBridgeRelayInfos> | Promise<Nullable<LnBridgeRelayInfos>>;
+
+  abstract sortedLnBridgeRelayInfos(
+    fromChain?: Nullable<string>,
+    toChain?: Nullable<string>,
+    version?: Nullable<string>,
+    bridge?: Nullable<string>,
+    token?: Nullable<string>,
+    row?: Nullable<number>,
+    amount?: Nullable<string>,
+    decimals?: Nullable<number>
+  ): Nullable<SortedLnBridgeRelayInfos> | Promise<Nullable<SortedLnBridgeRelayInfos>>;
+
+  abstract queryLnBridgeSupportChains(
+    tokenKey?: Nullable<string>
+  ): Nullable<Nullable<SupportChains>[]> | Promise<Nullable<Nullable<SupportChains>[]>>;
+
+  abstract queryMaxTransfer(
+    fromChain?: Nullable<string>,
+    toChain?: Nullable<string>,
+    bridge?: Nullable<string>,
+    token?: Nullable<string>,
+    balance?: Nullable<string>
+  ): Nullable<BigInt> | Promise<Nullable<BigInt>>;
 }
 
 export abstract class IMutation {
-    abstract signConfirmedBlock(id?: Nullable<string>, relayer?: Nullable<string>, block?: Nullable<string>, timestamp?: Nullable<number>, signature?: Nullable<string>): Nullable<string> | Promise<Nullable<string>>;
-
-    abstract signHeartBeat(fromChainId?: Nullable<string>, toChainId?: Nullable<string>, version?: Nullable<string>, relayer?: Nullable<string>, tokenAddress?: Nullable<string>, softTransferLimit?: Nullable<string>, timestamp?: Nullable<number>, signature?: Nullable<string>): Nullable<string> | Promise<Nullable<string>>;
-
-    abstract signDynamicFee(fromChainId?: Nullable<string>, toChainId?: Nullable<string>, version?: Nullable<string>, relayer?: Nullable<string>, tokenAddress?: Nullable<string>, dynamicFee?: Nullable<string>, dynamicFeeExpire?: Nullable<string>, dynamicFeeSignature?: Nullable<string>, timestamp?: Nullable<number>, signature?: Nullable<string>): Nullable<string> | Promise<Nullable<string>>;
+  abstract signConfirmedBlock(
+    id?: Nullable<string>,
+    relayer?: Nullable<string>,
+    block?: Nullable<string>,
+    timestamp?: Nullable<number>,
+    signature?: Nullable<string>
+  ): Nullable<string> | Promise<Nullable<string>>;
+
+  abstract signHeartBeat(
+    fromChainId?: Nullable<string>,
+    toChainId?: Nullable<string>,
+    version?: Nullable<string>,
+    relayer?: Nullable<string>,
+    tokenAddress?: Nullable<string>,
+    softTransferLimit?: Nullable<string>,
+    timestamp?: Nullable<number>,
+    signature?: Nullable<string>
+  ): Nullable<string> | Promise<Nullable<string>>;
+
+  abstract signDynamicFee(
+    fromChainId?: Nullable<string>,
+    toChainId?: Nullable<string>,
+    version?: Nullable<string>,
+    relayer?: Nullable<string>,
+    tokenAddress?: Nullable<string>,
+    dynamicFee?: Nullable<string>,
+    dynamicFeeExpire?: Nullable<string>,
+    dynamicFeeSignature?: Nullable<string>,
+    timestamp?: Nullable<number>,
+    signature?: Nullable<string>
+  ): Nullable<string> | Promise<Nullable<string>>;
 }
 
 export type BigInt = any;