Fix eth bridge incoming history (#1614)

* fix incoming history restoration

* up version to 1.44.3

* fix Jenkinsfile

Jenkinsfile

@@ -25,7 +25,7 @@ def pipeline = new org.js.AppPipeline(steps: this,
     vaultUser: "polkaswap-rw",
     vaultCredId: "pswapVaultCreds",
     valuesDestPath: "argocd-cc/src/charts/sora2/polkaswap-exchange-web/",
-    devValuesPath: "dev/dev/dev/",
+    devValuesPath: "test/dev/test/",
     initialSecretName: "sora2-dev-polkaswap-exchange-polkaswap-exchange-web-eso-base",
     initialNameSpace: "sora2-dev-web",
     targetNameSpace: "sora2-${env.CHANGE_ID}-web",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.44.2",
+  "version": "1.44.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
@@ -104,5 +104,6 @@
       "eslint --fix",
       "git add"
     ]
-  }
+  },
+  "packageManager": "[email protected]"
 }

src/utils/bridge/eth/classes/history.ts

@@ -266,10 +266,24 @@ export class EthBridgeHistory {
     return tx;
   }
 
-  public async fetchHistoryElements(address: string, timestamp = 0, ids?: string[]): Promise<HistoryElement[]> {
+  public async fetchHistoryElements({
+    address,
+    timestamp = 0,
+    ids,
+    isOutgoing = true,
+  }: {
+    address: string;
+    timestamp?: number;
+    ids?: string[];
+    isOutgoing?: boolean;
+  }): Promise<HistoryElement[]> {
     const indexer = getCurrentIndexer();
     const operations = [Operation.EthBridgeOutgoing, Operation.EthBridgeIncoming];
-    const filter = indexer.historyElementsFilter({ address, operations, timestamp, ids });
+    const filterCommonOptions = { operations, timestamp, ids };
+    const filterOptions = isOutgoing
+      ? { address, ...filterCommonOptions }
+      : { ...filterCommonOptions, query: { accountAddress: address } };
+    const filter = indexer.historyElementsFilter(filterOptions);
     const history: HistoryElement[] = [];
 
     let hasNext = true;
@@ -307,7 +321,11 @@ export class EthBridgeHistory {
     assetDataByAddress: (address?: Nullable<string>) => Nullable<RegisteredAccountAsset>,
     updateCallback?: FnWithoutArgs | AsyncFnWithoutArgs
   ): Promise<void> {
-    const historyElements = await this.fetchHistoryElements(address, this.historySyncTimestamp);
+    const filter = { address, timestamp: this.historySyncTimestamp };
+    const outgoing = await this.fetchHistoryElements({ ...filter, isOutgoing: true });
+    const incoming = await this.fetchHistoryElements({ ...filter, isOutgoing: false });
+
+    const historyElements = [...outgoing, ...incoming];
 
     if (!historyElements.length) return;
 

src/utils/bridge/eth/classes/reducers.ts

@@ -106,7 +106,13 @@ export class EthBridgeOutgoingReducer extends EthBridgeReducer {
               // format account address to sora format
               const { from: address } = getTransaction(id);
               const bridgeHistory = await this.getBridgeHistoryInstance();
-              const historyItem = first(await bridgeHistory.fetchHistoryElements(address as string, 0, [tx.txId]));
+              const historyItem = first(
+                await bridgeHistory.fetchHistoryElements({
+                  address: address as string,
+                  ids: [tx.txId],
+                  isOutgoing: true,
+                })
+              );
 
               if (historyItem) {
                 this.updateTransactionParams(id, {