Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6deec5f91a | ||
|
|
368a7389f4 | ||
|
|
7c3ef9b635 | ||
|
|
6fa9ee58e3 | ||
|
|
b71107c2b3 | ||
|
|
93daca0614 | ||
|
|
e381336281 | ||
|
|
30c65694b9 | ||
|
|
84542d98d1 | ||
|
|
b9a1b60555 | ||
|
|
aed3b9b148 | ||
|
|
48d51418ef | ||
|
|
50facca935 | ||
|
|
e90d7f54ce | ||
|
|
2587130e45 | ||
|
|
f4be61d90a | ||
|
|
047abede75 | ||
|
|
4a1bf7bb51 | ||
|
|
a407c10b02 | ||
|
|
995b5a6666 | ||
|
|
4badde8595 | ||
|
|
6cce052bf7 | ||
|
|
df4a86a0df | ||
|
|
11f5bf4243 | ||
|
|
5d22b17af5 | ||
|
|
4a2738ddf1 | ||
|
|
4e147cb380 | ||
|
|
dc34766423 | ||
|
|
cd10b981b1 | ||
|
|
fe493bff9e | ||
|
|
7930840005 | ||
|
|
d5df3ff10d | ||
|
|
a0221c3bf7 | ||
|
|
c3d315ed49 | ||
|
|
e120c1de69 | ||
|
|
6fc7e0860e | ||
|
|
1d071a9998 | ||
|
|
6b13bd1d45 | ||
|
|
c0f7584503 | ||
|
|
ff07b5b927 | ||
|
|
4e1df4de23 | ||
|
|
4ff143387e | ||
|
|
8817a7df51 | ||
|
|
6f0b24d62d | ||
|
|
62f4bedb17 | ||
|
|
0a2c49911d | ||
|
|
2f7c03cbe8 | ||
|
|
172f6aca32 | ||
|
|
d26db867dd | ||
|
|
39580f1740 | ||
|
|
29bc408431 | ||
|
|
dffd498152 | ||
|
|
a2fa2c0720 | ||
|
|
b2ba3f5ea0 | ||
|
|
52628772b3 | ||
|
|
cc84e7fb91 | ||
|
|
04b3983844 | ||
|
|
83e1df0403 | ||
|
|
fbbf63fa54 | ||
|
|
3238cd9735 | ||
|
|
047e41be82 | ||
|
|
cb9c633936 | ||
|
|
d29f110a11 | ||
|
|
40e034ef1b | ||
|
|
865f746636 | ||
|
|
6179347045 | ||
|
|
b2216fd270 | ||
|
|
5a1d288b17 | ||
|
|
800bb51fbf | ||
|
|
30e941195a | ||
|
|
32e73f4586 | ||
|
|
d438e9f968 | ||
|
|
20ae466765 | ||
|
|
84b093b981 | ||
|
|
84f074b9fa | ||
|
|
7a0724098f | ||
|
|
04d77ab376 | ||
|
|
24d5e64d0b | ||
|
|
3a7e7adfe3 | ||
|
|
2b1d07fee4 | ||
|
|
dd8638dba8 | ||
|
|
4ec3516045 | ||
|
|
5913a70f7e | ||
|
|
e6629319a5 | ||
|
|
4a8e372720 | ||
|
|
1b896ae75b | ||
|
|
ffad0154c1 | ||
|
|
61664b027b | ||
|
|
86592934cb | ||
|
|
6542b53b36 | ||
|
|
e20f6785ad | ||
|
|
51d6b690cb | ||
|
|
03b3828a65 | ||
|
|
34f61bbbf0 | ||
|
|
cddeccd2b9 | ||
|
|
af860d89cf | ||
|
|
65505b3d55 | ||
|
|
b6d9e4e591 | ||
|
|
b89ff5f456 | ||
|
|
50c2ed0fee | ||
|
|
b51444fd5c |
No files matched your search
@@ -45,7 +45,7 @@ src/qt/forms/ui_*.h
|
||||
|
||||
src/qt/test/moc*.cpp
|
||||
|
||||
dependencies/*
|
||||
lbrycrd-dependencies/*
|
||||
|
||||
.deps
|
||||
.dirstamp
|
||||
@@ -74,6 +74,7 @@ dependencies/*
|
||||
#libtool object files
|
||||
*.lo
|
||||
*.la
|
||||
start_time
|
||||
|
||||
# Compilation and Qt preprocessor part
|
||||
*.qm
|
||||
@@ -119,3 +120,5 @@ share/BitcoindComparisonTool.jar
|
||||
/doc/doxygen/
|
||||
|
||||
libbitcoinconsensus.pc
|
||||
|
||||
cmake-build-*/
|
||||
@@ -29,8 +29,8 @@ before_install:
|
||||
|
||||
install: true
|
||||
script:
|
||||
- if [[ "${TARGET}" == "osx" ]]; then ./reproducible_build.sh -t -o -c; fi
|
||||
- if [[ "${TARGET}" == "linux" ]]; then ./reproducible_build.sh -t -o -c; fi
|
||||
- if [[ "${TARGET}" == "osx" ]]; then ./reproducible_build.sh -t -o -c -f; fi
|
||||
- if [[ "${TARGET}" == "linux" ]]; then ./reproducible_build.sh -t -o -c -f; fi
|
||||
- if [[ "${TARGET}" == "windows" ]]; then ./packaging/build_windows.sh; fi
|
||||
- if [[ "${TARGET}" == "osx" ]]; then zip -j "lbrycrd-${TARGET}.zip" src/lbrycrdd src/lbrycrd-cli src/lbrycrd-tx; fi
|
||||
- if [[ "${TARGET}" == "linux" ]]; then zip -j "lbrycrd-${TARGET}.zip" src/lbrycrdd src/lbrycrd-cli src/lbrycrd-tx; fi
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
cmake_minimum_required(VERSION 3.7)
|
||||
project(lbrycrd_clion) # not expecting a full compile -- just something that allows clion syntax checking
|
||||
|
||||
set (CMAKE_CXX_STANDARD 98) # 03 is not supported by cmake, but this will soon be 11 (after upstream bitcoin merge)
|
||||
# I thought that setting the standard would disable the clang-tidy c++11 tips; nope.
|
||||
|
||||
set(BOOST_ROOT "build/boost" CACHE PATH "Boost library path")
|
||||
set(Boost_NO_SYSTEM_PATHS on CACHE BOOL "Do not search system for Boost")
|
||||
find_package(Boost REQUIRED COMPONENTS filesystem program_options thread chrono) # locale coming shortly
|
||||
|
||||
file(GLOB sources
|
||||
src/*.h src/*.cpp
|
||||
src/wallet/*.h src/wallet/*.cpp
|
||||
src/support/*.h src/support/*.cpp src/support/allocators/*.h
|
||||
src/script/*.h src/script/*.cpp
|
||||
src/rpc/*.h src/rpc/*.cpp
|
||||
src/primitives/*.h src/primitives/*.cpp
|
||||
src/policy/*.h src/policy/*.cpp
|
||||
src/crypto/*.h src/crypto/*.cpp
|
||||
src/consensus/*.h src/consensus/*.cpp
|
||||
src/compat/*.h src/compat/*.cpp
|
||||
)
|
||||
list(FILTER sources EXCLUDE REGEX "src/bitcoin*.cpp$")
|
||||
|
||||
include_directories(${Boost_INCLUDE_DIRS}
|
||||
build/bdb/include
|
||||
build/libevent/include
|
||||
build/openssl/include
|
||||
src/support/allocators
|
||||
src/support
|
||||
src/rpc
|
||||
src/policy
|
||||
src/wallet src/script
|
||||
src/leveldb/helpers/memenv
|
||||
src/leveldb/include
|
||||
src/config
|
||||
src/crypto
|
||||
src/compat
|
||||
src/obj
|
||||
src/univalue/include
|
||||
src/secp256k1/include
|
||||
src/
|
||||
)
|
||||
|
||||
add_compile_definitions(HAVE_CONFIG_H)
|
||||
|
||||
add_executable(lbrycrd-cli src/bitcoin-cli.cpp ${sources})
|
||||
add_executable(lbrycrd-tx src/bitcoin-tx.cpp ${sources})
|
||||
add_executable(lbrycrdd src/bitcoind.cpp ${sources})
|
||||
|
||||
file(GLOB tests src/test/*.cpp)
|
||||
foreach(test ${tests})
|
||||
get_filename_component(filename ${test} NAME_WE)
|
||||
add_executable(${filename} ${test} ${sources})
|
||||
target_include_directories(${filename} PRIVATE src/test)
|
||||
endforeach(test)
|
||||
@@ -1,5 +0,0 @@
|
||||
Building LBRYcrd
|
||||
|
||||
See doc/build-*.md for instructions on building bitcoind,
|
||||
the intended-for-services, no-graphical-interface, reference
|
||||
implementation of LBRYcrd.
|
||||
@@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015-2016 LBRY Inc
|
||||
Copyright (c) 2015-2018 LBRY Inc
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,
|
||||
|
||||
@@ -1,87 +1,95 @@
|
||||
LBRYcrd integration/staging tree
|
||||
=====================================
|
||||
# LBRYcrd - The LBRY blockchain
|
||||
|
||||
http://lbry.io
|
||||

|
||||
|
||||
What is LBRYcrd?
|
||||
----------------
|
||||
LBRYcrd uses a blockchain similar to bitcoin's to implement an index and payment system for content on the LBRY network. It is a fork of bitcoin core.
|
||||
|
||||
LBRYcrd is a fork of bitcoin core designed for use in the LBRY network.
|
||||
## Installation
|
||||
|
||||
LBRYcrd uses a blockchain similar to bitcoin's to implement a unique naming system in which the person who dedicates the largest amount of LBC to a name has control over that name.
|
||||
Latest binaries are available from https://github.com/lbryio/lbrycrd/releases. There is no installation procedure, the binaries run as is.
|
||||
|
||||
What is Bitcoin?
|
||||
----------------
|
||||
## Usage
|
||||
|
||||
Bitcoin is an experimental new digital currency that enables instant payments to
|
||||
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
|
||||
with no central authority: managing transactions and issuing money are carried
|
||||
out collectively by the network. Bitcoin Core is the name of open source
|
||||
software which enables the use of this currency.
|
||||
The `lbrycrdd` executable will start a LBRYcrd node and connect you to the LBRYcrd network. Use the `lbrycrd-cli` executable
|
||||
to interact with lbrycrdd through the command line. Help pages for both executable are available through
|
||||
the "--help" flag (e.g. `lbrycrd-cli --help`).
|
||||
|
||||
For more information, as well as an immediately useable, binary version of
|
||||
the Bitcoin Core software, see https://bitcoin.org/en/download, or read the
|
||||
[original whitepaper](https://bitcoincore.org/bitcoin.pdf).
|
||||
### Example Usage
|
||||
|
||||
License
|
||||
-------
|
||||
Run `./lbrycrdd -server -daemon` to start lbrycrdd in the background.
|
||||
|
||||
Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
|
||||
information or see https://opensource.org/licenses/MIT.
|
||||
Run `./lbrycrd-cli getinfo` to check for some basic informations about your LBRYcrd node.
|
||||
|
||||
Development Process
|
||||
-------------------
|
||||
Run `./lbrycrd-cli help` to get a list of all commands that you can run. To get help on specific commands run `./lbrycrd-cli [command_name] help`
|
||||
|
||||
### Data directory
|
||||
|
||||
Lbrycrdd will use the below default data directories
|
||||
|
||||
Windows < Vista: C:\Documents and Settings\Username\Application Data\lbrycrd
|
||||
|
||||
Windows >= Vista: C:\Users\Username\AppData\Roaming\lbrycrd
|
||||
|
||||
Mac: ~/Library/Application Support/lbrycrd
|
||||
|
||||
Unix: ~/.lbrycrd
|
||||
|
||||
The data directory contains various things such as your default wallet (wallet.dat), debug logs (debug.log), and blockchain data. You can optionally
|
||||
create a configuration file lbrycrd.conf in the default data directory which will be used by default when running lbrycrdd.
|
||||
For a list of configuration parameters run `./lbrycrdd --help`. Below is a sample lbrycrd.conf to enable JSON RPC server on lbrycrdd.
|
||||
|
||||
```rpcuser=lbry
|
||||
rpcpassword=xyz123456790
|
||||
daemon=1
|
||||
server=1
|
||||
txindex=1
|
||||
```
|
||||
|
||||
## Running from Source
|
||||
|
||||
Run `./reproducible_build.sh -c -t`. This will build the binaries and put them into the `./src` directory.
|
||||
|
||||
If you encounter any errors, please check `doc/build-*.md` for further instructions. If you're still stuck, [create an issue](https://github.com/lbryio/lbrycrd/issues/new) with the output of that command, your system info, and any other information you think might be helpful.
|
||||
|
||||
## Contributing
|
||||
|
||||
Contributions to this project are welcome, encouraged, and compensated. For more details, see [lbry.io/faq/contributing](https://lbry.io/faq/contributing)
|
||||
|
||||
The codebase is in C++03, C++11 is currently not supported but we will be migrating to it in the near future. Recommended GCC version is 4.8 or greater.
|
||||
We follow the same coding guidelines as documented by Bitcoin Core, see [here](/doc/developer-notes.md). To run an automated code formatting check, try:
|
||||
`git diff -U0 master -- '*.h' '*.cpp' | ./contrib/devtools/clang-format-diff.py -p1`. This will check any commits not on master for proper code formatting.
|
||||
We try to avoid altering parts of the code that is inherited from Bitcoin Core unless absolutely necessary. This will make it easier to merge changes from
|
||||
Bitcoin Core. If commits are expected not to be merged upstream (i.e. we broke up a commit from Bitcoin Core in order to use a single feature in it), the commit
|
||||
message must contain the string "NOT FOR UPSTREAM MERGE".
|
||||
|
||||
The `master` branch is regularly built and tested, but is not guaranteed to be
|
||||
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
|
||||
regularly to indicate new official, stable release versions of Bitcoin Core.
|
||||
|
||||
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
|
||||
|
||||
The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev)
|
||||
should be used to discuss complicated or controversial changes before working
|
||||
on a patch set.
|
||||
|
||||
Developer IRC can be found on Freenode at #bitcoin-core-dev.
|
||||
|
||||
Testing
|
||||
-------
|
||||
completely stable. [Releases](https://github.com/lbryio/lbrycrd/releases) are created
|
||||
regularly to indicate new official, stable release versions.
|
||||
|
||||
Testing and code review is the bottleneck for development; we get more pull
|
||||
requests than we can review and test on short notice. Please be patient and help out by testing
|
||||
other people's pull requests, and remember this is a security-critical project where any mistake might cost people
|
||||
lots of money.
|
||||
|
||||
### Automated Testing
|
||||
|
||||
Developers are strongly encouraged to write [unit tests](/doc/unit-tests.md) for new code, and to
|
||||
lots of money. Developers are strongly encouraged to write [unit tests](/doc/unit-tests.md) for new code, and to
|
||||
submit new unit tests for old code. Unit tests can be compiled and run
|
||||
(assuming they weren't disabled in configure) with: `make check`
|
||||
|
||||
There are also [regression and integration tests](/qa) of the RPC interface, written
|
||||
in Python, that are run automatically on the build server.
|
||||
These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py`
|
||||
The Travis CI system makes sure that every pull request is built, and that unit and sanity tests are automatically run.
|
||||
|
||||
The Travis CI system makes sure that every pull request is built for Windows
|
||||
and Linux, OS X, and that unit and sanity tests are automatically run.
|
||||
### Testnet
|
||||
|
||||
### Manual Quality Assurance (QA) Testing
|
||||
Testnet is maintained for testing purposes and can be accessed using the command `./lbrycrdd -testnet`. If you would like testnet credits, please contact kay@lbry.io or grin@lbry.io.
|
||||
|
||||
Changes should be tested by somebody other than the developer who wrote the
|
||||
code. This is especially important for large or high-risk changes. It is useful
|
||||
to add a test plan to the pull request description if testing the changes is
|
||||
not straightforward.
|
||||
## License
|
||||
|
||||
Translations
|
||||
------------
|
||||
This project is MIT licensed. For the full license, see [LICENSE](LICENSE).
|
||||
|
||||
Changes to translations as well as new translations can be submitted to
|
||||
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
|
||||
## Security
|
||||
|
||||
Translations are periodically pulled from Transifex and merged into the git repository. See the
|
||||
[translation process](doc/translation_process.md) for details on how this works.
|
||||
We take security seriously. Please contact security@lbry.io regarding any security issues.
|
||||
Our PGP key is [here](https://keybase.io/lbry/key.asc) if you need it.
|
||||
|
||||
## Contact
|
||||
|
||||
The primary contact for this project is [@kaykurokawa](https://github.com/kaykurokawa) (kay@lbry.io)
|
||||
|
||||
**Important**: We do not accept translation changes as GitHub pull requests because the next
|
||||
pull from Transifex would automatically overwrite them again.
|
||||
|
||||
Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators).
|
||||
@@ -2,9 +2,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
|
||||
AC_PREREQ([2.60])
|
||||
define(_CLIENT_VERSION_MAJOR, 0)
|
||||
define(_CLIENT_VERSION_MINOR, 12)
|
||||
define(_CLIENT_VERSION_REVISION, 99)
|
||||
define(_CLIENT_VERSION_REVISION, 2)
|
||||
define(_CLIENT_VERSION_BUILD, 0)
|
||||
define(_CLIENT_VERSION_IS_RELEASE, false)
|
||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||
define(_COPYRIGHT_YEAR, 2016)
|
||||
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
||||
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[LBRY]])
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import json
|
||||
import math
|
||||
import subprocess as sp
|
||||
import sys
|
||||
|
||||
|
||||
def main():
|
||||
if len(sys.argv) < 2: # pass in the CLI tool so that we don't have to replicate the cookie handling
|
||||
print('Missing required argument: <path to CLI tool> [CLI tool args...]', file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
cli_tool = sys.argv[1:]
|
||||
if '-regtest' not in cli_tool:
|
||||
cli_tool.append('-regtest')
|
||||
|
||||
result = sp.run(cli_tool + ['getblockchaininfo'], stdout=sp.PIPE, universal_newlines=True)
|
||||
info = json.loads(result.stdout)
|
||||
if not info or info['chain'] != 'lbrycrdreg':
|
||||
print('Unable to query block chain info; are you missing the RPC authentication parameters?', file=sys.stderr)
|
||||
sys.exit(2)
|
||||
|
||||
claimsintrie = json.load(sys.stdin)
|
||||
i = 0
|
||||
total_i = len(claimsintrie)
|
||||
print('Importing ' + str(total_i) + ' names. Progress:')
|
||||
for node in claimsintrie:
|
||||
if 'name' in node and 'claims' in node:
|
||||
prev_amount = sys.float_info.max
|
||||
for claim in node['claims']:
|
||||
amount = claim['amount'] if claim['amount'] < prev_amount else prev_amount / 2.0
|
||||
if amount <= 0.0:
|
||||
amount = 0.0000001
|
||||
prev_amount = amount
|
||||
|
||||
# ensure that we have enough LBC to cover that amount:
|
||||
result = sp.run(cli_tool + ['getbalance'], stdout=sp.PIPE, universal_newlines=True)
|
||||
balance = float(result.stdout)
|
||||
while balance < amount + 10.0: # assuming no fees greater than 10
|
||||
needed_blocks = math.ceil(amount + 100.0 - balance)
|
||||
sp.run(cli_tool + ['generate', str(needed_blocks)], stdout=sp.PIPE, universal_newlines=True)
|
||||
result = sp.run(cli_tool + ['getbalance'], stdout=sp.PIPE, universal_newlines=True)
|
||||
balance = float(result.stdout)
|
||||
|
||||
# insert the claim:
|
||||
name = node['name'].replace('\x00', '') # not dealing with encodings today
|
||||
value = claim['value'].replace('\x00', '')
|
||||
result = sp.run(cli_tool + ['claimname', name, value, "{:17.8f}".format(amount)],
|
||||
stdout=sp.PIPE, universal_newlines=True)
|
||||
txid = result.stdout
|
||||
if not txid or 'error' in txid:
|
||||
print('Failed to create claim named ' + node['name'] +
|
||||
'. Message: ' + txid + ', Amount: ' + str(amount), file=sys.stderr)
|
||||
sys.exit(3)
|
||||
i += 1
|
||||
workdone = i / total_i
|
||||
print('\r[{0:20s}] {1:.1f}%, {2}'.format('#' * int(workdone * 20), workdone * 100, i), end='', flush=True)
|
||||
|
||||
sp.run(cli_tool + ['generate', '20'], stdout=sp.PIPE, universal_newlines=True) # far enough for activation
|
||||
print()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,62 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import datetime
|
||||
import json
|
||||
import math
|
||||
import subprocess as sp
|
||||
import sys
|
||||
|
||||
|
||||
def main():
|
||||
if len(sys.argv) < 2: # pass in the CLI tool so that we don't have to replicate the cookie handling
|
||||
print('Missing required argument: <path to CLI tool> [CLI tool args...]', file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
cli_tool = sys.argv[1:]
|
||||
if '-regtest' not in cli_tool:
|
||||
cli_tool.append('-regtest')
|
||||
|
||||
result = sp.run(cli_tool + ['getblockchaininfo'], stdout=sp.PIPE, universal_newlines=True)
|
||||
info = json.loads(result.stdout)
|
||||
if not info or info['chain'] != 'lbrycrdreg':
|
||||
print('Unable to query block chain info; are you missing the RPC authentication parameters?', file=sys.stderr)
|
||||
sys.exit(2)
|
||||
|
||||
names = sys.stdin.readlines()
|
||||
i = 0
|
||||
total_i = len(names)
|
||||
print('Importing ' + str(total_i) + ' names. Progress:')
|
||||
# make sure we have neough LBC to start:
|
||||
amount = 1 / 400
|
||||
for name in names:
|
||||
|
||||
# as noted below, we roll the block forward for every 100 names
|
||||
if i % 100 == 0: # before adding any names ensure that we have enough mula to roll the block forward after
|
||||
result = sp.run(cli_tool + ['getbalance'], stdout=sp.PIPE, universal_newlines=True)
|
||||
balance = float(result.stdout)
|
||||
while balance < amount * 100.0 + 10.0: # assuming no fees greater than 10
|
||||
needed_blocks = math.ceil(amount * 100.0 + 10.0 - balance)
|
||||
sp.run(cli_tool + ['generate', str(needed_blocks)], stdout=sp.PIPE, universal_newlines=True)
|
||||
result = sp.run(cli_tool + ['getbalance'], stdout=sp.PIPE, universal_newlines=True)
|
||||
balance = float(result.stdout)
|
||||
|
||||
result = sp.run(cli_tool + ['claimname', name, str(datetime.datetime.utcnow().isoformat()),
|
||||
"{:17.8f}".format(amount)], stdout=sp.PIPE, universal_newlines=True)
|
||||
txid = result.stdout
|
||||
if not txid or 'error' in txid:
|
||||
print('Failed to create claim named ' + name +
|
||||
'. Message: ' + txid + ', Amount: ' + str(amount), file=sys.stderr)
|
||||
sys.exit(3)
|
||||
|
||||
i += 1
|
||||
if i % 100 == 0 or i == total_i: # time to flush
|
||||
sp.run(cli_tool + ['generate', '1'], stdout=sp.PIPE, universal_newlines=True)
|
||||
|
||||
workdone = i / total_i
|
||||
print('\r[{0:20s}] {1:.1f}%, {2}'.format('#' * int(workdone * 20), workdone * 100, i), end='', flush=True)
|
||||
|
||||
print()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -26,7 +26,7 @@ if ! $VALID; then
|
||||
exit 1
|
||||
fi
|
||||
if $VALID && $REVSIG; then
|
||||
echo "$INPUT" | gpg --trust-model always "$@" | grep "\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)" 2>/dev/null
|
||||
echo "$INPUT" | gpg --trust-model always "$@" | grep "^\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)" 2>/dev/null
|
||||
echo "$GOODREVSIG"
|
||||
else
|
||||
echo "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
|
||||
|
||||
@@ -2,6 +2,16 @@ Mac OS X Build Instructions and Notes
|
||||
====================================
|
||||
This guide will show you how to build Bitcoin Core for OS X.
|
||||
|
||||
|
||||
TRY THIS FIRST
|
||||
-----
|
||||
|
||||
Run `./reproducible_build.sh -c -t` in the Terminal. This should build the binaries and put them into the `./src` directory.
|
||||
|
||||
If that errors, please report the issue. See below for other ways of building the binaries.
|
||||
|
||||
---
|
||||
|
||||
Notes
|
||||
-----
|
||||
|
||||
|
||||
@@ -1,39 +1,116 @@
|
||||
Developer Notes
|
||||
===============
|
||||
|
||||
<!-- markdown-toc start -->
|
||||
**Table of Contents**
|
||||
|
||||
- [Developer Notes](#developer-notes)
|
||||
- [Coding Style](#coding-style)
|
||||
- [Doxygen comments](#doxygen-comments)
|
||||
- [Development tips and tricks](#development-tips-and-tricks)
|
||||
- [Compiling for debugging](#compiling-for-debugging)
|
||||
- [Compiling for gprof profiling](#compiling-for-gprof-profiling)
|
||||
- [debug.log](#debuglog)
|
||||
- [Testnet and Regtest modes](#testnet-and-regtest-modes)
|
||||
- [DEBUG_LOCKORDER](#debug_lockorder)
|
||||
- [Valgrind suppressions file](#valgrind-suppressions-file)
|
||||
- [Compiling for test coverage](#compiling-for-test-coverage)
|
||||
- [Locking/mutex usage notes](#lockingmutex-usage-notes)
|
||||
- [Threads](#threads)
|
||||
- [Ignoring IDE/editor files](#ignoring-ideeditor-files)
|
||||
- [Development guidelines](#development-guidelines)
|
||||
- [General Bitcoin Core](#general-bitcoin-core)
|
||||
- [Wallet](#wallet)
|
||||
- [General C++](#general-c)
|
||||
- [C++ data structures](#c-data-structures)
|
||||
- [Strings and formatting](#strings-and-formatting)
|
||||
- [Variable names](#variable-names)
|
||||
- [Threads and synchronization](#threads-and-synchronization)
|
||||
- [Source code organization](#source-code-organization)
|
||||
- [GUI](#gui)
|
||||
- [Subtrees](#subtrees)
|
||||
- [Git and GitHub tips](#git-and-github-tips)
|
||||
- [Scripted diffs](#scripted-diffs)
|
||||
- [RPC interface guidelines](#rpc-interface-guidelines)
|
||||
|
||||
<!-- markdown-toc end -->
|
||||
|
||||
Coding Style
|
||||
---------------
|
||||
|
||||
Various coding styles have been used during the history of the codebase,
|
||||
and the result is not very consistent. However, we're now trying to converge to
|
||||
a single style, so please use it in new code. Old code will be converted
|
||||
gradually.
|
||||
- Basic rules specified in src/.clang-format. Use a recent clang-format-3.5 to format automatically.
|
||||
- Braces on new lines for namespaces, classes, functions, methods.
|
||||
a single style, which is specified below. When writing patches, favor the new
|
||||
style over attempting to mimic the surrounding style, except for move-only
|
||||
commits.
|
||||
|
||||
Do not submit patches solely to modify the style of existing code.
|
||||
|
||||
- **Indentation and whitespace rules** as specified in
|
||||
[src/.clang-format](/src/.clang-format). You can use the provided
|
||||
[clang-format-diff script](/contrib/devtools/README.md#clang-format-diffpy)
|
||||
tool to clean up patches automatically before submission.
|
||||
- Braces on new lines for classes, functions, methods.
|
||||
- Braces on the same line for everything else.
|
||||
- 4 space indentation (no tabs) for every block except namespaces.
|
||||
- No indentation for public/protected/private or for namespaces.
|
||||
- No indentation for `public`/`protected`/`private` or for `namespace`.
|
||||
- No extra spaces inside parenthesis; don't do ( this )
|
||||
- No space after function names; one space after if, for and while.
|
||||
- No space after function names; one space after `if`, `for` and `while`.
|
||||
- If an `if` only has a single-statement `then`-clause, it can appear
|
||||
on the same line as the `if`, without braces. In every other case,
|
||||
braces are required, and the `then` and `else` clauses must appear
|
||||
correctly indented on a new line.
|
||||
|
||||
- **Symbol naming conventions**. These are preferred in new code, but are not
|
||||
required when doing so would need changes to significant pieces of existing
|
||||
code.
|
||||
- Variable and namespace names are all lowercase, and may use `_` to
|
||||
separate words (snake_case).
|
||||
- Class member variables have a `m_` prefix.
|
||||
- Global variables have a `g_` prefix.
|
||||
- Constant names are all uppercase, and use `_` to separate words.
|
||||
- Class names, function names and method names are UpperCamelCase
|
||||
(PascalCase). Do not prefix class names with `C`.
|
||||
- Test suite naming convention: The Boost test suite in file
|
||||
`src/test/foo_tests.cpp` should be named `foo_tests`. Test suite names
|
||||
must be unique.
|
||||
|
||||
- **Miscellaneous**
|
||||
- `++i` is preferred over `i++`.
|
||||
- `nullptr` is preferred over `NULL` or `(void*)0`.
|
||||
- `static_assert` is preferred over `assert` where possible. Generally; compile-time checking is preferred over run-time checking.
|
||||
- `enum class` is preferred over `enum` where possible. Scoped enumerations avoid two potential pitfalls/problems with traditional C++ enumerations: implicit conversions to int, and name clashes due to enumerators being exported to the surrounding scope.
|
||||
|
||||
Block style example:
|
||||
```c++
|
||||
namespace foo
|
||||
{
|
||||
int g_count = 0;
|
||||
|
||||
namespace foo {
|
||||
class Class
|
||||
{
|
||||
bool Function(char* psz, int n)
|
||||
std::string m_name;
|
||||
|
||||
public:
|
||||
bool Function(const std::string& s, int n)
|
||||
{
|
||||
// Comment summarising what this section of code does
|
||||
for (int i = 0; i < n; i++) {
|
||||
for (int i = 0; i < n; ++i) {
|
||||
int total_sum = 0;
|
||||
// When something fails, return early
|
||||
if (!Something())
|
||||
return false;
|
||||
if (!Something()) return false;
|
||||
...
|
||||
if (SomethingElse(i)) {
|
||||
total_sum += ComputeSomething(g_count);
|
||||
} else {
|
||||
DoSomething(m_name, total_sum);
|
||||
}
|
||||
}
|
||||
|
||||
// Success return is usually at the end
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace foo
|
||||
```
|
||||
|
||||
Doxygen comments
|
||||
@@ -95,57 +172,146 @@ Not OK (used plenty in the current source, but not picked up):
|
||||
A full list of comment syntaxes picked up by doxygen can be found at http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html,
|
||||
but if possible use one of the above styles.
|
||||
|
||||
Documentation can be generated with `make docs` and cleaned up with `make clean-docs`.
|
||||
|
||||
Development tips and tricks
|
||||
---------------------------
|
||||
|
||||
**compiling for debugging**
|
||||
### Compiling for debugging
|
||||
|
||||
Run configure with the --enable-debug option, then make. Or run configure with
|
||||
CXXFLAGS="-g -ggdb -O0" or whatever debug flags you need.
|
||||
Run configure with `--enable-debug` to add additional compiler flags that
|
||||
produce better debugging builds.
|
||||
|
||||
**debug.log**
|
||||
### Compiling for gprof profiling
|
||||
|
||||
Run configure with the `--enable-gprof` option, then make.
|
||||
|
||||
### debug.log
|
||||
|
||||
If the code is behaving strangely, take a look in the debug.log file in the data directory;
|
||||
error and debugging messages are written there.
|
||||
|
||||
The -debug=... command-line option controls debugging; running with just -debug or -debug=1 will turn
|
||||
The `-debug=...` command-line option controls debugging; running with just `-debug` or `-debug=1` will turn
|
||||
on all categories (and give you a very large debug.log file).
|
||||
|
||||
The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt
|
||||
The Qt code routes `qDebug()` output to debug.log under category "qt": run with `-debug=qt`
|
||||
to see it.
|
||||
|
||||
**testnet and regtest modes**
|
||||
### Testnet and Regtest modes
|
||||
|
||||
Run with the -testnet option to run with "play bitcoins" on the test network, if you
|
||||
Run with the `-testnet` option to run with "play bitcoins" on the test network, if you
|
||||
are testing multi-machine code that needs to operate across the internet.
|
||||
|
||||
If you are testing something that can run on one machine, run with the -regtest option.
|
||||
In regression test mode, blocks can be created on-demand; see qa/rpc-tests/ for tests
|
||||
that run in -regtest mode.
|
||||
If you are testing something that can run on one machine, run with the `-regtest` option.
|
||||
In regression test mode, blocks can be created on-demand; see [test/functional/](/test/functional) for tests
|
||||
that run in `-regtest` mode.
|
||||
|
||||
**DEBUG_LOCKORDER**
|
||||
### DEBUG_LOCKORDER
|
||||
|
||||
Bitcoin Core is a multithreaded application, and deadlocks or other multithreading bugs
|
||||
can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure
|
||||
CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of which locks
|
||||
are held, and adds warnings to the debug.log file if inconsistencies are detected.
|
||||
Bitcoin Core is a multi-threaded application, and deadlocks or other
|
||||
multi-threading bugs can be very difficult to track down. The `--enable-debug`
|
||||
configure option adds `-DDEBUG_LOCKORDER` to the compiler flags. This inserts
|
||||
run-time checks to keep track of which locks are held, and adds warnings to the
|
||||
debug.log file if inconsistencies are detected.
|
||||
|
||||
### Valgrind suppressions file
|
||||
|
||||
Valgrind is a programming tool for memory debugging, memory leak detection, and
|
||||
profiling. The repo contains a Valgrind suppressions file
|
||||
([`valgrind.supp`](https://github.com/bitcoin/bitcoin/blob/master/contrib/valgrind.supp))
|
||||
which includes known Valgrind warnings in our dependencies that cannot be fixed
|
||||
in-tree. Example use:
|
||||
|
||||
```shell
|
||||
$ valgrind --suppressions=contrib/valgrind.supp src/test/test_bitcoin
|
||||
$ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \
|
||||
--show-leak-kinds=all src/test/test_bitcoin --log_level=test_suite
|
||||
$ valgrind -v --leak-check=full src/bitcoind -printtoconsole
|
||||
```
|
||||
|
||||
### Compiling for test coverage
|
||||
|
||||
LCOV can be used to generate a test coverage report based upon `make check`
|
||||
execution. LCOV must be installed on your system (e.g. the `lcov` package
|
||||
on Debian/Ubuntu).
|
||||
|
||||
To enable LCOV report generation during test runs:
|
||||
|
||||
```shell
|
||||
./configure --enable-lcov
|
||||
make
|
||||
make cov
|
||||
|
||||
# A coverage report will now be accessible at `./test_bitcoin.coverage/index.html`.
|
||||
```
|
||||
|
||||
**Sanitizers**
|
||||
|
||||
Bitcoin can be compiled with various "sanitizers" enabled, which add
|
||||
instrumentation for issues regarding things like memory safety, thread race
|
||||
conditions, or undefined behavior. This is controlled with the
|
||||
`--with-sanitizers` configure flag, which should be a comma separated list of
|
||||
sanitizers to enable. The sanitizer list should correspond to supported
|
||||
`-fsanitize=` options in your compiler. These sanitizers have runtime overhead,
|
||||
so they are most useful when testing changes or producing debugging builds.
|
||||
|
||||
Some examples:
|
||||
|
||||
```bash
|
||||
# Enable both the address sanitizer and the undefined behavior sanitizer
|
||||
./configure --with-sanitizers=address,undefined
|
||||
|
||||
# Enable the thread sanitizer
|
||||
./configure --with-sanitizers=thread
|
||||
```
|
||||
|
||||
If you are compiling with GCC you will typically need to install corresponding
|
||||
"san" libraries to actually compile with these flags, e.g. libasan for the
|
||||
address sanitizer, libtsan for the thread sanitizer, and libubsan for the
|
||||
undefined sanitizer. If you are missing required libraries, the configure script
|
||||
will fail with a linker error when testing the sanitizer flags.
|
||||
|
||||
The test suite should pass cleanly with the `thread` and `undefined` sanitizers,
|
||||
but there are a number of known problems when using the `address` sanitizer. The
|
||||
address sanitizer is known to fail in
|
||||
[sha256_sse4::Transform](/src/crypto/sha256_sse4.cpp) which makes it unusable
|
||||
unless you also use `--disable-asm` when running configure. We would like to fix
|
||||
sanitizer issues, so please send pull requests if you can fix any errors found
|
||||
by the address sanitizer (or any other sanitizer).
|
||||
|
||||
Not all sanitizer options can be enabled at the same time, e.g. trying to build
|
||||
with `--with-sanitizers=address,thread` will fail in the configure script as
|
||||
these sanitizers are mutually incompatible. Refer to your compiler manual to
|
||||
learn more about these options and which sanitizers are supported by your
|
||||
compiler.
|
||||
|
||||
Additional resources:
|
||||
|
||||
* [AddressSanitizer](https://clang.llvm.org/docs/AddressSanitizer.html)
|
||||
* [LeakSanitizer](https://clang.llvm.org/docs/LeakSanitizer.html)
|
||||
* [MemorySanitizer](https://clang.llvm.org/docs/MemorySanitizer.html)
|
||||
* [ThreadSanitizer](https://clang.llvm.org/docs/ThreadSanitizer.html)
|
||||
* [UndefinedBehaviorSanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html)
|
||||
* [GCC Instrumentation Options](https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html)
|
||||
* [Google Sanitizers Wiki](https://github.com/google/sanitizers/wiki)
|
||||
* [Issue #12691: Enable -fsanitize flags in Travis](https://github.com/bitcoin/bitcoin/issues/12691)
|
||||
|
||||
Locking/mutex usage notes
|
||||
-------------------------
|
||||
|
||||
The code is multi-threaded, and uses mutexes and the
|
||||
LOCK/TRY_LOCK macros to protect data structures.
|
||||
`LOCK` and `TRY_LOCK` macros to protect data structures.
|
||||
|
||||
Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main
|
||||
and then cs_wallet, while thread 2 locks them in the opposite order:
|
||||
result, deadlock as each waits for the other to release its lock) are
|
||||
a problem. Compile with -DDEBUG_LOCKORDER to get lock order
|
||||
inconsistencies reported in the debug.log file.
|
||||
Deadlocks due to inconsistent lock ordering (thread 1 locks `cs_main` and then
|
||||
`cs_wallet`, while thread 2 locks them in the opposite order: result, deadlock
|
||||
as each waits for the other to release its lock) are a problem. Compile with
|
||||
`-DDEBUG_LOCKORDER` (or use `--enable-debug`) to get lock order inconsistencies
|
||||
reported in the debug.log file.
|
||||
|
||||
Re-architecting the core code so there are better-defined interfaces
|
||||
between the various components is a goal, with any necessary locking
|
||||
done by the components (e.g. see the self-contained CKeyStore class
|
||||
and its cs_KeyStore lock for example).
|
||||
done by the components (e.g. see the self-contained `CBasicKeyStore` class
|
||||
and its `cs_KeyStore` lock for example).
|
||||
|
||||
Threads
|
||||
-------
|
||||
@@ -170,12 +336,8 @@ Threads
|
||||
|
||||
- DumpAddresses : Dumps IP addresses of nodes to peers.dat.
|
||||
|
||||
- ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
|
||||
|
||||
- ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
|
||||
|
||||
- BitcoinMiner : Generates bitcoins (if wallet is enabled).
|
||||
|
||||
- Shutdown : Does an orderly shutdown of everything.
|
||||
|
||||
Ignoring IDE/editor files
|
||||
@@ -229,9 +391,9 @@ General Bitcoin Core
|
||||
- *Rationale*: Makes sure that they pass thorough testing, and that the tester will keep passing
|
||||
on the master branch. Otherwise all new pull requests will start failing the tests, resulting in
|
||||
confusion and mayhem
|
||||
|
||||
|
||||
- *Explanation*: If the test suite is to be updated for a change, this has to
|
||||
be done first
|
||||
be done first
|
||||
|
||||
Wallet
|
||||
-------
|
||||
@@ -240,7 +402,7 @@ Wallet
|
||||
|
||||
- *Rationale*: In RPC code that conditionally uses the wallet (such as
|
||||
`validateaddress`) it is easy to forget that global pointer `pwalletMain`
|
||||
can be NULL. See `qa/rpc-tests/disablewallet.py` for functional tests
|
||||
can be nullptr. See `test/functional/disablewallet.py` for functional tests
|
||||
exercising the API with `-disablewallet`
|
||||
|
||||
- Include `db_cxx.h` (BerkeleyDB header) only when `ENABLE_WALLET` is set
|
||||
@@ -252,7 +414,7 @@ General C++
|
||||
|
||||
- Assertions should not have side-effects
|
||||
|
||||
- *Rationale*: Even though the source code is set to to refuse to compile
|
||||
- *Rationale*: Even though the source code is set to refuse to compile
|
||||
with assertions disabled, having side-effects in assertions is unexpected and
|
||||
makes the code harder to understand
|
||||
|
||||
@@ -263,7 +425,7 @@ General C++
|
||||
the `.h` to the `.cpp` should not result in build errors
|
||||
|
||||
- Use the RAII (Resource Acquisition Is Initialization) paradigm where possible. For example by using
|
||||
`scoped_pointer` for allocations in a function.
|
||||
`unique_ptr` for allocations in a function.
|
||||
|
||||
- *Rationale*: This avoids memory and resource leaks, and ensures exception safety
|
||||
|
||||
@@ -282,19 +444,33 @@ C++ data structures
|
||||
- *Rationale*: Behavior is undefined. In C++ parlor this means "may reformat
|
||||
the universe", in practice this has resulted in at least one hard-to-debug crash bug
|
||||
|
||||
- Watch out for vector out-of-bounds exceptions. `&vch[0]` is illegal for an
|
||||
empty vector, `&vch[vch.size()]` is always illegal. Use `begin_ptr(vch)` and
|
||||
`end_ptr(vch)` to get the begin and end pointer instead (defined in
|
||||
`serialize.h`)
|
||||
- Watch out for out-of-bounds vector access. `&vch[vch.size()]` is illegal,
|
||||
including `&vch[0]` for an empty vector. Use `vch.data()` and `vch.data() +
|
||||
vch.size()` instead.
|
||||
|
||||
- Vector bounds checking is only enabled in debug mode. Do not rely on it
|
||||
|
||||
- Make sure that constructors initialize all fields. If this is skipped for a
|
||||
good reason (i.e., optimization on the critical path), add an explicit
|
||||
comment about this
|
||||
- Initialize all non-static class members where they are defined.
|
||||
If this is skipped for a good reason (i.e., optimization on the critical
|
||||
path), add an explicit comment about this
|
||||
|
||||
- *Rationale*: Ensure determinism by avoiding accidental use of uninitialized
|
||||
values. Also, static analyzers balk about this.
|
||||
Initializing the members in the declaration makes it easy to
|
||||
spot uninitialized ones.
|
||||
|
||||
```cpp
|
||||
class A
|
||||
{
|
||||
uint32_t m_count{0};
|
||||
}
|
||||
```
|
||||
|
||||
- By default, declare single-argument constructors `explicit`.
|
||||
|
||||
- *Rationale*: This is a precaution to avoid unintended conversions that might
|
||||
arise when single-argument constructors are used as implicit conversion
|
||||
functions.
|
||||
|
||||
- Use explicitly signed or unsigned `char`s, or even better `uint8_t` and
|
||||
`int8_t`. Do not use bare `char` unless it is to pass to a third-party API.
|
||||
@@ -321,14 +497,67 @@ Strings and formatting
|
||||
buffer overflows and surprises with `\0` characters. Also some C string manipulations
|
||||
tend to act differently depending on platform, or even the user locale
|
||||
|
||||
- Use `ParseInt32`, `ParseInt64`, `ParseDouble` from `utilstrencodings.h` for number parsing
|
||||
- Use `ParseInt32`, `ParseInt64`, `ParseUInt32`, `ParseUInt64`, `ParseDouble` from `utilstrencodings.h` for number parsing
|
||||
|
||||
- *Rationale*: These functions do overflow checking, and avoid pesky locale issues
|
||||
- *Rationale*: These functions do overflow checking, and avoid pesky locale issues.
|
||||
|
||||
- Avoid using locale dependent functions if possible. You can use the provided
|
||||
[`lint-locale-dependence.sh`](/contrib/devtools/lint-locale-dependence.sh)
|
||||
to check for accidental use of locale dependent functions.
|
||||
|
||||
- *Rationale*: Unnecessary locale dependence can cause bugs that are very tricky to isolate and fix.
|
||||
|
||||
- These functions are known to be locale dependent:
|
||||
`alphasort`, `asctime`, `asprintf`, `atof`, `atoi`, `atol`, `atoll`, `atoq`,
|
||||
`btowc`, `ctime`, `dprintf`, `fgetwc`, `fgetws`, `fprintf`, `fputwc`,
|
||||
`fputws`, `fscanf`, `fwprintf`, `getdate`, `getwc`, `getwchar`, `isalnum`,
|
||||
`isalpha`, `isblank`, `iscntrl`, `isdigit`, `isgraph`, `islower`, `isprint`,
|
||||
`ispunct`, `isspace`, `isupper`, `iswalnum`, `iswalpha`, `iswblank`,
|
||||
`iswcntrl`, `iswctype`, `iswdigit`, `iswgraph`, `iswlower`, `iswprint`,
|
||||
`iswpunct`, `iswspace`, `iswupper`, `iswxdigit`, `isxdigit`, `mblen`,
|
||||
`mbrlen`, `mbrtowc`, `mbsinit`, `mbsnrtowcs`, `mbsrtowcs`, `mbstowcs`,
|
||||
`mbtowc`, `mktime`, `putwc`, `putwchar`, `scanf`, `snprintf`, `sprintf`,
|
||||
`sscanf`, `stoi`, `stol`, `stoll`, `strcasecmp`, `strcasestr`, `strcoll`,
|
||||
`strfmon`, `strftime`, `strncasecmp`, `strptime`, `strtod`, `strtof`,
|
||||
`strtoimax`, `strtol`, `strtold`, `strtoll`, `strtoq`, `strtoul`,
|
||||
`strtoull`, `strtoumax`, `strtouq`, `strxfrm`, `swprintf`, `tolower`,
|
||||
`toupper`, `towctrans`, `towlower`, `towupper`, `ungetwc`, `vasprintf`,
|
||||
`vdprintf`, `versionsort`, `vfprintf`, `vfscanf`, `vfwprintf`, `vprintf`,
|
||||
`vscanf`, `vsnprintf`, `vsprintf`, `vsscanf`, `vswprintf`, `vwprintf`,
|
||||
`wcrtomb`, `wcscasecmp`, `wcscoll`, `wcsftime`, `wcsncasecmp`, `wcsnrtombs`,
|
||||
`wcsrtombs`, `wcstod`, `wcstof`, `wcstoimax`, `wcstol`, `wcstold`,
|
||||
`wcstoll`, `wcstombs`, `wcstoul`, `wcstoull`, `wcstoumax`, `wcswidth`,
|
||||
`wcsxfrm`, `wctob`, `wctomb`, `wctrans`, `wctype`, `wcwidth`, `wprintf`
|
||||
|
||||
- For `strprintf`, `LogPrint`, `LogPrintf` formatting characters don't need size specifiers
|
||||
|
||||
- *Rationale*: Bitcoin Core uses tinyformat, which is type safe. Leave them out to avoid confusion
|
||||
|
||||
Variable names
|
||||
--------------
|
||||
|
||||
Although the shadowing warning (`-Wshadow`) is not enabled by default (it prevents issues rising
|
||||
from using a different variable with the same name),
|
||||
please name variables so that their names do not shadow variables defined in the source code.
|
||||
|
||||
E.g. in member initializers, prepend `_` to the argument name shadowing the
|
||||
member name:
|
||||
|
||||
```c++
|
||||
class AddressBookPage
|
||||
{
|
||||
Mode m_mode;
|
||||
}
|
||||
|
||||
AddressBookPage::AddressBookPage(Mode _mode) :
|
||||
m_mode(_mode)
|
||||
...
|
||||
```
|
||||
|
||||
When using nested cycles, do not name the inner cycle variable the same as in
|
||||
upper cycle etc.
|
||||
|
||||
|
||||
Threads and synchronization
|
||||
----------------------------
|
||||
|
||||
@@ -366,11 +595,57 @@ Source code organization
|
||||
|
||||
- *Rationale*: Shorter and simpler header files are easier to read, and reduce compile time
|
||||
|
||||
- Use only the lowercase alphanumerics (`a-z0-9`), underscore (`_`) and hyphen (`-`) in source code filenames.
|
||||
|
||||
- *Rationale*: `grep`:ing and auto-completing filenames is easier when using a consistent
|
||||
naming pattern. Potential problems when building on case-insensitive filesystems are
|
||||
avoided when using only lowercase characters in source code filenames.
|
||||
|
||||
- Every `.cpp` and `.h` file should `#include` every header file it directly uses classes, functions or other
|
||||
definitions from, even if those headers are already included indirectly through other headers.
|
||||
|
||||
- *Rationale*: Excluding headers because they are already indirectly included results in compilation
|
||||
failures when those indirect dependencies change. Furthermore, it obscures what the real code
|
||||
dependencies are.
|
||||
|
||||
- Don't import anything into the global namespace (`using namespace ...`). Use
|
||||
fully specified types such as `std::string`.
|
||||
|
||||
- *Rationale*: Avoids symbol conflicts
|
||||
|
||||
- Terminate namespaces with a comment (`// namespace mynamespace`). The comment
|
||||
should be placed on the same line as the brace closing the namespace, e.g.
|
||||
|
||||
```c++
|
||||
namespace mynamespace {
|
||||
...
|
||||
} // namespace mynamespace
|
||||
|
||||
namespace {
|
||||
...
|
||||
} // namespace
|
||||
```
|
||||
|
||||
- *Rationale*: Avoids confusion about the namespace context
|
||||
|
||||
- Use `#include <primitives/transaction.h>` bracket syntax instead of
|
||||
`#include "primitives/transactions.h"` quote syntax.
|
||||
|
||||
- *Rationale*: Bracket syntax is less ambiguous because the preprocessor
|
||||
searches a fixed list of include directories without taking location of the
|
||||
source file into account. This allows quoted includes to stand out more when
|
||||
the location of the source file actually is relevant.
|
||||
|
||||
- Use include guards to avoid the problem of double inclusion. The header file
|
||||
`foo/bar.h` should use the include guard identifier `BITCOIN_FOO_BAR_H`, e.g.
|
||||
|
||||
```c++
|
||||
#ifndef BITCOIN_FOO_BAR_H
|
||||
#define BITCOIN_FOO_BAR_H
|
||||
...
|
||||
#endif // BITCOIN_FOO_BAR_H
|
||||
```
|
||||
|
||||
GUI
|
||||
-----
|
||||
|
||||
@@ -379,3 +654,265 @@ GUI
|
||||
- *Rationale*: Model classes pass through events and data from the core, they
|
||||
should not interact with the user. That's where View classes come in. The converse also
|
||||
holds: try to not directly access core data structures from Views.
|
||||
|
||||
- Avoid adding slow or blocking code in the GUI thread. In particular do not
|
||||
add new `interfaces::Node` and `interfaces::Wallet` method calls, even if they
|
||||
may be fast now, in case they are changed to lock or communicate across
|
||||
processes in the future.
|
||||
|
||||
Prefer to offload work from the GUI thread to worker threads (see
|
||||
`RPCExecutor` in console code as an example) or take other steps (see
|
||||
https://doc.qt.io/archives/qq/qq27-responsive-guis.html) to keep the GUI
|
||||
responsive.
|
||||
|
||||
- *Rationale*: Blocking the GUI thread can increase latency, and lead to
|
||||
hangs and deadlocks.
|
||||
|
||||
Subtrees
|
||||
----------
|
||||
|
||||
Several parts of the repository are subtrees of software maintained elsewhere.
|
||||
|
||||
Some of these are maintained by active developers of Bitcoin Core, in which case changes should probably go
|
||||
directly upstream without being PRed directly against the project. They will be merged back in the next
|
||||
subtree merge.
|
||||
|
||||
Others are external projects without a tight relationship with our project. Changes to these should also
|
||||
be sent upstream but bugfixes may also be prudent to PR against Bitcoin Core so that they can be integrated
|
||||
quickly. Cosmetic changes should be purely taken upstream.
|
||||
|
||||
There is a tool in `test/lint/git-subtree-check.sh` to check a subtree directory for consistency with
|
||||
its upstream repository.
|
||||
|
||||
Current subtrees include:
|
||||
|
||||
- src/leveldb
|
||||
- Upstream at https://github.com/google/leveldb ; Maintained by Google, but
|
||||
open important PRs to Core to avoid delay.
|
||||
- **Note**: Follow the instructions in [Upgrading LevelDB](#upgrading-leveldb) when
|
||||
merging upstream changes to the leveldb subtree.
|
||||
|
||||
- src/libsecp256k1
|
||||
- Upstream at https://github.com/bitcoin-core/secp256k1/ ; actively maintaned by Core contributors.
|
||||
|
||||
- src/crypto/ctaes
|
||||
- Upstream at https://github.com/bitcoin-core/ctaes ; actively maintained by Core contributors.
|
||||
|
||||
- src/univalue
|
||||
- Upstream at https://github.com/jgarzik/univalue ; report important PRs to Core to avoid delay.
|
||||
|
||||
Upgrading LevelDB
|
||||
---------------------
|
||||
|
||||
Extra care must be taken when upgrading LevelDB. This section explains issues
|
||||
you must be aware of.
|
||||
|
||||
### File Descriptor Counts
|
||||
|
||||
In most configurations we use the default LevelDB value for `max_open_files`,
|
||||
which is 1000 at the time of this writing. If LevelDB actually uses this many
|
||||
file descriptors it will cause problems with Bitcoin's `select()` loop, because
|
||||
it may cause new sockets to be created where the fd value is >= 1024. For this
|
||||
reason, on 64-bit Unix systems we rely on an internal LevelDB optimization that
|
||||
uses `mmap()` + `close()` to open table files without actually retaining
|
||||
references to the table file descriptors. If you are upgrading LevelDB, you must
|
||||
sanity check the changes to make sure that this assumption remains valid.
|
||||
|
||||
In addition to reviewing the upstream changes in `env_posix.cc`, you can use `lsof` to
|
||||
check this. For example, on Linux this command will show open `.ldb` file counts:
|
||||
|
||||
```bash
|
||||
$ lsof -p $(pidof bitcoind) |\
|
||||
awk 'BEGIN { fd=0; mem=0; } /ldb$/ { if ($4 == "mem") mem++; else fd++ } END { printf "mem = %s, fd = %s\n", mem, fd}'
|
||||
mem = 119, fd = 0
|
||||
```
|
||||
|
||||
The `mem` value shows how many files are mmap'ed, and the `fd` value shows you
|
||||
many file descriptors these files are using. You should check that `fd` is a
|
||||
small number (usually 0 on 64-bit hosts).
|
||||
|
||||
See the notes in the `SetMaxOpenFiles()` function in `dbwrapper.cc` for more
|
||||
details.
|
||||
|
||||
### Consensus Compatibility
|
||||
|
||||
It is possible for LevelDB changes to inadvertently change consensus
|
||||
compatibility between nodes. This happened in Bitcoin 0.8 (when LevelDB was
|
||||
first introduced). When upgrading LevelDB you should review the upstream changes
|
||||
to check for issues affecting consensus compatibility.
|
||||
|
||||
For example, if LevelDB had a bug that accidentally prevented a key from being
|
||||
returned in an edge case, and that bug was fixed upstream, the bug "fix" would
|
||||
be an incompatible consensus change. In this situation the correct behavior
|
||||
would be to revert the upstream fix before applying the updates to Bitcoin's
|
||||
copy of LevelDB. In general you should be wary of any upstream changes affecting
|
||||
what data is returned from LevelDB queries.
|
||||
|
||||
Git and GitHub tips
|
||||
---------------------
|
||||
|
||||
- For resolving merge/rebase conflicts, it can be useful to enable diff3 style using
|
||||
`git config merge.conflictstyle diff3`. Instead of
|
||||
|
||||
<<<
|
||||
yours
|
||||
===
|
||||
theirs
|
||||
>>>
|
||||
|
||||
you will see
|
||||
|
||||
<<<
|
||||
yours
|
||||
|||
|
||||
original
|
||||
===
|
||||
theirs
|
||||
>>>
|
||||
|
||||
This may make it much clearer what caused the conflict. In this style, you can often just look
|
||||
at what changed between *original* and *theirs*, and mechanically apply that to *yours* (or the other way around).
|
||||
|
||||
- When reviewing patches which change indentation in C++ files, use `git diff -w` and `git show -w`. This makes
|
||||
the diff algorithm ignore whitespace changes. This feature is also available on github.com, by adding `?w=1`
|
||||
at the end of any URL which shows a diff.
|
||||
|
||||
- When reviewing patches that change symbol names in many places, use `git diff --word-diff`. This will instead
|
||||
of showing the patch as deleted/added *lines*, show deleted/added *words*.
|
||||
|
||||
- When reviewing patches that move code around, try using
|
||||
`git diff --patience commit~:old/file.cpp commit:new/file/name.cpp`, and ignoring everything except the
|
||||
moved body of code which should show up as neither `+` or `-` lines. In case it was not a pure move, this may
|
||||
even work when combined with the `-w` or `--word-diff` options described above.
|
||||
|
||||
- When looking at other's pull requests, it may make sense to add the following section to your `.git/config`
|
||||
file:
|
||||
|
||||
[remote "upstream-pull"]
|
||||
fetch = +refs/pull/*:refs/remotes/upstream-pull/*
|
||||
url = git@github.com:bitcoin/bitcoin.git
|
||||
|
||||
This will add an `upstream-pull` remote to your git repository, which can be fetched using `git fetch --all`
|
||||
or `git fetch upstream-pull`. Afterwards, you can use `upstream-pull/NUMBER/head` in arguments to `git show`,
|
||||
`git checkout` and anywhere a commit id would be acceptable to see the changes from pull request NUMBER.
|
||||
|
||||
Scripted diffs
|
||||
--------------
|
||||
|
||||
For reformatting and refactoring commits where the changes can be easily automated using a bash script, we use
|
||||
scripted-diff commits. The bash script is included in the commit message and our Travis CI job checks that
|
||||
the result of the script is identical to the commit. This aids reviewers since they can verify that the script
|
||||
does exactly what it's supposed to do. It is also helpful for rebasing (since the same script can just be re-run
|
||||
on the new master commit).
|
||||
|
||||
To create a scripted-diff:
|
||||
|
||||
- start the commit message with `scripted-diff:` (and then a description of the diff on the same line)
|
||||
- in the commit message include the bash script between lines containing just the following text:
|
||||
- `-BEGIN VERIFY SCRIPT-`
|
||||
- `-END VERIFY SCRIPT-`
|
||||
|
||||
The scripted-diff is verified by the tool `test/lint/commit-script-check.sh`
|
||||
|
||||
Commit [`bb81e173`](https://github.com/bitcoin/bitcoin/commit/bb81e173) is an example of a scripted-diff.
|
||||
|
||||
RPC interface guidelines
|
||||
--------------------------
|
||||
|
||||
A few guidelines for introducing and reviewing new RPC interfaces:
|
||||
|
||||
- Method naming: use consecutive lower-case names such as `getrawtransaction` and `submitblock`
|
||||
|
||||
- *Rationale*: Consistency with existing interface.
|
||||
|
||||
- Argument naming: use snake case `fee_delta` (and not, e.g. camel case `feeDelta`)
|
||||
|
||||
- *Rationale*: Consistency with existing interface.
|
||||
|
||||
- Use the JSON parser for parsing, don't manually parse integers or strings from
|
||||
arguments unless absolutely necessary.
|
||||
|
||||
- *Rationale*: Introduces hand-rolled string manipulation code at both the caller and callee sites,
|
||||
which is error prone, and it is easy to get things such as escaping wrong.
|
||||
JSON already supports nested data structures, no need to re-invent the wheel.
|
||||
|
||||
- *Exception*: AmountFromValue can parse amounts as string. This was introduced because many JSON
|
||||
parsers and formatters hard-code handling decimal numbers as floating point
|
||||
values, resulting in potential loss of precision. This is unacceptable for
|
||||
monetary values. **Always** use `AmountFromValue` and `ValueFromAmount` when
|
||||
inputting or outputting monetary values. The only exceptions to this are
|
||||
`prioritisetransaction` and `getblocktemplate` because their interface
|
||||
is specified as-is in BIP22.
|
||||
|
||||
- Missing arguments and 'null' should be treated the same: as default values. If there is no
|
||||
default value, both cases should fail in the same way. The easiest way to follow this
|
||||
guideline is detect unspecified arguments with `params[x].isNull()` instead of
|
||||
`params.size() <= x`. The former returns true if the argument is either null or missing,
|
||||
while the latter returns true if is missing, and false if it is null.
|
||||
|
||||
- *Rationale*: Avoids surprises when switching to name-based arguments. Missing name-based arguments
|
||||
are passed as 'null'.
|
||||
|
||||
- Try not to overload methods on argument type. E.g. don't make `getblock(true)` and `getblock("hash")`
|
||||
do different things.
|
||||
|
||||
- *Rationale*: This is impossible to use with `bitcoin-cli`, and can be surprising to users.
|
||||
|
||||
- *Exception*: Some RPC calls can take both an `int` and `bool`, most notably when a bool was switched
|
||||
to a multi-value, or due to other historical reasons. **Always** have false map to 0 and
|
||||
true to 1 in this case.
|
||||
|
||||
- Don't forget to fill in the argument names correctly in the RPC command table.
|
||||
|
||||
- *Rationale*: If not, the call can not be used with name-based arguments.
|
||||
|
||||
- Set okSafeMode in the RPC command table to a sensible value: safe mode is when the
|
||||
blockchain is regarded to be in a confused state, and the client deems it unsafe to
|
||||
do anything irreversible such as send. Anything that just queries should be permitted.
|
||||
|
||||
- *Rationale*: Troubleshooting a node in safe mode is difficult if half the
|
||||
RPCs don't work.
|
||||
|
||||
- Add every non-string RPC argument `(method, idx, name)` to the table `vRPCConvertParams` in `rpc/client.cpp`.
|
||||
|
||||
- *Rationale*: `bitcoin-cli` and the GUI debug console use this table to determine how to
|
||||
convert a plaintext command line to JSON. If the types don't match, the method can be unusable
|
||||
from there.
|
||||
|
||||
- A RPC method must either be a wallet method or a non-wallet method. Do not
|
||||
introduce new methods such as `signrawtransaction` that differ in behavior
|
||||
based on presence of a wallet.
|
||||
|
||||
- *Rationale*: as well as complicating the implementation and interfering
|
||||
with the introduction of multi-wallet, wallet and non-wallet code should be
|
||||
separated to avoid introducing circular dependencies between code units.
|
||||
|
||||
- Try to make the RPC response a JSON object.
|
||||
|
||||
- *Rationale*: If a RPC response is not a JSON object then it is harder to avoid API breakage if
|
||||
new data in the response is needed.
|
||||
|
||||
- Wallet RPCs call BlockUntilSyncedToCurrentChain to maintain consistency with
|
||||
`getblockchaininfo`'s state immediately prior to the call's execution. Wallet
|
||||
RPCs whose behavior does *not* depend on the current chainstate may omit this
|
||||
call.
|
||||
|
||||
- *Rationale*: In previous versions of Bitcoin Core, the wallet was always
|
||||
in-sync with the chainstate (by virtue of them all being updated in the
|
||||
same cs_main lock). In order to maintain the behavior that wallet RPCs
|
||||
return results as of at least the highest best-known block an RPC
|
||||
client may be aware of prior to entering a wallet RPC call, we must block
|
||||
until the wallet is caught up to the chainstate as of the RPC call's entry.
|
||||
This also makes the API much easier for RPC clients to reason about.
|
||||
|
||||
- Be aware of RPC method aliases and generally avoid registering the same
|
||||
callback function pointer for different RPCs.
|
||||
|
||||
- *Rationale*: RPC methods registered with the same function pointer will be
|
||||
considered aliases and only the first method name will show up in the
|
||||
`help` rpc command list.
|
||||
|
||||
- *Exception*: Using RPC method aliases may be appropriate in cases where a
|
||||
new RPC is replacing a deprecated RPC, to avoid both RPCs confusingly
|
||||
showing up in the command list.
|
||||
|
||||
@@ -7,7 +7,7 @@ Release Process
|
||||
|
||||
* * *
|
||||
|
||||
###First time / New builders
|
||||
### First time / New builders
|
||||
Check out the source code in the following directory hierarchy.
|
||||
|
||||
cd /path/to/your/toplevel/build
|
||||
@@ -16,7 +16,7 @@ Check out the source code in the following directory hierarchy.
|
||||
git clone https://github.com/devrandom/gitian-builder.git
|
||||
git clone https://github.com/bitcoin/bitcoin.git
|
||||
|
||||
###Bitcoin maintainers/release engineers, update (commit) version in sources
|
||||
### Bitcoin maintainers/release engineers, update (commit) version in sources
|
||||
|
||||
pushd ./bitcoin
|
||||
contrib/verifysfbinaries/verify.sh
|
||||
@@ -37,7 +37,7 @@ Check out the source code in the following directory hierarchy.
|
||||
|
||||
* * *
|
||||
|
||||
###Setup and perform Gitian builds
|
||||
### Setup and perform Gitian builds
|
||||
|
||||
Setup Gitian descriptors:
|
||||
|
||||
@@ -59,7 +59,7 @@ Check out the source code in the following directory hierarchy.
|
||||
pushd ./gitian-builder
|
||||
git pull
|
||||
|
||||
###Fetch and create inputs: (first time, or when dependency versions change)
|
||||
### Fetch and create inputs: (first time, or when dependency versions change)
|
||||
|
||||
mkdir -p inputs
|
||||
wget -P inputs https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch
|
||||
@@ -73,7 +73,7 @@ Check out the source code in the following directory hierarchy.
|
||||
|
||||
tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.9.sdk.tar.gz MacOSX10.9.sdk
|
||||
|
||||
###Optional: Seed the Gitian sources cache and offline git repositories
|
||||
### Optional: Seed the Gitian sources cache and offline git repositories
|
||||
|
||||
By default, Gitian will fetch source files as needed. To cache them ahead of time:
|
||||
|
||||
@@ -87,7 +87,7 @@ NOTE: Offline builds must use the --url flag to ensure Gitian fetches only from
|
||||
```
|
||||
The gbuild invocations below <b>DO NOT DO THIS</b> by default.
|
||||
|
||||
###Build and sign Bitcoin Core for Linux, Windows, and OS X:
|
||||
### Build and sign Bitcoin Core for Linux, Windows, and OS X:
|
||||
|
||||
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
|
||||
./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
|
||||
@@ -111,7 +111,7 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
|
||||
4. OS X unsigned installer and dist tarball (bitcoin-${VERSION}-osx-unsigned.dmg, bitcoin-${VERSION}-osx64.tar.gz)
|
||||
5. Gitian signatures (in gitian.sigs/${VERSION}-<linux|{win,osx}-unsigned>/(your Gitian key)/
|
||||
|
||||
###Verify other gitian builders signatures to your own. (Optional)
|
||||
### Verify other gitian builders signatures to your own. (Optional)
|
||||
|
||||
Add other gitian builders keys to your gpg keyring
|
||||
|
||||
@@ -125,7 +125,7 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
|
||||
|
||||
popd
|
||||
|
||||
###Next steps:
|
||||
### Next steps:
|
||||
|
||||
Commit your signature to gitian.sigs:
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 49 KiB |
@@ -16,6 +16,7 @@ function HELP {
|
||||
echo "Optional arguments:"
|
||||
echo
|
||||
echo "-c: don't clone a fresh copy of the repo"
|
||||
echo "-f: check formatting of committed code relative to master"
|
||||
echo "-r: remove intermediate files."
|
||||
echo "-l: build only lbrycrd"
|
||||
echo "-d: build only the dependencies"
|
||||
@@ -27,6 +28,7 @@ function HELP {
|
||||
|
||||
CLONE=true
|
||||
CLEAN=false
|
||||
CHECK_CODE_FORMAT=false
|
||||
BUILD_DEPENDENCIES=true
|
||||
BUILD_LBRYCRD=true
|
||||
TIMEOUT=false
|
||||
@@ -35,7 +37,7 @@ THREE_MB=3145728
|
||||
# the script exits due to a timeout
|
||||
OUTPUT_LOG=true
|
||||
|
||||
while getopts :crldoth:w:d: FLAG; do
|
||||
while getopts :crfldoth:w:d: FLAG; do
|
||||
case $FLAG in
|
||||
c)
|
||||
CLONE=false
|
||||
@@ -43,6 +45,9 @@ while getopts :crldoth:w:d: FLAG; do
|
||||
r)
|
||||
CLEAN=true
|
||||
;;
|
||||
f)
|
||||
CHECK_CODE_FORMAT=true
|
||||
;;
|
||||
l)
|
||||
BUILD_DEPENDENCIES=false
|
||||
;;
|
||||
@@ -201,6 +206,7 @@ function brew_if_not_installed() {
|
||||
|
||||
function install_brew_packages() {
|
||||
brew update > /dev/null
|
||||
brew unlink python
|
||||
brew_if_not_installed autoconf
|
||||
brew_if_not_installed automake
|
||||
# something weird happened where glibtoolize was failing to find
|
||||
@@ -209,6 +215,10 @@ function install_brew_packages() {
|
||||
brew_if_not_installed pkg-config
|
||||
brew_if_not_installed protobuf
|
||||
brew_if_not_installed gmp
|
||||
|
||||
if [ "${CHECK_CODE_FORMAT}" = true ]; then
|
||||
brew_if_not_installed clang-format
|
||||
fi
|
||||
}
|
||||
|
||||
function install_apt_packages() {
|
||||
@@ -224,6 +234,12 @@ function install_apt_packages() {
|
||||
build-essential python-dev libbz2-dev libtool \
|
||||
autotools-dev autoconf git pkg-config wget \
|
||||
ca-certificates automake bsdmainutils
|
||||
|
||||
if [ "${CHECK_CODE_FORMAT}" = true ]; then
|
||||
$SUDO apt-get ${QUIET} install -y --no-install-recommends \
|
||||
clang-format-3.4
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
function build_dependencies() {
|
||||
@@ -232,7 +248,7 @@ function build_dependencies() {
|
||||
else
|
||||
install_apt_packages
|
||||
fi
|
||||
|
||||
|
||||
if [ "$CLEAN" = true ]; then
|
||||
rm -rf "${LBRYCRD_DEPENDENCIES}"
|
||||
rm -rf "${OUTPUT_DIR}"
|
||||
@@ -246,7 +262,7 @@ function build_dependencies() {
|
||||
|
||||
build_dependency "${BDB_PREFIX}" "${LOG_DIR}/bdb_build.log" build_bdb
|
||||
build_dependency "${OPENSSL_PREFIX}" "${LOG_DIR}/openssl_build.log" build_openssl
|
||||
|
||||
|
||||
set +u
|
||||
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${OPENSSL_PREFIX}/lib/pkgconfig/"
|
||||
set -u
|
||||
@@ -277,8 +293,9 @@ function build_openssl() {
|
||||
-fPIC darwin64-x86_64-cc \
|
||||
no-shared no-dso no-engines > "${OPENSSL_LOG}"
|
||||
else
|
||||
[[ $(uname -m) = 'i686' ]] && OS_ARCH="linux-generic32" || OS_ARCH="linux-x86_64"
|
||||
./Configure --prefix="${OPENSSL_PREFIX}" --openssldir="${OPENSSL_PREFIX}/ssl" \
|
||||
linux-x86_64 -fPIC -static no-shared no-dso > "${OPENSSL_LOG}"
|
||||
${OS_ARCH} -fPIC -static no-shared no-dso > "${OPENSSL_LOG}"
|
||||
fi
|
||||
background make "${OPENSSL_LOG}" "Waiting for openssl to finish building"
|
||||
make install >> "${OPENSSL_LOG}" 2>&1
|
||||
@@ -297,7 +314,7 @@ function build_boost() {
|
||||
function build_libevent() {
|
||||
LIBEVENT_LOG="$1"
|
||||
if [ ! -d libevent ]; then
|
||||
git clone https://github.com/libevent/libevent.git
|
||||
git clone --branch release-2.0.22-stable https://github.com/libevent/libevent.git
|
||||
fi
|
||||
cd libevent
|
||||
echo "Building libevent. tail -f ${LIBEVENT_LOG} to see the details and monitor progress"
|
||||
@@ -343,18 +360,23 @@ function build_lbrycrd() {
|
||||
LDFLAGS="${LDFLAGS}" \
|
||||
CPPFLAGS="${CPPFLAGS}" >> "${LBRYCRD_LOG}" 2>&1
|
||||
background make "${LBRYCRD_LOG}" "Waiting for lbrycrd to finish building"
|
||||
# tests don't work on OSX. Should definitely figure out why
|
||||
# that is but, for now, not letting that stop the rest
|
||||
# of the build
|
||||
if [ "${OS_NAME}" = "linux" ]; then
|
||||
src/test/test_lbrycrd
|
||||
fi
|
||||
src/test/test_lbrycrd
|
||||
strip src/lbrycrdd
|
||||
strip src/lbrycrd-cli
|
||||
strip src/lbrycrd-tx
|
||||
strip src/test/test_lbrycrd
|
||||
}
|
||||
|
||||
function clang_format_diff(){
|
||||
# run a code formatting check on any commits not in master
|
||||
# requires clang-format
|
||||
if ! git config remote.origin2.url > /dev/null; then
|
||||
git remote add origin2 https://github.com/lbryio/lbrycrd.git
|
||||
fi
|
||||
git fetch origin2
|
||||
git diff -U0 origin2/master -- '*.h' '*.cpp' | ./contrib/devtools/clang-format-diff.py -p1
|
||||
}
|
||||
|
||||
# these variables are needed in both functions
|
||||
LBRYCRD_DEPENDENCIES="$(pwd)/lbrycrd-dependencies"
|
||||
OUTPUT_DIR="$(pwd)/build"
|
||||
@@ -368,6 +390,15 @@ if [ "${BUILD_DEPENDENCIES}" = true ]; then
|
||||
build_dependencies
|
||||
fi
|
||||
|
||||
if [ "${CHECK_CODE_FORMAT}" = true ]; then
|
||||
LINES_W_FORMAT_REQUIRED=$(clang_format_diff | wc -l)
|
||||
if [ ${LINES_W_FORMAT_REQUIRED} -ne 0 ]; then
|
||||
echo "Failed to pass clang format diff: See below for the diff"
|
||||
clang_format_diff
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
set +u
|
||||
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${OPENSSL_PREFIX}/lib/pkgconfig/:${LIBEVENT_PREFIX}/lib/pkgconfig/"
|
||||
set -u
|
||||
|
||||
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.3 KiB |
@@ -1,384 +1,612 @@
|
||||
/* XPM */
|
||||
static char *bitcoin___[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"128 128 250 2",
|
||||
" c #845415",
|
||||
". c #895616",
|
||||
"X c #84581E",
|
||||
"o c #8D5C18",
|
||||
"O c #925A15",
|
||||
"+ c #925E1C",
|
||||
"@ c #98621C",
|
||||
"# c #9E711C",
|
||||
"$ c #A36E1A",
|
||||
"% c #A96F1B",
|
||||
"& c #A6711C",
|
||||
"* c #AC741C",
|
||||
"= c #B2741E",
|
||||
"- c #B37C1E",
|
||||
"; c #BB7C1E",
|
||||
": c #835B21",
|
||||
"> c #8F6125",
|
||||
", c #956727",
|
||||
"< c #916B2E",
|
||||
"1 c #996B2C",
|
||||
"2 c #B47B23",
|
||||
"3 c #BD7C20",
|
||||
"4 c #A17330",
|
||||
"5 c #AB7D3B",
|
||||
"6 c #C17F20",
|
||||
"7 c #B9831F",
|
||||
"8 c #BB842B",
|
||||
"9 c #BD8533",
|
||||
"0 c #B68F3D",
|
||||
"q c #BE8C3B",
|
||||
"w c #C4801F",
|
||||
"e c #FE8C03",
|
||||
"r c #F38A0F",
|
||||
"t c #FD8E0A",
|
||||
"y c #FF910C",
|
||||
"u c #F78F13",
|
||||
"i c #F98F10",
|
||||
"p c #F79016",
|
||||
"a c #FE9314",
|
||||
"s c #F6931E",
|
||||
"d c #FD961B",
|
||||
"f c #FE991E",
|
||||
"g c #C58421",
|
||||
"h c #CD8621",
|
||||
"j c #C78B21",
|
||||
"k c #CC8B23",
|
||||
"l c #C2852B",
|
||||
"z c #C08B2D",
|
||||
"x c #D28722",
|
||||
"c c #D38B25",
|
||||
"v c #DB8E22",
|
||||
"b c #D28E2C",
|
||||
"n c #D49323",
|
||||
"m c #DC9224",
|
||||
"M c #DC9B25",
|
||||
"N c #D4922D",
|
||||
"B c #DF972A",
|
||||
"V c #DF982E",
|
||||
"C c #C18D33",
|
||||
"Z c #C58E38",
|
||||
"A c #CB9332",
|
||||
"S c #C2933C",
|
||||
"D c #CD9339",
|
||||
"F c #CC9938",
|
||||
"G c #D19733",
|
||||
"H c #DA9230",
|
||||
"J c #D59935",
|
||||
"K c #DC9C33",
|
||||
"L c #DC9E3B",
|
||||
"P c #E49124",
|
||||
"I c #EA9426",
|
||||
"U c #E09D26",
|
||||
"Y c #EC972B",
|
||||
"T c #F79625",
|
||||
"R c #F99524",
|
||||
"E c #F69A26",
|
||||
"W c #F89825",
|
||||
"Q c #F2972B",
|
||||
"! c #F59A2C",
|
||||
"~ c #F89B2B",
|
||||
"^ c #E79D33",
|
||||
"/ c #EF9D31",
|
||||
"( c #E19F3A",
|
||||
") c #EF9D3A",
|
||||
"_ c #F49C33",
|
||||
"` c #F99E32",
|
||||
"' c #F49F39",
|
||||
"] c #D6A13E",
|
||||
"[ c #DAA33B",
|
||||
"{ c #E3A127",
|
||||
"} c #E7A328",
|
||||
"| c #EDA32C",
|
||||
" . c #EDA829",
|
||||
".. c #FFA325",
|
||||
"X. c #FFAB25",
|
||||
"o. c #F3A42B",
|
||||
"O. c #FFA429",
|
||||
"+. c #F4A929",
|
||||
"@. c #FFAC2A",
|
||||
"#. c #FFB227",
|
||||
"$. c #FFB32C",
|
||||
"%. c #FFBA2D",
|
||||
"&. c #EEA830",
|
||||
"*. c #F7A334",
|
||||
"=. c #FAA036",
|
||||
"-. c #FCAB34",
|
||||
";. c #F4A13C",
|
||||
":. c #F9A33B",
|
||||
">. c #F4A83B",
|
||||
",. c #FFA83F",
|
||||
"<. c #FDB432",
|
||||
"1. c #FFBB33",
|
||||
"2. c #FFB73A",
|
||||
"3. c #FDB93E",
|
||||
"4. c #FFC12F",
|
||||
"5. c #FFC432",
|
||||
"6. c #FFC338",
|
||||
"7. c #D2A043",
|
||||
"8. c #D8A140",
|
||||
"9. c #EEA144",
|
||||
"0. c #E2A840",
|
||||
"q. c #EDA34B",
|
||||
"w. c #F4A444",
|
||||
"e. c #F9A642",
|
||||
"r. c #FBA945",
|
||||
"t. c #F3A64B",
|
||||
"y. c #F4A84E",
|
||||
"u. c #FBAB4B",
|
||||
"i. c #EEB041",
|
||||
"p. c #FABA44",
|
||||
"a. c #ECA653",
|
||||
"s. c #EEAC5D",
|
||||
"d. c #F3AA53",
|
||||
"f. c #FAAE53",
|
||||
"g. c #F2AD5A",
|
||||
"h. c #FBB056",
|
||||
"j. c #F6B15E",
|
||||
"k. c #FBB25B",
|
||||
"l. c #DDAF79",
|
||||
"z. c #E3A962",
|
||||
"x. c #EBAE63",
|
||||
"c. c #E4AC68",
|
||||
"v. c #EAAF69",
|
||||
"b. c #EEB065",
|
||||
"n. c #E7B06C",
|
||||
"m. c #EEB36B",
|
||||
"M. c #F5B263",
|
||||
"N. c #FBB461",
|
||||
"B. c #E6B274",
|
||||
"V. c #ECB574",
|
||||
"C. c #E7B57B",
|
||||
"Z. c #EAB77C",
|
||||
"A. c #ECB97C",
|
||||
"S. c #F2B770",
|
||||
"D. c #F0BB7A",
|
||||
"F. c #DBB485",
|
||||
"G. c #DFB888",
|
||||
"H. c #E4B984",
|
||||
"J. c #EDBD82",
|
||||
"K. c #E5BC8B",
|
||||
"L. c #EABE8A",
|
||||
"P. c #F0BE82",
|
||||
"I. c #E0BF96",
|
||||
"U. c #EDC089",
|
||||
"Y. c #F0C28B",
|
||||
"T. c #E5C194",
|
||||
"R. c #E9C191",
|
||||
"E. c #E4C39C",
|
||||
"W. c #EBC699",
|
||||
"Q. c #EBC99F",
|
||||
"!. c #DFC3A0",
|
||||
"~. c #DDCAAF",
|
||||
"^. c #CFC7BD",
|
||||
"/. c #D2CBB6",
|
||||
"(. c #DBC8B1",
|
||||
"). c #DBCDBB",
|
||||
"_. c #E2C6A4",
|
||||
"`. c #E6C8A5",
|
||||
"'. c #EACBA5",
|
||||
"]. c #E1C7A8",
|
||||
"[. c #E3CBAD",
|
||||
"{. c #EACCAA",
|
||||
"}. c #EED1AC",
|
||||
"|. c #E1CDB3",
|
||||
" X c #E3CFB8",
|
||||
".X c #E6D1B6",
|
||||
"XX c #EBD2B3",
|
||||
"oX c #E3D1BB",
|
||||
"OX c #EAD6BB",
|
||||
"+X c #EBD8BF",
|
||||
"@X c #D3CDC2",
|
||||
"#X c #D8CDC2",
|
||||
"$X c #D0CECA",
|
||||
"%X c #DDD3C4",
|
||||
"&X c #D3D2CC",
|
||||
"*X c #DDD5CB",
|
||||
"=X c #CCD3D5",
|
||||
"-X c #C9D7DF",
|
||||
";X c #D2D4D6",
|
||||
":X c #DEDAD4",
|
||||
">X c #DDDCDB",
|
||||
",X c #E2D4C2",
|
||||
"<X c #ECDBC2",
|
||||
"1X c #E2D7CA",
|
||||
"2X c #E3D8CC",
|
||||
"3X c #E2DCD6",
|
||||
"4X c #E9DED2",
|
||||
"5X c #E1DEDA",
|
||||
"6X c #EEE0CE",
|
||||
"7X c #EEE3D4",
|
||||
"8X c #E7E2DA",
|
||||
"9X c #EEE4D8",
|
||||
"0X c #F3E6D1",
|
||||
"qX c #C5D7ED",
|
||||
"wX c #CDDBEB",
|
||||
"eX c #DBDEE2",
|
||||
"rX c #CBDCF1",
|
||||
"tX c #C4DFFF",
|
||||
"yX c #DEE1E4",
|
||||
"uX c #DDE4EC",
|
||||
"iX c #D3E1F2",
|
||||
"pX c #DDE6F1",
|
||||
"aX c #DEE9F4",
|
||||
"sX c #D8E5F8",
|
||||
"dX c #D6EEFF",
|
||||
"fX c #DEECFB",
|
||||
"gX c #D5F4FF",
|
||||
"hX c #DDF3FF",
|
||||
"jX c #DCF9FF",
|
||||
"kX c #E3E4E6",
|
||||
"lX c #EFEBE4",
|
||||
"zX c #E1E5EB",
|
||||
"xX c #E2E8ED",
|
||||
"cX c #F1F1ED",
|
||||
"vX c #E0E7F0",
|
||||
"bX c #E2E9F2",
|
||||
"nX c #EAEFF6",
|
||||
"mX c #E1EEFD",
|
||||
"MX c #E4F1F6",
|
||||
"NX c #E3F4FF",
|
||||
"BX c #EAF6FF",
|
||||
"VX c #E5F9FF",
|
||||
"CX c #EBFAFF",
|
||||
"ZX c #F5F5F5",
|
||||
"AX c #F9F7F5",
|
||||
"SX c #FAF8F6",
|
||||
"DX c #F3F7FB",
|
||||
"FX c #F4FAFE",
|
||||
"GX c #FEFEFE",
|
||||
"HX c None",
|
||||
/* pixels */
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX1 Z L >.N b b b b N >.( C > HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX4 L _ *.@.<.$.X.X...X.X.X.X.X.X...X.@.$.<.@.*./ G , HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX< L -.@.$.X...R R R T T T T W W W W W W T T T T R R W ..X.$.@.*.J HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXD -.%.X.W R T T W W W W W W W W W W W W W W W W W W W W W W T T R W X.%.+.A HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXS -.$.X.R T T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T T R X.$.-.C HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXF <.@.f R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R W #.<.A HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX[ <.X.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R X.$.K HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX0.$...R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E W W W W W W W T R ..%.G HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXS 1...R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ E W W W W W W W W W T R X.1.A HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3.X.d T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ E W W W W W W W W W W T R @.2.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX7.5.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W T W %.z HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3.X.s T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W T R $.<.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX1...R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W R ..1.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX0 5.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W T W 5.8 HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX8.$.s W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W T R %.N HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXi.#.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W R $.&.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXp.X.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W R @.<.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXp.X.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W R @.<.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXi.X.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ E ~ W R ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W R @.| HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX] #.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ! s e t d ~ ` ` ` ` ` ` =.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W R %.N HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXq %.R W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E W E ~ ~ ~ ~ y l.=XI.x.) p a =.` ` =.=.=.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W R %.2 HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX5 5.d W W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ t (.jXVXNXuX@XF.W ` =.:.` W =.:.=.=.` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX1.f T W W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ R Q eXDXSXSXDXgX#Xa ` =.=.;.q.W a a R ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T W %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX3...T W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ` a a.NXSXGXGXAXNXV.a :.:.f c.tX*XE.n.9.R ~ ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W T @.@.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXD #.R W W W W W W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` t H.VXSXGXGXDXmXy.f :.:.a I.hXBXCXNXiX^.' W ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W R %.g HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX5.d W W W W W W W W W W W W W W W W W W W W W W W W W E ~ W ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` i |.CXGXGXGXCX3X~ ` :.:.R %XCXSXGXAXNX>XW ~ ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX2.W T W W W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ s t e a W ~ ` ` ` ` ` ` W ! eXFXGXGXSXVX[.d :.:.~ w.uXFXGXGXSXVXW.a ` ` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T ..@.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX9 $.R W W W W W W W W W W W W W W W W W W W W W W E W ~ ~ ~ y F./.B.9.T t t a ~ =.` =.a a.hXDXGXGXSXNXA.d :.e.R v.NXSXGXGXSXNXm.a =.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W R %.= HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX6.d W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ W i &XjXNXfX:X].B.q.T t a d e K.VXSXGXGXDXaXd.W e.e.d E.VXSXGXGXDXvXw.W =.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXK X.T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ a ) uXDXSXFXFXCXNXfX:X_.B.q.r .XFXGXGXGXCX3X=.=.e.,.~ %XCXGXGXGXCX1XW ` =.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T $.m HXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHX5.R W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ t x.NXSXGXGXGXSXSXDXFXCXNXmX8XcXSXGXGXGXCXW.e :.e.=.t.uXFXGXGXSXVXE.d :.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHX^ X.T W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ` t T.VXSXGXGXGXGXGXGXGXSXSXFXGXGXGXGXGXGXFX}.9.' W e v.VXSXGXGXSXNXm.d :.=.=.=.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W T @.P HXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHX1.R W W W W W W W W W W W W W W W W E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ s ;XNXAXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXNX>X|.V.XXFXGXGXGXFXbXy.~ :.:.=.=.` ` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXH X.T W W W W W W W W W W W W W W E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` R ' $XsXNXVXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXCXCXFXSXGXGXGXCXOXa :.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W T $.c HXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHX1.R W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ~ t.V.`.5XVXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFX<X_ d d =.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W R $.HXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHX8 $.T W W W W W W W W W W W E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` =.=.~ f a a W b.xXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXmX~.x.T a =.:.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T $.3 HXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHX-.W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.` e y.MXFXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXCXhX*Xn.p a :.=.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W ~ O.HXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHX1.R W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` =.` =.=.=.:.:.:.:.:.:.:.a .XFXGXGXGXGXGXGXGXGXGXFXFXSXSXGXGXGXGXGXGXGXGXGXGXGXSXAXCXhX%Xq.t ~ =.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXb @.T W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.e.d [.CXGXGXGXGXGXGXGXGXSXZXnXNXNXBXDXSXSXGXGXGXGXGXGXGXGXGXSXAXCXhXH.t W :.` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T @.x HXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHX<.R W W W W W E E E ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ~ ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.:.e.=.' >XFXGXGXGXGXGXGXGXSXCX{.e.P.'.2XvXNXBXDXSXGXGXGXGXGXGXGXGXGXSXDXjX~.y W =.` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W @.HXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHX: 1.R W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.:.e.e.e.~ s.fXDXGXGXGXGXGXGXGXSXNXD.f =.=.,.M.L.oXaXVXDXSXGXGXGXGXGXGXGXGXGXAXVX(.t ~ ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W R %. HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXl #.T W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.:.:.:.:.:.:.:.:.:.e.e.e.e.r.W H.NXSXGXGXGXGXGXGXGXDXzXg.r.f.f.f.r.=.=.g.`.fXBXAXGXGXGXGXGXGXGXGXGXAXjXH.t =.` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W T $.6 HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHX~ ..W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.e.e.e.e.e.e.e.r.W |.CXGXGXGXGXGXGXGXGXBX1X,.f.f.f.f.h.h.f.,.~ d.3XVXAXGXGXGXGXGXGXGXGXGXDXsX' f ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W ..~ HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHX$.R W W W W W E ~ ~ ~ ~ ~ ` ` ` ` ` ` =.=.=.=.=.=.:.:.:.:.:.:.:.e.e.e.e.e.r.r.r.,.w.>XFXGXGXGXGXGXGXGXSXNX`.=.f.h.h.h.h.f.f.f.f.=.~ ,XVXSXGXGXGXGXGXGXGXGXSXVXT.y ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W R $.HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXX %.T W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.=.=.:.:.:.:.:.:.:.:.e.e.e.e.e.e.r.r.r.u.=.x.fXDXGXGXGXGXGXGXGXSXmXA.,.h.h.h.k.k.h.f.f.f.f.:.~ 5XFXGXGXGXGXGXGXGXGXGXCX:XW ~ ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W T $.. HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHX8 $.T W W W W W W E ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.:.:.:.:.e.e.e.e.e.r.r.r.r.r.u.u.~ K.NXSXGXGXGXGXGXGXGXDXzXj.r.k.k.k.k.k.h.f.f.f.f.f.W V.VXSXGXGXGXGXGXGXGXGXDXuXw.f ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W T $.3 HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXY ..W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.:.e.e.e.e.e.e.r.r.r.r.u.u.u.u.~ |.CXGXGXGXGXGXGXGXGXBX2Xr.f.k.k.k.k.k.k.h.f.f.f.f.,.d.bXFXGXGXGXGXGXGXGXGXDXfXd.d =.` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W O.P HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXO.W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.e.e.e.r.r.r.r.r.r.u.u.u.u.r.w.>XFXGXGXGXGXGXGXGXSXNX'.,.k.k.k.k.k.k.k.h.h.f.f.f.e.y.kXFXGXGXGXGXGXGXGXGXDXfXg.d =.` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W O.HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHX$.R W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.:.:.:.:.e.e.r.r.r.r.u.u.u.u.u.u.f.=.b.fXDXGXGXGXGXGXGXGXSXmXJ.r.k.k.k.k.k.k.k.h.h.f.f.f.:.s.mXFXGXGXGXGXGXGXGXGXDXpXy.R =.` ` ` ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W $.HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHX1.R W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.u.u.u.f.=.K.NXSXGXGXGXGXGXGXGXFXxXM.u.k.k.k.k.k.k.k.k.h.f.f.k.~ K.VXSXGXGXGXGXGXGXGXGXCX5X=.~ =.=.` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W $.HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHX+ $.T W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.f.f.f.=.|.CXGXGXGXGXGXGXGXGXFX<X~ u.k.N.N.N.k.k.k.k.k.k.k.=.;.uXFXGXGXGXGXGXGXGXGXSXBXoXR =.=.=.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W T $.O HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXl @.T W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.f.f.u.t.>XFXGXGXGXGXGXGXGXGXFX9XA.b.u.r.r.u.u.h.h.h.u.r.O.w.:XCXSXGXGXGXGXGXGXGXGXSXhXL.a :.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W T $.* HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXV X.T W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.u.u.f.,.b.fXFXGXGXGXGXGXGXGXGXSXFXVXpX*X[.R.V.M.g.d.d.g.b.T.pXCXSXGXGXGXGXGXGXGXGXGXDXpXe.~ :.:.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W T $.; HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHX| O.T W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.:.e.e.r.r.u.u.u.u.f.=.K.NXSXGXGXGXGXGXGXGXGXGXGXSXFXFXBXNXmXuX>X3X3XyXmXVXFXSXGXGXGXGXGXGXGXGXGXAXhXE.d :.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W T @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` ` =.:.:.:.:.:.e.e.e.r.r.u.u.u.u.=.|.BXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXSXSXFXFXFXFXFXSXSXGXGXGXGXGXGXGXGXGXGXAXNX>X~ =.e.:.:.:.=.` ` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXk @.T W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.:.:.:.:.e.e.e.r.r.r.u.u.r.w.>XFXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXZXNXeXe.~ e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.r.u.u.=.x.fXFXGXGXGXGXGXGXGXGXGXFXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFXCXfXoX:.~ r.e.:.:.:.:.:.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.:.e.e.r.r.r.u.~ K.NXSXGXGXGXGXGXGXGXSXZX6XkXmXNXBXDXAXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGX0X'.S.~ =.u.e.e.e.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXk @.T W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.e.e.r.r.u.~ |.CXGXGXGXGXGXGXGXGXFX4X,.k.D.Q.,XkXmXNXDXSXSXGXGXGXGXGXGXGXGXGXGXGX<X_ y r.u.r.r.e.e.e.:.:.:.:.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXc @.T W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.:.:.:.e.e.e.r.r.e.;.>XFXGXGXGXGXGXGXGXSXVX{.,.f.u.r.u.N.J.{.5XNXBXAXSXGXGXGXGXGXGXGXGXGXFXMXH.W r.u.r.e.e.e.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W W T @.h HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXo.O.T W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.e.r.O.s.fXFXGXGXGXGXGXGXGXSXmXJ.r.N.N.N.N.h.r.r.f.J.1XhXBXAXGXGXGXGXGXGXGXGXSXDXjX!.W e.u.r.e.e.e.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W W W W T @.g HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXB X.T W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.=.:.:.:.:.:.e.e.r.W H.NXSXGXGXGXGXGXGXGXDXuXM.u.k.k.N.N.N.N.N.h.,.e.D.>XNXSXGXGXGXGXGXGXGXGXSXZXjXE.W r.r.e.e.e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W W T $.- HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXl @.T W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` =.=.=.:.:.:.:.e.e.r.W |.CXGXGXGXGXGXGXGXGXBX2Xr.h.k.k.k.k.k.k.k.k.k.h.,.,.|.NXZXGXGXGXGXGXGXGXGXGXZXgXV.~ u.e.e.e.:.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W T $.% HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHX@ $.T W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.:.' >XFXGXGXGXGXGXGXGXSXNX{.,.k.k.k.k.k.k.k.k.k.k.k.k.u.~ `.NXSXGXGXGXGXGXGXGXGXSXCX>X=.e.r.r.e.e.:.:.:.:.:.=.=.` ` ` ~ ~ ~ ~ ~ ~ W W W W W W W W W T $.. HXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.:.e.~ s.fXFXGXGXGXGXGXGXGXSXNXJ.,.k.k.k.k.k.k.k.k.k.k.h.h.k.u.O.2XCXGXGXGXGXGXGXGXGXGXAXhXV.~ u.r.e.e.e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ W W W W W W W W W W $.HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHX$.R W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` ` ~ :.:.:.:.e.f Z.VXSXGXGXGXGXGXGXGXDXzXM.r.k.k.k.k.k.k.k.h.h.h.h.f.f.k.=.V.NXSXGXGXGXGXGXGXGXGXSXVX`.W r.e.e.e.e.:.:.:.:.=.=.=.` ` ` ~ ~ ~ ~ ~ ~ E W W W W W W W W $.HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXO.W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` =.~ Q a a W =.=.t XCXGXGXGXGXGXGXGXGXBX2Xr.f.k.k.k.k.k.k.h.h.h.h.f.f.f.f.r.y.kXFXGXGXGXGXGXGXGXGXGXBX,X~ :.e.e.e.:.:.:.:.:.:.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W W ~ ..HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXI O.W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` a z.-X_.B.q.! u C.NXSXGXGXGXGXGXGXGXSXNX'.=.h.h.k.k.k.h.h.f.f.f.f.f.f.f.f.r.w.5XFXGXGXGXGXGXGXGXGXGXCX2X=.:.e.:.:.:.:.:.:.:.:.=.=.=.` ` ` ` ~ ~ ~ ~ ~ E W W W W W W O.P HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXk @.T W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ t ).jXVXNXaX2X1XBXDXSXGXGXGXGXGXGXGXSXmXA.:.h.h.h.h.h.f.f.f.f.f.f.f.f.f.f.,.d.vXFXGXGXGXGXGXGXGXGXGXCX1X` =.:.:.:.:.:.:.=.=.=.=.=.=.` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W T $.; HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXo %.T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ` y q.fXZXSXSXFXFXFXSXSXGXGXGXGXGXGXGXGXFXxXj.r.f.h.h.h.f.f.f.f.f.f.f.f.u.u.f.W B.NXSXGXGXGXGXGXGXGXGXSXBXoXW :.:.:.:.:.:.=.=.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ W W W W W W %. HXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHX$.R W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ` e !.CXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFX+Xd ,.f.h.h.h.f.f.f.f.f.f.u.u.u.f.,.T :XFXGXGXGXGXGXGXGXGXGXSXNXE.f :.:.:.:.:.=.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W R $.HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHX~ ..W W W W W W W W W W W W W W W W W W W W E ~ ~ a _ aXFXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXFX7XV.s.:.=.:.,.u.f.f.f.f.u.u.u.r.~ s ~.VXSXGXGXGXGXGXGXGXGXGXAXhXV.d :.:.=.=.=.=.=.` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W O.E HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXg $.T W W W W W W W W W W W W W W W W W W W E ~ ~ e G.hXAXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXVXpX*X_.Z.x.t.:.` ~ ~ ~ ~ ~ ' x.*XVXSXGXGXGXGXGXGXGXGXGXGXDXuXw.W :.=.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W T $.; HXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHX %.R W W W W W W W W W W W W W W W W W W W W ~ d T qXgXBXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXFXFXBXNXaX>X,X[._.T.T.E.|.:XNXCXSXGXGXGXGXGXGXGXGXGXGXSXVX Xd =.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W R %.HXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHX@.W W W W W W W W W W W W W W W W W W W W W ~ R ` s.H.oXkXNXNXCXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXSXDXFXCXCXBXVXVXBXCXFXSXSXGXGXGXGXGXGXGXGXGXGXGXAXhXm.a :.` =.` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W @.HXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXx @.T W W W W W W W W W W W W W W W W W W W W ~ ~ y t a _ g.L.oXkXhXVXCXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXGXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXBX:Xf ~ ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W T $.h HXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ d a t a ' s.R.oXnXDXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXZXhXg.y =.` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E ~ E W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXO.~ W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ~ W a a d ! <XFXGXGXGXGXGXFXSXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXAXjX`.y ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W ..O.HXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHX; $.T W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` =.~ p 2XFXGXGXGXSXZXMXNXVXFXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXZXjX%Xa W =.` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W T %.= HXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ` ` =.d a.mXSXGXGXSXCXY.:.U..XkXDXSXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXGXSXAXBXjX Xa d =.` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W R $.HXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXv $.T W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` a C.NXSXGXGXDXNXg.a ~ ~ ~ '.FXGXGXGXGXFXFXFXDXDXSXSXSXSXSXSXSXSXDXBXhXuXZ.y d ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W T $.x HXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` =.i ].CXGXGXGXCX5X:.:.r.r.d [.FXGXGXGXFXlXXX3XzXmXNXNXNXNXNXNXNXfXuX,XJ.~ t ~ ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXP @.T W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ~ E :XFXGXGXGXVX|.R e.r.:.w.yXFXGXGXSXCX'.e ` t.g.m.J.L.R.R.L.A.x.;.d t f ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W T @.m HXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHX%.R W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` a q.fXDXGXGXSXNXJ.f e.r.~ x.hXSXGXGXSXNXV.d ` W f d d a a a a a a d ~ ` ` ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W R %.HXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXP $.T W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ` t C.VXSXGXGXDXfXg.W e.r.f K.VXSXGXGXDXbXt.W :.:.:.=.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W T $.v HXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX%.W W W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ t ].CXSXGXGXFX3X` =.e.e.R ).CXGXGXGXCX2XW ` =.=.=.` ` ` ` ` ` ~ ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W W W %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX* %.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ R Q wXNXAXSXSXVX[.d :.e.=.;.yXFXGXGXSXVX`.a =.=.=.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W T %.* HXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX@.O.T W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ d ' @XyXNXVXNXdXZ.d :.e.R s.NXSXGXGXSXNXV.a =.` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W W W W W W W T O.@.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX5.R W W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ! ~ d ' b.W.%XrXd.R :.:.a K.NXSXGXGXFXbXw.f =.` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W W W W W W R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXg %.R W W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ d a y R w.:.=.:.=.R =XgXDXSXAXBX1XR ~ ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W T %.w HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX+.@.T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ` ~ R ` :.:.=.` K.%XzXNXNXgXE.y ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T @.o.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX%.~ T W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ` ` =.=.:.:.:.d d ;.b.R.&Xv.a ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T ~ %.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX4.R T W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ` ` =.=.=.=.=.` R a y R ~ ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R 5.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX& %.R W W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ` ` ` =.=.` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W R 4.$ HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk %.R W W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ` ` ` ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ E E E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W R %.g HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM %.R W W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W R %.n HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX{ $.R W W W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ` ` ` ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W R $.U HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX{ $.R W W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ` ` ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W R %.M HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXM %.R W W W W W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W R %.n HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk %.R T W W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T W %.g HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX* 4.~ T W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T ..4.# HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX%.@.T W W W W W W W W W W W W W W W ~ ~ ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T @.%.HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX .%.R T W W W W W W W W W W W W W E ~ ~ ~ ~ ~ ~ ~ E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R %.} HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX7 4.O.T W W W W W W W W W W W W W ~ ~ ~ ~ E E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T O.%.- HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX+.%.W T W W W W W W W W W W W E ~ E E W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T W %. .HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX- %.@.R T W W W W W W W W W W ~ W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R $.%.* HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk %.@.R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R @.%.j HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXn %.@.R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T W @.%.n HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk $.$.~ R T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T R ..$.$.j HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX- O.%.@.W T T W W W W W W W W W W W W W W W W W W W W W W W W W W W W W W T T W @.%.O.* HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXk @.%.$.O.R T T W W W W W W W W W W W W W W W W W W W W W W T T R O.$.%.@.h HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX; E $.%.$.O.~ W W T T T T T T T T T T T T T T W W W O.$.$.$.E ; HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX ; P ..$.$.$.$.$.@.@.@.@.@.@.@.@.$.$.$.$.$.O.P ; . HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXO % ; g h h h h h h h ; % O HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX",
|
||||
"HXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHXHX"
|
||||
};
|
||||
static char * bitcoin128_xpm[] = {
|
||||
"128 128 481 2",
|
||||
" c None",
|
||||
". c #FFFFFF",
|
||||
"+ c #ECEEEE",
|
||||
"@ c #CED3D4",
|
||||
"# c #F0F2F2",
|
||||
"$ c #F9FAFA",
|
||||
"% c #C7CDCD",
|
||||
"& c #6B7A7C",
|
||||
"* c #405457",
|
||||
"= c #6C7B7D",
|
||||
"- c #B8BFC0",
|
||||
"; c #EFF1F1",
|
||||
"> c #E3E6E7",
|
||||
", c #8E9A9B",
|
||||
"' c #415558",
|
||||
") c #2B4145",
|
||||
"! c #2B4245",
|
||||
"~ c #2B4144",
|
||||
"{ c #374C4F",
|
||||
"] c #667679",
|
||||
"^ c #B3BBBC",
|
||||
"/ c #EEF0F0",
|
||||
"( c #F6F7F7",
|
||||
"_ c #B5BCBD",
|
||||
": c #58696C",
|
||||
"< c #2E4447",
|
||||
"[ c #2C4245",
|
||||
"} c #2D4346",
|
||||
"| c #344A4D",
|
||||
"1 c #617274",
|
||||
"2 c #B0B8B9",
|
||||
"3 c #EEEFF0",
|
||||
"4 c #FEFEFE",
|
||||
"5 c #D7DBDC",
|
||||
"6 c #7A888A",
|
||||
"7 c #364B4E",
|
||||
"8 c #32474A",
|
||||
"9 c #5D6E71",
|
||||
"0 c #ADB5B6",
|
||||
"a c #A2ACAD",
|
||||
"b c #495C5E",
|
||||
"c c #2C4346",
|
||||
"d c #2A4043",
|
||||
"e c #304649",
|
||||
"f c #5A6B6E",
|
||||
"g c #A6AFB1",
|
||||
"h c #E6E8E9",
|
||||
"i c #FDFEFE",
|
||||
"j c #F8F9F9",
|
||||
"k c #C2C9CA",
|
||||
"l c #657577",
|
||||
"m c #2F4548",
|
||||
"n c #314749",
|
||||
"o c #506365",
|
||||
"p c #56676A",
|
||||
"q c #9FA9AA",
|
||||
"r c #E1E4E4",
|
||||
"s c #FCFDFD",
|
||||
"t c #DDE0E1",
|
||||
"u c #879496",
|
||||
"v c #3D5154",
|
||||
"w c #475A5D",
|
||||
"x c #9AA5A6",
|
||||
"y c #E2E5E6",
|
||||
"z c #C9CFD0",
|
||||
"A c #7F8C8E",
|
||||
"B c #435659",
|
||||
"C c #526466",
|
||||
"D c #98A3A4",
|
||||
"E c #DCDFE0",
|
||||
"F c #FBFCFC",
|
||||
"G c #F1F3F3",
|
||||
"H c #ABB4B5",
|
||||
"I c #536568",
|
||||
"J c #778587",
|
||||
"K c #D1D6D7",
|
||||
"L c #F8F8F8",
|
||||
"M c #CFD3D4",
|
||||
"N c #869394",
|
||||
"O c #45595B",
|
||||
"P c #2A4044",
|
||||
"Q c #2D4347",
|
||||
"R c #4E6063",
|
||||
"S c #919C9E",
|
||||
"T c #D6DADB",
|
||||
"U c #FAFBFB",
|
||||
"V c #FBFBFB",
|
||||
"W c #CCD1D2",
|
||||
"X c #718082",
|
||||
"Y c #354A4D",
|
||||
"Z c #2A4144",
|
||||
"` c #F3F4F4",
|
||||
" . c #FAFAFA",
|
||||
".. c #D4D9DA",
|
||||
"+. c #8D999A",
|
||||
"@. c #485C5E",
|
||||
"#. c #495C5F",
|
||||
"$. c #8A9698",
|
||||
"%. c #D2D7D8",
|
||||
"&. c #E6E9E9",
|
||||
"*. c #939EA0",
|
||||
"=. c #43575A",
|
||||
"-. c #3E5255",
|
||||
";. c #8E9A9C",
|
||||
">. c #DADEDF",
|
||||
",. c #4C5F61",
|
||||
"'. c #859193",
|
||||
"). c #D1D6D6",
|
||||
"!. c #F7F8F8",
|
||||
"~. c #B9C0C1",
|
||||
"{. c #5B6C6F",
|
||||
"]. c #314649",
|
||||
"^. c #68787A",
|
||||
"/. c #C8CECF",
|
||||
"(. c #FDFDFD",
|
||||
"_. c #E0E4E4",
|
||||
":. c #9BA5A6",
|
||||
"<. c #4F6264",
|
||||
"[. c #818E90",
|
||||
"}. c #CFD4D4",
|
||||
"|. c #DBDFDF",
|
||||
"1. c #7E8B8D",
|
||||
"2. c #384D50",
|
||||
"3. c #4B5E60",
|
||||
"4. c #A3ADAE",
|
||||
"5. c #E3E6E6",
|
||||
"6. c #9CA6A8",
|
||||
"7. c #536567",
|
||||
"8. c #7B898B",
|
||||
"9. c #A5AEB0",
|
||||
"0. c #394E51",
|
||||
"a. c #D8DDDD",
|
||||
"b. c #E4E6E7",
|
||||
"c. c #A0AAAB",
|
||||
"d. c #3B5052",
|
||||
"e. c #768586",
|
||||
"f. c #C4CACB",
|
||||
"g. c #F4F5F5",
|
||||
"h. c #FAFAFB",
|
||||
"i. c #C6CCCD",
|
||||
"j. c #6A7A7C",
|
||||
"k. c #5D6E70",
|
||||
"l. c #5E6F71",
|
||||
"m. c #33494C",
|
||||
"n. c #BEC4C5",
|
||||
"o. c #F1F2F2",
|
||||
"p. c #E0E3E4",
|
||||
"q. c #8E999B",
|
||||
"r. c #3F5456",
|
||||
"s. c #45585B",
|
||||
"t. c #95A0A1",
|
||||
"u. c #E5E7E8",
|
||||
"v. c #E9EBEC",
|
||||
"w. c #ADB6B7",
|
||||
"x. c #647476",
|
||||
"y. c #384C4F",
|
||||
"z. c #B6BEBF",
|
||||
"A. c #EDEFEF",
|
||||
"B. c #F2F3F3",
|
||||
"C. c #AFB7B8",
|
||||
"D. c #56686A",
|
||||
"E. c #34494C",
|
||||
"F. c #728183",
|
||||
"G. c #CDD2D3",
|
||||
"H. c #B4BCBD",
|
||||
"I. c #69797B",
|
||||
"J. c #657678",
|
||||
"K. c #EAEDED",
|
||||
"L. c #FCFCFC",
|
||||
"M. c #CFD4D5",
|
||||
"N. c #748385",
|
||||
"O. c #AEB6B7",
|
||||
"P. c #F1F2F3",
|
||||
"Q. c #F0F1F1",
|
||||
"R. c #BCC3C4",
|
||||
"S. c #707F81",
|
||||
"T. c #607173",
|
||||
"U. c #AAB3B4",
|
||||
"V. c #E9EBEB",
|
||||
"W. c #EAECED",
|
||||
"X. c #465A5C",
|
||||
"Y. c #3C5053",
|
||||
"Z. c #899697",
|
||||
"`. c #758386",
|
||||
" + c #3A4F52",
|
||||
".+ c #33484B",
|
||||
"++ c #5A6C6E",
|
||||
"@+ c #A4AEAF",
|
||||
"#+ c #BFC5C6",
|
||||
"$+ c #304548",
|
||||
"%+ c #798789",
|
||||
"&+ c #556769",
|
||||
"*+ c #E5E8E8",
|
||||
"=+ c #DEE1E2",
|
||||
"-+ c #849192",
|
||||
";+ c #3A4E51",
|
||||
">+ c #485B5E",
|
||||
",+ c #9DA7A8",
|
||||
"'+ c #EDEEEF",
|
||||
")+ c #CAD0D1",
|
||||
"!+ c #7D8A8C",
|
||||
"~+ c #516366",
|
||||
"{+ c #E2E5E5",
|
||||
"]+ c #788688",
|
||||
"^+ c #D3D8D9",
|
||||
"/+ c #828F91",
|
||||
"(+ c #44585A",
|
||||
"_+ c #4E6163",
|
||||
":+ c #97A2A3",
|
||||
"<+ c #CBD0D1",
|
||||
"[+ c #6E7D7F",
|
||||
"}+ c #32484B",
|
||||
"|+ c #596B6D",
|
||||
"1+ c #F4F5F6",
|
||||
"2+ c #D2D6D7",
|
||||
"3+ c #899597",
|
||||
"4+ c #4B5E61",
|
||||
"5+ c #D8DCDC",
|
||||
"6+ c #919D9E",
|
||||
"7+ c #425658",
|
||||
"8+ c #909C9E",
|
||||
"9+ c #D6DBDB",
|
||||
"0+ c #8A9798",
|
||||
"a+ c #D2D7D7",
|
||||
"b+ c #F9F9F9",
|
||||
"c+ c #F5F6F6",
|
||||
"d+ c #5B6C6E",
|
||||
"e+ c #6D7C7F",
|
||||
"f+ c #DCE0E0",
|
||||
"g+ c #D3D7D8",
|
||||
"h+ c #506265",
|
||||
"i+ c #A9B3B4",
|
||||
"j+ c #EFF0F1",
|
||||
"k+ c #9EA8AA",
|
||||
"l+ c #7C898C",
|
||||
"m+ c #C7CDCE",
|
||||
"n+ c #EBEDED",
|
||||
"o+ c #849193",
|
||||
"p+ c #596A6D",
|
||||
"q+ c #768486",
|
||||
"r+ c #C3C9CA",
|
||||
"s+ c #C2C8C9",
|
||||
"t+ c #637476",
|
||||
"u+ c #C0C6C7",
|
||||
"v+ c #EAECEC",
|
||||
"w+ c #5C6D70",
|
||||
"x+ c #A8B1B2",
|
||||
"y+ c #889496",
|
||||
"z+ c #99A4A5",
|
||||
"A+ c #EBEEEE",
|
||||
"B+ c #ECEEEF",
|
||||
"C+ c #AEB7B8",
|
||||
"D+ c #617174",
|
||||
"E+ c #344A4C",
|
||||
"F+ c #273E41",
|
||||
"G+ c #F2F3F4",
|
||||
"H+ c #748284",
|
||||
"I+ c #D0D5D6",
|
||||
"J+ c #FCFCFD",
|
||||
"K+ c #283F42",
|
||||
"L+ c #919D9F",
|
||||
"M+ c #738284",
|
||||
"N+ c #33494B",
|
||||
"O+ c #4D6062",
|
||||
"P+ c #96A1A3",
|
||||
"Q+ c #3F5356",
|
||||
"R+ c #8B9799",
|
||||
"S+ c #DFE2E2",
|
||||
"T+ c #D9DDDE",
|
||||
"U+ c #B8C0C1",
|
||||
"V+ c #31474A",
|
||||
"W+ c #F9F9FA",
|
||||
"X+ c #A6B0B1",
|
||||
"Y+ c #D7DCDC",
|
||||
"Z+ c #7D8B8D",
|
||||
"`+ c #A5AEAF",
|
||||
" @ c #6B7B7D",
|
||||
".@ c #263D40",
|
||||
"+@ c #8F9B9D",
|
||||
"@@ c #4C5F62",
|
||||
"#@ c #384D4F",
|
||||
"$@ c #DADEDE",
|
||||
"%@ c #8D989A",
|
||||
"&@ c #405557",
|
||||
"*@ c #B6BDBE",
|
||||
"=@ c #C7CCCD",
|
||||
"-@ c #5C6D6F",
|
||||
";@ c #BBC2C3",
|
||||
">@ c #B1BABB",
|
||||
",@ c #E4E7E7",
|
||||
"'@ c #8D999B",
|
||||
")@ c #939E9F",
|
||||
"!@ c #E7EAEA",
|
||||
"~@ c #D4D8D9",
|
||||
"{@ c #516365",
|
||||
"]@ c #F6F7F8",
|
||||
"^@ c #2D4345",
|
||||
"/@ c #6F7E80",
|
||||
"(@ c #CCD2D2",
|
||||
"_@ c #9BA6A7",
|
||||
":@ c #46595C",
|
||||
"<@ c #859294",
|
||||
"[@ c #DDE1E1",
|
||||
"}@ c #FEFFFF",
|
||||
"|@ c #C9CFCF",
|
||||
"1@ c #3B4F52",
|
||||
"2@ c #526467",
|
||||
"3@ c #A9B2B4",
|
||||
"4@ c #BEC5C6",
|
||||
"5@ c #C0C7C8",
|
||||
"6@ c #F7F8F9",
|
||||
"7@ c #879395",
|
||||
"8@ c #C1C7C8",
|
||||
"9@ c #637375",
|
||||
"0@ c #A3ACAE",
|
||||
"a@ c #BAC1C2",
|
||||
"b@ c #F6F6F7",
|
||||
"c@ c #DBDEDF",
|
||||
"d@ c #CAD0D0",
|
||||
"e@ c #DFE2E3",
|
||||
"f@ c #44575A",
|
||||
"g@ c #97A2A4",
|
||||
"h@ c #E8EAEA",
|
||||
"i@ c #E0E3E3",
|
||||
"j@ c #516466",
|
||||
"k@ c #68787B",
|
||||
"l@ c #F3F5F5",
|
||||
"m@ c #425659",
|
||||
"n@ c #293F42",
|
||||
"o@ c #6A797C",
|
||||
"p@ c #D0D5D5",
|
||||
"q@ c #AFB8B9",
|
||||
"r@ c #DBDFE0",
|
||||
"s@ c #69787A",
|
||||
"t@ c #B8C0C0",
|
||||
"u@ c #F0F1F2",
|
||||
"v@ c #8A9697",
|
||||
"w@ c #E8EAEB",
|
||||
"x@ c #D9DDDD",
|
||||
"y@ c #ACB4B6",
|
||||
"z@ c #6F7E81",
|
||||
"A@ c #5F7072",
|
||||
"B@ c #738183",
|
||||
"C@ c #3B5053",
|
||||
"D@ c #677779",
|
||||
"E@ c #B9C1C1",
|
||||
"F@ c #C3CACB",
|
||||
"G@ c #627375",
|
||||
"H@ c #55676A",
|
||||
"I@ c #3C5153",
|
||||
"J@ c #283E42",
|
||||
"K@ c #294043",
|
||||
"L@ c #D8DCDD",
|
||||
"M@ c #374C4E",
|
||||
"N@ c #B0B9BA",
|
||||
"O@ c #FEFFFE",
|
||||
"P@ c #D5DADA",
|
||||
"Q@ c #273D41",
|
||||
"R@ c #45595C",
|
||||
"S@ c #768587",
|
||||
"T@ c #627274",
|
||||
"U@ c #ACB5B6",
|
||||
"V@ c #E9ECEC",
|
||||
"W@ c #829091",
|
||||
"X@ c #808E90",
|
||||
"Y@ c #C1C8C9",
|
||||
"Z@ c #A8B1B3",
|
||||
"`@ c #BFC6C7",
|
||||
" # c #3E5355",
|
||||
".# c #C5CCCC",
|
||||
"+# c #A6AFB0",
|
||||
"@# c #9CA6A7",
|
||||
"## c #596A6C",
|
||||
"$# c #F2F4F4",
|
||||
"%# c #758485",
|
||||
"&# c #C3CACA",
|
||||
"*# c #4A5D60",
|
||||
"=# c #7C8A8B",
|
||||
"-# c #58696B",
|
||||
";# c #B1B9BA",
|
||||
"># c #CBD1D2",
|
||||
",# c #57686B",
|
||||
"'# c #929E9F",
|
||||
")# c #405456",
|
||||
"!# c #8C9899",
|
||||
"~# c #E1E4E5",
|
||||
"{# c #B5BDBE",
|
||||
"]# c #57696B",
|
||||
"^# c #A1ABAD",
|
||||
"/# c #5A6B6D",
|
||||
"(# c #939FA0",
|
||||
"_# c #E1E5E5",
|
||||
":# c #46595B",
|
||||
"<# c #2F4447",
|
||||
"[# c #546668",
|
||||
"}# c #9DA8A9",
|
||||
"|# c #E7E9EA",
|
||||
"1# c #9AA4A6",
|
||||
"2# c #475B5D",
|
||||
"3# c #FDFDFE",
|
||||
"4# c #2E4346",
|
||||
"5# c #B7BEBF",
|
||||
"6# c #D3D8D8",
|
||||
"7# c #99A3A5",
|
||||
"8# c #D7DBDB",
|
||||
"9# c #4F6164",
|
||||
"0# c #949FA1",
|
||||
"a# c #808D8F",
|
||||
"b# c #96A1A2",
|
||||
"c# c #2D4447",
|
||||
"d# c #9FAAAB",
|
||||
"e# c #929D9F",
|
||||
"f# c #9EA8A9",
|
||||
"g# c #EBEDEE",
|
||||
"h# c #4D5F62",
|
||||
"i# c #959FA1",
|
||||
"j# c #4C5E61",
|
||||
"k# c #4A5D5F",
|
||||
"l# c #909B9D",
|
||||
"m# c #7A8889",
|
||||
"n# c #F4F6F6",
|
||||
"o# c #DEE2E2",
|
||||
"p# c #DFE3E3",
|
||||
"q# c #4E6062",
|
||||
"r# c #8F9B9C",
|
||||
"s# c #CACFD0",
|
||||
"t# c #586A6C",
|
||||
"u# c #B5BCBE",
|
||||
"v# c #8B9798",
|
||||
"w# c #3F5355",
|
||||
"x# c #425558",
|
||||
"y# c #949FA0",
|
||||
"z# c #9BA5A7",
|
||||
"A# c #6D7C7E",
|
||||
"B# c #C8CECE",
|
||||
"C# c #4F6163",
|
||||
"D# c #919C9D",
|
||||
"E# c #A0AAAC",
|
||||
"F# c #889596",
|
||||
"G# c #A8B2B3",
|
||||
"H# c #E4E7E8",
|
||||
"I# c #818F90",
|
||||
"J# c #D5D9DA",
|
||||
"K# c #2C4345",
|
||||
"L# c #889597",
|
||||
"M# c #DCE0E1",
|
||||
"N# c #A2ABAD",
|
||||
"O# c #56686B",
|
||||
"P# c #2F4547",
|
||||
"Q# c #2C4246",
|
||||
"R# c #667678",
|
||||
"S# c #5F6F72",
|
||||
"T# c #A1ABAC",
|
||||
"U# c #9BA6A8",
|
||||
"V# c #E8EBEB",
|
||||
"W# c #D9DCDD",
|
||||
"X# c #627275",
|
||||
"Y# c #859293",
|
||||
"Z# c #A7B0B1",
|
||||
"`# c #4F6265",
|
||||
" $ c #839091",
|
||||
".$ c #F8F8F9",
|
||||
"+$ c #CBD1D1",
|
||||
"@$ c #415557",
|
||||
"#$ c #7D8B8C",
|
||||
"$$ c #758385",
|
||||
"%$ c #C5CBCC",
|
||||
"&$ c #B7BFC0",
|
||||
"*$ c #607072",
|
||||
"=$ c #758486",
|
||||
"-$ c #465A5D",
|
||||
";$ c #394D50",
|
||||
">$ c #69787B",
|
||||
",$ c #728082",
|
||||
"'$ c #BDC4C5",
|
||||
")$ c #546568",
|
||||
"!$ c #717F81",
|
||||
"~$ c #68777A",
|
||||
"{$ c #778688",
|
||||
"]$ c #3A4F51",
|
||||
"^$ c #F5F6F7",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" . . . . . . . ",
|
||||
" . . . . . . . . . . . ",
|
||||
" . . . . . . . . . . . . . . ",
|
||||
" . . . . . . . + @ # . . . . . . . . ",
|
||||
" . . . . . . . $ % & * = - ; . . . . . . . . ",
|
||||
" . . . . . . . > , ' ) ! ~ { ] ^ / . . . . . . . . ",
|
||||
" . . . . . . . ( _ : < [ } } } [ ~ | 1 2 3 . . . . . . . . ",
|
||||
" . . . . . . . 4 5 6 7 ~ } } } } } } } [ ~ 8 9 0 + 4 . . . . . . . ",
|
||||
" . . . . . . . + a b ~ [ } } } } ~ [ } } } } c d e f g h i . . . . . . . . ",
|
||||
" . . . . . . . j k l m ~ } } } } ~ n o * ~ ~ } } } } } d m p q r s . . . . . . . . ",
|
||||
" . . . . . . 4 t u v d c } } } [ ~ w x y z A B ~ ~ } } } } } d < C D E F . . . . . . . . ",
|
||||
" . . . . . . . G H I } ! } } } } d 7 J K F . . L M N O ! ~ } } } } } P Q R S T U . . . . . . . . ",
|
||||
" . . . . . . . V W X Y Z } } } } ! [ : ^ ` . . . . . . ...+.@.[ ~ } } } } } ~ } #.$.%.$ . . . . . . . . ",
|
||||
" . . . . . . . &.*.=.~ [ } } } c Z -.;.> . . . . . . . . . . F >.*.,.} ~ } } } } } ~ } O '.).$ . . . . . . . . ",
|
||||
" . . . . . . . !.~.{.m ! } } } } ~ ].^./.U . . . . . . . . . . . . . (._.:.<.< ~ } } } } } ! [ ' [.}.$ . . . . . . . . ",
|
||||
" . . . . . . 4 |.1.2.~ } } } } [ [ 3.4.# . . . . . . . . . . . . . . . . . 4 5.6.7.e ~ c } } } } [ ~ -.8.z !.. . . . . . . . ",
|
||||
" . . . . . . . / 9.,.~ [ } } } } ~ 0.1.a.4 . . . . . . . . . . . . . . . . . . . . 4 b.c.: 8 ~ [ } } } } [ d d.e.f.g.. . . . . . . . ",
|
||||
" . . . . . . . h.i.j.e ~ } } } } ~ m k.- ( . . . . . . . . . . . . . . . . . . . . . . . . 4 h g l.m.Z [ } } } } [ d 0.X n.o.. . . . . . . . ",
|
||||
" . . . . . . 4 p.q.r.d [ } } } [ ~ s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 v.w.x.Y d [ } } } } [ d y.= z.A.. . . . . . . . ",
|
||||
" . . . . . . . B.C.D.} ~ } } } } d E.F.G.V . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + H.I.{ d [ } } } } [ d 7 J.2 K.. . . . . . . . ",
|
||||
" . . . . . . . L.M.N.7 Z } } } } ! [ 7.O.P.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Q.R.S.2.d [ } } } } [ Z Y T.U.V.4 . . . . . . . ",
|
||||
" . . . . . . . W.D X.[ [ } } } } d Y.Z.r 4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . g.f.`. +d [ } } } } [ ~ .+++@+&.4 . . . . . . . . ",
|
||||
" . . . . . . . j #+T.$+~ } } } } ) $+l f. .. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . !./.%+v ~ [ } } } } [ ~ ].&+c.*+4 . . . . . . . . ",
|
||||
" . . . . . . . 4 =+-+;+~ } } } } [ [ >+,+'+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . j )+!+* [ ! } } } } } ~ < ~+6.{+(.. . . . . . . . ",
|
||||
" . . . . . . . # U.<.~ [ } } } } ~ { ]+^+(.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . j G./+(+c ~ } } } } } ~ } _+:+t L.. . . . . . . . ",
|
||||
" . . . . . . . U <+[+}+~ } } } } ~ < |+^ 1+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . $ 2+3+@.} ~ } } } } } ~ [ 4+S 5+U . . . . . . . . ",
|
||||
" . . . . . . . 5.6+7+d [ } } } [ Z 7+8+y . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . U 9+S R < Z } } } } } ~ [ >+0+a+b+. . . . . . . . ",
|
||||
" . . . . . . . c+H.d+< ~ } } } } Z }+e+z .. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . F f+D ~+< d } } } } } ~ [ O -+W !.. . . . . . . ",
|
||||
" . . . . . . . s g+%+2.P } } } } [ ~ h+i+j+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . s _.k+&+m d } } } } } ~ [ ' l+m+( . . . . . . ",
|
||||
" . . . . . . . n+6.b [ [ } } } } d 0.o+t 4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 *+9.p+e d c } } } } ! ! -.q+r+( . . . . ",
|
||||
" . . . . . . . $ s+t+].~ } } } } ~ m T.u+j . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . v+U.w+8 ~ [ } } } } [ ~ 2.x+. . . . ",
|
||||
" . . . . . . . {+y+Y.~ } } } } [ [ O z+A+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . B+C+D+E+~ [ } } } } F+8+. . . . ",
|
||||
" . . . . . . . G+C.I [ [ } } } } ~ 7 H+I+J+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . / ^ ] { c } } } K+L+. . . . ",
|
||||
" . . . . . . . F @ M+N+Z } } } } ! } &+w.` . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . o.- O+~ } } K+L+. . . . ",
|
||||
" . . . . . . . *+P+s.d [ } } } [ d Q+R+S+4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 T+: d } } K+L+. . . . ",
|
||||
" . . . . . . . ( U+l.m ~ } } } } Z V+I.f.W+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . / X+o < } } } K+L+. . . . ",
|
||||
" . . . . . . 4 Y+Z+;+Z } } } } [ ~ ,.`+A.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . $ i. @.+~ } } } } .@+@. . . . ",
|
||||
" . . . . . . . Q.a @@[ [ } } } } Z #@A $@(.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . y %@&@~ [ } } } [ d * *@. . . . ",
|
||||
". . . . . . U =@^.8 ~ } } } } [ < -@;@!.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . c+>@D.< [ } } } } ~ .+X M.L.. . . . ",
|
||||
". . . . . ,@'@-.~ c } } } [ ~ 7+)@!@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . (.~@J Y ~ } } } } [ } {@H ` . . . . . . ",
|
||||
". . . ]@H.D.^@[ } } } } ~ E./@(@F . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . v+_@:@Z [ } } } [ ~ v <@[@}@. . . . . . . ",
|
||||
". . . |@1@d } } } } ! } 2@3@B.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ( 4@T.< ~ } } } } ~ V+l 5@6@. . . . . . . . . ",
|
||||
". . . 5@8 [ } } } Z v 7@t 4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . (.5+[. +d } } } } [ ! 4+c.W.. . . . . . . . . . . ",
|
||||
". . . 8@.+[ } } m 9@5@j . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + 0@_+[ [ } } } } d 2.1.T L.. . . . . . . . . . . . . ",
|
||||
". . . 8@.+[ } [ Q+}.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . b+f.^.8 ~ } } } } ~ < l.a@b@. . . . . . . . . . . . . . . . ",
|
||||
". . . 8@.+[ } [ B c@. . . . . . . G d@G . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 e@3+-.~ [ } } } [ Z f@g@h@. . . . . . . . . . . . . . . . . . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . i@j@k@;@` . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . l@w.2@} [ } } } } ~ E.F.2+s . . . . . . . . . . . . . . . . . . . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . =+m@n@7 o@;@B.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . L.p@X E.~ } } } } [ } I q@g.. . . . . . . . . . . . . . . (.]@# + $ . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . r@Q+! [ d Y s@t@u@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . !@g@=.Z [ } } } [ ~ -.v@p.. . . . 4 4 s !.; w@r x@(@R.y@6.+.A z@A@B@*+. . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . T+C@[ } } [ d E.D@_ A.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . c+E@9 } ~ } } } } ~ }+^.F@b+. . . . .- $.Z+S.G@H@>+I@7 .+m [ n@J@n@K@R+V . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . L@M@~ } } } } [ d E.l N@n+O@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . L.P@!+2.d } } } } [ [ R a + . . . . . . 4 C+E+Q@K+K@d ~ [ [ [ } } } } ) R@%.. . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . K.S@0.d [ } } } } [ d E.T@U@v.4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . V@k+3.~ [ } } } } d ;+[.L@s . . . . . . . . c+W@} } } } } } } } } } } } [ X@$ . . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . . ` Y@N. +d [ } } } } [ Z E.l.Z@w@4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . L `@l n ~ } } } } ~ < T.R.( . . . . . . . . . . . _.d+~ } } } } } } } } } [ #/.. . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . . . . c+.#J 1@d [ } } } } [ ~ .+{.+#w@4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . }@t '.v ~ [ } } } [ ~ :@@#V@. . . . . . . . . . . . . . s+Q+[ } } } } } } } } ~ N.( . . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . . . . . . !.z 6 v ~ [ } } } } [ ~ V+##+#V.}@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . $#H o } [ } } } } ~ Y %#g+(.. . . . . . . . . . . . . . F &#*#[ } } } } } } } [ 2.4@. . . . ",
|
||||
". . . 8@.+[ } [ B >.. . . . . . . . . . . . . . b+W =#Q+[ [ } } } } } ~ e -#X+V.4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . L.@ [+}+~ } } } } [ < &+;#c+. . . . . . . . . . . . . . . *+S * } } } } } } } } } ~ s@$#. . . . ",
|
||||
". . . 8@.+[ } [ B c@. . . . . . . . . . . . . . . . j >#Z+' [ ! } } } } } Z m ,#@+&.4 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . *+'#' Z [ } } } [ ~ )#!#~#. . . . . . . . . . . . . . . c+{#]#} ! } } } } } } } } [ E.{#. . . . ",
|
||||
". . . 8@.+[ } [ m@$@. . . . . . . . . . . . . . . . . . j W [.=.[ ~ } } } } } d < p ^#5.(.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . g.{#/#} ~ } } } } Z .+& i.$ . . . . . . . . . . . . . . L.2+]+7 d } } } } [ ~ } } } } d A@; . . . . ",
|
||||
". . . 8@.+[ } [ 7 (#_#(.. . . . . . . . . . . . . . . . . . j @ <@:#[ ~ } } } } } P <#[#}#p.s . . . . . . . . . . . . . . . . . . . . . . . . . . F %.6 { d } } } } [ [ o g 3 . . . . . . . . . . . . . . . |#1#w Z [ } } } } P 0.,.< } } } e H . . . . ",
|
||||
". . . 8@.+[ } } } e [#@#i@s . . . . . . . . . . . . . . . . . . $ %.$.2#[ ~ } } } } } P < C D [@L.. . . . . . . . . . . . . . . . . . . . . . . w@_@>+~ [ } } } } d C@-+>.3#. . . . . . . . . . . . . . ( a@T.m ~ } } } } ~ 4#-@5#6#p P } d ]#V.. . . . ",
|
||||
". . . u+].[ } } } } ~ m C 7#S+(.. . . . . . . . . . . . . . . . . . U 8#;.#.[ ~ } } } } } ~ < 9#0#E L.. . . . . . . . . . . . . . . . . . . ( ;@D+e ~ } } } } ~ m 9@u+!.. . . . . . . . . . . . . . i 5+a# +Z } } } } [ d =.b#*+. . E@d.~ c#d#. . . . ",
|
||||
". . . g+<.[ ~ } } } } } ~ m <.b#=+(.. . . . . . . . . . . . . . . . . . F $@e#*#[ ~ } } } } } ~ < ,.6+|.L.. . . . . . . . . . . . . . . 4 T+a#1@~ c } } } [ Z w f#g#. . . . . . . . . . . . . . . ; a @@[ [ } } } } Z E.B@}.L.. . . $ ;.~ _+r . . . . ",
|
||||
". . . s e@t.4+} ~ } } } } } ~ < h#t.e@(.. . . . . . . . . . . . . . . . . . s =+i#j#} ~ } } } } } ~ 4#k#l#|.s . . . . . . . . . . . . u@`+O+} [ } } } } ~ Y m#T (.. . . . . . . . . . . . . . h.i.D@V+~ } } } } [ } 7.2 n#. . . . . . &.9@e#(.. . . ",
|
||||
". . . . . (.o#0#h#< ~ } } } } } ~ } ,.P+p.(.. . . . . . . . . . . . . . . . . . (.p#b#q#< ~ } } } } } ~ [ >+r#$@L.. . . . . . . . V s# @V+~ } } } } [ < t#u#( . . . . . . . . . . . . . . . {+v#v ~ c } } } [ ~ -.v@r . . . . . . . . . T > . . . . ",
|
||||
". . . . . . . (.o#b#9#m ~ } } } } } ~ c ,.b#=+s . . . . . . . . . . . . . . . . . . (.e@g@o m ~ } } } } } ~ ) w '@5 V . . . . 4 ,@;.w#d [ } } } [ ~ x#+@,@. . . . . . . . . . . . . . . G+2 [#[ [ } } } } ~ }+D@f.$ . . . . . . . . . . . . . . . . ",
|
||||
" . . . . . . . . s S+7#C m Z } } } } } ~ [ j#y#c@F . . . . . . . . . . . . . . . . . . (.i@z#[#e Z c } } } } ~ ) :@$.^+ .. G+;#D.[ ) } } } } ~ E.A#B# .. . . . . . . . . . . . . . V }.B@E.Z } } } } [ [ C#4.A.. . . . . . . . . . . . . . . ",
|
||||
" . . . . . . . . s p#_@[#m d } } } } } Z [ 3.D#Y+U . . . . . . . . . . . . . . . . . . (.{+E#t#e d [ } } } } ~ ~ O F#U+q+Y P } } } } ! [ C G#j+. . . . . . . . . . . . . . . H#t.(+Z [ } } } c d C@I#T+4 . . . . . . . . . . . . . . . ",
|
||||
" . . . . . . . . s r q H@m d } } } } } ~ } k#+.J#U . . . . . . . . . . . . . . . . . . (.*++#d+e d [ } } } } ~ K#m.! [ } } } [ d v L#M#i . . . . . . . . . . . . . . n#{#-@< ~ } } } } ~ $+G@4@!.. . . . . . . . . . . ",
|
||||
" . . . . . . . (.> N#O#P#d } } } } } ~ } >+Z.~@h.. . . . . . . . . . . . . . . . . . 4 w@U.k.].d Q#} } } } [ } } } } ~ $+R#k $ . . . . . . . . . . . . . . s %.%+2.Z } } } } [ Z >+,+V@. . . . . . . ",
|
||||
" . . . . . . . 4 &.`+]#m Z } } } } } ~ } R@7@^+U . . . . . . . . . . . . . . . . . . }@n+w.S#V+d [ } } } } } [ ~ k#T#B+. . . . . . . . . . . . . . . W.U#b [ [ } } } } Z 7 8.J#(.. . . . . . . ",
|
||||
" . . . . . . . }@V#g ]#e ~ } } } } } ! Q#=.<@6#V . . . . . . . . . . . . . . . . . . . A.2 T.}+~ [ } } ~ { 8.W#4 . . . . . . . . . . . . . . W+8@T@e ! } } } } ! < /#- ( . . . . . . . ",
|
||||
" . . . . . . . }@v.g ##V+~ [ } } } } [ [ 7+<@6#U . . . . . . . . . . . . . . . . . . . / ;#X#E+Z < f - ( . . . . . . . . . . . . . . 4 =+Y#1@~ } } } } [ ! m@e#!@. . . . . . . ",
|
||||
" . . . . . . . 4 V.Z#d+}+~ [ } } } } ! ~ x#o+K $ . . . . . . . . . . . . . . . . . . . / >@ @e#h . . . . . . . . . . . . . . . # U.`#) [ } } } } ~ | /@<+V . . . . . . . ",
|
||||
" . . . . . . . 4 V#x+k.N+Z [ } } } } ~ Z ' $@ .$. . . . . . . . . . . . . . . . . . 4 n#U . . . . . . . . . . . . . . h.|@[+V+Z } } } } ! } I 3@o.. . . . . . . ",
|
||||
" . . . . . . . 4 V.H T.m.d [ } } } } ~ Z ' a#+$!.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 4 _#r#@$d [ } } } [ d Q+Z.[@4 . . . . . . ",
|
||||
" . . . . . . . 4 W.q@x.m.d [ } } } } ~ ~ &@#$/.( . . . . . . . . . . . . . . . . . . . . . . . . . . . . ` 2 : c#~ } } } } Z V+I.f.b+. . . . . . . ",
|
||||
" . . . . . . . . A.H.R#m.d [ } } } } ) ~ Q+6 i.( . . . . . . . . . . . . . . . . . . . . . . . . L.M.$$7 Z } } } } [ ~ O+g / . . . . . . . ",
|
||||
" . . . . . . . . u@z.R#E.d [ } } } } ! ! -.J %$( . . . . . . . . . . . . . . . . . . . . . h@P+:@! [ } } } } Z 0.-+|.i . . . . . . ",
|
||||
" . . . . . . . . G &$R#| ~ [ } } } } [ ~ Y.$$%$!.. . . . . . . . . . . . . . . . . !.;@k.m ! } } } } ~ m *$#+j . . . . . . . ",
|
||||
" . . . . . . . . G z.] 7 ~ [ } } } } [ ~ 1@=$i.!.. . . . . . . . . . . . . 4 |.A 2.~ } } } } [ ! -$1#n+. . . . . . . ",
|
||||
" . . . . . . . . o.&$I.{ ~ [ } } } } [ P ;+`.%$c+. . . . . . . . . . / @+,.~ [ } } } } ~ { J 6#(.. . . . . . ",
|
||||
" . . . . . . . . o.U+ @;$~ [ } } } } [ d ;+H+Y@` . . . . . . $ %$>$e ~ } } } } ~ < |+^ n#. . . . . . . ",
|
||||
" . . . . . . . . # a@[+0.d [ } } } } [ d ;+,$4@B.. . 4 =+$.-.d [ } } } [ Z =.S {+. . . . . . . ",
|
||||
" . . . . . . . . P.'$X 0.d [ } } } } [ Z ;+/@R.!@H )$c ) } } } } d m.!$)+h.. . . . . . . ",
|
||||
" . . . . . . . . ` 8@M+;+d [ } } } } [ Z 1@7.7 ~ } } } } ! [ I w.# . . . . . . . ",
|
||||
" . . . . . . . . c+f.$$;+P [ } } } } [ ~ [ } } } c P v $.r 4 . . . . . . ",
|
||||
" . . . . . . . . ( i.=$ +~ [ } } } } } } } ~ ].~$i. .. . . . . . . ",
|
||||
" . . . . . . . . !.i.q+Y.~ [ } } } [ [ 4+T#/ . . . . . . . ",
|
||||
" . . . . . . . . !.i.{$-.! ~ ~ ]$Z+5+4 . . . . . . . ",
|
||||
" . . . . . . . . ( % 6 B A@a@( . . . . . . . ",
|
||||
" . . . . . . . . ^$K &.. . . . . . . ",
|
||||
" . . . . . . . . . . . . . . . ",
|
||||
" . . . . . . . . . . . ",
|
||||
" . . . . . . . ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
Before Width: | Height: | Size: 827 B After Width: | Height: | Size: 1006 B |
@@ -1,181 +1,159 @@
|
||||
/* XPM */
|
||||
static char *bitcoin__[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 159 2",
|
||||
" c #CA7C1E",
|
||||
". c #CB7D1E",
|
||||
"X c #D1811E",
|
||||
"o c #D0801F",
|
||||
"O c #D1801F",
|
||||
"+ c #D3821F",
|
||||
"@ c #D7831F",
|
||||
"# c #EE8D18",
|
||||
"$ c #F4931F",
|
||||
"% c #D78625",
|
||||
"& c #D88520",
|
||||
"* c #D98521",
|
||||
"= c #D98620",
|
||||
"- c #D78B2D",
|
||||
"; c #DF8D2A",
|
||||
": c #DF8F2F",
|
||||
"> c #DF943B",
|
||||
", c #D8913C",
|
||||
"< c #D8923E",
|
||||
"1 c #DF953E",
|
||||
"2 c #E28B23",
|
||||
"3 c #E38B23",
|
||||
"4 c #EA9023",
|
||||
"5 c #EB9023",
|
||||
"6 c #ED9122",
|
||||
"7 c #ED9123",
|
||||
"8 c #EE9123",
|
||||
"9 c #EE9223",
|
||||
"0 c #F39421",
|
||||
"q c #F19423",
|
||||
"w c #F39523",
|
||||
"e c #F79521",
|
||||
"r c #F59422",
|
||||
"t c #F49623",
|
||||
"y c #F69622",
|
||||
"u c #F79623",
|
||||
"i c #F09324",
|
||||
"p c #F19424",
|
||||
"a c #F19525",
|
||||
"s c #F49624",
|
||||
"d c #F59625",
|
||||
"f c #F49725",
|
||||
"g c #F79624",
|
||||
"h c #F79724",
|
||||
"j c #F69725",
|
||||
"k c #F79725",
|
||||
"l c #F69726",
|
||||
"z c #F79726",
|
||||
"x c #F89621",
|
||||
"c c #F89722",
|
||||
"v c #F89723",
|
||||
"b c #F89724",
|
||||
"n c #F89824",
|
||||
"m c #F89825",
|
||||
"M c #F99825",
|
||||
"N c #F89925",
|
||||
"B c #F89926",
|
||||
"V c #F89927",
|
||||
"C c #F99927",
|
||||
"Z c #F0972E",
|
||||
"A c #F7992A",
|
||||
"S c #F79A2B",
|
||||
"D c #F79B2C",
|
||||
"F c #F69A2D",
|
||||
"G c #F79D2F",
|
||||
"H c #F89929",
|
||||
"J c #F89A28",
|
||||
"K c #F89A29",
|
||||
"L c #F99A29",
|
||||
"P c #F99B29",
|
||||
"I c #F89A2A",
|
||||
"U c #F89A2B",
|
||||
"Y c #F99B2B",
|
||||
"T c #F89B2C",
|
||||
"R c #F89C2C",
|
||||
"E c #F99C2D",
|
||||
"W c #F99C2E",
|
||||
"Q c #F89D2E",
|
||||
"! c #F99D2F",
|
||||
"~ c #E29335",
|
||||
"^ c #E49639",
|
||||
"/ c #E2983F",
|
||||
"( c #F79F35",
|
||||
") c #F99E31",
|
||||
"_ c #F89E32",
|
||||
"` c #F99E32",
|
||||
"' c #F9A033",
|
||||
"] c #F9A035",
|
||||
"[ c #F9A135",
|
||||
"{ c #F9A036",
|
||||
"} c #F9A136",
|
||||
"| c #F9A137",
|
||||
" . c #F3A03F",
|
||||
".. c #F7A43F",
|
||||
"X. c #F8A139",
|
||||
"o. c #F9A23A",
|
||||
"O. c #FAA33B",
|
||||
"+. c #FAA43E",
|
||||
"@. c #FAA43F",
|
||||
"#. c #EF9F41",
|
||||
"$. c #EEA244",
|
||||
"%. c #ECA34B",
|
||||
"&. c #F8A440",
|
||||
"*. c #F9A541",
|
||||
"=. c #F9A644",
|
||||
"-. c #F9A947",
|
||||
";. c #F0A349",
|
||||
":. c #F5A648",
|
||||
">. c #F1A74E",
|
||||
",. c #F7AA4F",
|
||||
"<. c #E4A458",
|
||||
"1. c #E4A55B",
|
||||
"2. c #E8A95E",
|
||||
"3. c #F2A950",
|
||||
"4. c #F4AA52",
|
||||
"5. c #FBAF55",
|
||||
"6. c #E4A860",
|
||||
"7. c #EAAC63",
|
||||
"8. c #EBAF68",
|
||||
"9. c #F2AF61",
|
||||
"0. c #EBB16C",
|
||||
"q. c #F6B568",
|
||||
"w. c #E3AF71",
|
||||
"e. c #EBBE89",
|
||||
"r. c #E0BC93",
|
||||
"t. c #E3C199",
|
||||
"y. c #E6C59D",
|
||||
"u. c #EAC89E",
|
||||
"i. c #E7C8A2",
|
||||
"p. c #EACBA6",
|
||||
"a. c #EBCFAF",
|
||||
"s. c #F1CCA0",
|
||||
"d. c #E7CEB1",
|
||||
"f. c #ECD1B0",
|
||||
"g. c #E5D2BB",
|
||||
"h. c #E8D2B8",
|
||||
"j. c #DFDFDF",
|
||||
"k. c #E7D5C1",
|
||||
"l. c #E7D7C4",
|
||||
"z. c #E5D7C7",
|
||||
"x. c #E7DACB",
|
||||
"c. c #EADAC8",
|
||||
"v. c #E9DCCC",
|
||||
"b. c #EDDFCE",
|
||||
"n. c #E5DDD3",
|
||||
"m. c #E4DFD9",
|
||||
"M. c #ECE0D1",
|
||||
"N. c #E4E1DD",
|
||||
"B. c #EDE3D8",
|
||||
"V. c #EAE4DD",
|
||||
"C. c #ECE5DC",
|
||||
"Z. c #E2E2E2",
|
||||
"A. c #E5E2E0",
|
||||
"S. c #E4E4E4",
|
||||
"D. c #E7E7E7",
|
||||
"F. c #EAEAE9",
|
||||
"G. c gray92",
|
||||
"H. c #EEEEEE",
|
||||
"J. c None",
|
||||
/* pixels */
|
||||
"J.J.J.J.J.J.J.1 > J.J.J.J.J.J.J.",
|
||||
"J.J.J.J.J./ ..| ' ( ~ J.J.J.J.J.",
|
||||
"J.J.J.< *.{ V $ r U W _ - J.J.J.",
|
||||
"J.J., o.J 0 # <.w.$.F N H % J.J.",
|
||||
"J.J.o.T e 1.r.k.x.t.S z B u J.J.",
|
||||
"J.^ [ Y ! #.z.H.M.n.0.d n m 2 J.",
|
||||
"J.X.) | =. .h.B.5.f.j.;.v B d J.",
|
||||
": Q M ` &.>.A.V.p.c.l.4.E n d = ",
|
||||
"; I b A Z 2.D.s.u.F.a.-.} C w & ",
|
||||
"J.l g y 6.m.G.q.3.b.Z.,.] D 8 J.",
|
||||
"J.3 k c %.d.C.v.N.S.y.@.L a * J.",
|
||||
"J.J.j z x 8.i.g.e.9.+.W t 6 J.J.",
|
||||
"J.J.+ s h G :.7.O.R B s 7 . J.J.",
|
||||
"J.J.J.O i f P L K d p 5 J.J.J.",
|
||||
"J.J.J.J.J.@ 9 q i 4 + J.J.J.J.J.",
|
||||
"J.J.J.J.J.J.J.X o J.J.J.J.J.J.J."
|
||||
};
|
||||
static char * bitcoin16_xpm[] = {
|
||||
"16 16 140 2",
|
||||
" c None",
|
||||
". c #FFFFFF",
|
||||
"+ c #FFFFFF",
|
||||
"@ c #FFFFFF",
|
||||
"# c #F8F9F9",
|
||||
"$ c #C1C7C8",
|
||||
"% c #B5BDBE",
|
||||
"& c #E9EBEB",
|
||||
"* c #FFFFFF",
|
||||
"= c #FFFFFF",
|
||||
"- c #DADEDE",
|
||||
"; c #9AA5A6",
|
||||
"> c #8A9698",
|
||||
", c #B0B8B9",
|
||||
"' c #E5E8E8",
|
||||
") c #FFFFFF",
|
||||
"! c #FFFFFF",
|
||||
"~ c #EFF1F1",
|
||||
"{ c #B1B9BA",
|
||||
"] c #869395",
|
||||
"^ c #899597",
|
||||
"/ c #ACB5B6",
|
||||
"( c #E2E5E5",
|
||||
"_ c #FFFFFF",
|
||||
": c #FFFFFF",
|
||||
"< c #FEFEFE",
|
||||
"[ c #CBD0D1",
|
||||
"} c #8F9B9C",
|
||||
"| c #8A9698",
|
||||
"1 c #B0B8B9",
|
||||
"2 c #F1F3F3",
|
||||
"3 c #E5E8E8",
|
||||
"4 c #A3ADAE",
|
||||
"5 c #E0E3E3",
|
||||
"6 c #9BA6A7",
|
||||
"7 c #F5F6F6",
|
||||
"8 c #BEC4C5",
|
||||
"9 c #98A3A4",
|
||||
"0 c #808D8F",
|
||||
"a c #808D8F",
|
||||
"b c #D7DBDB",
|
||||
"c c #E0E3E4",
|
||||
"d c #A5AEB0",
|
||||
"e c #889496",
|
||||
"f c #97A2A3",
|
||||
"g c #D8DCDC",
|
||||
"h c #F3F4F4",
|
||||
"i c #F9F9F9",
|
||||
"j c #FFFFFF",
|
||||
"k c #FFFFFF",
|
||||
"l c #DCE0E0",
|
||||
"m c #A6AFB0",
|
||||
"n c #889596",
|
||||
"o c #899697",
|
||||
"p c #BEC5C6",
|
||||
"q c #F7F8F8",
|
||||
"r c #FFFFFF",
|
||||
"s c #FFFFFF",
|
||||
"t c #FFFFFF",
|
||||
"u c #DEE2E2",
|
||||
"v c #A7B0B2",
|
||||
"w c #899597",
|
||||
"x c #899697",
|
||||
"y c #A6AFB1",
|
||||
"z c #E6E9E9",
|
||||
"A c #FFFFFF",
|
||||
"B c #FFFFFF",
|
||||
"C c #FFFFFF",
|
||||
"D c #DDE1E1",
|
||||
"E c #B0B8B9",
|
||||
"F c #CED3D4",
|
||||
"G c #FFFFFF",
|
||||
"H c #FFFFFF",
|
||||
"I c #FFFFFF",
|
||||
"J c #FFFFFF",
|
||||
"K c #8D999A",
|
||||
"L c #96A1A3",
|
||||
"M c #B5BDBE",
|
||||
"N c #F5F6F7",
|
||||
"O c #FDFEFE",
|
||||
"P c #DCE0E0",
|
||||
"Q c #9FA9AA",
|
||||
"R c #99A4A5",
|
||||
"S c #E3E6E6",
|
||||
"T c #FFFFFF",
|
||||
"U c #FEFEFE",
|
||||
"V c #E0E3E4",
|
||||
"W c #A3ADAE",
|
||||
"X c #8A9698",
|
||||
"Y c #C8CECF",
|
||||
"Z c #FBFCFC",
|
||||
"` c #FDFDFD",
|
||||
" . c #B6BEBF",
|
||||
".. c #738284",
|
||||
"+. c #9BA5A7",
|
||||
"@. c #DDE1E1",
|
||||
"#. c #FDFDFD",
|
||||
"$. c #EBEDEE",
|
||||
"%. c #A2ACAD",
|
||||
"&. c #8C9899",
|
||||
"*. c #D0D5D5",
|
||||
"=. c #8D999B",
|
||||
"-. c #CFD4D4",
|
||||
";. c #AAB3B4",
|
||||
">. c #95A0A1",
|
||||
",. c #D5DADA",
|
||||
"'. c #FCFCFC",
|
||||
"). c #F9FAFA",
|
||||
"!. c #BFC6C7",
|
||||
"~. c #879395",
|
||||
"{. c #B9C1C2",
|
||||
"]. c #B3BBBC",
|
||||
"^. c #6A797B",
|
||||
"/. c #9CA6A7",
|
||||
"(. c #E3E6E6",
|
||||
"_. c #CBD1D2",
|
||||
":. c #909B9D",
|
||||
"<. c #95A0A1",
|
||||
"[. c #D3D8D9",
|
||||
"}. c #FBFBFB",
|
||||
"|. c #DCE0E0",
|
||||
"1. c #929D9F",
|
||||
"2. c #9CA6A8",
|
||||
"3. c #DEE1E2",
|
||||
"4. c #BBC2C3",
|
||||
"5. c #ADB5B6",
|
||||
"6. c #E3E6E6",
|
||||
"7. c #CED3D4",
|
||||
"8. c #929E9F",
|
||||
"9. c #879496",
|
||||
"0. c #8B9799",
|
||||
"a. c #CBD1D1",
|
||||
"b. c #D4D9D9",
|
||||
"c. c #909C9D",
|
||||
"d. c #ABB4B5",
|
||||
"e. c #E2E5E5",
|
||||
"f. c #DCE0E0",
|
||||
"g. c #DFE2E3",
|
||||
"h. c #A7B0B1",
|
||||
"i. c #9BA6A7",
|
||||
" ",
|
||||
" ",
|
||||
" $ % ",
|
||||
" - ; K L > , ",
|
||||
" { ] M N O P Q ^ / ",
|
||||
" [ } R S T T T T U V W | 1 ",
|
||||
" 4 X Y Z T T T T T T T ` ...5 ",
|
||||
"6 +.@.#.T T T T T T T $.%.&.*.7 ",
|
||||
"=.-.;.>.,.'.T T T ).!.~.{.].^.8 ",
|
||||
"9 /.(._.:.<.[.}.|.1.2.3.4.0 a b ",
|
||||
"c d e 5.6.7.8.9.0.a.b.c.f g ",
|
||||
" m n d.e.f.g.h.o p ",
|
||||
" v w i.x y ",
|
||||
" E F ",
|
||||
" ",
|
||||
" "};
|
||||
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@@ -1,140 +1,233 @@
|
||||
/* XPM */
|
||||
static char *bitcoin__[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 102 2",
|
||||
" c #CC7D1D",
|
||||
". c #D5831F",
|
||||
"X c #D48221",
|
||||
"o c #D98621",
|
||||
"O c #DC8820",
|
||||
"+ c #DC8D2C",
|
||||
"@ c #D98F36",
|
||||
"# c #D68F39",
|
||||
"$ c #DD943E",
|
||||
"% c #E28B23",
|
||||
"& c #E98F24",
|
||||
"* c #E18F2D",
|
||||
"= c #ED9124",
|
||||
"- c #EC942A",
|
||||
"; c #F59624",
|
||||
": c #F89724",
|
||||
"> c #F79827",
|
||||
", c #F89825",
|
||||
"< c #F0962B",
|
||||
"1 c #F59A2D",
|
||||
"2 c #F99B2B",
|
||||
"3 c #EC9732",
|
||||
"4 c #EC9A37",
|
||||
"5 c #E2963B",
|
||||
"6 c #E6983A",
|
||||
"7 c #EC9C3B",
|
||||
"8 c #F69D33",
|
||||
"9 c #F99E32",
|
||||
"0 c #F49E3A",
|
||||
"q c #F9A036",
|
||||
"w c #F6A13C",
|
||||
"e c #F9A33B",
|
||||
"r c #D79341",
|
||||
"t c #DC9641",
|
||||
"y c #E39A43",
|
||||
"u c #EA9D42",
|
||||
"i c #EFA041",
|
||||
"p c #EDA34B",
|
||||
"a c #F5A443",
|
||||
"s c #F9A643",
|
||||
"d c #FAA846",
|
||||
"f c #F2A64C",
|
||||
"g c #F9AA4B",
|
||||
"h c #E5A251",
|
||||
"j c #ECA756",
|
||||
"k c #EBA758",
|
||||
"l c #FAAF57",
|
||||
"z c #FBB057",
|
||||
"x c #FBB25B",
|
||||
"c c #DFB179",
|
||||
"v c #E4AA65",
|
||||
"b c #EBAE64",
|
||||
"n c #E9AF69",
|
||||
"m c #FBB665",
|
||||
"M c #F1B46A",
|
||||
"N c #F8B96D",
|
||||
"B c #E5B071",
|
||||
"V c #EBB777",
|
||||
"C c #EEB877",
|
||||
"Z c #E7B478",
|
||||
"A c #EBB97D",
|
||||
"S c #F0B671",
|
||||
"D c #F2B871",
|
||||
"F c #EFBC80",
|
||||
"G c #E6BD8D",
|
||||
"H c #EDBF88",
|
||||
"J c #E6BF90",
|
||||
"K c #F1C187",
|
||||
"L c #F1C288",
|
||||
"P c #E5C093",
|
||||
"I c #EEC493",
|
||||
"U c #E1C19B",
|
||||
"Y c #E9C69C",
|
||||
"T c #ECC89D",
|
||||
"R c #F1C897",
|
||||
"E c #DFC5A4",
|
||||
"W c #DBCBB8",
|
||||
"Q c #E2C7A7",
|
||||
"! c #EBCBA6",
|
||||
"~ c #E6CBAB",
|
||||
"^ c #E9D2B7",
|
||||
"/ c #E5D1B9",
|
||||
"( c #EBD6BD",
|
||||
") c #EFD9BE",
|
||||
"_ c #DDD0C2",
|
||||
"` c #DCD7D2",
|
||||
"' c #DEDEDE",
|
||||
"] c #ECDAC5",
|
||||
"[ c #EDDECB",
|
||||
"{ c #E9E0D5",
|
||||
"} c #E7E0D9",
|
||||
"| c #E9E2DB",
|
||||
" . c #EFE8DF",
|
||||
".. c #E5E5E5",
|
||||
"X. c #EBE7E2",
|
||||
"o. c #EFEAE6",
|
||||
"O. c #ECECEC",
|
||||
"+. c #F2ECE6",
|
||||
"@. c #F1F0EE",
|
||||
"#. c #F4F4F4",
|
||||
"$. c #FBFBFB",
|
||||
"%. c None",
|
||||
/* pixels */
|
||||
"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.%.%.%.%.%.t 5 5 $ %.%.%.%.%.%.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.%.%.r u w q 9 9 9 8 4 # %.%.%.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.y s e 9 2 , , , : > 2 9 q 5 %.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.s q 2 , , , , : , > 2 2 > > 2 9 %.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.t e 1 , , , , : : ; > 2 9 9 2 , , > 2 + %.%.%.%.%.%.",
|
||||
"%.%.%.%.%.$ e 2 , , , , , , ; u u 8 1 1 2 > , , > > + %.%.%.%.%.",
|
||||
"%.%.%.%.%.e 2 , , : > ; ; > < ` ` 0 c n 1 2 , , , > , %.%.%.%.%.",
|
||||
"%.%.%.%.e 1 , , , , ; h v - 3 ..! w ' _ 9 2 > , , , > : %.%.%.%.",
|
||||
"%.%.%.6 q , : , > 2 > W ..| [ #.H V ..D 9 9 2 , , , , , % %.%.%.",
|
||||
"%.%.%.e 2 , > 2 2 2 9 b ! #.$.$.#.#.#.Y i 1 2 > , , , > ; %.%.%.",
|
||||
"%.%.@ q > 2 2 2 9 q e q 0 o.$.+.) { #.#.| b 2 2 , , , , : X %.%.",
|
||||
"%.%.4 9 2 2 9 q e e s w b O.#.( m x I @.$...f > > , , , : & %.%.",
|
||||
"%.%.8 > 2 2 9 e s d g a P #.#.L x l a [ $.#.A 2 2 , : , , ; %.%.",
|
||||
"%.+ 1 , , 2 2 q e d g f / $.#.T n k Z o.$.O.M 9 2 > , , , ; X %.",
|
||||
"%.* 2 , , , 2 9 q e s f X.$.#.O.O.O.#.$.+.Y g e 9 2 , , , ; o %.",
|
||||
"%.* 2 , , , 2 2 q e w n O.$.[ R ( O.$.$.[ d s e 9 2 2 , , ; o %.",
|
||||
"%.+ 2 , , , > 2 8 8 1 G #.#.T m m N ] #.#.~ s e e 9 2 > : ; X %.",
|
||||
"%.%.> , , , , 2 < v B [ $.O.m z z s b #.$...g e e q 9 2 ; = %.%.",
|
||||
"%.%.= : , , , : 7 ' O.#.$.@.C j p u ~ #.$.} g q 9 9 2 2 ; % %.%.",
|
||||
"%.%.o , , , , : 0 G ^ .$.#.O.X.{ X.#.$.#.Y e 9 2 2 > , ; %.%.",
|
||||
"%.%.%., : , , , 2 2 2 M O.) ] #.#.#.#.O./ d 9 2 > , , ; = %.%.%.",
|
||||
"%.%.%.& ; , , , , 2 ; Q ..g F O.K A H S s 9 2 > , : , ; o %.%.%.",
|
||||
"%.%.%.%.; ; , , , , 2 E _ d ' ..d q q 9 2 > , : , , ; = %.%.%.%.",
|
||||
"%.%.%.%.%.; : , , , 2 q d g U J e 2 2 > , , , , , ; = %.%.%.%.%.",
|
||||
"%.%.%.%.%.o ; : , , , 2 9 q 9 q 9 > , : , , , , ; = . %.%.%.%.%.",
|
||||
"%.%.%.%.%.%.. ; ; , , > 2 2 2 > , , , , , , , ; = %.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.= ; : > 2 2 , , : , , , , ; ; & %.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.. = ; > : , , , , ; ; = = X %.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.%.%. % = ; ; ; ; & O %.%.%.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.%.%.%.%.%. X X %.%.%.%.%.%.%.%.%.%.%.%.%.%.",
|
||||
"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%."
|
||||
};
|
||||
static char * bitcoin32_xpm[] = {
|
||||
"32 32 198 2",
|
||||
" c None",
|
||||
". c #FDFDFD",
|
||||
"+ c #FCFCFC",
|
||||
"@ c #FFFFFF",
|
||||
"# c #EDEFEF",
|
||||
"$ c #9DA7A8",
|
||||
"% c #839092",
|
||||
"& c #CFD4D4",
|
||||
"* c #FAFAFA",
|
||||
"= c #C2C9CA",
|
||||
"- c #5E6F71",
|
||||
"; c #43575A",
|
||||
"> c #526467",
|
||||
", c #405457",
|
||||
"' c #788688",
|
||||
") c #CAD0D0",
|
||||
"! c #F7F8F8",
|
||||
"~ c #E0E3E4",
|
||||
"{ c #828F91",
|
||||
"] c #3E5255",
|
||||
"^ c #707F81",
|
||||
"/ c #D4D8D9",
|
||||
"( c #EFF0F1",
|
||||
"_ c #B2BABB",
|
||||
": c #5F7072",
|
||||
"< c #3F5356",
|
||||
"[ c #728082",
|
||||
"} c #C5CBCC",
|
||||
"| c #F6F7F7",
|
||||
"1 c #F3F4F4",
|
||||
"2 c #ABB4B5",
|
||||
"3 c #4C5F61",
|
||||
"4 c #4F6264",
|
||||
"5 c #B0B8BA",
|
||||
"6 c #B8BFC0",
|
||||
"7 c #647477",
|
||||
"8 c #6C7C7E",
|
||||
"9 c #BFC6C7",
|
||||
"0 c #F4F5F5",
|
||||
"a c #6A7A7C",
|
||||
"b c #3F5355",
|
||||
"c c #889596",
|
||||
"d c #E4E7E7",
|
||||
"e c #F5F6F6",
|
||||
"f c #BEC5C6",
|
||||
"g c #6B7A7C",
|
||||
"h c #667678",
|
||||
"i c #B9C1C2",
|
||||
"j c #F2F3F3",
|
||||
"k c #E8EBEB",
|
||||
"l c #929E9F",
|
||||
"m c #415558",
|
||||
"n c #627275",
|
||||
"o c #C7CDCE",
|
||||
"p c #C4CACB",
|
||||
"q c #617274",
|
||||
"r c #B4BCBD",
|
||||
"s c #EFF1F1",
|
||||
"t c #B9C0C1",
|
||||
"u c #56686A",
|
||||
"v c #475A5D",
|
||||
"w c #A1ABAD",
|
||||
"x c #F1F2F2",
|
||||
"y c #F9F9F9",
|
||||
"z c #CACFD0",
|
||||
"A c #778587",
|
||||
"B c #5D6E70",
|
||||
"C c #B6BEBF",
|
||||
"D c #FBFCFC",
|
||||
"E c #FEFEFE",
|
||||
"F c #DADDDE",
|
||||
"G c #798789",
|
||||
"H c #3D5154",
|
||||
"I c #788788",
|
||||
"J c #DBDEDF",
|
||||
"K c #CFD4D5",
|
||||
"L c #596A6D",
|
||||
"M c #536568",
|
||||
"N c #A1ABAC",
|
||||
"O c #BAC1C2",
|
||||
"P c #EEF0F0",
|
||||
"Q c #435659",
|
||||
"R c #738284",
|
||||
"S c #EBEDED",
|
||||
"T c #6D7D7F",
|
||||
"U c #415557",
|
||||
"V c #929D9F",
|
||||
"W c #FAFBFB",
|
||||
"X c #C0C7C8",
|
||||
"Y c #5C6D6F",
|
||||
"Z c #44575A",
|
||||
"` c #98A3A5",
|
||||
" . c #D8DCDD",
|
||||
".. c #A9B2B4",
|
||||
"+. c #E3E6E6",
|
||||
"@. c #EBEDEE",
|
||||
"#. c #DEE2E2",
|
||||
"$. c #7F8C8E",
|
||||
"%. c #738183",
|
||||
"&. c #D8DCDC",
|
||||
"*. c #FCFDFD",
|
||||
"=. c #FDFEFE",
|
||||
"-. c #D9DDDE",
|
||||
";. c #45595B",
|
||||
">. c #BFC5C6",
|
||||
",. c #98A3A4",
|
||||
"'. c #A8B1B2",
|
||||
"). c #ECEEEE",
|
||||
"!. c #F2F3F4",
|
||||
"~. c #A6AFB1",
|
||||
"{. c #4A5D5F",
|
||||
"]. c #526466",
|
||||
"^. c #EAEDED",
|
||||
"/. c #AFB7B8",
|
||||
"(. c #939EA0",
|
||||
"_. c #818E90",
|
||||
":. c #939FA0",
|
||||
"<. c #DDE0E1",
|
||||
"[. c #808D8F",
|
||||
"}. c #A4AEAF",
|
||||
"|. c #657577",
|
||||
"1. c #8D999A",
|
||||
"2. c #E7E9E9",
|
||||
"3. c #6B7A7D",
|
||||
"4. c #273D40",
|
||||
"5. c #283F42",
|
||||
"6. c #97A1A3",
|
||||
"7. c #425659",
|
||||
"8. c #D5DADA",
|
||||
"9. c #A2ACAD",
|
||||
"0. c #E9EBEB",
|
||||
"a. c #E5E8E8",
|
||||
"b. c #8B9798",
|
||||
"c. c #677779",
|
||||
"d. c #CCD1D2",
|
||||
"e. c #EAECED",
|
||||
"f. c #94A0A1",
|
||||
"g. c #34494C",
|
||||
"h. c #475B5D",
|
||||
"i. c #435759",
|
||||
"j. c #899697",
|
||||
"k. c #DADEDF",
|
||||
"l. c #879495",
|
||||
"m. c #44585A",
|
||||
"n. c #506265",
|
||||
"o. c #9EA8AA",
|
||||
"p. c #E7EAEA",
|
||||
"q. c #B1B9BA",
|
||||
"r. c #506365",
|
||||
"s. c #4B5E60",
|
||||
"t. c #57686B",
|
||||
"u. c #A0AAAB",
|
||||
"v. c #9CA6A8",
|
||||
"w. c #516366",
|
||||
"x. c #D9DDDD",
|
||||
"y. c #8A9698",
|
||||
"z. c #46595C",
|
||||
"A. c #4E6163",
|
||||
"B. c #9DA7A9",
|
||||
"C. c #C6CCCD",
|
||||
"D. c #717F81",
|
||||
"E. c #808E8F",
|
||||
"F. c #E0E3E3",
|
||||
"G. c #DADEDE",
|
||||
"H. c #D7DCDC",
|
||||
"I. c #FBFBFB",
|
||||
"J. c #E8EAEA",
|
||||
"K. c #A4ADAF",
|
||||
"L. c #536567",
|
||||
"M. c #859294",
|
||||
"N. c #D7DBDC",
|
||||
"O. c #DDE1E1",
|
||||
"P. c #8E9A9C",
|
||||
"Q. c #485B5E",
|
||||
"R. c #384D50",
|
||||
"S. c #C2C8C9",
|
||||
"T. c #E9EBEC",
|
||||
"U. c #A5AFB0",
|
||||
"V. c #546668",
|
||||
"W. c #D6DADB",
|
||||
"X. c #DEE1E2",
|
||||
"Y. c #B7BFC0",
|
||||
"Z. c #A9B2B3",
|
||||
"`. c #425658",
|
||||
" + c #E1E4E4",
|
||||
".+ c #6E7D7F",
|
||||
"++ c #D1D5D6",
|
||||
"@+ c #AAB3B4",
|
||||
"#+ c #57696B",
|
||||
"$+ c #7F8D8E",
|
||||
"%+ c #D3D8D8",
|
||||
"&+ c #F0F2F2",
|
||||
"*+ c #AFB8B9",
|
||||
"=+ c #ACB5B6",
|
||||
"-+ c #596B6D",
|
||||
";+ c #ADB5B7",
|
||||
">+ c #7B898B",
|
||||
",+ c #C8CDCE",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" . + ",
|
||||
" @ # $ % & * ",
|
||||
" * = - ; > , ' ) ! ",
|
||||
" @ ~ { ] ^ / ( _ : < [ } | ",
|
||||
" 1 2 3 4 5 | @ @ @ 1 6 7 ] 8 9 0 @ ",
|
||||
" . & a b c d @ @ @ @ @ @ @ e f g ] h i j @ ",
|
||||
" @ k l m n o + @ @ @ @ @ @ @ @ @ @ ! p ^ < q r s @ ",
|
||||
" ! t u v w x @ @ @ @ @ @ @ @ @ @ @ @ @ @ y z A , B C D ",
|
||||
" E F G H I J @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ + K L M s ",
|
||||
"@ s N v u O y @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ P $ Q R e ",
|
||||
"S T U V S @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ W X Y Z ` # @ ",
|
||||
" .m ..@ +.@.@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ #.$.] %.&.@ @ *.=.",
|
||||
"-.;.>.@ ,.M '.).@ @ @ @ @ @ @ @ @ @ @ @ @ !.~.{.].r ^./.(._.:.0 ",
|
||||
"-.;.>.@ <.[.m M }.^.@ @ @ @ @ @ @ @ @ *.) |., 1.2.@ e 3.4.5.6.@ ",
|
||||
" .7./.@ @ + 8.% 7.].9.0.@ @ @ @ @ @ a.b.< c.d.. @ e.f.Q g.h.#. ",
|
||||
"a.- i.j.k.. @ *.&.l.m.n.o.p.@ @ | q.r.s.'.1 @ y O t.;.u._ v.=. ",
|
||||
"@ p.N w.m.c x.. @ . k.y.z.A.B.C.D.] E.F.@ E G.' H A H.E I.| ",
|
||||
" @ J.K.L.; M.N.*.@ . O.P.Q.R.- S.W @ s o.z.u t ! ",
|
||||
" @ T.U.V.Q % W.+ @ E X.Y.# @ I.p : m (.k @ ",
|
||||
" @ e.Z.u `._./ + @ @ @ +{ ] .+++. ",
|
||||
" @ ).@+#+m $+%+&+@+3 4 *+0 ",
|
||||
" @ ).=+-+7.M , j.+.@ ",
|
||||
" @ # ;+>+,+D ",
|
||||
" E D ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.2 KiB |
@@ -1,242 +1,406 @@
|
||||
/* XPM */
|
||||
static char *bitcoin__[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"64 64 172 2",
|
||||
" c #8F6319",
|
||||
". c #8F6A1A",
|
||||
"X c #90651A",
|
||||
"o c #916C1A",
|
||||
"O c #AF7C1E",
|
||||
"+ c #B1781E",
|
||||
"@ c #9A7026",
|
||||
"# c #AC801F",
|
||||
"$ c #B1811F",
|
||||
"% c #A9812B",
|
||||
"& c #B08320",
|
||||
"* c #BB8621",
|
||||
"= c #BD8E22",
|
||||
"- c #A58132",
|
||||
"; c #FC8400",
|
||||
": c #FD8A03",
|
||||
"> c #FD8E0C",
|
||||
", c #FF910E",
|
||||
"< c #F98F14",
|
||||
"1 c #F79117",
|
||||
"2 c #FD9314",
|
||||
"3 c #FC951B",
|
||||
"4 c #FE9A1D",
|
||||
"5 c #CA8E22",
|
||||
"6 c #CC8E2A",
|
||||
"7 c #D48D23",
|
||||
"8 c #C39223",
|
||||
"9 c #CE9925",
|
||||
"0 c #D19C25",
|
||||
"q c #D19329",
|
||||
"w c #D5992B",
|
||||
"e c #DD9D33",
|
||||
"r c #D69F3C",
|
||||
"t c #E29425",
|
||||
"y c #E79925",
|
||||
"u c #EA9926",
|
||||
"i c #E69A2C",
|
||||
"p c #F79625",
|
||||
"a c #F99524",
|
||||
"s c #F79825",
|
||||
"d c #F89825",
|
||||
"f c #F3962A",
|
||||
"g c #F69B2C",
|
||||
"h c #F89B2B",
|
||||
"j c #E19F30",
|
||||
"k c #EE9B34",
|
||||
"l c #F49D33",
|
||||
"z c #F99E32",
|
||||
"x c #F39F3B",
|
||||
"c c #DFA731",
|
||||
"v c #D7A43D",
|
||||
"b c #DCA63C",
|
||||
"n c #EEA328",
|
||||
"m c #FFA225",
|
||||
"M c #FFAB26",
|
||||
"N c #F3A529",
|
||||
"B c #FEA429",
|
||||
"V c #F4AB2A",
|
||||
"C c #FFAC2A",
|
||||
"Z c #FFB325",
|
||||
"A c #FFB42C",
|
||||
"S c #FFBB2D",
|
||||
"D c #E3A335",
|
||||
"F c #E5A438",
|
||||
"G c #EDA03D",
|
||||
"H c #F7A037",
|
||||
"J c #FAA135",
|
||||
"K c #F3AB31",
|
||||
"L c #FEAB31",
|
||||
"P c #F4A13C",
|
||||
"I c #F9A33B",
|
||||
"U c #FDB432",
|
||||
"Y c #FFBF37",
|
||||
"T c #FFC12F",
|
||||
"R c #FFC230",
|
||||
"E c #FFC03E",
|
||||
"W c #DFAF41",
|
||||
"Q c #ECA34D",
|
||||
"! c #EDA84E",
|
||||
"~ c #F2A343",
|
||||
"^ c #FAA642",
|
||||
"/ c #FAA846",
|
||||
"( c #F1A74C",
|
||||
") c #F6A94F",
|
||||
"_ c #FAAA4A",
|
||||
"` c #E7A451",
|
||||
"' c #ECA754",
|
||||
"] c #EFAA56",
|
||||
"[ c #ECAC5B",
|
||||
"{ c #F3AA52",
|
||||
"} c #FCAE52",
|
||||
"| c #FBB056",
|
||||
" . c #FBB25C",
|
||||
".. c #E7AB61",
|
||||
"X. c #ECB067",
|
||||
"o. c #E7B36D",
|
||||
"O. c #EBB36C",
|
||||
"+. c #F2B163",
|
||||
"@. c #FCB460",
|
||||
"#. c #F0B56B",
|
||||
"$. c #E3B274",
|
||||
"%. c #EDB672",
|
||||
"&. c #EDB877",
|
||||
"*. c #E2B57C",
|
||||
"=. c #ECB97B",
|
||||
"-. c #E4BA83",
|
||||
";. c #EBBD83",
|
||||
":. c #E7BF8D",
|
||||
">. c #EBBD88",
|
||||
",. c #E9C08C",
|
||||
"<. c #E7C496",
|
||||
"1. c #EBC393",
|
||||
"2. c #EBC997",
|
||||
"3. c #E7C49A",
|
||||
"4. c #E9C69A",
|
||||
"5. c #E3CA9D",
|
||||
"6. c #E9C89E",
|
||||
"7. c #DCC9AE",
|
||||
"8. c #DDCBB2",
|
||||
"9. c #E3C7A2",
|
||||
"0. c #E5CAA3",
|
||||
"q. c #E9CBA3",
|
||||
"w. c #E5CEAB",
|
||||
"e. c #E8CEAA",
|
||||
"r. c #E4D4AC",
|
||||
"t. c #EBD2AF",
|
||||
"y. c #E7CFB2",
|
||||
"u. c #E1D4B4",
|
||||
"i. c #E8D5B6",
|
||||
"p. c #E5D7BB",
|
||||
"a. c #E9D6BB",
|
||||
"s. c #E5D8B9",
|
||||
"d. c #EAD8BE",
|
||||
"f. c #F0D6B4",
|
||||
"g. c #DFDFC6",
|
||||
"h. c #E3D6C1",
|
||||
"j. c #E9D7C0",
|
||||
"k. c #E6DAC5",
|
||||
"l. c #EBDCC7",
|
||||
"z. c #E5DCCA",
|
||||
"x. c #EADEC9",
|
||||
"c. c #E8DFD0",
|
||||
"v. c #D7E2D9",
|
||||
"b. c #E3E0C9",
|
||||
"n. c #EEE2CB",
|
||||
"m. c #E6E1D4",
|
||||
"M. c #E9E2D3",
|
||||
"N. c #E4E4DC",
|
||||
"B. c #E9E5DE",
|
||||
"V. c #F4EDDE",
|
||||
"C. c #DFE8E6",
|
||||
"Z. c #DEEEE8",
|
||||
"A. c #DFF2F3",
|
||||
"S. c #DDFFFF",
|
||||
"D. c #E1E6E0",
|
||||
"F. c #E8E6E2",
|
||||
"G. c #E8E9E5",
|
||||
"H. c #E5EFEC",
|
||||
"J. c #E8E9EA",
|
||||
"K. c #EAF3EE",
|
||||
"L. c #F3F3EB",
|
||||
"P. c #E7EDF2",
|
||||
"I. c #E8EEF3",
|
||||
"U. c #E7F4F7",
|
||||
"Y. c #E9F0F7",
|
||||
"T. c #EBF5FD",
|
||||
"R. c #E4FEFF",
|
||||
"E. c #ECFCFF",
|
||||
"W. c #F4F5F4",
|
||||
"Q. c #F4FFFF",
|
||||
"!. c #FEFFFF",
|
||||
"~. c None",
|
||||
/* pixels */
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.F L h C C A A A A C C h L e ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.D N C m d d a a p a a p a a d m m C N j ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.- K M m a p s d d d d d d d d d d d d s p d m M V % ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.Y M d a d d d d d d d d d d d d d d d d h h d s a d M U ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.E m 4 a d d d d d d d d d d d d d d d d d d h h h d d d a d M U ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.C 4 a d d d d d d d d d d d d d d d d d h h h h h h d d d d d a m C ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.W S a p d d d d d d d d d d d d d d d d h h h h g g h h h d d d d d p a S c ~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.v M a s d d d d d d d d d d d d d d d h h h h h g z z g h h d d d d d d s a C w ~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.r Z a d d d d d d d d d d d d d d d g 4 : 2 h z z z z z h h h h d d d d d d d a S q ~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.b Z a d d d d d d d d d d d d d d h h 4 x $.l a z H h h H z h h h d d d d d d d d a A w ~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.T a s d d d d d d d d d d d d h h h g : $.R.T.7.a B x f > a H h h d d d d d d d d s a R ~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.U a s d d d d d d d d d d d d h h h h z : e.!.!.p.2 3 8.D.5.' a h h h d d d d d d d d p d A ~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.U M p d d d d d d d d d d h h 1 : : 2 h h p B.!.Q.%., l J.!.R.-.> z h h h d d d d d d d d p C N ~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.S a d d d d d d d d d d h d 3 7.r.O.G p ; k E.!.T.( , [ E.!.T.~ 4 z h h h d d d d d d d d d a S ~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.V d s d d d d d d d d h h h 2 l E.!.Q.T.m.:.q.!.!.l.: : -.Q.!.c.a z z z g h h d d d d d d d d s m A ~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.@ S a d d d d d d d h h h h z : *.R.!.!.!.!.Q.!.!.!.V.,.Q d.!.Q.1.2 I z z h h h d d d d d d d d d a S X ~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.U d s d d d d d h h h h h g z a [ 5.M.Q.!.!.!.!.!.!.!.Q.E.!.!.Q.&.; 3 J H z h h h d d d d d d d d s h C ~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.S a d d d d h h h h h h z z z I d > < %.W.!.!.!.!.!.!.!.!.!.!.!.W.s.[ > 4 H g h h d d d d d d d d d a S ~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.i M p d d d h h h h g z z z z J H I I J > x.!.!.!.!.Q.T.E.Q.!.!.!.!.!.E.u.f 2 H h h h d d d d d d d d p C 7 ~.~.~.~.~.",
|
||||
"~.~.~.~.~.C a d h h h h h g g z z z J J I I I I J P J.!.!.!.!.d.P =.e.G.E.!.!.!.!.Q.Z.f 2 z h h d d d d d d d d d d A ~.~.~.~.~.",
|
||||
"~.~.~.~.~.A a h h h h h g z z z J H I I I I ^ / d X.E.!.!.!.Q.1.4 I J I ;.U.!.!.!.!.!.N.1 h g h h d d d d d d d d a S ~.~.~.~.~.",
|
||||
"~.~.~.~.6 C p d h h h z z J J J I I I I ^ ^ ^ _ a 3.Q.!.!.!.E.#.I . ._ 3 ] K.!.!.!.!.E.O., z h h h d d d d d d d p A + ~.~.~.~.",
|
||||
"~.~.~.~.i B d d h h h g z J I I I I ^ ^ ^ / / _ h k.!.!.!.!.J.) } . .| .3 6.Q.!.!.!.Q.q.> z g h h d d d d d d d d B t ~.~.~.~.",
|
||||
"~.~.~.~.B d d d d h h h z z J I I ^ / / / _ _ ^ ( I.!.!.!.Q.d.I . . .| .d 1.Q.!.!.!.Q.q.2 z h h h d d d d d d d d d B ~.~.~.~.",
|
||||
"~.~.~.~.C a d d d d h h g z J H I ^ ^ / _ _ } J %.E.!.!.!.Q.;.4 _ } | } J f m.!.!.!.!.Q.;.2 J z g h h d d d d d d d a A ~.~.~.~.",
|
||||
"~.~.~.~.C a d d d d h h h z z J I I ^ ^ / _ } z 6.Q.!.!.!.!.n.<.&.+.{ ) ] h.Q.!.!.!.!.R.~ d H z z h h h d d d d d d a A ~.~.~.~.",
|
||||
"~.~.~.~.A a d d d d d h h g z z H I I ^ / _ _ z k.!.!.!.!.!.!.Q.E.I.F.F.T.Q.!.!.!.!.E.9.2 I J z z h h h d d d d d d d A ~.~.~.~.",
|
||||
"~.~.~.~.S a d d d d d h h h z z J I I ^ ^ / I ( P.!.!.!.!.Q.Q.!.!.!.!.!.!.!.!.!.!.E.w.d J I I J z h h h d d d d d d d A ~.~.~.~.",
|
||||
"~.~.~.~.A a d d d d d d h h h z J J I I ^ / h O.E.!.!.!.Q.f.1.z.Y.E.!.!.!.!.!.!.L.! , ^ / I I H z z h h h d d d d d d A ~.~.~.~.",
|
||||
"~.~.~.~.S p d d d d d d h h h z z J I I ^ / d <.Q.!.!.!.E.+.d _ +.>.k.E.!.!.!.!.Q.s.P J _ ^ I I J z z h h h d d d d d A ~.~.~.~.",
|
||||
"~.~.~.~.C a d d d d d d d h h g z z H I I ^ d k.!.!.!.!.J.{ | @.} I I O.H.!.!.!.!.Q.C.l I ^ I I H J z g h h d d d d a A ~.~.~.~.",
|
||||
"~.~.~.~.B a d d d d d d d h h h h z z J I J x P.!.!.!.Q.j.I . . . . .B { K.!.!.!.!.Q.0.a / ^ I I J z z h h h d d d a A ~.~.~.~.",
|
||||
"~.~.~.~.B d d d d d d d d d h h h J h f 2 ; [ E.!.!.!.Q.1.I . . .| | .d 4.Q.!.!.!.!.m.z I ^ I I I J z h h h h d d d B ~.~.~.~.",
|
||||
"~.~.~.~.u B d d d d d d d d h h z , ' v.q.X.M.!.!.!.!.E.#.^ . .| } } } d >.Q.!.!.!.!.F.x J I I I J J z z h h h d d C t ~.~.~.~.",
|
||||
"~.~.~.~.7 C p d d d d d d d d h h : y.Q.Q.Q.!.!.!.!.!.B.d B / _ } } } J 1 k.!.!.!.!.!.c.s J I H J J z z z h h h h s A + ~.~.~.~.",
|
||||
"~.~.~.~.~.A a d d d d d d d d h > ` R.!.!.!.!.!.!.!.!.L.q.=.[ ~ z h h l 0.Q.!.!.!.!.Q.q.2 I J J z z h h h h h h h a S ~.~.~.~.~.",
|
||||
"~.~.~.~.~.C d d d d d d d d d d > ..g.Y.E.Q.!.!.!.!.!.!.Q.E.T.B.k.a.d.P.Q.!.!.!.!.!.E.[ 2 J z z z g h h h h d d d d C ~.~.~.~.~.",
|
||||
"~.~.~.~.~.y C p d d d d d d d d g 3 > l [ <.x.W.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.Q.z.> z z z h h h h h d d d d p C 7 ~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.S a d d d d d d d d d h h 3 , > ; =.Q.!.W.T.Q.!.!.!.!.!.!.!.!.!.!.!.Q.A.g 2 z h h h h h h d d d d d a S ~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.C h s d d d d d d d d d h g z H : <.!.!.t.l &.V.!.!.Q.Q.Q.Q.!.Q.Q.E.b.l > H h h h h h d d d d d d s m C ~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.X S a d d d d d d d d d h h h h p N.!.Q.=.: < c.!.Q.2.&.e.a.d.i.6.[ < 2 z h h h h d d d d d d d d a S ~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.A h s d d d d d d d d d h g 2 ~ E.!.E.{ 2 [ E.!.T.l : 2 1 3 2 > > h z h h h h d d d d d d d d s m A ~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.S a d d d d d d d d d h h : -.R.!.B.h 2 =.Q.!.M.p z z z h h z g h h h d d d d d d d d d d d a S ~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.N C p d d d d d d d d d h 3 ' 2.N.9.2 3 z.!.!.q.> J z h h h h h h d d d d d d d d d d d d p C n ~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.S h p d d d d d d d d d z 3 : p l J g 8.T.S.O.> z h h h h h d d d d d d d d d d d d d p h S ~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.S a s d d d d d d d d h h z d h I J a P o.P d g h h h d d d d d d d d d d d d d d s a S ~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.* S a s d d d d d d d d h h g z J J h 3 > d z h h h d d d d d d d d d d d d d d s a S * ~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.$ T a s d d d d d d d h h h z z z h g g h h d d d d d d d d d d d d d d d d s a T O ~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.& S a p d d d d d d h h h z g h h h h h d d d d d d d d d d d d d d d d p a S # ~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.8 S d p d d d d d d h h g h h h h d d d d d d d d d d d d d d d d d p h S = ~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.S A a s d d d d h h h h h d d d d d d d d d d d d d d d d d s a A S ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.0 T m p d d d d h h h d d d d d d d d d d d d d d d d d p B S 9 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.V S m a p d h d d d d d d d d d d d d d d d d p a m S V ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.o V S C d p p d d d d d d d d d d d d p p d C S N . ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.5 C S A B d d a a d d a a a d B A S C 5 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.O t B A A A A A A A A B t O ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.",
|
||||
"~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~."
|
||||
};
|
||||
static char * bitcoin64_xpm[] = {
|
||||
"64 64 339 2",
|
||||
" c None",
|
||||
". c #FFFFFF",
|
||||
"+ c #FAFAFA",
|
||||
"@ c #BFC6C7",
|
||||
"# c #9EA8A9",
|
||||
"$ c #DEE1E2",
|
||||
"% c #FDFEFE",
|
||||
"& c #DFE3E3",
|
||||
"* c #828F91",
|
||||
"= c #384D50",
|
||||
"- c #2C4245",
|
||||
"; c #485B5E",
|
||||
"> c #8F9B9D",
|
||||
", c #DCDFE0",
|
||||
"' c #FDFDFD",
|
||||
") c #F3F4F5",
|
||||
"! c #ABB4B5",
|
||||
"~ c #4D6062",
|
||||
"{ c #2B4144",
|
||||
"] c #2A4043",
|
||||
"^ c #2A4144",
|
||||
"/ c #294043",
|
||||
"( c #45585B",
|
||||
"_ c #8B9799",
|
||||
": c #D8DCDC",
|
||||
"< c #FCFCFC",
|
||||
"[ c #FCFDFD",
|
||||
"} c #CDD2D3",
|
||||
"| c #6C7C7E",
|
||||
"1 c #314649",
|
||||
"2 c #2D4346",
|
||||
"3 c #5B6C6F",
|
||||
"4 c #526467",
|
||||
"5 c #2E4447",
|
||||
"6 c #293F42",
|
||||
"7 c #425558",
|
||||
"8 c #849192",
|
||||
"9 c #D2D6D7",
|
||||
"0 c #FAFBFB",
|
||||
"a c #E8EAEA",
|
||||
"b c #919D9E",
|
||||
"c c #3F5356",
|
||||
"d c #415557",
|
||||
"e c #95A0A2",
|
||||
"f c #E9ECEC",
|
||||
"g c #E7E9EA",
|
||||
"h c #A3ADAE",
|
||||
"i c #56686A",
|
||||
"j c #2F4548",
|
||||
"k c #3E5355",
|
||||
"l c #7D8A8C",
|
||||
"m c #CCD1D2",
|
||||
"n c #F9FAFA",
|
||||
"o c #F8F9F9",
|
||||
"p c #B8BFC0",
|
||||
"q c #57696B",
|
||||
"r c #31474A",
|
||||
"s c #6F7E80",
|
||||
"t c #D0D5D6",
|
||||
"u c #EBEDEE",
|
||||
"v c #5B6D6F",
|
||||
"w c #304649",
|
||||
"x c #3B5053",
|
||||
"y c #778688",
|
||||
"z c #C9CECF",
|
||||
"A c #FEFEFE",
|
||||
"B c #D9DDDE",
|
||||
"C c #7A888A",
|
||||
"D c #354A4D",
|
||||
"E c #4F6164",
|
||||
"F c #ADB5B6",
|
||||
"G c #F4F5F6",
|
||||
"H c #EFF0F1",
|
||||
"I c #AFB7B9",
|
||||
"J c #5F7072",
|
||||
"K c #32484B",
|
||||
"L c #394E50",
|
||||
"M c #728183",
|
||||
"N c #C3CACA",
|
||||
"O c #F6F7F7",
|
||||
"P c #EFF1F1",
|
||||
"Q c #A1ABAC",
|
||||
"R c #475A5D",
|
||||
"S c #3A4E51",
|
||||
"T c #859294",
|
||||
"U c #E1E4E4",
|
||||
"V c #F0F2F2",
|
||||
"W c #B5BCBE",
|
||||
"X c #657577",
|
||||
"Y c #34494C",
|
||||
"Z c #364B4E",
|
||||
"` c #6D7C7E",
|
||||
" . c #BDC4C5",
|
||||
".. c #FBFBFB",
|
||||
"+. c #C4CACB",
|
||||
"@. c #637476",
|
||||
"#. c #627275",
|
||||
"$. c #C3C9CA",
|
||||
"%. c #F3F4F4",
|
||||
"&. c #BBC3C4",
|
||||
"*. c #6C7B7D",
|
||||
"=. c #344A4D",
|
||||
"-. c #667679",
|
||||
";. c #B6BEBF",
|
||||
">. c #F1F2F3",
|
||||
",. c #E3E6E6",
|
||||
"'. c #889496",
|
||||
"). c #3B4F52",
|
||||
"!. c #46595C",
|
||||
"~. c #9FA9AA",
|
||||
"{. c #EFF0F0",
|
||||
"]. c #718082",
|
||||
"^. c #33484B",
|
||||
"/. c #617174",
|
||||
"(. c #B1B9BA",
|
||||
"_. c #F5F6F6",
|
||||
":. c #B0B8B9",
|
||||
"<. c #516365",
|
||||
"[. c #2B4245",
|
||||
"}. c #778587",
|
||||
"|. c #D7DBDC",
|
||||
"1. c #C7CDCD",
|
||||
"2. c #768486",
|
||||
"3. c #293F43",
|
||||
"4. c #5C6D70",
|
||||
"5. c #ACB5B6",
|
||||
"6. c #ECEEEE",
|
||||
"7. c #D1D6D7",
|
||||
"8. c #B5BDBE",
|
||||
"9. c #F7F8F8",
|
||||
"0. c #F9F9FA",
|
||||
"a. c #CBD1D2",
|
||||
"b. c #58696C",
|
||||
"c. c #A6AFB0",
|
||||
"d. c #E8EBEB",
|
||||
"e. c #EAECED",
|
||||
"f. c #96A1A3",
|
||||
"g. c #425658",
|
||||
"h. c #3E5255",
|
||||
"i. c #E6E9E9",
|
||||
"j. c #839092",
|
||||
"k. c #415558",
|
||||
"l. c #536568",
|
||||
"m. c #9EA8AA",
|
||||
"n. c #E4E7E8",
|
||||
"o. c #BCC3C4",
|
||||
"p. c #6A7A7C",
|
||||
"q. c #8A9698",
|
||||
"r. c #44585B",
|
||||
"s. c #A9B2B4",
|
||||
"t. c #DDE0E1",
|
||||
"u. c #7F8D8E",
|
||||
"v. c #374C4E",
|
||||
"w. c #4B5E61",
|
||||
"x. c #A7B0B2",
|
||||
"y. c #DBDFDF",
|
||||
"z. c #8F9B9C",
|
||||
"A. c #495C5F",
|
||||
"B. c #273E41",
|
||||
"C. c #4A5D60",
|
||||
"D. c #384C4F",
|
||||
"E. c #808D8F",
|
||||
"F. c #C8CECE",
|
||||
"G. c #435759",
|
||||
"H. c #283F42",
|
||||
"I. c #667779",
|
||||
"J. c #C9CFCF",
|
||||
"K. c #68787A",
|
||||
"L. c #5E6F71",
|
||||
"M. c #BFC5C6",
|
||||
"N. c #C0C6C7",
|
||||
"O. c #283E41",
|
||||
"P. c #657578",
|
||||
"Q. c #E6E8E9",
|
||||
"R. c #8D999B",
|
||||
"S. c #3D5154",
|
||||
"T. c #435659",
|
||||
"U. c #99A4A5",
|
||||
"V. c #DEE2E2",
|
||||
"W. c #818E90",
|
||||
"X. c #FEFEFF",
|
||||
"Y. c #546668",
|
||||
"Z. c #D3D8D8",
|
||||
"`. c #F2F3F4",
|
||||
" + c #A8B1B3",
|
||||
".+ c #4C5F61",
|
||||
"++ c #374C4F",
|
||||
"@+ c #7D8B8D",
|
||||
"#+ c #DCE0E0",
|
||||
"$+ c #DADEDE",
|
||||
"%+ c #B0B9BA",
|
||||
"&+ c #CAD0D0",
|
||||
"*+ c #6A797B",
|
||||
"=+ c #F9F9F9",
|
||||
"-+ c #D5D9DA",
|
||||
";+ c #E3E6E7",
|
||||
">+ c #E5E7E8",
|
||||
",+ c #8D989A",
|
||||
"'+ c #3D5254",
|
||||
")+ c #99A3A5",
|
||||
"!+ c #EBEDED",
|
||||
"~+ c #D5DADA",
|
||||
"{+ c #3A4F52",
|
||||
"]+ c #909C9D",
|
||||
"^+ c #DFE2E3",
|
||||
"/+ c #B2BABB",
|
||||
"(+ c #748284",
|
||||
"_+ c #D4D9D9",
|
||||
":+ c #909B9D",
|
||||
"<+ c #E1E4E5",
|
||||
"[+ c #425659",
|
||||
"}+ c #485B5D",
|
||||
"|+ c #939EA0",
|
||||
"1+ c #D4D8D9",
|
||||
"2+ c #738284",
|
||||
"3+ c #B3BBBC",
|
||||
"4+ c #DCE0E1",
|
||||
"5+ c #CFD4D5",
|
||||
"6+ c #C1C8C9",
|
||||
"7+ c #B1B9BB",
|
||||
"8+ c #B0B8BA",
|
||||
"9+ c #F3F5F5",
|
||||
"0+ c #E0E3E3",
|
||||
"a+ c #283E42",
|
||||
"b+ c #98A3A4",
|
||||
"c+ c #8C989A",
|
||||
"d+ c #69797B",
|
||||
"e+ c #32474A",
|
||||
"f+ c #798789",
|
||||
"g+ c #9CA6A8",
|
||||
"h+ c #4C5F62",
|
||||
"i+ c #D9DDDD",
|
||||
"j+ c #5C6D6F",
|
||||
"k+ c #7E8C8D",
|
||||
"l+ c #9BA6A7",
|
||||
"m+ c #4F6264",
|
||||
"n+ c #44585A",
|
||||
"o+ c #899597",
|
||||
"p+ c #D8DCDD",
|
||||
"q+ c #4C5E61",
|
||||
"r+ c #A8B1B2",
|
||||
"s+ c #6E7D7F",
|
||||
"t+ c #516366",
|
||||
"u+ c #889596",
|
||||
"v+ c #A4AEAF",
|
||||
"w+ c #2F4447",
|
||||
"x+ c #2C4346",
|
||||
"y+ c #788688",
|
||||
"z+ c #A0AAAC",
|
||||
"A+ c #FBFCFC",
|
||||
"B+ c #C7CCCD",
|
||||
"C+ c #667678",
|
||||
"D+ c #3E5254",
|
||||
"E+ c #384D4F",
|
||||
"F+ c #5D6E70",
|
||||
"G+ c #ADB6B7",
|
||||
"H+ c #EDEFEF",
|
||||
"I+ c #E9EBEB",
|
||||
"J+ c #A5AFB0",
|
||||
"K+ c #57686B",
|
||||
"L+ c #405457",
|
||||
"M+ c #D1D6D6",
|
||||
"N+ c #E2E5E5",
|
||||
"O+ c #9AA4A6",
|
||||
"P+ c #869394",
|
||||
"Q+ c #677779",
|
||||
"R+ c #EEF0F0",
|
||||
"S+ c #849193",
|
||||
"T+ c #5B6C6E",
|
||||
"U+ c #A9B2B3",
|
||||
"V+ c #596A6D",
|
||||
"W+ c #304548",
|
||||
"X+ c #2A4044",
|
||||
"Y+ c #506265",
|
||||
"Z+ c #D7DBDB",
|
||||
"`+ c #5D6E71",
|
||||
" @ c #637375",
|
||||
".@ c #CED3D4",
|
||||
"+@ c #FBFBFC",
|
||||
"@@ c #808E8F",
|
||||
"#@ c #5A6B6D",
|
||||
"$@ c #EDEEEF",
|
||||
"%@ c #ACB4B5",
|
||||
"&@ c #7C8A8C",
|
||||
"*@ c #707F81",
|
||||
"=@ c #56676A",
|
||||
"-@ c #B6BDBE",
|
||||
";@ c #DDE1E1",
|
||||
">@ c #9FA9AB",
|
||||
",@ c #D3D7D8",
|
||||
"'@ c #596A6C",
|
||||
")@ c #AEB7B8",
|
||||
"!@ c #3C5053",
|
||||
"~@ c #C2C8C9",
|
||||
"{@ c #95A0A1",
|
||||
"]@ c #4B5D60",
|
||||
"^@ c #7B898B",
|
||||
"/@ c #D4D9DA",
|
||||
"(@ c #869294",
|
||||
"_@ c #A5AEB0",
|
||||
":@ c #F0F1F2",
|
||||
"<@ c #627375",
|
||||
"[@ c #FCFCFD",
|
||||
"}@ c #BBC2C3",
|
||||
"|@ c #546669",
|
||||
"1@ c #E9EBEC",
|
||||
"2@ c #F2F3F3",
|
||||
"3@ c #B7BFC0",
|
||||
"4@ c #4E6063",
|
||||
"5@ c #899697",
|
||||
"6@ c #97A2A4",
|
||||
"7@ c #EAEDED",
|
||||
"8@ c #44575A",
|
||||
"9@ c #A2ACAD",
|
||||
"0@ c #E8EAEB",
|
||||
"a@ c #B9C0C1",
|
||||
"b@ c #E0E4E4",
|
||||
"c@ c #728082",
|
||||
"d@ c #D2D7D8",
|
||||
"e@ c #45595C",
|
||||
"f@ c #A0AAAB",
|
||||
"g@ c #506365",
|
||||
"h@ c #9DA7A8",
|
||||
"i@ c #E4E7E7",
|
||||
"j@ c #949FA1",
|
||||
"k@ c #929D9F",
|
||||
"l@ c #4E6163",
|
||||
"m@ c #9AA5A6",
|
||||
"n@ c #6A797C",
|
||||
"o@ c #DFE2E2",
|
||||
"p@ c #4D5F62",
|
||||
"q@ c #F2F4F4",
|
||||
"r@ c #4B5E60",
|
||||
"s@ c #394E51",
|
||||
"t@ c #97A2A3",
|
||||
"u@ c #627274",
|
||||
"v@ c #9BA5A7",
|
||||
"w@ c #354B4D",
|
||||
"x@ c #F8F8F8",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" . . ",
|
||||
" . . . . . . . ",
|
||||
" . . + @ # $ % . . . ",
|
||||
" . . . & * = - ; > , ' . . . ",
|
||||
" . . . ) ! ~ { ] ^ / { ( _ : < . . . ",
|
||||
" . . [ } | 1 / 2 3 _ 4 5 6 ^ 7 8 9 0 . . . ",
|
||||
" . . . a b c ] ] d e f . g h i j 6 ] k l m n . . . ",
|
||||
" . . . o p q 2 / r s t ' . . . . u ! v w / ] x y z o . . . ",
|
||||
" . . A B C D ] { E F G . . . . . . . . H I J K / ] L M N O . . . ",
|
||||
" . . . P Q R ^ ] S T U . . . . . . . . . . . . V W X Y / / Z ` .) . . . ",
|
||||
" . . ..+.@.j / 5 #.$.0 . . . . . . . . . . . . . . . %.&.*.Z / / =.-.;.>.. . . ",
|
||||
" . . . ,.'.).] ^ !.~.{.. . . . . . . . . . . . . . . . . . . O $.].= ] / ^./.(.P . . . ",
|
||||
" . . . _.:.<.[.] Y }.|.A . . . . . . . . . . . . . . . . . . . . . . o 1.2.).] 3.1 4.5.6.. . . ",
|
||||
" . . ' 7.].K / - i 8.9.. . . . . . . . . . . . . . . . . . . . . . . . . . 0.a.l k ] 6 j b.c.d.. . . ",
|
||||
" . . . e.f.g.] ] h.> i.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 0 7.j.k.^ 6 5 l.m.n.A . . ",
|
||||
" . . . n o.3 2 / w p.m [ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . < |.q.r.{ 6 2 ~ s.A . ",
|
||||
" . . . t.u.v.] { w.x.%.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ' y.z.A.5 B.X 0 . ",
|
||||
" . . . >.c.C.^ / D.E.t.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . F.G.H.I.0 . ",
|
||||
" . . < J.K.w / 2 L.M.n . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . n N./.w O.P.0 . ",
|
||||
". . . Q.R.S.] ] T.U.6.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . V.W.= ] { A.:.X.. ",
|
||||
". + 8.Y.- ] ^.M Z.A . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . `. +.+{ ] ++@+#+. . . ",
|
||||
". $+c ] 2 4 %+_.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . < &+*+w / 2 4.o.=+. . . . ",
|
||||
". -+S ] p.;+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . >+,+'+] ] G.)+!+. . . . . . . ",
|
||||
". ~+{+/ ]+. . . 6.x.^+A . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . O /+l.- / ^.(+_+A . . . . . . . . . ",
|
||||
". ~+{+/ :+. . . <+[+}+|+V.% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . % 1+2+^./ - l.3+O ' O P i.4+5+6+7+8+9+. ",
|
||||
". ~+{+/ :+. . . 0+c a+[.}+:+, ' . . . . . . . . . . . . . . . . . . . . . . . . . . . !+b+T.] ] S.c+>+. . |.d+Y.A.c = e+{ f++ . ",
|
||||
". ~+{+/ :+. . . _.g+h+- 3.{ !.c+i+[ . . . . . . . . . . . . . . . . . . . . . . . =+o.j+2 / w d+&+< . . . O k+^ { - - - = 1.. . ",
|
||||
". ~+{+/ :+. . . . A ;+l+m+2 / { n+o+p+' . . . . . . . . . . . . . . . . . . . . #+@+++] { q+r+`.. . . . . . m h.- 2 2 ] s+9.. ",
|
||||
". ~+{+/ ]+. . . . . . . i.m.t+5 / { T.u+|.< . . . . . . . . . . . . . . . . V v+A.{ ] = W.$ . . . . . . 9.8.i w+- 2 x+Y o.. . ",
|
||||
". ~+{+] y+H . . . . . . . . i.z+Y.5 6 ^ k.T 1+A+. . . . . . . . . . . . ..B+C+j / 5 J @ n . . . . . % _+2.Y / - D+j ] @.%.. ",
|
||||
". -+E+{ e+F+G+H+. . . . . . . . I+J+K+j 6 ^ L+W.M+... . . . . . . . . N+u+x ] ] ( g+H+. . . . . . 6.O+n+] ] S P+t Q+5 (.. . ",
|
||||
". R+S+h.] / w T+! H+. . . . . . . . u U+V+W+/ X+h.k+5+... . . . . _.G+Y+[./ Y }.Z+A . . . . . + M.`+5 ] w+ @+.0 . .@M 6.. ",
|
||||
". . +@7.@@c ^ / j #@! $@. . . . . . . . H+%@3 1 / ] S.&@.@+ . ' t *@e+] - =@-@9.. . . . . . ;@E.++] { R >@P . . . < u A . ",
|
||||
" . . . +@,@j.d ^ 6 j '@ +!+. . . . . . . . R+)@J e+3.] !@C ~@{@L+] ] c :+i.. . . . . . V J+]@{ ] Z ^@i+A . . . . . . ",
|
||||
" . . . A+/@(@g.^ 6 j K+_@f . . . . . . . . :@3+<@K 6 ] Y 5 / 1 | } [@. . . . . +@1.C+W+/ 2 T+}@o . . . ",
|
||||
" . . . < |.u+T.{ 3.5 |@h 1@. . . . . . . . 2@3@X ^./ { 4@! 9+. . . . . . ;+5@!@] ] g.6@7@. . . ",
|
||||
" . . . ' p+o+8@{ 3.5 l.9@0@. . . . . . . . 9+a@p.S+b@. . . . . . _.:.t+- ] ^.c@d@% . . ",
|
||||
" . . . ' i+_ e@{ 6 2 4 f@i.A . . . . . . . 9.0 . . . . . ' t *@K / - l.(._.. . . ",
|
||||
" . . . ' y.> R { 6 2 g@h@i@A . . . . . . . . . . . I+j@k.] ] '+R.>+. . . ",
|
||||
" . . . % V.k@; [.6 2 l@m@i@A . . . . . . . o a@'@2 / w n@m < . . ",
|
||||
" . . . A o@k@A.- 3.2 ~ m@,.A . . . A B C D ] { p@ +q@. . . ",
|
||||
" . . . A ^+j@r@- 6 - h+6@<+A R+>@R ^ / s@j.o@. . . ",
|
||||
" . . . A U t@h+- 6 - .+5@ @w+/ 5 u@~@+ . . ",
|
||||
" . . . A ,.O+~ 2 / ^ ] ^ R f@H . . . ",
|
||||
" . . A i@v@E 2 w@f+p+A . . ",
|
||||
" . . A i@9@a@x@. . . ",
|
||||
" . . . . . . ",
|
||||
" . . ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 201 KiB |
@@ -6,13 +6,16 @@ AlignTrailingComments: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: false
|
||||
AllowShortBlocksOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: All
|
||||
AllowShortIfStatementsOnASingleLine: false
|
||||
AllowShortIfStatementsOnASingleLine: true
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AlwaysBreakTemplateDeclarations: true
|
||||
BinPackParameters: false
|
||||
BreakBeforeBinaryOperators: false
|
||||
BreakBeforeBraces: Linux
|
||||
BreakBeforeBraces: Custom
|
||||
BraceWrapping:
|
||||
AfterClass: true
|
||||
AfterFunction: true
|
||||
BreakBeforeTernaryOperators: false
|
||||
BreakConstructorInitializersBeforeComma: false
|
||||
ColumnLimit: 0
|
||||
@@ -23,7 +26,6 @@ ContinuationIndentWidth: 4
|
||||
Cpp11BracedListStyle: true
|
||||
DerivePointerAlignment: false
|
||||
DisableFormat: false
|
||||
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, BOOST_REVERSE_FOREACH ]
|
||||
IndentCaseLabels: false
|
||||
IndentFunctionDeclarationAfterType: false
|
||||
IndentWidth: 4
|
||||
@@ -49,4 +51,4 @@ SpacesInCStyleCastParentheses: false
|
||||
SpacesInParentheses: false
|
||||
Standard: Cpp03
|
||||
TabWidth: 8
|
||||
UseTab: Never
|
||||
UseTab: Never
|
||||
@@ -60,7 +60,9 @@ BITCOIN_TESTS =\
|
||||
test/merkle_tests.cpp \
|
||||
test/miner_tests.cpp \
|
||||
test/multisig_tests.cpp \
|
||||
test/claimtrie_tests.cpp \
|
||||
test/claimtriecache_tests.cpp \
|
||||
test/claimtriebranching_tests.cpp \
|
||||
test/nameclaim_tests.cpp \
|
||||
test/netbase_tests.cpp \
|
||||
test/pmt_tests.cpp \
|
||||
test/policyestimator_tests.cpp \
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "tinyformat.h"
|
||||
|
||||
const std::string CURRENCY_UNIT = "BTC";
|
||||
const std::string CURRENCY_UNIT = "LBC";
|
||||
|
||||
CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_)
|
||||
{
|
||||
|
||||
@@ -131,6 +131,9 @@ public:
|
||||
consensus.powLimit = uint256S("0000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
||||
consensus.nPowTargetTimespan = 150; //retarget every block
|
||||
consensus.nPowTargetSpacing = 150;
|
||||
consensus.nOriginalClaimExpirationTime = 262974;
|
||||
consensus.nExtendedClaimExpirationTime = 2102400;
|
||||
consensus.nExtendedClaimExpirationForkHeight = 400155;
|
||||
consensus.fPowAllowMinDifficultyBlocks = false;
|
||||
consensus.fPowNoRetargeting = false;
|
||||
consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016
|
||||
@@ -215,6 +218,9 @@ public:
|
||||
consensus.powLimit = uint256S("0000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
||||
consensus.nPowTargetTimespan = 150;
|
||||
consensus.nPowTargetSpacing = 150;
|
||||
consensus.nOriginalClaimExpirationTime = 262974;
|
||||
consensus.nExtendedClaimExpirationTime = 2102400;
|
||||
consensus.nExtendedClaimExpirationForkHeight = 278160;
|
||||
consensus.fPowAllowMinDifficultyBlocks = true;
|
||||
consensus.fPowNoRetargeting = false;
|
||||
consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
|
||||
@@ -292,6 +298,9 @@ public:
|
||||
consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
||||
consensus.nPowTargetTimespan = 1;//14 * 24 * 60 * 60; // two weeks
|
||||
consensus.nPowTargetSpacing = 1;
|
||||
consensus.nOriginalClaimExpirationTime = 500;
|
||||
consensus.nExtendedClaimExpirationTime = 600;
|
||||
consensus.nExtendedClaimExpirationForkHeight = 800;
|
||||
consensus.fPowAllowMinDifficultyBlocks = false;
|
||||
consensus.fPowNoRetargeting = false;
|
||||
consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains
|
||||
|
||||
@@ -218,6 +218,7 @@ bool CClaimTrie::supportQueueEmpty() const
|
||||
void CClaimTrie::setExpirationTime(int t)
|
||||
{
|
||||
nExpirationTime = t;
|
||||
LogPrintf("%s: Expiration time is now %d\n", __func__, nExpirationTime);
|
||||
}
|
||||
|
||||
void CClaimTrie::clear()
|
||||
@@ -525,6 +526,43 @@ claimsForNameType CClaimTrie::getClaimsForName(const std::string& name) const
|
||||
return allClaims;
|
||||
}
|
||||
|
||||
//return effective amount from claim, retuns 0 if claim is not found
|
||||
CAmount CClaimTrie::getEffectiveAmountForClaim(const std::string& name, uint160 claimId) const
|
||||
{
|
||||
std::vector<CSupportValue> supports;
|
||||
return getEffectiveAmountForClaimWithSupports(name, claimId, supports);
|
||||
}
|
||||
|
||||
//return effective amount from claim and the supports used as inputs, retuns 0 if claim is not found
|
||||
CAmount CClaimTrie::getEffectiveAmountForClaimWithSupports(const std::string& name, uint160 claimId,
|
||||
std::vector<CSupportValue>& supports) const
|
||||
{
|
||||
claimsForNameType claims = getClaimsForName(name);
|
||||
CAmount effectiveAmount = 0;
|
||||
bool claim_found = false;
|
||||
for (std::vector<CClaimValue>::iterator it=claims.claims.begin(); it!=claims.claims.end(); ++it)
|
||||
{
|
||||
if (it->claimId == claimId && it->nValidAtHeight < nCurrentHeight)
|
||||
{
|
||||
effectiveAmount += it->nAmount;
|
||||
claim_found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!claim_found)
|
||||
return effectiveAmount;
|
||||
|
||||
for (std::vector<CSupportValue>::iterator it=claims.supports.begin(); it!=claims.supports.end(); ++it)
|
||||
{
|
||||
if (it->supportedClaimId == claimId && it->nValidAtHeight < nCurrentHeight)
|
||||
{
|
||||
effectiveAmount += it->nAmount;
|
||||
supports.push_back(*it);
|
||||
}
|
||||
}
|
||||
return effectiveAmount;
|
||||
}
|
||||
|
||||
bool CClaimTrie::checkConsistency() const
|
||||
{
|
||||
if (empty())
|
||||
@@ -564,6 +602,31 @@ bool CClaimTrie::recursiveCheckConsistency(const CClaimTrieNode* node) const
|
||||
return calculatedHash == node->hash;
|
||||
}
|
||||
|
||||
void CClaimTrie::addToClaimIndex(const std::string& name, const CClaimValue& claim)
|
||||
{
|
||||
CClaimIndexElement element = { name, claim };
|
||||
LogPrintf("%s: ClaimIndex[%s] updated %s\n", __func__, claim.claimId.GetHex(), name);
|
||||
|
||||
db.Write(std::make_pair(CLAIM_BY_ID, claim.claimId), element);
|
||||
}
|
||||
|
||||
void CClaimTrie::removeFromClaimIndex(const CClaimValue& claim)
|
||||
{
|
||||
db.Erase(std::make_pair(CLAIM_BY_ID, claim.claimId));
|
||||
}
|
||||
|
||||
bool CClaimTrie::getClaimById(const uint160 claimId, std::string& name, CClaimValue& claim) const
|
||||
{
|
||||
CClaimIndexElement element;
|
||||
if (db.Read(std::make_pair(CLAIM_BY_ID, claimId), element))
|
||||
{
|
||||
name = element.name;
|
||||
claim = element.claim;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CClaimTrie::getQueueRow(int nHeight, claimQueueRowType& row) const
|
||||
{
|
||||
claimQueueType::const_iterator itQueueRow = dirtyQueueRows.find(nHeight);
|
||||
@@ -744,17 +807,26 @@ bool CClaimTrie::update(nodeCacheType& cache, hashMapType& hashes, std::map<std:
|
||||
for (nodeCacheType::iterator itcache = cache.begin(); itcache != cache.end(); ++itcache)
|
||||
{
|
||||
if (!updateName(itcache->first, itcache->second))
|
||||
{
|
||||
LogPrintf("%s: Failed to update name for:%s\n", __func__, itcache->first);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (hashMapType::iterator ithash = hashes.begin(); ithash != hashes.end(); ++ithash)
|
||||
{
|
||||
if (!updateHash(ithash->first, ithash->second))
|
||||
{
|
||||
LogPrintf("%s: Failed to update hash for:%s\n", __func__, ithash->first);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (std::map<std::string, int>::iterator itheight = takeoverHeights.begin(); itheight != takeoverHeights.end(); ++itheight)
|
||||
{
|
||||
if (!updateTakeoverHeight(itheight->first, itheight->second))
|
||||
{
|
||||
LogPrintf("%s: Failed to update takeover height for:%s\n", __func__, itheight->first);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (claimQueueType::iterator itQueueCacheRow = queueCache.begin(); itQueueCacheRow != queueCache.end(); ++itQueueCacheRow)
|
||||
{
|
||||
@@ -1058,9 +1130,11 @@ bool CClaimTrie::ReadFromDisk(bool check)
|
||||
LogPrintf("%s: Couldn't read the best block's hash\n", __func__);
|
||||
if (!db.Read(CURRENT_HEIGHT, nCurrentHeight))
|
||||
LogPrintf("%s: Couldn't read the current height\n", __func__);
|
||||
setExpirationTime(Params().GetConsensus().GetExpirationTime(nCurrentHeight-1));
|
||||
|
||||
boost::scoped_ptr<CDBIterator> pcursor(const_cast<CDBWrapper*>(&db)->NewIterator());
|
||||
|
||||
pcursor->SeekToFirst();
|
||||
|
||||
while (pcursor->Valid())
|
||||
{
|
||||
std::pair<char, std::string> key;
|
||||
@@ -1084,6 +1158,7 @@ bool CClaimTrie::ReadFromDisk(bool check)
|
||||
}
|
||||
pcursor->Next();
|
||||
}
|
||||
|
||||
if (check)
|
||||
{
|
||||
LogPrintf("Checking Claim trie consistency...");
|
||||
@@ -1186,14 +1261,24 @@ bool CClaimTrieCache::empty() const
|
||||
|
||||
CClaimTrieNode* CClaimTrieCache::addNodeToCache(const std::string& position, CClaimTrieNode* original) const
|
||||
{
|
||||
if (!original)
|
||||
original = new CClaimTrieNode();
|
||||
CClaimTrieNode* cacheCopy = new CClaimTrieNode(*original);
|
||||
// create a copy of the node in the cache, if new node, create empty node
|
||||
CClaimTrieNode* cacheCopy;
|
||||
if(!original)
|
||||
cacheCopy = new CClaimTrieNode();
|
||||
else
|
||||
cacheCopy = new CClaimTrieNode(*original);
|
||||
cache[position] = cacheCopy;
|
||||
|
||||
// check to see if there is the original node in block_originals,
|
||||
// if not, add it to block_originals cache
|
||||
nodeCacheType::const_iterator itOriginals = block_originals.find(position);
|
||||
if (block_originals.end() == itOriginals)
|
||||
{
|
||||
CClaimTrieNode* originalCopy = new CClaimTrieNode(*original);
|
||||
CClaimTrieNode* originalCopy;
|
||||
if(!original)
|
||||
originalCopy = new CClaimTrieNode();
|
||||
else
|
||||
originalCopy = new CClaimTrieNode(*original);
|
||||
block_originals[position] = originalCopy;
|
||||
}
|
||||
return cacheCopy;
|
||||
@@ -1272,6 +1357,7 @@ bool CClaimTrieCache::insertClaimIntoTrie(const std::string& name, CClaimValue c
|
||||
{
|
||||
fChanged = true;
|
||||
currentNode->insertClaim(claim);
|
||||
base->addToClaimIndex(name, claim);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1346,7 +1432,8 @@ bool CClaimTrieCache::removeClaimFromTrie(const std::string& name, const COutPoi
|
||||
CClaimValue currentTop = currentNode->claims.front();
|
||||
|
||||
success = currentNode->removeClaim(outPoint, claim);
|
||||
|
||||
base->removeFromClaimIndex(claim);
|
||||
|
||||
if (!currentNode->claims.empty())
|
||||
{
|
||||
supportMapEntryType node;
|
||||
@@ -1384,6 +1471,9 @@ bool CClaimTrieCache::removeClaimFromTrie(const std::string& name, const COutPoi
|
||||
|
||||
bool CClaimTrieCache::recursivePruneName(CClaimTrieNode* tnCurrent, unsigned int nPos, std::string sName, bool* pfNullified) const
|
||||
{
|
||||
// Recursively prune leaf node(s) without any claims in it and store
|
||||
// the modified nodes in the cache
|
||||
|
||||
bool fNullified = false;
|
||||
std::string sCurrentSubstring = sName.substr(0, nPos);
|
||||
if (nPos < sName.size())
|
||||
@@ -1540,6 +1630,7 @@ bool CClaimTrieCache::addClaimToQueues(const std::string& name, CClaimValue& cla
|
||||
itQueueNameRow->second.push_back(outPointHeightType(claim.outPoint, claim.nValidAtHeight));
|
||||
nameOutPointType expireEntry(name, claim.outPoint);
|
||||
addToExpirationQueue(claim.nHeight + base->nExpirationTime, expireEntry);
|
||||
base->addToClaimIndex(name, claim);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1578,6 +1669,8 @@ bool CClaimTrieCache::removeClaimFromQueue(const std::string& name, const COutPo
|
||||
std::swap(claim, itQueue->second);
|
||||
itQueueNameRow->second.erase(itQueueName);
|
||||
itQueueRow->second.erase(itQueue);
|
||||
|
||||
base->removeFromClaimIndex(claim);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1612,7 +1705,8 @@ bool CClaimTrieCache::removeClaim(const std::string& name, const COutPoint& outP
|
||||
if (removed == true)
|
||||
{
|
||||
nValidAtHeight = claim.nValidAtHeight;
|
||||
removeFromExpirationQueue(name, outPoint, nHeight);
|
||||
int expirationHeight = nHeight + base->nExpirationTime;
|
||||
removeFromExpirationQueue(name, outPoint, expirationHeight);
|
||||
}
|
||||
return removed;
|
||||
}
|
||||
@@ -1623,9 +1717,8 @@ void CClaimTrieCache::addToExpirationQueue(int nExpirationHeight, nameOutPointTy
|
||||
itQueueRow->second.push_back(entry);
|
||||
}
|
||||
|
||||
void CClaimTrieCache::removeFromExpirationQueue(const std::string& name, const COutPoint& outPoint, int nHeight) const
|
||||
void CClaimTrieCache::removeFromExpirationQueue(const std::string& name, const COutPoint& outPoint, int expirationHeight) const
|
||||
{
|
||||
int expirationHeight = nHeight + base->nExpirationTime;
|
||||
expirationQueueType::iterator itQueueRow = getExpirationQueueCacheRow(expirationHeight, false);
|
||||
expirationQueueRowType::iterator itQueue;
|
||||
if (itQueueRow != expirationQueueCache.end())
|
||||
@@ -1635,10 +1728,11 @@ void CClaimTrieCache::removeFromExpirationQueue(const std::string& name, const C
|
||||
if (name == itQueue->name && outPoint == itQueue->outPoint)
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (itQueue != itQueueRow->second.end())
|
||||
{
|
||||
itQueueRow->second.erase(itQueue);
|
||||
|
||||
if (itQueue != itQueueRow->second.end())
|
||||
{
|
||||
itQueueRow->second.erase(itQueue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1670,7 +1764,12 @@ bool CClaimTrieCache::reorderTrieNode(const std::string& name, bool fCheckTakeov
|
||||
cachedNode = cache.find(name);
|
||||
if (cachedNode == cache.end())
|
||||
{
|
||||
CClaimTrieNode* currentNode = &(base->root);
|
||||
CClaimTrieNode* currentNode;
|
||||
cachedNode = cache.find("");
|
||||
if(cachedNode == cache.end())
|
||||
currentNode = &(base->root);
|
||||
else
|
||||
currentNode = cachedNode->second;
|
||||
for (std::string::const_iterator itCur = name.begin(); itCur != name.end(); ++itCur)
|
||||
{
|
||||
std::string sCurrentSubstring(name.begin(), itCur);
|
||||
@@ -1938,7 +2037,8 @@ bool CClaimTrieCache::removeSupport(const std::string& name, const COutPoint& ou
|
||||
removed = true;
|
||||
if (removed)
|
||||
{
|
||||
removeSupportFromExpirationQueue(name, outPoint, nHeight);
|
||||
int expirationHeight = nHeight + base->nExpirationTime;
|
||||
removeSupportFromExpirationQueue(name, outPoint, expirationHeight);
|
||||
nValidAtHeight = support.nValidAtHeight;
|
||||
}
|
||||
return removed;
|
||||
@@ -1950,9 +2050,8 @@ void CClaimTrieCache::addSupportToExpirationQueue(int nExpirationHeight, nameOut
|
||||
itQueueRow->second.push_back(entry);
|
||||
}
|
||||
|
||||
void CClaimTrieCache::removeSupportFromExpirationQueue(const std::string& name, const COutPoint& outPoint, int nHeight) const
|
||||
void CClaimTrieCache::removeSupportFromExpirationQueue(const std::string& name, const COutPoint& outPoint, int expirationHeight) const
|
||||
{
|
||||
int expirationHeight = nHeight + base->nExpirationTime;
|
||||
expirationQueueType::iterator itQueueRow = getSupportExpirationQueueCacheRow(expirationHeight, false);
|
||||
expirationQueueRowType::iterator itQueue;
|
||||
if (itQueueRow != supportExpirationQueueCache.end())
|
||||
@@ -2006,6 +2105,7 @@ bool CClaimTrieCache::spendSupport(const std::string& name, const COutPoint& out
|
||||
bool CClaimTrieCache::incrementBlock(insertUndoType& insertUndo, claimQueueRowType& expireUndo, insertUndoType& insertSupportUndo, supportQueueRowType& expireSupportUndo, std::vector<std::pair<std::string, int> >& takeoverHeightUndo) const
|
||||
{
|
||||
LogPrintf("%s: nCurrentHeight (before increment): %d\n", __func__, nCurrentHeight);
|
||||
|
||||
claimQueueType::iterator itQueueRow = getQueueCacheRow(nCurrentHeight, false);
|
||||
if (itQueueRow != claimQueueCache.end())
|
||||
{
|
||||
@@ -2055,6 +2155,7 @@ bool CClaimTrieCache::incrementBlock(insertUndoType& insertUndo, claimQueueRowTy
|
||||
CClaimValue claim;
|
||||
assert(removeClaimFromTrie(itEntry->name, itEntry->outPoint, claim, true));
|
||||
expireUndo.push_back(std::make_pair(itEntry->name, claim));
|
||||
LogPrintf("Expiring claim %s: %s, nHeight: %d, nValidAtHeight: %d\n", claim.claimId.GetHex(), itEntry->name, claim.nHeight, claim.nValidAtHeight);
|
||||
}
|
||||
itExpirationRow->second.clear();
|
||||
}
|
||||
@@ -2106,6 +2207,7 @@ bool CClaimTrieCache::incrementBlock(insertUndoType& insertUndo, claimQueueRowTy
|
||||
CSupportValue support;
|
||||
assert(removeSupportFromMap(itEntry->name, itEntry->outPoint, support, true));
|
||||
expireSupportUndo.push_back(std::make_pair(itEntry->name, support));
|
||||
LogPrintf("Expiring support %s: %s, nHeight: %d, nValidAtHeight: %d\n", support.supportedClaimId.GetHex(), itEntry->name, support.nHeight, support.nValidAtHeight);
|
||||
}
|
||||
itSupportExpirationRow->second.clear();
|
||||
}
|
||||
@@ -2321,6 +2423,7 @@ bool CClaimTrieCache::decrementBlock(insertUndoType& insertUndo, claimQueueRowTy
|
||||
{
|
||||
cacheTakeoverHeights[itTakeoverHeightUndo->first] = itTakeoverHeightUndo->second;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -2418,6 +2521,7 @@ bool CClaimTrieCache::clear() const
|
||||
supportCache.clear();
|
||||
supportQueueCache.clear();
|
||||
supportQueueNameCache.clear();
|
||||
supportExpirationQueueCache.clear();
|
||||
namesToCheckForTakeover.clear();
|
||||
cacheTakeoverHeights.clear();
|
||||
return true;
|
||||
@@ -2508,3 +2612,106 @@ CClaimTrieProof CClaimTrieCache::getProofForName(const std::string& name) const
|
||||
return CClaimTrieProof(nodes, fNameHasValue, outPoint,
|
||||
nHeightOfLastTakeover);
|
||||
}
|
||||
|
||||
|
||||
void CClaimTrieCache::removeAndAddToExpirationQueue(expirationQueueRowType &row, int height, bool increment) const
|
||||
{
|
||||
for (expirationQueueRowType::iterator e = row.begin(); e != row.end(); ++e)
|
||||
{
|
||||
// remove and insert with new expiration time
|
||||
removeFromExpirationQueue(e->name, e->outPoint, height);
|
||||
int extend_expiration = Params().GetConsensus().nExtendedClaimExpirationTime - Params().GetConsensus().nOriginalClaimExpirationTime;
|
||||
int new_expiration_height = increment ? height + extend_expiration : height - extend_expiration;
|
||||
nameOutPointType entry(e->name, e->outPoint);
|
||||
addToExpirationQueue(new_expiration_height, entry);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void CClaimTrieCache::removeAndAddSupportToExpirationQueue(expirationQueueRowType &row, int height, bool increment) const
|
||||
{
|
||||
for (expirationQueueRowType::iterator e = row.begin(); e != row.end(); ++e)
|
||||
{
|
||||
// remove and insert with new expiration time
|
||||
removeSupportFromExpirationQueue(e->name, e->outPoint, height);
|
||||
int extend_expiration = Params().GetConsensus().nExtendedClaimExpirationTime - Params().GetConsensus().nOriginalClaimExpirationTime;
|
||||
int new_expiration_height = increment ? height + extend_expiration : height - extend_expiration;
|
||||
nameOutPointType entry(e->name, e->outPoint);
|
||||
addSupportToExpirationQueue(new_expiration_height, entry);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool CClaimTrieCache::forkForExpirationChange(bool increment) const
|
||||
{
|
||||
/*
|
||||
If increment is True, we have forked to extend the expiration time, thus items in the expiration queue
|
||||
will have their expiration extended by "new expiration time - original expiration time"
|
||||
|
||||
If increment is False, we are decremented a block to reverse the fork. Thus items in the expiration queue
|
||||
will have their expiration extension removed.
|
||||
*/
|
||||
|
||||
// look through dirty expiration queues
|
||||
std::set<int> dirtyHeights;
|
||||
for (expirationQueueType::const_iterator i = base->dirtyExpirationQueueRows.begin(); i != base->dirtyExpirationQueueRows.end(); ++i)
|
||||
{
|
||||
int height = i->first;
|
||||
dirtyHeights.insert(height);
|
||||
expirationQueueRowType row = i->second;
|
||||
removeAndAddToExpirationQueue(row, height, increment);
|
||||
}
|
||||
|
||||
std::set<int> dirtySupportHeights;
|
||||
for (expirationQueueType::const_iterator i = base->dirtySupportExpirationQueueRows.begin(); i != base->dirtySupportExpirationQueueRows.end(); ++i)
|
||||
{
|
||||
int height = i->first;
|
||||
dirtySupportHeights.insert(height);
|
||||
expirationQueueRowType row = i->second;
|
||||
removeAndAddSupportToExpirationQueue(row, height, increment);
|
||||
}
|
||||
|
||||
|
||||
//look through db for expiration queues, if we haven't already found it in dirty expiration queue
|
||||
boost::scoped_ptr<CDBIterator> pcursor(const_cast<CDBWrapper*>(&base->db)->NewIterator());
|
||||
pcursor->SeekToFirst();
|
||||
while (pcursor->Valid())
|
||||
{
|
||||
std::pair<char, int> key;
|
||||
if (pcursor->GetKey(key))
|
||||
{
|
||||
int height = key.second;
|
||||
// if we've looked through this in dirtyExprirationQueueRows, don't use it
|
||||
// because its stale
|
||||
if ((key.first == EXP_QUEUE_ROW) & (dirtyHeights.count(height) == 0))
|
||||
{
|
||||
expirationQueueRowType row;
|
||||
if (pcursor->GetValue(row))
|
||||
{
|
||||
removeAndAddToExpirationQueue(row, height, increment);
|
||||
}
|
||||
else
|
||||
{
|
||||
return error("%s(): error reading expiration queue rows from disk", __func__);
|
||||
}
|
||||
}
|
||||
else if ((key.first == SUPPORT_EXP_QUEUE_ROW) & (dirtySupportHeights.count(height) == 0))
|
||||
{
|
||||
expirationQueueRowType row;
|
||||
if (pcursor->GetValue(row))
|
||||
{
|
||||
removeAndAddSupportToExpirationQueue(row, height, increment);
|
||||
}
|
||||
else
|
||||
{
|
||||
return error("%s(): error reading support expiration queue rows from disk", __func__);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
pcursor->Next();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -6,15 +6,18 @@
|
||||
#include "uint256.h"
|
||||
#include "util.h"
|
||||
#include "dbwrapper.h"
|
||||
#include "chainparams.h"
|
||||
#include "primitives/transaction.h"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
// leveldb keys
|
||||
#define HASH_BLOCK 'h'
|
||||
#define CURRENT_HEIGHT 't'
|
||||
#define TRIE_NODE 'n'
|
||||
#define CLAIM_BY_ID 'i'
|
||||
#define CLAIM_QUEUE_ROW 'r'
|
||||
#define CLAIM_QUEUE_NAME_ROW 'm'
|
||||
#define EXP_QUEUE_ROW 'e'
|
||||
@@ -54,7 +57,7 @@ public:
|
||||
READWRITE(nHeight);
|
||||
READWRITE(nValidAtHeight);
|
||||
}
|
||||
|
||||
|
||||
bool operator<(const CClaimValue& other) const
|
||||
{
|
||||
if (nEffectiveAmount < other.nEffectiveAmount)
|
||||
@@ -71,12 +74,12 @@ public:
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool operator==(const CClaimValue& other) const
|
||||
{
|
||||
return outPoint == other.outPoint && claimId == other.claimId && nAmount == other.nAmount && nHeight == other.nHeight && nValidAtHeight == other.nValidAtHeight;
|
||||
}
|
||||
|
||||
|
||||
bool operator!=(const CClaimValue& other) const
|
||||
{
|
||||
return !(*this == other);
|
||||
@@ -91,7 +94,7 @@ public:
|
||||
CAmount nAmount;
|
||||
int nHeight;
|
||||
int nValidAtHeight;
|
||||
|
||||
|
||||
CSupportValue() {};
|
||||
CSupportValue(COutPoint outPoint, uint160 supportedClaimId,
|
||||
CAmount nAmount, int nHeight, int nValidAtHeight)
|
||||
@@ -99,7 +102,7 @@ public:
|
||||
, nAmount(nAmount), nHeight(nHeight)
|
||||
, nValidAtHeight(nValidAtHeight)
|
||||
{}
|
||||
|
||||
|
||||
ADD_SERIALIZE_METHODS;
|
||||
|
||||
template <typename Stream, typename Operation>
|
||||
@@ -147,7 +150,7 @@ public:
|
||||
bool empty() const {return children.empty() && claims.empty();}
|
||||
bool haveClaim(const COutPoint& outPoint) const;
|
||||
void reorderClaims(supportMapEntryType& supports);
|
||||
|
||||
|
||||
ADD_SERIALIZE_METHODS;
|
||||
|
||||
template <typename Stream, typename Operation>
|
||||
@@ -156,7 +159,7 @@ public:
|
||||
READWRITE(claims);
|
||||
READWRITE(nHeightOfLastTakeover);
|
||||
}
|
||||
|
||||
|
||||
bool operator==(const CClaimTrieNode& other) const
|
||||
{
|
||||
return hash == other.hash && claims == other.claims;
|
||||
@@ -241,6 +244,21 @@ struct nameOutPointType
|
||||
}
|
||||
};
|
||||
|
||||
class CClaimIndexElement
|
||||
{
|
||||
public:
|
||||
ADD_SERIALIZE_METHODS;
|
||||
|
||||
template <typename Stream, typename Operation>
|
||||
inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
|
||||
READWRITE(name);
|
||||
READWRITE(claim);
|
||||
}
|
||||
|
||||
std::string name;
|
||||
CClaimValue claim;
|
||||
};
|
||||
|
||||
typedef std::pair<std::string, CClaimValue> claimQueueEntryType;
|
||||
|
||||
typedef std::pair<std::string, CSupportValue> supportQueueEntryType;
|
||||
@@ -282,35 +300,42 @@ class CClaimTrie
|
||||
public:
|
||||
CClaimTrie(bool fMemory = false, bool fWipe = false, int nProportionalDelayFactor = 32)
|
||||
: db(GetDataDir() / "claimtrie", 100, fMemory, fWipe, false)
|
||||
, nCurrentHeight(0), nExpirationTime(262974)
|
||||
, nCurrentHeight(0), nExpirationTime(Params().GetConsensus().nOriginalClaimExpirationTime)
|
||||
, nProportionalDelayFactor(nProportionalDelayFactor)
|
||||
, root(uint256S("0000000000000000000000000000000000000000000000000000000000000001"))
|
||||
{}
|
||||
|
||||
|
||||
uint256 getMerkleHash();
|
||||
|
||||
|
||||
bool empty() const;
|
||||
void clear();
|
||||
|
||||
|
||||
bool checkConsistency() const;
|
||||
|
||||
|
||||
bool WriteToDisk();
|
||||
bool ReadFromDisk(bool check = false);
|
||||
|
||||
|
||||
std::vector<namedNodeType> flattenTrie() const;
|
||||
bool getInfoForName(const std::string& name, CClaimValue& claim) const;
|
||||
bool getLastTakeoverForName(const std::string& name, int& lastTakeoverHeight) const;
|
||||
|
||||
claimsForNameType getClaimsForName(const std::string& name) const;
|
||||
|
||||
CAmount getEffectiveAmountForClaim(const std::string& name, uint160 claimId) const;
|
||||
CAmount getEffectiveAmountForClaimWithSupports(const std::string& name, uint160 claimId,
|
||||
std::vector<CSupportValue>& supports) const;
|
||||
|
||||
bool queueEmpty() const;
|
||||
bool supportEmpty() const;
|
||||
bool supportQueueEmpty() const;
|
||||
bool expirationQueueEmpty() const;
|
||||
bool supportExpirationQueueEmpty() const;
|
||||
|
||||
|
||||
void setExpirationTime(int t);
|
||||
|
||||
|
||||
void addToClaimIndex(const std::string& name, const CClaimValue& claim);
|
||||
void removeFromClaimIndex(const CClaimValue& claim);
|
||||
|
||||
bool getClaimById(const uint160 claimId, std::string& name, CClaimValue& claim) const;
|
||||
bool getQueueRow(int nHeight, claimQueueRowType& row) const;
|
||||
bool getQueueNameRow(const std::string& name, queueNameRowType& row) const;
|
||||
bool getExpirationQueueRow(int nHeight, expirationQueueRowType& row) const;
|
||||
@@ -318,21 +343,22 @@ public:
|
||||
bool getSupportQueueRow(int nHeight, supportQueueRowType& row) const;
|
||||
bool getSupportQueueNameRow(const std::string& name, queueNameRowType& row) const;
|
||||
bool getSupportExpirationQueueRow(int nHeight, expirationQueueRowType& row) const;
|
||||
|
||||
|
||||
|
||||
bool haveClaim(const std::string& name, const COutPoint& outPoint) const;
|
||||
bool haveClaimInQueue(const std::string& name, const COutPoint& outPoint,
|
||||
int& nValidAtHeight) const;
|
||||
|
||||
|
||||
bool haveSupport(const std::string& name, const COutPoint& outPoint) const;
|
||||
bool haveSupportInQueue(const std::string& name, const COutPoint& outPoint,
|
||||
int& nValidAtHeight) const;
|
||||
|
||||
|
||||
unsigned int getTotalNamesInTrie() const;
|
||||
unsigned int getTotalClaimsInTrie() const;
|
||||
CAmount getTotalValueOfClaimsInTrie(bool fControllingOnly) const;
|
||||
|
||||
|
||||
friend class CClaimTrieCache;
|
||||
|
||||
|
||||
CDBWrapper db;
|
||||
int nCurrentHeight;
|
||||
int nExpirationTime;
|
||||
@@ -341,7 +367,7 @@ private:
|
||||
void clear(CClaimTrieNode* current);
|
||||
|
||||
const CClaimTrieNode* getNodeForName(const std::string& name) const;
|
||||
|
||||
|
||||
bool update(nodeCacheType& cache, hashMapType& hashes,
|
||||
std::map<std::string, int>& takeoverHeights,
|
||||
const uint256& hashBlock, claimQueueType& queueCache,
|
||||
@@ -355,11 +381,11 @@ private:
|
||||
bool updateHash(const std::string& name, uint256& hash);
|
||||
bool updateTakeoverHeight(const std::string& name, int nTakeoverHeight);
|
||||
bool recursiveNullify(CClaimTrieNode* node, std::string& name);
|
||||
|
||||
|
||||
bool recursiveCheckConsistency(const CClaimTrieNode* node) const;
|
||||
|
||||
|
||||
bool InsertFromDisk(const std::string& name, CClaimTrieNode* node);
|
||||
|
||||
|
||||
unsigned int getTotalNamesRecursive(const CClaimTrieNode* current) const;
|
||||
unsigned int getTotalClaimsRecursive(const CClaimTrieNode* current) const;
|
||||
CAmount getTotalValueOfClaimsRecursive(const CClaimTrieNode* current,
|
||||
@@ -367,7 +393,7 @@ private:
|
||||
bool recursiveFlattenTrie(const std::string& name,
|
||||
const CClaimTrieNode* current,
|
||||
std::vector<namedNodeType>& nodes) const;
|
||||
|
||||
|
||||
void markNodeDirty(const std::string& name, CClaimTrieNode* node);
|
||||
void updateQueueRow(int nHeight, claimQueueRowType& row);
|
||||
void updateQueueNameRow(const std::string& name,
|
||||
@@ -378,10 +404,11 @@ private:
|
||||
void updateSupportNameQueue(const std::string& name,
|
||||
queueNameRowType& row);
|
||||
void updateSupportExpirationQueue(int nHeight, expirationQueueRowType& row);
|
||||
|
||||
|
||||
void BatchWriteNode(CDBBatch& batch, const std::string& name,
|
||||
const CClaimTrieNode* pNode) const;
|
||||
void BatchEraseNode(CDBBatch& batch, const std::string& nome) const;
|
||||
void BatchWriteClaimIndex(CDBBatch& batch) const;
|
||||
void BatchWriteQueueRows(CDBBatch& batch);
|
||||
void BatchWriteQueueNameRows(CDBBatch& batch);
|
||||
void BatchWriteExpirationQueueRows(CDBBatch& batch);
|
||||
@@ -390,18 +417,18 @@ private:
|
||||
void BatchWriteSupportQueueNameRows(CDBBatch& batch);
|
||||
void BatchWriteSupportExpirationQueueRows(CDBBatch& batch);
|
||||
template<typename K> bool keyTypeEmpty(char key, K& dummy) const;
|
||||
|
||||
|
||||
CClaimTrieNode root;
|
||||
uint256 hashBlock;
|
||||
|
||||
|
||||
claimQueueType dirtyQueueRows;
|
||||
queueNameType dirtyQueueNameRows;
|
||||
expirationQueueType dirtyExpirationQueueRows;
|
||||
|
||||
|
||||
supportQueueType dirtySupportQueueRows;
|
||||
queueNameType dirtySupportQueueNameRows;
|
||||
expirationQueueType dirtySupportExpirationQueueRows;
|
||||
|
||||
|
||||
nodeCacheType dirtyNodes;
|
||||
supportMapType dirtySupportNodes;
|
||||
};
|
||||
@@ -440,13 +467,13 @@ public:
|
||||
assert(base);
|
||||
nCurrentHeight = base->nCurrentHeight;
|
||||
}
|
||||
|
||||
|
||||
uint256 getMerkleHash() const;
|
||||
|
||||
|
||||
bool empty() const;
|
||||
bool flush();
|
||||
bool dirty() const { return !dirtyHashes.empty(); }
|
||||
|
||||
|
||||
bool addClaim(const std::string& name, const COutPoint& outPoint,
|
||||
uint160 claimId, CAmount nAmount, int nHeight) const;
|
||||
bool undoAddClaim(const std::string& name, const COutPoint& outPoint,
|
||||
@@ -456,7 +483,7 @@ public:
|
||||
bool undoSpendClaim(const std::string& name, const COutPoint& outPoint,
|
||||
uint160 claimId, CAmount nAmount, int nHeight,
|
||||
int nValidAtHeight) const;
|
||||
|
||||
|
||||
bool addSupport(const std::string& name, const COutPoint& outPoint,
|
||||
CAmount nAmount, uint160 supportedClaimId,
|
||||
int nHeight) const;
|
||||
@@ -467,7 +494,7 @@ public:
|
||||
bool undoSpendSupport(const std::string& name, const COutPoint& outPoint,
|
||||
uint160 supportedClaimId, CAmount nAmount,
|
||||
int nHeight, int nValidAtHeight) const;
|
||||
|
||||
|
||||
uint256 getBestBlock();
|
||||
void setBestBlock(const uint256& hashBlock);
|
||||
|
||||
@@ -481,9 +508,9 @@ public:
|
||||
insertUndoType& insertSupportUndo,
|
||||
supportQueueRowType& expireSupportUndo,
|
||||
std::vector<std::pair<std::string, int> >& takeoverHeightUndo) const;
|
||||
|
||||
|
||||
~CClaimTrieCache() { clear(); }
|
||||
|
||||
|
||||
bool insertClaimIntoTrie(const std::string& name, CClaimValue claim,
|
||||
bool fCheckTakeover = false) const;
|
||||
bool removeClaimFromTrie(const std::string& name, const COutPoint& outPoint,
|
||||
@@ -492,7 +519,14 @@ public:
|
||||
CClaimTrieProof getProofForName(const std::string& name) const;
|
||||
|
||||
bool finalizeDecrement() const;
|
||||
private:
|
||||
|
||||
void removeAndAddSupportToExpirationQueue(expirationQueueRowType &row, int height, bool increment) const;
|
||||
void removeAndAddToExpirationQueue(expirationQueueRowType &row, int height, bool increment) const;
|
||||
|
||||
bool forkForExpirationChange(bool increment) const;
|
||||
|
||||
|
||||
protected:
|
||||
CClaimTrie* base;
|
||||
|
||||
bool fRequireTakeoverHeights;
|
||||
@@ -512,48 +546,48 @@ private:
|
||||
mutable std::map<std::string, int> cacheTakeoverHeights;
|
||||
mutable int nCurrentHeight; // Height of the block that is being worked on, which is
|
||||
// one greater than the height of the chain's tip
|
||||
|
||||
|
||||
uint256 hashBlock;
|
||||
|
||||
|
||||
uint256 computeHash() const;
|
||||
|
||||
|
||||
bool reorderTrieNode(const std::string& name, bool fCheckTakeover) const;
|
||||
bool recursiveComputeMerkleHash(CClaimTrieNode* tnCurrent,
|
||||
std::string sPos) const;
|
||||
bool recursivePruneName(CClaimTrieNode* tnCurrent, unsigned int nPos,
|
||||
std::string sName,
|
||||
bool* pfNullified = NULL) const;
|
||||
|
||||
|
||||
bool clear() const;
|
||||
|
||||
|
||||
bool removeClaim(const std::string& name, const COutPoint& outPoint,
|
||||
int nHeight, int& nValidAtHeight, bool fCheckTakeover) const;
|
||||
|
||||
|
||||
bool addClaimToQueues(const std::string& name, CClaimValue& claim) const;
|
||||
bool removeClaimFromQueue(const std::string& name, const COutPoint& outPoint,
|
||||
CClaimValue& claim) const;
|
||||
void addToExpirationQueue(int nExpirationHeight, nameOutPointType& entry) const;
|
||||
void removeFromExpirationQueue(const std::string& name, const COutPoint& outPoint,
|
||||
int nHeight) const;
|
||||
|
||||
|
||||
claimQueueType::iterator getQueueCacheRow(int nHeight,
|
||||
bool createIfNotExists) const;
|
||||
queueNameType::iterator getQueueCacheNameRow(const std::string& name,
|
||||
bool createIfNotExists) const;
|
||||
expirationQueueType::iterator getExpirationQueueCacheRow(int nHeight,
|
||||
bool createIfNotExists) const;
|
||||
|
||||
|
||||
bool removeSupport(const std::string& name, const COutPoint& outPoint,
|
||||
int nHeight, int& nValidAtHeight,
|
||||
bool fCheckTakeover) const;
|
||||
bool removeSupportFromMap(const std::string& name, const COutPoint& outPoint,
|
||||
CSupportValue& support,
|
||||
bool fCheckTakeover) const;
|
||||
|
||||
|
||||
bool insertSupportIntoMap(const std::string& name,
|
||||
CSupportValue support,
|
||||
bool fCheckTakeover) const;
|
||||
|
||||
|
||||
supportQueueType::iterator getSupportQueueCacheRow(int nHeight,
|
||||
bool createIfNotExists) const;
|
||||
queueNameType::iterator getSupportQueueCacheNameRow(const std::string& name,
|
||||
@@ -570,12 +604,12 @@ private:
|
||||
void removeSupportFromExpirationQueue(const std::string& name,
|
||||
const COutPoint& outPoint,
|
||||
int nHeight) const;
|
||||
|
||||
|
||||
bool getSupportsForName(const std::string& name,
|
||||
supportMapEntryType& node) const;
|
||||
|
||||
bool getLastTakeoverForName(const std::string& name, int& lastTakeoverHeight) const;
|
||||
|
||||
|
||||
int getDelayForName(const std::string& name) const;
|
||||
|
||||
uint256 getLeafHashForProof(const std::string& currentPosition, unsigned char nodeChar,
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* for both bitcoind and bitcoin-core, to make it harder for attackers to
|
||||
* target servers or GUI users specifically.
|
||||
*/
|
||||
const std::string CLIENT_NAME("Satoshi");
|
||||
const std::string CLIENT_NAME("LBRY");
|
||||
|
||||
/**
|
||||
* Client version number
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
|
||||
#define CLIENT_VERSION_MAJOR 0
|
||||
#define CLIENT_VERSION_MINOR 12
|
||||
#define CLIENT_VERSION_REVISION 0
|
||||
#define CLIENT_VERSION_BUILD 1
|
||||
#define CLIENT_VERSION_REVISION 2
|
||||
#define CLIENT_VERSION_BUILD 0
|
||||
|
||||
//! Set to true for release, false for prerelease or test build
|
||||
#define CLIENT_VERSION_IS_RELEASE false
|
||||
#define CLIENT_VERSION_IS_RELEASE true
|
||||
|
||||
/**
|
||||
* Copyright year (2009-this)
|
||||
|
||||
@@ -58,6 +58,17 @@ struct Params {
|
||||
bool fPowNoRetargeting;
|
||||
int64_t nPowTargetSpacing;
|
||||
int64_t nPowTargetTimespan;
|
||||
/** how long it took claims to expire before the hard fork */
|
||||
int64_t nOriginalClaimExpirationTime;
|
||||
/** how long it takes claims to expire after the hard fork */
|
||||
int64_t nExtendedClaimExpirationTime;
|
||||
/** blocks before the hard fork that changed the expiration time */
|
||||
int64_t nExtendedClaimExpirationForkHeight;
|
||||
int64_t GetExpirationTime(int64_t nHeight) const {
|
||||
return nHeight < nExtendedClaimExpirationForkHeight ?
|
||||
nOriginalClaimExpirationTime :
|
||||
nExtendedClaimExpirationTime;
|
||||
}
|
||||
int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
|
||||
};
|
||||
} // namespace Consensus
|
||||
|
||||
@@ -1229,6 +1229,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
LogPrintf("* Using %.1fMiB for chain state database\n", nCoinDBCache * (1.0 / 1024 / 1024));
|
||||
LogPrintf("* Using %.1fMiB for in-memory UTXO set\n", nCoinCacheUsage * (1.0 / 1024 / 1024));
|
||||
|
||||
const Consensus::Params& consensusParams = Params().GetConsensus();
|
||||
|
||||
bool fLoaded = false;
|
||||
while (!fLoaded) {
|
||||
bool fReset = fReindex;
|
||||
@@ -1266,7 +1268,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
|
||||
// If the loaded chain has a wrong genesis, bail out immediately
|
||||
// (we're likely using a testnet datadir, or the other way around).
|
||||
if (!mapBlockIndex.empty() && mapBlockIndex.count(chainparams.GetConsensus().hashGenesisBlock) == 0)
|
||||
if (!mapBlockIndex.empty() && mapBlockIndex.count(consensusParams.hashGenesisBlock) == 0)
|
||||
return InitError(_("Incorrect or no genesis block found. Wrong datadir for network?"));
|
||||
|
||||
// Initialize the block index (no-op if non-empty database was already loaded)
|
||||
@@ -1422,6 +1424,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
|
||||
RandAddSeedPerfmon();
|
||||
|
||||
pclaimTrie->setExpirationTime(consensusParams.GetExpirationTime(chainActive.Height()));
|
||||
|
||||
//// debug print
|
||||
LogPrintf("mapBlockIndex.size() = %u\n", mapBlockIndex.size());
|
||||
LogPrintf("nBestHeight = %d\n", chainActive.Height());
|
||||
@@ -1437,7 +1441,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
StartNode(threadGroup, scheduler);
|
||||
|
||||
// Monitor the chain, and alert if we get blocks much quicker or slower than expected
|
||||
int64_t nPowTargetSpacing = Params().GetConsensus().nPowTargetSpacing;
|
||||
int64_t nPowTargetSpacing = consensusParams.nPowTargetSpacing;
|
||||
CScheduler::Function f = boost::bind(&PartitionCheck, &IsInitialBlockDownload,
|
||||
boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing);
|
||||
scheduler.scheduleEvery(f, nPowTargetSpacing);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "lbry.h"
|
||||
#include "uint256.h"
|
||||
#include "lbry.h"
|
||||
#include "uint256.h"
|
||||
#include <cstdio>
|
||||
|
||||
unsigned int CalculateLbryNextWorkRequired(const CBlockIndex* pindexLast, int64_t nFirstBlockTime, const Consensus::Params& params)
|
||||
{
|
||||
if (params.fPowNoRetargeting)
|
||||
@@ -26,9 +27,7 @@ unsigned int CalculateLbryNextWorkRequired(const CBlockIndex* pindexLast, int64_
|
||||
// Retarget
|
||||
const arith_uint256 bnPowLimit = UintToArith256(params.powLimit);
|
||||
arith_uint256 bnNew;
|
||||
arith_uint256 bnOld;
|
||||
bnNew.SetCompact(pindexLast->nBits);
|
||||
bnOld = bnNew;
|
||||
bnNew *= nModulatedTimespan;
|
||||
bnNew /= retargetTimespan;
|
||||
if (bnNew > bnPowLimit)
|
||||
|
||||
@@ -82,6 +82,7 @@ bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
|
||||
|
||||
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
|
||||
CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
|
||||
CAmount minFeePerNameClaimChar = MIN_FEE_PER_NAMECLAIM_CHAR;
|
||||
|
||||
CTxMemPool mempool(::minRelayTxFee);
|
||||
FeeFilterRounder filterRounder(::minRelayTxFee);
|
||||
@@ -1194,6 +1195,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
|
||||
return state.DoS(0, false, REJECT_NONSTANDARD, "bad-txns-too-many-sigops", false,
|
||||
strprintf("%d", nSigOps));
|
||||
|
||||
// If a ClaimTrie transaction, it must meet the minimum fee requirement due to
|
||||
// it consuming extra system resources, compared to an ordinary transaction
|
||||
CAmount minClaimTrieFee = CalcMinClaimTrieFee(tx, minFeePerNameClaimChar);
|
||||
if (nModifiedFees < minClaimTrieFee) {
|
||||
return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "minimum claim trie fee not met", false,
|
||||
strprintf("%d < %d", nFees, minClaimTrieFee));
|
||||
}
|
||||
|
||||
CAmount mempoolRejectFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nSize);
|
||||
if (mempoolRejectFee > 0 && nModifiedFees < mempoolRejectFee) {
|
||||
return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "mempool min fee not met", false, strprintf("%d < %d", nFees, mempoolRejectFee));
|
||||
@@ -1201,7 +1210,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
|
||||
// Require that free transactions have sufficient priority to be mined in the next block.
|
||||
return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient priority");
|
||||
}
|
||||
|
||||
// Continuously rate-limit free (really, very-low-fee) transactions
|
||||
// This mitigates 'penny-flooding' -- sending thousands of free transactions just to
|
||||
// be annoying or make others' transactions take longer to confirm.
|
||||
@@ -2163,12 +2171,22 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
|
||||
if (op == OP_CLAIM_NAME)
|
||||
{
|
||||
assert(vvchParams.size() == 2);
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
std::string value(vvchParams[1].begin(), vvchParams[1].end());
|
||||
claimId = ClaimIdHash(hash, i);
|
||||
LogPrintf("--- %s[%lu]: OP_CLAIM_NAME \"%s\" = \"%s\" with claimId %s and tx prevout %s at index %d\n",
|
||||
__func__, pindex->nHeight, name, SanitizeString(value),
|
||||
claimId.GetHex(), hash.ToString(), i);
|
||||
}
|
||||
else if (op == OP_UPDATE_CLAIM)
|
||||
{
|
||||
assert(vvchParams.size() == 3);
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
std::string value(vvchParams[1].begin(), vvchParams[1].end());
|
||||
claimId = uint160(vvchParams[1]);
|
||||
LogPrintf("--- %s[%lu]: OP_UPDATE_CLAIM \"%s\" = \"%s\" with claimId %s and tx prevout %s at index %d\n",
|
||||
__func__, pindex->nHeight, name, SanitizeString(value),
|
||||
claimId.GetHex(), hash.ToString(), i);
|
||||
}
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
LogPrintf("%s: (txid: %s, nOut: %d) Trying to remove %s from the claim trie due to its block being disconnected\n", __func__, hash.ToString(), i, name.c_str());
|
||||
@@ -2182,6 +2200,8 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
|
||||
assert(vvchParams.size() == 2);
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
uint160 supportedClaimId(vvchParams[1]);
|
||||
LogPrintf("--- %s[%lu]: OP_SUPPORT_CLAIM \"%s\" with claimId %s and tx prevout %s at index %d\n",
|
||||
__func__, pindex->nHeight, name, supportedClaimId.GetHex(), hash.ToString(), i);
|
||||
LogPrintf("%s: (txid: %s, nOut: %d) Removing support for claim id %s on %s due to its block being disconnected\n", __func__, hash.ToString(), i, supportedClaimId.ToString(), name.c_str());
|
||||
if (!trieCache.undoAddSupport(name, COutPoint(hash, i), pindex->nHeight))
|
||||
LogPrintf("%s: Something went wrong removing support for name %s in hash %s\n", __func__, name.c_str(), hash.ToString());
|
||||
@@ -2212,6 +2232,13 @@ bool DisconnectBlock(const CBlock& block, CValidationState& state, const CBlockI
|
||||
assert(trieCache.finalizeDecrement());
|
||||
trieCache.setBestBlock(pindex->pprev->GetBlockHash());
|
||||
assert(trieCache.getMerkleHash() == pindex->pprev->hashClaimTrie);
|
||||
if (pindex->nHeight == Params().GetConsensus().nExtendedClaimExpirationForkHeight)
|
||||
{
|
||||
LogPrintf("Decremented past the extended claim expiration hard fork height");
|
||||
pclaimTrie->setExpirationTime(Params().GetConsensus().GetExpirationTime(pindex->nHeight-1));
|
||||
trieCache.forkForExpirationChange(false);
|
||||
}
|
||||
|
||||
|
||||
if (pfClean) {
|
||||
*pfClean = fClean;
|
||||
@@ -2472,6 +2499,15 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
|
||||
flags |= SCRIPT_VERIFY_CHECKSEQUENCEVERIFY;
|
||||
nLockTimeFlags |= LOCKTIME_VERIFY_SEQUENCE;
|
||||
}
|
||||
|
||||
// v 13 LBRYcrd hard fork to extend expiration time
|
||||
if (pindex->nHeight == Params().GetConsensus().nExtendedClaimExpirationForkHeight)
|
||||
{
|
||||
LogPrintf("Incremented past the extended claim expiration hard fork height");
|
||||
pclaimTrie->setExpirationTime(chainparams.GetConsensus().GetExpirationTime(pindex->nHeight));
|
||||
trieCache.forkForExpirationChange(true);
|
||||
}
|
||||
|
||||
|
||||
int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
|
||||
LogPrint("bench", " - Fork checks: %.2fms [%.2fs]\n", 0.001 * (nTime2 - nTime1), nTimeForks * 0.000001);
|
||||
@@ -2565,12 +2601,22 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
|
||||
if (op == OP_CLAIM_NAME)
|
||||
{
|
||||
assert(vvchParams.size() == 2);
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
std::string value(vvchParams[1].begin(), vvchParams[1].end());
|
||||
claimId = ClaimIdHash(txin.prevout.hash, txin.prevout.n);
|
||||
LogPrintf("+++ %s[%lu]: OP_CLAIM_NAME \"%s\" = \"%s\" with claimId %s and tx prevout %s at index %d\n",
|
||||
__func__, pindex->nHeight, name, SanitizeString(value),
|
||||
claimId.GetHex(), txin.prevout.hash.GetHex(), txin.prevout.n);
|
||||
}
|
||||
else if (op == OP_UPDATE_CLAIM)
|
||||
{
|
||||
assert(vvchParams.size() == 3);
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
std::string value(vvchParams[1].begin(), vvchParams[1].end());
|
||||
claimId = uint160(vvchParams[1]);
|
||||
LogPrintf("+++ %s[%lu]: OP_UPDATE_CLAIM \"%s\" = \"%s\" with claimId %s and tx prevout %s at index %d\n",
|
||||
__func__, pindex->nHeight, name, SanitizeString(value),
|
||||
claimId.GetHex(), txin.prevout.hash.GetHex(), txin.prevout.n);
|
||||
}
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
int nValidAtHeight;
|
||||
@@ -2587,11 +2633,14 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
|
||||
assert(vvchParams.size() == 2);
|
||||
std::string name(vvchParams[0].begin(), vvchParams[0].end());
|
||||
uint160 supportedClaimId(vvchParams[1]);
|
||||
LogPrintf("+++ %s[%lu]: OP_SUPPORT_CLAIM \"%s\" with claimId %s and tx prevout %s at index %d\n",
|
||||
__func__, pindex->nHeight, name,
|
||||
supportedClaimId.GetHex(), txin.prevout.hash.GetHex(), txin.prevout.n);
|
||||
int nValidAtHeight;
|
||||
LogPrintf("%s: Removing support for %s in %s. Tx: %s, nOut: %d\n", __func__, supportedClaimId.ToString(), name, txin.prevout.hash.ToString(), txin.prevout.n);
|
||||
LogPrintf("%s: Removing support for %s in %s. Tx: %s, nOut: %d, removed txid: %s\n", __func__, supportedClaimId.ToString(), name, txin.prevout.hash.ToString(), txin.prevout.n,tx.GetHash().ToString());
|
||||
if (trieCache.spendSupport(name, COutPoint(txin.prevout.hash, txin.prevout.n), coins->nHeight, nValidAtHeight))
|
||||
{
|
||||
mClaimUndoHeights[0] = nValidAtHeight;
|
||||
mClaimUndoHeights[i] = nValidAtHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ static const bool DEFAULT_WHITELISTFORCERELAY = true;
|
||||
/** Default for -minrelaytxfee, minimum relay fee for transactions */
|
||||
static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
|
||||
//! -maxtxfee default
|
||||
static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN;
|
||||
static const CAmount DEFAULT_TRANSACTION_MAXFEE = 1 * COIN;
|
||||
//! Discourage users to set fees higher than this amount (in satoshis) per kB
|
||||
static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
|
||||
//! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
|
||||
@@ -163,6 +163,9 @@ extern size_t nCoinCacheUsage;
|
||||
extern CFeeRate minRelayTxFee;
|
||||
/** Absolute maximum transaction fee (in satoshis) used by wallet and mempool (rejects high fee in sendrawtransaction) */
|
||||
extern CAmount maxTxFee;
|
||||
/** Used to calculate minimum fee for claim trie transactions **/
|
||||
extern CAmount minFeePerNameClaimChar;
|
||||
|
||||
/** If the tip is older than this (in seconds), the node is considered to be in initial block download. */
|
||||
extern int64_t nMaxTipAge;
|
||||
extern bool fEnableReplacement;
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#include <boost/foreach.hpp>
|
||||
#include "nameclaim.h"
|
||||
#include "hash.h"
|
||||
#include "util.h"
|
||||
|
||||
|
||||
std::vector<unsigned char> uint32_t_to_vch(uint32_t n)
|
||||
{
|
||||
std::vector<unsigned char> vchN;
|
||||
@@ -25,6 +27,29 @@ uint32_t vch_to_uint32_t(std::vector<unsigned char>& vchN)
|
||||
return n;
|
||||
}
|
||||
|
||||
CScript ClaimNameScript(std::string name, std::string value)
|
||||
{
|
||||
std::vector<unsigned char> vchName(name.begin(), name.end());
|
||||
std::vector<unsigned char> vchValue(value.begin(), value.end());
|
||||
return CScript() << OP_CLAIM_NAME << vchName << vchValue << OP_2DROP << OP_DROP << OP_TRUE;
|
||||
|
||||
}
|
||||
CScript SupportClaimScript(std::string name, uint160 claimId)
|
||||
{
|
||||
std::vector<unsigned char> vchName(name.begin(), name.end());
|
||||
std::vector<unsigned char> vchClaimId(claimId.begin(),claimId.end());
|
||||
return CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << OP_2DROP << OP_DROP << OP_TRUE;
|
||||
}
|
||||
CScript UpdateClaimScript(std::string name, uint160 claimId, std::string value)
|
||||
{
|
||||
std::vector<unsigned char> vchName(name.begin(), name.end());
|
||||
std::vector<unsigned char> vchClaimId(claimId.begin(),claimId.end());
|
||||
std::vector<unsigned char> vchValue(value.begin(), value.end());
|
||||
return CScript() << OP_UPDATE_CLAIM << vchName << vchClaimId << vchValue << OP_2DROP << OP_2DROP << OP_TRUE;
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams)
|
||||
{
|
||||
CScript::const_iterator pc = scriptIn.begin();
|
||||
@@ -150,3 +175,27 @@ size_t ClaimNameSize(const CScript& scriptIn)
|
||||
return vvchParams[0].size();
|
||||
}
|
||||
}
|
||||
|
||||
CAmount CalcMinClaimTrieFee(const CTransaction& tx, const CAmount &minFeePerNameClaimChar)
|
||||
{
|
||||
if (minFeePerNameClaimChar == 0)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
CAmount min_fee = 0;
|
||||
BOOST_FOREACH(const CTxOut& txout, tx.vout)
|
||||
{
|
||||
int op;
|
||||
std::vector<std::vector<unsigned char> > vvchParams;
|
||||
if (DecodeClaimScript(txout.scriptPubKey, op, vvchParams))
|
||||
{
|
||||
if (op == OP_CLAIM_NAME)
|
||||
{
|
||||
int claim_name_size = vvchParams[0].size();
|
||||
min_fee += claim_name_size*minFeePerNameClaimChar;
|
||||
}
|
||||
}
|
||||
}
|
||||
return min_fee;
|
||||
}
|
||||
@@ -1,19 +1,33 @@
|
||||
#ifndef BITCOIN_NAMECLAIM_H
|
||||
#define BITCOIN_NAMECLAIM_H
|
||||
|
||||
#include "amount.h"
|
||||
#include "script/script.h"
|
||||
#include "primitives/transaction.h"
|
||||
#include "uint256.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
// This is the minimum claim fee per character in the name of an OP_CLAIM_NAME command that must
|
||||
// be attached to transactions for it to be accepted into the memory pool.
|
||||
// Rationale: current implementation of the claim trie uses more memory for longer name claims
|
||||
// due to the fact that each chracater is assigned a trie node regardless of whether it contains
|
||||
// any claims or not. In the future, we can switch to a radix tree implementation where
|
||||
// empty nodes do not take up any memory and the minimum fee can be priced on a per claim
|
||||
// basis.
|
||||
#define MIN_FEE_PER_NAMECLAIM_CHAR 200000
|
||||
|
||||
// This is the max claim script size in bytes, not including the script pubkey part of the script.
|
||||
// Scripts exceeding this size are rejected in CheckTransaction in main.cpp
|
||||
#define MAX_CLAIM_SCRIPT_SIZE 8192
|
||||
|
||||
// This is the max claim name size in bytes, for all claim trie transactions.
|
||||
// This is the max claim name size in bytes, for all claim trie transactions.
|
||||
// Scripts exceeding this size are rejected in CheckTransaction in main.cpp
|
||||
#define MAX_CLAIM_NAME_SIZE 255
|
||||
|
||||
CScript ClaimNameScript(std::string name, std::string value);
|
||||
CScript SupportClaimScript(std::string name, uint160 claimId);
|
||||
CScript UpdateClaimScript(std::string name, uint160 claimId, std::string value);
|
||||
bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams);
|
||||
bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, CScript::const_iterator& pc);
|
||||
CScript StripClaimScriptPrefix(const CScript& scriptIn);
|
||||
@@ -21,9 +35,11 @@ CScript StripClaimScriptPrefix(const CScript& scriptIn, int& op);
|
||||
uint160 ClaimIdHash(const uint256& txhash, uint32_t nOut);
|
||||
std::vector<unsigned char> uint32_t_to_vch(uint32_t n);
|
||||
uint32_t vch_to_uint32_t(std::vector<unsigned char>& vchN);
|
||||
// get size of the claim script, minus the script pubkey part
|
||||
// get size of the claim script, minus the script pubkey part
|
||||
size_t ClaimScriptSize(const CScript& scriptIn);
|
||||
// get size of the name in a claim script, returns 0 if scriptin is not a claimetrie transaction
|
||||
size_t ClaimNameSize(const CScript& scriptIn);
|
||||
// get size of the name in a claim script, returns 0 if scriptin is not a claimetrie transaction
|
||||
size_t ClaimNameSize(const CScript& scriptIn);
|
||||
// calculate the minimum fee (mempool rule) required for transaction
|
||||
CAmount CalcMinClaimTrieFee(const CTransaction& tx, const CAmount &minFeePerNameClaimChar);
|
||||
|
||||
#endif // BITCOIN_NAMECLAIM_H
|
||||
@@ -14,31 +14,21 @@
|
||||
unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
|
||||
{
|
||||
unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
|
||||
|
||||
// Genesis block
|
||||
if (pindexLast == NULL)
|
||||
return nProofOfWorkLimit;
|
||||
|
||||
// Only change once per difficulty adjustment interval
|
||||
if ((pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval() != 0)
|
||||
if (params.fPowAllowMinDifficultyBlocks && pindexLast->nHeight >= 277299)
|
||||
{
|
||||
if (params.fPowAllowMinDifficultyBlocks)
|
||||
{
|
||||
// Special difficulty rule for testnet:
|
||||
// If the new block's timestamp is more than 2* 10 minutes
|
||||
// then allow mining of a min-difficulty block.
|
||||
if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2)
|
||||
return nProofOfWorkLimit;
|
||||
else
|
||||
{
|
||||
// Return the last non-special-min-difficulty-rules-block
|
||||
const CBlockIndex* pindex = pindexLast;
|
||||
while (pindex->pprev && pindex->nHeight % params.DifficultyAdjustmentInterval() != 0 && pindex->nBits == nProofOfWorkLimit)
|
||||
pindex = pindex->pprev;
|
||||
return pindex->nBits;
|
||||
}
|
||||
// Special difficulty rule for testnet:
|
||||
// If the new block's timestamp is twice the target block time
|
||||
// then allow mining of a min-difficulty block.
|
||||
// This is to prevent the testnet from gettig stuck when a large amount
|
||||
// of hashrate drops off the network.
|
||||
// This rule was not implemented properly until testnet block 277299.
|
||||
if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2){
|
||||
return nProofOfWorkLimit;
|
||||
}
|
||||
return pindexLast->nBits;
|
||||
}
|
||||
|
||||
// Go back the full period unless it's the first retarget after genesis.
|
||||
|
||||
@@ -170,15 +170,19 @@ public:
|
||||
// 546*minRelayTxFee/1000 (in satoshis)
|
||||
if (scriptPubKey.IsUnspendable())
|
||||
return 0;
|
||||
|
||||
size_t nSize = GetSerializeSize(SER_DISK,0)+148u;
|
||||
return 3*minRelayTxFee.GetFee(nSize);
|
||||
|
||||
// for lbrycrd this is mainly to prevent 0 value claims
|
||||
// and some spam protection without limiting small
|
||||
// lbrynet transactions
|
||||
return 1;
|
||||
// below is original bitcoin core code
|
||||
//size_t nSize = GetSerializeSize(SER_DISK,0)+dd148u;
|
||||
//return 3*minRelayTxFee.GetFee(nSize);
|
||||
}
|
||||
|
||||
bool IsDust(const CFeeRate &minRelayTxFee) const
|
||||
{
|
||||
return false;
|
||||
// return (nValue < GetDustThreshold(minRelayTxFee));
|
||||
return (nValue < GetDustThreshold(minRelayTxFee));
|
||||
}
|
||||
|
||||
friend bool operator==(const CTxOut& a, const CTxOut& b)
|
||||
|
||||
@@ -40,9 +40,9 @@ QString BitcoinUnits::name(int unit)
|
||||
{
|
||||
switch(unit)
|
||||
{
|
||||
case BTC: return QString("BTC");
|
||||
case mBTC: return QString("mBTC");
|
||||
case uBTC: return QString::fromUtf8("μBTC");
|
||||
case BTC: return QString("LBC");
|
||||
case mBTC: return QString("mLBC");
|
||||
case uBTC: return QString::fromUtf8("μLBC");
|
||||
default: return QString("???");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,12 +48,12 @@ double GetDifficulty(const CBlockIndex* blockindex)
|
||||
double dDiff =
|
||||
(double)0x0000ffff / (double)(blockindex->nBits & 0x00ffffff);
|
||||
|
||||
while (nShift < 29)
|
||||
while (nShift < 31)
|
||||
{
|
||||
dDiff *= 256.0;
|
||||
nShift++;
|
||||
}
|
||||
while (nShift > 29)
|
||||
while (nShift > 31)
|
||||
{
|
||||
dDiff /= 256.0;
|
||||
nShift--;
|
||||
|
||||
@@ -4,6 +4,24 @@
|
||||
#include "univalue.h"
|
||||
#include "txmempool.h"
|
||||
|
||||
// Maximum block decrement that is allowed from rpc calls
|
||||
const int MAX_RPC_BLOCK_DECREMENTS = 50;
|
||||
|
||||
uint160 ParseClaimtrieId(const UniValue& v, std::string strName)
|
||||
{
|
||||
std::string strHex;
|
||||
if (v.isStr())
|
||||
strHex = v.get_str();
|
||||
if (!IsHex(strHex)) // Note: IsHex("") is false
|
||||
throw JSONRPCError(RPC_INVALID_PARAMETER, strName + " must be a 20-character hexadecimal string (not '" + strHex + "')");
|
||||
if (40 != strHex.length())
|
||||
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be of length %d (not %d)", strName, 40, strHex.length()));
|
||||
|
||||
uint160 result;
|
||||
result.SetHex(strHex);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
UniValue getclaimsintrie(const UniValue& params, bool fHelp)
|
||||
{
|
||||
@@ -19,6 +37,7 @@ UniValue getclaimsintrie(const UniValue& params, bool fHelp)
|
||||
" \"name\" (string) the name claimed\n"
|
||||
" \"claims\": [ (array of object) the claims for this name\n"
|
||||
" {\n"
|
||||
" \"claimId\" (string) the claimId of the claim\n"
|
||||
" \"txid\" (string) the txid of the claim\n"
|
||||
" \"n\" (numeric) the vout value of the claim\n"
|
||||
" \"amount\" (numeric) txout amount\n"
|
||||
@@ -46,6 +65,7 @@ UniValue getclaimsintrie(const UniValue& params, bool fHelp)
|
||||
for (std::vector<CClaimValue>::iterator itClaims = it->second.claims.begin(); itClaims != it->second.claims.end(); ++itClaims)
|
||||
{
|
||||
UniValue claim(UniValue::VOBJ);
|
||||
claim.push_back(Pair("claimId", itClaims->claimId.GetHex()));
|
||||
claim.push_back(Pair("txid", itClaims->outPoint.hash.GetHex()));
|
||||
claim.push_back(Pair("n", (int)itClaims->outPoint.n));
|
||||
claim.push_back(Pair("amount", ValueFromAmount(itClaims->nAmount)));
|
||||
@@ -57,7 +77,7 @@ UniValue getclaimsintrie(const UniValue& params, bool fHelp)
|
||||
__func__, itClaims->outPoint.hash.GetHex());
|
||||
claim.push_back(Pair("error", "No value found for claim"));
|
||||
}
|
||||
else if (coin->vout.size() < itClaims->outPoint.n || coin->vout[itClaims->outPoint.n].IsNull())
|
||||
else if (!coin->IsAvailable(itClaims->outPoint.n))
|
||||
{
|
||||
LogPrintf("%s: the specified txout of %s appears to have been spent\n", __func__, itClaims->outPoint.hash.GetHex());
|
||||
claim.push_back(Pair("error", "Txout spent"));
|
||||
@@ -133,7 +153,7 @@ bool getValueForClaim(const COutPoint& out, std::string& sValue)
|
||||
__func__, out.hash.GetHex());
|
||||
return true;
|
||||
}
|
||||
if (coin->vout.size() < out.n || coin->vout[out.n].IsNull())
|
||||
if(!coin->IsAvailable(out.n))
|
||||
{
|
||||
LogPrintf("%s: the specified txout of %s appears to have been spent\n", __func__, out.hash.GetHex());
|
||||
return true;
|
||||
@@ -168,6 +188,7 @@ UniValue getvalueforname(const UniValue& params, bool fHelp)
|
||||
"1. \"name\" (string) the name to look up\n"
|
||||
"Result: \n"
|
||||
"\"value\" (string) the value of the name, if it exists\n"
|
||||
"\"claimId\" (string) the claimId for this name claim\n"
|
||||
"\"txid\" (string) the hash of the transaction which successfully claimed the name\n"
|
||||
"\"n\" (numeric) vout value\n"
|
||||
"\"amount\" (numeric) txout amount\n"
|
||||
@@ -184,10 +205,11 @@ UniValue getvalueforname(const UniValue& params, bool fHelp)
|
||||
if (!getValueForClaim(claim.outPoint, sValue))
|
||||
return ret;
|
||||
ret.push_back(Pair("value", sValue));
|
||||
ret.push_back(Pair("claimId", claim.claimId.GetHex()));
|
||||
ret.push_back(Pair("txid", claim.outPoint.hash.GetHex()));
|
||||
ret.push_back(Pair("n", (int)claim.outPoint.n));
|
||||
ret.push_back(Pair("amount", claim.nAmount));
|
||||
ret.push_back(Pair("effective amount", claim.nEffectiveAmount));
|
||||
ret.push_back(Pair("effective amount", pclaimTrie->getEffectiveAmountForClaim(name, claim.claimId)));
|
||||
ret.push_back(Pair("height", claim.nHeight));
|
||||
return ret;
|
||||
}
|
||||
@@ -343,6 +365,73 @@ UniValue getclaimsforname(const UniValue& params, bool fHelp)
|
||||
return ret;
|
||||
}
|
||||
|
||||
UniValue getclaimbyid(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (fHelp || params.size() != 1)
|
||||
throw std::runtime_error(
|
||||
"getclaimbyid\n"
|
||||
"Get a claim by claim id\n"
|
||||
"Arguments: \n"
|
||||
"1. \"claimId\" (string) the claimId of this claim\n"
|
||||
"Result:\n"
|
||||
"{\n"
|
||||
" \"name\" (string) the name of the claim\n"
|
||||
" \"value\" (string) claim metadata\n"
|
||||
" \"claimId\" (string) the claimId of this claim\n"
|
||||
" \"txid\" (string) the hash of the transaction which has successfully claimed this name\n"
|
||||
" \"n\" (numeric) vout value\n"
|
||||
" \"amount\" (numeric) txout value\n"
|
||||
" \"effective amount\" (numeric) txout amount plus amount from all supports associated with the claim\n"
|
||||
" \"height\" (numeric) the height of the block in which this claim transaction is located\n"
|
||||
" \"supports\" (array of object) supports for this claim\n"
|
||||
" \"valid at height\" (numeric) the height at which the claim is valid\n"
|
||||
" [\n"
|
||||
" \"txid\" (string) the txid of the support\n"
|
||||
" \"n\" (numeric) the index of the support in the transaction's list of outputs\n"
|
||||
" \"height\" (numeric) the height at which the support was included in the blockchain\n"
|
||||
" \"valid at height\" (numeric) the height at which the support is valid\n"
|
||||
" \"amount\" (numeric) the amount of the support\n"
|
||||
" ]\n"
|
||||
"}\n"
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
uint160 claimId = ParseClaimtrieId(params[0], "Claim-id (parameter 1)");
|
||||
UniValue claim(UniValue::VOBJ);
|
||||
std::string name;
|
||||
CClaimValue claimValue;
|
||||
pclaimTrie->getClaimById(claimId, name, claimValue);
|
||||
if (claimValue.claimId == claimId)
|
||||
{
|
||||
std::vector<CSupportValue> supports;
|
||||
CAmount effectiveAmount = pclaimTrie->getEffectiveAmountForClaimWithSupports(
|
||||
name, claimValue.claimId, supports);
|
||||
|
||||
std::string sValue;
|
||||
getValueForClaim(claimValue.outPoint, sValue);
|
||||
claim.push_back(Pair("name", name));
|
||||
claim.push_back(Pair("value", sValue));
|
||||
claim.push_back(Pair("claimId", claimValue.claimId.GetHex()));
|
||||
claim.push_back(Pair("txid", claimValue.outPoint.hash.GetHex()));
|
||||
claim.push_back(Pair("n", (int) claimValue.outPoint.n));
|
||||
claim.push_back(Pair("amount", claimValue.nAmount));
|
||||
claim.push_back(Pair("effective amount", effectiveAmount));
|
||||
UniValue supportList(UniValue::VARR);
|
||||
BOOST_FOREACH(const CSupportValue& support, supports) {
|
||||
UniValue supportEntry(UniValue::VOBJ);
|
||||
supportEntry.push_back(Pair("txid", support.outPoint.hash.GetHex()));
|
||||
supportEntry.push_back(Pair("n", (int)support.outPoint.n));
|
||||
supportEntry.push_back(Pair("height", support.nHeight));
|
||||
supportEntry.push_back(Pair("valid at height", support.nValidAtHeight));
|
||||
supportEntry.push_back(Pair("amount", support.nAmount));
|
||||
supportList.push_back(supportEntry);
|
||||
}
|
||||
claim.push_back(Pair("supports", supportList));
|
||||
claim.push_back(Pair("height", claimValue.nHeight));
|
||||
claim.push_back(Pair("valid at height", claimValue.nValidAtHeight));
|
||||
}
|
||||
return claim;
|
||||
}
|
||||
|
||||
UniValue gettotalclaimednames(const UniValue& params, bool fHelp)
|
||||
{
|
||||
@@ -438,10 +527,7 @@ UniValue getclaimsfortx(const UniValue& params, bool fHelp)
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
uint256 hash;
|
||||
hash.SetHex(params[0].get_str());
|
||||
|
||||
uint256 hash = ParseHashV(params[0], "txid (parameter 1)");
|
||||
UniValue ret(UniValue::VARR);
|
||||
|
||||
int op;
|
||||
@@ -667,8 +753,7 @@ UniValue getnameproof(const UniValue& params, bool fHelp)
|
||||
uint256 blockHash;
|
||||
if (params.size() == 2)
|
||||
{
|
||||
std::string strBlockHash = params[1].get_str();
|
||||
blockHash = uint256S(strBlockHash);
|
||||
blockHash = ParseHashV(params[1], "blockhash (optional parameter 2)");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -682,7 +767,7 @@ UniValue getnameproof(const UniValue& params, bool fHelp)
|
||||
if (!chainActive.Contains(pblockIndex))
|
||||
throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not in main chain");
|
||||
|
||||
if (chainActive.Tip()->nHeight > (pblockIndex->nHeight + 20))
|
||||
if (chainActive.Tip()->nHeight > (pblockIndex->nHeight + MAX_RPC_BLOCK_DECREMENTS))
|
||||
throw JSONRPCError(RPC_INTERNAL_ERROR, "Block too deep to generate proof");
|
||||
|
||||
CClaimTrieProof proof;
|
||||
@@ -704,6 +789,7 @@ static const CRPCCommand commands[] =
|
||||
{ "Claimtrie", "gettotalvalueofclaims", &gettotalvalueofclaims, true },
|
||||
{ "Claimtrie", "getclaimsfortx", &getclaimsfortx, true },
|
||||
{ "Claimtrie", "getnameproof", &getnameproof, true },
|
||||
{ "Claimtrie", "getclaimbyid", &getclaimbyid, true },
|
||||
};
|
||||
|
||||
void RegisterClaimTrieRPCCommands(CRPCTable &tableRPC)
|
||||
|
||||
@@ -658,9 +658,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
|
||||
result.push_back(Pair("curtime", pblock->GetBlockTime()));
|
||||
result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
|
||||
result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
|
||||
|
||||
if (pclaimTrie)
|
||||
result.push_back(Pair("claimtrie", pclaimTrie->getMerkleHash().GetHex()));
|
||||
result.push_back(Pair("claimtrie", pblock->hashClaimTrie.GetHex()));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,229 @@
|
||||
#include "claimtrie.h"
|
||||
#include "main.h"
|
||||
#include "uint256.h"
|
||||
|
||||
#include "test/test_bitcoin.h"
|
||||
#include <boost/test/unit_test.hpp>
|
||||
using namespace std;
|
||||
|
||||
|
||||
class CClaimTrieCacheTest : public CClaimTrieCache {
|
||||
public:
|
||||
CClaimTrieCacheTest(CClaimTrie* base):
|
||||
CClaimTrieCache(base, false){}
|
||||
|
||||
bool recursiveComputeMerkleHash(CClaimTrieNode* tnCurrent,
|
||||
std::string sPos) const
|
||||
{
|
||||
return CClaimTrieCache::recursiveComputeMerkleHash(tnCurrent, sPos);
|
||||
}
|
||||
|
||||
bool recursivePruneName(CClaimTrieNode* tnCurrent, unsigned int nPos, std::string sName, bool* pfNullified) const
|
||||
{
|
||||
return CClaimTrieCache::recursivePruneName(tnCurrent,nPos,sName, pfNullified);
|
||||
}
|
||||
int cacheSize()
|
||||
{
|
||||
return cache.size();
|
||||
}
|
||||
|
||||
nodeCacheType::iterator getCache(std::string key)
|
||||
{
|
||||
return cache.find(key);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
CMutableTransaction BuildTransaction(const uint256& prevhash)
|
||||
{
|
||||
CMutableTransaction tx;
|
||||
tx.nVersion = 1;
|
||||
tx.nLockTime = 0;
|
||||
tx.vin.resize(1);
|
||||
tx.vout.resize(1);
|
||||
tx.vin[0].prevout.hash = prevhash;
|
||||
tx.vin[0].prevout.n = 0;
|
||||
tx.vin[0].scriptSig = CScript();
|
||||
tx.vin[0].nSequence = std::numeric_limits<unsigned int>::max();
|
||||
tx.vout[0].scriptPubKey = CScript();
|
||||
tx.vout[0].nValue = 0;
|
||||
|
||||
return tx;
|
||||
}
|
||||
|
||||
BOOST_FIXTURE_TEST_SUITE(claimtriecache_tests, RegTestingSetup)
|
||||
|
||||
|
||||
BOOST_AUTO_TEST_CASE(merkle_hash_single_test)
|
||||
{
|
||||
// check empty trie
|
||||
uint256 one(uint256S("0000000000000000000000000000000000000000000000000000000000000001"));
|
||||
CClaimTrieCacheTest cc(pclaimTrie);
|
||||
BOOST_CHECK(one == cc.getMerkleHash());
|
||||
|
||||
// check trie with only root node
|
||||
CClaimTrieNode base_node;
|
||||
cc.recursiveComputeMerkleHash(&base_node, "");
|
||||
BOOST_CHECK(one == cc.getMerkleHash());
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)
|
||||
{
|
||||
CClaimValue unused;
|
||||
uint256 hash0(uint256S("0000000000000000000000000000000000000000000000000000000000000001"));
|
||||
uint160 hash160;
|
||||
CMutableTransaction tx1 = BuildTransaction(hash0);
|
||||
COutPoint tx1OutPoint(tx1.GetHash(), 0);
|
||||
CMutableTransaction tx2 = BuildTransaction(tx1.GetHash());
|
||||
COutPoint tx2OutPoint(tx2.GetHash(), 0);
|
||||
CMutableTransaction tx3 = BuildTransaction(tx2.GetHash());
|
||||
COutPoint tx3OutPoint(tx3.GetHash(), 0);
|
||||
CMutableTransaction tx4 = BuildTransaction(tx3.GetHash());
|
||||
COutPoint tx4OutPoint(tx4.GetHash(), 0);
|
||||
CMutableTransaction tx5 = BuildTransaction(tx4.GetHash());
|
||||
COutPoint tx5OutPoint(tx5.GetHash(), 0);
|
||||
CMutableTransaction tx6 = BuildTransaction(tx5.GetHash());
|
||||
COutPoint tx6OutPoint(tx6.GetHash(), 0);
|
||||
|
||||
uint256 hash1;
|
||||
hash1.SetHex("71c7b8d35b9a3d7ad9a1272b68972979bbd18589f1efe6f27b0bf260a6ba78fa");
|
||||
|
||||
uint256 hash2;
|
||||
hash2.SetHex("c4fc0e2ad56562a636a0a237a96a5f250ef53495c2cb5edd531f087a8de83722");
|
||||
|
||||
uint256 hash3;
|
||||
hash3.SetHex("baf52472bd7da19fe1e35116cfb3bd180d8770ffbe3ae9243df1fb58a14b0975");
|
||||
|
||||
uint256 hash4;
|
||||
hash4.SetHex("c73232a755bf015f22eaa611b283ff38100f2a23fb6222e86eca363452ba0c51");
|
||||
|
||||
BOOST_CHECK(pclaimTrie->empty());
|
||||
|
||||
CClaimTrieCache ntState(pclaimTrie, false);
|
||||
ntState.insertClaimIntoTrie(std::string("test"), CClaimValue(tx1OutPoint, hash160, 50, 100, 200));
|
||||
ntState.insertClaimIntoTrie(std::string("test2"), CClaimValue(tx2OutPoint, hash160, 50, 100, 200));
|
||||
|
||||
BOOST_CHECK(pclaimTrie->empty());
|
||||
BOOST_CHECK(!ntState.empty());
|
||||
BOOST_CHECK(ntState.getMerkleHash() == hash1);
|
||||
|
||||
ntState.insertClaimIntoTrie(std::string("test"), CClaimValue(tx3OutPoint, hash160, 50, 101, 201));
|
||||
BOOST_CHECK(ntState.getMerkleHash() == hash1);
|
||||
ntState.insertClaimIntoTrie(std::string("tes"), CClaimValue(tx4OutPoint, hash160, 50, 100, 200));
|
||||
BOOST_CHECK(ntState.getMerkleHash() == hash2);
|
||||
ntState.insertClaimIntoTrie(std::string("testtesttesttest"), CClaimValue(tx5OutPoint, hash160, 50, 100, 200));
|
||||
ntState.removeClaimFromTrie(std::string("testtesttesttest"), tx5OutPoint, unused);
|
||||
BOOST_CHECK(ntState.getMerkleHash() == hash2);
|
||||
ntState.flush();
|
||||
|
||||
BOOST_CHECK(!pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash2);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
|
||||
CClaimTrieCache ntState1(pclaimTrie, false);
|
||||
ntState1.removeClaimFromTrie(std::string("test"), tx1OutPoint, unused);
|
||||
ntState1.removeClaimFromTrie(std::string("test2"), tx2OutPoint, unused);
|
||||
ntState1.removeClaimFromTrie(std::string("test"), tx3OutPoint, unused);
|
||||
ntState1.removeClaimFromTrie(std::string("tes"), tx4OutPoint, unused);
|
||||
|
||||
BOOST_CHECK(ntState1.getMerkleHash() == hash0);
|
||||
|
||||
CClaimTrieCache ntState2(pclaimTrie, false);
|
||||
ntState2.insertClaimIntoTrie(std::string("abab"), CClaimValue(tx6OutPoint, hash160, 50, 100, 200));
|
||||
ntState2.removeClaimFromTrie(std::string("test"), tx1OutPoint, unused);
|
||||
|
||||
BOOST_CHECK(ntState2.getMerkleHash() == hash3);
|
||||
|
||||
ntState2.flush();
|
||||
|
||||
BOOST_CHECK(!pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash3);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
|
||||
CClaimTrieCache ntState3(pclaimTrie, false);
|
||||
ntState3.insertClaimIntoTrie(std::string("test"), CClaimValue(tx1OutPoint, hash160, 50, 100, 200));
|
||||
BOOST_CHECK(ntState3.getMerkleHash() == hash4);
|
||||
ntState3.flush();
|
||||
BOOST_CHECK(!pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash4);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
|
||||
CClaimTrieCache ntState4(pclaimTrie, false);
|
||||
ntState4.removeClaimFromTrie(std::string("abab"), tx6OutPoint, unused);
|
||||
BOOST_CHECK(ntState4.getMerkleHash() == hash2);
|
||||
ntState4.flush();
|
||||
BOOST_CHECK(!pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash2);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
|
||||
CClaimTrieCache ntState5(pclaimTrie, false);
|
||||
ntState5.removeClaimFromTrie(std::string("test"), tx3OutPoint, unused);
|
||||
|
||||
BOOST_CHECK(ntState5.getMerkleHash() == hash2);
|
||||
ntState5.flush();
|
||||
BOOST_CHECK(!pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash2);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
|
||||
CClaimTrieCache ntState6(pclaimTrie, false);
|
||||
ntState6.insertClaimIntoTrie(std::string("test"), CClaimValue(tx3OutPoint, hash160, 50, 101, 201));
|
||||
|
||||
BOOST_CHECK(ntState6.getMerkleHash() == hash2);
|
||||
ntState6.flush();
|
||||
BOOST_CHECK(!pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash2);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
|
||||
CClaimTrieCache ntState7(pclaimTrie, false);
|
||||
ntState7.removeClaimFromTrie(std::string("test"), tx3OutPoint, unused);
|
||||
ntState7.removeClaimFromTrie(std::string("test"), tx1OutPoint, unused);
|
||||
ntState7.removeClaimFromTrie(std::string("tes"), tx4OutPoint, unused);
|
||||
ntState7.removeClaimFromTrie(std::string("test2"), tx2OutPoint, unused);
|
||||
|
||||
BOOST_CHECK(ntState7.getMerkleHash() == hash0);
|
||||
ntState7.flush();
|
||||
BOOST_CHECK(pclaimTrie->empty());
|
||||
BOOST_CHECK(pclaimTrie->getMerkleHash() == hash0);
|
||||
BOOST_CHECK(pclaimTrie->checkConsistency());
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(recursive_prune_test)
|
||||
{
|
||||
CClaimTrieCacheTest cc(pclaimTrie);
|
||||
BOOST_CHECK_EQUAL(0, cc.cacheSize());
|
||||
|
||||
COutPoint outpoint;
|
||||
uint160 claimId;
|
||||
CAmount amount(20);
|
||||
int height = 0;
|
||||
int validAtHeight = 0;
|
||||
CClaimValue test_claim(outpoint, claimId, amount, height, validAtHeight);
|
||||
|
||||
CClaimTrieNode base_node;
|
||||
// base node has a claim, so it should not be pruned
|
||||
base_node.insertClaim(test_claim);
|
||||
|
||||
// node 1 has a claim so it should not be pruned
|
||||
CClaimTrieNode node_1;
|
||||
const char c = 't';
|
||||
base_node.children[c] = &node_1;
|
||||
node_1.insertClaim(test_claim);
|
||||
// set this just to make sure we get the right CClaimTrieNode back
|
||||
node_1.nHeightOfLastTakeover = 10;
|
||||
|
||||
//node 2 does not have a claim so it should be pruned
|
||||
// thus we should find pruned node 1 in cache
|
||||
CClaimTrieNode node_2;
|
||||
const char c_2 = 'e';
|
||||
node_1.children[c_2] = &node_2;
|
||||
|
||||
cc.recursivePruneName(&base_node, 0, std::string("te"), NULL);
|
||||
BOOST_CHECK_EQUAL(1, cc.cacheSize());
|
||||
nodeCacheType::iterator it = cc.getCache(std::string("t"));
|
||||
BOOST_CHECK_EQUAL(10, it->second->nHeightOfLastTakeover);
|
||||
BOOST_CHECK_EQUAL(1, it->second->claims.size());
|
||||
BOOST_CHECK_EQUAL(0, it->second->children.size());
|
||||
}
|
||||
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
@@ -0,0 +1,38 @@
|
||||
#include "nameclaim.h"
|
||||
#include "primitives/transaction.h"
|
||||
#include <boost/test/unit_test.hpp>
|
||||
#include "test/test_bitcoin.h"
|
||||
|
||||
//BOOST_FIXTURE_TEST_SUITE(nameclaim_tests, BasicTestingSetup)
|
||||
|
||||
BOOST_AUTO_TEST_CASE(calc_min_claimtrie_fee)
|
||||
{
|
||||
|
||||
CMutableTransaction tx;
|
||||
tx.vout.resize(1);
|
||||
tx.vout[0].scriptPubKey = ClaimNameScript("A","test");
|
||||
BOOST_CHECK_EQUAL(CalcMinClaimTrieFee(tx, MIN_FEE_PER_NAMECLAIM_CHAR), MIN_FEE_PER_NAMECLAIM_CHAR);
|
||||
|
||||
// check that fee is adjusted based on name length
|
||||
CMutableTransaction tx2;
|
||||
tx2.vout.resize(1);
|
||||
tx2.vout[0].scriptPubKey = ClaimNameScript("ABCDE","test");
|
||||
BOOST_CHECK_EQUAL(CalcMinClaimTrieFee(tx2,MIN_FEE_PER_NAMECLAIM_CHAR), MIN_FEE_PER_NAMECLAIM_CHAR*5);
|
||||
|
||||
// check that multiple OP_CLAIM_NAME outputs are counted
|
||||
CMutableTransaction tx3;
|
||||
tx3.vout.resize(2);
|
||||
tx3.vout[0].scriptPubKey = ClaimNameScript("A","test");
|
||||
tx3.vout[1].scriptPubKey = ClaimNameScript("AB","test");
|
||||
BOOST_CHECK_EQUAL(CalcMinClaimTrieFee(tx3,MIN_FEE_PER_NAMECLAIM_CHAR), MIN_FEE_PER_NAMECLAIM_CHAR*3);
|
||||
|
||||
// if tx has no claim minimum fee is 0
|
||||
CMutableTransaction tx4;
|
||||
tx4.vout.resize(1);
|
||||
BOOST_CHECK_EQUAL(CalcMinClaimTrieFee(tx4,MIN_FEE_PER_NAMECLAIM_CHAR), 0);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
//BOOST_AUTO_TEST_SUITE_END()
|
||||
@@ -332,4 +332,23 @@ BOOST_AUTO_TEST_CASE(rpc_convert_values_generatetoaddress)
|
||||
BOOST_CHECK_EQUAL(result[2].get_int(), 9);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(rpc_claimtrie_validation)
|
||||
{
|
||||
// std::runtime_error: parameter 2 must be hexadecimal string (not 'not_hex')
|
||||
BOOST_CHECK_THROW(CallRPC("getnameproof test not_hex"), runtime_error);
|
||||
// std::runtime_error: Block not found
|
||||
BOOST_CHECK_THROW(CallRPC("getnameproof test aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), runtime_error);
|
||||
// Generate a block to validate the NO_THROW case.
|
||||
UniValue result = CallRPC("generate 1");
|
||||
BOOST_CHECK_NO_THROW(CallRPC(string("getnameproof test ") + result[0].get_str()));
|
||||
|
||||
BOOST_CHECK_THROW(CallRPC("getclaimsfortx not_hex"), runtime_error);
|
||||
BOOST_CHECK_NO_THROW(CallRPC("getclaimsfortx aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
|
||||
|
||||
BOOST_CHECK_THROW(CallRPC("getclaimbyid not_hex"), runtime_error);
|
||||
// Wrong length.
|
||||
BOOST_CHECK_THROW(CallRPC("getclaimbyid a"), runtime_error);
|
||||
BOOST_CHECK_NO_THROW(CallRPC("getclaimbyid aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
@@ -153,6 +153,7 @@ TestChain100Setup::~TestChain100Setup()
|
||||
RegTestingSetup::RegTestingSetup() : TestingSetup(CBaseChainParams::REGTEST)
|
||||
{
|
||||
minRelayTxFee = CFeeRate(0);
|
||||
minFeePerNameClaimChar = 0;
|
||||
}
|
||||
|
||||
RegTestingSetup::~RegTestingSetup()
|
||||
|
||||
@@ -337,11 +337,14 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
|
||||
BOOST_CHECK(IsStandardTx(t, reason));
|
||||
|
||||
// Check dust with default relay fee:
|
||||
CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
|
||||
BOOST_CHECK_EQUAL(nDustThreshold, 546);
|
||||
//CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3;
|
||||
//BOOST_CHECK_EQUAL(nDustThreshold, 546);
|
||||
// lbry dust is set to 1, regardless of minRelayTxfee
|
||||
CAmount nDustThreshold = 1;
|
||||
|
||||
// dust:
|
||||
//t.vout[0].nValue = nDustThreshold - 1;
|
||||
//BOOST_CHECK(!IsStandardTx(t, reason));
|
||||
t.vout[0].nValue = nDustThreshold - 1;
|
||||
BOOST_CHECK(!IsStandardTx(t, reason));
|
||||
// not dust:
|
||||
t.vout[0].nValue = nDustThreshold;
|
||||
BOOST_CHECK(IsStandardTx(t, reason));
|
||||
|
||||
@@ -455,9 +455,9 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
|
||||
boost::filesystem::path GetDefaultDataDir()
|
||||
{
|
||||
namespace fs = boost::filesystem;
|
||||
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
|
||||
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
|
||||
// Mac: ~/Library/Application Support/Bitcoin
|
||||
// Windows < Vista: C:\Documents and Settings\Username\Application Data\lbrycrd
|
||||
// Windows >= Vista: C:\Users\Username\AppData\Roaming\lbrycrd
|
||||
// Mac: ~/Library/Application Support/lbrycrd
|
||||
// Unix: ~/.lbrycrd
|
||||
#ifdef WIN32
|
||||
// Windows
|
||||
|
||||
@@ -390,10 +390,10 @@ void CreateClaim(CScript& claimScript, CAmount nAmount, CWalletTx& wtxNew)
|
||||
|
||||
vector<CRecipient> vecSend;
|
||||
int nChangePosRet = -1;
|
||||
|
||||
|
||||
CRecipient recipient = {claimScript, nAmount, false};
|
||||
vecSend.push_back(recipient);
|
||||
|
||||
|
||||
CReserveKey reservekey(pwalletMain);
|
||||
CAmount nFeeRequired;
|
||||
if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError))
|
||||
@@ -411,7 +411,7 @@ UniValue claimname(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (!EnsureWalletIsAvailable(fHelp))
|
||||
return NullUniValue;
|
||||
|
||||
|
||||
if (fHelp || params.size() != 3)
|
||||
throw runtime_error(
|
||||
"claimname \"name\" \"value\" amount\n"
|
||||
@@ -419,7 +419,7 @@ UniValue claimname(const UniValue& params, bool fHelp)
|
||||
+ HelpRequiringPassphrase() +
|
||||
"\nArguments:\n"
|
||||
"1. \"name\" (string, required) The name to be assigned the value.\n"
|
||||
"2. \"value\" (string, required) The value to assign to the name.\n"
|
||||
"2. \"value\" (string, required) The value to assign to the name encoded in hexadecimal.\n"
|
||||
"3. \"amount\" (numeric, required) The amount in LBRYcrd to send. eg 0.1\n"
|
||||
"\nResult:\n"
|
||||
"\"transactionid\" (string) The transaction id.\n"
|
||||
@@ -427,7 +427,8 @@ UniValue claimname(const UniValue& params, bool fHelp)
|
||||
string sName = params[0].get_str();
|
||||
string sValue = params[1].get_str();
|
||||
std::vector<unsigned char> vchName (sName.begin(), sName.end());
|
||||
std::vector<unsigned char> vchValue (sValue.begin(), sValue.end());
|
||||
std::vector<unsigned char> vchValue(ParseHex(sValue));
|
||||
|
||||
CAmount nAmount = AmountFromValue(params[2]);
|
||||
|
||||
CWalletTx wtx;
|
||||
@@ -435,7 +436,7 @@ UniValue claimname(const UniValue& params, bool fHelp)
|
||||
EnsureWalletIsUnlocked();
|
||||
|
||||
CScript claimScript = CScript() << OP_CLAIM_NAME << vchName << vchValue << OP_2DROP << OP_DROP;
|
||||
|
||||
|
||||
CreateClaim(claimScript, nAmount, wtx);
|
||||
|
||||
return wtx.GetHash().GetHex();
|
||||
@@ -471,10 +472,10 @@ void UpdateName(const std::vector<unsigned char> vchName, const uint160 claimId,
|
||||
|
||||
vector<CRecipient> vecSend;
|
||||
int nChangePosRet = -1;
|
||||
|
||||
|
||||
CRecipient recipient = {claimScript, nAmount, false};
|
||||
vecSend.push_back(recipient);
|
||||
|
||||
|
||||
CReserveKey reservekey(pwalletMain);
|
||||
CAmount nFeeRequired;
|
||||
if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError, NULL, true, &wtxIn, nTxOut))
|
||||
@@ -493,7 +494,7 @@ UniValue updateclaim(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (!EnsureWalletIsAvailable(fHelp))
|
||||
return NullUniValue;
|
||||
|
||||
|
||||
if (fHelp || params.size() != 3)
|
||||
throw runtime_error(
|
||||
"updateclaim \"txid\" \"value\" amount\n"
|
||||
@@ -501,20 +502,20 @@ UniValue updateclaim(const UniValue& params, bool fHelp)
|
||||
+ HelpRequiringPassphrase() +
|
||||
"\nArguments:\n"
|
||||
"1. \"txid\" (string, required) The transaction containing the unspent txout which should be spent.\n"
|
||||
"2. \"value\" (string, required) The value to assign to the name.\n"
|
||||
"2. \"value\" (string, required) The value to assign to the name encoded in hexadecimal.\n"
|
||||
"3. \"amount\" (numeric, required) The amount in LBRYcrd to use to bid for the name. eg 0.1\n"
|
||||
"\nResult:\n"
|
||||
"\"transactionid\" (string) The new transaction id.\n"
|
||||
);
|
||||
|
||||
|
||||
uint256 hash;
|
||||
hash.SetHex(params[0].get_str());
|
||||
|
||||
|
||||
std::vector<unsigned char> vchName;
|
||||
string sValue = params[1].get_str();
|
||||
std::vector<unsigned char> vchValue (sValue.begin(), sValue.end());
|
||||
std::vector<unsigned char> vchValue(ParseHex(sValue));
|
||||
CAmount nAmount = AmountFromValue(params[2]);
|
||||
|
||||
|
||||
isminefilter filter = ISMINE_CLAIM;
|
||||
|
||||
UniValue entry;
|
||||
@@ -572,13 +573,13 @@ void AbandonClaim(const CTxDestination &address, CAmount nAmount, CWalletTx& wtx
|
||||
}
|
||||
|
||||
CScript scriptPubKey = GetScriptForDestination(address);
|
||||
|
||||
|
||||
vector<CRecipient> vecSend;
|
||||
int nChangePosRet = -1;
|
||||
|
||||
|
||||
CRecipient recipient = {scriptPubKey, nAmount, false};
|
||||
vecSend.push_back(recipient);
|
||||
|
||||
|
||||
CReserveKey reservekey(pwalletMain);
|
||||
CAmount nFeeRequired;
|
||||
if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError, NULL, true, &wtxIn, nTxOut))
|
||||
@@ -596,7 +597,7 @@ UniValue abandonclaim(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (!EnsureWalletIsAvailable(fHelp))
|
||||
return NullUniValue;
|
||||
|
||||
|
||||
if (fHelp || params.size() != 3)
|
||||
throw runtime_error(
|
||||
"abandonclaim \"txid\" \"lbrycrdaddress\" \"amount\"\n"
|
||||
@@ -678,7 +679,7 @@ void ListNameClaims(const CWalletTx& wtx, const string& strAccount, int nMinDept
|
||||
LogPrintf("%s(): Txout classified as name claim could not be decoded. Txid: %s", __func__, wtx.GetHash().ToString());
|
||||
continue;
|
||||
}
|
||||
else if (((op == OP_CLAIM_NAME || op == OP_SUPPORT_CLAIM) && (vvchParams.size() != 2)) ||
|
||||
else if (((op == OP_CLAIM_NAME || op == OP_SUPPORT_CLAIM) && (vvchParams.size() != 2)) ||
|
||||
((op == OP_UPDATE_CLAIM) && (vvchParams.size() != 3)))
|
||||
{
|
||||
LogPrintf("%s(): Wrong number of params to name claim script. Got %d, expected %d. Txid: %s", __func__, vvchParams.size(), ((op == OP_CLAIM_NAME) ? 2 : 3), wtx.GetHash().ToString());
|
||||
@@ -752,7 +753,7 @@ UniValue listnameclaims(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (!EnsureWalletIsAvailable(fHelp))
|
||||
return NullUniValue;
|
||||
|
||||
|
||||
if (fHelp || params.size() > 3)
|
||||
throw runtime_error(
|
||||
"listnameclaims includesuppports activeonly minconf\n"
|
||||
@@ -793,7 +794,7 @@ UniValue listnameclaims(const UniValue& params, bool fHelp)
|
||||
isminefilter claim_filter = ISMINE_CLAIM;
|
||||
if (params.size() < 1 || params[0].get_bool())
|
||||
claim_filter |= ISMINE_SUPPORT;
|
||||
|
||||
|
||||
bool fListSpent = true;
|
||||
if (params.size() > 1)
|
||||
fListSpent = !params[1].get_bool();
|
||||
@@ -802,7 +803,7 @@ UniValue listnameclaims(const UniValue& params, bool fHelp)
|
||||
int nMinDepth = 1;
|
||||
if (params.size() > 2)
|
||||
nMinDepth = params[2].get_int();
|
||||
|
||||
|
||||
UniValue ret(UniValue::VARR);
|
||||
|
||||
const CWallet::TxItems& txOrdered = pwalletMain->wtxOrdered;
|
||||
@@ -858,7 +859,7 @@ UniValue supportclaim(const UniValue& params, bool fHelp)
|
||||
EnsureWalletIsUnlocked();
|
||||
|
||||
CScript supportScript = CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << OP_2DROP << OP_DROP;
|
||||
|
||||
|
||||
CreateClaim(supportScript, nAmount, wtx);
|
||||
|
||||
return wtx.GetHash().GetHex();
|
||||
|
||||
@@ -2279,6 +2279,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
|
||||
if (coinControl && nFeeNeeded > 0 && coinControl->nMinimumTotalFee > nFeeNeeded) {
|
||||
nFeeNeeded = coinControl->nMinimumTotalFee;
|
||||
}
|
||||
// Make sure we meet the minimum claimtrie fee, pick which ever one is largest
|
||||
CAmount minClaimTrieFee = CalcMinClaimTrieFee(wtxNew, minFeePerNameClaimChar);
|
||||
nFeeNeeded = std::max(nFeeNeeded, minClaimTrieFee);
|
||||
|
||||
// If we made it here and we aren't even able to meet the relay fee on the next pass, give up
|
||||
// because we must be at the maximum allowed fee.
|
||||
|
||||