Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Commit 41ae5c1

Browse files
committed
Fixed Mac gaia error, updated version and fixed Infura API error.
1 parent ff65bc9 commit 41ae5c1

9 files changed

Lines changed: 576 additions & 120 deletions

File tree

wallet 2.0/electron.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function windowManager() {
3232
this.createWindow = () => {
3333
if (process.platform === 'win32') screenHeight = 700;
3434
else screenHeight = 672;
35-
this.window = new BrowserWindow({ title: "Sentinel Network - dVPN - alpha-0.1.2", resizable: false, maximizable: false, width: 1000, height: screenHeight, icon: './public/icon256x256.png' });
35+
this.window = new BrowserWindow({ title: "Sentinel Network - dVPN - alpha-0.1.3", resizable: false, maximizable: false, width: 1000, height: screenHeight, icon: './public/icon256x256.png' });
3636
this.window.loadURL(url.format({
3737
pathname: path.join(__dirname, 'build/index.html'),
3838
protocol: 'file:',

wallet 2.0/installers/windows/createinstaller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
22
const path = require('path')
3-
const appVersion='0.1.2'
3+
const appVersion='0.1.3'
44

55
getInstallerConfig()
66
.then(createWindowsInstaller)

wallet 2.0/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Sentinel Network - dVPN Desktop Application",
44
"productName": "Sentinel",
55
"author": "Dev Team <devteam@sentinelgroup.io>",
6-
"version": "0.1.2",
6+
"version": "0.1.3",
77
"private": true,
88
"main": "electron.js",
99
"license": "MIT",
@@ -40,7 +40,7 @@
4040
"package-mac": "electron-packager . Sentinel --overwrite --asar --platform=darwin --arch=x64 --icon=public/icon256x256.ico --prune=true --out=release-builds --extra-resource=public/gaiacli",
4141
"package-win": "electron-packager . sentinel --overwrite --asar --platform=win32 --icon=public/icon256x256.ico --prune=true --out=release-builds --win32metadata.CompanyName=Sentinel --win32metadata.FileDescription=\"Application for Sentinel\" --win32metadata.requested-execution-level=requireAdministrator --win32metadata.ProductName=\"Sentinel\"",
4242
"package-linux": "electron-packager . sentinel --overwrite --asar --platform=linux --arch=x64 --icon=public/icon256x256.png --prune=true --out=release-builds",
43-
"create-installer-mac": "electron-installer-dmg ./release-builds/Sentinel-darwin-x64/Sentinel.app Sentinel-alpha-0.1.2 --out=release-builds --overwrite --icon=public/icon256x256.icns",
43+
"create-installer-mac": "electron-installer-dmg ./release-builds/Sentinel-darwin-x64/Sentinel.app Sentinel-alpha-0.1.3 --out=release-builds --overwrite --icon=public/icon256x256.icns",
4444
"create-installer-win": "node installers/windows/createinstaller.js",
4545
"create-debian-installer": "electron-installer-debian --src release-builds/sentinel-linux-x64/ --arch amd64 --config debian.json"
4646
},

wallet 2.0/src/Actions/connectSOCKS.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export async function checksentinelSocks(cb) {
129129
cb(null);
130130
} else {
131131
let username = getUserHome();
132-
exec(`${username}\\AppData\\Local\\Sentinel\\app-0.1.2\\resources\\extras\\socks5\\service.exe`, function (execErr, execOut, execStd) {
132+
exec(`${username}\\AppData\\Local\\Sentinel\\app-0.1.3\\resources\\extras\\socks5\\service.exe`, function (execErr, execOut, execStd) {
133133
exec(`net start sentinelSocksv12`, function (stderr, stdout, error) {
134134
cb(null);
135135
});

wallet 2.0/src/Constants/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const config = {
44
'main': {
55
masterUrl: 'https://api.sentinelgroup.io:8333',
6-
infuraUrl: 'https://mainnet.infura.io/aiAxnxbpJ4aG0zed1aMy',
6+
infuraUrl: 'https://mainnet.infura.io/v3/5f7d36c20a8c448da6fbb8c03808dbbe',
77
sentinelAddress: '0xa44E5137293E855B1b7bC7E2C6f8cD796fFCB037',
88
gasLimit: 5000000,
99
ethBalanceUrl: `https://api.etherscan.io/api?apikey=Y5BJ5VA3XZ59F63XQCQDDUWU2C29144MMM&module=account&action=balance&tag=latest&address=`,
@@ -16,7 +16,7 @@ const config = {
1616
},
1717
'test': {
1818
masterUrl: 'http://api.sentinelgroup.io:8333',
19-
infuraUrl: 'https://rinkeby.infura.io/aiAxnxbpJ4aG0zed1aMy',
19+
infuraUrl: 'https://rinkeby.infura.io/v3/5f7d36c20a8c448da6fbb8c03808dbbe',
2020
sentinelAddress: '0x29317B796510afC25794E511e7B10659Ca18048B',
2121
gasLimit: 2500000,
2222
ethBalanceUrl: `https://api-rinkeby.etherscan.io/api?apikey=Y5BJ5VA3XZ59F63XQCQDDUWU2C29144MMM&module=account&action=balance&tag=latest&address=`,

wallet 2.0/src/Constants/language.js

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.

wallet 2.0/src/Reducers/beforeAuth.reducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function getKeystoreFile() {
2525
}
2626
}
2727

28-
export function setLanguage(state = 'zh', action) {
28+
export function setLanguage(state = 'en', action) {
2929
switch (action.type) {
3030
case types.LANGUAGE:
3131
return action.payload

wallet 2.0/src/Utils/Gaiacli.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function runGaiacli(cb) {
2525
let gaiacliPath = path.join(remote.process.resourcesPath, 'gaiacli');
2626
execSync(`chmod +x ${gaiacliPath}`);
2727
// exec(`${gaiacliPath} advanced rest-server --node tcp://209.182.217.171:26657 --chain-id=Sentinel-dev-testnet`,
28-
exec('/usr/lib/sentinel/public/gaiacli advanced rest-server --node http://tm-lcd.sentinelgroup.io:26657 --chain-id=Sentinel-testnet-1.1',
28+
exec(`${gaiacliPath} advanced rest-server --node http://tm-lcd.sentinelgroup.io:26657 --chain-id=Sentinel-testnet-1.1`,
2929

3030
function (err, stdout, stderr) {
3131
if (err) {

0 commit comments

Comments
 (0)