Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: VerusCoin/Verus-Desktop
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.12-2
Choose a base ref
...
head repository: VerusCoin/Verus-Desktop
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 8, 2023

  1. Copy the full SHA
    775618a View commit details
  2. Remove unnecessary logs

    michaeltout committed Jul 8, 2023
    Copy the full SHA
    f1b161f View commit details
  3. Copy the full SHA
    3088d3d View commit details
  4. Copy the full SHA
    04aa3f9 View commit details

Commits on Jul 11, 2023

  1. Copy the full SHA
    000e271 View commit details
  2. Update version

    Asherda committed Jul 11, 2023
    Copy the full SHA
    d8175c4 View commit details
  3. Merge pull request #205 from VerusCoin/dev

    v1.0.12-4
    Asherda authored Jul 11, 2023
    Copy the full SHA
    4e09acb View commit details

Commits on Jul 13, 2023

  1. Add load bridgekeeper conf file

    monkins1010 authored and Asherda committed Jul 13, 2023
    Copy the full SHA
    b996051 View commit details
  2. Copy the full SHA
    56a2c77 View commit details
  3. update submodule

    Asherda committed Jul 13, 2023
    Copy the full SHA
    ed3c14a View commit details
  4. update version

    Asherda committed Jul 13, 2023
    Copy the full SHA
    a99c002 View commit details

Commits on Jul 14, 2023

  1. Merge pull request #207 from VerusCoin/dev

    v1.0.12-5
    Asherda authored Jul 14, 2023
    Copy the full SHA
    00d7c3d View commit details

Commits on Jul 20, 2023

  1. update version

    Asherda committed Jul 20, 2023
    Copy the full SHA
    8d9d570 View commit details
  2. Merge pull request #208 from VerusCoin/dev

    v1.0.12-6
    Asherda authored Jul 20, 2023
    Copy the full SHA
    31624a1 View commit details
  3. update version

    Asherda committed Jul 20, 2023
    Copy the full SHA
    0b589ce View commit details
  4. Merge pull request #209 from VerusCoin/dev

    update version
    Asherda authored Jul 20, 2023
    Copy the full SHA
    d9933b0 View commit details

Commits on Aug 7, 2023

  1. updates for no private key

    monkins1010 authored and Asherda committed Aug 7, 2023
    Copy the full SHA
    2264675 View commit details
  2. update submodule

    Asherda committed Aug 7, 2023
    Copy the full SHA
    de002d1 View commit details

Commits on Aug 10, 2023

  1. update bridgekeeper

    Asherda committed Aug 10, 2023
    Copy the full SHA
    3c8bc85 View commit details
  2. update version

    Asherda committed Aug 10, 2023
    Copy the full SHA
    f923394 View commit details
  3. Merge pull request #211 from VerusCoin/dev

    v1.1.0
    Asherda authored Aug 10, 2023
    Copy the full SHA
    4058e78 View commit details

Commits on Aug 31, 2023

  1. update Pirate binaries

    Asherda committed Aug 31, 2023
    Copy the full SHA
    09baade View commit details
  2. update version

    Asherda committed Aug 31, 2023
    Copy the full SHA
    5800b7d View commit details
  3. Merge pull request #212 from VerusCoin/dev

    v1.1.1
    Asherda authored Aug 31, 2023
    Copy the full SHA
    cdac13a View commit details

Commits on Sep 2, 2023

  1. update version

    Asherda committed Sep 2, 2023
    Copy the full SHA
    41cb19b View commit details

Commits on Sep 4, 2023

  1. Merge pull request #213 from VerusCoin/dev

    v1.1.1-1
    Asherda authored Sep 4, 2023
    Copy the full SHA
    677b9f4 View commit details

Commits on Sep 12, 2023

  1. update version

    Asherda committed Sep 12, 2023
    Copy the full SHA
    abf4c4d View commit details

Commits on Sep 13, 2023

  1. Merge pull request #214 from VerusCoin/dev

    update version
    Asherda authored Sep 13, 2023
    Copy the full SHA
    6e9e8f0 View commit details

Commits on Oct 2, 2023

  1. update dependencies

    Asherda committed Oct 2, 2023
    Copy the full SHA
    ebc4348 View commit details

Commits on Oct 3, 2023

  1. update version

    Asherda committed Oct 3, 2023
    Copy the full SHA
    40575f1 View commit details
  2. Merge pull request #215 from VerusCoin/dev

    v1.1.1-3
    Asherda authored Oct 3, 2023
    Copy the full SHA
    5afea63 View commit details

Commits on Oct 4, 2023

  1. update version

    Asherda committed Oct 4, 2023
    Copy the full SHA
    4777097 View commit details

Commits on Oct 5, 2023

  1. Merge pull request #216 from VerusCoin/dev

    v1.1.1-4
    Asherda authored Oct 5, 2023
    Copy the full SHA
    8475549 View commit details

Commits on Oct 7, 2023

  1. update bridgekeeper

    Asherda committed Oct 7, 2023
    Copy the full SHA
    6ae20b8 View commit details
  2. update version

    Asherda committed Oct 7, 2023
    Copy the full SHA
    7d04b06 View commit details
  3. Merge pull request #217 from VerusCoin/dev

    v1.1.1-5
    Asherda authored Oct 7, 2023
    Copy the full SHA
    925d482 View commit details

Commits on Oct 10, 2023

  1. update submodule

    Asherda committed Oct 10, 2023
    Copy the full SHA
    469f431 View commit details
  2. update bridgekeeper

    Asherda committed Oct 10, 2023
    Copy the full SHA
    d189770 View commit details
  3. update version

    Asherda committed Oct 10, 2023
    Copy the full SHA
    34ba838 View commit details
  4. Merge pull request #218 from VerusCoin/dev

    v1.1.1-6
    Asherda authored Oct 10, 2023
    Copy the full SHA
    47d0afd View commit details

Commits on Oct 12, 2023

  1. Update conf file generation

    Asherda committed Oct 12, 2023
    Copy the full SHA
    286a91c View commit details
  2. Update bridgekeeper

    Asherda committed Oct 12, 2023
    Copy the full SHA
    853834d View commit details
  3. Update version

    Asherda committed Oct 12, 2023
    Copy the full SHA
    4712705 View commit details
  4. Merge pull request #219 from VerusCoin/dev

    v1.1.1-7
    Asherda authored Oct 12, 2023
    Copy the full SHA
    fe45129 View commit details

Commits on Oct 19, 2023

  1. Update submodule

    Asherda committed Oct 19, 2023
    Copy the full SHA
    42bff58 View commit details
  2. Update bridgekeeper

    Asherda committed Oct 19, 2023
    Copy the full SHA
    729f72d View commit details
  3. Update version

    Asherda committed Oct 19, 2023
    Copy the full SHA
    1f35cdc View commit details
  4. Merge pull request #220 from VerusCoin/dev

    v1.1.1-8
    Asherda authored Oct 19, 2023
    Copy the full SHA
    8892e80 View commit details

Commits on Oct 20, 2023

  1. update submodule

    Asherda committed Oct 20, 2023
    Copy the full SHA
    306333a View commit details
  2. update bridgekeeper

    Asherda committed Oct 20, 2023
    Copy the full SHA
    a79debb View commit details
Showing with 1,446 additions and 1,001 deletions.
  1. +28 −30 .gitlab-ci.yml
  2. +1 −1 gui/Verus-Desktop-GUI
  3. +10 −7 main.js
  4. +18 −10 package.json
  5. +9 −0 routes/api.js
  6. +12 −0 routes/api/binsUtils.js
  7. +28 −2 routes/api/daemonControl.js
  8. +8 −4 routes/api/dlhandler.js
  9. +8 −10 routes/api/downloadZcparams.js
  10. +2 −29 routes/api/electrum/balances.js
  11. +0 −3 routes/api/electrum/block.js
  12. +3 −36 routes/api/electrum/cache.js
  13. +1 −10 routes/api/electrum/coins.js
  14. +76 −2 routes/api/electrum/interest.js
  15. +1 −12 routes/api/electrum/listunspent.js
  16. +0 −18 routes/api/electrum/merkle.js
  17. +0 −7 routes/api/electrum/nspv.js
  18. +1 −3 routes/api/electrum/send.js
  19. +0 −8 routes/api/electrum/servers.js
  20. +0 −26 routes/api/electrum/transactions.js
  21. +0 −1 routes/api/explorer/remoteExplorers.js
  22. +55 −0 routes/api/getSignatureInfo.js
  23. +35 −0 routes/api/native/callDaemon.js
  24. +35 −0 routes/api/native/estimateConversion.js
  25. +53 −0 routes/api/native/estimateSendcurrencyFee.js
  26. +65 −0 routes/api/native/getBlock.js
  27. +6 −288 routes/api/native/getConversionPaths.js
  28. +2 −2 routes/api/native/getCurrencies.js
  29. +6 −4 routes/api/native/getCurrency.js
  30. +65 −0 routes/api/native/getVdxfId.js
  31. +4 −1 routes/api/native/idInformation.js
  32. +1 −2 routes/api/native/remove.js
  33. +6 −4 routes/api/native/reservetransfers.js
  34. +30 −0 routes/api/native/signdata.js
  35. +9 −5 routes/api/native/transactions.js
  36. +47 −11 routes/api/native/verusbridge/verusbridge.js
  37. +20 −12 routes/api/native/verusbridge/vethconf.js
  38. +16 −12 routes/api/native/verusid/login/signResponse.js
  39. +4 −3 routes/api/native/verusid/login/verifyRequest.js
  40. +56 −0 routes/api/native/verusid/provision/signIdProvisioningRequest.js
  41. +50 −0 routes/api/native/verusid/provision/verifyIdProvisioningResponse.js
  42. +1 −0 routes/api/native/verusid/verusid.js
  43. +3 −5 routes/api/network/fees/btc/btcFees.js
  44. +1 −1 routes/api/network/fees/networkFees.js
  45. +0 −8 routes/api/pathsUtil.js
  46. +12 −4 routes/api/plugin/builtin/loginconsentui.js
  47. +1 −1 routes/api/plugin/start.js
  48. +5 −2 routes/api/rpc.js
  49. +16 −0 routes/api/utils/constants/daemons.js
  50. +9 −0 routes/api/utils/constants/dev_options.js
  51. +3 −1 routes/api/utils/constants/index.js
  52. +16 −7 routes/appConfig.js
  53. +6 −9 routes/chainParams.js
  54. +3 −4 routes/coinDataTranslated.js
  55. +7 −4 routes/deeplink/openurlhandler.js
  56. +1 −3 routes/ports.js
  57. +1 −1 routes/workers/openExternalSafe.js
  58. +0 −6 routes/zcashParamsSources.js
  59. +2 −2 version.json
  60. +1 −1 version_build
  61. +587 −379 yarn.lock
58 changes: 28 additions & 30 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
stages:
- build
- test
- deploy
- build
- test
- deploy
########################################################################################################################
####START#### PROJECT LEVEL VARIABLES ####START####
########################################################################################################################
variables:
DOCKER_DRIVER: overlay2
DEFAULT_VERUSCOIN_BRANCH: release
VERUS_VERSION: 1.0.12-2
VERUSCOIN_VERSION: 1.0.12-2
KOMODO_VERSION: 0.8.0
VERUS_VERSION: 1.2.7
VERUSCOIN_VERSION: 1.2.7
KOMODO_VERSION: 0.9.0
KOMODO_DOWNLOAD_URL: https://github.com/KomodoPlatform/komodo/releases/download
PIRATE_VERSION: 5.7.4
PIRATE_VERSION: 5.9.0
PIRATE_DOWNLOAD_URL: https://github.com/PirateNetwork/pirate/releases/download
BINARY_SOURCE: VerusCoin
VERUS_APPIMAGE_X64: Verus-Desktop-v${VERUS_VERSION}-x86_64.AppImage
@@ -41,8 +41,10 @@ build:linux:
stage: build
variables:
DOCKER_DRIVER: overlay2
KOMODO_CLI_PACKAGE: komodo_${KOMODO_VERSION}_linux.zip
PIRATE_CLI_PACKAGE: pirate-cli-ubuntu1804-v${PIRATE_VERSION}.zip
KOMODO_CLI_PACKAGE: komodo-${KOMODO_VERSION}-linux.tar.gz
KOMODO_CLI_SHA256: ed28bce09176c212c1eac9abf9fce41c948ef1199764b03b607a461146952107
PIRATE_CLI_PACKAGE: pirate-cli-ubuntu2004-v${PIRATE_VERSION}.zip
PIRATE_CLI_SHA256: 2358e992a6649517f6a72f790105468a22c5ae22302076b06f9c528b7c7c4788
before_script:
- echo "$AUTH_KEY" > AUTH_KEY.json &&
gcloud auth activate-service-account
@@ -64,14 +66,11 @@ build:linux:
- mkdir -p assets/bin/linux64/komodod
- mkdir -p assets/bin/linux64/pirated
- wget ${KOMODO_DOWNLOAD_URL}/v${KOMODO_VERSION}/${KOMODO_CLI_PACKAGE}
- unzip -j ${KOMODO_CLI_PACKAGE} komodod -d assets/bin/linux64/komodod
- unzip -j ${KOMODO_CLI_PACKAGE} komodo-cli -d assets/bin/linux64/komodod
- unzip -j ${KOMODO_CLI_PACKAGE} wallet-utility -d assets/bin/linux64/komodod
- echo "${KOMODO_CLI_SHA256} ${KOMODO_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- tar -xzvf ${KOMODO_CLI_PACKAGE} --directory assets/bin/linux64/komodod
- rm ${KOMODO_CLI_PACKAGE}
- gsutil cp $STAGING/VerusCoin/Zcash/zcashd-linux-x86_64.tar.gz .
- tar -xzvf zcashd-linux-x86_64.tar.gz --directory assets/bin/linux64/
- rm zcashd-linux-x86_64.tar.gz
- wget ${PIRATE_DOWNLOAD_URL}/v${PIRATE_VERSION}/${PIRATE_CLI_PACKAGE}
- echo "${PIRATE_CLI_SHA256} ${PIRATE_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- unzip ${PIRATE_CLI_PACKAGE} -d assets/bin/linux64/pirated
- rm ${PIRATE_CLI_PACKAGE}
- sed -i "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
@@ -105,6 +104,7 @@ build:linux:arm64:
variables:
DOCKER_DRIVER: overlay2
PIRATE_CLI_PACKAGE: pirate-cli-aarch64-v${PIRATE_VERSION}.zip
PIRATE_CLI_SHA256: c6a3b13881155fb11a8743a9d319254a0ca70f99c14382fb28384446fffe52c5
before_script:
- echo "$AUTH_KEY" > AUTH_KEY.json &&
gcloud auth activate-service-account
@@ -124,10 +124,8 @@ build:linux:arm64:
- gsutil cp $STAGING/$VERUS_CLI_LINUX .
- tar -xzvf Verus-CLI-Linux-v${VERUSCOIN_VERSION}-arm64.tar.gz --strip=1 --directory assets/bin/linux64/verusd
- rm Verus-CLI-Linux-v${VERUSCOIN_VERSION}-arm64.tar.gz
- gsutil cp $STAGING/VerusCoin/Zcash/zcashd-linux-arm64.tar.gz .
- tar -xzvf zcashd-linux-arm64.tar.gz --directory assets/bin/linux64/
- rm zcashd-linux-arm64.tar.gz
- wget ${PIRATE_DOWNLOAD_URL}/v${PIRATE_VERSION}/${PIRATE_CLI_PACKAGE}
- echo "${PIRATE_CLI_SHA256} ${PIRATE_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- unzip ${PIRATE_CLI_PACKAGE} -d assets/bin/linux64/pirated
- rm ${PIRATE_CLI_PACKAGE}
- sed -i "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
@@ -164,8 +162,10 @@ build:windows:
image: asherd/agama-builder:windows
variables:
DOCKER_DRIVER: overlay2
KOMODO_CLI_PACKAGE: komodo_${KOMODO_VERSION}_windows.zip
KOMODO_CLI_PACKAGE: komodo-${KOMODO_VERSION}-win.zip
KOMODO_CLI_SHA256: 0b36821ebccdaf6bc060dc31083e6d8f48f7f8bc35e519b127bf1ccc05cf9890
PIRATE_CLI_PACKAGE: pirate-cli-windows-v${PIRATE_VERSION}.zip
PIRATE_CLI_SHA256: deb338bf2bcabfdb32be3c13dfaed78d83749fbae9d3985e47cb001ff058bb3f
before_script:
- echo "$AUTH_KEY" > AUTH_KEY.json &&
gcloud auth activate-service-account
@@ -183,6 +183,7 @@ build:windows:
- mkdir -p assets/bin/win64/komodod
- mkdir -p assets/bin/win64/pirated
- wget ${KOMODO_DOWNLOAD_URL}/v${KOMODO_VERSION}/${KOMODO_CLI_PACKAGE}
- echo "${KOMODO_CLI_SHA256} ${KOMODO_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- unzip -j ${KOMODO_CLI_PACKAGE} komodod.exe -d assets/bin/win64/komodod
- unzip -j ${KOMODO_CLI_PACKAGE} komodo-cli.exe -d assets/bin/win64/komodod
- unzip -j ${KOMODO_CLI_PACKAGE} wallet-utility.exe -d assets/bin/win64/komodod
@@ -191,10 +192,8 @@ build:windows:
- unzip -qq Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip -d assets/bin/win64
- mv assets/bin/win64/verus-cli assets/bin/win64/verusd
- rm Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip
- gsutil cp $STAGING/VerusCoin/Zcash/zcashd-win.tar.gz .
- tar -xzvf zcashd-win.tar.gz --directory assets/bin/win64/
- rm zcashd-win.tar.gz
- wget ${PIRATE_DOWNLOAD_URL}/v${PIRATE_VERSION}/${PIRATE_CLI_PACKAGE}
- echo "${PIRATE_CLI_SHA256} ${PIRATE_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- unzip ${PIRATE_CLI_PACKAGE} -d assets/bin/win64/pirated
- rm ${PIRATE_CLI_PACKAGE}
- sed -i "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
@@ -228,10 +227,12 @@ build:windows:
########################################################################################################################
build:mac:
stage: build
tags: ["Big Sur"]
tags: ["Ventura"]
variables:
KOMODO_CLI_PACKAGE: komodo_${KOMODO_VERSION}_macos.zip
KOMODO_CLI_PACKAGE: komodo-${KOMODO_VERSION}-mac.zip
KOMODO_CLI_SHA256: 1a092af97b34f4e2ea99b95a91599fc4fdca3881c7e3afa468a5df043a460694
PIRATE_CLI_PACKAGE: pirate-cli-MacOS-v${PIRATE_VERSION}.zip
PIRATE_CLI_SHA256: c20a761c36e494cd2b19237162881bb0dcdae24e6eec996072cc5ee7135e8362
before_script:
- echo "$AUTH_KEY" > AUTH_KEY.json &&
gcloud auth activate-service-account
@@ -253,14 +254,11 @@ build:mac:
- tar -xzf Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz --strip=1 --directory assets/bin/osx/verusd
- rm Verus-CLI-MacOS-v${VERUSCOIN_VERSION}.tar.gz
- wget ${KOMODO_DOWNLOAD_URL}/v${KOMODO_VERSION}/${KOMODO_CLI_PACKAGE}
- unzip -j ${KOMODO_CLI_PACKAGE} komodod -d assets/bin/osx/komodod
- unzip -j ${KOMODO_CLI_PACKAGE} komodo-cli -d assets/bin/osx/komodod
- unzip -j ${KOMODO_CLI_PACKAGE} wallet-utility -d assets/bin/osx/komodod
- echo "${KOMODO_CLI_SHA256} ${KOMODO_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- tar -xzvf ${KOMODO_CLI_PACKAGE} --directory assets/bin/osx/komodod
- rm ${KOMODO_CLI_PACKAGE}
- gsutil cp $STAGING/VerusCoin/Zcash/zcashd-macos.tar.gz .
- tar -xzvf zcashd-macos.tar.gz --directory assets/bin/osx/
- rm zcashd-macos.tar.gz
- wget ${PIRATE_DOWNLOAD_URL}/v${PIRATE_VERSION}/${PIRATE_CLI_PACKAGE}
- echo "${PIRATE_CLI_SHA256} ${PIRATE_CLI_PACKAGE}" | sha256sum -c - || { echo "SHA-256 checksum does not match. Exiting."; exit 1; }
- unzip ${PIRATE_CLI_PACKAGE} -d assets/bin/osx/pirated
- rm ${PIRATE_CLI_PACKAGE}
- sed -i -e "s/process.env.INFURA_PROJECT_ID/'${INFURA_PROJECT_ID}'/g" keys/infura.js
2 changes: 1 addition & 1 deletion gui/Verus-Desktop-GUI
Submodule Verus-Desktop-GUI updated 35 files
+32 −26 react/package.json
+1 −1 react/src/components/modals/addCoin/selectCoin/selectCoin.render.js
+37 −19 react/src/components/modals/bridgekeeper/bridgekeeper.js
+46 −12 react/src/components/modals/bridgekeeper/bridgekeeper.render.js
+1 −1 react/src/components/modals/chainOptions/chainOptions.render.js
+6 −3 react/src/components/modals/convertCurrency/conversionOverview/conversionOverview.js
+1 −1 react/src/components/modals/convertCurrency/conversionOverview/conversionOverview.render.js
+187 −55 react/src/components/modals/convertCurrency/convertCurrencyForm/convertCurrencyForm.js
+124 −55 react/src/components/modals/convertCurrency/convertCurrencyForm/convertCurrencyForm.render.js
+0 −1 react/src/components/modals/operationInfo/operationInfo.js
+5 −1 react/src/components/postAuth/apps/mining/mining.js
+23 −6 react/src/components/postAuth/apps/mining/miningWallet/miningWallet.render.js
+31 −37 react/src/components/postAuth/apps/settings/coinSettings/coinSettings.js
+21 −26 react/src/components/postAuth/apps/settings/coinSettings/coinSettings.render.js
+1 −1 react/src/components/postAuth/apps/wallet/coinWallet/coinWallet.render.js
+2 −1 react/src/containers/CurrencyCard/CurrencyCard.js
+3 −3 react/src/containers/NetworkOverviewCard/NetworkOverviewCard.js
+10 −7 react/src/index.js
+2 −2 react/src/translate/coins.js
+11 −1 react/src/util/api/verusbridge/verusbridge.js
+16 −0 react/src/util/api/wallet/readCalls/estimateConversion.js
+10 −0 react/src/util/api/wallet/readCalls/estimateSendcurrencyFee.js
+2 −2 react/src/util/api/wallet/readCalls/getCurrencyConversionPaths.js
+2 −0 react/src/util/api/wallet/walletCalls.js
+1 −0 react/src/util/api/wallet/writeCalls/sendCoin.js
+0 −5 react/src/util/coinData.js
+0 −2 react/src/util/coinHelper.js
+1 −6 react/src/util/constants/coinDataDirectories.js
+4 −0 react/src/util/constants/componentConstants.js
+2 −1 react/src/util/constants/erc20Contracts.js
+0 −1 react/src/util/explorers.js
+1 −4 react/src/util/testutil/testConfig.js
+0 −2 react/webpack.config.js
+0 −208 react/webpack.prod.config.js
+1,476 −1,552 react/yarn.lock
17 changes: 10 additions & 7 deletions main.js
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ if (!hasLock) {

guiapp.use((req, res, next) => {
if (!appConfig.general.main.dev && !(process.argv.indexOf("devmode") > -1)) {
res.header("Access-Control-Allow-Origin", "http://127.0.0.1:3000");
res.header("Access-Control-Allow-Origin", "http://localhost:3000");
} else {
res.header("Access-Control-Allow-Origin", "*");
}
@@ -155,7 +155,7 @@ if (!hasLock) {
cors: {
origin:
appConfig.general.main.dev || process.argv.indexOf("devmode") > -1
? "http://127.0.0.1:3000"
? "http://localhost:3000"
: null,
methods: ["GET", "POST"],
},
@@ -298,8 +298,11 @@ if (!hasLock) {
createAppCloseWindow();
api.quitKomodod(appConfig.general.native.cliStopTimeout);

setInterval(() => {
if (!Object.keys(api.startedDaemonRegistry).length) {
setInterval(async () => {
if (
!Object.keys(api.startedDaemonRegistry).length &&
!(await api.isAnyDaemonRunning())
) {
closeApp();
}
}, 1000);
@@ -455,7 +458,7 @@ if (!hasLock) {

mainWindow.loadURL(
appConfig.general.main.dev || process.argv.indexOf("devmode") > -1
? "http://127.0.0.1:3000"
? "http://localhost:3000"
: `file://${__dirname}/gui/Verus-Desktop-GUI/react/build/index.html`
);

@@ -548,7 +551,7 @@ if (!hasLock) {
focusMain();

if (process.platform == "win32" || process.platform == "linux") {
const argIndex = (appConfig.general.main.dev || process.argv.indexOf("devmode") > -1) ? 2 : 1;
const argIndex = 2;
openurlhandler(null, argv.slice(1).toString().split(",")[argIndex], api.dlhandler);
}
}
@@ -559,7 +562,7 @@ if (!hasLock) {
app.on("second-instance", handleSecondInstance);

// Deep linking
if (appConfig.general.main.enableDeeplink) {
if (!appConfig.general.main.disableDeeplink) {
api.log("setting up deeplink", "init");
setuplink(app);
} else {
28 changes: 18 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "verus-desktop",
"productName": "Verus-Desktop",
"version": "1.0.12-2",
"version": "1.2.7",
"description": "Verus Desktop Wallet App",
"main": "main.js",
"scripts": {
@@ -38,29 +38,30 @@
"license": "MIT",
"devDependencies": {
"cross-env": "5.2.1",
"electron": "20.3.9",
"electron-builder": "23.6.0",
"electron": "22.3.25",
"electron-builder": "24.13.3",
"electron-devtools-installer": "3.2.0",
"tslint": "6.1.3",
"typescript": "4.4.4"
},
"dependencies": {
"@bitgo/utxo-lib": "git+https://github.com/VerusCoin/BitGoJS.git#utxo-lib-verus",
"@electron/remote": "1.1.0",
"@ethersproject/signing-key": "5.0.5",
"@xmldom/xmldom": "0.8.4",
"agama-wallet-lib": "git+https://github.com/VerusCoin/agama-wallet-lib.git#dev",
"arch": "2.1.0",
"async": "2.6.4",
"axios": "0.25.0",
"base64url": "https://github.com/michaeltout/base64url.git",
"axios": "1.6.5",
"base64url": "git+https://github.com/VerusCoin/base64url.git",
"bigi": "1.4.2",
"bitgo-utxo-lib": "git+https://github.com/VerusCoin/bitgo-utxo-lib.git",
"blake2b": "https://github.com/VerusCoin/blake2b.git",
"body-parser": "1.19.1",
"buffer-reverse": "1.0.1",
"coinselect": "github:bitcoinjs/coinselect",
"create-hash": "git+https://github.com/pbca26/createHash#electron-v4",
"crypto-js": "4.0.0",
"crypto-js": "4.2.0",
"csv-writer": "1.6.0",
"ethers": "5.1.0",
"ethers-michaeltout": "github:michaeltout/ethersjs-package",
@@ -77,12 +78,13 @@
"semver-compare": "1.0.0",
"sha256": "0.2.0",
"socket.io": "4.6.2",
"systeminformation": "5.13.5",
"systeminformation": "5.21.9",
"tx-builder": "^0.18.0",
"unzipper": "0.10.11",
"verus-typescript-primitives": "git+https://github.com/VerusCoin/verus-typescript-primitives.git",
"verus-wallet-endpoints": "git+https://github.com/VerusCoin/verus-wallet-endpoints.git",
"verus_bridgekeeper": "git+https://github.com/VerusCoin/verusbridgekeeper.git",
"verusd-rpc-ts-client": "git+https://github.com/VerusCoin/verusd-rpc-ts-client",
"wif": "2.0.6"
},
"optionalDependencies": {
@@ -133,7 +135,8 @@
"artifactName": "${productName}-v${version}-${arch}.${ext}",
"icon": "assets/icons/agama_icons",
"desktop": {
"Encoding": "UTF-8"
"Encoding": "UTF-8",
"MimeType": "x-scheme-handler/i5jtwbp6zymeay9llnraglgjqgdrffsau4"
},
"target": [
"appimage"
@@ -182,11 +185,16 @@
"ansi-regex": "5.0.1",
"qs": "6.2.4",
"debug": "2.6.9",
"follow-redirects": "1.14.8",
"follow-redirects": "1.15.4",
"fresh": "0.5.2",
"mime": "1.4.1",
"minimatch": "5.1.0",
"json-schema": "0.4.0",
"got": "11.8.5"
"got": "11.8.5",
"axios": "1.6.5",
"json5": "2.2.2",
"semver": "6.3.1",
"tough-cookie": "4.1.3",
"secp256k1": "3.8.1"
}
}
9 changes: 9 additions & 0 deletions routes/api.js
Original file line number Diff line number Diff line change
@@ -130,6 +130,8 @@ api = require('./api/native/callDaemon')(api);
api = require('./api/native/addresses')(api);
api = require('./api/native/balances')(api);
api = require('./api/native/definedchains')(api);
api = require('./api/native/getBlock.js')(api);
api = require('./api/native/getVdxfId.js')(api);
api = require('./api/native/info')(api);
api = require('./api/native/mininginfo')(api);
api = require('./api/native/getTransaction.js')(api);
@@ -147,6 +149,8 @@ api = require('./api/native/idUpdate.js')(api);
api = require('./api/native/idInformation.js')(api);
api = require('./api/native/getCurrencies.js')(api);
api = require('./api/native/getCurrency.js')(api);
api = require('./api/native/estimateSendcurrencyFee.js')(api);
api = require('./api/native/estimateConversion.js')(api);
api = require('./api/native/getConversionPaths.js')(api);
api = require('./api/native/currencyGraylist.js')(api);
api = require('./api/native/idRecovery.js')(api);
@@ -159,6 +163,8 @@ api = require('./api/native/shieldcoinbase.js')(api);
api = require('./api/native/verusid/verusid.js')(api);
api = require('./api/native/verusid/login/verifyRequest.js')(api);
api = require('./api/native/verusid/login/signResponse.js')(api);
api = require('./api/native/verusid/provision/signIdProvisioningRequest.js')(api);
api = require('./api/native/verusid/provision/verifyIdProvisioningResponse.js')(api);
api = require('./api/native/makeoffer')(api);
api = require('./api/native/getoffers')(api);
api = require('./api/native/closeoffers')(api);
@@ -170,6 +176,9 @@ api = require('./api/native/getNetworkGraph')(api);
api = require('./api/native/verusbridge/verusbridge.js')(api);
api = require('./api/native/verusbridge/vethconf.js')(api);

// lite
api = require('./api/getSignatureInfo.js')(api);

// general network calls
api.networkFees = {}
api.coinSupply = {}
12 changes: 12 additions & 0 deletions routes/api/binsUtils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const os = require('os');
const fsnode = require('fs');
const _fs = require('graceful-fs');
const { DAEMON_NAMES } = require('./utils/constants');
const exec = require('child_process').exec;

module.exports = (api) => {
@@ -63,5 +64,16 @@ module.exports = (api) => {
})
}

api.isAnyDaemonRunning = async () => {
for (const daemon of DAEMON_NAMES) {
if (await api.isDaemonRunning(daemon)) {
api.log(`${daemon} is currently running...`, 'native.process');
return true;
} else {
api.log(`${daemon} is not currently running...`, 'native.process');
}
}
}

return api;
};
Loading