Skip to content

Commit

Permalink
Switch to ADON VIP
Browse files Browse the repository at this point in the history
  • Loading branch information
Adonis-Network committed Feb 3, 2023
1 parent bc4cea0 commit e9851aa
Show file tree
Hide file tree
Showing 45 changed files with 149 additions and 149 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ADON Core integration/staging repository
=====================================

[![GitHub release (latest by date)](https://img.shields.io/github/v/release/AdonisNetwork/ADON?color=%23002144&cacheSeconds=60)](https://github.com/AdonisNetwork/ADON/releases)
[![GitHub Release Date](https://img.shields.io/github/release-date/AdonisNetwork/ADON?color=%23002144&cacheSeconds=3600)](https://github.com/AdonisNetwork/ADON/releases)
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/AdonisExchange/ADON?color=%23002144&cacheSeconds=60)](https://github.com/AdonisExchange/ADON/releases)
[![GitHub Release Date](https://img.shields.io/github/release-date/AdonisExchange/ADON?color=%23002144&cacheSeconds=3600)](https://github.com/AdonisExchange/ADON/releases)

## What is ADON?
## What is ADON VIP?

ADONIS Coin (ADON) is a decentralized, MIT-licensed open-source, fair-launch blockchain/cryptocurrency project managed, developed, governed, and stewarded by a community-driven decentralized autonomous organization (DAO). It has been designed, engineered, and tested using advanced cryptography protocols to provide, first and foremost, user Financial Data Protection.
ADONIS VIP Coin (ADON) is a decentralized, MIT-licensed open-source, fair-launch blockchain/cryptocurrency project managed, developed, governed, and stewarded by a community-driven decentralized autonomous organization (DAO). It has been designed, engineered, and tested using advanced cryptography protocols to provide, first and foremost, user Financial Data Protection.

### Main aspects:

Expand All @@ -16,24 +16,24 @@ ADONIS Coin (ADON) is a decentralized, MIT-licensed open-source, fair-launch blo
4. Fast Transactions: Through the use of fast block times and the tier two network, ADON is committed to continue researching new and better instant transactions mechanisms.
5. Ease of Use: ADON is determined to offer the best possible graphical interface for a core node/wallet. A full featured graphical product for new and advanced users.

A lot more information and specs at [adon.adonis.network](https://adon.adonis.network/). Join the community at [ADON Telegram]( https://t.me/adonisnetwork).
A lot more information and specs at [adon.adonis.exchange](https://adon.adonis.exchange/). Join the community at [ADON Telegram]( https://t.me/AdonisExchange).

## License
ADON Core is released under the terms of the MIT license. See [COPYING](https://github.com/AdonisNetwork/ADON/blob/master/COPYING) for more information or see https://opensource.org/licenses/MIT.
ADON Core is released under the terms of the MIT license. See [COPYING](https://github.com/AdonisExchange/ADON/blob/master/COPYING) for more information or see https://opensource.org/licenses/MIT.

## Development Process

The master branch is regularly built (see doc/build-*.md for instructions) and tested, but it is not guaranteed to be completely stable. [Tags](https://github.com/AdonisNetwork/ADON/tags) are created regularly from release branches to indicate new official, stable release versions of ADON Core.
The master branch is regularly built (see doc/build-*.md for instructions) and tested, but it is not guaranteed to be completely stable. [Tags](https://github.com/AdonisExchange/ADON/tags) are created regularly from release branches to indicate new official, stable release versions of ADON Core.

The contribution workflow is described in [CONTRIBUTING.md](https://github.com/AdonisNetwork/ADON/blob/master/CONTRIBUTING.md) and useful hints for developers can be found in [doc/developer-notes.md](https://github.com/AdonisNetwork/ADON/blob/master/doc/developer-notes.md).
The contribution workflow is described in [CONTRIBUTING.md](https://github.com/AdonisExchange/ADON/blob/master/CONTRIBUTING.md) and useful hints for developers can be found in [doc/developer-notes.md](https://github.com/AdonisExchange/ADON/blob/master/doc/developer-notes.md).

## Testing

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 a lot of money.

## Automated Testing

Developers are strongly encouraged to write [unit tests](https://github.com/AdonisNetwork/ADON/blob/master/src/test/README.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. Further details on running and extending unit tests can be found in [/src/test/README.md](https://github.com/AdonisNetwork/ADON/blob/master/src/test/README.md).
Developers are strongly encouraged to write [unit tests](https://github.com/AdonisExchange/ADON/blob/master/src/test/README.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. Further details on running and extending unit tests can be found in [/src/test/README.md](https://github.com/AdonisExchange/ADON/blob/master/src/test/README.md).

There are also regression and integration tests, written in Python. These tests can be run (if the test dependencies are installed) with: test/functional/test_runner.py`

Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 5)
define(_CLIENT_VERSION_MINOR, 5)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2022)
AC_INIT([ADON Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/AdonisNetwork/ADON/issues],[adon],[https://adon.adonis.network/])
define(_COPYRIGHT_YEAR, 2023)
AC_INIT([ADON Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/AdonisExchange/ADON/issues],[adon],[https://adon.adonis.exchange/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/adon-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Build-Depends: debhelper,
libzmq3-dev,
dh-systemd
Standards-Version: 3.9.2
Homepage: http://adon.adonis.network
Vcs-Git: git://github.com/AdonisNetwork/ADON.git
Vcs-Browser: http://github.com/AdonisNetwork/ADON
Homepage: http://adon.adonis.exchange
Vcs-Git: git://github.com/AdonisExchange/ADON.git
Vcs-Browser: http://github.com/AdonisExchange/ADON

Package: adond
Architecture: any
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/watch
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
version=3
# use qa.debian.org redirector; see man uscan
opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
http://githubredir.debian.net/github/AdonisNetwork/ADON v(.*).tar.gz
http://githubredir.debian.net/github/AdonisExchange/ADON v(.*).tar.gz
4 changes: 2 additions & 2 deletions contrib/devtools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ For example:
./github-merge.py 3077

(in any git repository) will help you merge pull request #3077 for the
AdonisNetwork/ADON repository.
AdonisExchange/ADON repository.

What it does:
* Fetch master and the pull request.
Expand All @@ -119,7 +119,7 @@ Setup
---------
Configuring the github-merge tool for the ADON repository is done in the following way:

git config githubmerge.repository AdonisNetwork/ADON
git config githubmerge.repository AdonisExchange/ADON
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey mykeyid

Expand Down
8 changes: 4 additions & 4 deletions contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ def setup_darwin():

def setup_repos():
if not os.path.isdir('gitian.sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/AdonisNetwork/gitian.sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/AdonisExchange/gitian.sigs.git'])
if not os.path.isdir('adon-detached-sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/AdonisNetwork/ADON-detached-sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/AdonisExchange/ADON-detached-sigs.git'])
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('adon'):
subprocess.check_call(['git', 'clone', 'https://github.com/AdonisNetwork/ADON.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/AdonisExchange/ADON.git'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
Expand Down Expand Up @@ -257,7 +257,7 @@ def main():
parser = argparse.ArgumentParser(description='Script for running full Gitian builds.')
parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/AdonisNetwork/ADON', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/AdonisExchange/ADON', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS')
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ packages:
- "ca-certificates"
- "python3"
remotes:
- "url": "https://github.com/AdonisNetwork/ADON.git"
- "url": "https://github.com/AdonisExchange/ADON.git"
"dir": "adon"
files: []
script: |
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx-signer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ architectures:
packages:
- "faketime"
remotes:
- "url": "https://github.com/AdonisNetwork/ADON-detached-sigs.git"
- "url": "https://github.com/AdonisExchange/ADON-detached-sigs.git"
"dir": "signature"
files:
- "adon-osx-unsigned.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ packages:
- "python3-setuptools"
- "fonts-tuffy"
remotes:
- "url": "https://github.com/AdonisNetwork/ADON.git"
- "url": "https://github.com/AdonisExchange/ADON.git"
"dir": "adon"
files:
- "Xcode-11.3.1-11C505-extracted-SDK-with-libcxx-headers.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win-signer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages:
- "libtool"
- "pkg-config"
remotes:
- "url": "https://github.com/AdonisNetwork/ADON-detached-sigs.git"
- "url": "https://github.com/AdonisExchange/ADON-detached-sigs.git"
"dir": "signature"
files:
- "osslsigncode-2.0.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ packages:
- "ca-certificates"
- "python3"
remotes:
- "url": "https://github.com/AdonisNetwork/ADON.git"
- "url": "https://github.com/AdonisExchange/ADON.git"
"dir": "adon"
files: []
script: |
Expand Down
4 changes: 2 additions & 2 deletions contrib/macdeploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ redistributed.

`genisoimage` is used to create the initial DMG. It is not deterministic as-is, so it has been
patched. A system `genisoimage` will work fine, but it will not be deterministic because
the file-order will change between invocations. The patch can be seen here: [cdrkit-deterministic.patch](https://github.com/AdonisNetwork/ADON/blob/master/depends/patches/native_cdrkit/cdrkit-deterministic.patch).
the file-order will change between invocations. The patch can be seen here: [cdrkit-deterministic.patch](https://github.com/AdonisExchange/ADON/blob/master/depends/patches/native_cdrkit/cdrkit-deterministic.patch).
No effort was made to fix this cleanly, so it likely leaks memory badly, however it's only used for
a single invocation, so that's no real concern.

Expand All @@ -119,6 +119,6 @@ deterministic. Here's how it works:
of a tarball, which also contains all of the tools that have been previously (deterministically)
built in order to create a final DMG.
- The Apple keyholder uses this unsigned app to create a detached signature, using the
script that is also included there. Detached signatures are available from this [repository](https://github.com/AdonisNetwork/ADON-detached-sigs).
script that is also included there. Detached signatures are available from this [repository](https://github.com/AdonisExchange/ADON-detached-sigs).
- Builders feed the unsigned app + detached signature back into Gitian. It uses the
pre-built tools to recombine the pieces into a deterministic DMG.
2 changes: 1 addition & 1 deletion depends/packages/native_rust.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package=native_rust
$(package)_version=1.54.0
$(package)_download_path=https://depends.adonis.network
$(package)_download_path=https://depends.adonis.exchange
$(package)_file_name_x86_64_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.xz
$(package)_sha256_hash_x86_64_linux=e1451b0d0c65d7d15ddc8a300714c8280bcda052a9cee10ef5bcb62b23640be2
$(package)_file_name_arm_linux=rust-$($(package)_version)-arm-unknown-linux-gnueabihf.tar.xz
Expand Down
10 changes: 5 additions & 5 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ADON Core

Setup
---------------------
[ADON Core](http://adon.adonis.network/wallet) is the original ADON client and it builds the backbone of the network. However, it downloads and stores the entire history of ADON transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
[ADON Core](http://adon.adonis.exchange/wallet) is the original ADON client and it builds the backbone of the network. However, it downloads and stores the entire history of ADON transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.

Running
---------------------
Expand All @@ -28,10 +28,10 @@ Drag ADON-Qt to your applications folder, and then run ADON-Qt.

### Need Help?

* See the documentation at the [ADON Wiki](https://docs.adonis.network/)
* See the documentation at the [ADON Wiki](https://docs.adonis.exchange/)
for help and more information.
* Ask for help on the [ADON Forum](http://forum.adonis.network).
* Join our Discord server [Discord Server](https://discord.adonis.network)
* Ask for help on the [ADON Forum](http://forum.adonis.exchange).
* Join our Discord server [Discord Server](https://discord.adonis.exchange)

Building
---------------------
Expand All @@ -58,7 +58,7 @@ The ADON repo's [root README](/README.md) contains relevant information on the d
- [Dnsseed Policy](dnsseed-policy.md)

### Resources
* Discuss on the [ADON](http://forum.adonis.network) forum.
* Discuss on the [ADON](http://forum.adonis.exchange) forum.
* Join the [ADON Discord](https://discord.adonis.network).

### Miscellaneous
Expand Down
12 changes: 6 additions & 6 deletions doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ These are the dependencies currently used by ADON Core. You can find instruction
| Dependency | Version used | Minimum required | CVEs | Shared | [Bundled Qt library](https://doc.qt.io/qt-5/configure-options.html#third-party-libraries) |
| --- | --- | --- | --- | --- | --- |
| Berkeley DB | [4.8.30](https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No | | |
| Boost | [1.71.0](https://www.boost.org/users/download/) | [1.57.0](https://github.com/AdonisNetwork/ADON/pull/1703) | No | | |
| Boost | [1.71.0](https://www.boost.org/users/download/) | [1.57.0](https://github.com/AdonisExchange/ADON/pull/1703) | No | | |
| Clang | | [3.3+](https://llvm.org/releases/download.html) (C++11 support) | | | |
| D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | |
| Expat | [2.2.6](https://libexpat.github.io/) | | No | Yes | |
Expand All @@ -16,17 +16,17 @@ These are the dependencies currently used by ADON Core. You can find instruction
| HarfBuzz-NG | | | | | |
| libevent | [2.1.8-stable](https://github.com/libevent/libevent/releases) | 2.0.22 | No | | |
| libnatpmp | [20150609](https://miniupnp.tuxfamily.org/files) | | No | | |
| libjpeg | | | | | [Yes](https://github.com/AdonisNetwork/ADON/blob/master/depends/packages/qt.mk#L65) |
| libpng | | | | | [Yes](https://github.com/AdonisNetwork/ADON/blob/master/depends/packages/qt.mk#L64) |
| libjpeg | | | | | [Yes](https://github.com/AdonisExchange/ADON/blob/master/depends/packages/qt.mk#L65) |
| libpng | | | | | [Yes](https://github.com/AdonisExchange/ADON/blob/master/depends/packages/qt.mk#L64) |
| librsvg | | | | | |
| MiniUPnPc | [2.2.2](https://miniupnp.tuxfamily.org/files) | | No | | |
| GMP | [6.1.2](https://gmplib.org/) | | No | | |
| PCRE | | | | | [Yes](https://github.com/AdonisNetwork/ADON/blob/master/depends/packages/qt.mk#L66) |
| PCRE | | | | | [Yes](https://github.com/AdonisExchange/ADON/blob/master/depends/packages/qt.mk#L66) |
| Python (tests) | | [3.5](https://www.python.org/downloads) | | | |
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | |
| XCB | | | | | [Yes](https://github.com/AdonisNetwork/ADON/blob/master/depends/packages/qt.mk#L87) (Linux only) |
| xkbcommon | | | | | [Yes](https://github.com/AdonisNetwork/ADON/blob/master/depends/packages/qt.mk#L86) (Linux only) |
| XCB | | | | | [Yes](https://github.com/AdonisExchange/ADON/blob/master/depends/packages/qt.mk#L87) (Linux only) |
| xkbcommon | | | | | [Yes](https://github.com/AdonisExchange/ADON/blob/master/depends/packages/qt.mk#L86) (Linux only) |
| ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.0.0 | No | | |
| zlib | [1.2.11](https://zlib.net/) | | | | No |
| Sodium | [1.0.15](https://github.com/jedisct1/libsodium) |
Expand Down
6 changes: 3 additions & 3 deletions doc/developer-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ debug.log file if inconsistencies are detected.

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/AdonisNetwork/ADON/blob/master/contrib/valgrind.supp))
([`valgrind.supp`](https://github.com/AdonisExchange/ADON/blob/master/contrib/valgrind.supp))
which includes known Valgrind warnings in our dependencies that cannot be fixed
in-tree. Example use:

Expand Down Expand Up @@ -730,7 +730,7 @@ Current subtrees include:
- Upstream at https://github.com/bitcoin-core/univalue ; actively maintained by Core contributors, deviates from upstream https://github.com/jgarzik/univalue

- src/chiabls
- Upstream at https://github.com/AdonisNetwork/bls-signatures/ ; actively maintained by Core contributors, deviates from upstream https://github.com/Chia-Network/bls-signatures/
- Upstream at https://github.com/AdonisExchange/bls-signatures/ ; actively maintained by Core contributors, deviates from upstream https://github.com/Chia-Network/bls-signatures/

Upgrading LevelDB
---------------------
Expand Down Expand Up @@ -850,7 +850,7 @@ Git and GitHub tips

[remote "upstream-pull"]
fetch = +refs/pull/*:refs/remotes/upstream-pull/*
url = git@github.com:AdonisNetwork/ADON.git
url = git@github.com:AdonisExchange/ADON.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`,
Expand Down
2 changes: 1 addition & 1 deletion doc/dnsseed-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ related to the DNS seed operation.
If these expectations cannot be satisfied the operator should
discontinue providing services and contact the active ADON
Core development team as well as posting on the
[ADON Forum](https://forum.adonis.network).
[ADON Forum](https://forum.adonis.exchange).

Behavior outside of these expectations may be reasonable in some
situations but should be discussed in public in advance.
Expand Down
Loading

0 comments on commit e9851aa

Please sign in to comment.