@multiversx/sdk-dapp-liquidity 1.0.3 → 1.0.4

package/api/confirmRate.d.ts

@@ -1,5 +1,5 @@
 import { ServerTransaction } from '../types/transaction';
-import { ConfirmRateDto } from '../dto/ConfirmRate.dto.ts';
+import { ConfirmRateDto } from '../dto/ConfirmRate.dto';
 import { AxiosResponse } from 'axios';
 
 type ConfirmRateProps = {

package/api/sendTransactions.d.ts

@@ -1,11 +1,13 @@
 import { ServerTransaction } from '../types/transaction';
+import { ProviderType } from '../types/providerType';
 import { BatchTransactions } from '../types/batchTransactions';
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
 
 export type SendTransactionsType = {
     transactions: ServerTransaction[];
+    provider: ProviderType;
     url: string;
     token: string;
     axiosConfig?: AxiosRequestConfig;
 };
-export declare const sendTransactions: ({ transactions, url, token, axiosConfig }: SendTransactionsType) => Promise<AxiosResponse<BatchTransactions>>;
+export declare const sendTransactions: ({ transactions, provider, url, token, axiosConfig }: SendTransactionsType) => Promise<AxiosResponse<BatchTransactions>>;

package/api/sendTransactions.js

@@ -5,6 +5,7 @@ const axios = require("axios");
 const helpers_serializeTransaction = require("../helpers/serializeTransaction.js");
 const sendTransactions = async ({
   transactions,
+  provider,
   url,
   token,
   axiosConfig
@@ -20,9 +21,12 @@ const sendTransactions = async ({
   };
   return axios.post(
     `/transactions`,
-    transactions.map(
-      (transaction) => JSON.parse(helpers_serializeTransaction.serializeTransaction(transaction))
-    ),
+    {
+      transactions: transactions.map(
+        (transaction) => JSON.parse(helpers_serializeTransaction.serializeTransaction(transaction))
+      ),
+      provider
+    },
     config
   );
 };

package/api/sendTransactions.mjs

@@ -2,6 +2,7 @@ import axios from "axios";
 import { serializeTransaction } from "../helpers/serializeTransaction.mjs";
 const sendTransactions = async ({
   transactions,
+  provider,
   url,
   token,
   axiosConfig
@@ -17,9 +18,12 @@ const sendTransactions = async ({
   };
   return axios.post(
     `/transactions`,
-    transactions.map(
-      (transaction) => JSON.parse(serializeTransaction(transaction))
-    ),
+    {
+      transactions: transactions.map(
+        (transaction) => JSON.parse(serializeTransaction(transaction))
+      ),
+      provider
+    },
     config
   );
 };

package/api/tests/confirmRate.spec.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 const axios = require("axios");
+const types_providerType = require("../../types/providerType.js");
 const api_confirmRate = require("../confirmRate.js");
 jest.mock("axios");
 const mockedAxios = axios;
@@ -16,7 +17,8 @@ describe("confirmRate", () => {
       fromChainId: "97",
       toChainId: "44",
       sender: "0x123",
-      receiver: "0x456"
+      receiver: "0x456",
+      provider: types_providerType.ProviderType.None
     };
     const nativeAuthToken = "ZXJkMXdoOWMwc2pyMnhuOGh6ZjAybHd3Y3I0amsyczg0dGF0OXVkMmthcTZ6cjd4enB2bDlsNXE4YXdtZXg.YUhSMGNITTZMeTlrWlhadVpYUXVkR1Z0Y0d4aGRHVXRaR0Z3Y0M1dGRXeDBhWFpsY25ONExtTnZiUS5lZjc2YjRjNzZlZjZlMTNhNjM5MDc2N2ZjNzhhODhjYTRiYmI1OTE4YTJiOWRkYzQ0OTQyOTI3NjkzNjUwNjUxLjg2NDAwLmV5SjBhVzFsYzNSaGJYQWlPakUzTXpNME9EazBNREI5.04a986df7f0142837f9b1ca1ae4829f7b471e4c3470602ca6a16f2a4d7c6616c4e7628a93b4ce87d9534e95ab9215f893faeb9e0904e1d834007c16e43b12d01";
     const config = {
@@ -61,7 +63,8 @@ describe("confirmRate", () => {
       fromChainId: "97",
       toChainId: "44",
       sender: "0x123",
-      receiver: "0x456"
+      receiver: "0x456",
+      provider: types_providerType.ProviderType.None
     };
     const nativeAuthToken = "";
     const config = {
@@ -104,7 +107,8 @@ describe("confirmRate", () => {
       fromChainId: "97",
       toChainId: "44",
       sender: "0x123",
-      receiver: "0x456"
+      receiver: "0x456",
+      provider: types_providerType.ProviderType.None
     };
     const nativeAuthToken = "";
     const config = {

package/api/tests/confirmRate.spec.mjs

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { ProviderType } from "../../types/providerType.mjs";
 import { confirmRate } from "../confirmRate.mjs";
 jest.mock("axios");
 const mockedAxios = axios;
@@ -14,7 +15,8 @@ describe("confirmRate", () => {
       fromChainId: "97",
       toChainId: "44",
       sender: "0x123",
-      receiver: "0x456"
+      receiver: "0x456",
+      provider: ProviderType.None
     };
     const nativeAuthToken = "ZXJkMXdoOWMwc2pyMnhuOGh6ZjAybHd3Y3I0amsyczg0dGF0OXVkMmthcTZ6cjd4enB2bDlsNXE4YXdtZXg.YUhSMGNITTZMeTlrWlhadVpYUXVkR1Z0Y0d4aGRHVXRaR0Z3Y0M1dGRXeDBhWFpsY25ONExtTnZiUS5lZjc2YjRjNzZlZjZlMTNhNjM5MDc2N2ZjNzhhODhjYTRiYmI1OTE4YTJiOWRkYzQ0OTQyOTI3NjkzNjUwNjUxLjg2NDAwLmV5SjBhVzFsYzNSaGJYQWlPakUzTXpNME9EazBNREI5.04a986df7f0142837f9b1ca1ae4829f7b471e4c3470602ca6a16f2a4d7c6616c4e7628a93b4ce87d9534e95ab9215f893faeb9e0904e1d834007c16e43b12d01";
     const config = {
@@ -59,7 +61,8 @@ describe("confirmRate", () => {
       fromChainId: "97",
       toChainId: "44",
       sender: "0x123",
-      receiver: "0x456"
+      receiver: "0x456",
+      provider: ProviderType.None
     };
     const nativeAuthToken = "";
     const config = {
@@ -102,7 +105,8 @@ describe("confirmRate", () => {
       fromChainId: "97",
       toChainId: "44",
       sender: "0x123",
-      receiver: "0x456"
+      receiver: "0x456",
+      provider: ProviderType.None
     };
     const nativeAuthToken = "";
     const config = {

package/api/tests/getRate.spec.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 const axios = require("axios");
+const types_providerType = require("../../types/providerType.js");
 const api_getRate = require("../getRate.js");
 jest.mock("axios");
 const mockedAxios = axios;
@@ -24,7 +25,8 @@ describe("getRate", () => {
     };
     const response = {
       fee: "5",
-      amountOut: "100"
+      amountOut: "100",
+      provider: types_providerType.ProviderType.None
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await api_getRate.getRate({
@@ -50,7 +52,8 @@ describe("getRate", () => {
     };
     const response = {
       fee: "5",
-      amountOut: "100"
+      amountOut: "100",
+      provider: types_providerType.ProviderType.None
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await api_getRate.getRate({

package/api/tests/getRate.spec.mjs

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { ProviderType } from "../../types/providerType.mjs";
 import { getRate } from "../getRate.mjs";
 jest.mock("axios");
 const mockedAxios = axios;
@@ -22,7 +23,8 @@ describe("getRate", () => {
     };
     const response = {
       fee: "5",
-      amountOut: "100"
+      amountOut: "100",
+      provider: ProviderType.None
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await getRate({
@@ -48,7 +50,8 @@ describe("getRate", () => {
     };
     const response = {
       fee: "5",
-      amountOut: "100"
+      amountOut: "100",
+      provider: ProviderType.None
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await getRate({

package/api/tests/sendTransactions.spec.js

@@ -3,6 +3,7 @@
 const axios = require("axios");
 const api_sendTransactions = require("../sendTransactions.js");
 const helpers_serializeTransaction = require("../../helpers/serializeTransaction.js");
+const types_providerType = require("../../types/providerType.js");
 jest.mock("axios");
 const mockedAxios = axios;
 describe("sendTransactions", () => {
@@ -24,7 +25,12 @@ describe("sendTransactions", () => {
   it("POST sendTransactions successfully", async () => {
     const response = { data: { transactions } };
     mockedAxios.post.mockResolvedValue(response);
-    const result = await api_sendTransactions.sendTransactions({ transactions, url, token });
+    const result = await api_sendTransactions.sendTransactions({
+      transactions,
+      provider: types_providerType.ProviderType.None,
+      url,
+      token
+    });
     expect(mockedAxios.post).toHaveBeenCalledWith(
       "/transactions",
       transactions.map(
@@ -47,6 +53,7 @@ describe("sendTransactions", () => {
     mockedAxios.post.mockResolvedValue(response);
     const result = await api_sendTransactions.sendTransactions({
       transactions,
+      provider: types_providerType.ProviderType.None,
       url,
       token,
       axiosConfig
@@ -75,6 +82,7 @@ describe("sendTransactions", () => {
         transactions: transactions.map(
           (transaction) => JSON.parse(helpers_serializeTransaction.serializeTransaction(transaction))
         ),
+        provider: types_providerType.ProviderType.None,
         url,
         token
       })

package/api/tests/sendTransactions.spec.mjs

@@ -1,6 +1,7 @@
 import axios from "axios";
 import { sendTransactions } from "../sendTransactions.mjs";
 import { serializeTransaction } from "../../helpers/serializeTransaction.mjs";
+import { ProviderType } from "../../types/providerType.mjs";
 jest.mock("axios");
 const mockedAxios = axios;
 describe("sendTransactions", () => {
@@ -22,7 +23,12 @@ describe("sendTransactions", () => {
   it("POST sendTransactions successfully", async () => {
     const response = { data: { transactions } };
     mockedAxios.post.mockResolvedValue(response);
-    const result = await sendTransactions({ transactions, url, token });
+    const result = await sendTransactions({
+      transactions,
+      provider: ProviderType.None,
+      url,
+      token
+    });
     expect(mockedAxios.post).toHaveBeenCalledWith(
       "/transactions",
       transactions.map(
@@ -45,6 +51,7 @@ describe("sendTransactions", () => {
     mockedAxios.post.mockResolvedValue(response);
     const result = await sendTransactions({
       transactions,
+      provider: ProviderType.None,
       url,
       token,
       axiosConfig
@@ -73,6 +80,7 @@ describe("sendTransactions", () => {
         transactions: transactions.map(
           (transaction) => JSON.parse(serializeTransaction(transaction))
         ),
+        provider: ProviderType.None,
         url,
         token
       })

package/dto/ConfirmRate.dto.d.ts

@@ -1,11 +1,11 @@
-export interface ConfirmRateDto {
+import { RateRequestResponse } from '../types';
+
+export interface ConfirmRateDto extends RateRequestResponse {
     tokenIn: string;
     amountIn: string;
     fromChainId: string;
     tokenOut: string;
     toChainId: string;
-    fee: string;
-    amountOut: string;
     sender: string;
     receiver: string;
 }

package/package.json

@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/multiversx/mx-sdk-dapp-liquidity#readme",
   "license": "MIT",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -349,7 +349,10 @@ const BridgeForm = ({
     });
   };
   const onSubmit = require$$0.useCallback(
-    async (transactions) => {
+    async ({
+      transactions,
+      provider
+    }) => {
       const signedTransactions = [];
       setPendingSigning(true);
       setSigningTransactionsCount(() => transactions.length);
@@ -392,6 +395,7 @@ const BridgeForm = ({
         }
         await sendTransactions({
           transactions: signedTransactions,
+          provider,
           url: helpers_getApiURL.getApiURL() ?? "",
           token: nativeAuthToken ?? ""
         });
@@ -432,6 +436,7 @@ const BridgeForm = ({
     setLastChangedField
   } = reactjs_hooks_useBridgeFormik.useBridgeFormik({
     fee: rate == null ? void 0 : rate.fee,
+    provider: rate == null ? void 0 : rate.provider,
     nativeAuthToken,
     mvxAccountAddress: mvxAddress,
     firstToken,

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -346,7 +346,10 @@ const BridgeForm = ({
     });
   };
   const onSubmit = useCallback(
-    async (transactions) => {
+    async ({
+      transactions,
+      provider
+    }) => {
       const signedTransactions = [];
       setPendingSigning(true);
       setSigningTransactionsCount(() => transactions.length);
@@ -389,6 +392,7 @@ const BridgeForm = ({
         }
         await sendTransactions({
           transactions: signedTransactions,
+          provider,
           url: getApiURL() ?? "",
           token: nativeAuthToken ?? ""
         });
@@ -429,6 +433,7 @@ const BridgeForm = ({
     setLastChangedField
   } = useBridgeFormik({
     fee: rate == null ? void 0 : rate.fee,
+    provider: rate == null ? void 0 : rate.provider,
     nativeAuthToken,
     mvxAccountAddress: mvxAddress,
     firstToken,

package/reactjs/hooks/useBridgeFormik.d.ts

@@ -1,5 +1,6 @@
 import { ServerTransaction } from '../../types/transaction';
 import { TokenType } from '../../types/token';
+import { ProviderType } from '../../types/providerType';
 
 export declare enum BridgeFormikValuesEnum {
     firstToken = "firstToken",
@@ -17,7 +18,7 @@ export interface TradeFormikValuesType {
     fromChainId?: string;
     toChainId?: string;
 }
-export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, firstToken, firstAmount, secondToken, secondAmount, fromChainId, toChainId, fee, onSubmit }: {
+export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, firstToken, firstAmount, secondToken, secondAmount, fromChainId, toChainId, fee, provider, onSubmit }: {
     mvxAccountAddress?: string;
     nativeAuthToken?: string;
     firstAmount?: string;
@@ -27,7 +28,11 @@ export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, fir
     firstToken?: TokenType;
     secondToken?: TokenType;
     fee?: string;
-    onSubmit: (transactions: ServerTransaction[]) => void;
+    provider?: ProviderType;
+    onSubmit: ({ transactions, provider }: {
+        transactions: ServerTransaction[];
+        provider: ProviderType;
+    }) => void;
 }) => {
     formik: {
         initialValues: TradeFormikValuesType;

package/reactjs/hooks/useBridgeFormik.js

@@ -10,6 +10,7 @@ const reactjs_hooks_validation_useAmountSchema = require("./validation/useAmount
 const reactjs_hooks_validation_useSecondAmountSchema = require("./validation/useSecondAmountSchema.js");
 const api_confirmRate = require("../../api/confirmRate.js");
 const helpers_getApiURL = require("../../helpers/getApiURL.js");
+const types_providerType = require("../../types/providerType.js");
 var BridgeFormikValuesEnum = /* @__PURE__ */ ((BridgeFormikValuesEnum2) => {
   BridgeFormikValuesEnum2["firstToken"] = "firstToken";
   BridgeFormikValuesEnum2["firstAmount"] = "firstAmount";
@@ -29,6 +30,7 @@ const useBridgeFormik = ({
   fromChainId,
   toChainId,
   fee = "0",
+  provider,
   onSubmit
 }) => {
   const [lastChangedField, setLastChangedField] = require$$0.useState(null);
@@ -70,7 +72,8 @@ const useBridgeFormik = ({
         fee: fee ?? "0",
         amountOut: (secondAmount == null ? void 0 : secondAmount.toString()) ?? "",
         sender: account.address ?? "",
-        receiver: mvxAccountAddress ?? ""
+        receiver: mvxAccountAddress ?? "",
+        provider: provider ?? types_providerType.ProviderType.None
       }
     });
     const transactions = data;
@@ -79,7 +82,10 @@ const useBridgeFormik = ({
       return;
     }
     resetSwapForm();
-    onSubmit(transactions);
+    onSubmit({
+      transactions,
+      provider: provider ?? types_providerType.ProviderType.None
+    });
     pendingSigningRef.current = false;
   };
   const formik$1 = formik.useFormik({

package/reactjs/hooks/useBridgeFormik.mjs

@@ -7,6 +7,7 @@ import { useAmountSchema } from "./validation/useAmountSchema.mjs";
 import { useSecondAmountSchema } from "./validation/useSecondAmountSchema.mjs";
 import { confirmRate } from "../../api/confirmRate.mjs";
 import { getApiURL } from "../../helpers/getApiURL.mjs";
+import { ProviderType } from "../../types/providerType.mjs";
 var BridgeFormikValuesEnum = /* @__PURE__ */ ((BridgeFormikValuesEnum2) => {
   BridgeFormikValuesEnum2["firstToken"] = "firstToken";
   BridgeFormikValuesEnum2["firstAmount"] = "firstAmount";
@@ -26,6 +27,7 @@ const useBridgeFormik = ({
   fromChainId,
   toChainId,
   fee = "0",
+  provider,
   onSubmit
 }) => {
   const [lastChangedField, setLastChangedField] = useState(null);
@@ -67,7 +69,8 @@ const useBridgeFormik = ({
         fee: fee ?? "0",
         amountOut: (secondAmount == null ? void 0 : secondAmount.toString()) ?? "",
         sender: account.address ?? "",
-        receiver: mvxAccountAddress ?? ""
+        receiver: mvxAccountAddress ?? "",
+        provider: provider ?? ProviderType.None
       }
     });
     const transactions = data;
@@ -76,7 +79,10 @@ const useBridgeFormik = ({
       return;
     }
     resetSwapForm();
-    onSubmit(transactions);
+    onSubmit({
+      transactions,
+      provider: provider ?? ProviderType.None
+    });
     pendingSigningRef.current = false;
   };
   const formik = useFormik({

package/reactjs/hooks/useSendTransactions.d.ts

@@ -1,3 +1,3 @@
 import { SendTransactionsType } from '../../api/sendTransactions';
 
-export declare const useSendTransactions: () => ({ transactions, url, token, axiosConfig }: SendTransactionsType) => Promise<import('axios').AxiosResponse<import('../..').BatchTransactions, any>>;
+export declare const useSendTransactions: () => ({ transactions, provider, url, token, axiosConfig }: SendTransactionsType) => Promise<import('axios').AxiosResponse<import('../..').BatchTransactions, any>>;

package/reactjs/hooks/useSendTransactions.js

@@ -5,9 +5,16 @@ const require$$0 = require("react");
 const api_sendTransactions = require("../../api/sendTransactions.js");
 const useSendTransactions = () => {
   return require$$0.useCallback(
-    async ({ transactions, url, token, axiosConfig }) => {
+    async ({
+      transactions,
+      provider,
+      url,
+      token,
+      axiosConfig
+    }) => {
       return await api_sendTransactions.sendTransactions({
         transactions,
+        provider,
         url,
         token,
         axiosConfig

package/reactjs/hooks/useSendTransactions.mjs

@@ -2,9 +2,16 @@ import { useCallback } from "react";
 import { sendTransactions } from "../../api/sendTransactions.mjs";
 const useSendTransactions = () => {
   return useCallback(
-    async ({ transactions, url, token, axiosConfig }) => {
+    async ({
+      transactions,
+      provider,
+      url,
+      token,
+      axiosConfig
+    }) => {
       return await sendTransactions({
         transactions,
+        provider,
         url,
         token,
         axiosConfig

package/types/providerType.d.ts

@@ -0,0 +1,5 @@
+export declare enum ProviderType {
+    MultiversxBridge = "multiversx-bridge",
+    XMoney = "xmoney",
+    None = "none"
+}

package/types/providerType.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+var ProviderType = /* @__PURE__ */ ((ProviderType2) => {
+  ProviderType2["MultiversxBridge"] = "multiversx-bridge";
+  ProviderType2["XMoney"] = "xmoney";
+  ProviderType2["None"] = "none";
+  return ProviderType2;
+})(ProviderType || {});
+exports.ProviderType = ProviderType;

package/types/providerType.mjs

@@ -0,0 +1,9 @@
+var ProviderType = /* @__PURE__ */ ((ProviderType2) => {
+  ProviderType2["MultiversxBridge"] = "multiversx-bridge";
+  ProviderType2["XMoney"] = "xmoney";
+  ProviderType2["None"] = "none";
+  return ProviderType2;
+})(ProviderType || {});
+export {
+  ProviderType
+};

package/types/rate.d.ts

@@ -1,3 +1,5 @@
+import { ProviderType } from './providerType';
+
 export interface RateRequestBody {
     tokenIn: string;
     amountIn: string;
@@ -8,4 +10,5 @@ export interface RateRequestBody {
 export interface RateRequestResponse {
     fee: string;
     amountOut: string;
+    provider: ProviderType;
 }