Skip to content

Commit 481ba90

Browse files
committed
v1.1.0
1 parent 493a996 commit 481ba90

File tree

291 files changed

+8224
-8551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+8224
-8551
lines changed

README.md

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,6 @@
1616
- Near instantaneous transactions via SwiftTX.
1717
- Masternode technology used to secure the network and provide the above features.
1818

19-
### Addnodes
20-
To improve the network speed/performance it's recommended that you connect to the following nodes.
21-
22-
How to add nodes to the ittrium.conf file.
23-
1. Backup your wallet file by clicking File > Backup Wallet
24-
2. Shut your wallet.
25-
3. Navigate to %AppData%/Ittrium (Windows), ~./ittrium (Linux) or ~/Library/Application Support/Ittrium (Mac)
26-
4. Open ittrium.conf file in a word editor (i.e. Notepad).
27-
5. Paste the following text into the ittrium.conf file, Save and Exit.
28-
29-
```
30-
addnode=195.201.28.86
31-
addnode=195.201.30.56
32-
addnode=51.38.127.99
33-
addnode=51.38.68.244
34-
addnode=51.38.68.255
35-
addnode=51.38.98.231
36-
addnode=88.99.123.145
37-
addnode=95.216.136.26
38-
addnode=95.216.148.31
39-
addnode=95.216.169.173
40-
addnode=159.69.3.16
41-
addnode=
42-
```
43-
4419
### Coin Specs
4520
<table>
4621
<tr><td>Algo</td><td>Lyra2z</td></tr>
@@ -52,6 +27,7 @@ addnode=
5227
</table>
5328

5429
### Reward Distribution
30+
5531
<table>
5632
<th>Phase</th><th>Block Height</th><th>Reward</th><th>Proof of Stake (27%)</th><th>Masternodes (73%)</th>
5733
<tr><td>Phase 1</td><td>0-300</td><td>1650 XIT</td><td>na</td><td>na</td></tr>
@@ -67,5 +43,3 @@ addnode=
6743
<tr><td>Phase 11</td><td>650,001-1,800,000</td><td>6 XIT</td><td>1.62 XIT</td><td>4.38 XIT</td></tr>
6844
<tr><td>Phase 12</td><td>1,800,000-7,868,633</td><td>3 XIT</td><td>0.81 XIT</td><td>2.19 XIT</td></tr>
6945

70-
71-

configure.ac

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 1)
4-
define(_CLIENT_VERSION_MINOR, 0)
5-
define(_CLIENT_VERSION_REVISION, 3)
6-
define(_CLIENT_VERSION_BUILD, 3)
4+
define(_CLIENT_VERSION_MINOR, 1)
5+
define(_CLIENT_VERSION_REVISION, 0)
6+
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2018)
99
AC_INIT([Ittrium Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.ittrium.io],[ittrium])
@@ -19,9 +19,9 @@ BITCOIN_TX_NAME=ittrium-tx
1919

2020
AC_CANONICAL_HOST
2121

22-
AH_TOP([#ifndef ITTRIUM_CONFIG_H])
23-
AH_TOP([#define ITTRIUM_CONFIG_H])
24-
AH_BOTTOM([#endif //ITTRIUM_CONFIG_H])
22+
AH_TOP([#ifndef XIT_CONFIG_H])
23+
AH_TOP([#define XIT_CONFIG_H])
24+
AH_BOTTOM([#endif //XIT_CONFIG_H])
2525

2626
dnl faketime breaks configure and is only needed for make. Disable it here.
2727
unset FAKETIME

contrib/devtools/check-doc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
2121
REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
2222
# list unsupported, deprecated and duplicate args as they need no documentation
23-
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions'])
23+
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider', '-anonymizeittriumamount'])
2424

2525
def main():
2626
used = check_output(CMD_GREP_ARGS, shell=True)

contrib/ittrium-qt.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ HEADERS += src/activemasternode.h \
6262
src/allocators.h \
6363
src/amount.h \
6464
src/base58.h \
65+
src/bignum.h \
6566
src/bloom.h \
6667
src/chain.h \
6768
src/chainparams.h \
@@ -222,7 +223,6 @@ HEADERS += src/activemasternode.h \
222223
src/script/sigcache.h \
223224
src/script/sign.h \
224225
src/script/standard.h \
225-
src/test/bignum.h \
226226
src/univalue/univalue.h \
227227
src/univalue/univalue_escapes.h \
228228
src/leveldb/db/builder.h \

contrib/linearize/README.md

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,57 @@
11
# Linearize
2-
Construct a linear, no-fork, best version of the blockchain.
2+
Construct a linear, no-fork, best version of the Bitcoin blockchain. The scripts
3+
run using Python 3 but are compatible with Python 2.
4+
5+
REQUIRED: [nist5_hash](https://github.com/IttriumCore/nist5_hash)
36

47
## Step 1: Download hash list
58

6-
$ ./linearize-hashes.py linearize.cfg > hashlist.txt
9+
$ ./linearize-hashes.py linearize.cfg > hashlist.txt
710

811
Required configuration file settings for linearize-hashes:
9-
* RPC: rpcuser, rpcpassword
12+
* RPC: `datadir` (Required if `rpcuser` and `rpcpassword` are not specified)
13+
* RPC: `rpcuser`, `rpcpassword` (Required if `datadir` is not specified)
1014

1115
Optional config file setting for linearize-hashes:
12-
* RPC: host, port
13-
* Block chain: min_height, max_height
16+
* RPC: `host` (Default: `127.0.0.1`)
17+
* RPC: `port` (Default: `8332`)
18+
* Blockchain: `min_height`, `max_height`
19+
* `rev_hash_bytes`: If true, the written block hash list will be
20+
byte-reversed. (In other words, the hash returned by getblockhash will have its
21+
bytes reversed.) False by default. Intended for generation of
22+
standalone hash lists but safe to use with linearize-data.py, which will output
23+
the same data no matter which byte format is chosen.
24+
25+
The `linearize-hashes` script requires a connection, local or remote, to a
26+
JSON-RPC server. Running `bitcoind` or `bitcoin-qt -server` will be sufficient.
1427

1528
## Step 2: Copy local block data
1629

17-
$ ./linearize-data.py linearize.cfg
30+
$ ./linearize-data.py linearize.cfg
1831

1932
Required configuration file settings:
20-
* "input": bitcoind blocks/ directory containing blkNNNNN.dat
21-
* "hashlist": text file containing list of block hashes, linearized-hashes.py
22-
output.
23-
* "output_file": bootstrap.dat
33+
* `output_file`: The file that will contain the final blockchain.
2434
or
25-
* "output": output directory for linearized blocks/blkNNNNN.dat output
35+
* `output`: Output directory for linearized `blocks/blkNNNNN.dat` output.
2636

2737
Optional config file setting for linearize-data:
28-
* "netmagic": network magic number
29-
* "max_out_sz": maximum output file size (default 1000*1000*1000)
30-
* "split_timestamp": Split files when a new month is first seen, in addition to
31-
reaching a maximum file size.
32-
* "file_timestamp": Set each file's last-modified time to that of the
33-
most recent block in that file.
38+
* `debug_output`: Some printouts may not always be desired. If true, such output
39+
will be printed.
40+
* `file_timestamp`: Set each file's last-accessed and last-modified times,
41+
respectively, to the current time and to the timestamp of the most recent block
42+
written to the script's blockchain.
43+
* `genesis`: The hash of the genesis block in the blockchain.
44+
* `input`: bitcoind blocks/ directory containing blkNNNNN.dat
45+
* `hashlist`: text file containing list of block hashes created by
46+
linearize-hashes.py.
47+
* `max_out_sz`: Maximum size for files created by the `output_file` option.
48+
(Default: `1000*1000*1000 bytes`)
49+
* `netmagic`: Network magic number.
50+
* `out_of_order_cache_sz`: If out-of-order blocks are being read, the block can
51+
be written to a cache so that the blockchain doesn't have to be sought again.
52+
This option specifies the cache size. (Default: `100*1000*1000 bytes`)
53+
* `rev_hash_bytes`: If true, the block hash list written by linearize-hashes.py
54+
will be byte-reversed when read by linearize-data.py. See the linearize-hashes
55+
entry for more information.
56+
* `split_timestamp`: Split blockchain files when a new month is first seen, in
57+
addition to reaching a maximum file size (`max_out_sz`).

contrib/linearize/example-linearize.cfg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
# bitcoind RPC settings (linearize-hashes)
2-
rpcuser=someuser
3-
rpcpassword=somepassword
2+
rpcuser=RPCUSERNAME
3+
rpcpassword=RPCPASSWORD
44
#datadir=~/.ittrium
55
host=127.0.0.1
66

77
#mainnet default
8-
port=39993
8+
port=50369
99

1010
#testnet default
11-
#port=3993
11+
#port=51369
1212

1313
# bootstrap.dat hashlist settings (linearize-hashes)
14-
max_height=313000
14+
max_height=1000
1515

1616
# bootstrap.dat input/output settings (linearize-data)
1717

1818
# mainnet
1919
netmagic=08020117
20-
genesis=00000908a5fd7c4c863c9a0281def7b5b9c137b782d66a75753c3954d369eb5c
21-
input=/home/example/.ittrium/blocks
20+
genesis000000fdacddaba54eb66a4c09dc795efbfc75fcd0572c99f489424367bc9ec9
21+
input=/home/ittrium/.ittrium/blocks
2222

2323
# "output" option causes blockchain files to be written to the given location,
2424
# with "output_file" ignored. If not used, "output_file" is used instead.
2525
# output=/home/example/blockchain_directory
26-
output_file=/home/example/Downloads/bootstrap.dat
26+
output_file=/home/ittrium/bootstrap.dat
2727
hashlist=hashlist.txt
2828

2929
# Maximum size in bytes of out-of-order blocks cache in memory

0 commit comments

Comments
 (0)