@ecency/wallets 1.0.9 → 1.0.10

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

@@ -52,6 +52,11 @@ declare interface Payload {
     address: string;
 }
 
+declare interface Payload_2 {
+    address: string;
+    privateKeyOrSeed: string;
+}
+
 export declare function useCoinGeckoPriceQuery(currency?: EcencyWalletCurrency): UseQueryResult<number, Error>;
 
 declare function useCreateAccountWithWallets(username: string): UseMutationResult<Response, Error, Payload, unknown>;
@@ -68,6 +73,12 @@ export declare function useGetExternalWalletBalanceQuery(currency: EcencyWalletC
 
 export declare function useHiveKeysQuery(username: string): UseQueryResult<EcencyHiveKeys, Error>;
 
+export declare function useImportWallet(username: string, currency: EcencyWalletCurrency): UseMutationResult<    {
+privateKey: string;
+address: string;
+publicKey: string;
+}, Error, Payload_2, unknown>;
+
 export declare function useSeedPhrase(): UseQueryResult<string, Error>;
 
 export declare function useWalletCreate(username: string, currency: EcencyWalletCurrency): {

package/dist/ecency-wallets.es.js

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

package/package.json

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