replace pact-lang-api in getTransactionStatus; remove pect-lang-api

enkryptcom · Jan 22, 2024 · 5a56203 · 5a56203
1 parent 3824b99
commit 5a56203
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 606 deletions.
diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -58,7 +58,6 @@
     "memoize-one": "^6.0.0",
     "moment": "^2.29.4",
     "nanoevents": "^7.0.1",
-    "pact-lang-api": "^4.3.6",
     "pinia": "^2.1.6",
     "qrcode.vue": "^3.4.1",
     "switch-ts": "^1.1.1",

diff --git a/packages/extension/src/providers/kadena/libs/api.ts b/packages/extension/src/providers/kadena/libs/api.ts
@@ -49,12 +49,16 @@ class API implements ProviderAPIInterface {
     });
   }
 
-  async getTransactionStatus(hash: string): Promise<KadenaRawInfo | null> {
-    const Pact = require("pact-lang-api");
-    const cmd = { requestKeys: [hash] };
+  async getTransactionStatus(requestKey: string): Promise<KadenaRawInfo> {
     const chainId = await this.getChainId();
-    const transactions = await Pact.fetch.poll(cmd, this.getApiHost(chainId));
-    return transactions[hash];
+    const networkId = this.networkId;
+    const { pollStatus } = createClient(this.getApiHost(chainId));
+    const responses = await pollStatus({
+      requestKey,
+      networkId,
+      chainId: chainId as ChainId,
+    });
+    return responses[requestKey];
   }
 
   async getBalanceByChainId(address: string, chainId: string): Promise<string> {

diff --git a/packages/extension/src/types/activity.ts b/packages/extension/src/types/activity.ts
@@ -5,6 +5,7 @@ import {
   TokenTypeTo,
   StatusOptionsResponse,
 } from "@enkryptcom/swap";
+import { ICommandResult } from "@kadena/client";
 
 interface BTCInOuts {
   address: string;
@@ -62,13 +63,7 @@ interface SubstrateRawInfo {
   asset_type: string;
 }
 
-interface KadenaRawInfo {
-  gas: number;
-  result: { status: string; data: string };
-  reqKey: string;
-  logs: string;
-  txId: number;
-}
+type KadenaRawInfo = ICommandResult;
 
 enum ActivityStatus {
   pending = "pending",