emblem-vault-sdk 1.9.2 → 1.9.4

package/dist/bundle.js

@@ -709352,9 +709352,9 @@ const bip39 = __importStar(require("bip39"));
 // import bitcoin from "bitcoinjs-lib";
 const ecc = __importStar(require("@bitcoin-js/tiny-secp256k1-asmjs"));
 const bip32 = (0, bip32_1.BIP32Factory)(ecc);
-let mainnet = { "messagePrefix": "\u0018Bitcoin Signed Message:\n", "bech32": "bc", "bip32": { "public": 76067358, "private": 76066276 }, "pubKeyHash": 0, "scriptHash": 5, "wif": 128 };
 const generateTaprootAddressFromMnemonic = (phrase) => __awaiter(void 0, void 0, void 0, function* () {
     let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
     bitcoin.initEccLib(ecc);
     const seed = bip39.mnemonicToSeedSync(phrase);
     const rootKey = bip32.fromSeed(seed, mainnet);
@@ -709376,6 +709376,7 @@ exports.generateTaprootAddressFromMnemonic = generateTaprootAddressFromMnemonic;
 const getPsbtTxnSize = (phrase, psbtBase64) => {
     var _a, _b;
     let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
     const parsedPsbt = bitcoin.Psbt.fromBase64(psbtBase64);
     const psbt = new bitcoin.Psbt();
     const seed = bip39.mnemonicToSeedSync(phrase);
@@ -709476,7 +709477,7 @@ const bignumber_1 = require("@ethersproject/bignumber");
 const utils_1 = require("./utils");
 const sats_connect_1 = require("sats-connect");
 const derive_1 = require("./derive");
-const SDK_VERSION = '1.9.2';
+const SDK_VERSION = '1.9.3';
 class EmblemVaultSDK {
     constructor(apiKey, baseUrl) {
         this.apiKey = apiKey;
@@ -709934,9 +709935,8 @@ class EmblemVaultSDK {
             });
         });
     }
-    generatePSBT(phrase) {
+    generatePSBT(phrase, satsPerByte = 20) {
         return __awaiter(this, void 0, void 0, function* () {
-            const desiredFeeRate = 2; // sats per byte -> mainnet will be much higher
             const { paymentAddress, paymentPublicKey, ordinalsAddress } = yield this.getSatsConnectAddress();
             // change this to mainnet
             if (window.bitcoin) {
@@ -709993,18 +709993,18 @@ class EmblemVaultSDK {
                     });
                     totalFeeInput += utxo.value;
                     size = (0, derive_1.getPsbtTxnSize)(phrase, psbt.toBase64());
-                    if (totalFeeInput >= desiredFeeRate * size) {
+                    if (totalFeeInput >= satsPerByte * size) {
                         break;
                     }
                 }
-                if (totalFeeInput < desiredFeeRate * size) {
+                if (totalFeeInput < satsPerByte * size) {
                     throw new Error("Insufficient funds at desired fee rate");
                 }
                 // maybe add output for change if change is greater than 1000 sats (dust)
-                if (desiredFeeRate * size > 1000) {
+                if (satsPerByte * size > 1000) {
                     psbt.addOutput({
                         address: paymentAddress,
-                        value: totalFeeInput - Math.ceil(desiredFeeRate * size),
+                        value: totalFeeInput - Math.ceil(satsPerByte * size),
                     });
                 }
                 // sign

package/dist/derive.js

@@ -38,9 +38,9 @@ const bip39 = __importStar(require("bip39"));
 // import bitcoin from "bitcoinjs-lib";
 const ecc = __importStar(require("@bitcoin-js/tiny-secp256k1-asmjs"));
 const bip32 = (0, bip32_1.BIP32Factory)(ecc);
-let mainnet = { "messagePrefix": "\u0018Bitcoin Signed Message:\n", "bech32": "bc", "bip32": { "public": 76067358, "private": 76066276 }, "pubKeyHash": 0, "scriptHash": 5, "wif": 128 };
 const generateTaprootAddressFromMnemonic = (phrase) => __awaiter(void 0, void 0, void 0, function* () {
     let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
     bitcoin.initEccLib(ecc);
     const seed = bip39.mnemonicToSeedSync(phrase);
     const rootKey = bip32.fromSeed(seed, mainnet);
@@ -62,6 +62,7 @@ exports.generateTaprootAddressFromMnemonic = generateTaprootAddressFromMnemonic;
 const getPsbtTxnSize = (phrase, psbtBase64) => {
     var _a, _b;
     let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
     const parsedPsbt = bitcoin.Psbt.fromBase64(psbtBase64);
     const psbt = new bitcoin.Psbt();
     const seed = bip39.mnemonicToSeedSync(phrase);

package/dist/index.js

@@ -36,7 +36,7 @@ const bignumber_1 = require("@ethersproject/bignumber");
 const utils_1 = require("./utils");
 const sats_connect_1 = require("sats-connect");
 const derive_1 = require("./derive");
-const SDK_VERSION = '1.9.2';
+const SDK_VERSION = '1.9.3';
 class EmblemVaultSDK {
     constructor(apiKey, baseUrl) {
         this.apiKey = apiKey;
@@ -494,9 +494,8 @@ class EmblemVaultSDK {
             });
         });
     }
-    generatePSBT(phrase) {
+    generatePSBT(phrase, satsPerByte = 20) {
         return __awaiter(this, void 0, void 0, function* () {
-            const desiredFeeRate = 2; // sats per byte -> mainnet will be much higher
             const { paymentAddress, paymentPublicKey, ordinalsAddress } = yield this.getSatsConnectAddress();
             // change this to mainnet
             if (window.bitcoin) {
@@ -553,18 +552,18 @@ class EmblemVaultSDK {
                     });
                     totalFeeInput += utxo.value;
                     size = (0, derive_1.getPsbtTxnSize)(phrase, psbt.toBase64());
-                    if (totalFeeInput >= desiredFeeRate * size) {
+                    if (totalFeeInput >= satsPerByte * size) {
                         break;
                     }
                 }
-                if (totalFeeInput < desiredFeeRate * size) {
+                if (totalFeeInput < satsPerByte * size) {
                     throw new Error("Insufficient funds at desired fee rate");
                 }
                 // maybe add output for change if change is greater than 1000 sats (dust)
-                if (desiredFeeRate * size > 1000) {
+                if (satsPerByte * size > 1000) {
                     psbt.addOutput({
                         address: paymentAddress,
-                        value: totalFeeInput - Math.ceil(desiredFeeRate * size),
+                        value: totalFeeInput - Math.ceil(satsPerByte * size),
                     });
                 }
                 // sign

package/docs/bundle.js

@@ -709352,9 +709352,9 @@ const bip39 = __importStar(require("bip39"));
 // import bitcoin from "bitcoinjs-lib";
 const ecc = __importStar(require("@bitcoin-js/tiny-secp256k1-asmjs"));
 const bip32 = (0, bip32_1.BIP32Factory)(ecc);
-let mainnet = { "messagePrefix": "\u0018Bitcoin Signed Message:\n", "bech32": "bc", "bip32": { "public": 76067358, "private": 76066276 }, "pubKeyHash": 0, "scriptHash": 5, "wif": 128 };
 const generateTaprootAddressFromMnemonic = (phrase) => __awaiter(void 0, void 0, void 0, function* () {
     let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
     bitcoin.initEccLib(ecc);
     const seed = bip39.mnemonicToSeedSync(phrase);
     const rootKey = bip32.fromSeed(seed, mainnet);
@@ -709376,6 +709376,7 @@ exports.generateTaprootAddressFromMnemonic = generateTaprootAddressFromMnemonic;
 const getPsbtTxnSize = (phrase, psbtBase64) => {
     var _a, _b;
     let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
     const parsedPsbt = bitcoin.Psbt.fromBase64(psbtBase64);
     const psbt = new bitcoin.Psbt();
     const seed = bip39.mnemonicToSeedSync(phrase);
@@ -709476,7 +709477,7 @@ const bignumber_1 = require("@ethersproject/bignumber");
 const utils_1 = require("./utils");
 const sats_connect_1 = require("sats-connect");
 const derive_1 = require("./derive");
-const SDK_VERSION = '1.9.2';
+const SDK_VERSION = '1.9.3';
 class EmblemVaultSDK {
     constructor(apiKey, baseUrl) {
         this.apiKey = apiKey;
@@ -709934,9 +709935,8 @@ class EmblemVaultSDK {
             });
         });
     }
-    generatePSBT(phrase) {
+    generatePSBT(phrase, satsPerByte = 20) {
         return __awaiter(this, void 0, void 0, function* () {
-            const desiredFeeRate = 2; // sats per byte -> mainnet will be much higher
             const { paymentAddress, paymentPublicKey, ordinalsAddress } = yield this.getSatsConnectAddress();
             // change this to mainnet
             if (window.bitcoin) {
@@ -709993,18 +709993,18 @@ class EmblemVaultSDK {
                     });
                     totalFeeInput += utxo.value;
                     size = (0, derive_1.getPsbtTxnSize)(phrase, psbt.toBase64());
-                    if (totalFeeInput >= desiredFeeRate * size) {
+                    if (totalFeeInput >= satsPerByte * size) {
                         break;
                     }
                 }
-                if (totalFeeInput < desiredFeeRate * size) {
+                if (totalFeeInput < satsPerByte * size) {
                     throw new Error("Insufficient funds at desired fee rate");
                 }
                 // maybe add output for change if change is greater than 1000 sats (dust)
-                if (desiredFeeRate * size > 1000) {
+                if (satsPerByte * size > 1000) {
                     psbt.addOutput({
                         address: paymentAddress,
-                        value: totalFeeInput - Math.ceil(desiredFeeRate * size),
+                        value: totalFeeInput - Math.ceil(satsPerByte * size),
                     });
                 }
                 // sign

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emblem-vault-sdk",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "Emblem Vault Software Development Kit",
   "main": "dist/index.js",
   "scripts": {

package/src/derive.ts

@@ -6,14 +6,15 @@ import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs'
 
 const bip32 = BIP32Factory(ecc);
 
-let mainnet: any = {"messagePrefix":"\u0018Bitcoin Signed Message:\n","bech32":"bc","bip32":{"public":76067358,"private":76066276},"pubKeyHash":0,"scriptHash":5,"wif":128}
+// let mainnet: any = {"messagePrefix":"\u0018Bitcoin Signed Message:\n","bech32":"bc","bip32":{"public":76067358,"private":76066276},"pubKeyHash":0,"scriptHash":5,"wif":128}
 declare global {
     interface Window {
       bitcoin: any;
     }
   }
 export const generateTaprootAddressFromMnemonic = async (phrase: string) => {
-  let bitcoin = window.bitcoin;  
+  let bitcoin = window.bitcoin;
+  let mainnet = bitcoin.networks.mainnet;
   bitcoin.initEccLib(ecc);
   const seed = bip39.mnemonicToSeedSync(phrase);
 
@@ -39,7 +40,8 @@ export const generateTaprootAddressFromMnemonic = async (phrase: string) => {
 // we sign it with a dummy key and then extract the transaction
 // it should be very close to 100% accurate
 export const getPsbtTxnSize = (phrase: string, psbtBase64: string) => {
-    let bitcoin = window.bitcoin;  
+    let bitcoin = window.bitcoin;
+    let mainnet = bitcoin.networks.mainnet;
   const parsedPsbt = bitcoin.Psbt.fromBase64(psbtBase64);
 
   const psbt = new bitcoin.Psbt();

package/src/index.ts

@@ -404,9 +404,7 @@ class EmblemVaultSDK {
         });
     }
 
-    async generatePSBT(phrase: string) {
-       
-        const desiredFeeRate = 2; // sats per byte -> mainnet will be much higher
+    async generatePSBT(phrase: string, satsPerByte: number = 20) {     
 
         const { paymentAddress, paymentPublicKey, ordinalsAddress } = await this.getSatsConnectAddress();
 
@@ -481,20 +479,20 @@ class EmblemVaultSDK {
 
                 size = getPsbtTxnSize(phrase, psbt.toBase64());
 
-                if (totalFeeInput >= desiredFeeRate * size) {
+                if (totalFeeInput >= satsPerByte * size) {
                     break;
                 }
             }
 
-            if (totalFeeInput < desiredFeeRate * size) {
+            if (totalFeeInput < satsPerByte * size) {
                 throw new Error("Insufficient funds at desired fee rate");
             }
 
             // maybe add output for change if change is greater than 1000 sats (dust)
-            if (desiredFeeRate * size > 1000) {
+            if (satsPerByte * size > 1000) {
                 psbt.addOutput({
                     address: paymentAddress,
-                    value: totalFeeInput - Math.ceil(desiredFeeRate * size),
+                    value: totalFeeInput - Math.ceil(satsPerByte * size),
                 });
             }
 

package/types/index.d.ts

@@ -46,7 +46,7 @@ declare class EmblemVaultSDK {
     legacyBalanceFromContractByAddress(web3: any, address: string): Promise<number[]>;
     refreshLegacyOwnership(web3: any, address: string): Promise<void>;
     getSatsConnectAddress(): Promise<SatsConnectAddress>;
-    generatePSBT(phrase: string): Promise<void>;
+    generatePSBT(phrase: string, satsPerByte?: number): Promise<void>;
     getTaprootAddressFromMnemonic(phrase: string): Promise<{
         p2tr: any;
         tweakedSigner: import("bip32/types/bip32").Signer;