@gardenfi/wallet-connectors 2.2.1-beta.4 → 2.2.1-beta.6

package/dist/index7.cjs

@@ -1 +1 @@
-"use strict";var m=r=>{throw TypeError(r)};var f=(r,t,e)=>t.has(r)||m("Cannot "+e);var a=(r,t,e)=>(f(r,t,"read from private field"),e?e.call(r):t.get(r)),w=(r,t,e)=>t.has(r)?m("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(r):t.set(r,e),g=(r,t,e,s)=>(f(r,t,"write to private field"),s?s.call(r,e):t.set(r,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("bitcoinjs-lib"),N=require("tiny-secp256k1"),n=require("@gardenfi/utils"),i=require("./index3.cjs"),c=require("@gardenfi/core"),A=require("./index4.cjs");function y(r){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(r){for(const e in r)if(e!=="default"){const s=Object.getOwnPropertyDescriptor(r,e);Object.defineProperty(t,e,s.get?s:{enumerable:!0,get:()=>r[e]})}}return t.default=r,Object.freeze(t)}const u=y(P),x=y(N);P.initEccLib(x);var o;class O{constructor(t){w(this,o);this.address="",this.id=i.WALLET_CONFIG.Phantom.id,this.name=i.WALLET_CONFIG.Phantom.name,this.icon=i.WALLET_CONFIG.Phantom.icon,this.disconnect=()=>(this.address="",Promise.resolve(n.Ok("Disconnected Phantom wallet"))),g(this,o,t)}async connect(t){if(t||(t=n.Network.MAINNET),t===n.Network.TESTNET)return n.Err("Phantom wallet does not support testnet");try{const e=await a(this,o).requestAccounts();for(const s of e)s.purpose==="payment"&&(this.address=s.address);return this.address===""?n.Err("Could not connect to Phantom bitcoin payment account"):n.Ok({address:this.address,provider:this,network:t,id:i.WALLET_CONFIG.Phantom.id})}catch(e){return n.Err("Error while connecting to Phantom wallet: "+e)}}async requestAccounts(){return await n.executeWithTryCatch(async()=>{const t=await a(this,o).requestAccounts();return t.length>0&&(this.address=t[0].address),t.map(e=>e.address)},"Error while requesting accounts from Phantom wallet")}async getAccounts(){return this.requestAccounts()}async getNetwork(){return n.Ok(n.Network.MAINNET)}async switchNetwork(){return n.Err("Phantom wallet does not support testnet")}async getBalance(){return await n.executeWithTryCatch(async()=>{const t=await A.getBalance(this.address,n.Network.MAINNET);if(t.ok&&t.val)return t.val;throw new Error(t.error)},"Error while getting balance from Phantom wallet")}async sendBitcoin(t,e){return await n.executeWithTryCatch(async()=>{const s=u.networks.bitcoin,d=new c.BitcoinProvider(c.BitcoinNetwork.Mainnet);try{const{txHex:h,utxoCount:p}=await c.BitcoinWallet.generateUnsignedPSBT(d,s,this.address,t,e),b=await a(this,o).signPSBT(this.fromHexString(h),{inputsToSign:[{address:this.address,signingIndexes:Array.from({length:p},(S,T)=>T),sigHash:u.Transaction.SIGHASH_ALL}]}),l=u.Psbt.fromBuffer(Buffer.from(b)).extractTransaction(),E=l.getId();return await d.broadcast(l.toHex()),E}catch{throw new Error("Failed to send bitcoin")}},"Error while sending bitcoin from Phantom wallet")}fromHexString(t){return Uint8Array.from(t.match(/.{1,2}/g).map(e=>parseInt(e,16)))}on(t,e){a(this,o).on(t,e)}off(t,e){a(this,o).off(t,e)}}o=new WeakMap;exports.PhantomProvider=O;
+"use strict";var f=r=>{throw TypeError(r)};var w=(r,t,e)=>t.has(r)||f("Cannot "+e);var a=(r,t,e)=>(w(r,t,"read from private field"),e?e.call(r):t.get(r)),g=(r,t,e)=>t.has(r)?f("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(r):t.set(r,e),P=(r,t,e,o)=>(w(r,t,"write to private field"),o?o.call(r,e):t.set(r,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("bitcoinjs-lib"),A=require("tiny-secp256k1"),n=require("@gardenfi/utils"),i=require("./index3.cjs"),d=require("@gardenfi/core"),x=require("./index4.cjs");function p(r){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(r){for(const e in r)if(e!=="default"){const o=Object.getOwnPropertyDescriptor(r,e);Object.defineProperty(t,e,o.get?o:{enumerable:!0,get:()=>r[e]})}}return t.default=r,Object.freeze(t)}const h=p(y),I=p(A);y.initEccLib(I);var s;class O{constructor(t){g(this,s);this.address="",this.id=i.WALLET_CONFIG.Phantom.id,this.name=i.WALLET_CONFIG.Phantom.name,this.icon=i.WALLET_CONFIG.Phantom.icon,this.disconnect=()=>(this.address="",Promise.resolve(n.Ok("Disconnected Phantom wallet"))),P(this,s,t)}async connect(t){if(t||(t=n.Network.MAINNET),t===n.Network.TESTNET)return n.Err("Phantom wallet does not support testnet");try{const e=await a(this,s).requestAccounts();for(const o of e)o.purpose==="payment"&&(this.address=o.address);return this.address===""?n.Err("Could not connect to Phantom bitcoin payment account"):n.Ok({address:this.address,provider:this,network:t,id:i.WALLET_CONFIG.Phantom.id})}catch(e){return n.Err("Error while connecting to Phantom wallet: "+e)}}async requestAccounts(){return await n.executeWithTryCatch(async()=>{const t=await a(this,s).requestAccounts();return t.length>0&&(this.address=t[0].address),t.map(e=>e.address)},"Error while requesting accounts from Phantom wallet")}async getAccounts(){return this.requestAccounts()}async getNetwork(){return n.Ok(n.Network.MAINNET)}async switchNetwork(){return n.Err("Phantom wallet does not support testnet")}async getBalance(){return await n.executeWithTryCatch(async()=>{const t=await x.getBalance(this.address,n.Network.MAINNET);if(t.ok&&t.val)return t.val;throw new Error(t.error)},"Error while getting balance from Phantom wallet")}async sendBitcoin(t,e){return await n.executeWithTryCatch(async()=>{const o=h.networks.bitcoin,l=new d.BitcoinProvider(d.BitcoinNetwork.Mainnet);try{const{txHex:c,utxoCount:b}=await d.BitcoinWallet.generateUnsignedPSBT(l,o,this.address,t,e),E=await a(this,s).signPSBT(this.fromHexString(c),{inputsToSign:[{address:this.address,signingIndexes:Array.from({length:b},(S,N)=>N),sigHash:h.Transaction.SIGHASH_ALL}]}),m=h.Psbt.fromBuffer(Buffer.from(E));m.finalizeAllInputs();const u=m.extractTransaction();console.log("tx",u);const T=u.getId();return await l.broadcast(u.toHex()),T}catch(c){throw new Error(`Failed to send bitcoin: ${c}`)}},"Error while sending bitcoin from Phantom wallet")}fromHexString(t){return Uint8Array.from(t.match(/.{1,2}/g).map(e=>parseInt(e,16)))}on(t,e){a(this,s).on(t,e)}off(t,e){a(this,s).off(t,e)}}s=new WeakMap;exports.PhantomProvider=O;

package/dist/index7.js

@@ -1,30 +1,30 @@
-var w = (n) => {
+var g = (n) => {
   throw TypeError(n);
 };
-var g = (n, t, r) => t.has(n) || w("Cannot " + r);
-var s = (n, t, r) => (g(n, t, "read from private field"), r ? r.call(n) : t.get(n)), p = (n, t, r) => t.has(n) ? w("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, r), P = (n, t, r, o) => (g(n, t, "write to private field"), o ? o.call(n, r) : t.set(n, r), r);
-import * as d from "bitcoinjs-lib";
-import { initEccLib as T } from "bitcoinjs-lib";
-import * as x from "tiny-secp256k1";
-import { Ok as h, Network as a, Err as i, executeWithTryCatch as m } from "@gardenfi/utils";
+var p = (n, t, r) => t.has(n) || g("Cannot " + r);
+var s = (n, t, r) => (p(n, t, "read from private field"), r ? r.call(n) : t.get(n)), P = (n, t, r) => t.has(n) ? g("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, r), y = (n, t, r, e) => (p(n, t, "write to private field"), e ? e.call(n, r) : t.set(n, r), r);
+import * as m from "bitcoinjs-lib";
+import { initEccLib as b } from "bitcoinjs-lib";
+import * as N from "tiny-secp256k1";
+import { Ok as u, Network as a, Err as i, executeWithTryCatch as l } from "@gardenfi/utils";
 import { WALLET_CONFIG as c } from "./index3.js";
-import { BitcoinProvider as N, BitcoinNetwork as B, BitcoinWallet as I } from "@gardenfi/core";
-import { getBalance as v } from "./index4.js";
-T(x);
-var e;
+import { BitcoinProvider as B, BitcoinNetwork as I, BitcoinWallet as v } from "@gardenfi/core";
+import { getBalance as S } from "./index4.js";
+b(N);
+var o;
 class _ {
   constructor(t) {
-    p(this, e);
-    this.address = "", this.id = c.Phantom.id, this.name = c.Phantom.name, this.icon = c.Phantom.icon, this.disconnect = () => (this.address = "", Promise.resolve(h("Disconnected Phantom wallet"))), P(this, e, t);
+    P(this, o);
+    this.address = "", this.id = c.Phantom.id, this.name = c.Phantom.name, this.icon = c.Phantom.icon, this.disconnect = () => (this.address = "", Promise.resolve(u("Disconnected Phantom wallet"))), y(this, o, t);
   }
   async connect(t) {
     if (t || (t = a.MAINNET), t === a.TESTNET)
       return i("Phantom wallet does not support testnet");
     try {
-      const r = await s(this, e).requestAccounts();
-      for (const o of r)
-        o.purpose === "payment" && (this.address = o.address);
-      return this.address === "" ? i("Could not connect to Phantom bitcoin payment account") : h({
+      const r = await s(this, o).requestAccounts();
+      for (const e of r)
+        e.purpose === "payment" && (this.address = e.address);
+      return this.address === "" ? i("Could not connect to Phantom bitcoin payment account") : u({
         address: this.address,
         provider: this,
         network: t,
@@ -35,8 +35,8 @@ class _ {
     }
   }
   async requestAccounts() {
-    return await m(async () => {
-      const t = await s(this, e).requestAccounts();
+    return await l(async () => {
+      const t = await s(this, o).requestAccounts();
       return t.length > 0 && (this.address = t[0].address), t.map((r) => r.address);
     }, "Error while requesting accounts from Phantom wallet");
   }
@@ -45,46 +45,50 @@ class _ {
   }
   // bitcoin testnet is not supported in Phantom wallet
   async getNetwork() {
-    return h(a.MAINNET);
+    return u(a.MAINNET);
   }
   async switchNetwork() {
     return i("Phantom wallet does not support testnet");
   }
   async getBalance() {
-    return await m(async () => {
-      const t = await v(this.address, a.MAINNET);
+    return await l(async () => {
+      const t = await S(this.address, a.MAINNET);
       if (t.ok && t.val)
         return t.val;
       throw new Error(t.error);
     }, "Error while getting balance from Phantom wallet");
   }
   async sendBitcoin(t, r) {
-    return await m(async () => {
-      const o = d.networks.bitcoin, u = new N(B.Mainnet);
+    return await l(async () => {
+      const e = m.networks.bitcoin, f = new B(I.Mainnet);
       try {
-        const { txHex: f, utxoCount: y } = await I.generateUnsignedPSBT(
-          u,
-          o,
+        const { txHex: d, utxoCount: A } = await v.generateUnsignedPSBT(
+          f,
+          e,
           this.address,
           t,
           r
-        ), E = await s(this, e).signPSBT(
-          this.fromHexString(f),
+        ), E = await s(this, o).signPSBT(
+          this.fromHexString(d),
           {
             inputsToSign: [
               {
                 address: this.address,
-                signingIndexes: Array.from({ length: y }, (H, A) => A),
-                sigHash: d.Transaction.SIGHASH_ALL
+                signingIndexes: Array.from({ length: A }, (H, T) => T),
+                sigHash: m.Transaction.SIGHASH_ALL
               }
             ]
           }
-        ), l = d.Psbt.fromBuffer(
+        ), w = m.Psbt.fromBuffer(
           Buffer.from(E)
-        ).extractTransaction(), b = l.getId();
-        return await u.broadcast(l.toHex()), b;
-      } catch {
-        throw new Error("Failed to send bitcoin");
+        );
+        w.finalizeAllInputs();
+        const h = w.extractTransaction();
+        console.log("tx", h);
+        const x = h.getId();
+        return await f.broadcast(h.toHex()), x;
+      } catch (d) {
+        throw new Error(`Failed to send bitcoin: ${d}`);
       }
     }, "Error while sending bitcoin from Phantom wallet");
   }
@@ -94,13 +98,13 @@ class _ {
     );
   }
   on(t, r) {
-    s(this, e).on(t, r);
+    s(this, o).on(t, r);
   }
   off(t, r) {
-    s(this, e).off(t, r);
+    s(this, o).off(t, r);
   }
 }
-e = new WeakMap();
+o = new WeakMap();
 export {
   _ as PhantomProvider
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/wallet-connectors",
-  "version": "2.2.1-beta.4",
+  "version": "2.2.1-beta.6",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -36,8 +36,8 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@gardenfi/core": "2.3.1-beta.4",
-    "@gardenfi/utils": "2.3.0",
+    "@gardenfi/core": "2.3.1-beta.6",
+    "@gardenfi/utils": "2.3.1",
     "axios": "^1.7.9",
     "bitcoinjs-lib": "^6.1.7",
     "react": "^18.3.1",