@ecency/wallets 1.0.13 → 1.0.16

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

@@ -79,7 +79,7 @@ address: string;
 publicKey: string;
 }, Error, Payload_2, unknown>;
 
-export declare function useSeedPhrase(): UseQueryResult<string, Error>;
+export declare function useSeedPhrase(username: string): UseQueryResult<string, Error>;
 
 export declare function useWalletCreate(username: string, currency: EcencyWalletCurrency): {
     createWallet: UseMutationResult<EcencyCreateWalletInformation, Error, void, unknown>;

package/dist/ecency-wallets.es.js

@@ -1,20 +1,20 @@
-import { useCallback as v } from "react";
-import { useQuery as u, useQueryClient as h, useMutation as m } from "@tanstack/react-query";
+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 { 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 { AtomWallet as N } from "@okxweb3/coin-cosmos";
+import { AptosWallet as D } from "@okxweb3/coin-aptos";
+import K, { mnemonicToSeedSync as _ } from "bip39";
 import { LRUCache as H } from "lru-cache";
-import { PrivateKey as p } from "@hiveio/dhive";
+import { PrivateKey as u } 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 _(e) {
+function j(e) {
   return new Promise((t) => setTimeout(t, e));
 }
-function b(e) {
+function T(e) {
   switch (e) {
     case o.BTC:
       return new S();
@@ -27,18 +27,18 @@ function b(e) {
     case o.SOL:
       return new k();
     case o.ATOM:
-      return new K();
-    case o.APT:
       return new N();
+    case o.APT:
+      return new D();
     default:
       return;
   }
 }
 function re(e) {
-  return j(e).toString("hex");
+  return _(e).toString("hex");
 }
-function ie(e, t) {
-  return u({
+function ce(e, t) {
+  return p({
     queryKey: ["ecency-wallets", "external-wallet-balance", e, t],
     queryFn: async () => {
       switch (e) {
@@ -79,12 +79,12 @@ function ie(e, t) {
             `https://tonapi.io/v1/blockchain/getAccount?account=${t}`
           )).json()).balance / 1e9;
         case o.APT:
-          const f = (await (await fetch(
+          const y = (await (await fetch(
             `https://fullnode.mainnet.aptoslabs.com/v1/accounts/${t}/resources`
           )).json()).find(
-            (P) => P.type.includes("coin::CoinStore")
+            (v) => v.type.includes("coin::CoinStore")
           );
-          return f ? parseInt(f.data.coin.value) / 1e8 : 0;
+          return y ? parseInt(y.data.coin.value) / 1e8 : 0;
         case o.ATOM:
           return +(await (await fetch(
             `https://rest.cosmos.directory/cosmoshub/auth/accounts/${t}`
@@ -93,10 +93,10 @@ function ie(e, t) {
     }
   });
 }
-function g() {
-  return u({
-    queryKey: ["ecency-wallets", "seed"],
-    queryFn: async () => D.generateMnemonic(128)
+function b(e) {
+  return p({
+    queryKey: ["ecency-wallets", "seed", e],
+    queryFn: async () => K.generateMnemonic(128)
   });
 }
 const C = {
@@ -107,12 +107,12 @@ const C = {
   allowStale: !1,
   updateAgeOnGet: !1,
   updateAgeOnHas: !1
-}, 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);
+}, 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;
 };
-function ce(e) {
-  return u({
+function le(e) {
+  return p({
     queryKey: ["ecency-wallets", "coingecko-price", e],
     queryFn: async () => {
       let t = e;
@@ -132,7 +132,7 @@ function ce(e) {
         default:
           t = e;
       }
-      let n = q("gecko"), a;
+      let n = E("gecko"), a;
       if (n)
         a = n;
       else {
@@ -148,36 +148,36 @@ function ce(e) {
             })
           }
         )).json();
-        W("gecko", s === void 0 ? d : s), a = s;
+        B("gecko", s === void 0 ? d : s), a = s;
       }
       return 1 / +a[Object.keys(a)[0]].usd;
     },
     enabled: !!e
   });
 }
-function B(e) {
-  const { data: t } = g();
-  return u({
+function L(e) {
+  const { data: t } = b(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 = p.fromLogin(e, t, "owner"), a = p.fromLogin(e, t, "active"), i = p.fromLogin(e, t, "posting"), r = p.fromLogin(e, t, "memo");
+      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");
       return {
         username: e,
         owner: n.toString(),
         active: a.toString(),
-        posting: i.toString(),
-        memo: r.toString(),
+        posting: r.toString(),
+        memo: i.toString(),
         ownerPubkey: n.createPublic().toString(),
         activePubkey: a.createPublic().toString(),
-        postingPubkey: i.createPublic().toString(),
-        memoPubkey: r.createPublic().toString()
+        postingPubkey: r.createPublic().toString(),
+        memoPubkey: i.createPublic().toString()
       };
     }
   });
 }
-const L = {
+const W = {
   [o.BTC]: "m/44'/0'/0'/0/0",
   // Bitcoin (BIP44)
   [o.ETH]: "m/44'/60'/0'/0/0",
@@ -193,17 +193,17 @@ const L = {
   [o.ATOM]: "m/44'/118'/0'/0/0"
   // Cosmos (BIP44)
 };
-function le(e, t) {
-  const { data: n } = g(), a = h(), i = m({
+function pe(e, t) {
+  const { data: n } = b(e), a = h(), r = 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 = b(t), c = await (s == null ? void 0 : s.getDerivedPrivateKey({
+      const s = T(t), c = await (s == null ? void 0 : s.getDerivedPrivateKey({
         mnemonic: n,
-        hdPath: L[t]
+        hdPath: W[t]
       }));
-      await _(1e3);
+      await j(1e3);
       const l = await (s == null ? void 0 : s.getNewAddress({
         privateKey: c
       }));
@@ -221,21 +221,21 @@ function le(e, t) {
         (c) => new Map(c ? Array.from(c.entries()) : []).set(s.currency, s)
       );
     }
-  }), r = v(() => {
+  }), i = P(() => {
   }, []);
   return {
-    createWallet: i,
-    importWallet: r
+    createWallet: r,
+    importWallet: i
   };
 }
-const x = { privateApiHost: "https://ecency.com" };
+const q = { privateApiHost: "https://ecency.com" };
 function M(e) {
-  const { data: t } = u({
+  const { data: t } = p({
     queryKey: ["ecency-wallets", "wallets", e]
-  }), { data: n } = B(e);
+  }), { data: n } = L(e);
   return m({
     mutationKey: ["ecency-wallets", "create-account-with-wallets", e],
-    mutationFn: ({ currency: a, address: i }) => fetch(x.privateApiHost + "/private-api/wallets-add", {
+    mutationFn: ({ currency: a, address: r }) => fetch(q.privateApiHost + "/private-api/wallets-add", {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -243,15 +243,15 @@ function M(e) {
       body: JSON.stringify({
         username: e,
         token: a,
-        address: i,
+        address: r,
         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, [s, c]) => ({
-              ...r,
+            (i, [s, c]) => ({
+              ...i,
               [s]: c.address
             }),
             {}
@@ -264,7 +264,7 @@ function M(e) {
 const ue = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   useCreateAccountWithWallets: M
-}, Symbol.toStringTag, { value: "Module" })), E = {
+}, Symbol.toStringTag, { value: "Module" })), x = {
   [o.BTC]: [
     "m/84'/0'/0'/0/0",
     "m/44'/0'/0'/0/0",
@@ -276,46 +276,62 @@ const ue = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   [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]
 };
-async function F(e, t, n, a) {
-  for (const i of E[a] || [])
+async function Q(e, t, n, a) {
+  for (const r of x[a] || [])
     try {
-      const r = await n.getDerivedPrivateKey({
+      const i = await n.getDerivedPrivateKey({
         mnemonic: e,
-        hdPath: i
+        hdPath: r
       });
-      if ((await n.getNewAddress({
-        privateKey: r
-      })).address === t)
-        return r;
+      for (const s of F[a])
+        if ((await n.getNewAddress({
+          privateKey: i,
+          addressType: s
+        })).address === t)
+          return i;
     } catch {
       return;
     }
 }
-function pe(e, t) {
+function me(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)
+    mutationFn: async ({ privateKeyOrSeed: a, address: r }) => {
+      const i = T(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 F(
+        l = await Q(
           a,
-          i,
           r,
+          i,
           t
         ), c = !!l;
       else {
-        const w = await r.getNewAddress({
+        const w = await i.getNewAddress({
           privateKey: a
-        }), y = await r.validPrivateKey({
+        }), f = await i.validPrivateKey({
           privateKey: a
         });
-        c = w.address === i && y.isValid;
+        c = w.address === r && f.isValid;
       }
       if (!c)
         throw new Error(
@@ -323,17 +339,17 @@ function pe(e, t) {
         );
       return {
         privateKey: l,
-        address: i,
+        address: r,
         publicKey: ""
       };
     },
-    onSuccess: ({ privateKey: a, publicKey: i, address: r }) => {
+    onSuccess: ({ privateKey: a, publicKey: r, address: i }) => {
       n.setQueryData(
         ["ecency-wallets", "wallets", e],
         (s) => new Map(s ? Array.from(s.entries()) : []).set(t, {
           privateKey: a,
-          publicKey: i,
-          address: r,
+          publicKey: r,
+          address: i,
           username: e,
           currency: t,
           custom: !0
@@ -345,13 +361,13 @@ function pe(e, t) {
 export {
   o as EcencyWalletCurrency,
   ue as EcencyWalletsPrivateApi,
-  _ as delay,
-  b as getWallet,
+  j as delay,
+  T as getWallet,
   re as mnemonicToSeedBip39,
-  ce as useCoinGeckoPriceQuery,
-  ie as useGetExternalWalletBalanceQuery,
-  B as useHiveKeysQuery,
-  pe as useImportWallet,
-  g as useSeedPhrase,
-  le as useWalletCreate
+  le as useCoinGeckoPriceQuery,
+  ce as useGetExternalWalletBalanceQuery,
+  L as useHiveKeysQuery,
+  me as useImportWallet,
+  b as useSeedPhrase,
+  pe as useWalletCreate
 };

package/package.json

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