Skip to content

Commit

Permalink
Merge branch 'nifty-wallet/develop' into nifty-wallet/feature/dcent-i…
Browse files Browse the repository at this point in the history
…ntegration
  • Loading branch information
SeungjunWe committed Jul 2, 2021
2 parents 320bacc + 7e0d424 commit f6e6f73
Show file tree
Hide file tree
Showing 151 changed files with 33,052 additions and 17,202 deletions.
44 changes: 0 additions & 44 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ workflows:
- test-unit:
requires:
- prep-deps-npm
# - test-integration-mascara-chrome:
# requires:
# - prep-deps-npm
# - prep-scss
# - test-integration-mascara-firefox:
# requires:
# - prep-deps-npm
# - prep-scss
- test-integration-flat-chrome:
requires:
- prep-deps-npm
Expand All @@ -53,8 +45,6 @@ workflows:
- test-unit
- test-e2e-chrome
# - test-e2e-firefox
# - test-integration-mascara-chrome
# - test-integration-mascara-firefox
- test-integration-flat-chrome
- test-integration-flat-firefox
- job-screens:
Expand Down Expand Up @@ -292,9 +282,6 @@ jobs:
key: build-cache-{{ .Revision }}
- restore_cache:
key: job-screens-{{ .Revision }}
- store_artifacts:
path: dist/mascara
destination: builds/mascara
- store_artifacts:
path: dist/sourcemaps
destination: builds/sourcemaps
Expand Down Expand Up @@ -380,37 +367,6 @@ jobs:
name: test:integration:flat
command: npm run test:flat

test-integration-mascara-firefox:
environment:
browsers: '["Firefox"]'
docker:
- image: circleci/node:10.19.0-browsers
steps:
- checkout
- restore_cache:
key: dependency-cache-firefox-{{ .Revision }}
- run:
name: Install firefox
command: ./.circleci/scripts/firefox-install
- restore_cache:
key: dependency-cache-{{ .Revision }}
- run:
name: test:integration:mascara
command: npm run test:mascara

test-integration-mascara-chrome:
environment:
browsers: '["Chrome"]'
docker:
- image: circleci/node:10.19.0-browsers
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ .Revision }}
- run:
name: test:integration:mascara
command: npm run test:mascara

all-tests-pass:
docker:
- image: circleci/node:10.19.0-browsers
Expand Down
3 changes: 0 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ app/vendor/**

ui/lib/blockies.js

mascara/src/app/first-time/spinner.js
mascara/test/jquery-3.1.0.min.js

test/integration/bundle.js
test/integration/jquery-3.1.0.min.js
test/integration/helpers.js
Expand Down
104 changes: 104 additions & 0 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: Nifty Wallet CI

on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop

jobs:
prep-deps-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: '10.x'
- name: Install npm 6 + deps via npm
run: |
sudo npm install -g npm@6.14.5 && npm install --no-save
test-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: '10.x'
- name: Install npm 6 + deps via npm
run: |
sudo npm install -g npm@6.14.5 && npm install --no-save
- name: lint
run: npm run lint

test-unit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: '10.x'
- name: Install npm 6 + deps via npm
run: |
sudo npm install -g npm@6.14.5 && npm install --no-save
- name: test:coverage
run: npm run test:coverage

# test-integration-flat-chrome:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v1
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: '10.x'
# - name: Install npm 6 + deps via npm
# run: |
# sudo npm install -g npm@6.14.5 && npm install --no-save
# - name: Enable Chrome
# run: |
# sudo apt-get update
# sudo apt-get install xvfb
# xvfb-run --auto-servernum npm test
# - name: test:integration:flat
# run: npm run test:flat
# env:
# browsers: '["Chrome"]'

# test-e2e-chrome:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v1
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: '10.x'
# - name: Install npm 6 + deps via npm
# run: |
# sudo npm install -g npm@6.14.5 && npm install --no-save
# - name: Enable Chrome
# run: |
# sudo apt-get update
# sudo apt-get install xvfb
# xvfb-run --auto-servernum npm test
# - name: build:dist
# run: NODE_ENV='production' npm run dist
# - name: build:debug
# run: find dist/ -type f -exec md5sum {} \; | sort -k 2
# - name: Install Chromedriver latest version
# run: |
# # sudo apt-get update
# # sudo apt-get install lsb-release libappindicator3-1
# curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
# sudo dpkg -i google-chrome.deb
# sudo sed -i 's|HERE/chrome"|HERE/chrome" --no-sandbox|g' /opt/google/chrome/google-chrome
# rm google-chrome.deb
# - name: test:e2e:chrome
# run: npm run test:e2e:chrome
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ notes.txt

.coveralls.yml
.nyc_output

.niftywalletrc
3 changes: 3 additions & 0 deletions .niftywalletrc.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
; Extra environment variables
ETH_MAINNET_RPC_ENDPOINT=00000000000
INFURA_PROJECT_ID=00000000000
1 change: 0 additions & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dist/
docs/
fonts/
images/
mascara/
node_modules/
notices/
test/
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,55 @@

## Current Master

## 5.2.5 Fri May 21 2021

- [#459](https://github.com/poanetwork/nifty-wallet/pull/459) - (Fix) Phishing detection

## 5.2.4 Sat Feb 27 2021

- [#451](https://github.com/poanetwork/nifty-wallet/pull/451) - (Fix) Fix export private key when switching between chains
- [#450](https://github.com/poanetwork/nifty-wallet/pull/450) - (Chore) Remove deprecated Infura network status check
- [#443](https://github.com/poanetwork/nifty-wallet/pull/443) - (Fix) Fire 'confirmation', 'receipt' events

## 5.2.3 Fri Jan 15 2021

- [#441](https://github.com/poanetwork/nifty-wallet/pull/441) - Replace Infura Mainnet endpoint with custom one

## 5.2.2 Tue Dec 29 2020

- [#437](https://github.com/poanetwork/nifty-wallet/pull/437) - Support getting proxy implementation address by following EIP-1967
- [#436](https://github.com/poanetwork/nifty-wallet/pull/436) - Allow master copy pattern in importing of proxy contract
- [#435](https://github.com/poanetwork/nifty-wallet/pull/435) - Allow array input type in contracts interactions
- [#434](https://github.com/poanetwork/nifty-wallet/pull/434) - Add support of tuple type at interaction with read-only contract methods
- [#432](https://github.com/poanetwork/nifty-wallet/pull/432) - bump rsk-contract-metadata dependency

## 5.2.1 Fri Dec 04 2020

- [#429](https://github.com/poanetwork/nifty-wallet/pull/429) - Allow Ledger signMessage method

## 5.2.0 Fri Nov 13 2020

- [#427](https://github.com/poanetwork/nifty-wallet/pull/427) - Fix support of eth_signTypedData_v4 (eip-712)
- [#426](https://github.com/poanetwork/nifty-wallet/pull/426) - Update inpage provider: add ethereum.request method support
- [#411](https://github.com/poanetwork/nifty-wallet/pull/411) - GitHub actions CI

## 5.1.6 Tue Oct 27 2020

- [#419](https://github.com/poanetwork/nifty-wallet/pull/419) - Add 10% margin for gas price in case of RSK chains

## 5.1.5 Tue Oct 20 2020

- [#416](https://github.com/poanetwork/nifty-wallet/pull/416) - Change Copy token address text
- [#415](https://github.com/poanetwork/nifty-wallet/pull/415) - Fix broken Blockscout's token transfers page link

## 5.1.4 Tue Aug 04 2020

Removal of webRequest permission was not applied in the previous version. Applying it here.

## 5.1.3 Tue Aug 04 2020

- [#407](https://github.com/poanetwork/nifty-wallet/pull/407) - Remove excess extension permissions: webRequest

## 5.1.2 Fri Jul 10 2020

- [#400](https://github.com/poanetwork/nifty-wallet/pull/400) - (Fix) Fix RNS resolving
Expand Down
3 changes: 1 addition & 2 deletions app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
"version": "5.1.2",
"version": "5.2.5",
"manifest_version": 2,
"author": "POA Network",
"description": "__MSG_appDescription__",
Expand Down Expand Up @@ -69,7 +69,6 @@
"http://localhost:8545/",
"https://*.infura.io/",
"activeTab",
"webRequest",
"*://*.eth/",
"notifications"
],
Expand Down
Loading

0 comments on commit f6e6f73

Please sign in to comment.