Skip to content

Commit 847fb98

Browse files
BKdilseBKdilse
authored
Merge pull request #24 from The-GNTL-Project/v1.0.2-Changes
V1.0.2 changes
2 parents 16c346d + e305942 commit 847fb98

21 files changed

+63
-39
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2021-2022 The GNTL Project
1+
Copyright (c) 2021-2023 The GNTL Project
22
Copyright (c) 2018-2020, ArQmA Project
33
Copyright (c) 2018-2020, Ryo Currency Project
44
Copyright (c) 2018-2020, Loki Currency Project

‎README.md

+25-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# GNTL Electron (GUI) Wallet
22
<img src="https://github.com/The-GNTL-Project/Images/raw/master/GNTL_Icon_Round_200x200.png" alt="GNTL Coin">
33

4-
Copyright (c) 2021-2022 The GNTL Project
4+
Copyright (c) 2021-2023 The GNTL Project
55
Copyright (c) 2018-2021, The Arqma Network
66

77
## Introduction
@@ -15,25 +15,44 @@ Please submit any changes as pull requests to the development branch, all change
1515

1616
## Compile from Source
1717
### Pre-requisites
18-
- Download latest [GNTL Release](https://github.com/the-gntl-project/gntl/releases/latest)
18+
#### GNTL Release binaries
19+
Grab the download link for the latest [GNTL Release](https://gntl.cash/pages/downloads.html).
20+
21+
We'll use **v1.0.5** as an example:
22+
```
23+
wget https://gntl.cash/downloads/GNTL-Linux-x86_64-Ubuntu-2004-v1.0.5.tar.gz
24+
```
25+
26+
Create **~/gntl/**, extract binaries, and remove the downloaded file:
27+
```
28+
mkdir ~/gntl/
29+
tar -xvf GNTL-Linux-x86_64-Ubuntu-2004-v1.0.5.tar.gz -C ~/gntl/
30+
rm GNTL-Linux-x86_64-Ubuntu-2004-v1.0.5.tar.gz
31+
```
32+
33+
#### Install Node Version Manager
34+
```
35+
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
36+
```
1937

2038
### Compile
2139
```
22-
nvm use 12.20.2 ##install with nvm install 12.20.2)
40+
nvm use 12.20.2
2341
npm install -g quasar-cli
2442
git clone https://github.com/the-gntl-project/gntl-electron-wallet
2543
cd gntl-electron-wallet
26-
cp path_to_gntl_binaries/gntld bin/
27-
cp path_to_gntl_binaries/gntl-wallet-rpc bin/
44+
cp ~/gntl/gntld bin/
45+
cp ~/gntl/gntl-wallet-rpc bin/
2846
npm install --force
2947
```
3048

3149
#### Development
50+
**Note:** This will only run the wallet, for development purposes.
3251
```
3352
npm run dev
3453
```
3554

36-
### Building
55+
### Build
3756
**Note:** This will only build the binaries for the system you run the command on. Running this command on `linux` will only make `linux` binaries, no `mac` or `windows` binaries.
3857
```
3958
npm run build

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gntl-electron-wallet",
3-
"version": "1.0.1",
4-
"daemonVersion": "1.0.2",
3+
"version": "1.0.2",
4+
"daemonVersion": "1.0.5",
55
"description": "Modern GUI interface for GNTL Coin",
66
"productName": "GNTL Electron Wallet",
77
"repository": {
@@ -48,7 +48,7 @@
4848
"qrcode.vue": "^1.7.0",
4949
"rotating-file-stream": "^1.4.1",
5050
"rxjs": "^6.6.7",
51-
"ryo-core-js": "git://github.com/The-GNTL-Project/ryo-core-js.git",
51+
"ryo-core-js": "git+https://github.com/The-GNTL-Project/ryo-core-js.git",
5252
"urllib": "^2.37.1",
5353
"utf-8-validate": "^5.0.5",
5454
"validation": "0.0.1",

‎quasar.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ module.exports = function (ctx) {
209209

210210
appId: "com.gntl.electron-wallet",
211211
productName: "GNTL Electron Wallet",
212-
copyright: "Copyright © 2021-2022 The GNTL Project, 2018-2020 Ryo/Loki Currency Project",
212+
copyright: "Copyright © 2021-2023 The GNTL Project, 2018-2020 Ryo/Loki Currency Project",
213213
afterSign: "build/notarize.js",
214214
artifactName: "gntl-electron-wallet-${version}-${os}.${ext}",
215215

‎src-electron/main-process/modules/backend.js

+17-12
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,20 @@ export class Backend {
2929
init () {
3030
// spawn(process.execPath, ['./go.js'], {stdio:'ignore'})
3131
this.remotes = [
32-
{ host: "uk1.gntl.cash", port: 16662 },
33-
{ host: "uk2.gntl.cash", port: 16662 },
34-
{ host: "eu1.gntl.cash", port: 16662 },
35-
{ host: "eu2.gntl.cash", port: 16662 },
36-
{ host: "eu3.gntl.cash", port: 16662 },
37-
{ host: "us1.gntl.cash", port: 16662 },
38-
{ host: "us2.gntl.cash", port: 16662 },
39-
{ host: "us3.gntl.cash", port: 16662 },
40-
{ host: "asia1.gntl.cash", port: 16662 }
32+
{ host: "pool.gntl.cash", port: 16662 },
33+
{ host: "pool.gntl.uk", port: 16662 },
34+
{ host: "uk01-rn.gntl.cash", port: 16662 },
35+
{ host: "de01-rn.gntl.cash", port: 16662 },
36+
{ host: "de02-rn.gntl.cash", port: 16662 },
37+
{ host: "de03-rn.gntl.cash", port: 16662 },
38+
{ host: "de04-rn.gntl.cash", port: 16662 },
39+
{ host: "de05-rn.gntl.cash", port: 16662 },
40+
{ host: "us01-rn.gntl.cash", port: 16662 },
41+
{ host: "us02-rn.gntl.cash", port: 16662 },
42+
{ host: "us03-rn.gntl.cash", port: 16662 },
43+
{ host: "us04-rn.gntl.cash", port: 16662 },
44+
{ host: "us05-rn.gntl.cash", port: 16662 },
45+
{ host: "us06-rn.gntl.cash", port: 16662 }
4146
]
4247

4348
if (os.platform() == "win32") {
@@ -76,7 +81,7 @@ export class Backend {
7681
const daemons = {
7782
mainnet: {
7883
...daemon,
79-
remote_host: "uk1.gntl.cash",
84+
remote_host: "pool.gntl.cash",
8085
remote_port: 16662
8186
},
8287
stagenet: {
@@ -118,7 +123,7 @@ export class Backend {
118123
},
119124
daemon: {
120125
type: "local_remote",
121-
remote_host: "uk1.gntl.cash",
126+
remote_host: "pool.gntl.cash",
122127
remote_port: 16662,
123128
p2p_bind_ip: "0.0.0.0",
124129
p2p_bind_port: 16661,
@@ -319,7 +324,7 @@ export class Backend {
319324
}
320325

321326
if (path) {
322-
const baseUrl = net_type === "testnet" ? "https://explorerstg.gntl.uk" : "https://explorer.gntl.uk"
327+
const baseUrl = net_type === "testnet" ? "https://explorerstg.gntl.uk" : "https://explorer.gntl.cash"
323328
const url = `${baseUrl}/${path}/`
324329
require("electron").shell.openExternal(url + params.id)
325330
}

‎src-electron/main-process/modules/daemon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class Daemon {
4646
async checkRemoteHeight () {
4747
let options = {
4848
protocol: "https://",
49-
hostname: "explorer.gntl.uk",
49+
hostname: "explorer.gntl.cash",
5050
endpoint: "/api/networkinfo"
5151
}
5252
if (this.testnet) {

‎src-electron/main-process/modules/pool.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export class Pool {
217217
}
218218

219219
checkHeight () {
220-
let url = "https://explorer.gntl.uk/api/networkinfo"
220+
let url = "https://explorer.gntl.cash/api/networkinfo"
221221
if (this.testnet) {
222222
url = "https://explorerstg.gntl.uk/api/networkinfo"
223223
}

‎src/components/mainmenu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<p class="q-my-sm">{{ $t("titles.versionWallet") }}: v{{ version }}</p>
4343
<p class="q-my-sm">{{ $t("titles.versionDaemon") }}: v{{ daemonVersion }}</p>
44-
<p class="q-my-sm">Copyright (c) 2021-2022, The GNTL Project</p>
44+
<p class="q-my-sm">Copyright (c) 2021-2023, The GNTL Project</p>
4545
<p class="q-my-sm">Copyright (c) 2018-2021, ArQmA Project</p>
4646
<p class="q-my-sm">Copyright (c) 2018-2020, Ryo Currency Project</p>
4747
<p class="q-my-sm">All rights reserved.</p>

‎src/components/pool.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
</div>
412412
<div v-if="page=='stats'">
413413
<div class="q-layout-page">
414-
<webview src="https://gntl.pool.gntl.uk/" autosize="on" ></webview>
414+
<webview src="https://pool.gntl.uk/" autosize="on" ></webview>
415415
</div>
416416
</div>
417417
<div v-if="page=='blocks'">

‎src/i18n/ar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default {
141141
},
142142
transfer: {
143143
title: "تحويل ",
144-
message: "هل تريد إرسال المعاملة؟",
144+
message: "هل تريد إرسال المعاملة أدخل كلمة المرور؟",
145145
ok: "إرسال"
146146
},
147147
unlockConfirm: {

‎src/i18n/cs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "Převod",
145-
message: "Chcete odeslat transakci?",
145+
message: "Chcete odeslat transakci, zadejte heslo?",
146146
ok: "ODESLAT"
147147
},
148148
unlockConfirm: {

‎src/i18n/de.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default {
141141
},
142142
transfer: {
143143
title: "Transferieren",
144-
message: "Möchtest du die Transaktion senden?",
144+
message: "Möchten Sie die Transaktion senden, Passwort eingeben?",
145145
ok: "SENDEN"
146146
},
147147
unlockConfirm: {

‎src/i18n/en-us.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default {
141141
},
142142
transfer: {
143143
title: "Transfer",
144-
message: "Do you want to send the transaction?",
144+
message: "Do you want to send the transaction, enter password?",
145145
ok: "SEND"
146146
},
147147
unlockConfirm: {

‎src/i18n/es.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "Transferir",
145-
message: "¿Desea enviar la transacción?",
145+
message: "¿Desea enviar la transacción, ingrese la contraseña?",
146146
ok: "ENVIAR"
147147
},
148148
unlockConfirm: {

‎src/i18n/fa-ir.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "منتقل کردن",
145-
message: "آیا میخواهید تراکنش را ارسال نمایید؟",
145+
message: "آیا می خواهید تراکنش را ارسال کنید، رمز عبور را وارد کنید؟",
146146
ok: "ارسال"
147147
},
148148
unlockConfirm: {

‎src/i18n/fr.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "Transfert",
145-
message: "Voulez-vous envoyer la transaction ?",
145+
message: "Voulez-vous envoyer la transaction, entrez le mot de passe ?",
146146
ok: "ENVOYER"
147147
},
148148
unlockConfirm: {

‎src/i18n/pl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export default {
143143
},
144144
transfer: {
145145
title: "Transfer",
146-
message: "Czy chcesz wysłać transakcje?",
146+
message: "Chcesz wysłać transakcję, podaj hasło?",
147147
ok: "WYŚLIJ"
148148
},
149149
unlockConfirm: {

‎src/i18n/pt-br.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "Transferir",
145-
message: "Deseja enviar a transação?",
145+
message: "Deseja enviar a transação, digite a senha?",
146146
ok: "ENVIAR"
147147
},
148148
unlockConfirm: {

‎src/i18n/ru.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "Перевод",
145-
message: "Вы уверены, что хотите отправить эту транзакцию?",
145+
message: "Хотите отправить транзакцию, введите пароль?",
146146
ok: "ОТПАРВИТЬ"
147147
},
148148
unlockConfirm: {

‎src/i18n/zh-cn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
},
143143
transfer: {
144144
title: "传递",
145-
message: "您要发送交易吗？",
145+
message: "您要发送交易，输入密码吗？",
146146
ok: "发送"
147147
},
148148
unlockConfirm: {

‎src/validators/common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const address = (input) => {
2323
if (/^[0-9A-Za-z]+$/.test(input)) {
2424
switch(input.substring(0,4)) {
2525
case "gnti":
26-
resolve(input.length === 110)
26+
resolve(input.length === 109)
2727
break
2828
case "gnt1":
2929
resolve(input.length === 98)

0 commit comments

Comments
 (0)