fix: make 6336 compile in v21.1.x branch, using older CHECK_NONFATAL functionality #6340
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
knst
reviewed
Oct 22, 2024
| @@ -336,7 +336,9 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, bool include_add | |||
| if (calculate_fee) { | |||
| CAmount fee = amt_total_in - amt_total_out; | |||
| if (tx.IsPlatformTransfer()) { | |||
| fee = CHECK_NONFATAL(GetTxPayload<CAssetUnlockPayload>(tx))->getFee(); | |||
| auto payload = GetTxPayload<CAssetUnlockPayload>(tx); | |||
There was a problem hiding this comment.
nit: missing const
Suggested change
| auto payload = GetTxPayload<CAssetUnlockPayload>(tx); | |
| const auto payload = GetTxPayload<CAssetUnlockPayload>(tx); |
There was a problem hiding this comment.
meh, it'll be reverted in develop, and compiler can figure that out for this one version :)
kwvg
approved these changes
Oct 22, 2024
|
CI build is happy. Merging |
PastaPastaPasta
added a commit
to PastaPastaPasta/dash
that referenced
this pull request
Oct 22, 2024
…lder CHECK_NONFATAL functionality a7bbcc8 fix: make 6336 compile in v21.1.x branch, using older CHECK_NONFATAL functionality (pasta) Pull request description: ## Issue being fixed or feature implemented Resolve build failures when 6336 is back ported ## What was done? Use older functionality of CHECK_NONFATAL ## How Has This Been Tested? built on both branches ## Breaking Changes ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: knst: utACK a7bbcc8 UdjinM6: utACK a7bbcc8 (dashpay#6339 compiles with this one applied on top of it) kwvg: utACK a7bbcc8 Tree-SHA512: 17b6d8223f653eaafa6ef9d1a4e8fc14ca1fe1623fbb13d23a9429e87a64c8fae3ddaf6d2d8d5a52138ab712a36949662b38a8a9cbbc5db3618ce24f565f6f2a
PastaPastaPasta
added a commit
that referenced
this pull request
Oct 22, 2024
d627a6e chore: bump version to 21.1.1 (pasta) 5f9700c docs: release notes for v21.1.1 (pasta) 1c00726 Merge #6277: chore: add builder key for kittywhiskers (pasta) a2bc0f1 Merge #6290: chore: update pasta gpg key to reflect new subkeys (pasta) 167608c Merge #6338: ci: attest results of guix builds (pasta) 6fb4e49 Merge #6197: ci: always build guix, save artifacts (pasta) c0ca93c Merge #6340: fix: make 6336 compile in v21.1.x branch, using older CHECK_NONFATAL functionality (pasta) bb96df4 Merge #6336: fix: rpc getblock and getblockstats for blocks with withdrawal transactions (asset unlock) (pasta) 8e70262 Merge #6131: feat: make a support of Qt app to show Platform transfer Tx (pasta) 80ed279 Merge #6328: backport: bitcoin#30131, bitcoin#23258, bitcoin#30504 - fix bild for Ubuntu 24.10 + clang (pasta) bd772fb Merge #6229: fix: `creditOutputs` in AssetLock tx json output should be an array of objects, not debug strings (pasta) 9bf39a9 Merge #6222: fix: adjust payee predictions after mn_rr activation, add tests (pasta) 87bebfc Merge #6219: fix: correct is_snapshot_cs in VerifyDB (pasta) a4e6b8a Merge #6208: fix: persist coinjoin denoms options from gui over restarts (pasta) Pull request description: ## Issue being fixed or feature implemented See commits, backports, release notes, version bump ## What was done? ## How Has This Been Tested? ## Breaking Changes ## Checklist: _Go over all the following points, and put an `x` in all the boxes that apply._ - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: knst: utACK d627a6e kwvg: ACK d627a6e UdjinM6: utACK d627a6e ogabrielides: utACK d627a6e Tree-SHA512: cde7e40760e16e9f48da8149c3742d18a34029b057405e4d55b87110da96acbcd19b47280451dd7b5ad1ccfc91fde655452cf5f0f0d1e01a41b4c685337c64b8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
Resolve build failures when 6336 is back ported
What was done?
Use older functionality of CHECK_NONFATAL
How Has This Been Tested?
built on both branches
Breaking Changes
Checklist:
Go over all the following points, and put an
xin all the boxes that apply.