Skip to content

Gui #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janus wants to merge 7 commits into
base: j_week_6
Choose a base branch
from
Open

Gui #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da34e48
Update missing conflict
janus Jan 26, 2021
f9897f5
Add up qt-gui code
janus Feb 1, 2021
e601d44
Fix errors
janus Feb 8, 2021
6896416
Fixes for gui wallet and tx signing, hide 'generate segwit address' c…
Feb 15, 2021
777590f
Merge pull request #5 from van-orton/gui-fixes
janus Feb 15, 2021
35434f8
Fix test-BGL-qt
janus Feb 21, 2021
bb87c47
Merge pull request #8 from janus/qt_test
janus Feb 22, 2021
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
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<<<<<<< HEAD
BGL Core integration/staging tree
=====================================

What is BGL?
----------------
Expand Down Expand Up @@ -141,4 +139,3 @@ Reporting a vulnerability
------------

See [SECURITY.md](SECURITY.md)
>>>>>>> 67f232b5d... Squashed 'src/secp256k1/' changes from b19c000063..2ed54da18a
10 changes: 5 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 21)
define(_CLIENT_VERSION_MINOR, 99)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_BUILD, 5)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2020)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2021)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[BGL Core]])
AC_INIT([BGL Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/BGL/BGL/issues],[BGL],[https://BGLcore.org/])
Expand Down
6,597 changes: 0 additions & 6,597 deletions src/.changes!
View file
Open in desktop

This file was deleted.

63 changes: 62 additions & 1 deletion src/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,67 @@
"iostream": "cpp",
"*.tcc": "cpp",
"ostream": "cpp",
"sstream": "cpp"
"sstream": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"array": "cpp",
"atomic": "cpp",
"strstream": "cpp",
"bitset": "cpp",
"chrono": "cpp",
"codecvt": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"cstdint": "cpp",
"deque": "cpp",
"list": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"optional": "cpp",
"ratio": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"istream": "cpp",
"limits": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cfenv": "cpp",
"cinttypes": "cpp",
"regex": "cpp",
"utility": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory_resource": "cpp",
"random": "cpp",
"set": "cpp",
"string": "cpp"
}
}
10 changes: 5 additions & 5 deletions src/chainparamsbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ const CBaseChainParams& BaseParams()
}

/**
* Port numbers for incoming Tor connections (8334, 18334, 38334, 18445) have
* Port numbers for incoming Tor connections (8455, 18455, 38455, 18475) have
* been chosen arbitrarily to keep ranges of used ports tight.
*/
std::unique_ptr<CBaseChainParams> CreateBaseChainParams(const std::string& chain)
{
if (chain == CBaseChainParams::MAIN) {
return MakeUnique<CBaseChainParams>("", 8332, 8334);
return MakeUnique<CBaseChainParams>("", 8455, 8457);
} else if (chain == CBaseChainParams::TESTNET) {
return MakeUnique<CBaseChainParams>("testnet3", 18332, 18334);
return MakeUnique<CBaseChainParams>("testnet3", 18455, 18457);
} else if (chain == CBaseChainParams::SIGNET) {
return MakeUnique<CBaseChainParams>("signet", 38332, 38334);
return MakeUnique<CBaseChainParams>("signet", 38455, 38457);
} else if (chain == CBaseChainParams::REGTEST) {
return MakeUnique<CBaseChainParams>("regtest", 18443, 18445);
return MakeUnique<CBaseChainParams>("regtest", 18475, 18477);
}
throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain));
}
Expand Down
8 changes: 4 additions & 4 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,10 +1356,10 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
/* Register RPC commands regardless of -server setting so they will be
* available in the GUI RPC console even if external calls are disabled.
*/
// RegisterAllCoreRPCCommands(tableRPC);
// for (const auto& client : node.chain_clients) {
// client->registerRpcs();
// }
RegisterAllCoreRPCCommands(tableRPC);
for (const auto& client : node.chain_clients) {
client->registerRpcs();
}
#if ENABLE_ZMQ
RegisterZMQRPCCommands(tableRPC);
#endif
Expand Down
1 change: 1 addition & 0 deletions src/key_io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
return ScriptHash(hash);
}
}

data.clear();
auto bech = bech32::Decode(str);
if (bech.second.size() > 0 && bech.first == params.Bech32HRP()) {
Expand Down
6 changes: 3 additions & 3 deletions src/policy/feerate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

#include <string>

const std::string CURRENCY_UNIT = "BTC"; // One formatted unit
const std::string CURRENCY_UNIT = "BGL"; // One formatted unit
const std::string CURRENCY_ATOM = "sat"; // One indivisible minimum value unit

/* Used to determine type of fee estimation requested */
enum class FeeEstimateMode {
UNSET, //!< Use default settings based on other criteria
ECONOMICAL, //!< Force estimateSmartFee to use non-conservative estimates
CONSERVATIVE, //!< Force estimateSmartFee to use conservative estimates
BTC_KVB, //!< Use BTC/kvB fee rate unit
BGL_KVB, //!< Use BTC/kvB fee rate unit
SAT_VB, //!< Use sat/vB fee rate unit
};

Expand Down Expand Up @@ -65,7 +65,7 @@ class CFeeRate
friend bool operator>=(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK >= b.nSatoshisPerK; }
friend bool operator!=(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK != b.nSatoshisPerK; }
CFeeRate& operator+=(const CFeeRate& a) { nSatoshisPerK += a.nSatoshisPerK; return *this; }
std::string ToString(const FeeEstimateMode& fee_estimate_mode = FeeEstimateMode::BTC_KVB) const;
std::string ToString(const FeeEstimateMode& fee_estimate_mode = FeeEstimateMode::BGL_KVB) const;

SERIALIZE_METHODS(CFeeRate, obj) { READWRITE(obj.nSatoshisPerK); }
};
Expand Down
11 changes: 4 additions & 7 deletions src/prevector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2015-2020 The BGL Core developers
// Copyright (c) 2015-2020 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -15,7 +15,6 @@
#include <type_traits>
#include <utility>

#pragma pack(push, 1)
/** Implements a drop-in replacement for std::vector<T> which stores up to N
* elements directly (without heap allocation). The types Size and Diff are
* used to store element counts, and can be any unsigned + signed type.
Expand Down Expand Up @@ -147,18 +146,17 @@ class prevector {
};

private:
size_type _size = 0;
#pragma pack(push, 1)
union direct_or_indirect {
char direct[sizeof(T) * N];
struct {
size_type capacity;
char* indirect;
size_type capacity;
} indirect_contents;
};

#pragma pack(pop)
alignas(char*) direct_or_indirect _union = {};
//size_type _size = 0;
size_type _size = 0;

static_assert(alignof(char*) % alignof(size_type) == 0 && sizeof(char*) % alignof(size_type) == 0, "size_type cannot have more restrictive alignment requirement than pointer");
static_assert(alignof(char*) % alignof(T) == 0, "value_type T cannot have more restrictive alignment requirement than pointer");
Expand Down Expand Up @@ -535,6 +533,5 @@ class prevector {
return item_ptr(0);
}
};
#pragma pack(pop)

#endif // BGL_PREVECTOR_H
1 change: 1 addition & 0 deletions src/qt/BGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#include <QThread>
#include <QTimer>
#include <QTranslator>
#include <QtGlobal>

#if defined(QT_STATICPLUGIN)
#include <QtPlugin>
Expand Down
37 changes: 12 additions & 25 deletions src/qt/BGL_locale.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,41 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/translations">
<file alias="af">locale/BGL_af.qm</file>
<file alias="am">locale/BGL_am.qm</file>
<file alias="ar">locale/BGL_ar.qm</file>
<file alias="be_BY">locale/BGL_be_BY.qm</file>
<file alias="be">locale/BGL_be.qm</file>
<file alias="bg">locale/BGL_bg.qm</file>
<file alias="bn">locale/BGL_bn.qm</file>
<file alias="bs">locale/BGL_bs.qm</file>
<file alias="ca">locale/BGL_ca.qm</file>
<file alias="cs">locale/BGL_cs.qm</file>
<file alias="cs_CZ">locale/BGL_cs_CZ.qm</file>
<file alias="cy">locale/BGL_cy.qm</file>
<file alias="da">locale/BGL_da.qm</file>
<file alias="de">locale/BGL_de.qm</file>
<file alias="de_DE">locale/BGL_de_DE.qm</file>
<file alias="el">locale/BGL_el.qm</file>
<file alias="el_GR">locale/BGL_el_GR.qm</file>
<file alias="en">locale/BGL_en.qm</file>
<file alias="en_AU">locale/BGL_en_AU.qm</file>
<file alias="en_GB">locale/BGL_en_GB.qm</file>
<file alias="eo">locale/BGL_eo.qm</file>
<file alias="es">locale/BGL_es.qm</file>
<file alias="es_CL">locale/BGL_es_CL.qm</file>
<file alias="es_CO">locale/BGL_es_CO.qm</file>
<file alias="es_DO">locale/BGL_es_DO.qm</file>
<file alias="es_ES">locale/BGL_es_ES.qm</file>
<file alias="es_MX">locale/BGL_es_MX.qm</file>
<file alias="es_VE">locale/BGL_es_VE.qm</file>
<file alias="et">locale/BGL_et.qm</file>
<file alias="et_EE">locale/BGL_et_EE.qm</file>
<file alias="eu">locale/BGL_eu.qm</file>
<file alias="fa">locale/BGL_fa.qm</file>
<file alias="fi">locale/BGL_fi.qm</file>
<file alias="fil">locale/BGL_fil.qm</file>
<file alias="fr">locale/BGL_fr.qm</file>
<file alias="fr_CA">locale/BGL_fr_CA.qm</file>
<file alias="fr_FR">locale/BGL_fr_FR.qm</file>
<file alias="gl">locale/BGL_gl.qm</file>
<file alias="gl_ES">locale/BGL_gl_ES.qm</file>
<file alias="he">locale/BGL_he.qm</file>
<file alias="he_IL">locale/BGL_he_IL.qm</file>
<file alias="hi">locale/BGL_hi.qm</file>
<file alias="hr">locale/BGL_hr.qm</file>
<file alias="hu">locale/BGL_hu.qm</file>
<file alias="hu_HU">locale/BGL_hu_HU.qm</file>
<file alias="id">locale/BGL_id.qm</file>
<file alias="id_ID">locale/BGL_id_ID.qm</file>
<file alias="is">locale/BGL_is.qm</file>
<file alias="it">locale/BGL_it.qm</file>
<file alias="it_IT">locale/BGL_it_IT.qm</file>
<file alias="ja">locale/BGL_ja.qm</file>
<file alias="ka">locale/BGL_ka.qm</file>
<file alias="kk">locale/BGL_kk.qm</file>
Expand All @@ -53,32 +46,26 @@
<file alias="la">locale/BGL_la.qm</file>
<file alias="lt">locale/BGL_lt.qm</file>
<file alias="lv">locale/BGL_lv.qm</file>
<file alias="lv_LV">locale/BGL_lv_LV.qm</file>
<file alias="mk">locale/BGL_mk.qm</file>
<file alias="ml">locale/BGL_ml.qm</file>
<file alias="mn">locale/BGL_mn.qm</file>
<file alias="mr_IN">locale/BGL_mr_IN.qm</file>
<file alias="ms">locale/BGL_ms.qm</file>
<file alias="ms_MY">locale/BGL_ms_MY.qm</file>
<file alias="my">locale/BGL_my.qm</file>
<file alias="nb">locale/BGL_nb.qm</file>
<file alias="ne">locale/BGL_ne.qm</file>
<file alias="nl">locale/BGL_nl.qm</file>
<file alias="nl_NL">locale/BGL_nl_NL.qm</file>
<file alias="pam">locale/BGL_pam.qm</file>
<file alias="pl">locale/BGL_pl.qm</file>
<file alias="pt">locale/BGL_pt.qm</file>
<file alias="pt_BR">locale/BGL_pt_BR.qm</file>
<file alias="pt_PT">locale/BGL_pt_PT.qm</file>
<file alias="ro">locale/BGL_ro.qm</file>
<file alias="ro_RO">locale/BGL_ro_RO.qm</file>
<file alias="ru">locale/BGL_ru.qm</file>
<file alias="ru_RU">locale/BGL_ru_RU.qm</file>
<file alias="si">locale/BGL_si.qm</file>
<file alias="sk">locale/BGL_sk.qm</file>
<file alias="sk_SK">locale/BGL_sk_SK.qm</file>
<file alias="sl">locale/BGL_sl.qm</file>
<file alias="sl_SI">locale/BGL_sl_SI.qm</file>
<file alias="sn">locale/BGL_sn.qm</file>
<file alias="sq">locale/BGL_sq.qm</file>
<file alias="sr">locale/BGL_sr.qm</file>
<file alias="sr@latin">locale/BGL_sr@latin.qm</file>
<file alias="sv">locale/BGL_sv.qm</file>
Expand All @@ -87,17 +74,17 @@
<file alias="te">locale/BGL_te.qm</file>
<file alias="th">locale/BGL_th.qm</file>
<file alias="tr">locale/BGL_tr.qm</file>
<file alias="tr_TR">locale/BGL_tr_TR.qm</file>
<file alias="uk">locale/BGL_uk.qm</file>
<file alias="uk_UA">locale/BGL_uk_UA.qm</file>
<file alias="ur">locale/BGL_ur.qm</file>
<file alias="uz@Cyrl">locale/BGL_uz@Cyrl.qm</file>
<file alias="uz@Latn">locale/BGL_uz@Latn.qm</file>
<file alias="vi">locale/BGL_vi.qm</file>
<file alias="vi_VN">locale/BGL_vi_VN.qm</file>
<file alias="yo">locale/BGL_yo.qm</file>
<file alias="zh-Hans">locale/BGL_zh-Hans.qm</file>
<file alias="zh">locale/BGL_zh.qm</file>
<file alias="zh_CN">locale/BGL_zh_CN.qm</file>
<file alias="zh_HK">locale/BGL_zh_HK.qm</file>
<file alias="zh_TW">locale/BGL_zh_TW.qm</file>
<file alias="zu">locale/BGL_zu.qm</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion src/qt/BGLamountfield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class AmountSpinBox: public QAbstractSpinBox

const QFontMetrics fm(fontMetrics());
int h = lineEdit()->minimumSizeHint().height();
int w = GUIUtil::TextWidth(fm, BGLUnits::format(BGLUnits::BTC, BGLUnits::maxMoney(), false, BGLUnits::SeparatorStyle::ALWAYS));
int w = GUIUtil::TextWidth(fm, BGLUnits::format(BGLUnits::BGL, BGLUnits::maxMoney(), false, BGLUnits::SeparatorStyle::ALWAYS));
w += 2; // cursor blinking space

QStyleOptionSpinBox opt;
Expand Down
Loading