Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Repository Tools

### [Developer tools](/contrib/devtools) ###
Specific tools for developers working on this repository.
Additional tools, including the `github-merge.py` script, are available in the [maintainer-tools](https://github.com/bitcoin-core/bitcoin-maintainer-tools) repository.
Additional tools, including the `github-merge.py` script, are available in the [maintainer-tools](https://github.com/AvianNetwork/avian-maintainer-tools) repository.

### [Verify-Commits](/contrib/verify-commits) ###
Tool to verify that every merge commit was signed by a developer using the `github-merge.py` script.
Expand All @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain.

### [Qos](/contrib/qos) ###

A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Avian network. This means one can have an always-on aviand instance running, and another local aviand/avian-qt instance which connects to this node and receives blocks from it.

### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client.
Expand All @@ -24,7 +24,7 @@ Build Tools and Keys
### Packaging ###
The [Debian](/contrib/debian) subfolder contains the copyright file.

All other packaging related files can be found in the [bitcoin-core/packaging](https://github.com/bitcoin-core/packaging) repository.
All other packaging related files can be found in the [AvianNetwork/packaging](https://github.com/AvianNetwork/packaging) repository.

### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds.
Expand All @@ -33,10 +33,10 @@ Test and Verify Tools
---------------------

### [TestGen](/contrib/testgen) ###
Utilities to generate test vectors for the data-driven Bitcoin tests.
Utilities to generate test vectors for the data-driven Avian tests.

### [Verify-Binaries](/contrib/verify-binaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org.
This script attempts to download and verify the signature file SHA256SUMS.asc from avian.network.

Command Line Tools
---------------------
Expand All @@ -48,6 +48,6 @@ UTXO Set Tools
--------------

### [UTXO-to-SQLite](/contrib/utxo-tools/utxo_to_sqlite.py) ###
This script converts a compact-serialized UTXO set (as generated by Bitcoin Core with `dumptxoutset`)
This script converts a compact-serialized UTXO set (as generated by Avian with `dumptxoutset`)
to a SQLite3 database. For more details like e.g. the created table name and schema, refer to the
module docstring on top of the script, which is also contained in the command's `--help` output.
2 changes: 1 addition & 1 deletion contrib/asmap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Tool for performing various operations on textual and binary asmap files,
particularly encoding/compressing the raw data to the binary format that can
be used in Bitcoin Core with the `-asmap` option.
be used in Avian with the `-asmap` option.

Example usage:
```
Expand Down
12 changes: 6 additions & 6 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Bitcoin
Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
irc://#bitcoin-core-dev@libera.chat
Source: https://github.com/bitcoin/bitcoin
Upstream-Name: Avian
Upstream-Contact: The Avian Core developers
irc://#avian-dev@libera.chat
Source: https://github.com/AvianNetwork/Avian

Files: *
Copyright: 2009-2026, Bitcoin Core Developers
Copyright: 2009-2026, Avian Core Developers
License: Expat
Comment: The Bitcoin Core Developers encompasses all contributors to the
Comment: The Avian Core Developers encompasses all contributors to the
project, listed in the release notes or the git log.

Files: debian/*
Expand Down
26 changes: 13 additions & 13 deletions contrib/devtools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
copyright\_header.py
====================

Provides utilities for managing copyright headers of `The Bitcoin Core
Provides utilities for managing copyright headers of `The Avian Core
developers` in repository source files. It has three subcommands:

```
Expand All @@ -83,31 +83,31 @@ Specifying `verbose` will list the full filenames of files of each category.

copyright\_header.py update \<base\_directory\> [verbose]
---------------------------------------------------------
Updates all the copyright headers of `The Bitcoin Core developers` which were
Updates all the copyright headers of `The Avian Core developers` which were
changed in a year more recent than is listed. For example:
```
// Copyright (c) <firstYear>-<lastYear> The Bitcoin Core developers
// Copyright (c) <firstYear>-<lastYear> The Avian Core developers
```
will be updated to:
```
// Copyright (c) <firstYear>-<lastModifiedYear> The Bitcoin Core developers
// Copyright (c) <firstYear>-<lastModifiedYear> The Avian Core developers
```
where `<lastModifiedYear>` is obtained from the `git log` history.

This subcommand also handles copyright headers that have only a single year. In
those cases:
```
// Copyright (c) <year> The Bitcoin Core developers
// Copyright (c) <year> The Avian Core developers
```
will be updated to:
```
// Copyright (c) <year>-<lastModifiedYear> The Bitcoin Core developers
// Copyright (c) <year>-<lastModifiedYear> The Avian Core developers
```
where the update is appropriate.

copyright\_header.py insert \<file\>
------------------------------------
Inserts a copyright header for `The Bitcoin Core developers` at the top of the
Inserts a copyright header for `The Avian Core developers` at the top of the
file in either Python or C++ style as determined by the file extension. If the
file is a Python file and it has `#!` starting the first line, the header is
inserted in the line below it.
Expand All @@ -117,7 +117,7 @@ The copyright dates will be set to be `<year_introduced>-<current_year>` where
`<year_introduced>` is equal to `<current_year>`, it will be set as a single
year rather than two hyphenated years.

If the file already has a copyright for `The Bitcoin Core developers`, the
If the file already has a copyright for `The Avian Core developers`, the
script will exit.

gen-manpages.py
Expand All @@ -144,19 +144,19 @@ options, as all its configuration is set at the top of the file. It runs many ti
pypy3 contrib/devtools/headerssync-params.py
```

gen-bitcoin-conf.sh
===================
gen-avian-conf.sh
=================

Generates a bitcoin.conf file in `share/examples/` by parsing the output from `bitcoind --help`. This script is run during the
release process to include a bitcoin.conf with the release binaries and can also be run by users to generate a file locally.
Generates a avian.conf file in `share/examples/` by parsing the output from `aviand --help`. This script is run during the
release process to include a avian.conf with the release binaries and can also be run by users to generate a file locally.
When generating a file as part of the release process, make sure to commit the changes after running the script.

This script assumes a build directory named `build` as suggested by example build documentation.
To use it with a different build directory, set `BUILDDIR`.
For example:

```bash
BUILDDIR=$PWD/my-build-dir contrib/devtools/gen-bitcoin-conf.sh
BUILDDIR=$PWD/my-build-dir contrib/devtools/gen-avian-conf.sh
```

circular-dependencies.py
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.22)

project(bitcoin-tidy
project(avian-tidy
VERSION
1.0.0
DESCRIPTION "clang-tidy checks for Bitcoin Core"
DESCRIPTION "clang-tidy checks for Avian"
LANGUAGES CXX)

include(GNUInstallDirs)
Expand All @@ -25,43 +25,43 @@ find_program(CLANG_TIDY_EXE NAMES "clang-tidy-${LLVM_VERSION_MAJOR}" "clang-tidy
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Found clang-tidy: ${CLANG_TIDY_EXE}")

add_library(bitcoin-tidy MODULE bitcoin-tidy.cpp nontrivial-threadlocal.cpp)
target_include_directories(bitcoin-tidy SYSTEM PRIVATE ${LLVM_INCLUDE_DIRS})
add_library(avian-tidy MODULE avian-tidy.cpp nontrivial-threadlocal.cpp)
target_include_directories(avian-tidy SYSTEM PRIVATE ${LLVM_INCLUDE_DIRS})

# Disable RTTI and exceptions as necessary
if (MSVC)
target_compile_options(bitcoin-tidy PRIVATE /GR-)
target_compile_options(avian-tidy PRIVATE /GR-)
else()
target_compile_options(bitcoin-tidy PRIVATE -fno-rtti)
target_compile_options(bitcoin-tidy PRIVATE -fno-exceptions)
target_compile_options(avian-tidy PRIVATE -fno-rtti)
target_compile_options(avian-tidy PRIVATE -fno-exceptions)
endif()

if(CMAKE_HOST_APPLE)
# ld64 expects no undefined symbols by default
target_link_options(bitcoin-tidy PRIVATE -Wl,-flat_namespace)
target_link_options(bitcoin-tidy PRIVATE -Wl,-undefined -Wl,suppress)
target_link_options(avian-tidy PRIVATE -Wl,-flat_namespace)
target_link_options(avian-tidy PRIVATE -Wl,-undefined -Wl,suppress)
endif()

# Add warnings
if (MSVC)
target_compile_options(bitcoin-tidy PRIVATE /W4)
target_compile_options(avian-tidy PRIVATE /W4)
else()
target_compile_options(bitcoin-tidy PRIVATE -Wall)
target_compile_options(bitcoin-tidy PRIVATE -Wextra)
target_compile_options(avian-tidy PRIVATE -Wall)
target_compile_options(avian-tidy PRIVATE -Wextra)
endif()

if(CMAKE_VERSION VERSION_LESS 3.27)
set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "--load=${CMAKE_BINARY_DIR}/${CMAKE_SHARED_MODULE_PREFIX}bitcoin-tidy${CMAKE_SHARED_MODULE_SUFFIX}" "-checks=-*,bitcoin-*")
set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "--load=${CMAKE_BINARY_DIR}/${CMAKE_SHARED_MODULE_PREFIX}avian-tidy${CMAKE_SHARED_MODULE_SUFFIX}" "-checks=-*,avian-*")
else()
# CLANG_TIDY_COMMAND supports generator expressions as of 3.27
set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "--load=$<TARGET_FILE:bitcoin-tidy>" "-checks=-*,bitcoin-*")
set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "--load=$<TARGET_FILE:avian-tidy>" "-checks=-*,avian-*")
endif()

# Create a dummy library that runs clang-tidy tests as a side-effect of building
add_library(bitcoin-tidy-tests OBJECT EXCLUDE_FROM_ALL example_nontrivial-threadlocal.cpp)
add_dependencies(bitcoin-tidy-tests bitcoin-tidy)
add_library(avian-tidy-tests OBJECT EXCLUDE_FROM_ALL example_nontrivial-threadlocal.cpp)
add_dependencies(avian-tidy-tests avian-tidy)

set_target_properties(bitcoin-tidy-tests PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
set_target_properties(avian-tidy-tests PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")


install(TARGETS bitcoin-tidy LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(TARGETS avian-tidy LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Bitcoin Tidy
# Avian Tidy

Example Usage:

Expand All @@ -7,5 +7,5 @@ cmake -S . -B build -DLLVM_DIR=$(llvm-config --cmakedir) -DCMAKE_BUILD_TYPE=Rele

cmake --build build -j$(nproc)

cmake --build build --target bitcoin-tidy-tests -j$(nproc)
cmake --build build --target avian-tidy-tests -j$(nproc)
```
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2023 Bitcoin Developers
// Copyright (c) 2026 The Avian Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -7,16 +8,16 @@
#include <clang-tidy/ClangTidyModule.h>
#include <clang-tidy/ClangTidyModuleRegistry.h>

class BitcoinModule final : public clang::tidy::ClangTidyModule
class AvianModule final : public clang::tidy::ClangTidyModule
{
public:
void addCheckFactories(clang::tidy::ClangTidyCheckFactories& CheckFactories) override
{
CheckFactories.registerCheck<bitcoin::NonTrivialThreadLocal>("bitcoin-nontrivial-threadlocal");
CheckFactories.registerCheck<avian::NonTrivialThreadLocal>("avian-nontrivial-threadlocal");
}
};

static clang::tidy::ClangTidyModuleRegistry::Add<BitcoinModule>
X("bitcoin-module", "Adds bitcoin checks.");
static clang::tidy::ClangTidyModuleRegistry::Add<AvianModule>
X("avian-module", "Adds avian checks.");

volatile int BitcoinModuleAnchorSource = 0;
volatile int AvianModuleAnchorSource = 0;
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2023 Bitcoin Developers
// Copyright (c) 2026 The Avian Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -16,7 +17,7 @@ AST_MATCHER(clang::CXXRecordDecl, hasNonTrivialDestructor) {
}
} // namespace

namespace bitcoin {
namespace avian {

void NonTrivialThreadLocal::registerMatchers(clang::ast_matchers::MatchFinder* finder)
{
Expand All @@ -41,4 +42,4 @@ void NonTrivialThreadLocal::check(const clang::ast_matchers::MatchFinder::MatchR
}
}

} // namespace bitcoin
} // namespace avian
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2023 Bitcoin Developers
// Copyright (c) 2026 The Avian Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -7,7 +8,7 @@

#include <clang-tidy/ClangTidyCheck.h>

namespace bitcoin {
namespace avian {

// Warn about any thread_local variable with a non-trivial destructor.
class NonTrivialThreadLocal final : public clang::tidy::ClangTidyCheck
Expand All @@ -24,6 +25,6 @@ class NonTrivialThreadLocal final : public clang::tidy::ClangTidyCheck
void check(const clang::ast_matchers::MatchFinder::MatchResult& Result) override;
};

} // namespace bitcoin
} // namespace avian

#endif // NONTRIVIAL_THREADLOCAL_CHECK_H
Loading