Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SetMerkleBranch: remove unused code, remove cs_main lock requirement #9446

Merged
merged 1 commit into from
Jan 3, 2017

Conversation

jonasschnelli
Copy link
Contributor

SetMerkleBranch's return value is no longer being used. Remove the unnecessary code part.

@sipa
Copy link
Member

sipa commented Dec 30, 2016

utACK

@maflcko
Copy link
Member

maflcko commented Dec 30, 2016

ACK

@paveljanik
Copy link
Contributor

ACK 9e351c9

@cdecker
Copy link
Contributor

cdecker commented Jan 2, 2017

ACK 9e351c9

@jonasschnelli jonasschnelli merged commit 9e351c9 into bitcoin:master Jan 3, 2017
jonasschnelli added a commit that referenced this pull request Jan 3, 2017
… requirement

9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
codablock pushed a commit to codablock/dash that referenced this pull request Jan 18, 2018
…in lock requirement

9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
…in lock requirement

9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 26, 2019
…in lock requirement

9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
denverbdr pushed a commit to ycashfoundation/ycash that referenced this pull request Sep 25, 2019
denverbdr pushed a commit to ycashfoundation/ycash that referenced this pull request Sep 25, 2019
blondfrogs pushed a commit to blondfrogs/zelcash that referenced this pull request Nov 6, 2019
cryptobubbles pushed a commit to cryptoprofutonium/zclassic-1 that referenced this pull request Dec 18, 2019
hTrap pushed a commit to ZclassicCommunity/zclassic that referenced this pull request Dec 18, 2019
* Ignore exceptions when deserializing note plaintexts

* SetMerkleBranch: remove unused code, remove cs_main lock requirement

Includes equivalent changes to bitcoin/bitcoin#9446

* Remove cs_main lock requirement from CWallet::SyncTransaction

SetMerkleBranch was the only call underneath SyncTransaction that
required the cs_main lock.

* Move mempool SyncWithWallets call into its own thread

* Enable RPC tests to wait on mempool notifications

* Cast uint8* in InterruptibleRecv to char* for recv

Fixes a Windows-specific compile bug introduced in zcash#4212.
Closes zcash#4214.

* Accept any sequence of PUSHDATAs in OP_RETURN outputs

Previously only one PUSHDATA was allowed, needlessly limiting
applications such as matching OP_RETURN contents with bloom filters that
operate on a per-PUSHDATA level. Now any combination that passes
IsPushOnly() is allowed, so long as the total size of the scriptPubKey
is less than 42 bytes. (unchanged modulo non-minimal PUSHDATA encodings)

Also, this fixes the odd bug where previously the PUSHDATA could be
replaced by any single opcode, even sigops consuming opcodes such as
CHECKMULTISIG. (20 sigops!)

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Increase the default setting for nMaxDatacarrierBytes to 223 bytes

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Fix missing include

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Versioning changes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated manpages for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated release notes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>
cryptobubbles pushed a commit to cryptoprofutonium/zclassic-patched-for-explorer that referenced this pull request Dec 18, 2019
* Ignore exceptions when deserializing note plaintexts

* SetMerkleBranch: remove unused code, remove cs_main lock requirement

Includes equivalent changes to bitcoin/bitcoin#9446

* Remove cs_main lock requirement from CWallet::SyncTransaction

SetMerkleBranch was the only call underneath SyncTransaction that
required the cs_main lock.

* Move mempool SyncWithWallets call into its own thread

* Enable RPC tests to wait on mempool notifications

* Cast uint8* in InterruptibleRecv to char* for recv

Fixes a Windows-specific compile bug introduced in #4212.
Closes #4214.

* Accept any sequence of PUSHDATAs in OP_RETURN outputs

Previously only one PUSHDATA was allowed, needlessly limiting
applications such as matching OP_RETURN contents with bloom filters that
operate on a per-PUSHDATA level. Now any combination that passes
IsPushOnly() is allowed, so long as the total size of the scriptPubKey
is less than 42 bytes. (unchanged modulo non-minimal PUSHDATA encodings)

Also, this fixes the odd bug where previously the PUSHDATA could be
replaced by any single opcode, even sigops consuming opcodes such as
CHECKMULTISIG. (20 sigops!)

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Increase the default setting for nMaxDatacarrierBytes to 223 bytes

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Fix missing include

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Versioning changes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated manpages for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated release notes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>
cryptobubbles pushed a commit to cryptoprofutonium/zclassic-patched-for-explorer that referenced this pull request Dec 18, 2019
* Ignore exceptions when deserializing note plaintexts

* SetMerkleBranch: remove unused code, remove cs_main lock requirement

Includes equivalent changes to bitcoin/bitcoin#9446

* Remove cs_main lock requirement from CWallet::SyncTransaction

SetMerkleBranch was the only call underneath SyncTransaction that
required the cs_main lock.

* Move mempool SyncWithWallets call into its own thread

* Enable RPC tests to wait on mempool notifications

* Cast uint8* in InterruptibleRecv to char* for recv

Fixes a Windows-specific compile bug introduced in #4212.
Closes #4214.

* Accept any sequence of PUSHDATAs in OP_RETURN outputs

Previously only one PUSHDATA was allowed, needlessly limiting
applications such as matching OP_RETURN contents with bloom filters that
operate on a per-PUSHDATA level. Now any combination that passes
IsPushOnly() is allowed, so long as the total size of the scriptPubKey
is less than 42 bytes. (unchanged modulo non-minimal PUSHDATA encodings)

Also, this fixes the odd bug where previously the PUSHDATA could be
replaced by any single opcode, even sigops consuming opcodes such as
CHECKMULTISIG. (20 sigops!)

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Increase the default setting for nMaxDatacarrierBytes to 223 bytes

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Fix missing include

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Versioning changes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated manpages for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated release notes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>
hTrap pushed a commit to ZclassicCommunity/zclassic-patched-for-explorer that referenced this pull request Dec 18, 2019
* Ignore exceptions when deserializing note plaintexts

* SetMerkleBranch: remove unused code, remove cs_main lock requirement

Includes equivalent changes to bitcoin/bitcoin#9446

* Remove cs_main lock requirement from CWallet::SyncTransaction

SetMerkleBranch was the only call underneath SyncTransaction that
required the cs_main lock.

* Move mempool SyncWithWallets call into its own thread

* Enable RPC tests to wait on mempool notifications

* Cast uint8* in InterruptibleRecv to char* for recv

Fixes a Windows-specific compile bug introduced in #4212.
Closes #4214.

* Accept any sequence of PUSHDATAs in OP_RETURN outputs

Previously only one PUSHDATA was allowed, needlessly limiting
applications such as matching OP_RETURN contents with bloom filters that
operate on a per-PUSHDATA level. Now any combination that passes
IsPushOnly() is allowed, so long as the total size of the scriptPubKey
is less than 42 bytes. (unchanged modulo non-minimal PUSHDATA encodings)

Also, this fixes the odd bug where previously the PUSHDATA could be
replaced by any single opcode, even sigops consuming opcodes such as
CHECKMULTISIG. (20 sigops!)

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Increase the default setting for nMaxDatacarrierBytes to 223 bytes

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Fix missing include

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Versioning changes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated manpages for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>

* Updated release notes for 2.0.6-1

Signed-off-by: cryptobubbles <cryptobubbles@protonmail.com>
furszy added a commit to PIVX-Project/PIVX that referenced this pull request Apr 14, 2020
… requirement

a209031 [Wallet] Remove cs_main lock from SyncTransaction. (furszy)
27eea07 SetMerkleBranch: remove unused code, remove cs_main lock requirement. (furszy)

Pull request description:

  `SetMerkleBranch`'s return value is no longer being used. Remove the unnecessary code part. Coming from upstream@[9446](bitcoin#9446).

  And removed the `cs_main` lock from CWallet::SyncTransaction that was previously needed do the `SetMerkleBranch` assert lock held.

ACKs for top commit:
  random-zebra:
    ACK a209031
  Fuzzbawls:
    utACK a209031

Tree-SHA512: 973abcf4584252d9b88743685815c7850387c8a60006b1a19c41090cdb0f90fbfc46459f27e0e2ae52cf9dbe884da357f0c8045d541e2e1bd837c9d69bc39f71
wqking pushed a commit to wqking-temp/Vitae that referenced this pull request Nov 29, 2020
… requirement

a20903157e0628da8c38a7a7a83f73956afdb8b5 [Wallet] Remove cs_main lock from SyncTransaction. (furszy)
27eea07192f6b6277bd1e528dbc279fdf9fa69b4 SetMerkleBranch: remove unused code, remove cs_main lock requirement. (furszy)

Pull request description:

  `SetMerkleBranch`'s return value is no longer being used. Remove the unnecessary code part. Coming from upstream@[9446](bitcoin/bitcoin#9446).

  And removed the `cs_main` lock from CWallet::SyncTransaction that was previously needed do the `SetMerkleBranch` assert lock held.

ACKs for top commit:
  random-zebra:
    ACK a20903157e0628da8c38a7a7a83f73956afdb8b5
  Fuzzbawls:
    utACK a20903157e0628da8c38a7a7a83f73956afdb8b5

Tree-SHA512: 973abcf4584252d9b88743685815c7850387c8a60006b1a19c41090cdb0f90fbfc46459f27e0e2ae52cf9dbe884da357f0c8045d541e2e1bd837c9d69bc39f71
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants