Skip to content

Commit

Permalink
try88-7
Browse files Browse the repository at this point in the history
  • Loading branch information
lla-dane committed Apr 16, 2024
1 parent db85aa4 commit d7ee112
Show file tree
Hide file tree
Showing 291 changed files with 659,500 additions and 2,969 deletions.
4,415 changes: 4,415 additions & 0 deletions mempool/01d645e19e9716968fdd91a9f6b46417d8c03d3ea710c0b9758a6520d0c0f3bf.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/0248defd8dfcb2dff703478449c3f13c19769052f85da4109d7147ee1f70265d.json

Large diffs are not rendered by default.

5,498 changes: 5,498 additions & 0 deletions mempool/02e09abed1c49fa18819425c9fde49b3dcfcc9a2652fee7c8c3e15fd7f140fa3.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/0529997d6bacdc6a3981cea0b4609415553ddf1799994174a8f03d7e9f166169.json

Large diffs are not rendered by default.

7,614 changes: 7,614 additions & 0 deletions mempool/07fdd70c4e669f057f76ae0e31f2d41919d3461df3a20003161f4d59947b6519.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/0a5d6ddc87a9246297c1038d873eec419f04301197d67b9854fa2679dbe3bd65.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/0d7f82acd12a9f2ddec18af6f977ab8c5fa98ee488f7e611924c4d320cfbfa82.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/0ec427bc5c43b92e00d14628d19a9aa2295fb4abcee10d417a6dfbd3f13e58ff.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/17d0f4356c58aeeb92419c86b25e5013169a50836759acbae8ef6c2dd3a4a459.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/1980828ca817df28c494108ac5f446910b5c5073b13f1aba916301c2ba09f1f7.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/198c50c35bafc17dd138aa92892bd052f937ebd1cba24e994edc060ff1a492ad.json

Large diffs are not rendered by default.

2,400 changes: 2,400 additions & 0 deletions mempool/2cf6adf63bb6778bc72adab378eb22f39215b8448bb728295fb37b368b23011f.json

Large diffs are not rendered by default.

3,796 changes: 3,796 additions & 0 deletions mempool/317b1e915852327c2737d36f040d8d7367695c9c091af3a1ffac80238baf6e12.json

Large diffs are not rendered by default.

2,580 changes: 2,580 additions & 0 deletions mempool/3203bd2b1b65c6d5c2f5d5a53057717ddcfeecb00050e4b7b7404ed404914169.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/363108cab6d9000cbb0a4f187785f94c86d910c5a548d553bc8a722a58b82c1e.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/37849c4044136a17fcae42c206e7eca2c912480bfb3b4ebd7f961def8a0b741a.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/3841009b14944173ae6a1b7460be4f008966f3e5d7ca545775a8ff8643ee8080.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/389f6625b5f41b40c358e1f48e373080bafdbc3df7b76dafdae32406862fd23f.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/38cacda93a9a38df1c7ce422a75fe8913c652014af1396051ff0b11727c142f8.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/3a83c7aab69269f76e60fc5c4f7a9dd8a5d1ba1cd7596b20e205de36e6118c51.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/3d0b02ece80c18277053b1d388dae98da8dfa3e5de0387166083ad737bd96bc1.json

Large diffs are not rendered by default.

4,342 changes: 4,342 additions & 0 deletions mempool/5a025166f89de9b6e8f9b83ba578a26cd79f8e08c4410e25f0e97a12e1780afa.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/5fff05565e6729f8715090ac93cb48573a2438e3466ca920430da5eed8700843.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/65b69f7af54f5f12177d269b37fd8cdbe68e3d16f46630c97c9e470d72037f3c.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/695f2a246317b1f6f4cb0224010d1287ec650ce3a9327672c0e6249998c0448d.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/70ee724b3620f6c7b826b846d95c2cb6f48e134ad7be508ed936ca1933e62a90.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2,675 changes: 2,675 additions & 0 deletions mempool/7bb25c94138ac89b5dc31344938ab99ad8be0286fb9fcc583ec3508339048c9a.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/83e474ce45df6423e415b8391ecfdffedc13ed18c4984eae78695cf8a153499a.json

Large diffs are not rendered by default.

7,614 changes: 7,614 additions & 0 deletions mempool/8680a81d506c73841c10013cbc89bebf5d4cae96c3e1bbdb66540c3df58864ff.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/87869ef25494474a24b461ddebbb19a221a05d5da156d3bcbe9f0eaee2bde7bc.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/8aca03ee171eaaeff309a1ddd69910bc74a51e2007f5c4dd3ca692b542df458e.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"value": 2726004
}
]
}
}
4,415 changes: 4,415 additions & 0 deletions mempool/938a2466667dd170fc7a29d8a61613a4b4abdd7699d65cb2334dfa30cb8bb437.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/95cd44e82e8324150f49d7463c90a8d285b9221b14df68638318bb9f45c656e4.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/96382ea4f81ce327a2e7f4ba8c6607b1c683b2d1d68a2b54264c72d0bf0ca67d.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/9a397f3817cb0cf8b49681c2fe8a35ee49ca25cfc6e0df0d59e59fdc0780caf7.json

Large diffs are not rendered by default.

4,621 changes: 4,621 additions & 0 deletions mempool/9be7d02a0658311f506a4c407188827bfad9e7913e85e6799925f362fb452445.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/a051162fb593192abd07707e9449c71c15eb57ddf8ee223e5b46e08bfce88f53.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/a2d9a8473554bd3f0b229bf9020664db29c2f25f89c353db39e0ae3730383f67.json

Large diffs are not rendered by default.

2,637 changes: 2,637 additions & 0 deletions mempool/a2fe0dfc8365361583e31fdd0206d6ffd58cf246f08042245c14822a447bd4de.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/a53397653b0f3a339c8bf9fd8c71922a8e721a6b22094ac399f154508b57bb3e.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/a58077991d09258705eb51fbab0c6535a49f98570535c4f02cdfb20bf385ca65.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/b37e15c4a5e2220fdfe351523fbd82a320df49ce267c99e8e19818252fef0ca9.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/b6b5aefcc98f9fa49d4d5331bd83d9fd329ae2a57e663c7d216bef5173f4fb32.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/b7fe5a0038c6452f4ed8d1ae49e4632a81cc70e899ffbf196e9a1a6a3e5f01ee.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/bb6ebec902a2783ef7c833a43c0c9d7ad61ebb5c80606b01791060966b44245e.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/c2938ca102dd618147bcee288595970c228de734ba613490613c5bfb4e8f8ed7.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/c56b086f5debcd5801aad4a8fdb85c43eb215196e6330ed9dac78aa4915ae599.json

Large diffs are not rendered by default.

4,632 changes: 4,632 additions & 0 deletions mempool/c815996cf3e4bbac45ac1280df06d48b98670893fb1351146a395aaf957245c8.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/cc8f6c5cb837a2220c7260d82fe101c641817ea305f6c1d69d06eaa2b9d1ca85.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

8,644 changes: 8,644 additions & 0 deletions mempool/cd04ba62b5037604e49641ece5f985f6ebfe2d7cf624cc21afa2018497a8a002.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/cd1a3cd694f01d4e02d2568757afecff9d577b40cbbcc8fe47002e8b8cb4d47e.json

Large diffs are not rendered by default.

5,335 changes: 5,335 additions & 0 deletions mempool/d67a043f87eb002584c24b497b1f8c0ca4f29845dec09eba60c74c95068ed55f.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/dbaab66f0fada6b01739f1a479b1ae0fa5fab81ad19bc7224d5fa4a42014dd63.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/de28e46a41fe497c909c0aeffa7185014c31a33410119a479c99dfbf0dbcca4f.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/de8b33c9e41ff6daaf1fad7a37834fe9c2098300824ad1be42ca9c388cb088cc.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/e1e9bf082fb6b5587122c64f31620cc8180de495240af2e183f6459f4fbc725e.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/e491b736afbbefe37127d5d4cca3933c6cd6b4ac5b96a4d6fadc4e578f657ec7.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/e5b6a5f13d315a44e469b9849f7daece0cb5a9faa39173d1871c54f587078db8.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/e74e3c2aec4899d206f7f7e1ea824a5bbfed9137f7a555f939a10f7d11184d58.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/e78540a20ba451aa4907a4f22564cb684b71731bf1a0bd92765af8a05849338b.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/eac9c81994278f89b562980bd95ca2361a5f5191b1ac7a16973dd116f7db2b8c.json

Large diffs are not rendered by default.

9,515 changes: 9,515 additions & 0 deletions mempool/ef1dfecbc6a783b355688ff0169ac47134e55e3c7ebc671fff9cd14d2d39e186.json

Large diffs are not rendered by default.

4,619 changes: 4,619 additions & 0 deletions mempool/efe5d0dd5fc6754e126a2ba16b68e593e75a62dd0daa45a12a827293303bf8fd.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/f1a8ac15ed437961f9dc95aebe384c3e36e62e4e2a845fbfb9d9a651b69d3a9b.json

Large diffs are not rendered by default.

7,610 changes: 7,610 additions & 0 deletions mempool/f4720266c9159b9c6be53a0a0eea2207ae7b63021e6341ec7546979e3dd73d9a.json

Large diffs are not rendered by default.

1,515 changes: 1,515 additions & 0 deletions mempool/f5f5704193145bbee96c04663862075e521a7388bf264590a3d0efe8bcac9499.json

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/fb534540249d4cbdbb602809f87ee0d210096136dc90a8054600c11202138815.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4,415 changes: 4,415 additions & 0 deletions mempool/fe95de3ef95b4f6b10719b7de3998d1fc126b8333d3001d3ec3fc5cbf6021803.json

Large diffs are not rendered by default.

2,074 changes: 2,074 additions & 0 deletions mempool/ff0717b6f0d2b2518cfb85eed7ccea44c3a3822e2a0ce6e753feecf68df94a7f.json

Large diffs are not rendered by default.

2,675 changes: 2,675 additions & 0 deletions mempool/ff7d9ab4df5c33f6a3e347cacb759eff28a48a9936e0103a439a92019d6c1899.json

Large diffs are not rendered by default.

7,265 changes: 4,312 additions & 2,953 deletions output.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/block_mine/merkle_root.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use super::serialise_tx::double_sha256;
pub fn generate_roots(
map: Vec<(String, Transaction, String, usize, u64)>,
) -> Result<(String, String, String, Vec<String>)> {
let tx_weight_limit = 3996000;
let tx_weight_limit = 3998000;
let mut current_tx_weight = 0;
let mut txids: Vec<String> = Vec::new();
let mut wtxids: Vec<String> = Vec::new();
Expand Down
18 changes: 9 additions & 9 deletions src/block_mine/serialise_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ pub fn create_txid_tx_map() -> Result<Vec<(String, Transaction, String, usize, u
// Find the correct position to insert the transaction based on its fees
let position = map
.iter()
.position(|(_, _, _, _, gas_fees)| {
fees > *gas_fees
.position(|(_, _, _, net_weight, gas_fees)| {
fees / tx_weight as u64 > *gas_fees / (*net_weight as u64)
})
.unwrap_or(map.len());
map.insert(position, (txid, transaction, wtxid, tx_weight, fees));
Expand Down Expand Up @@ -115,7 +115,7 @@ fn serialise_tx(tx: &Transaction) -> Result<(bool, Vec<u8>, Vec<u8>, usize, u64)

// OUTPUT COUNT

if tx.vout.len() >= 50 {
if tx.vout.len() >= 200 {
return Ok((false, Vec::new(), Vec::new(), 0, 0));
}

Expand Down Expand Up @@ -157,9 +157,9 @@ fn serialise_tx(tx: &Transaction) -> Result<(bool, Vec<u8>, Vec<u8>, usize, u64)
witness_bytes += 1 + 1;

// INPUT COUNT
// if tx.vin.len() >= 50 {
// return Ok((false, Vec::new(), Vec::new(), 0, 0));
// }
if tx.vin.len() >= 200 {
return Ok((false, Vec::new(), Vec::new(), 0, 0));
}
raw_tx.push(tx.vin.len().try_into()?);
raw_wtx.push(tx.vin.len().try_into()?);

Expand Down Expand Up @@ -224,9 +224,9 @@ fn serialise_tx(tx: &Transaction) -> Result<(bool, Vec<u8>, Vec<u8>, usize, u64)

non_witness_bytes += 8;

// if scriptpubkey.len() >= 50 {
// return Ok((false, Vec::new(), Vec::new(), 0, 0));
// }
if scriptpubkey.len() >= 50 {
return Ok((false, Vec::new(), Vec::new(), 0, 0));
}
raw_tx.push(scriptpubkey.len().try_into()?);
raw_wtx.push(scriptpubkey.len().try_into()?);
raw_tx.extend_from_slice(&scriptpubkey);
Expand Down
2 changes: 1 addition & 1 deletion target/.rustc_info.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"rustc_fingerprint":5426084349829402623,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.77.2 (25ef9e3d8 2024-04-09)\nbinary: rustc\ncommit-hash: 25ef9e3d85d934b27d9dada2f9dd52b1dc63bb04\ncommit-date: 2024-04-09\nhost: x86_64-unknown-linux-gnu\nrelease: 1.77.2\nLLVM version: 17.0.6\n","stderr":""},"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/dane/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}}
{"rustc_fingerprint":5426084349829402623,"outputs":{"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/dane/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.77.2 (25ef9e3d8 2024-04-09)\nbinary: rustc\ncommit-hash: 25ef9e3d85d934b27d9dada2f9dd52b1dc63bb04\ncommit-date: 2024-04-09\nhost: x86_64-unknown-linux-gnu\nrelease: 1.77.2\nLLVM version: 17.0.6\n","stderr":""}},"successes":{}}
Loading

0 comments on commit d7ee112

Please sign in to comment.