Skip to content

Commit a0cca7a

Browse files
Jenova7Jenova7
authored
Merge pull request #4 from ElectraProtocol/dev
Release v1.0.1.1
2 parents 3774323 + 6635131 commit a0cca7a

File tree

5 files changed

+62
-64
lines changed

5 files changed

+62
-64
lines changed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 1)
33
define(_CLIENT_VERSION_MINOR, 0)
44
define(_CLIENT_VERSION_REVISION, 1)
5-
define(_CLIENT_VERSION_BUILD, 0)
5+
define(_CLIENT_VERSION_BUILD, 1)
66
define(_CLIENT_VERSION_RC, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2021)

‎depends/packages/qt.mk‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,16 @@ $(package)_config_opts += -no-feature-concurrent
8686
$(package)_config_opts += -no-feature-dial
8787
$(package)_config_opts += -no-feature-fontcombobox
8888
$(package)_config_opts += -no-feature-ftp
89-
$(package)_config_opts += -no-feature-http
9089
$(package)_config_opts += -no-feature-image_heuristic_mask
9190
$(package)_config_opts += -no-feature-keysequenceedit
9291
$(package)_config_opts += -no-feature-lcdnumber
93-
$(package)_config_opts += -no-feature-networkdiskcache
94-
$(package)_config_opts += -no-feature-networkproxy
9592
$(package)_config_opts += -no-feature-pdf
9693
$(package)_config_opts += -no-feature-printdialog
9794
$(package)_config_opts += -no-feature-printer
9895
$(package)_config_opts += -no-feature-printpreviewdialog
9996
$(package)_config_opts += -no-feature-printpreviewwidget
10097
$(package)_config_opts += -no-feature-regularexpression
10198
$(package)_config_opts += -no-feature-sessionmanager
102-
$(package)_config_opts += -no-feature-socks5
10399
$(package)_config_opts += -no-feature-sql
104100
$(package)_config_opts += -no-feature-statemachine
105101
$(package)_config_opts += -no-feature-syntaxhighlighter

‎src/chainparams.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@ class CMainParams : public CChainParams {
161161
// This is fine at runtime as we'll fall back to using them as an addrfetch if they don't support the
162162
// service bits we want, but we should get them updated to support all service bits wanted by any
163163
// release ASAP to avoid it where possible.
164-
vSeeds.emplace_back("seed01.electraprotocol.network");
165-
vSeeds.emplace_back("seed02.electraprotocol.network");
166-
vSeeds.emplace_back("seed03.electraprotocol.network");
167-
vSeeds.emplace_back("seed04.electraprotocol.network");
168-
vSeeds.emplace_back("seed05.electraprotocol.network");
169-
vSeeds.emplace_back("seed06.electraprotocol.network");
170-
vSeeds.emplace_back("seed07.electraprotocol.network");
171-
vSeeds.emplace_back("seed08.electraprotocol.network");
164+
vSeeds.emplace_back("seed01.electraprotocol.eu");
165+
vSeeds.emplace_back("seed02.electraprotocol.eu");
166+
vSeeds.emplace_back("seed03.electraprotocol.eu");
167+
vSeeds.emplace_back("seed04.electraprotocol.eu");
168+
vSeeds.emplace_back("seed05.electraprotocol.eu");
169+
vSeeds.emplace_back("seed06.electraprotocol.eu");
170+
vSeeds.emplace_back("seed07.electraprotocol.eu");
171+
vSeeds.emplace_back("seed08.electraprotocol.eu");
172172

173173
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,55);
174174
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,137);
@@ -275,14 +275,14 @@ class CTestNetParams : public CChainParams {
275275
vFixedSeeds.clear();
276276
vSeeds.clear();
277277
// nodes with support for servicebits filtering should be at the top
278-
vSeeds.emplace_back("seed01.electraprotocol.network");
279-
vSeeds.emplace_back("seed02.electraprotocol.network");
280-
vSeeds.emplace_back("seed03.electraprotocol.network");
281-
vSeeds.emplace_back("seed04.electraprotocol.network");
282-
vSeeds.emplace_back("seed05.electraprotocol.network");
283-
vSeeds.emplace_back("seed06.electraprotocol.network");
284-
vSeeds.emplace_back("seed07.electraprotocol.network");
285-
vSeeds.emplace_back("seed08.electraprotocol.network");
278+
vSeeds.emplace_back("seed01.electraprotocol.eu");
279+
vSeeds.emplace_back("seed02.electraprotocol.eu");
280+
vSeeds.emplace_back("seed03.electraprotocol.eu");
281+
vSeeds.emplace_back("seed04.electraprotocol.eu");
282+
vSeeds.emplace_back("seed05.electraprotocol.eu");
283+
vSeeds.emplace_back("seed06.electraprotocol.eu");
284+
vSeeds.emplace_back("seed07.electraprotocol.eu");
285+
vSeeds.emplace_back("seed08.electraprotocol.eu");
286286

287287
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,141);
288288
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,19);
@@ -325,14 +325,14 @@ class SigNetParams : public CChainParams {
325325

326326
if (!args.IsArgSet("-signetchallenge")) {
327327
bin = ParseHex("512103ad5e0edad18cb1f0fc0d28a3d4f1f3e445640337489abb10404f2d1e086be430210359ef5021964fe22d6f8e05b2463c9540ce96883fe3b278760f048f5189f2e6c452ae");
328-
vSeeds.emplace_back("seed01.electraprotocol.network");
329-
vSeeds.emplace_back("seed02.electraprotocol.network");
330-
vSeeds.emplace_back("seed03.electraprotocol.network");
331-
vSeeds.emplace_back("seed04.electraprotocol.network");
332-
vSeeds.emplace_back("seed05.electraprotocol.network");
333-
vSeeds.emplace_back("seed06.electraprotocol.network");
334-
vSeeds.emplace_back("seed07.electraprotocol.network");
335-
vSeeds.emplace_back("seed08.electraprotocol.network");
328+
vSeeds.emplace_back("seed01.electraprotocol.eu");
329+
vSeeds.emplace_back("seed02.electraprotocol.eu");
330+
vSeeds.emplace_back("seed03.electraprotocol.eu");
331+
vSeeds.emplace_back("seed04.electraprotocol.eu");
332+
vSeeds.emplace_back("seed05.electraprotocol.eu");
333+
vSeeds.emplace_back("seed06.electraprotocol.eu");
334+
vSeeds.emplace_back("seed07.electraprotocol.eu");
335+
vSeeds.emplace_back("seed08.electraprotocol.eu");
336336
//vSeeds.emplace_back("v7ajjeirttkbnt32wpy3c6w3emwnfr3fkla7hpxcfokr3ysd3kqtzmqd.onion:38333");
337337

338338
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000");

‎src/qt/utilitydialog.cpp‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ UpdateWalletDialog::~UpdateWalletDialog()
171171

172172
void UpdateWalletDialog::checkForUpdate()
173173
{
174-
const QString VERSION_URL = "https://raw.githubusercontent.com/ElectraProtocol/xep-ecosystem-versions/main/XEP-Core/latestversion.json";
174+
const QUrl strVerUrl = QUrl("http://electraprotocol.eu/getlatestversion");
175175

176-
const QNetworkRequest request(VERSION_URL);
176+
const QNetworkRequest request(strVerUrl);
177177
reply = manager->get(request);
178178
}
179179

@@ -183,40 +183,42 @@ void UpdateWalletDialog::gotReply()
183183
const QByteArray response_data = reply->readAll();
184184
delete reply;
185185
const QJsonDocument jsonAnswer = QJsonDocument::fromJson(response_data);
186-
const QJsonObject &responseObject = jsonAnswer.object();
187-
188-
const QString strVerMajor = "version_major";
189-
const QString strVerMinor = "version_minor";
190-
const QString strVerRev = "version_revision";
191-
const QString strVerBuild = "version_build";
192-
const QString strVerRC = "version_rc";
193-
const QString strMandatory = "mandatory";
194-
const QString strLastMandatory = "lastmandatory";
195-
196-
if (responseObject.size() == 7 && responseObject[strVerMajor].isDouble() && responseObject[strVerMinor].isDouble() &&
197-
responseObject[strVerRev].isDouble() && responseObject[strVerBuild].isDouble() && responseObject[strVerRC].isDouble() &&
198-
responseObject[strMandatory].isBool() && responseObject[strLastMandatory].isObject()) {
199-
const QJsonObject &lastMandatory = responseObject[strLastMandatory].toObject();
200-
if (lastMandatory.size() == 5 && lastMandatory[strVerMajor].isDouble() && lastMandatory[strVerMinor].isDouble() &&
201-
lastMandatory[strVerRev].isDouble() && lastMandatory[strVerBuild].isDouble() && lastMandatory[strVerRC].isDouble()) {
202-
bool outdated = true;
203-
mandatoryUpdate = true;
204-
205-
newVersionMajor = responseObject[strVerMajor].toInt();
206-
newVersionMinor = responseObject[strVerMinor].toInt();
207-
newVersionRevision = responseObject[strVerRev].toInt();
208-
newVersionBuild = responseObject[strVerBuild].toInt();
209-
newVersionRC = responseObject[strVerRC].toInt();
210-
if (lastMandatory[strVerMajor].toInt() <= CLIENT_VERSION_MAJOR && lastMandatory[strVerMinor].toInt() <= CLIENT_VERSION_MINOR && lastMandatory[strVerRev].toInt() <= CLIENT_VERSION_REVISION && lastMandatory[strVerBuild].toInt() <= CLIENT_VERSION_BUILD) {
211-
mandatoryUpdate = responseObject[strMandatory].toBool();
212-
if (newVersionMajor <= CLIENT_VERSION_MAJOR && newVersionMinor <= CLIENT_VERSION_MINOR && newVersionRevision <= CLIENT_VERSION_REVISION && newVersionBuild <= CLIENT_VERSION_BUILD) {
213-
outdated = false;
186+
if (jsonAnswer.isObject()) {
187+
const QJsonObject &responseObject = jsonAnswer.object();
188+
189+
const QString strVerMajor = "version_major";
190+
const QString strVerMinor = "version_minor";
191+
const QString strVerRev = "version_revision";
192+
const QString strVerBuild = "version_build";
193+
const QString strVerRC = "version_rc";
194+
const QString strMandatory = "mandatory";
195+
const QString strLastMandatory = "lastmandatory";
196+
197+
if (responseObject.size() == 7 && responseObject[strVerMajor].isDouble() && responseObject[strVerMinor].isDouble() &&
198+
responseObject[strVerRev].isDouble() && responseObject[strVerBuild].isDouble() && responseObject[strVerRC].isDouble() &&
199+
responseObject[strMandatory].isBool() && responseObject[strLastMandatory].isObject()) {
200+
const QJsonObject &lastMandatory = responseObject[strLastMandatory].toObject();
201+
if (lastMandatory.size() == 5 && lastMandatory[strVerMajor].isDouble() && lastMandatory[strVerMinor].isDouble() &&
202+
lastMandatory[strVerRev].isDouble() && lastMandatory[strVerBuild].isDouble() && lastMandatory[strVerRC].isDouble()) {
203+
bool outdated = true;
204+
mandatoryUpdate = true;
205+
206+
newVersionMajor = responseObject[strVerMajor].toInt();
207+
newVersionMinor = responseObject[strVerMinor].toInt();
208+
newVersionRevision = responseObject[strVerRev].toInt();
209+
newVersionBuild = responseObject[strVerBuild].toInt();
210+
newVersionRC = responseObject[strVerRC].toInt();
211+
if (lastMandatory[strVerMajor].toInt() <= CLIENT_VERSION_MAJOR && lastMandatory[strVerMinor].toInt() <= CLIENT_VERSION_MINOR && lastMandatory[strVerRev].toInt() <= CLIENT_VERSION_REVISION && lastMandatory[strVerBuild].toInt() <= CLIENT_VERSION_BUILD) {
212+
mandatoryUpdate = responseObject[strMandatory].toBool();
213+
if (newVersionMajor <= CLIENT_VERSION_MAJOR && newVersionMinor <= CLIENT_VERSION_MINOR && newVersionRevision <= CLIENT_VERSION_REVISION && newVersionBuild <= CLIENT_VERSION_BUILD) {
214+
outdated = false;
215+
}
214216
}
215-
}
216217

217-
if (outdated) {
218-
ui->aboutMessage->setText(getUpdateString());
219-
exec();
218+
if (outdated) {
219+
ui->aboutMessage->setText(getUpdateString());
220+
exec();
221+
}
220222
}
221223
}
222224
}

‎src/validation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5751,7 +5751,7 @@ bool CheckBlockSignature(const CBlock& block)
57515751
if ((pubkeyStart + CPubKey::COMPRESSED_SIZE) > txin.scriptSig.size() || txin.scriptSig[pubkeyStart-1] < CPubKey::COMPRESSED_SIZE) // last pushdata must be large enough to at least hold a compressed pubkey
57525752
return error("%s : p2pkh txin.scriptSig.size() = %u is too small", __func__, txin.scriptSig.size());
57535753
pubkey = CPubKey(txin.scriptSig.begin()+pubkeyStart, txin.scriptSig.end());
5754-
} else if (cbtxin.scriptSig.size() > CPubKey::COMPRESSED_SIZE) { // check for pubkey in coinbase
5754+
} else if (cbtxin.scriptSig.size() > CPubKey::COMPRESSED_SIZE && cbtxin.scriptSig[cbtxin.scriptSig.size()-CPubKey::COMPRESSED_SIZE-1] == CPubKey::COMPRESSED_SIZE) { // check for pubkey in coinbase
57555755
//std::vector<unsigned char> vchPubKey(cbtxin.scriptSig.end()-CPubKey::COMPRESSED_SIZE, cbtxin.scriptSig.end());
57565756
//LogPrintf("%s : coinbase cbtxin.scriptSig = %s\n", __func__, HexStr(cbtxin.scriptSig));
57575757
//LogPrintf("%s : cbtxin.scriptSig.size() = %u, vchPubKey = %s\n", __func__, cbtxin.scriptSig.size(), HexStr(vchPubKey));

0 commit comments

Comments
 (0)