Merge branch 'master' into example/multisigtaproot

Author: junderw

CHANGELOG.md

@@ -333,7 +333,7 @@ __fixed__
 
 # 2.1.0
 From this release users should use the HDNode directly (compared to accessing `.keyPair`) when performing ECDSA operations such as `sign` or `verify`.
-Ideally you shoud not have to directly access `HDNode` internals for general usage,  as it can often be confusing and error prone.
+Ideally you should not have to directly access `HDNode` internals for general usage,  as it can often be confusing and error prone.
 
 __added__
 - `ECPair.prototype.getNetwork`
@@ -344,7 +344,7 @@ __added__
 
 
 # 2.0.0
-In this release we have strived to simplify the API,  [using native types](https://github.com/bitcoinjs/bitcoinjs-lib/issues/407) wherevever possible to encourage cross-compatibility with other open source community modules.
+In this release we have strived to simplify the API,  [using native types](https://github.com/bitcoinjs/bitcoinjs-lib/issues/407) wherever possible to encourage cross-compatibility with other open source community modules.
 
 The `ecdsa` module has been removed in lieu of using a new ECDSA module (for performance and safety reasons) during the `2.x.y` major release.
 Several other cumbersome modules have been removed,  with their new independent modules recommended for usage instead for greater modularity in your projects.

README.md

@@ -93,7 +93,7 @@ If you'd like to use a different (more modern) build tool than `browserify`, you
 
 ```sh
 $ npm install bitcoinjs-lib browserify
-$ npx browserify --standalone bitcoin - -o bitcoinjs-lib.js <<<"module.exports = require('bitcoinjs-lib');"
+$ npx browserify --standalone bitcoin -o bitcoinjs-lib.js <<< "module.exports = require('bitcoinjs-lib');"
 ```
 
 Which you can then import as an ESM module:
@@ -102,6 +102,16 @@ Which you can then import as an ESM module:
 <script type="module">import "/scripts/bitcoinjs-lib.js"</script>
 ````
 
+#### Using Taproot:
+When utilizing Taproot features with bitcoinjs-lib, you may need to include an additional ECC (Elliptic Curve Cryptography) library. The commonly used `tiny-secp256k1` library, however, might lead to compatibility issues due to its reliance on WASM (WebAssembly). The following alternatives may be used instead, though they may be significantly slower for high volume of signing and pubkey deriving operations.
+
+#### Alternatives for ECC Library:
+1. `@bitcoinjs-lib/tiny-secp256k1-asmjs`
+   A version of `tiny-secp256k1` compiled to ASM.js directly from the WASM version, potentially better supported in browsers. This is the slowest option.
+2. `@bitcoinerlab/secp256k1`
+   Another alternative library for ECC functionality. This requires access to the global `BigInt` primitive.
+For advantages and detailed comparison of these libraries, visit: [tiny-secp256k1 GitHub page](https://github.com/bitcoinjs/tiny-secp256k1).
+
 **NOTE**: We use Node Maintenance LTS features, if you need strict ES5, use [`--transform babelify`](https://github.com/babel/babelify) in conjunction with your `browserify` step (using an [`es2015`](https://babeljs.io/docs/plugins/preset-es2015/) preset).
 
 **WARNING**: iOS devices have [problems](https://github.com/feross/buffer/issues/136), use at least [buffer@5.0.5](https://github.com/feross/buffer/pull/155) or greater,  and enforce the test suites (for `Buffer`, and any other dependency) pass before use.

src/psbt/bip371.js

@@ -97,7 +97,7 @@ function checkTaprootScriptPubkey(outputData, newOutputData) {
     const { script: scriptPubkey } = outputData;
     const script = getTaprootScripPubkey(tapInternalKey, tapTree);
     if (scriptPubkey && !scriptPubkey.equals(script))
-      throw new Error('Error adding output. Script or address missmatch.');
+      throw new Error('Error adding output. Script or address mismatch.');
   }
 }
 function getTaprootScripPubkey(tapInternalKey, tapTree) {

test/fixtures/psbt.json

@@ -615,7 +615,7 @@
           "address": "bc1p3efq8ujsj0qr5xvms7mv89p8cz0crqdtuxe9ms6grqgxc9sgsntslthf6w",
           "value": 410000
         },
-        "exception": "Error adding output. Script or address missmatch."
+        "exception": "Error adding output. Script or address mismatch."
       },
       {
         "description": "Adds taproot output with both taproot and non-taproot fields",

ts_src/psbt/bip371.ts

@@ -129,7 +129,7 @@ function checkTaprootScriptPubkey(
     const { script: scriptPubkey } = outputData as any;
     const script = getTaprootScripPubkey(tapInternalKey, tapTree);
     if (scriptPubkey && !scriptPubkey.equals(script))
-      throw new Error('Error adding output. Script or address missmatch.');
+      throw new Error('Error adding output. Script or address mismatch.');
   }
 }