Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
IttriumCore committed Oct 13, 2018
1 parent 493a996 commit 481ba90
Show file tree
Hide file tree
Showing 291 changed files with 8,224 additions and 8,551 deletions.
28 changes: 1 addition & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,6 @@
- Near instantaneous transactions via SwiftTX.
- Masternode technology used to secure the network and provide the above features.

### Addnodes
To improve the network speed/performance it's recommended that you connect to the following nodes.

How to add nodes to the ittrium.conf file.
1. Backup your wallet file by clicking File > Backup Wallet
2. Shut your wallet.
3. Navigate to %AppData%/Ittrium (Windows), ~./ittrium (Linux) or ~/Library/Application Support/Ittrium (Mac)
4. Open ittrium.conf file in a word editor (i.e. Notepad).
5. Paste the following text into the ittrium.conf file, Save and Exit.

```
addnode=195.201.28.86
addnode=195.201.30.56
addnode=51.38.127.99
addnode=51.38.68.244
addnode=51.38.68.255
addnode=51.38.98.231
addnode=88.99.123.145
addnode=95.216.136.26
addnode=95.216.148.31
addnode=95.216.169.173
addnode=159.69.3.16
addnode=
```

### Coin Specs
<table>
<tr><td>Algo</td><td>Lyra2z</td></tr>
Expand All @@ -52,6 +27,7 @@ addnode=
</table>

### Reward Distribution

<table>
<th>Phase</th><th>Block Height</th><th>Reward</th><th>Proof of Stake (27%)</th><th>Masternodes (73%)</th>
<tr><td>Phase 1</td><td>0-300</td><td>1650 XIT</td><td>na</td><td>na</td></tr>
Expand All @@ -67,5 +43,3 @@ addnode=
<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>
<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>



12 changes: 6 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([Ittrium Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.ittrium.io],[ittrium])
Expand All @@ -19,9 +19,9 @@ BITCOIN_TX_NAME=ittrium-tx

AC_CANONICAL_HOST

AH_TOP([#ifndef ITTRIUM_CONFIG_H])
AH_TOP([#define ITTRIUM_CONFIG_H])
AH_BOTTOM([#endif //ITTRIUM_CONFIG_H])
AH_TOP([#ifndef XIT_CONFIG_H])
AH_TOP([#define XIT_CONFIG_H])
AH_BOTTOM([#endif //XIT_CONFIG_H])

dnl faketime breaks configure and is only needed for make. Disable it here.
unset FAKETIME
Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/check-doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
# list unsupported, deprecated and duplicate args as they need no documentation
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions'])
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider', '-anonymizeittriumamount'])

def main():
used = check_output(CMD_GREP_ARGS, shell=True)
Expand Down
2 changes: 1 addition & 1 deletion contrib/ittrium-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ HEADERS += src/activemasternode.h \
src/allocators.h \
src/amount.h \
src/base58.h \
src/bignum.h \
src/bloom.h \
src/chain.h \
src/chainparams.h \
Expand Down Expand Up @@ -222,7 +223,6 @@ HEADERS += src/activemasternode.h \
src/script/sigcache.h \
src/script/sign.h \
src/script/standard.h \
src/test/bignum.h \
src/univalue/univalue.h \
src/univalue/univalue_escapes.h \
src/leveldb/db/builder.h \
Expand Down
58 changes: 41 additions & 17 deletions contrib/linearize/README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,57 @@
# Linearize
Construct a linear, no-fork, best version of the blockchain.
Construct a linear, no-fork, best version of the Bitcoin blockchain. The scripts
run using Python 3 but are compatible with Python 2.

REQUIRED: [nist5_hash](https://github.com/IttriumCore/nist5_hash)

## Step 1: Download hash list

$ ./linearize-hashes.py linearize.cfg > hashlist.txt
$ ./linearize-hashes.py linearize.cfg > hashlist.txt

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

Optional config file setting for linearize-hashes:
* RPC: host, port
* Block chain: min_height, max_height
* RPC: `host` (Default: `127.0.0.1`)
* RPC: `port` (Default: `8332`)
* Blockchain: `min_height`, `max_height`
* `rev_hash_bytes`: If true, the written block hash list will be
byte-reversed. (In other words, the hash returned by getblockhash will have its
bytes reversed.) False by default. Intended for generation of
standalone hash lists but safe to use with linearize-data.py, which will output
the same data no matter which byte format is chosen.

The `linearize-hashes` script requires a connection, local or remote, to a
JSON-RPC server. Running `bitcoind` or `bitcoin-qt -server` will be sufficient.

## Step 2: Copy local block data

$ ./linearize-data.py linearize.cfg
$ ./linearize-data.py linearize.cfg

Required configuration file settings:
* "input": bitcoind blocks/ directory containing blkNNNNN.dat
* "hashlist": text file containing list of block hashes, linearized-hashes.py
output.
* "output_file": bootstrap.dat
* `output_file`: The file that will contain the final blockchain.
or
* "output": output directory for linearized blocks/blkNNNNN.dat output
* `output`: Output directory for linearized `blocks/blkNNNNN.dat` output.

Optional config file setting for linearize-data:
* "netmagic": network magic number
* "max_out_sz": maximum output file size (default 1000*1000*1000)
* "split_timestamp": Split files when a new month is first seen, in addition to
reaching a maximum file size.
* "file_timestamp": Set each file's last-modified time to that of the
most recent block in that file.
* `debug_output`: Some printouts may not always be desired. If true, such output
will be printed.
* `file_timestamp`: Set each file's last-accessed and last-modified times,
respectively, to the current time and to the timestamp of the most recent block
written to the script's blockchain.
* `genesis`: The hash of the genesis block in the blockchain.
* `input`: bitcoind blocks/ directory containing blkNNNNN.dat
* `hashlist`: text file containing list of block hashes created by
linearize-hashes.py.
* `max_out_sz`: Maximum size for files created by the `output_file` option.
(Default: `1000*1000*1000 bytes`)
* `netmagic`: Network magic number.
* `out_of_order_cache_sz`: If out-of-order blocks are being read, the block can
be written to a cache so that the blockchain doesn't have to be sought again.
This option specifies the cache size. (Default: `100*1000*1000 bytes`)
* `rev_hash_bytes`: If true, the block hash list written by linearize-hashes.py
will be byte-reversed when read by linearize-data.py. See the linearize-hashes
entry for more information.
* `split_timestamp`: Split blockchain files when a new month is first seen, in
addition to reaching a maximum file size (`max_out_sz`).
16 changes: 8 additions & 8 deletions contrib/linearize/example-linearize.cfg
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# bitcoind RPC settings (linearize-hashes)
rpcuser=someuser
rpcpassword=somepassword
rpcuser=RPCUSERNAME
rpcpassword=RPCPASSWORD
#datadir=~/.ittrium
host=127.0.0.1

#mainnet default
port=39993
port=50369

#testnet default
#port=3993
#port=51369

# bootstrap.dat hashlist settings (linearize-hashes)
max_height=313000
max_height=1000

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

# mainnet
netmagic=08020117
genesis=00000908a5fd7c4c863c9a0281def7b5b9c137b782d66a75753c3954d369eb5c
input=/home/example/.ittrium/blocks
genesis000000fdacddaba54eb66a4c09dc795efbfc75fcd0572c99f489424367bc9ec9
input=/home/ittrium/.ittrium/blocks

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

# Maximum size in bytes of out-of-order blocks cache in memory
Expand Down
Loading

0 comments on commit 481ba90

Please sign in to comment.