Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

Commit

Permalink
chore: stage 2.9.2 (#2214)
Browse files Browse the repository at this point in the history
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Alex Barnsley <[email protected]>
Co-authored-by: Breno Polanski <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Brian Faust <[email protected]>
Co-authored-by: Edgar Goetzendorff <[email protected]>
Co-authored-by: Brian Faust <[email protected]>
Co-authored-by: Simon <[email protected]>
Co-authored-by: Davi Figueiredo <[email protected]>
  • Loading branch information
10 people authored Jun 22, 2020
1 parent 4e5c4a8 commit 2839d3e
Show file tree
Hide file tree
Showing 139 changed files with 3,629 additions and 2,997 deletions.
4 changes: 3 additions & 1 deletion .electron-vue/dev-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const webpack = require('webpack')
const WebpackDevServer = require('webpack-dev-server')
const webpackHotMiddleware = require('webpack-hot-middleware')

const HtmlWebpackPlugin = require('html-webpack-plugin')

const mainConfig = require('./webpack.main.config')
const rendererConfig = require('./webpack.renderer.config')

Expand Down Expand Up @@ -50,7 +52,7 @@ function startRenderer () {
})

compiler.hooks.compilation.tap('compilation', compilation => {
compilation.hooks.htmlWebpackPluginAfterEmit.tapAsync('html-webpack-plugin-after-emit', (data, cb) => {
HtmlWebpackPlugin.getHooks(compilation).afterEmit.tapAsync('html-webpack-plugin-after-emit', (data, cb) => {
hotMiddleware.publish({ action: 'reload' })
cb()
})
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/draft-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
Expand Down Expand Up @@ -46,20 +46,20 @@ jobs:
# - name: Upload .AppImage
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-linux-2.9.1.AppImage
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage
# name: ark-desktop-wallet-linux-2.9.2.AppImage
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage

# - name: Upload .tar.gz
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-linux-2.9.1.tar.gz
# path: build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz
# name: ark-desktop-wallet-linux-2.9.2.tar.gz
# path: build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz

- name: Upload .deb
uses: actions/upload-artifact@master
with:
name: ark-desktop-wallet-linux-2.9.1-${{ github.sha }}.deb
path: build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb
name: ark-desktop-wallet-linux-2.9.2-${{ github.sha }}.deb
path: build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb

build-macOS:
runs-on: macos-latest
Expand All @@ -69,7 +69,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
Expand Down Expand Up @@ -102,14 +102,14 @@ jobs:
# - name: Upload .zip
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-mac-2.9.1.zip
# path: build/target/ark-desktop-wallet-mac-2.9.1.zip
# name: ark-desktop-wallet-mac-2.9.2.zip
# path: build/target/ark-desktop-wallet-mac-2.9.2.zip

- name: Upload .dmg
uses: actions/upload-artifact@v1
with:
name: ark-desktop-wallet-mac-2.9.1-${{ github.sha }}.dmg
path: build/target/ark-desktop-wallet-mac-2.9.1.dmg
name: ark-desktop-wallet-mac-2.9.2-${{ github.sha }}.dmg
path: build/target/ark-desktop-wallet-mac-2.9.2.dmg

build-windows:
runs-on: windows-latest
Expand All @@ -119,7 +119,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
Expand All @@ -137,5 +137,5 @@ jobs:
- name: Upload .exe
uses: actions/upload-artifact@v1
with:
name: ark-desktop-wallet-win-2.9.1-${{ github.sha }}.exe
path: build/target/ark-desktop-wallet-win-2.9.1.exe
name: ark-desktop-wallet-win-2.9.2-${{ github.sha }}.exe
path: build/target/ark-desktop-wallet-win-2.9.2.exe
48 changes: 24 additions & 24 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
name: Format

on:
pull_request:
paths:
- '**.css'
- '**.js'
- '**.ts'
- '**.vue'
pull_request:
paths:
- "**.css"
- "**.js"
- "**.ts"
- "**.vue"

jobs:
eslint:
runs-on: ubuntu-latest
eslint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
steps:
- uses: actions/checkout@v1

- name: Update System
run: sudo apt-get update
- name: Update System
run: sudo apt-get update

- name: Ledger
run: sudo apt-get install libudev-dev libusb-1.0-0-dev
- name: Ledger
run: sudo apt-get install libudev-dev libusb-1.0-0-dev

- name: Install
run: yarn global add node-gyp && yarn install --frozen-lockfile && npm rebuild
- name: Install
run: yarn global add node-gyp && yarn install --frozen-lockfile && npm rebuild

- name: Run eslint
run: yarn lint:fix
- name: Run eslint
run: yarn lint:fix

- uses: stefanzweifel/git-auto-commit-action@v2.1.0
with:
commit_message: "style: resolve style guide violations"
branch: ${{ github.head_ref }}
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
- uses: stefanzweifel/git-auto-commit-action@v4.1.2
with:
commit_message: "style: resolve style guide violations"
branch: ${{ github.head_ref }}
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
31 changes: 20 additions & 11 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ jobs:
RELEASE_VERSION=$(cat package.json | jq -r '.version')
echo "::set-output name=version::${RELEASE_VERSION}"
- name: Determine the release changelog
id: derive_release_changelog
run: |
CURRENT_VERSION=$(jq -r '.tag_name' <(curl https://api.github.com/repos/ArkEcosystem/desktop-wallet/releases/latest -s))
CHANGELOG_URL=$(echo "${{ secrets.CHANGELOG_SOURCE }}" | sed "s/__VERSION__/${CURRENT_VERSION}/g")
CHANGELOG=$(curl -s $CHANGELOG_URL)
echo "::set-output name=body::${CHANGELOG}"
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand All @@ -29,6 +37,7 @@ jobs:
release_name: Version ${{ steps.derive_release_version.outputs.version }}
draft: true
prerelease: false
body: ${{ steps.derive_release_changelog.outputs.body }}

publish-linux:
needs: ["create-release"]
Expand Down Expand Up @@ -73,28 +82,28 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Calculate Checksums for AppImage
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage

- name: Calculate Checksums for TAR
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz
run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz

- name: Calculate Checksums for DEB
run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb
run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb

- name: VirusTotal Scan for AppImage
run: |
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage' | jq -r .permalink
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage' | jq -r .permalink
- name: VirusTotal Scan for TAR
run: |
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz' | jq -r .permalink
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz' | jq -r .permalink
- name: VirusTotal Scan for DEB
run: |
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb' | jq -r .permalink
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb' | jq -r .permalink
publish-macos:
needs: ["create-release"]
Expand Down Expand Up @@ -139,20 +148,20 @@ jobs:
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

- name: Calculate Checksums for DMG
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.1.dmg
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.2.dmg

- name: Calculate Checksums for ZIP
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.1.zip
run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.2.zip

- name: VirusTotal Scan for DMG
run: |
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.1.dmg' | jq -r .permalink
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.2.dmg' | jq -r .permalink
- name: VirusTotal Scan for ZIP
run: |
UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.1.zip' | jq -r .permalink
curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.2.zip' | jq -r .permalink
publish-windows:
needs: ["create-release"]
Expand Down Expand Up @@ -190,5 +199,5 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Calculate Checksums for EXE
run: Get-FileHash build/target/ark-desktop-wallet-win-2.9.1.exe -Algorithm SHA256 | Format-List
run: Get-FileHash build/target/ark-desktop-wallet-win-2.9.2.exe -Algorithm SHA256 | Format-List
shell: powershell
32 changes: 16 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
Expand Down Expand Up @@ -90,20 +90,20 @@ jobs:
# - name: Upload .AppImage
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-linux-2.9.1.AppImage
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage
# name: ark-desktop-wallet-linux-2.9.2.AppImage
# path: build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage

# - name: Upload .tar.gz
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-linux-2.9.1.tar.gz
# path: build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz
# name: ark-desktop-wallet-linux-2.9.2.tar.gz
# path: build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz

- name: Upload .deb
uses: actions/upload-artifact@master
with:
name: ark-desktop-wallet-linux-2.9.1-${{ github.sha }}.deb
path: build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb
name: ark-desktop-wallet-linux-2.9.2-${{ github.sha }}.deb
path: build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb

build-macOS:
runs-on: macos-latest
Expand All @@ -113,7 +113,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v1
Expand All @@ -138,14 +138,14 @@ jobs:
# - name: Upload .zip
# uses: actions/upload-artifact@master
# with:
# name: ark-desktop-wallet-mac-2.9.1.zip
# path: build/target/ark-desktop-wallet-mac-2.9.1.zip
# name: ark-desktop-wallet-mac-2.9.2.zip
# path: build/target/ark-desktop-wallet-mac-2.9.2.zip

- name: Upload .dmg
uses: actions/upload-artifact@v1
with:
name: ark-desktop-wallet-mac-2.9.1-${{ github.sha }}.dmg
path: build/target/ark-desktop-wallet-mac-2.9.1.dmg
name: ark-desktop-wallet-mac-2.9.2-${{ github.sha }}.dmg
path: build/target/ark-desktop-wallet-mac-2.9.2.dmg

build-windows:
runs-on: windows-latest
Expand All @@ -155,7 +155,7 @@ jobs:
node-version: [12.x]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
Expand All @@ -173,5 +173,5 @@ jobs:
- name: Upload .exe
uses: actions/upload-artifact@v1
with:
name: ark-desktop-wallet-win-2.9.1-${{ github.sha }}.exe
path: build/target/ark-desktop-wallet-win-2.9.1.exe
name: ark-desktop-wallet-win-2.9.2-${{ github.sha }}.exe
path: build/target/ark-desktop-wallet-win-2.9.2.exe
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ brew cask install ark-desktop-wallet

## Translations

Translations are no longer accepted for the Desktop Wallet. Our plan is to use plugins to provide languages in the near future.
Translations are no longer accepted for the Desktop Wallet. We are using plugins to provide languages.

## Development

Expand Down Expand Up @@ -114,15 +114,6 @@ yarn test:e2e

# Build the application and run end-to-end tests
yarn test:e2e:full

# List what translations are missing or unused on a specific language. It could capture suggestions that are not accurate
yarn i18n 'src/renderer/i18n/locales/LANGUAGE.js'

# List what English messages are missing or unused (English is the default language)
yarn i18n:en-US

# List what translations are missing or unused on every language
yarn i18n:all
```

</details>
Expand Down
2 changes: 2 additions & 0 deletions __tests__/unit/__mocks__/@arkecosystem/ledger-transport.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ export class ARKTransport {
constructor () {
this.getPublicKey = jest.fn(() => '0278a28d0eac9916ef46613d9dbac706acc218e64864d4b4c1fcb0c759b6205b2b')
this.signMessage = jest.fn(() => 'SIGNATURE')
this.signMessageWithSchnorr = jest.fn(() => 'SIGNATURE')
this.signTransaction = jest.fn(() => 'SIGNATURE')
this.signTransactionWithSchnorr = jest.fn(() => 'SIGNATURE')
this.getVersion = jest.fn(() => '1.0.0')
}
}
Loading

0 comments on commit 2839d3e

Please sign in to comment.