@kimafinance/kima-transaction-api 1.4.2 → 1.4.3

package/build/types.d.ts

@@ -0,0 +1,68 @@
+export declare enum SupportedNetworks {
+    ETHEREUM = "ETH",
+    POLYGON = "POL",
+    AVALANCHE = "AVX",
+    SOLANA = "SOL",
+    BSC = "BSC",
+    ARBITRIUM = "ARB",
+    OPTIMISM = "OPT",
+    POLYGON_ZKEVM = "ZKE",
+    BITCOIN = "BTC",
+    BERA = "BERA",
+    CFX = "CFX",
+    TRON = "TRX",
+    FIAT = "FIAT",
+    CREDITCARD = "CC",
+    BASE = "BASE"
+}
+export declare enum CurrencyOptions {
+    USDT = "USDT",
+    USDC = "USDC",
+    USDK = "USDK",
+    EURC = "EURC",
+    EURK = "EURK",
+    EUR = "EUR",
+    USD = "USD"
+}
+export interface RequestHtlcReclaimProps {
+    senderAddress: string;
+    txHash: string;
+}
+export interface RequestHtlcLockProps {
+    fromAddress: string;
+    senderPubkey: string;
+    amount: string;
+    htlcTimeout: string;
+    txHash: string;
+    htlcAddress: string;
+}
+export interface RequestTransferTxProps {
+    originChain: SupportedNetworks;
+    originAddress: string;
+    targetChain: SupportedNetworks;
+    targetAddress: string;
+    originSymbol: CurrencyOptions;
+    targetSymbol: CurrencyOptions;
+    amount: string;
+    fee: string;
+    htlcCreationHash?: string;
+    htlcCreationVout?: number;
+    htlcExpirationTimestamp?: string;
+    htlcVersion?: string;
+    senderPubKey?: Uint8Array;
+    options: string;
+}
+export interface RequestSwapTxProps {
+    originChain: SupportedNetworks;
+    originAddress: string;
+    targetChain: SupportedNetworks;
+    targetAddress: string;
+    originSymbol: CurrencyOptions;
+    targetSymbol: CurrencyOptions;
+    amountIn: string;
+    amountOut: string;
+    fee: string;
+    dex: string;
+    slippage: string;
+    options: string;
+}

package/build/types.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CurrencyOptions = exports.SupportedNetworks = void 0;
+var SupportedNetworks;
+(function (SupportedNetworks) {
+    SupportedNetworks["ETHEREUM"] = "ETH";
+    SupportedNetworks["POLYGON"] = "POL";
+    SupportedNetworks["AVALANCHE"] = "AVX";
+    SupportedNetworks["SOLANA"] = "SOL";
+    SupportedNetworks["BSC"] = "BSC";
+    SupportedNetworks["ARBITRIUM"] = "ARB";
+    SupportedNetworks["OPTIMISM"] = "OPT";
+    SupportedNetworks["POLYGON_ZKEVM"] = "ZKE";
+    SupportedNetworks["BITCOIN"] = "BTC";
+    SupportedNetworks["BERA"] = "BERA";
+    SupportedNetworks["CFX"] = "CFX";
+    SupportedNetworks["TRON"] = "TRX";
+    SupportedNetworks["FIAT"] = "FIAT";
+    SupportedNetworks["CREDITCARD"] = "CC";
+    SupportedNetworks["BASE"] = "BASE";
+})(SupportedNetworks = exports.SupportedNetworks || (exports.SupportedNetworks = {}));
+var CurrencyOptions;
+(function (CurrencyOptions) {
+    CurrencyOptions["USDT"] = "USDT";
+    CurrencyOptions["USDC"] = "USDC";
+    CurrencyOptions["USDK"] = "USDK";
+    CurrencyOptions["EURC"] = "EURC";
+    CurrencyOptions["EURK"] = "EURK";
+    CurrencyOptions["EUR"] = "EUR";
+    CurrencyOptions["USD"] = "USD";
+})(CurrencyOptions = exports.CurrencyOptions || (exports.CurrencyOptions = {}));
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kimafinance/kima-transaction-api",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "A wrapper around Kima's API, enabling sending and monitoring transactions (Beta version)",
   "repository": "https://github.com/kima-finance/kima-transaction-api",
   "author": "",

package/src/index.ts

@@ -4,31 +4,18 @@ import {
   MsgHtlcReclaim,
   MsgRequestHtlcLock,
   MsgRequestTransaction,
-} from "./kima/tx";
+} from "./kima/transfer_tx";
 
-export enum SupportedNetworks {
-  ETHEREUM = "ETH",
-  POLYGON = "POL",
-  AVALANCHE = "AVX",
-  SOLANA = "SOL",
-  FUSE = "FUS",
-  CELO = "CEL",
-  BSC = "BSC",
-  ARBITRIUM = "ARB",
-  OPTIMISM = "OPT",
-  POLYGON_ZKEVM = "ZKE",
-}
-
-export enum CurrencyOptions {
-  USDT = "USDT",
-  USDC = "USDC",
-  USDK = "USDK",
-}
+import {
+  MsgRequestSwapTransaction,
+} from "./kima/swap_tx";
 
-interface RequestHtlcReclaimProps {
-  senderAddress: string;
-  txHash: string;
-}
+import {
+  RequestHtlcReclaimProps,
+  RequestHtlcLockProps,
+  RequestTransferTxProps,
+  RequestSwapTxProps,
+} from "./types";
 
 export async function HtlcReclaim({
   senderAddress,
@@ -52,15 +39,6 @@ export async function HtlcReclaim({
   return result;
 }
 
-interface RequestHtlcLockProps {
-  fromAddress: string;
-  senderPubkey: string;
-  amount: string;
-  htlcTimeout: string;
-  txHash: string;
-  htlcAddress: string;
-}
-
 export async function submitHtlcLock({
   fromAddress,
   senderPubkey,
@@ -91,27 +69,6 @@ export async function submitHtlcLock({
   return result;
 }
 
-interface RequestTxProps {
-  originChain: SupportedNetworks;
-  originAddress: string;
-  targetChain: SupportedNetworks;
-  targetAddress: string;
-  originSymbol: CurrencyOptions;
-  targetSymbol: CurrencyOptions;
-  amount: string; // number in whole units i.e. "12.34"
-  fee: string; // number in whole units i.e "0.061234"
-  htlcCreationHash: string;
-  htlcCreationVout: number;
-  htlcExpirationTimestamp: string;
-  htlcVersion: string;
-  senderPubKey: Uint8Array;
-  options: string;
-}
-
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 export async function getCreatorAddress() {
   const wallet = await DirectSecp256k1HdWallet.fromMnemonic(
     process.env.KIMA_BACKEND_MNEMONIC as string,
@@ -121,7 +78,7 @@ export async function getCreatorAddress() {
   return firstAccount;
 }
 
-export async function submitKimaTransaction({
+export async function submitKimaTransferTransaction({
   originChain,
   originAddress,
   targetChain,
@@ -131,12 +88,12 @@ export async function submitKimaTransaction({
   amount,
   fee,
   htlcCreationHash,
-  htlcCreationVout,
+  htlcCreationVout = 0,
   htlcExpirationTimestamp,
-  htlcVersion,
+  htlcVersion = "",
   senderPubKey,
   options,
-}: RequestTxProps) {
+}: RequestTransferTxProps) {
   const wallet = await DirectSecp256k1HdWallet.fromMnemonic(
     process.env.KIMA_BACKEND_MNEMONIC as string,
     { prefix: "kima" }
@@ -153,54 +110,58 @@ export async function submitKimaTransaction({
     targetSymbol,
     amount: amount,
     fee: fee,
-    htlcCreationHash,
-    htlcCreationVout,
-    htlcExpirationTimestamp,
+    htlcCreationHash: htlcCreationHash || "",
+    htlcCreationVout: htlcCreationVout || 0,
+    htlcExpirationTimestamp: htlcExpirationTimestamp || "",
     htlcVersion,
-    senderPubKey,
+    senderPubKey: senderPubKey || new Uint8Array(),
     options,
   };
 
   const msgTx = await client.msgRequestTransaction(params);
   const result = await client.signAndBroadcast([msgTx]);
 
-  if (result.code !== 0) {
-    return result;
-  }
-
-  let txId = 1;
-
-  for (const event of result.events) {
-    if (event.type === "transaction_requested") {
-      for (const attr of event.attributes) {
-        if (attr.key === "txId") {
-          txId = +attr.value;
-        }
-      }
-    }
-  }
-
-  await sleep(5000);
+  return result;
+}
 
-  const msgSetHash = await client.msgSetTxHash({
+export async function submitKimaSwapTransaction({
+  originChain,
+  originAddress,
+  targetChain,
+  targetAddress,
+  originSymbol,
+  targetSymbol,
+  amountIn,
+  amountOut,
+  fee,
+  dex,
+  slippage,
+  options,
+}: RequestSwapTxProps) {
+  const wallet = await DirectSecp256k1HdWallet.fromMnemonic(
+    process.env.KIMA_BACKEND_MNEMONIC as string,
+    { prefix: "kima" }
+  );
+  const client = await TxClient(wallet);
+  const [firstAccount] = await wallet.getAccounts();
+  const params: MsgRequestSwapTransaction = {
     creator: firstAccount.address,
-    txId,
-    txHash: result.transactionHash,
-    txType: "request_transaction",
-  });
-
-  console.log(msgSetHash);
+    originChain,
+    originAddress,
+    targetChain,
+    targetAddress,
+    originSymbol,
+    targetSymbol,
+    amountIn: amountIn,
+    amountOut: amountOut,
+    fee: fee,
+    dex: dex,
+    slippage: slippage,
+    options: options,
+  };
 
-  let hashResult;
-  do {
-    try {
-      hashResult = await client.signAndBroadcast([msgSetHash]);
-    } catch (error) {
-      console.log(error);
-      await sleep(5000);
-      continue;
-    }
-  } while (hashResult?.code !== 0);
+  const msgTx = await client.msgRequestSwapTransaction(params);
+  const result = await client.signAndBroadcast([msgTx]);
 
   return result;
 }

package/src/kima/common.ts

@@ -6,12 +6,17 @@ import {
   EncodeObject,
   coin,
 } from "@cosmjs/proto-signing";
+
 import {
   MsgRequestHtlcLock,
   MsgRequestTransaction,
   MsgSetTxHash,
   MsgHtlcReclaim,
-} from "./tx";
+} from "./transfer_tx";
+
+import {
+  MsgRequestSwapTransaction,
+} from "./swap_tx";
 
 dotenv.config();
 
@@ -30,6 +35,7 @@ const types = [
   ["/kimablockchain.transaction.MsgRequestHtlcLock", MsgRequestHtlcLock],
   ["/kimablockchain.transaction.MsgSetTxHash", MsgSetTxHash],
   ["/kimablockchain.transaction.MsgHtlcReclaim", MsgHtlcReclaim],
+  ["/kimablockchain.swap.MsgRequestSwapTransaction", MsgRequestSwapTransaction],
 ];
 
 export const registry = new Registry(<any>types);
@@ -69,5 +75,9 @@ export const TxClient = async (wallet: OfflineSigner) => {
       typeUrl: "/kimablockchain.transaction.MsgHtlcReclaim",
       value: MsgHtlcReclaim.fromPartial(data),
     }),
+    msgRequestSwapTransaction: (data: MsgRequestSwapTransaction): EncodeObject => ({
+      typeUrl: "/kimablockchain.swap.MsgRequestSwapTransaction",
+      value: MsgRequestSwapTransaction.fromPartial(data),
+    }),
   };
 };