diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index c446274473..1a564bd551 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -4,21 +4,14 @@ 185.197.251.199:15714 109.123.251.87:15714 84.46.245.181:15714 -167.86.117.103:15714 -167.86.117.143:15714 -167.86.117.144:15714 45.137.91.173:15714 45.138.55.128:15714 -45.138.55.130:15714 # IPv6 nodes [2a02:c206:2210:3221::1]:15714 [2a02:c206:2210:3222::1]:15714 [2a02:c206:2210:3223::1]:15714 -[2a02:c207:2056:6532::1]:15714 -[2a02:c207:2056:6533::1]:15714 -[2a02:c207:2056:6534::1]:15714 [2a10:3781:525:1::1]:15714 [2a10:3781:525:1::210]:15714 [2a10:3781:525::1]:15714 diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index 936f9a5a20..3cdafe2f17 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -4,23 +4,15 @@ 185.197.251.199:25714 109.123.251.87:25714 84.46.245.181:25714 -167.86.117.103:25714 -167.86.117.143:25714 -167.86.117.144:25714 45.137.91.173:25714 45.138.55.128:25714 -45.138.55.130:25714 # IPv6 nodes [2a02:c206:2210:3221::1]:25714 [2a02:c206:2210:3222::1]:25714 [2a02:c206:2210:3223::1]:25714 -[2a02:c207:2056:6532::1]:25714 -[2a02:c207:2056:6533::1]:25714 -[2a02:c207:2056:6534::1]:25714 [2a10:3781:525:1::1]:25714 -[2a10:3781:525:1::210]:25714 [2a10:3781:525::1]:25714 diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index ca07f374bf..a0b2d1e3fd 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -10,18 +10,11 @@ static const uint8_t chainparams_seed_main[] = { 0x01,0x04,0xb9,0xc5,0xfb,0xc7,0x3d,0x62, 0x01,0x04,0x6d,0x7b,0xfb,0x57,0x3d,0x62, 0x01,0x04,0x54,0x2e,0xf5,0xb5,0x3d,0x62, - 0x01,0x04,0xa7,0x56,0x75,0x67,0x3d,0x62, - 0x01,0x04,0xa7,0x56,0x75,0x8f,0x3d,0x62, - 0x01,0x04,0xa7,0x56,0x75,0x90,0x3d,0x62, 0x01,0x04,0x2d,0x89,0x5b,0xad,0x3d,0x62, 0x01,0x04,0x2d,0x8a,0x37,0x80,0x3d,0x62, - 0x01,0x04,0x2d,0x8a,0x37,0x82,0x3d,0x62, 0x02,0x10,0x2a,0x02,0xc2,0x06,0x22,0x10,0x32,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, 0x02,0x10,0x2a,0x02,0xc2,0x06,0x22,0x10,0x32,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, 0x02,0x10,0x2a,0x02,0xc2,0x06,0x22,0x10,0x32,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, - 0x02,0x10,0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, - 0x02,0x10,0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, - 0x02,0x10,0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, 0x02,0x10,0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, 0x02,0x10,0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x10,0x3d,0x62, 0x02,0x10,0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3d,0x62, @@ -34,20 +27,12 @@ static const uint8_t chainparams_seed_test[] = { 0x01,0x04,0xb9,0xc5,0xfb,0xc7,0x64,0x72, 0x01,0x04,0x6d,0x7b,0xfb,0x57,0x64,0x72, 0x01,0x04,0x54,0x2e,0xf5,0xb5,0x64,0x72, - 0x01,0x04,0xa7,0x56,0x75,0x67,0x64,0x72, - 0x01,0x04,0xa7,0x56,0x75,0x8f,0x64,0x72, - 0x01,0x04,0xa7,0x56,0x75,0x90,0x64,0x72, 0x01,0x04,0x2d,0x89,0x5b,0xad,0x64,0x72, 0x01,0x04,0x2d,0x8a,0x37,0x80,0x64,0x72, - 0x01,0x04,0x2d,0x8a,0x37,0x82,0x64,0x72, 0x02,0x10,0x2a,0x02,0xc2,0x06,0x22,0x10,0x32,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, 0x02,0x10,0x2a,0x02,0xc2,0x06,0x22,0x10,0x32,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, 0x02,0x10,0x2a,0x02,0xc2,0x06,0x22,0x10,0x32,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, - 0x02,0x10,0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, - 0x02,0x10,0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, - 0x02,0x10,0x2a,0x02,0xc2,0x07,0x20,0x56,0x65,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, 0x02,0x10,0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, - 0x02,0x10,0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x10,0x64,0x72, 0x02,0x10,0x2a,0x10,0x37,0x81,0x05,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x64,0x72, 0x04,0x20,0x9e,0x5e,0x6c,0xf4,0xe6,0xe8,0xf5,0x7b,0xa1,0xf9,0x36,0x3c,0x5a,0x58,0xea,0x15,0xe8,0xdd,0x02,0x7b,0xce,0xfe,0x11,0x77,0x6a,0xda,0xa2,0x48,0xd9,0xdc,0x19,0xec,0x64,0x72, 0x04,0x20,0x96,0xca,0x7c,0x35,0xae,0x3a,0x21,0xef,0x7a,0x0e,0x8f,0xa6,0x43,0x4a,0xe2,0xbe,0x64,0x88,0x98,0x82,0x7f,0x35,0xd3,0x8b,0x6d,0xb1,0x45,0x28,0x0e,0x91,0xbc,0xe4,0x64,0x72, diff --git a/src/headerssync.cpp b/src/headerssync.cpp index 5783cb6a3b..d65ae3566d 100644 --- a/src/headerssync.cpp +++ b/src/headerssync.cpp @@ -13,11 +13,11 @@ // contrib/devtools/headerssync-params.py. //! Store one header commitment per HEADER_COMMITMENT_PERIOD blocks. -constexpr size_t HEADER_COMMITMENT_PERIOD{606}; +constexpr size_t HEADER_COMMITMENT_PERIOD{568}; //! Only feed headers to validation once this many headers on top have been //! received and validated against commitments. -constexpr size_t REDOWNLOAD_BUFFER_SIZE{14441}; // 14441/606 = ~23.8 commitments +constexpr size_t REDOWNLOAD_BUFFER_SIZE{10071}; // 10071/568 = ~17.7 commitments // Our memory analysis assumes 48 + 4 bytes for a CompressedHeader (so we should // re-calculate parameters if we compress further) diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 6bebacae30..5ffbfbd73b 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -126,8 +126,8 @@ class CMainParams : public CChainParams { consensus.nStakeTimestampMask = 0xf; // 15 consensus.nCoinbaseMaturity = 500; - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000043c846cfe732c8b6dbc"); // block 5044605 - consensus.defaultAssumeValid = uint256S("0x6f8e37e21aa2fba3f8e2d6825cb825ca290e9367ed08b8c30943bc16efcba119"); // block 4908715 + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000004586098169d7b9cdc63"); // block 5178789 + consensus.defaultAssumeValid = uint256S("0xc133d21768f6579597cf33611e9d7388b452af1cfebce1c983d84ab38ebcee79"); // block 5178789 /** * The message start string is designed to be unlikely to occur in normal data. @@ -187,10 +187,10 @@ class CMainParams : public CChainParams { }; chainTxData = ChainTxData{ - // Data from RPC: getchaintxstats 40500 97d26e7793f0d3f3e8b3f52503881b013d4deb8ff468f6cae3f670266c91a46e - .nTime = 1723034304, - .nTxCount = 15444062, - .dTxRate = 0.03010594818542921, + // Data from RPC: getchaintxstats 40500 c133d21768f6579597cf33611e9d7388b452af1cfebce1c983d84ab38ebcee79 + .nTime = 1732044192, + .nTxCount = 15713978, + .dTxRate = 0.03001311850270631, }; // A vector of p2sh addresses @@ -247,8 +247,8 @@ class CTestNetParams : public CChainParams { consensus.nStakeTimestampMask = 0xf; consensus.nCoinbaseMaturity = 10; - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000054788711eaf8d71d0e"); // block 1971755 - consensus.defaultAssumeValid = uint256S("0x5d5c42500cc6057533e249ba9eeb9b5e998aff30468c904bc267ec9bccbc8b39"); // block 1415393 + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000005bcd58fc08c1b0ec53"); // block 2103490 + consensus.defaultAssumeValid = uint256S("0x03fec30e422ef981c1dcf5f19b1892ea7d5a3123277400f5c3d56f8a59e548b6"); // block 2103490 pchMessageStart[0] = 0xcd; pchMessageStart[1] = 0xf2; @@ -298,10 +298,10 @@ class CTestNetParams : public CChainParams { }; chainTxData = ChainTxData{ - // Data from RPC: getchaintxstats 40500 84517a2467681cf97ed7cf8926acc45dbd567226f2fb189302979ad49fd56b1f - .nTime = 1723034480, - .nTxCount = 3962401, - .dTxRate = 0.02976167726989428, + // Data from RPC: getchaintxstats 40500 03fec30e422ef981c1dcf5f19b1892ea7d5a3123277400f5c3d56f8a59e548b6 + .nTime = 1732044208, + .nTxCount = 4225853, + .dTxRate = 0.02972773825989593, }; // A vector of p2sh addresses