From fa4232573b6a329b3683e3e019fb6690f2ab90f9 Mon Sep 17 00:00:00 2001 From: Calvin Kim Date: Mon, 30 Dec 2024 17:14:31 +0900 Subject: [PATCH 1/2] blockchain: remove udata requirement from ExtractAccumulatorAdds It's not used in ExtractAccumulatorAdds so we're removing it. --- blockchain/utreexoviewpoint.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/blockchain/utreexoviewpoint.go b/blockchain/utreexoviewpoint.go index e016f763..1d4f050a 100644 --- a/blockchain/utreexoviewpoint.go +++ b/blockchain/utreexoviewpoint.go @@ -279,12 +279,6 @@ func ExtractAccumulatorDels(block *btcutil.Block, bestChain *chainView, remember func ExtractAccumulatorAdds(block *btcutil.Block, bestChain *chainView, remembers []uint32) ( []utreexo.Leaf, error) { - // Check that UData field isn't nil before doing anything else. - if block.MsgBlock().UData == nil { - return nil, fmt.Errorf("ExtractAccumulatorAdds(): block.MsgBlock().UData is nil. " + - "Cannot extract utreexo accumulator additions") - } - // outskip is all the txOuts that are referenced by a txIn in the same block // outCount is the count of all outskips. _, outCount, _, outskip := DedupeBlock(block) From 2e411e1faa81c5b2a4f10e0754d662052ab6e055 Mon Sep 17 00:00:00 2001 From: Calvin Kim Date: Mon, 30 Dec 2024 17:26:18 +0900 Subject: [PATCH 2/2] .github, main: update rust toolchain to 1.78.0 --- .github/workflows/go.yml | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 5e164f32..cc37c156 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,7 +16,7 @@ jobs: rust: - version: stable clippy: true - - version: 1.73.0 # As specified in rust-toolchain + - version: 1.78.0 # As specified in rust-toolchain steps: - uses: actions/checkout@v3 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3c4b81eb..623f9a27 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.73.0" +channel = "1.78.0" components = ["clippy", "rustfmt"]