multi: rebase bcc onto staging #2

tuxcanfly · 2018-05-01T12:40:11Z

Rebased, fixed merg conflicts.

tuxcanfly · 2018-05-02T11:24:34Z

OK, ready for review.

bucko13 · 2018-05-07T22:56:52Z

lib/blockchain/chaindb.js

@@ -59,7 +59,7 @@ class ChainDB {
    this.logger.info('Opening ChainDB...');

    await this.db.open();
-    await this.db.verify(layout.V.build(), 'chain', 5);
+    await this.db.verify(layout.V.build(), 'chain', 0x80 | 5);


what's this change for?

I think it's a flag for the chain type, so as to not confuse between forks.

bucko13 · 2018-05-07T22:57:50Z

lib/net/common.js

@@ -142,7 +142,7 @@ exports.USER_AGENT = `/bcoin:${pkg.version}/`;
 * @default
 */

-exports.MAX_MESSAGE = 4 * 1000 * 1000;
+exports.MAX_MESSAGE = 8 * 1000 * 1000;


How do we account for the next hard fork to 32MB, surely we're not just going to manually change this at the exact right time?

Yup, we need to do that in next hard fork PR.

bucko13 · 2018-05-07T23:03:13Z

lib/primitives/block.js

@@ -458,7 +458,7 @@ class Block extends AbstractBlock {

      // Count legacy sigops (do not count scripthash or witness).


Probably want to update the comment too

Going to leave this as it is harmless atm. Will note to revisit later.

edit: #4

bucko13 · 2018-05-07T23:04:41Z

lib/primitives/mtx.js

@@ -506,40 +470,6 @@ class MTX extends TX {

    // Witness program.
    if (prev.isProgram()) {


Are we keeping this check for the testnet? For cash mainnet this should never be true right?

There's probably a lot of code that can be ripped out. Will revisit later.

edit: #5

bucko13 · 2018-05-07T23:12:27Z

lib/protocol/consensus.js


 /**
 * Maximum block weight (consensus).
 * @const {Number}
 * @default
 */

-exports.MAX_BLOCK_WEIGHT = 4000000;
+exports.MAX_BLOCK_WEIGHT = 4000000 * 8;


Should we even have block weight anymore? Is this just in case we miss a weight check somewhere?

It might help with the merges to keep code similar.

edit: #4

bucko13 · 2018-05-07T23:13:09Z

lib/protocol/consensus.js

+ * @default
+ */
+
+exports.MAX_FORK_BLOCK_SIZE = 8000000;


Same comment about the upcoming fork here and below in terms of preparing for the hard fork.

bucko13 · 2018-05-07T23:18:23Z

lib/script/common.js

@@ -346,7 +346,9 @@ exports.flags = {
  VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM: 1 << 12,
  VERIFY_MINIMALIF: 1 << 13,
  VERIFY_NULLFAIL: 1 << 14,
-  VERIFY_WITNESS_PUBKEYTYPE: 1 << 15
+  VERIFY_WITNESS_PUBKEYTYPE: 1 << 15,
+  VERIFY_MAST: 1 << 16,


There's a MAST flag in cash?

nope, it is not.. This number is used as SCRIPT_ENABLE_REPLAY_PROTECTION.

nodech · 2018-05-08T17:24:57Z

lib/blockchain/chain.js

+    const mtp = await this.getMedianTime(prev);
+    if (mtp >= consensus.UAHF_TIME) {
+      state.flags = Script.flags.VERIFY_STRICTENC;
+      state.flags = Script.flags.VERIFY_SIGHASH_FORKID;


these need to be |= instead of =.

This is coming from the rebase. We can check this later.

edit: #6

nodech · 2018-05-09T12:34:28Z

lib/script/script.js

@@ -3096,40 +3095,27 @@ class Script {
        throw new ScriptError('SIG_PUSHONLY');
    }

+    if (flags & Script.flags.VERIFY_SIGHASH_FORKID)


We might not need the check in Deployments this enables STRICTENC as well. : )

Probably best to keep it.

tuxcanfly

LGTM, OK.

tuxcanfly · 2018-05-09T13:31:32Z

lib/blockchain/chain.js

+    const mtp = await this.getMedianTime(prev);
+    if (mtp >= consensus.UAHF_TIME) {
+      state.flags = Script.flags.VERIFY_STRICTENC;
+      state.flags = Script.flags.VERIFY_SIGHASH_FORKID;


This is coming from the rebase. We can check this later.

edit: #6

tuxcanfly · 2018-05-09T13:32:01Z

lib/blockchain/chaindb.js

@@ -59,7 +59,7 @@ class ChainDB {
    this.logger.info('Opening ChainDB...');

    await this.db.open();
-    await this.db.verify(layout.V.build(), 'chain', 5);
+    await this.db.verify(layout.V.build(), 'chain', 0x80 | 5);


I think it's a flag for the chain type, so as to not confuse between forks.

tuxcanfly · 2018-05-09T13:32:29Z

lib/net/common.js

@@ -142,7 +142,7 @@ exports.USER_AGENT = `/bcoin:${pkg.version}/`;
 * @default
 */

-exports.MAX_MESSAGE = 4 * 1000 * 1000;
+exports.MAX_MESSAGE = 8 * 1000 * 1000;


Yup, we need to do that in next hard fork PR.

tuxcanfly · 2018-05-09T13:33:14Z

lib/primitives/block.js

@@ -458,7 +458,7 @@ class Block extends AbstractBlock {

      // Count legacy sigops (do not count scripthash or witness).


Going to leave this as it is harmless atm. Will note to revisit later.

edit: #4

tuxcanfly · 2018-05-09T13:34:00Z

lib/primitives/mtx.js

@@ -506,40 +470,6 @@ class MTX extends TX {

    // Witness program.
    if (prev.isProgram()) {


There's probably a lot of code that can be ripped out. Will revisit later.

edit: #5

tuxcanfly · 2018-05-09T13:34:43Z

lib/protocol/consensus.js

+ * @default
+ */
+
+exports.MAX_FORK_BLOCK_SIZE = 8000000;


tuxcanfly · 2018-05-09T13:35:25Z

lib/protocol/consensus.js


 /**
 * Maximum block weight (consensus).
 * @const {Number}
 * @default
 */

-exports.MAX_BLOCK_WEIGHT = 4000000;
+exports.MAX_BLOCK_WEIGHT = 4000000 * 8;


It might help with the merges to keep code similar.

edit: #4

tuxcanfly · 2018-05-09T13:35:58Z

lib/script/common.js

@@ -346,7 +346,9 @@ exports.flags = {
  VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM: 1 << 12,
  VERIFY_MINIMALIF: 1 << 13,
  VERIFY_NULLFAIL: 1 << 14,
-  VERIFY_WITNESS_PUBKEYTYPE: 1 << 15
+  VERIFY_WITNESS_PUBKEYTYPE: 1 << 15,
+  VERIFY_MAST: 1 << 16,


tuxcanfly · 2018-05-09T13:36:52Z

lib/script/script.js

@@ -3096,40 +3095,27 @@ class Script {
        throw new ScriptError('SIG_PUSHONLY');
    }

+    if (flags & Script.flags.VERIFY_SIGHASH_FORKID)


Probably best to keep it.

chjj added 3 commits August 2, 2017 16:50

bcc: initial bcc implementation.

d1f3c2b

networks: remove segwit.

7127a82

primitives: show hex on json.

afd34c4

tuxcanfly force-pushed the bcash-bcc branch from be2e702 to 37072bf Compare May 1, 2018 12:48

multi: rebase bcc onto staging

4a0fb5c

tuxcanfly force-pushed the bcash-bcc branch from 37072bf to 4a0fb5c Compare May 1, 2018 15:18

multi: fix multiple issues blocking testnet sync

7c8965d

tuxcanfly force-pushed the bcash-bcc branch from b02fbec to 7c8965d Compare May 2, 2018 11:24

tuxcanfly requested review from nodech and bucko13 May 2, 2018 11:24

bucko13 reviewed May 7, 2018

View reviewed changes

nodech reviewed May 8, 2018

View reviewed changes

nodech reviewed May 9, 2018

View reviewed changes

tuxcanfly commented May 9, 2018

View reviewed changes

tuxcanfly merged commit 62b6224 into bcoin-org:staging May 9, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

multi: rebase bcc onto staging #2

multi: rebase bcc onto staging #2

tuxcanfly commented May 1, 2018

tuxcanfly commented May 2, 2018

bucko13 May 7, 2018

tuxcanfly May 9, 2018

bucko13 May 7, 2018

tuxcanfly May 9, 2018

bucko13 May 7, 2018

tuxcanfly May 9, 2018 •

edited

Loading

bucko13 May 7, 2018

tuxcanfly May 9, 2018 •

edited

Loading

bucko13 May 7, 2018

tuxcanfly May 9, 2018 •

edited

Loading

bucko13 May 7, 2018

tuxcanfly May 9, 2018

bucko13 May 7, 2018

nodech May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018

nodech May 8, 2018

tuxcanfly May 9, 2018 •

edited

Loading

nodech May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018

tuxcanfly left a comment

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018

tuxcanfly May 9, 2018

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018

tuxcanfly May 9, 2018

		@@ -458,7 +458,7 @@ class Block extends AbstractBlock {

		// Count legacy sigops (do not count scripthash or witness).

		@@ -506,40 +470,6 @@ class MTX extends TX {

		// Witness program.
		if (prev.isProgram()) {

multi: rebase bcc onto staging #2

multi: rebase bcc onto staging #2

Conversation

tuxcanfly commented May 1, 2018

tuxcanfly commented May 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nodech May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

nodech May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly left a comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

nodech May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

nodech May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading

tuxcanfly May 9, 2018 •

edited

Loading