duke
/
VerusCoin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of https://github.com/miketout/VerusCoin into dev

pull/446/head
miketout 2 years ago
parent
cd6c3a496f 216f2793d6
commit
2d840f1221
10 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .gitlab-ci.yml
  2. 2
      README.md
  3. 28
      contrib/seeds/nodes_test.txt
  4. 2
      doc/man/verus-cli/linux/README.txt
  5. 2
      doc/man/verus-cli/mac/README.txt
  6. 2
      doc/man/verus-cli/windows/README.txt
  7. 28
      src/chainparamsseeds.h
  8. 2
      src/deprecation.h
  9. 2
      src/pbaas/crosschainrpc.cpp
  10. 2
      src/version.h

4
.gitlab-ci.yml
View File

@ -7,7 +7,7 @@ stages:
########################################################################################################################
variables:
VERSION: 0.9.3
VERSION: 0.9.4
VERUS_CLI_ARM64_LINUX: Verus-CLI-Linux-v${VERSION}-arm64.tar.gz
VERUS_CLI_LINUX_X86_64: Verus-CLI-Linux-v${VERSION}-x86_64.tar.gz
@ -397,4 +397,4 @@ deploy:
expire_in: 1 week
########################################################################################################################
####END#### Deploy ####END####
########################################################################################################################
########################################################################################################################

2
README.md
View File

@ -1,5 +1,5 @@
## VerusCoin version 0.9.3
## VerusCoin version 0.9.4
Arguably the world's most advanced technology, zero knowledge privacy-centric blockchain, Verus Coin brings Sapling performance and zero knowledge features to an intelligent system with interchain smart contracts and a completely original, combined proof of stake/proof of work consensus algorithm that solves the nothing at stake problem. With this and its approach towards CPU mining and ASICs, Verus Coin strives to be one of the most naturally decentralizing and attack resistant blockchains in existence.

28
contrib/seeds/nodes_test.txt
View File

@ -1,17 +1,17 @@
# List of fixed seed nodes for testnet
116.203.95.63:43476
159.69.55.214:43476
95.216.207.181:43476
192.46.230.10:43476
45.33.4.79:43476
185.25.48.236:43476
185.64.105.111:43476
116.203.95.63:29765
159.69.55.214:29765
95.216.207.181:29765
192.46.230.10:29765
45.33.4.79:29765
185.25.48.236:29765
185.64.105.111:29765
[2a01:4f8:c0c:f42e::1]:43476
[2a01:4f8:c010:2555::1]:43476
[2a01:4f9:c010:bbad::1]:43476
[2400:8901::f03c:92ff:fe44:9542]:43476
[2600:3c00::f03c:92ff:fe44:95b3]:43476
[2a04:2180:0:2::149]:43476
[2a04:2180:0:2::29]:43476
[2a01:4f8:c0c:f42e::1]:29765
[2a01:4f8:c010:2555::1]:29765
[2a01:4f9:c010:bbad::1]:29765
[2400:8901::f03c:92ff:fe44:9542]:29765
[2600:3c00::f03c:92ff:fe44:95b3]:29765
[2a04:2180:0:2::149]:29765
[2a04:2180:0:2::29]:29765

2
doc/man/verus-cli/linux/README.txt
View File

@ -1,5 +1,5 @@
VerusCoin Command Line Tools v0.9.3
VerusCoin Command Line Tools v0.9.4
Contents:
verusd - VerusCoin daemon

2
doc/man/verus-cli/mac/README.txt
View File

@ -1,5 +1,5 @@
VerusCoin Command Line Tools v0.9.3
VerusCoin Command Line Tools v0.9.4
Contents:
verusd - VerusCoin daemon.

2
doc/man/verus-cli/windows/README.txt
View File

@ -1,5 +1,5 @@
VerusCoin Command Line Tools v0.9.3
VerusCoin Command Line Tools v0.9.4
Contents:
verusd.exe - VerusCoin daemon

28
src/chainparamsseeds.h
View File

@ -33,19 +33,19 @@ static SeedSpec6 pnSeed6_main[] = {
};
static SeedSpec6 pnSeed6_test[] = {
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0xcb,0x5f,0x3f}, 43476},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x45,0x37,0xd6}, 43476},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0xcf,0xb5}, 43476},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x2e,0xe6,0x0a}, 43476},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x04,0x4f}, 43476},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0xec}, 43476},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x69,0x6f}, 43476},
{{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0xf4,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 43476},
{{0x2a,0x01,0x04,0xf8,0xc0,0x10,0x25,0x55,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 43476},
{{0x2a,0x01,0x04,0xf9,0xc0,0x10,0xbb,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 43476},
{{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x92,0xff,0xfe,0x44,0x95,0x42}, 43476},
{{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x92,0xff,0xfe,0x44,0x95,0xb3}, 43476},
{{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x49}, 43476},
{{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29}, 43476}
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0xcb,0x5f,0x3f}, 29765},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x45,0x37,0xd6}, 29765},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0xcf,0xb5}, 29765},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x2e,0xe6,0x0a}, 29765},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x04,0x4f}, 29765},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0xec}, 29765},
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x69,0x6f}, 29765},
{{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0xf4,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 29765},
{{0x2a,0x01,0x04,0xf8,0xc0,0x10,0x25,0x55,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 29765},
{{0x2a,0x01,0x04,0xf9,0xc0,0x10,0xbb,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 29765},
{{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x92,0xff,0xfe,0x44,0x95,0x42}, 29765},
{{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x92,0xff,0xfe,0x44,0x95,0xb3}, 29765},
{{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x49}, 29765},
{{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x29}, 29765}
};
#endif // BITCOIN_CHAINPARAMSSEEDS_H

2
src/deprecation.h
View File

@ -9,7 +9,7 @@
// * Shut down 20 weeks' worth of blocks after the estimated release block height.
// * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
static const int APPROX_RELEASE_HEIGHT = 2063000;
static const int APPROX_RELEASE_HEIGHT = 2170000;
static const int WEEKS_UNTIL_DEPRECATION = 20;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);

2
src/pbaas/crosschainrpc.cpp
View File

@ -1108,7 +1108,7 @@ CCurrencyDefinition::CCurrencyDefinition(const std::string &currencyName, bool t
UniValue uniEra1(UniValue::VOBJ);
uniEra1.pushKV("reward", 1200000000);
uniEra1.pushKV("decay", 0);
uniEra1.pushKV("halving", 1011011);
uniEra1.pushKV("halving", 163382);
uniEra1.pushKV("eraend", 0);
uniEras.push_back(uniEra1);

2
src/version.h
View File

@ -35,6 +35,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
static const int NO_BLOOM_VERSION = 170004;
#define KOMODO_VERSION "0.2.1"
#define VERUS_VERSION "0.9.3"
#define VERUS_VERSION "0.9.4"
#endif // BITCOIN_VERSION_H

Write Preview
Loading…
Cancel
Save