[0.12] Backport BIP9, BIP68 and BIP112 with softfork #7543

btcdrak · 2016-02-16T21:11:48Z

Backport of #7184 (BIP68), #7524 (BIP112), #7187 (lockpoints), #7575 (BIP9) and #7648 (softfork) for 0.12.

EDIT: added #7531 (one line add test to extendedTests array and trivial comment edit #7773

morcos · 2016-02-19T21:11:01Z

ACK on this being the correct backport, but I would prefer to see 1 pull with the soft fork logic and all accompanying implementations backported at the same time. I think it would be much safer to test and review it together like that. Lets wait until we have the soft fork logic finished and merged.

btcdrak · 2016-03-16T20:24:14Z

I added #7187 to this backport.

SequenceLocks functions are used to evaluate sequence lock times or heights per BIP 68. The majority of this code is copied from maaku in bitcoin#6312 Further credit: btcdrak, sipa, NicolasDorier

it boggles the mind why these nits can't be delivered on a more timely basis

- Replace NOP3 with CHECKSEQUENCEVERIFY (BIP112) <nSequence> CHECKSEQUENCEVERIFY -> <nSequence> - Fails if txin.nSequence < nSequence, allowing funds of a txout to be locked for a number of blocks or a duration of time after its inclusion in a block. - Pull most of CheckLockTime() out into VerifyLockTime(), a local function that will be reused for CheckSequence() - Add bitwise AND operator to CScriptNum - Enable CHECKSEQUENCEVERIFY as a standard script verify flag - Transactions that fail CSV verification will be rejected from the mempool, making it easy to test the feature. However blocks containing "invalid" CSV-using transactions will still be accepted; this is *not* the soft-fork required to actually enable CSV for production use.

For the sake of a little repetition, make code more readable.

This if statement is a little obtuse and using braces here improves readability.

Obtain LockPoints to store in CTxMemPoolEntry and during a reorg, evaluate whether they are still valid and if not, recalculate them.

Inspired by former implementations by Eric Lombrozo and Rusty Russell, and based on code by Jorge Timon.

This commit introduces a way to gracefully bump the default transaction version in a two step process.

This RPC test will test both the activation mechanism of the first versionbits soft fork as well as testing many code branches of the consensus logic for BIP's 68, 112, and 113.

morcos · 2016-03-18T19:02:18Z

ACK 3a99feb (backported myself and got the same code)

sipa · 2016-03-28T10:38:42Z

Mechanical backport check ACK 26e9a05

Ran the following script:

while read F L; do git show $F | egrep -v '^index ' | egrep -v '^commit ' | egrep -v '^@@ ' >/tmp/f; git show $L | egrep -v '^index ' | egrep -v '^commit ' | egrep -v '^@@ ' >/tmp/l; diff /tmp/f /tmp/l; done

with input:
12c89c9 159ee3d
02c2435 9713ed3
478fba6 648be9b
65751a3 ee40924
d23f6c6 0bdaacd
6851107 6f83cf2
982670c ade85e1
a381076 c8d309e
c3c3752 6170506
53e53a3 c0c5e09
b043c4b 197c376
15ba08c c6c2f0f

(the corresponding non-test commits)

The output is:

29c29
<              return state.DoS(10, false, REJECT_INVALID, "bad-txns-nonfinal", false, "non-final transaction");
---
>              return state.DoS(10, error("%s: contains a non-final transaction", __func__), REJECT_INVALID, "bad-txns-nonfinal");
68,70c68,70
< diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
< --- a/src/rpc/blockchain.cpp
< +++ b/src/rpc/blockchain.cpp
---
> diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
> --- a/src/rpcblockchain.cpp
> +++ b/src/rpcblockchain.cpp
40,42c40,42
< diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
< --- a/src/rpc/blockchain.cpp
< +++ b/src/rpc/blockchain.cpp
---
> diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
> --- a/src/rpcblockchain.cpp
> +++ b/src/rpcblockchain.cpp
12d11
<    utilmoneystr.h \
14a14
>    version.h \
18c18
<    wallet/rpcwallet.h \
---
>    wallet/wallet.h \

which is good, as there are no lines starting with '+' or '-' that changed between the diffs.

instagibbs · 2016-03-28T14:08:29Z

26e9a05 ACK, backport matches

btcdrak · 2016-03-29T09:36:39Z

cherry-picked #7531 6ba8b2a as caf1381 - one line including bit68-sequence.py in extended tests array.

sdaftuar · 2016-03-30T15:26:05Z

ACK caf1381

jl2012 · 2016-03-30T16:02:40Z

backport matches, tACK caf1381

btcdrak · 2016-03-31T09:28:26Z

Added trivial comment edit from #7773 as c270b62

petertodd · 2016-03-31T19:23:50Z

utACK

maflcko · 2016-04-02T12:50:53Z

qa/rpc-tests/bip9-softforks.py

+        self.height = 3  # height of the next block to build
+        self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0)
+        self.nodeaddress = self.nodes[0].getnewaddress()
+        self.last_block_time = time.time()


This should explicitly be int. Sadly, py2 will silently cast the float to int where needed.

maflcko · 2016-04-02T12:51:46Z

utACK c270b62. My nits can be fixed later

NicolasDorier · 2016-04-02T14:22:59Z

utACK, checked with sipa's script

maflcko · 2016-04-03T16:17:46Z

qa/rpc-tests/bip68-sequence.py

@@ -181,7 +181,7 @@ def test_sequence_lock_confirmed_inputs(self):
                value += utxos[j]["amount"]*COIN
            # Overestimate the size of the tx - signatures should be less than 120 bytes, and leave 50 for the output
            tx_size = len(ToHex(tx))/2 + 120*num_inputs + 50
-            tx.vout.append(CTxOut(value-self.relayfee*tx_size*COIN/1000, CScript([b'a'])))
+            tx.vout.append(int(CTxOut(value-self.relayfee*tx_size*COIN/1000, CScript([b'a']))))


I'd be surprised if this worked. (You are passing the CTxOut into int())

Edit: You could just try a git cherry-pick ...; git reset HEAD~; git commit qa/rpc-tests/bip*

partial backport from bitcoin#7778 using fa2cea1

btcdrak · 2016-04-03T17:08:09Z

@MarcoFalke I cherry-picked your int/float fixes for RPC tests, from #7778 commit fa2cea1 in 640666b

maflcko · 2016-04-03T17:09:52Z

utACK 640666b

640666b [qa] rpc-tests: Properly use integers, floats (BtcDrak) c270b62 Fix comments in tests (BtcDrak) caf1381 Add bip68-sequence.py to extended rpc tests (BtcDrak) 26e9a05 Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier) 3a99feb Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos) 159ee3d Policy: allow transaction version 2 relay policy. (BtcDrak) 9713ed3 Soft fork logic for BIP68 (BtcDrak) 648be9b Soft fork logic for BIP113 (BtcDrak) ee40924 Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille) 6ff0b9f RPC test for BIP9 warning logic (Suhas Daftuar) 0710b30 Test versionbits deployments (Suhas Daftuar) 8ebc6f2 Add testing of ComputeBlockVersion (Suhas Daftuar) 0bdaacd Softfork status report in RPC (Pieter Wuille) 5f90d4e Versionbits tests (Pieter Wuille) 6f83cf2 BIP9 Implementation (Pieter Wuille) ade85e1 Add LockPoints (Alex Morcos) c8d309e Code style fix. (BtcDrak) 6170506 Separate CheckLockTime() and CheckSequence() logic (BtcDrak) c0c5e09 BIP112: Implement CHECKSEQUENCEVERIFY (Mark Friedenbach) 197c376 fix sdaftuar's nits again (Alex Morcos) 0a79c04 Bug fix to RPC test (Alex Morcos) 0d09af7 Add RPC test exercising BIP68 (mempool only) (Suhas Daftuar) 15ba08c Implement SequenceLocks functions (Alex Morcos)

afk11 · 2016-04-04T13:37:46Z

ACK 3a99feb

btcdrak mentioned this pull request Feb 16, 2016

Backport BIP112 implementation for 0.12 #7544

Closed

1 task

jonasschnelli added Feature Mempool labels Feb 19, 2016

btcdrak changed the title ~~Backport BIP68 implementation for 0.12~~ Backport BIP68 and BIP112 implementation for 0.12 Mar 15, 2016

btcdrak changed the title ~~Backport BIP68 and BIP112 implementation for 0.12~~ Backport BIP68 and BIP112 mempool logic for 0.12 Mar 15, 2016

btcdrak changed the title ~~Backport BIP68 and BIP112 mempool logic for 0.12~~ [0.12] Backport BIP68 and BIP112 mempool only Mar 15, 2016

btcdrak force-pushed the dot12_backport_bip68 branch from d20393d to d110b32 Compare March 18, 2016 09:13

morcos and others added 14 commits March 18, 2016 09:14

Implement SequenceLocks functions

15ba08c

SequenceLocks functions are used to evaluate sequence lock times or heights per BIP 68. The majority of this code is copied from maaku in bitcoin#6312 Further credit: btcdrak, sipa, NicolasDorier

Add RPC test exercising BIP68 (mempool only)

0d09af7

Bug fix to RPC test

0a79c04

fix sdaftuar's nits again

197c376

it boggles the mind why these nits can't be delivered on a more timely basis

Separate CheckLockTime() and CheckSequence() logic

6170506

For the sake of a little repetition, make code more readable.

Code style fix.

c8d309e

This if statement is a little obtuse and using braces here improves readability.

Add LockPoints

ade85e1

Obtain LockPoints to store in CTxMemPoolEntry and during a reorg, evaluate whether they are still valid and if not, recalculate them.

BIP9 Implementation

6f83cf2

Inspired by former implementations by Eric Lombrozo and Rusty Russell, and based on code by Jorge Timon.

Versionbits tests

5f90d4e

Softfork status report in RPC

0bdaacd

Add testing of ComputeBlockVersion

8ebc6f2

Test versionbits deployments

0710b30

RPC test for BIP9 warning logic

6ff0b9f

btcdrak force-pushed the dot12_backport_bip68 branch from d110b32 to 6ff0b9f Compare March 18, 2016 09:15

sipa and others added 5 commits March 18, 2016 09:28

Add CHECKSEQUENCEVERIFY softfork through BIP9

ee40924

Soft fork logic for BIP113

648be9b

Soft fork logic for BIP68

9713ed3

Policy: allow transaction version 2 relay policy.

159ee3d

This commit introduces a way to gracefully bump the default transaction version in a two step process.

Add RPC test for BIP 68/112/113 soft fork.

3a99feb

This RPC test will test both the activation mechanism of the first versionbits soft fork as well as testing many code branches of the consensus logic for BIP's 68, 112, and 113.

btcdrak changed the title ~~[0.12] Backport BIP68 and BIP112 mempool only~~ [0.12] Backport BIP9, BIP68 and BIP112 with softfork Mar 18, 2016

laanwj added the Consensus label Mar 18, 2016

Test of BIP9 fork activation of mtp, csv, sequence_lock

26e9a05

btcdrak force-pushed the dot12_backport_bip68 branch from 3afee6d to 26e9a05 Compare March 26, 2016 04:06

Add bip68-sequence.py to extended rpc tests

caf1381

Fix comments in tests

c270b62

maflcko reviewed Apr 2, 2016
View reviewed changes

maflcko reviewed Apr 3, 2016
View reviewed changes

[qa] rpc-tests: Properly use integers, floats

640666b

partial backport from bitcoin#7778 using fa2cea1

btcdrak force-pushed the dot12_backport_bip68 branch from 94c68e1 to 640666b Compare April 3, 2016 17:07

laanwj merged commit 640666b into bitcoin:0.12 Apr 4, 2016

btcdrak deleted the dot12_backport_bip68 branch December 3, 2016 10:57

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

[0.12] Backport BIP9, BIP68 and BIP112 with softfork #7543

[0.12] Backport BIP9, BIP68 and BIP112 with softfork #7543

btcdrak commented Feb 16, 2016

morcos commented Feb 19, 2016

btcdrak commented Mar 16, 2016

morcos commented Mar 18, 2016

sipa commented Mar 28, 2016

instagibbs commented Mar 28, 2016

btcdrak commented Mar 29, 2016

sdaftuar commented Mar 30, 2016

jl2012 commented Mar 30, 2016

btcdrak commented Mar 31, 2016

petertodd commented Mar 31, 2016

maflcko Apr 2, 2016

maflcko commented Apr 2, 2016

NicolasDorier commented Apr 2, 2016

maflcko Apr 3, 2016

btcdrak Apr 3, 2016

btcdrak commented Apr 3, 2016

maflcko commented Apr 3, 2016

afk11 commented Apr 4, 2016

[0.12] Backport BIP9, BIP68 and BIP112 with softfork #7543

[0.12] Backport BIP9, BIP68 and BIP112 with softfork #7543

Conversation

btcdrak commented Feb 16, 2016

morcos commented Feb 19, 2016

btcdrak commented Mar 16, 2016

morcos commented Mar 18, 2016

sipa commented Mar 28, 2016

instagibbs commented Mar 28, 2016

btcdrak commented Mar 29, 2016

sdaftuar commented Mar 30, 2016

jl2012 commented Mar 30, 2016

btcdrak commented Mar 31, 2016

petertodd commented Mar 31, 2016

maflcko Apr 2, 2016

Choose a reason for hiding this comment

maflcko commented Apr 2, 2016

NicolasDorier commented Apr 2, 2016

maflcko Apr 3, 2016

Choose a reason for hiding this comment

btcdrak Apr 3, 2016

Choose a reason for hiding this comment

btcdrak commented Apr 3, 2016

maflcko commented Apr 3, 2016

afk11 commented Apr 4, 2016