From 62c59cc4f5bd4667f206008eb0679beb84fd3548 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 18 Oct 2016 18:40:30 -0700 Subject: [PATCH] networks: segwit start time (main), segwit by default (testnet). --- lib/protocol/networks.js | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/protocol/networks.js b/lib/protocol/networks.js index c3e8f713..17d45c1a 100644 --- a/lib/protocol/networks.js +++ b/lib/protocol/networks.js @@ -336,8 +336,8 @@ main.deployments = { }, witness: { bit: 1, - startTime: 2000000000, // Far in the future - timeout: 2100000000, + startTime: 1479168000, // November 15th, 2016. + timeout: 1510704000, // November 15th, 2017. force: false }, mast: { @@ -346,12 +346,6 @@ main.deployments = { timeout: 2100000000, force: false } - // bip109: { - // bit: 28, - // startTime: 1453939200, // Jan 28th, 2016 - // timeout: 1514764800, // Jan 1st, 2018 - // force: true - // } }; /** @@ -469,10 +463,24 @@ testnet.alertKey = new Buffer('' 'hex'); testnet.checkpoints = { - 546: '70cb6af7ebbcb1315d3414029c556c55f3e2fc353c4c9063a76c932a00000000' + 546: '70cb6af7ebbcb1315d3414029c556c55f3e2fc353c4c9063a76c932a00000000', + // Custom checkpoints + 10000: '02a1b43f52591e53b660069173ac83b675798e12599dbb0442b7580000000000', + 100000: '1e0a16bbadccde1d80c66597b1939e45f91b570d29f95fc158299e0000000000', + 170000: '508125560d202b89757889bb0e49c712477be20440058f05db4f0e0000000000', + 210000: '32365454b5f29a826bff8ad9b0448cad0072fc73d50e482d91a3dece00000000', + 300000: 'a141bf3972424853f04367b47995e220e0b5a2706e5618766f22000000000000', + 390000: 'f217e183484fb6d695609cc71fa2ae24c3020943407e0150b298030000000000', + 420000: 'de9e73a3b91fbb014e036e8583a17d6b638a699aeb2de8573d12580800000000', + 500000: '06f60922a2aab2757317820fc6ffaf6a470e2cbb0f63a2aac0a7010000000000', + 630000: 'bbbe117035432a6a4effcb297207a02b031735b43e0d19a9217c000000000000', + 700000: 'c14d3f6a1e7c7d66fd940951e44f3c3be1273bea4d2ab1786140000000000000', + 780000: '0381582e34c3755964dc2813e2b33e521e5596367144e1670851050000000000', + 840000: 'dac1648107bd4394e57e4083c86d42b548b1cfb119665f179ea80a0000000000', + 900000: '9bd8ac418beeb1a2cf5d68c8b5c6ebaa947a5b766e5524898d6f350000000000' }; -testnet.checkpoints.lastHeight = 546; +testnet.checkpoints.lastHeight = 900000; testnet.halvingInterval = 210000; @@ -522,7 +530,7 @@ testnet.block = { slowHeight: 750000 }; -testnet.witness = false; +testnet.witness = true; testnet.oldWitness = false;