Merge pull request #159 from helix-bridge/xiaoch05-fix-bridge-conflict

bugfix: bridge name conflict
helix-bridge · Apr 10, 2024 · f7a9be9 · f7a9be9
2 parents e7ce0fa + 31eb0f4
commit f7a9be9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apollo/src/xtoken/transfer.service.ts b/apollo/src/xtoken/transfer.service.ts
@@ -174,7 +174,7 @@ export class TransferService extends BaseTransferServiceT2 {
       chainId: 43,
       chain: 'pangolin-dvm',
       url: this.darwiniaEthereumBackingUrl,
-      bridge: 'xtokenbridge',
+      bridge: 'xtoken-pangolin-sepolia',
       symbols: [
         {
           key: 'PRING',
@@ -196,7 +196,7 @@ export class TransferService extends BaseTransferServiceT2 {
       chainId: 11155111,
       chain: 'sepolia',
       url: this.darwiniaEthereumIssuingUrl,
-      bridge: 'xtokenbridge',
+      bridge: 'xtoken-pangolin-sepolia',
       symbols: [
         {
           key: 'PRING',

diff --git a/apollo/src/xtoken/xtoken.service.ts b/apollo/src/xtoken/xtoken.service.ts
@@ -123,7 +123,7 @@ export class xTokenService implements OnModuleInit {
           {
             fromChain: transfer.chain,
             toChain: partner.chain,
-            bridge: 'xtoken-' + transfer.chain,
+            bridge: transfer.bridge,
           },
           { nonce: 'desc' }
         );
@@ -169,7 +169,7 @@ export class xTokenService implements OnModuleInit {
             id: this.genID(transfer.chain, toChain.chain, record.direction, record.id),
             fromChain: transfer.chain,
             toChain: toChain.chain,
-            bridge: 'xtoken-' + transfer.chain,
+            bridge: transfer.bridge,
             messageNonce: this.toMessageNonce(record.messageId, record.userNonce),
             nonce: latestNonce + 1,
             requestTxHash: record.transactionHash,
@@ -223,7 +223,7 @@ export class xTokenService implements OnModuleInit {
           where: {
             fromChain: transfer.chain,
             toChain: partner.chain,
-            bridge: `xtoken-${transfer.chain}`,
+            bridge: transfer.bridge,
             responseTxHash: '',
           },
         })