Skip to content

Merge bitcoin#14890 and bitcoin#15390#4643

Merged
PastaPastaPasta merged 2 commits intodashpay:developfrom
dzutto:merge_14890_15390
Jan 10, 2022
Merged

Merge bitcoin#14890 and bitcoin#15390#4643
PastaPastaPasta merged 2 commits intodashpay:developfrom
dzutto:merge_14890_15390

Conversation

@dzutto
Copy link

@dzutto dzutto commented Dec 29, 2021

No description provided.

PastaPastaPasta
PastaPastaPasta previously approved these changes Dec 30, 2021
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta added this to the 18 milestone Dec 30, 2021
UdjinM6
UdjinM6 requested changes Dec 30, 2021
View reviewed changes
laanwj and others added 2 commits December 30, 2021 12:41
@laanwj @dzutto
Merge bitcoin#14890: rpc: Avoid creating non-standard raw transactions
67857bc 
fa4c867 rpc: Avoid creating non-standard raw transactions (MarcoFalke)

Pull request description:

  Multiple OP_RETURN outputs in a transaction are not standard and unlikely to be relayed, so avoid creating them.

  Apart from that, the logic was broken in that it duplicated the same hex-data for each data output: Closes bitcoin#14868.

Tree-SHA512: b08d08062b5622e8a7b497e490ccaf53b06e844c863fda3bf3f932a98684a809e8341aeb98232059a795afb32d8770a6c5591a66f8e6ee372b672af245607887
@dzutto
Merge bitcoin#15390: [wallet-tool] Close bdb when flushing wallet
4711bdb 
318b1f7 [wallet] Close bdb when flushing wallet. (John Newbery)

Pull request description:

  bdb would not be closed when closing the wallet in wallet-tool. Fix this by calling wallet->flush with true.

Tree-SHA512: f722e527e4806eca5254221e944f57853d11bf89a9264309fa558a6cc2b23feefb7bb2963e87b4fad9cfb31ac4cffe563688988e0614a481a8ff1d393aceb132
@github-actions
Copy link

github-actions bot commented Dec 30, 2021

This Pull Request may conflict if the Pull Requests below are merged first.

#4575
conflictable files: src/rpc/rawtransaction.cpp
#4642
conflictable files: src/rpc/rawtransaction.cpp
#4638
conflictable files: src/rpc/rawtransaction.cpp,src/wallet/rpcwallet.cpp
#4613
conflictable files: src/rpc/rawtransaction.cpp,src/rpc/rawtransaction_util.cpp,src/wallet/rpcwallet.cpp
#4321
conflictable files: src/wallet/rpcwallet.cpp
#4357
conflictable files: src/rpc/rawtransaction.cpp,src/test/rpc_tests.cpp,src/wallet/rpcwallet.cpp
#4623
conflictable files: src/rpc/rawtransaction.cpp,src/wallet/rpcwallet.cpp,src/wallet/wallettool.cpp

This was referenced Dec 30, 2021
Closed
Merged
Merged
Merged
Merged
Closed
Merged
UdjinM6
UdjinM6 approved these changes Jan 3, 2022
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

PastaPastaPasta
PastaPastaPasta approved these changes Jan 10, 2022
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta merged commit 25f5be7 into dashpay:develop Jan 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

Bitcoin Backport

Projects

None yet

Milestone

18

Development

Successfully merging this pull request may close these issues.

4 participants

@dzutto @UdjinM6 @PastaPastaPasta @laanwj