Merge branch 'master' into s/wallet-connect-v2

trustwallet · Jan 9, 2024 · d17c34f · d17c34f
2 parents 676c25d + d0af57e
commit d17c34f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/rust/tw_bitcoin/tests/p2pkh.rs b/rust/tw_bitcoin/tests/p2pkh.rs
@@ -9,7 +9,7 @@ use tw_proto::BitcoinV2::Proto;
 use tw_proto::Utxo::Proto as UtxoProto;
 
 #[test]
-fn coin_entry_emtpy() {
+fn coin_entry_empty() {
     let _coin = TestCoinContext::default();
     let alice_private_key = hex("56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657");
 

diff --git a/samples/cpp/sample.cpp b/samples/cpp/sample.cpp
@@ -24,7 +24,7 @@ int main() {
             cout << endl;
             cout << "  *** DISCLAIMER ***" << endl;
             cout << "  THIS IS A SAMPLE APPLICATION WITH DEMONSTRATION PURPOSES ONLY." << endl;
-            cout << "  DO NOT USE WITH REAL SECRETS, REAL ADDRESSESS, OR REAL TRANSACTIONS.  USE IT AT YOUR OWN RISK." << endl;
+            cout << "  DO NOT USE WITH REAL SECRETS, REAL ADDRESSES, OR REAL TRANSACTIONS.  USE IT AT YOUR OWN RISK." << endl;
             cout << "  *** DISCLAIMER ***" << endl;
             cout << endl;
         }

diff --git a/src/Bitcoin/MessageSigner.cpp b/src/Bitcoin/MessageSigner.cpp
@@ -17,7 +17,7 @@ using namespace TW;
 
 namespace TW::Bitcoin {
 
-// lenght-encode a message string
+// length-encode a message string
 Data messageToData(const std::string& message) {
     Data d;
     TW::encodeVarInt(message.size(), d);

diff --git a/src/Bitcoin/SigningInput.h b/src/Bitcoin/SigningInput.h
@@ -68,7 +68,7 @@ class SigningInput {
     uint32_t lockTime = 0;
     uint32_t time = 0;
 
-    // Besides to_address and change_addres,
+    // Besides to_address and change_address,
     // we have other outputs that include address and value
     std::vector<std::pair<std::string, int64_t>> extraOutputs;