Skip to content

Commit

Permalink
Merge pull request #722 from AXErunners/v1.6.x
Browse files Browse the repository at this point in the history
Release 1.6.1.0
  • Loading branch information
charlesrocket committed Nov 17, 2020
2 parents 47ab1ef + 69c0c31 commit 1fbb032
Show file tree
Hide file tree
Showing 24 changed files with 260 additions and 196 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 6)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2020)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
49 changes: 32 additions & 17 deletions contrib/seeds/nodes_main.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
1.1.1.5:9937
1.9.1.9:9937
1.25.15.15:9937
4.5.2.1:9937
Expand All @@ -17,7 +16,6 @@
35.232.242.61:9937
37.120.162.254:9937
38.103.9.20:9937
38.103.14.254:9937
38.103.59.180:9937
38.103.110.22:9937
38.103.110.23:9937
Expand Down Expand Up @@ -108,17 +106,17 @@
82.211.25.92:9937
84.255.243.73:9937
85.81.164.189:9937
85.217.170.166:9937
88.88.88.88:9937
89.40.118.180:9937
91.92.136.108:9937
94.156.189.42:9937
94.176.239.71:9937
94.177.245.248:9937
95.114.189.23:9937
95.183.51.146:9937
95.183.53.17:9937
95.183.53.128:9937
95.216.127.184:9937
95.216.249.233:9937
95.216.250.95:9937
95.217.67.224:9937
104.238.82.168:9937
104.238.88.205:9937
Expand All @@ -130,6 +128,8 @@
114.55.242.249:9937
116.203.92.8:9937
117.45.185.37:9937
117.51.138.86:9937
117.85.3.120:9937
118.31.124.115:9937
119.45.180.66:9937
119.45.208.63:9937
Expand All @@ -138,6 +138,7 @@
139.186.18.174:9937
144.32.208.54:9937
144.64.0.170:9937
144.91.89.141:9937
144.91.115.17:9937
144.190.29.94:9937
144.190.130.242:9937
Expand All @@ -149,36 +150,42 @@
148.72.150.99:9937
149.23.53.102:9937
149.28.166.204:9937
149.46.29.6:9937
149.81.201.233:9937
149.91.87.98:9937
149.99.178.216:9937
149.110.184.201:9937
149.115.16.188:9937
149.147.121.28:9937
149.153.41.39:9937
149.168.182.182:9937
149.173.196.121:9937
149.175.211.30:9937
149.206.97.177:9937
149.210.178.234:9937
149.211.96.129:9937
149.223.52.189:9937
149.234.81.175:9937
149.235.99.204:9937
149.248.116.203:9937
149.248.118.99:9937
153.26.110.69:9937
153.26.181.7:9937
153.26.210.70:9937
153.26.210.71:9937
154.118.13.55:9937
154.118.13.57:9937
154.118.13.62:9937
154.113.168.34:9937
154.113.168.36:9937
154.113.168.42:9937
154.113.168.45:9937
154.118.13.63:9937
154.118.13.121:9937
154.208.178.3:9937
154.208.178.5:9937
154.208.178.7:9937
154.208.178.13:9937
154.208.178.155:9937
154.208.178.8:9937
154.208.178.152:9937
154.208.178.160:9937
154.208.178.163:9937
154.208.178.170:9937
154.208.178.173:9937
156.33.204.157:9937
156.42.3.53:9937
156.76.50.101:9937
Expand All @@ -193,26 +200,26 @@
156.224.24.44:9937
156.228.13.4:9937
159.89.161.164:9937
167.86.88.137:9937
167.86.107.225:9937
167.86.115.204:9937
167.86.115.205:9937
172.161.33.56:9937
175.128.171.201:9937
178.62.251.10:9937
178.128.53.16:9937
178.128.77.190:9937
181.227.59.120:9937
184.119.18.210:9937
185.133.97.4:9937
185.133.97.5:9937
185.133.97.6:9937
185.133.97.15:9937
185.133.97.16:9937
185.172.165.190:9937
185.183.110.3:9937
185.228.83.130:9937
188.117.114.53:9937
188.117.114.54:9937
189.114.146.56:9937
193.37.213.45:9937
193.37.213.62:9937
193.37.214.45:9937
193.187.181.132:9937
193.187.181.146:9937
193.187.181.148:9937
Expand All @@ -223,6 +230,14 @@
202.91.32.72:9937
212.24.108.28:9937
216.189.147.174:9937
217.118.154.30:9937
217.118.154.39:9937
217.118.154.44:9937
217.118.154.66:9937
217.119.14.14:9937
217.119.14.22:9937
217.119.14.30:9937
217.119.14.61:9937
222.45.62.67:9937
222.45.62.70:9937
222.45.62.82:9937
Expand Down
8 changes: 4 additions & 4 deletions doc/man/axe-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH AXE-CLI "1" "October 2020" "axe-cli v1.6.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH AXE-CLI "1" "November 2020" "axe-cli v1.6.1.0" "User Commands"
.SH NAME
axe-cli \- manual page for axe-cli v1.6.0.0
axe-cli \- manual page for axe-cli v1.6.1.0
.SH DESCRIPTION
Axe Core RPC client version v1.6.0.0
Axe Core RPC client version v1.6.1.0
.SS "Usage:"
.TP
axe\-cli [options] <command> [params]
Expand Down
12 changes: 6 additions & 6 deletions doc/man/axe-qt.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH AXE-QT "1" "October 2020" "axe-qt v1.6.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH AXE-QT "1" "November 2020" "axe-qt v1.6.1.0" "User Commands"
.SH NAME
axe-qt \- manual page for axe-qt v1.6.0.0
axe-qt \- manual page for axe-qt v1.6.1.0
.SH DESCRIPTION
Axe Core version v1.6.0.0 (64\-bit)
Axe Core version v1.6.1.0 (64\-bit)
Usage:
.IP
axe\-qt [command\-line options]
Expand Down Expand Up @@ -32,9 +32,9 @@ block hash)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
00000000000004d7bcf343ee36d62beae50d19cf26f6ffeb774ee561ab9cc632,
000000000000253fe23b3fe2ad44457bbdd1f24516805fc7fad9fbcd96f9610b,
testnet:
000000e826e2f4bff3d2812c08d8a220869c0596ea7ee62fe3a7371846999e05)
00000109ef379bab833e20aaa4ccca1123ea9ba13abd68da4e0ace7cdf16115f)
.HP
\fB\-conf=\fR<file>
.IP
Expand Down
8 changes: 4 additions & 4 deletions doc/man/axe-tx.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH AXE-TX "1" "October 2020" "axe-tx v1.6.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH AXE-TX "1" "November 2020" "axe-tx v1.6.1.0" "User Commands"
.SH NAME
axe-tx \- manual page for axe-tx v1.6.0.0
axe-tx \- manual page for axe-tx v1.6.1.0
.SH DESCRIPTION
Axe Core axe\-tx utility version v1.6.0.0
Axe Core axe\-tx utility version v1.6.1.0
.SS "Usage:"
.TP
axe\-tx [options] <hex\-tx> [commands]
Expand Down
12 changes: 6 additions & 6 deletions doc/man/axed.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH AXED "1" "October 2020" "axed v1.6.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH AXED "1" "November 2020" "axed v1.6.1.0" "User Commands"
.SH NAME
axed \- manual page for axed v1.6.0.0
axed \- manual page for axed v1.6.1.0
.SH DESCRIPTION
Axe Core Daemon version v1.6.0.0
Axe Core Daemon version v1.6.1.0
.SS "Usage:"
.TP
axed [options]
Expand Down Expand Up @@ -33,9 +33,9 @@ block hash)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
00000000000004d7bcf343ee36d62beae50d19cf26f6ffeb774ee561ab9cc632,
000000000000253fe23b3fe2ad44457bbdd1f24516805fc7fad9fbcd96f9610b,
testnet:
000000e826e2f4bff3d2812c08d8a220869c0596ea7ee62fe3a7371846999e05)
00000109ef379bab833e20aaa4ccca1123ea9ba13abd68da4e0ace7cdf16115f)
.HP
\fB\-conf=\fR<file>
.IP
Expand Down
20 changes: 10 additions & 10 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,10 @@ class CMainParams : public CChainParams {
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nFalloffCoeff = 5; // this corresponds to 10 periods

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000057d1699af8ff34e377"); // 507186
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000005dd60d804ed482dce3"); // 551525

// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x00000000000004d7bcf343ee36d62beae50d19cf26f6ffeb774ee561ab9cc632"); // 507186
consensus.defaultAssumeValid = uint256S("0x000000000000253fe23b3fe2ad44457bbdd1f24516805fc7fad9fbcd96f9610b"); // 551525

/**
* The message start string is designed to be unlikely to occur in normal data.
Expand Down Expand Up @@ -466,10 +466,10 @@ class CMainParams : public CChainParams {
};

chainTxData = ChainTxData{
1597784558, // * UNIX timestamp of last known number of transactions
1043092, // * total number of transactions between genesis and that timestamp
1604796713, // * UNIX timestamp of last known number of transactions
1127533, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the SetBestChain debug.log lines)
0.02 // * estimated number of transactions per second after that timestamp
0.01 // * estimated number of transactions per second after that timestamp
};
}
};
Expand Down Expand Up @@ -560,15 +560,15 @@ class CTestNetParams : public CChainParams {
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nFalloffCoeff = 5; // this corresponds to 10 periods

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000001a10897feeb"); // 28049
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000006f80bb27579f1"); // 189536

// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x000000e826e2f4bff3d2812c08d8a220869c0596ea7ee62fe3a7371846999e05"); // 28049
consensus.defaultAssumeValid = uint256S("0x00000109ef379bab833e20aaa4ccca1123ea9ba13abd68da4e0ace7cdf16115f"); // 189536

pchMessageStart[0] = 0xce;
pchMessageStart[1] = 0xe2;
pchMessageStart[2] = 0xca;
pchMessageStart[3] = 0xff;
pchMessageStart[3] = 0xf1;
nDefaultPort = 19937;
nPruneAfterHeight = 1000;

Expand Down Expand Up @@ -643,8 +643,8 @@ class CTestNetParams : public CChainParams {
};

chainTxData = ChainTxData{
1597784520, // * UNIX timestamp of last known number of transactions
194076, // * total number of transactions between genesis and that timestamp
1604797397, // * UNIX timestamp of last known number of transactions
273040, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the SetBestChain debug.log lines)
0.01 // * estimated number of transactions per second after that timestamp
};
Expand Down
Loading

0 comments on commit 1fbb032

Please sign in to comment.