mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-02-24 22:58:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/nymkappa/menu' into nymkappa/menu

Browse source
This commit is contained in:
nymkappa 2023-08-21 11:20:20 +02:00
commit 4010047344
No known key found for this signature in database
GPG key ID: E155910B16E8BD04
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -27,8 +27,8 @@ jobs:
node-version: ${{ matrix.node }} node-version: ${{ matrix.node }}
registry-url: "https://registry.npmjs.org" registry-url: "https://registry.npmjs.org"
- name: Install 1.70.x Rust toolchain - name: Install 1.63.x Rust toolchain
uses: dtolnay/rust-toolchain@1.70 uses: dtolnay/rust-toolchain@1.63
- name: Install - name: Install
if: ${{ matrix.flavor == 'dev'}} if: ${{ matrix.flavor == 'dev'}}

2
backend/rust-gbt/Cargo.toml
View file

@ -6,6 +6,8 @@ authors = ["mononaut"]
edition = "2021" edition = "2021"
publish = false publish = false
[workspace]
[lib] [lib]
crate-type = ["cdylib"] crate-type = ["cdylib"]

14
backend/rust-gbt/src/gbt.rs
View file

@ -335,13 +335,15 @@ fn set_relatives(txid: u32, audit_pool: &mut AuditPool) {
let mut total_sigops: u32 = 0; let mut total_sigops: u32 = 0;
for ancestor_id in &ancestors { for ancestor_id in &ancestors {
let Some(ancestor) = audit_pool if let Some(ancestor) = audit_pool
.get(*ancestor_id as usize) .get(*ancestor_id as usize)
.expect("audit_pool contains all ancestors") else { todo!() }; .expect("audit_pool contains all ancestors")
total_fee += ancestor.fee; {
total_sigop_adjusted_weight += ancestor.sigop_adjusted_weight; total_fee += ancestor.fee;
total_sigop_adjusted_vsize += ancestor.sigop_adjusted_vsize; total_sigop_adjusted_weight += ancestor.sigop_adjusted_weight;
total_sigops += ancestor.sigops; total_sigop_adjusted_vsize += ancestor.sigop_adjusted_vsize;
total_sigops += ancestor.sigops;
} else { todo!() };
} }
if let Some(Some(tx)) = audit_pool.get_mut(txid as usize) { if let Some(Some(tx)) = audit_pool.get_mut(txid as usize) {

3
contributors/TheBlueMatt.txt Normal file
View file

@ -0,0 +1,3 @@
I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file with sha256 hash c80c5ee4c71c5a76a1f6cd35339bd0c45b25b491933ea7b02a66470e9f43a6fd.
Signed: TheBlueMatt