Skip to content

Commit eb35507

Browse files
AsherdaAsherda
authored
Merge pull request #161 from VerusCoin/dev
Dev
2 parents 61105da + 201c2b5 commit eb35507

10 files changed

Lines changed: 74 additions & 63 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ stages:
77
########################################################################################################################
88
variables:
99
DOCKER_DRIVER: overlay2
10-
DEFAULT_VERUSCOIN_BRANCH: ${CI_COMMIT_REF_NAME}
11-
AGAMA_VERSION: 0.5.9-2
12-
VERUSCOIN_VERSION: 0.5.9-2
13-
KOMODO_VERSION: 0.4.0a
10+
DEFAULT_VERUSCOIN_BRANCH: master
11+
AGAMA_VERSION: 0.6.0
12+
VERUSCOIN_VERSION: 0.6.0
13+
KOMODO_VERSION: 0.5.0
1414
BINARY_SOURCE: VerusCoin
1515
EASYDEX_GUI_BUILD: build.tar.gz
1616
AGAMA_APPIMAGE: Agama-Linux-v${AGAMA_VERSION}.AppImage
1717
AGAMA_LINUX_TAR: Agama-Linux-v${AGAMA_VERSION}.tar.gz
1818
AGAMA_WINDOWS_ZIP: Agama-Windows-v${AGAMA_VERSION}.zip
19+
AGAMA_WINDOWS_NSIS: Agama-Windows-v${AGAMA_VERSION}.exe
1920
AGAMA_MACOS: Agama-MacOS-v${AGAMA_VERSION}.dmg
2021
GIT_SUBMODULE_STRATEGY: recursive
2122
POST_COMMENT: "Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
@@ -41,8 +42,8 @@ build:linux:
4142
--key-file AUTH_KEY.json &&
4243
rm AUTH_KEY.json
4344
- if [ -z "${UPSTREAM_CLI_BRANCH}" ]; then export
44-
VERUS_CLI_LINUX="${BINARY_SOURCE}/${DEFAULT_VERUSCOIN_BRANCH}/Linux/Verus-CLI-Linux-v${VERUSCOIN_VERSION}.tar.gz"
45-
POST_COMMENT="${POST_COMMENT}Using ${BINARY_SOURCE}/${DEFAULT_VERUSCOIN_BRANCH} binaries.";
45+
VERUS_CLI_LINUX="${BINARY_SOURCE}/${DEFAULT_VERUSCOIN_BRANCH}/Linux/Verus-CLI-Linux-v${VERUSCOIN_VERSION}-amd64.tar.gz"
46+
POST_COMMENT="${POST_COMMENT}Using ${BINARY_SOURCE}/${DEFAULT_VERUSCOIN_BRANCH} binaries.";
4647
else
4748
export POST_COMMENT="${POST_COMMENT}Using ${UPSTREAM_TRIGGER}/${UPSTREAM_CLI_BRANCH} binaries."; fi
4849
- cd gui/EasyDEX-GUI/react
@@ -51,11 +52,11 @@ build:linux:
5152
- cd ../../..
5253
- mkdir -p assets/bin/linux64/verusd
5354
- gsutil cp $STAGING/$VERUS_CLI_LINUX .
54-
- tar -xzvf Verus-CLI-Linux-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64/verusd
55-
- rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}.tar.gz
56-
- wget https://github.com/KomodoPlatform/komodo/releases/download/dev-multios-0.4.0a-alpha/linux_0.4.0a.tar.gz
57-
- tar -xzvf linux_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/linux64
58-
- rm linux_${KOMODO_VERSION}.tar.gz
55+
- tar -xzvf Verus-CLI-Linux-v${VERUSCOIN_VERSION}-amd64.tar.gz --strip=1 --directory assets/bin/linux64/verusd
56+
- rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}-amd64.tar.gz
57+
- wget https://github.com/KomodoPlatform/komodo/releases/download/0.5.0/komodo_0.5.0_linux.tar.gz
58+
- tar -xzvf komodo_${KOMODO_VERSION}_linux.tar.gz --strip=1 --directory assets/bin/linux64
59+
- rm komodo_${KOMODO_VERSION}_linux.tar.gz
5960
- strip --strip-unneeded assets/bin/linux64/komodod && strip --strip-unneeded assets/bin/linux64/komodo-cli
6061
- yarn install
6162
script:
@@ -105,17 +106,18 @@ build:windows:
105106
- gsutil cp $STAGING/$VERUS_CLI_WINDOWS .
106107
- unzip -qq Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip -d assets/bin/win64
107108
- mv assets/bin/win64/verus-cli assets/bin/win64/verusd
108-
- wget https://github.com/KomodoPlatform/komodo/releases/download/dev-multios-0.4.0a-alpha/windows_0.4.0a.zip
109-
- unzip windows_${KOMODO_VERSION}.zip -d assets/bin
110-
- rm windows_${KOMODO_VERSION}.zip
109+
- wget https://github.com/KomodoPlatform/komodo/releases/download/0.5.0/komodo_0.5.0_windows.zip
110+
- unzip komodo_${KOMODO_VERSION}_windows.zip -d assets/bin
111+
- rm komodo_${KOMODO_VERSION}_windows.zip
111112
- strip --strip-unneeded assets/bin/win64/komodod.exe && strip --strip-unneeded assets/bin/win64/komodo-cli.exe && strip --strip-unneeded assets/bin/win64/komodo-tx.exe
112113
- rm Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip
113114
- yarn install
114115
script:
115116
- yarn run dist-win
116117
- cd dist
117118
- sha256sum ${AGAMA_WINDOWS_ZIP} > ${AGAMA_WINDOWS_ZIP}.sha256
118-
- mv ${AGAMA_WINDOWS_ZIP} ${AGAMA_WINDOWS_ZIP}.sha256 ..
119+
- sha256sum ${AGAMA_WINDOWS_NSIS} > ${AGAMA_WINDOWS_NSIS}.sha256
120+
- mv ${AGAMA_WINDOWS_ZIP} ${AGAMA_WINDOWS_ZIP}.sha256 ${AGAMA_WINDOWS_NSIS} ${AGAMA_WINDOWS_NSIS}.sha256 ..
119121
after_script:
120122
- curl -F file=@"$AGAMA_WINDOWS_ZIP"
121123
-F channels="$AGAMA_POST_CHANNEL"
@@ -126,6 +128,8 @@ build:windows:
126128
paths:
127129
- ${AGAMA_WINDOWS_ZIP}
128130
- ${AGAMA_WINDOWS_ZIP}.sha256
131+
- ${AGAMA_WINDOWS_NSIS}
132+
- ${AGAMA_WINDOWS_NSIS}.sha256
129133
- dist
130134
expire_in: 1 week
131135
########################################################################################################################
@@ -147,11 +151,11 @@ build:mac:
147151
- yarn run build
148152
- cd ../../..
149153
- gsutil cp $STAGING/$VERUS_CLI_MACOS .
150-
- wget https://github.com/KomodoPlatform/komodo/releases/download/dev-multios-0.4.0a-alpha/macOS_0.4.0a.tar.gz
154+
- wget https://github.com/KomodoPlatform/komodo/releases/download/0.5.0/komodo_0.5.0_macOS.gz
151155
- mkdir -p assets/bin/osx/verusd
152156
- tar -xzf Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/osx/verusd
153-
- tar -xzvf macOS_${KOMODO_VERSION}.tar.gz --strip=1 --directory assets/bin/osx
154-
- rm macOS_${KOMODO_VERSION}.tar.gz
157+
- tar -xzvf komodo_${KOMODO_VERSION}_macOS.gz --strip=1 --directory assets/bin/osx
158+
- rm komodo_${KOMODO_VERSION}_macOS.gz
155159
- rm Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz
156160
- yarn install
157161
script:
@@ -161,7 +165,7 @@ build:mac:
161165
- shasum -a 256 ${AGAMA_MACOS} > ${AGAMA_MACOS}.sha256
162166
- mv ${AGAMA_MACOS} ${AGAMA_MACOS}.sha256 ..
163167
after_script:
164-
- curl -F file=@"${AGAMA_MACOS}.dmg"
168+
- curl -F file=@"${AGAMA_MACOS}"
165169
-F channels="${AGAMA_POST_CHANNEL}"
166170
-F initial_comment="${POST_COMMENT}"
167171
-H "${SLACK_BOT_AUTH}"
@@ -199,4 +203,6 @@ deploy:
199203
- ${AGAMA_WINDOWS_ZIP}.sha256
200204
- ${AGAMA_MACOS}
201205
- ${AGAMA_MACOS}.sha256
206+
- ${AGAMA_WINDOWS_NSIS}
207+
- ${AGAMA_WINDOWS_NSIS}.sha256
202208
expire_in: 1 week

‎gui/EasyDEX-GUI‎

‎package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Agama",
33
"productName": "Agama",
4-
"version": "0.5.9-2",
4+
"version": "0.6.0",
55
"description": "Agama Wallet Desktop App",
66
"main": "main.js",
77
"scripts": {
@@ -35,13 +35,13 @@
3535
"license": "MIT",
3636
"devDependencies": {
3737
"cross-env": "^5.2.0",
38-
"electron": "^4.1.5",
38+
"electron": "^4.2.12",
3939
"electron-builder": "21.2.0",
4040
"electron-devtools-installer": "^2.2.4"
4141
},
4242
"dependencies": {
4343
"adm-zip": "^0.4.7",
44-
"agama-wallet-lib": "git+https://github.com/VerusCoin/agama-wallet-lib.git#dev",
44+
"agama-wallet-lib": "https://github.com/VerusCoin/agama-wallet-lib.git#dev",
4545
"arch": "^2.1.0",
4646
"async": "^2.6.0",
4747
"bigi": "^1.4.2",
@@ -137,6 +137,8 @@
137137
"resolutions": {
138138
"lodash": "^4.17.11",
139139
"js-yaml": "^3.13.1",
140-
"tar": "^4.4.8"
140+
"tar": "^4.4.8",
141+
"https-proxy-agent": "2.2.4",
142+
"mem": "4.0.0"
141143
}
142144
}

‎routes/api/addCoinShortcuts.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ module.exports = (api) => {
9191
selection === 'MNZ' ||
9292
selection === 'BTCH' ||
9393
selection === 'PIRATE' ||
94-
selection === 'VRSC' ||
95-
selection === 'K64'
94+
selection === 'VRSC'
9695
) {
9796
herdData = {
9897
ac_name: selection,

‎routes/appConfig.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ const appConfig = {
4747
verus: {
4848
stakeGuard: '',
4949
autoStakeVRSC: false,
50-
pbaasTestmode: true,
51-
enableVrsctest: false,
50+
// pbaasTestmode: false,
51+
//enableVrsctest: false,
5252
},
5353
pbaasChains: [],
5454
reservedChains: Object.keys(coins.CRYPTO).concat(Object.keys(coins.ASSETCHAINS)).concat(["KOMODO", "zcashd", "komodod", "chipsd"]),
@@ -336,4 +336,4 @@ const appConfig = {
336336
},
337337
};
338338

339-
module.exports = appConfig;
339+
module.exports = appConfig;

‎routes/chainParams.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ const chainParams = {
5353
ac_cc: 2,
5454
addnode: '51.75.122.83',
5555
},
56-
K64: {
57-
ac_supply: 64000777,
58-
ac_reward: 0,
59-
ac_staked: 10,
60-
addnode: '18.197.20.211',
61-
},
6256
MSHARK: {
6357
ac_supply: 1400000,
6458
},

‎routes/ports.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const assetChainPorts = {
44
komodod: 7771,
55
marketmaker: 7783,
66
OOT: 12467,
7-
K64: 12245,
87
PIZZA: 11608,
98
BEER: 8923,
109
CHIPS: 57776,
@@ -56,7 +55,7 @@ const assetChainPorts = {
5655
ZEXO: 33970,
5756
LABS: 40265,
5857
DP: 28388,
59-
VRSCTEST: 16982,
58+
VRSCTEST: 17845,
6059
VRSC: 27486,
6160
};
6261

‎version‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=0.5.9-2
1+
version=0.6.0
22
type=beta
3-
minversion=0.5.9-2
3+
minversion=0.6.0

‎version_build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.9-2
1+
0.6.0

‎yarn.lock‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
22
# yarn lockfile v1
33

4-
54
"7zip-bin@~5.0.3":
65
version "5.0.3"
76
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
@@ -78,9 +77,9 @@ after@0.8.2:
7877
resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
7978
integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
8079

81-
"agama-wallet-lib@git+https://github.com/VerusCoin/agama-wallet-lib.git#dev":
80+
"agama-wallet-lib@https://github.com/VerusCoin/agama-wallet-lib.git#dev":
8281
version "0.3.4"
83-
resolved "git+https://github.com/VerusCoin/agama-wallet-lib.git#5916c9fa0e7d3d1b045accf30bf269214b298ef5"
82+
resolved "https://github.com/VerusCoin/agama-wallet-lib.git#bda1f45abe201943863c95d6297e257c0d7e7f80"
8483
dependencies:
8584
bigi "^1.4.2"
8685
bip32 "^1.0.2"
@@ -1500,10 +1499,10 @@ electron-publish@21.2.0:
15001499
lazy-val "^1.0.4"
15011500
mime "^2.4.4"
15021501

1503-
electron@^4.1.5:
1504-
version "4.2.11"
1505-
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.11.tgz#bbcf4981b85b5cd841e57e9f70b4bb66da0b261a"
1506-
integrity sha512-7tYrmvQaatP5A4OwcBx+zjvPBarrtsnXKM65338QH3ifblrAt64DnL7B2dnE0Anb8pehCayMLd3YRvbLRyV1hQ==
1502+
electron@^4.2.12:
1503+
version "4.2.12"
1504+
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.12.tgz#8e8926a6a6654cde5eb0612952fed98a56941875"
1505+
integrity sha512-EES8eMztoW8gEP5E4GQLP8slrfS2jqTYtHbu36mlu3k1xYAaNPyQQr6mCILkYxqj4l3la4CT2Vcs89CUG62vcQ==
15071506
dependencies:
15081507
"@types/node" "^10.12.18"
15091508
electron-download "^4.1.0"
@@ -1729,7 +1728,6 @@ ethereumjs-util@^6.0.0:
17291728

17301729
"ethers@git://github.com/pbca26/ethers.js":
17311730
version "4.0.7"
1732-
uid "26671ceccb7a828e405b70f7ea42025efef19b73"
17331731
resolved "git://github.com/pbca26/ethers.js#26671ceccb7a828e405b70f7ea42025efef19b73"
17341732
dependencies:
17351733
"@types/node" "^10.3.2"
@@ -2345,10 +2343,10 @@ http-signature@~1.2.0:
23452343
jsprim "^1.2.2"
23462344
sshpk "^1.7.0"
23472345

2348-
https-proxy-agent@^2.2.1:
2349-
version "2.2.2"
2350-
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
2351-
integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
2346+
https-proxy-agent@2.2.4, https-proxy-agent@^2.2.1:
2347+
version "2.2.4"
2348+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
2349+
integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
23522350
dependencies:
23532351
agent-base "^4.3.0"
23542352
debug "^3.1.0"
@@ -3102,6 +3100,13 @@ make-fetch-happen@^5.0.0:
31023100
socks-proxy-agent "^4.0.0"
31033101
ssri "^6.0.0"
31043102

3103+
map-age-cleaner@^0.1.1:
3104+
version "0.1.3"
3105+
resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
3106+
integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
3107+
dependencies:
3108+
p-defer "^1.0.0"
3109+
31053110
map-obj@^1.0.0, map-obj@^1.0.1:
31063111
version "1.0.1"
31073112
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
@@ -3130,12 +3135,14 @@ media-typer@0.3.0:
31303135
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
31313136
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
31323137

3133-
mem@^1.1.0:
3134-
version "1.1.0"
3135-
resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
3136-
integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
3138+
mem@4.0.0, mem@^1.1.0:
3139+
version "4.0.0"
3140+
resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
3141+
integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
31373142
dependencies:
3143+
map-age-cleaner "^0.1.1"
31383144
mimic-fn "^1.0.0"
3145+
p-is-promise "^1.1.0"
31393146

31403147
meow@^3.1.0:
31413148
version "3.7.0"
@@ -3746,11 +3753,21 @@ p-cancelable@^1.0.0:
37463753
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
37473754
integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
37483755

3756+
p-defer@^1.0.0:
3757+
version "1.0.0"
3758+
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
3759+
integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
3760+
37493761
p-finally@^1.0.0:
37503762
version "1.0.0"
37513763
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
37523764
integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
37533765

3766+
p-is-promise@^1.1.0:
3767+
version "1.1.0"
3768+
resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
3769+
integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
3770+
37543771
p-limit@^1.1.0:
37553772
version "1.3.0"
37563773
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -3885,7 +3902,6 @@ parseurl@~1.3.3:
38853902

38863903
"passwd-strength@git+https://github.com/pbca26/passwd-strength.git":
38873904
version "1.1.0"
3888-
uid "3890ea7d0c5efb2ebaae0c3e93770f62ae7ec4c5"
38893905
resolved "git+https://github.com/pbca26/passwd-strength.git#3890ea7d0c5efb2ebaae0c3e93770f62ae7ec4c5"
38903906

38913907
path-exists@^2.0.0:
@@ -5213,12 +5229,7 @@ typedarray@^0.0.6:
52135229
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
52145230
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
52155231

5216-
typeforce@^1.11.1, typeforce@^1.11.3, typeforce@^1.11.5:
5217-
version "1.18.0"
5218-
resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
5219-
integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
5220-
5221-
"typeforce@git+https://github.com/michaeltout/typeforce":
5232+
typeforce@^1.11.1, typeforce@^1.11.3, typeforce@^1.11.5, "typeforce@git+https://github.com/michaeltout/typeforce":
52225233
version "1.18.0"
52235234
resolved "git+https://github.com/michaeltout/typeforce#c9b0abc33ff006d7a6a6150eff034bc7eb8b07de"
52245235

0 commit comments

Comments
 (0)