@ecency/wallets 1.0.19 → 1.1.1

package/dist/ecency-wallets.es.d.ts

@@ -38,7 +38,8 @@ export declare enum EcencyWalletCurrency {
 
 declare namespace EcencyWalletsPrivateApi {
     export {
-        useCreateAccountWithWallets
+        useCreateAccountWithWallets,
+        useCheckWalletExistence
     }
 }
 export { EcencyWalletsPrivateApi }
@@ -53,10 +54,17 @@ declare interface Payload {
 }
 
 declare interface Payload_2 {
+    address: string;
+    currency: EcencyWalletCurrency;
+}
+
+declare interface Payload_3 {
     address: string;
     privateKeyOrSeed: string;
 }
 
+declare function useCheckWalletExistence(): UseMutationResult<boolean, Error, Payload_2, unknown>;
+
 export declare function useCoinGeckoPriceQuery(currency?: EcencyWalletCurrency): UseQueryResult<number, Error>;
 
 declare function useCreateAccountWithWallets(username: string): UseMutationResult<Response, Error, Payload, unknown>;
@@ -75,9 +83,9 @@ export declare function useHiveKeysQuery(username: string): UseQueryResult<Ecenc
 
 export declare function useImportWallet(username: string, currency: EcencyWalletCurrency): UseMutationResult<    {
 privateKey: string;
-address: string;
+address: any;
 publicKey: string;
-}, Error, Payload_2, unknown>;
+}, Error, Payload_3, unknown>;
 
 export declare function useSeedPhrase(username: string): UseQueryResult<string, Error>;
 

package/dist/ecency-wallets.es.js

@@ -1,52 +1,52 @@
-import { useCallback as P } from "react";
-import { useQuery as p, useQueryClient as h, useMutation as m } from "@tanstack/react-query";
-import { BtcWallet as S } from "@okxweb3/coin-bitcoin";
-import { EthWallet as R } from "@okxweb3/coin-ethereum";
-import { TrxWallet as O } from "@okxweb3/coin-tron";
+import { useCallback as R } from "react";
+import { useQuery as p, useQueryClient as y, useMutation as m } from "@tanstack/react-query";
+import { BtcWallet as O } from "@okxweb3/coin-bitcoin";
+import { EthWallet as v } from "@okxweb3/coin-ethereum";
+import { TrxWallet as k } from "@okxweb3/coin-tron";
 import { TonWallet as A } from "@okxweb3/coin-ton";
-import { SolWallet as k } from "@okxweb3/coin-solana";
-import { AtomWallet as N } from "@okxweb3/coin-cosmos";
+import { SolWallet as N } from "@okxweb3/coin-solana";
+import { AtomWallet as K } from "@okxweb3/coin-cosmos";
 import { AptosWallet as D } from "@okxweb3/coin-aptos";
-import K, { mnemonicToSeedSync as _ } from "bip39";
+import j, { mnemonicToSeedSync as C } from "bip39";
 import { LRUCache as H } from "lru-cache";
 import { PrivateKey as u } from "@hiveio/dhive";
 var o = /* @__PURE__ */ ((e) => (e.BTC = "btc", e.ETH = "eth", e.APT = "aptos", e.ATOM = "cosmos", e.TON = "ton", e.TRON = "tron", e.SOL = "solana", e))(o || {});
-function j(e) {
+function x(e) {
   return new Promise((t) => setTimeout(t, e));
 }
-function T(e) {
+function h(e) {
   switch (e) {
     case o.BTC:
-      return new S();
+      return new O();
     case o.ETH:
-      return new R();
+      return new v();
     case o.TRON:
-      return new O();
+      return new k();
     case o.TON:
       return new A();
     case o.SOL:
-      return new k();
-    case o.ATOM:
       return new N();
+    case o.ATOM:
+      return new K();
     case o.APT:
       return new D();
     default:
       return;
   }
 }
-function re(e) {
-  return _(e).toString("hex");
+function ce(e) {
+  return C(e).toString("hex");
 }
-function ce(e, t) {
+function ie(e, t) {
   return p({
     queryKey: ["ecency-wallets", "external-wallet-balance", e, t],
     queryFn: async () => {
       switch (e) {
         case o.BTC:
-          const a = await (await fetch(
+          const r = await (await fetch(
             `https://mempool.space/api/address/${t}`
           )).json();
-          return (a.chain_stats.funded_txo_sum - a.chain_stats.spent_txo_sum) / 1e8;
+          return (r.chain_stats.funded_txo_sum - r.chain_stats.spent_txo_sum) / 1e8;
         case o.ETH:
           return +(await (await fetch("https://eth.llamarpc.com", {
             method: "POST",
@@ -79,12 +79,12 @@ function ce(e, t) {
             `https://tonapi.io/v1/blockchain/getAccount?account=${t}`
           )).json()).balance / 1e9;
         case o.APT:
-          const y = (await (await fetch(
+          const d = (await (await fetch(
             `https://fullnode.mainnet.aptoslabs.com/v1/accounts/${t}/resources`
           )).json()).find(
-            (v) => v.type.includes("coin::CoinStore")
+            (S) => S.type.includes("coin::CoinStore")
           );
-          return y ? parseInt(y.data.coin.value) / 1e8 : 0;
+          return d ? parseInt(d.data.coin.value) / 1e8 : 0;
         case o.ATOM:
           return +(await (await fetch(
             `https://rest.cosmos.directory/cosmoshub/auth/accounts/${t}`
@@ -93,13 +93,13 @@ function ce(e, t) {
     }
   });
 }
-function b(e) {
+function f(e) {
   return p({
     queryKey: ["ecency-wallets", "seed", e],
-    queryFn: async () => K.generateMnemonic(128)
+    queryFn: async () => j.generateMnemonic(128)
   });
 }
-const C = {
+const W = {
   max: 500,
   // how long to live in ms
   ttl: 1e3 * 60 * 5,
@@ -107,9 +107,9 @@ const C = {
   allowStale: !1,
   updateAgeOnGet: !1,
   updateAgeOnHas: !1
-}, g = new H(C), d = Symbol("undefined"), B = (e, t) => g.set(e, t === void 0 ? d : t), E = (e) => {
-  const t = g.get(e);
-  return t === d ? void 0 : t;
+}, b = new H(W), w = Symbol("undefined"), _ = (e, t) => b.set(e, t === void 0 ? w : t), E = (e) => {
+  const t = b.get(e);
+  return t === w ? void 0 : t;
 };
 function le(e) {
   return p({
@@ -132,11 +132,11 @@ function le(e) {
         default:
           t = e;
       }
-      let n = E("gecko"), a;
+      let n = E("gecko"), r;
       if (n)
-        a = n;
+        r = n;
       else {
-        const s = await (await fetch(
+        const a = await (await fetch(
           "https://api.coingecko.com/api/v3/simple/price",
           {
             method: "POST",
@@ -148,36 +148,36 @@ function le(e) {
             })
           }
         )).json();
-        B("gecko", s === void 0 ? d : s), a = s;
+        _("gecko", a === void 0 ? w : a), r = a;
       }
-      return 1 / +a[Object.keys(a)[0]].usd;
+      return 1 / +r[Object.keys(r)[0]].usd;
     },
     enabled: !!e
   });
 }
-function L(e) {
-  const { data: t } = b(e);
+function q(e) {
+  const { data: t } = f(e);
   return p({
     queryKey: ["ecencу-wallets", "hive-keys", e, t],
     queryFn: async () => {
       if (!t)
         throw new Error("[Ecency][Wallets] - no seed to create Hive account");
-      const n = u.fromLogin(e, t, "owner"), a = u.fromLogin(e, t, "active"), r = u.fromLogin(e, t, "posting"), i = u.fromLogin(e, t, "memo");
+      const n = u.fromLogin(e, t, "owner"), r = u.fromLogin(e, t, "active"), s = u.fromLogin(e, t, "posting"), i = u.fromLogin(e, t, "memo");
       return {
         username: e,
         owner: n.toString(),
-        active: a.toString(),
-        posting: r.toString(),
+        active: r.toString(),
+        posting: s.toString(),
         memo: i.toString(),
         ownerPubkey: n.createPublic().toString(),
-        activePubkey: a.createPublic().toString(),
-        postingPubkey: r.createPublic().toString(),
+        activePubkey: r.createPublic().toString(),
+        postingPubkey: s.createPublic().toString(),
         memoPubkey: i.createPublic().toString()
       };
     }
   });
 }
-const W = {
+const B = {
   [o.BTC]: "m/44'/0'/0'/0/0",
   // Bitcoin (BIP44)
   [o.ETH]: "m/44'/60'/0'/0/0",
@@ -194,17 +194,17 @@ const W = {
   // Cosmos (BIP44)
 };
 function pe(e, t) {
-  const { data: n } = b(e), a = h(), r = m({
+  const { data: n } = f(e), r = y(), s = m({
     mutationKey: ["ecency-wallets", "create-wallet", e, t],
     mutationFn: async () => {
       if (!n)
         throw new Error("[Ecency][Wallets] - No seed to create a wallet");
-      const s = T(t), c = await (s == null ? void 0 : s.getDerivedPrivateKey({
+      const a = h(t), c = await (a == null ? void 0 : a.getDerivedPrivateKey({
         mnemonic: n,
-        hdPath: W[t]
+        hdPath: B[t]
       }));
-      await j(1e3);
-      const l = await (s == null ? void 0 : s.getNewAddress({
+      await x(1e3);
+      const l = await (a == null ? void 0 : a.getNewAddress({
         privateKey: c
       }));
       return {
@@ -215,44 +215,44 @@ function pe(e, t) {
         currency: t
       };
     },
-    onSuccess: (s) => {
-      a.setQueryData(
-        ["ecency-wallets", "wallets", s.username],
-        (c) => new Map(c ? Array.from(c.entries()) : []).set(s.currency, s)
+    onSuccess: (a) => {
+      r.setQueryData(
+        ["ecency-wallets", "wallets", a.username],
+        (c) => new Map(c ? Array.from(c.entries()) : []).set(a.currency, a)
       );
     }
-  }), i = P(() => {
+  }), i = R(() => {
   }, []);
   return {
-    createWallet: r,
+    createWallet: s,
     importWallet: i
   };
 }
-const q = { privateApiHost: "https://ecency.com" };
-function M(e) {
+const g = { privateApiHost: "https://ecency.com" };
+function L(e) {
   const { data: t } = p({
     queryKey: ["ecency-wallets", "wallets", e]
-  }), { data: n } = L(e);
+  }), { data: n } = q(e);
   return m({
     mutationKey: ["ecency-wallets", "create-account-with-wallets", e],
-    mutationFn: ({ currency: a, address: r }) => fetch(q.privateApiHost + "/private-api/wallets-add", {
+    mutationFn: ({ currency: r, address: s }) => fetch(g.privateApiHost + "/private-api/wallets-add", {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
         username: e,
-        token: a,
-        address: r,
+        token: r,
+        address: s,
         meta: {
           ownerPublicKey: n == null ? void 0 : n.ownerPubkey,
           activePublicKey: n == null ? void 0 : n.activePubkey,
           postingPublicKey: n == null ? void 0 : n.postingPubkey,
           memoPublicKey: n == null ? void 0 : n.memoPubkey,
           ...Array.from((t == null ? void 0 : t.entries()) ?? []).reduce(
-            (i, [s, c]) => ({
+            (i, [a, c]) => ({
               ...i,
-              [s]: c.address
+              [a]: c.address
             }),
             {}
           )
@@ -261,103 +261,95 @@ function M(e) {
     })
   });
 }
+function T() {
+  return m({
+    mutationKey: ["ecency-wallets", "check-wallet-existence"],
+    mutationFn: async ({ address: e, currency: t }) => (await (await fetch(
+      g.privateApiHost + "/private-api/wallets-exist",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          address: e,
+          token: t
+        })
+      }
+    )).json()).length === 0
+  });
+}
 const ue = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  useCreateAccountWithWallets: M
-}, Symbol.toStringTag, { value: "Module" })), x = {
-  [o.BTC]: [
-    "m/84'/0'/0'/0/0",
-    "m/44'/0'/0'/0/0",
-    "m/49'/0'/0'/0/0",
-    "m/84'/0'/0'/0",
-    // XVerse wallet – Legacy
-    "m/44'/0'/0'/0",
-    // XVerse wallet – Segwit
-    "m/49'/0'/0'/0",
-    // XVerse wallet – Native segwit
-    "m/86'/0'/0'/0"
-    // XVerse wallet – Taproot
-  ],
-  [o.ETH]: ["m/44'/60'/0'/0/0"],
-  [o.SOL]: ["m/44'/501'/0'/0'"],
-  [o.TRON]: ["m/44'/195'/0'/0/0"],
-  [o.APT]: ["m/44'/637'/0'/0'/0'"],
-  [o.TON]: ["m/44'/607'/0'"],
-  [o.ATOM]: ["m/44'/118'/0'/0/0"]
-}, F = {
-  [o.BTC]: [
-    "",
-    // legacy
-    "segwit_native",
-    "segwite_nested",
-    "segwit_taproot"
-  ],
-  [o.ETH]: [void 0],
-  [o.SOL]: [void 0],
-  [o.TRON]: [void 0],
-  [o.APT]: [void 0],
-  [o.TON]: [void 0],
-  [o.ATOM]: [void 0]
+  useCheckWalletExistence: T,
+  useCreateAccountWithWallets: L
+}, Symbol.toStringTag, { value: "Module" })), F = {
+  [o.BTC]: ["m/84'/0'/0'/0/0"],
+  [o.ETH]: ["m/84'/60'/0'/0/0"],
+  // its not working for Trust, Exodus, todo: check others below
+  [o.SOL]: ["m/84'/501'/0'/0/0"],
+  [o.TRON]: ["m/84'/195'/0'/0/0"],
+  [o.APT]: ["m/84'/637'/0'/0/0"],
+  [o.TON]: [],
+  // Disabled
+  [o.ATOM]: ["m/84'/118'/0'/0'/0"]
 };
-async function Q(e, t, n, a) {
-  for (const r of x[a] || [])
+async function M(e, t, n) {
+  for (const r of F[n] || [])
     try {
-      const i = await n.getDerivedPrivateKey({
+      const s = await t.getDerivedPrivateKey({
         mnemonic: e,
         hdPath: r
+      }), i = await t.getNewAddress({
+        privateKey: s,
+        addressType: "segwit_native"
       });
-      for (const s of F[a])
-        if ((await n.getNewAddress({
-          privateKey: i,
-          addressType: s
-        })).address === t)
-          return i;
+      return [s.toString(), i.address];
     } catch {
-      return;
+      return [];
     }
+  return [];
 }
 function me(e, t) {
-  const n = h();
+  const n = y(), { mutateAsync: r } = T();
   return m({
     mutationKey: ["ecency-wallets", "import-wallet", e, t],
-    mutationFn: async ({ privateKeyOrSeed: a, address: r }) => {
-      const i = T(t);
+    mutationFn: async ({ privateKeyOrSeed: s }) => {
+      const i = h(t);
       if (!i)
         throw new Error("Cannot find token for this currency");
-      const s = a.split(" ").length === 12;
-      let c = !1, l = a;
-      if (s)
-        l = await Q(
-          a,
-          r,
-          i,
-          t
-        ), c = !!l;
-      else {
-        const w = await i.getNewAddress({
-          privateKey: a
-        }), f = await i.validPrivateKey({
-          privateKey: a
-        });
-        c = w.address === r && f.isValid;
-      }
-      if (!c)
+      const a = s.split(" ").length === 12;
+      let c, l = s;
+      if (a ? [l, c] = await M(
+        s,
+        i,
+        t
+      ) : c = (await i.getNewAddress({
+        privateKey: s
+      })).address, !c || !s)
         throw new Error(
           "Private key/seed phrase isn't matching with public key or token"
         );
+      if (!await r({
+        address: c,
+        currency: t
+      }))
+        throw new Error(
+          "This wallet has already in use by Hive account. Please, try another one"
+        );
       return {
         privateKey: l,
-        address: r,
+        address: c,
         publicKey: ""
       };
     },
-    onSuccess: ({ privateKey: a, publicKey: r, address: i }) => {
+    onSuccess: ({ privateKey: s, publicKey: i, address: a }) => {
       n.setQueryData(
         ["ecency-wallets", "wallets", e],
-        (s) => new Map(s ? Array.from(s.entries()) : []).set(t, {
-          privateKey: a,
-          publicKey: r,
-          address: i,
+        (c) => new Map(c ? Array.from(c.entries()) : []).set(t, {
+          privateKey: s,
+          publicKey: i,
+          address: a,
           username: e,
           currency: t,
           custom: !0
@@ -369,13 +361,13 @@ function me(e, t) {
 export {
   o as EcencyWalletCurrency,
   ue as EcencyWalletsPrivateApi,
-  j as delay,
-  T as getWallet,
-  re as mnemonicToSeedBip39,
+  x as delay,
+  h as getWallet,
+  ce as mnemonicToSeedBip39,
   le as useCoinGeckoPriceQuery,
-  ce as useGetExternalWalletBalanceQuery,
-  L as useHiveKeysQuery,
+  ie as useGetExternalWalletBalanceQuery,
+  q as useHiveKeysQuery,
   me as useImportWallet,
-  b as useSeedPhrase,
+  f as useSeedPhrase,
   pe as useWalletCreate
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ecency/wallets",
   "private": false,
-  "version": "1.0.19",
+  "version": "1.1.1",
   "type": "module",
   "main": "./dist/ecency-wallets.umd.js",
   "module": "./dist/ecency-wallets.es.js",