@tomo-inc/chains-service 0.0.21 → 0.0.23

package/dist/index.cjs

@@ -3976,6 +3976,7 @@ var FEE_RATE_KB = 0.5;
 var DECIMALS = 1e8;
 var TRANSACTION_PAGE_SIZE = 10;
 var MYDOGE_BASE_URL = "https://api.mydoge.com";
+var RPC_URL_TOMO = "https://wallet-pro.tomo.inc/rpc/v1/doge_coin";
 var RPC_URL = "https://api.bitcore.io/api/DOGE/mainnet";
 var RPC_TIMEOUT = 20 * 1e3;
 var TX_OVERHEAD = 10;
@@ -4183,6 +4184,10 @@ var TransactionParser = class {
 var mydoge = axios__default.default.create({
   baseURL: MYDOGE_BASE_URL
 });
+var tomoApi = axios__default.default.create({
+  baseURL: RPC_URL_TOMO,
+  timeout: RPC_TIMEOUT
+});
 var api = axios__default.default.create({
   baseURL: RPC_URL,
   timeout: RPC_TIMEOUT
@@ -4341,11 +4346,23 @@ var getDogeFeeByBlock = async (address, n = 22) => {
 };
 var sendDogeTx = async (rawTx) => {
   try {
-    const res = await api.post("/tx/send", { rawTx });
-    return res.data;
+    const body = {
+      jsonrpc: "2.0",
+      method: "sendrawtransaction",
+      params: [rawTx],
+      id: 1
+    };
+    const res = await tomoApi.post("/", body);
+    const data = res.data;
+    if (data?.error) {
+      return Promise.reject(new Error(data.error.message || String(data.error)));
+    }
+    const txid = data?.result ?? "";
+    return { txid };
   } catch (e) {
-    if (typeof e?.response?.data === "string") return Promise.reject(e?.response?.data);
-    else return Promise.reject(e.message);
+    if (typeof e?.response?.data === "string") return Promise.reject(new Error(e.response.data));
+    if (e?.response?.data?.error?.message) return Promise.reject(new Error(e.response.data.error.message));
+    return Promise.reject(e?.message ? new Error(e.message) : e);
   }
 };
 
@@ -4623,7 +4640,7 @@ var DogecoinService = class _DogecoinService extends BaseService {
     if (!spendableUtxos || spendableUtxos?.length === 0) {
       txData.spendableUtxos = await getSpendableUtxos(txData.from);
     }
-    const { psbtBase64, usingUtxos } = await createPsbt(txData);
+    const { psbtBase64 } = await createPsbt(txData);
     const signedPsbt = await this.accountInfo.signTransaction(JSON.stringify({ psbtBase64 }));
     const signedTx = DogecoinUtils.extractPsbtTransaction(signedPsbt, 1e5);
     if (signedTx === "") {
@@ -4631,7 +4648,6 @@ var DogecoinService = class _DogecoinService extends BaseService {
     }
     try {
       const { txid } = await sendDogeTx(signedTx);
-      addUsedUtxos(usingUtxos);
       return { txId: txid };
     } catch (err) {
       throw new Error("Error: send transaction err." + JSON.stringify(err));

package/dist/index.d.cts

@@ -491,7 +491,9 @@ declare function getTransactions(address: string, config?: {
     pageNumber: number;
 }): Promise<TransactionResponse>;
 declare const getDogeFeeByBlock: (address?: string, n?: number) => Promise<number>;
-declare const sendDogeTx: (rawTx: string) => Promise<any>;
+declare const sendDogeTx: (rawTx: string) => Promise<{
+    txid: any;
+}>;
 
 type API_Transaction = Transaction;
 type API_TransactionResponse = TransactionResponse;

package/dist/index.d.ts

@@ -491,7 +491,9 @@ declare function getTransactions(address: string, config?: {
     pageNumber: number;
 }): Promise<TransactionResponse>;
 declare const getDogeFeeByBlock: (address?: string, n?: number) => Promise<number>;
-declare const sendDogeTx: (rawTx: string) => Promise<any>;
+declare const sendDogeTx: (rawTx: string) => Promise<{
+    txid: any;
+}>;
 
 type API_Transaction = Transaction;
 type API_TransactionResponse = TransactionResponse;

package/dist/index.js

@@ -3968,6 +3968,7 @@ var FEE_RATE_KB = 0.5;
 var DECIMALS = 1e8;
 var TRANSACTION_PAGE_SIZE = 10;
 var MYDOGE_BASE_URL = "https://api.mydoge.com";
+var RPC_URL_TOMO = "https://wallet-pro.tomo.inc/rpc/v1/doge_coin";
 var RPC_URL = "https://api.bitcore.io/api/DOGE/mainnet";
 var RPC_TIMEOUT = 20 * 1e3;
 var TX_OVERHEAD = 10;
@@ -4175,6 +4176,10 @@ var TransactionParser = class {
 var mydoge = axios.create({
   baseURL: MYDOGE_BASE_URL
 });
+var tomoApi = axios.create({
+  baseURL: RPC_URL_TOMO,
+  timeout: RPC_TIMEOUT
+});
 var api = axios.create({
   baseURL: RPC_URL,
   timeout: RPC_TIMEOUT
@@ -4333,11 +4338,23 @@ var getDogeFeeByBlock = async (address, n = 22) => {
 };
 var sendDogeTx = async (rawTx) => {
   try {
-    const res = await api.post("/tx/send", { rawTx });
-    return res.data;
+    const body = {
+      jsonrpc: "2.0",
+      method: "sendrawtransaction",
+      params: [rawTx],
+      id: 1
+    };
+    const res = await tomoApi.post("/", body);
+    const data = res.data;
+    if (data?.error) {
+      return Promise.reject(new Error(data.error.message || String(data.error)));
+    }
+    const txid = data?.result ?? "";
+    return { txid };
   } catch (e) {
-    if (typeof e?.response?.data === "string") return Promise.reject(e?.response?.data);
-    else return Promise.reject(e.message);
+    if (typeof e?.response?.data === "string") return Promise.reject(new Error(e.response.data));
+    if (e?.response?.data?.error?.message) return Promise.reject(new Error(e.response.data.error.message));
+    return Promise.reject(e?.message ? new Error(e.message) : e);
   }
 };
 
@@ -4615,7 +4632,7 @@ var DogecoinService = class _DogecoinService extends BaseService {
     if (!spendableUtxos || spendableUtxos?.length === 0) {
       txData.spendableUtxos = await getSpendableUtxos(txData.from);
     }
-    const { psbtBase64, usingUtxos } = await createPsbt(txData);
+    const { psbtBase64 } = await createPsbt(txData);
     const signedPsbt = await this.accountInfo.signTransaction(JSON.stringify({ psbtBase64 }));
     const signedTx = DogecoinUtils.extractPsbtTransaction(signedPsbt, 1e5);
     if (signedTx === "") {
@@ -4623,7 +4640,6 @@ var DogecoinService = class _DogecoinService extends BaseService {
     }
     try {
       const { txid } = await sendDogeTx(signedTx);
-      addUsedUtxos(usingUtxos);
       return { txId: txid };
     } catch (err) {
       throw new Error("Error: send transaction err." + JSON.stringify(err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomo-inc/chains-service",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "author": "tomo.inc",
   "license": "MIT",
   "private": false,

package/src/dogecoin/config.ts

@@ -18,6 +18,7 @@ export const NETWORK = "livenet";
 export const MYDOGE_BASE_URL = "https://api.mydoge.com";
 export const TX_LINK = "https://chain.so/tx/DOGE/";
 
+export const RPC_URL_TOMO = "https://wallet-pro.tomo.inc/rpc/v1/doge_coin";
 export const RPC_URL = "https://api.bitcore.io/api/DOGE/mainnet";
 export const RPC_TIMEOUT = 20 * 1000;
 

package/src/dogecoin/rpc.ts

@@ -1,14 +1,18 @@
 import axios from "axios";
 
-import { TRANSACTION_PAGE_SIZE, BLOCK_CONFIRMATIONS, FEE_RATE_KB } from "./config";
-import { RPC_URL, MYDOGE_BASE_URL, RPC_TIMEOUT, TX_SIZE } from "./config";
-import { TransactionParser, toSatoshi, toBitcoin } from "./utils";
+import { BLOCK_CONFIRMATIONS, FEE_RATE_KB, MYDOGE_BASE_URL, RPC_TIMEOUT, RPC_URL, RPC_URL_TOMO, TRANSACTION_PAGE_SIZE, TX_SIZE } from "./config";
 import { DogeSpendableUtxos } from "./type";
+import { TransactionParser, toBitcoin, toSatoshi } from "./utils";
 
 export const mydoge = axios.create({
   baseURL: MYDOGE_BASE_URL,
 });
 
+const tomoApi = axios.create({
+  baseURL: RPC_URL_TOMO,
+  timeout: RPC_TIMEOUT,
+});
+
 const api = axios.create({
   baseURL: RPC_URL,
   timeout: RPC_TIMEOUT,
@@ -259,10 +263,23 @@ export const getDogeFeeByBlock = async (address?: string, n = 22) => {
 
 export const sendDogeTx = async (rawTx: string) => {
   try {
-    const res = await api.post("/tx/send", { rawTx });
-    return res.data;
+    //https://wallet.tomo.inc/rpc/v1/doge_coin
+    const body = {
+      jsonrpc: "2.0",
+      method: "sendrawtransaction",
+      params: [rawTx],
+      id: 1,
+    };
+    const res: any = await tomoApi.post("/", body);
+    const data = res.data;
+    if (data?.error) {
+      return Promise.reject(new Error(data.error.message || String(data.error)));
+    }
+    const txid = data?.result ?? "";
+    return { txid };
   } catch (e: any) {
-    if (typeof e?.response?.data === "string") return Promise.reject(e?.response?.data);
-    else return Promise.reject(e.message);
+    if (typeof e?.response?.data === "string") return Promise.reject(new Error(e.response.data));
+    if (e?.response?.data?.error?.message) return Promise.reject(new Error(e.response.data.error.message));
+    return Promise.reject(e?.message ? new Error(e.message) : e);
   }
 };

package/src/dogecoin/service.ts

@@ -15,7 +15,7 @@ import { DogeTxData } from "./type";
 import * as utils from "./utils";
 
 import { BaseConfig } from "./config";
-import { addUsedUtxos, createPsbt, toBitcoin } from "./utils";
+import { createPsbt, toBitcoin } from "./utils";
 
 export class DogecoinService extends BaseService {
   private static instance: DogecoinService;
@@ -204,8 +204,9 @@ export class DogecoinService extends BaseService {
     if (!spendableUtxos || spendableUtxos?.length === 0) {
       txData.spendableUtxos = await API.getSpendableUtxos(txData.from);
     }
+    // const { psbtBase64, usingUtxos } = await createPsbt(txData as any);
+    const { psbtBase64 } = await createPsbt(txData as any);
 
-    const { psbtBase64, usingUtxos } = await createPsbt(txData as any);
     const signedPsbt = await this.accountInfo.signTransaction(JSON.stringify({ psbtBase64 }));
     const signedTx = DogecoinUtils.extractPsbtTransaction(signedPsbt, 100000);
 
@@ -214,7 +215,7 @@ export class DogecoinService extends BaseService {
     }
     try {
       const { txid } = await API.sendDogeTx(signedTx);
-      addUsedUtxos(usingUtxos);
+      // addUsedUtxos(usingUtxos);
       return { txId: txid };
     } catch (err) {
       throw new Error("Error: send transaction err." + JSON.stringify(err));