From 3296c74073cb1730c80fadfbde0ff0406e932292 Mon Sep 17 00:00:00 2001 From: Adrian Gallagher Date: Sun, 1 Sep 2019 19:18:50 -0700 Subject: [PATCH] Litecoin: Branding --- .appveyor.yml | 4 ++-- doc/{bitcoin-conf.md => litecoin-conf.md} | 8 ++++---- doc/productivity.md | 2 +- doc/psbt.md | 18 +++++++++--------- share/examples/litecoin.conf | 2 +- src/Makefile.test.include | 2 +- src/compat/assumptions.h | 2 +- src/interfaces/README.md | 2 +- src/qt/bitcoin.cpp | 2 +- src/qt/bitcoinunits.cpp | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) rename doc/{bitcoin-conf.md => litecoin-conf.md} (76%) diff --git a/.appveyor.yml b/.appveyor.yml index ac39fe235b..d666b6a2de 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -50,8 +50,8 @@ before_test: - ps: '[IO.File]::WriteAllLines([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini"), ${conf_ini}, ${utf8})' - ps: move "build_msvc\${env:PLATFORM}\${env:CONFIGURATION}\*.exe" src test_script: -- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL -- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL +- cmd: src\test_litecoin.exe -k stdout -e stdout 2> NUL +- cmd: src\bench_litecoin.exe -evals=1 -scaling=0 > NUL - ps: python test\util\bitcoin-util-test.py - cmd: python test\util\rpcauth-test.py - cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast diff --git a/doc/bitcoin-conf.md b/doc/litecoin-conf.md similarity index 76% rename from doc/bitcoin-conf.md rename to doc/litecoin-conf.md index 88ecb8fe65..2855bc63be 100644 --- a/doc/bitcoin-conf.md +++ b/doc/litecoin-conf.md @@ -1,6 +1,6 @@ -# `bitcoin.conf` Configuration File +# `litecoin.conf` Configuration File -The configuration file is used by `bitcoind`, `bitcoin-qt` and `bitcoin-cli`. +The configuration file is used by `litecoind`, `litecoin-qt` and `litecoin-cli`. All command-line options (except for `-?`, `-help`, `-version` and `-conf`) may be specified in a configuration file, and all configuration file options (except for `includeconf`) may also be specified on the command line. Command-line options override values set in the configuration file and configuration file options override values set in the GUI. @@ -32,6 +32,6 @@ Network specific options can be: ## Configuration File Path -The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `bitcoin.conf` and it is located in the Bitcoin data directory, but both the Bitcoin data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options. +The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `litecoin.conf` and it is located in the Litecoin data directory, but both the Litecoin data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options. -The `includeconf=` option in the `bitcoin.conf` file can be used to include additional configuration files. +The `includeconf=` option in the `litecoin.conf` file can be used to include additional configuration files. diff --git a/doc/productivity.md b/doc/productivity.md index 862017290d..2ffe7fd2eb 100644 --- a/doc/productivity.md +++ b/doc/productivity.md @@ -129,7 +129,7 @@ When looking at other's pull requests, it may make sense to add the following se ``` [remote "upstream-pull"] fetch = +refs/pull/*:refs/remotes/upstream-pull/* - url = git@github.com:bitcoin/bitcoin.git + url = git@github.com:litecoin-project/litecoin.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. diff --git a/doc/psbt.md b/doc/psbt.md index 9d85af0348..73c033ca86 100644 --- a/doc/psbt.md +++ b/doc/psbt.md @@ -1,6 +1,6 @@ -# PSBT Howto for Bitcoin Core +# PSBT Howto for Litecoin Core -Since Bitcoin Core 0.17, an RPC interface exists for Partially Signed Bitcoin +Since Litecoin Core 0.17, an RPC interface exists for Partially Signed Litecoin Transactions (PSBTs, as specified in [BIP 174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki)). @@ -10,7 +10,7 @@ scenarios. ## PSBT in general -PSBT is an interchange format for Bitcoin transactions that are not fully signed +PSBT is an interchange format for Litecoin transactions that are not fully signed yet, together with relevant metadata to help entities work towards signing it. It is intended to simplify workflows where multiple parties need to cooperate to produce a transaction. Examples include hardware wallets, multisig setups, and @@ -18,7 +18,7 @@ produce a transaction. Examples include hardware wallets, multisig setups, and ### Overall workflow -Overall, the construction of a fully signed Bitcoin transaction goes through the +Overall, the construction of a fully signed Litecoin transaction goes through the following steps: - A **Creator** proposes a particular transaction to be created. They construct @@ -32,7 +32,7 @@ following steps: partial signature for the inputs for which they have relevant key(s). - A **Finalizer** is run for each input to convert the partial signatures and possibly script information into a final `scriptSig` and/or `scriptWitness`. -- An **Extractor** produces a valid Bitcoin transaction (in network format) +- An **Extractor** produces a valid Litecoin transaction (in network format) from a PSBT for which all inputs are finalized. Generally, each of the above (excluding Creator and Extractor) will simply @@ -46,7 +46,7 @@ The names above in bold are the names of the roles defined in BIP174. They're useful in understanding the underlying steps, but in practice, software and hardware implementations will typically implement multiple roles simultaneously. -## PSBT in Bitcoin Core +## PSBT in Litecoin Core ### RPCs @@ -89,13 +89,13 @@ hardware implementations will typically implement multiple roles simultaneously. ### Workflows -#### Multisig with multiple Bitcoin Core instances +#### Multisig with multiple Litecoin Core instances Alice, Bob, and Carol want to create a 2-of-3 multisig address. They're all using -Bitcoin Core. We assume their wallets only contain the multisig funds. In case +Litecoin Core. We assume their wallets only contain the multisig funds. In case they also have a personal wallet, this can be accomplished through the multiwallet feature - possibly resulting in a need to add `-rpcwallet=name` to -the command line in case `bitcoin-cli` is used. +the command line in case `litecoin-cli` is used. Setup: - All three call `getnewaddress` to create a new address; call these addresses diff --git a/share/examples/litecoin.conf b/share/examples/litecoin.conf index dfdf09dc2e..6250fd75c0 100644 --- a/share/examples/litecoin.conf +++ b/share/examples/litecoin.conf @@ -119,7 +119,7 @@ # This setting is over-ridden by the -paytxfee option. #txconfirmtarget=n -# Pay a transaction fee every time you send bitcoins. +# Pay a transaction fee every time you send litecoins. #paytxfee=0.000x # Miscellaneous options diff --git a/src/Makefile.test.include b/src/Makefile.test.include index b9129a876f..614f157edb 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -566,7 +566,7 @@ endif if TARGET_WINDOWS else if ENABLE_BENCH - @echo "Running bench/bench_bitcoin -evals=1 -scaling=0..." + @echo "Running bench/bench_litecoin -evals=1 -scaling=0..." $(BENCH_BINARY) -evals=1 -scaling=0 > /dev/null endif endif diff --git a/src/compat/assumptions.h b/src/compat/assumptions.h index 820c9b93d9..ce741a8660 100644 --- a/src/compat/assumptions.h +++ b/src/compat/assumptions.h @@ -14,7 +14,7 @@ // Example(s): We use assert(...) extensively with the assumption of it never // being a noop at runtime. #if defined(NDEBUG) -# error "Bitcoin cannot be compiled without assertions." +# error "Litecoin cannot be compiled without assertions." #endif // Assumption: We assume the floating-point types to fulfill the requirements of diff --git a/src/interfaces/README.md b/src/interfaces/README.md index 57d41df746..ef460af2bb 100644 --- a/src/interfaces/README.md +++ b/src/interfaces/README.md @@ -6,7 +6,7 @@ The following interfaces are defined here: * [`ChainClient`](chain.h) — used by node to start & stop `Chain` clients. Added in [#10973](https://github.com/bitcoin/bitcoin/pull/10973). -* [`Node`](node.h) — used by GUI to start & stop bitcoin node. Added in [#10244](https://github.com/bitcoin/bitcoin/pull/10244). +* [`Node`](node.h) — used by GUI to start & stop litecoin node. Added in [#10244](https://github.com/bitcoin/bitcoin/pull/10244). * [`Wallet`](wallet.h) — used by GUI to access wallets. Added in [#10244](https://github.com/bitcoin/bitcoin/pull/10244). diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 057003fe85..de766a19f9 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -174,7 +174,7 @@ void BitcoinCore::shutdown() } static int qt_argc = 1; -static const char* qt_argv = "bitcoin-qt"; +static const char* qt_argv = "litecoin-qt"; BitcoinApplication::BitcoinApplication(interfaces::Node& node): QApplication(qt_argc, const_cast(&qt_argv)), diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 6a09560bab..a29cefa027 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -45,7 +45,7 @@ QString BitcoinUnits::longName(int unit) case BTC: return QString("LTC"); case mBTC: return QString("lites"); case uBTC: return QString("photons"); - case SAT: return QString("liteoshi"); + case SAT: return QString("litoshi"); default: return QString("???"); } } @@ -67,7 +67,7 @@ QString BitcoinUnits::description(int unit) case BTC: return QString("Litecoins"); case mBTC: return QString("Lites (1 / 1" THIN_SP_UTF8 "000)"); case uBTC: return QString("Photons (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); - case SAT: return QString("Liteoshis (sat) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case SAT: return QString("Litoshis (sat) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } }