Univalue: Pull subtree #7147

maflcko · 2015-12-01T18:17:26Z

48edf57 Update key.cpp to new secp256k1 API (Pieter Wuille) 1d84107 Squashed 'src/secp256k1/' changes from 22f60a6..2bfb82b (Pieter Wuille)

a78e6ea Fix bug in mempool_tests unit test (Alex Morcos)

a264c32 http: speed up shutdown (Wladimir J. van der Laan)

Useful now that BIP113 is enforced for transactions entering the mempool. Was previously only (indirectly) available by calling getblocktemplate, a relatively expensive RPC call.

Previously if you called fundrawtransaction and set includeWatching to false it'd act as through you set it to true.

Previously this case failed deep in Cwallet::CreateTransaction() with the error message "Transaction amounts must be positive"

Completely static RPC call that doesn't change or even look at mutable state anywhere.

10953a7 Better error message for fundrawtransaction w/ empty vout (Peter Todd) 61e1eb2 Actually use includeWatching value in fundrawtransaction (Peter Todd)

b3ae384 Remove LOCK(cs_main) from decodescript (Peter Todd)

a5bc8de add jonasschnellis key to git-verify-commits trusted-keys (Jonas Schnelli) 160c72a update jonasschnellis gpg key (Jonas Schnelli)

e495ed5 add documentation for exluding whitelistes peer from maxuploadtarget (Jonas Schnelli) 5760749 [docs] rename reducetraffic.md to reduce-traffic.md (Jonas Schnelli) d61fcff don't enforce maxuploadtargets disconnect for whitelisted peers (Jonas Schnelli)

bbf49da Fix comment for blocksonly parameter interactions (Patick Strateman) 6a4982f Fix fRelayTxs comment (Patick Strateman) 59441a0 Display DEFAULT_WHITELISTALWAYSRELAY in help text (Patick Strateman) 71a2683 Use DEFAULT_BLOCKSONLY and DEFAULT_WHITELISTALWAYSRELAY constants (Patick Strateman) 762b13b Add help text for blocksonly and whitelistalwaysrelay (Patick Strateman) 3a96497 Add whitelistalwaysrelay option (Patick Strateman) 420fa81 Do not process tx inv's in blocksonly mode (Patick Strateman) 4044f07 Add blocksonly mode (Patick Strateman)

jonasschnelli · 2015-12-02T07:01:22Z

Agree with @sipa: Let's wait for @laanwj open PR there.

b171c69 [doc] Update OS X build notes for new qt5 configure (Michael Ford)

laanwj · 2015-12-02T09:09:27Z

Not sure what is blocking jgarzik/univalue#14.

Need to move this along though for the 0.12 branch. Maybe we could create a univalue fork under bitcoin.

dd5862c Flush coins cache also after transaction processing (Pieter Wuille) bde953e Uncache input txn in utxo cache if a tx is not accepted to mempool (Matt Corallo) 97bf377 Add CCoinsViewCache::HaveCoinsInCache to check if a tx is cached (Matt Corallo) 677aa3d Discard txn cache entries that were loaded for removed mempool txn (Matt Corallo) b2e74bd Get the set of now-uncacheable-txn from CTxMemPool::TrimToSize (Matt Corallo) 74d0f90 Add method to remove a tx from CCoinsViewCache if it is unchanged (Matt Corallo)

8f0d79e test: Disable scheduler test manythreads (Wladimir J. van der Laan)

jonasschnelli · 2015-12-02T09:27:07Z

I think a fork of UniValue under the github bitcoin identity would make sense.

laanwj · 2015-12-02T10:24:46Z

OK: https://github.com/bitcoin/univalue

maflcko · 2015-12-02T10:37:35Z

Updated. Make sure to fetch https://github.com/bitcoin/univalue (and not jgarzik) when doing

$ contrib/devtools/git-subtree-check.sh src/univalue

fanquake · 2015-12-02T11:17:56Z

ACK

On Wednesday, December 2, 2015, Wladimir J. van der Laan <
notifications@github.com> wrote:

src/univalue in HEAD was last updated to upstream commit 9218595ed19ccc1a7958c2c7284fd4acb9ce4fdc (tree 5d50d2814919fe88dda5f33df70310c2df080319)
src/univalue in HEAD currently refers to tree 5d50d2814919fe88dda5f33df70310c2df080319
GOOD

—
Reply to this email directly or view it on GitHub
#7147 (comment).

laanwj · 2015-12-02T11:21:14Z

Can you re-do this, I've added a commit to jgarzik/univalue#14 and updated the repository

laanwj · 2015-12-02T11:55:27Z

Thanks, should pass Travis now

src/univalue in HEAD was last updated to upstream commit 2740c4f71242086a7eb3dc32f812546ba9fad913 (tree 6abb4a6467fde2b738dfa8acf32fef55257130c2)
src/univalue in HEAD currently refers to tree 6abb4a6467fde2b738dfa8acf32fef55257130c2
GOOD

ACK

maflcko · 2015-12-02T12:00:27Z

@laanwj You have run subtree-check on master, not my PR ;)

laanwj · 2015-12-02T12:15:53Z

@MarcoFalke I was running it on master but without your PR merged, worst of both worlds. But I've since updated the post and it should be ok now?

maflcko · 2015-12-02T12:21:11Z

Looks good.

9827091 Squashed 'src/univalue/' changes from 5839ac3..2740c4f (MarcoFalke)

sipa · 2015-12-02T12:37:45Z

Can you also update the list of subtrees in https://github.com/bitcoin/bitcoin/tree/master/contrib/devtools ?

jonasschnelli and others added 30 commits November 13, 2015 16:27

[Qt] add startup option to reset Qt settings

ae98388

Fix bug in mempool_tests unit test

a78e6ea

Merge pull request bitcoin#6983

4f09b77

48edf57 Update key.cpp to new secp256k1 API (Pieter Wuille) 1d84107 Squashed 'src/secp256k1/' changes from 22f60a6..2bfb82b (Pieter Wuille)

Prevector type

114b581

Merge pull request bitcoin#7007

d356560

a78e6ea Fix bug in mempool_tests unit test (Alex Morcos)

Merge pull request bitcoin#6990

dbd2c13

a264c32 http: speed up shutdown (Wladimir J. van der Laan)

don't enforce maxuploadtargets disconnect for whitelisted peers

d61fcff

[docs] rename reducetraffic.md to reduce-traffic.md

5760749

Add mediantime field to getblockchaininfo RPC call

748321e

Useful now that BIP113 is enforced for transactions entering the mempool. Was previously only (indirectly) available by calling getblocktemplate, a relatively expensive RPC call.

Actually use includeWatching value in fundrawtransaction

61e1eb2

Previously if you called fundrawtransaction and set includeWatching to false it'd act as through you set it to true.

Better error message for fundrawtransaction w/ empty vout

10953a7

Previously this case failed deep in Cwallet::CreateTransaction() with the error message "Transaction amounts must be positive"

Clarify nLockTime-by-time comment in CheckFinalTx()

c277a63

Document new mediantime field in getblockchaininfo

7259769

Add mediantime field to getblock and getblockheader

6531f17

Remove LOCK(cs_main) from decodescript

b3ae384

Completely static RPC call that doesn't change or even look at mutable state anywhere.

Merge pull request bitcoin#7010

e0a5ef8

10953a7 Better error message for fundrawtransaction w/ empty vout (Peter Todd) 61e1eb2 Actually use includeWatching value in fundrawtransaction (Peter Todd)

Merge pull request bitcoin#7013

36baa9f

b3ae384 Remove LOCK(cs_main) from decodescript (Peter Todd)

Merge pull request bitcoin#7004

44ac42e

a5bc8de add jonasschnellis key to git-verify-commits trusted-keys (Jonas Schnelli) 160c72a update jonasschnellis gpg key (Jonas Schnelli)

add documentation for exluding whitelistes peer from maxuploadtarget

e495ed5

Add blocksonly mode

4044f07

Do not process tx inv's in blocksonly mode

420fa81

Add whitelistalwaysrelay option

3a96497

Add help text for blocksonly and whitelistalwaysrelay

762b13b

Use DEFAULT_BLOCKSONLY and DEFAULT_WHITELISTALWAYSRELAY constants

71a2683

Display DEFAULT_WHITELISTALWAYSRELAY in help text

59441a0

Fix fRelayTxs comment

6a4982f

Fix comment for blocksonly parameter interactions

bbf49da

[qa] travis: cover *receivedby* rpcs

33b7f83

TheBlueMatt and others added 5 commits December 1, 2015 15:50

Get the set of now-uncacheable-txn from CTxMemPool::TrimToSize

b2e74bd

Discard txn cache entries that were loaded for removed mempool txn

677aa3d

Add CCoinsViewCache::HaveCoinsInCache to check if a tx is cached

97bf377

Uncache input txn in utxo cache if a tx is not accepted to mempool

bde953e

Flush coins cache also after transaction processing

dd5862c

Merge pull request bitcoin#7040

4a63f94

b171c69 [doc] Update OS X build notes for new qt5 configure (Michael Ford)

laanwj added this to the 0.12.0 milestone Dec 2, 2015

laanwj added 2 commits December 2, 2015 10:17

Merge pull request bitcoin#7144

1b0241f

8f0d79e test: Disable scheduler test manythreads (Wladimir J. van der Laan)

maflcko force-pushed the MarcoFalke-2015-univalueSync branch from fafb6b6 to fac8548 Compare December 2, 2015 10:34

maflcko force-pushed the MarcoFalke-2015-univalueSync branch from fac8548 to fa82dce Compare December 2, 2015 11:15

Merge commit '982709199f1b4e9e35211c419a81938f9f1dd4ed' into bitcoin

fad4ea8

maflcko force-pushed the MarcoFalke-2015-univalueSync branch from f01d913 to fad4ea8 Compare December 2, 2015 11:30

laanwj merged commit fad4ea8 into bitcoin:master Dec 2, 2015

laanwj added a commit that referenced this pull request Dec 2, 2015

Merge pull request #7147

7c7a05d

9827091 Squashed 'src/univalue/' changes from 5839ac3..2740c4f (MarcoFalke)

maflcko deleted the MarcoFalke-2015-univalueSync branch December 2, 2015 12:31

maflcko mentioned this pull request Dec 2, 2015

Fix typos and misc cleanup. #7157

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Univalue: Pull subtree #7147

Univalue: Pull subtree #7147

maflcko commented Dec 1, 2015

jonasschnelli commented Dec 2, 2015

laanwj commented Dec 2, 2015

jonasschnelli commented Dec 2, 2015

laanwj commented Dec 2, 2015

maflcko commented Dec 2, 2015

fanquake commented Dec 2, 2015

laanwj commented Dec 2, 2015

laanwj commented Dec 2, 2015

maflcko commented Dec 2, 2015

laanwj commented Dec 2, 2015

maflcko commented Dec 2, 2015

sipa commented Dec 2, 2015 via email

Univalue: Pull subtree #7147

Univalue: Pull subtree #7147

Conversation

maflcko commented Dec 1, 2015

jonasschnelli commented Dec 2, 2015

laanwj commented Dec 2, 2015

jonasschnelli commented Dec 2, 2015

laanwj commented Dec 2, 2015

maflcko commented Dec 2, 2015

fanquake commented Dec 2, 2015

laanwj commented Dec 2, 2015

laanwj commented Dec 2, 2015

maflcko commented Dec 2, 2015

laanwj commented Dec 2, 2015

maflcko commented Dec 2, 2015

sipa commented Dec 2, 2015 via email