From 2c53cda11d05564a53dc651ea9ae8a6d8ac5f946 Mon Sep 17 00:00:00 2001 From: Ian Slane Date: Wed, 17 Apr 2024 12:25:39 -0600 Subject: [PATCH] commit before pulling upstream changes --- ...d59d4abba9ee0160910ac94b4bcefb294f196.json | 40 +++++++++---------- mine-your-first-block/src/main.rs | 2 +- test.sh | 0 3 files changed, 21 insertions(+), 21 deletions(-) mode change 100644 => 100755 test.sh diff --git a/mempool/0a3c3139b32f021a35ac9a7bef4d59d4abba9ee0160910ac94b4bcefb294f196.json b/mempool/0a3c3139b32f021a35ac9a7bef4d59d4abba9ee0160910ac94b4bcefb294f196.json index d895dcb..1215448 100644 --- a/mempool/0a3c3139b32f021a35ac9a7bef4d59d4abba9ee0160910ac94b4bcefb294f196.json +++ b/mempool/0a3c3139b32f021a35ac9a7bef4d59d4abba9ee0160910ac94b4bcefb294f196.json @@ -1,41 +1,41 @@ { - "version": 1, - "locktime": 0, + "version": 2, + "locktime": 834637, "vin": [ { - "txid": "3b7dc918e5671037effad7848727da3d3bf302b05f5ded9bec89449460473bbb", - "vout": 16, + "txid": "b9b515b6171b47940809366f5d58591a56063db03fc39f678a03cb2b455f9428", + "vout": 0, "prevout": { - "scriptpubkey": "0014f8d9f2203c6f0773983392a487d45c0c818f9573", - "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 f8d9f2203c6f0773983392a487d45c0c818f9573", + "scriptpubkey": "0014371e036c75b663254314287faa19c7b3f6c35e8a", + "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 371e036c75b663254314287faa19c7b3f6c35e8a", "scriptpubkey_type": "v0_p2wpkh", - "scriptpubkey_address": "bc1qlrvlygpudurh8xpnj2jg04zupjqcl9tnk5np40", - "value": 37079526 + "scriptpubkey_address": "bc1qxu0qxmr4ke3j2sc59pl65xw8k0mvxh52kt0x5m", + "value": 293400650 }, "scriptsig": "", "scriptsig_asm": "", "witness": [ - "30440220780ad409b4d13eb1882aaf2e7a53a206734aa302279d6859e254a7f0a7633556022011fd0cbdf5d4374513ef60f850b7059c6a093ab9e46beb002505b7cba0623cf301", - "022bf8c45da789f695d59f93983c813ec205203056e19ec5d3fbefa809af67e2ec" + "304402207ed00dfbbf904a6f24d43725fe3cd9d8fec2f5b6f6a7ac7b1e0816e39266ff7602200966bdee875f64538a655dd2a0bc548c3deb5fd717ec3e9e107d1233533cc23a01", + "021160ee898d5480f4a193254338a6f289ab33a56ed639ca0b1504c9acffdf4fda" ], "is_coinbase": false, - "sequence": 4294967295 + "sequence": 4294967294 } ], "vout": [ { - "scriptpubkey": "76a9146085312a9c500ff9cc35b571b0a1e5efb7fb9f1688ac", - "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 6085312a9c500ff9cc35b571b0a1e5efb7fb9f16 OP_EQUALVERIFY OP_CHECKSIG", - "scriptpubkey_type": "p2pkh", - "scriptpubkey_address": "19oMRmCWMYuhnP5W61ABrjjxHc6RphZh11", - "value": 100000 + "scriptpubkey": "00140d1c76c89fbba64867349c1ad0f3313e6b4b7d36", + "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 0d1c76c89fbba64867349c1ad0f3313e6b4b7d36", + "scriptpubkey_type": "v0_p2wpkh", + "scriptpubkey_address": "bc1qp5w8djylhwnysee5nsddpue38e45klfk893yee", + "value": 4402400 }, { - "scriptpubkey": "0014ad4cc1cc859c57477bf90d0f944360d90a3998bf", - "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 ad4cc1cc859c57477bf90d0f944360d90a3998bf", + "scriptpubkey": "001414989c53e65d603069bf506996f24f45f4a12107", + "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 14989c53e65d603069bf506996f24f45f4a12107", "scriptpubkey_type": "v0_p2wpkh", - "scriptpubkey_address": "bc1q44xvrny9n3t5w7lep58egsmqmy9rnx9lt6u0tc", - "value": 36977942 + "scriptpubkey_address": "bc1qzjvfc5lxt4srq6dl2p5eduj0gh62zgg8mqeurg", + "value": 288994794 } ] } \ No newline at end of file diff --git a/mine-your-first-block/src/main.rs b/mine-your-first-block/src/main.rs index 5814876..8dfb39f 100644 --- a/mine-your-first-block/src/main.rs +++ b/mine-your-first-block/src/main.rs @@ -1001,4 +1001,4 @@ fn main() { nonce += 1; } } -} \ No newline at end of file +} diff --git a/test.sh b/test.sh old mode 100644 new mode 100755