Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: replace goerli with sepolia #346

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
"stage-mainnet": [
"zksync-vue"
],
"prod-goerli": [
"goerli-wallet-zksync"
],
"goerli-beta": [
"goerli-beta-wallet-zksync"
"prod-sepolia": [
"sepolia-wallet-zksync"
]
}
},
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
network:
type: string
required: true
default: "goerli"
description: "target/env: mainnet, goerli, goerli-beta"
default: "sepolia"
description: "target/env: mainnet, sepolia"
jobs:
build_and_preview:
if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} || ${{ github.event.repository.full_name == github.repository }}
Expand All @@ -38,8 +38,8 @@ jobs:
run: |
yarn lint --max-warnings 0

- name: "Generate dist (default network: goerli)"
run: yarn run ci:build:goerli
- name: "Generate dist (default network: sepolia)"
run: yarn run ci:build:sepolia

- name: "Setup node@18"
uses: actions/setup-node@v2
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# [zkSync Wallet](https://wallet.zksync.io/)

[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/matter-labs/zksync-wallet-vue/blob/master/LICENSE-MIT) [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/matter-labs/zksync-wallet-vue/blob/master/LICENSE-APACHE) [![Live on Mainnet](https://img.shields.io/badge/wallet-Live%20on%20Mainnet-blue)](https://wallet.zksync.io) [![Live on Goerli](https://img.shields.io/badge/wallet-Live%20on%20Goerli-blue)](https://zksync.io?network=goerli)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/matter-labs/zksync-wallet-vue/blob/master/LICENSE-MIT) [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/matter-labs/zksync-wallet-vue/blob/master/LICENSE-APACHE) [![Live on Mainnet](https://img.shields.io/badge/wallet-Live%20on%20Mainnet-blue)](https://wallet.zksync.io) [![Live on Sepolia](https://img.shields.io/badge/wallet-Live%20on%20Sepolia-blue)](https://zksync.io?network=sepolia)


## Description

zkWallet was created to unleash the power of zkSync L2 operations and give everyone the access to L2 zkSync features. [Learn more](https://zksync.io/)

It's working perfectly on [**mainnet**](https://wallet.zksync.io) and [goerli](https://zksync.io?network=goerli), published and ready for mass adoption.
It's working perfectly on [**mainnet**](https://wallet.zksync.io) and [sepolia](https://zksync.io?network=sepolia), published and ready for mass adoption.

---

## Build Setup

``` bash
# install dependencies && populate .env file as of GOERLI connection (clear install)
# install dependencies && populate .env file as of Sepolia connection (clear install)
$ yarn ci:clear

# serve with hot reload at localhost:3000 [goerli]
# serve with hot reload at localhost:3000 [sepolia]
$ yarn dev
```

Expand Down
2 changes: 1 addition & 1 deletion cli-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if [ "$CATEGORY" == "dev" ]; then
fi
echo "Generating static html"
echo ""
yarn ci:build:goerli
yarn ci:build:sepolia
echo "Deploying to the firebase host for a day"
echo ""
firebase hosting:channel:deploy totest --only stage-mainnet --expires 1d
Expand Down
2 changes: 1 addition & 1 deletion cli-process-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Blue="\033[0;34m" # Blue
BBlue="\033[1;34m" # Bold Blue

if [ -z $NETWORK ]; then
NETWORK="goerli"
NETWORK="sepolia"
fi

if [ -z $ENV_VALUE ]; then
Expand Down
10 changes: 0 additions & 10 deletions environments/.env.goerli-beta

This file was deleted.

2 changes: 1 addition & 1 deletion environments/.env.goerli → environments/.env.sepolia
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_FORTMATIC=pk_test_6CCD7EB1D7A9D0DB
APP_PORTIS=68099bdc-3de9-4adc-ace0-e4664c1e77b4
ZK_NETWORK="goerli"
ZK_NETWORK="sepolia"
RAMP_MAINNET_HOST_API_KEY=j3b3oszn2vsr4qkz4att67zrucm6m6yjpfvxvtyy
UTORG_MAINNET_SID=zksynkio
MOONPAY_MAINNET_API_PUBLIC_KEY=pk_live_cS0AkN9LR0qquMUk9w4JGsaeoplwEuD
Expand Down
5 changes: 1 addition & 4 deletions environments/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ This directory contains your .env-files:
`Production`

* mainnet
* goerli

`Beta releases`
* goerli-beta
* sepolia
20 changes: 2 additions & 18 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
]
},
{
"target": "goerli-beta",
"target": "prod-sepolia",
"public": "public",
"ignore": [
"firebase.json",
Expand All @@ -78,23 +78,7 @@
{
"source": "**",
"type": 301,
"destination": "https://wallet.zksync.io?network=goerli-beta"
}
]
},
{
"target": "prod-goerli",
"public": "public",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"redirects": [
{
"source": "**",
"type": 301,
"destination": "https://wallet.zksync.io?network=goerli"
"destination": "https://wallet.zksync.io?network=sepolia"
}
]
},
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@inkline/nuxt": "^2.3.6",
"@matterlabs/eslint-config-nuxt": "^1.0.6",
"@matterlabs/prettier-config": "^1.0.2",
"@matterlabs/zksync-nuxt-core": "^1.12.1",
"@matterlabs/zksync-nuxt-core": "^1.12.3",
"@nuxt/typescript-runtime": "^2.1.0",
"@nuxtjs/google-gtag": "^1.0.4",
"@nuxtjs/sentry": "^5.1.7",
Expand All @@ -72,7 +72,7 @@
"nuxt-typed-vuex": "^0.3.0",
"oh-vue-icons": "^0.4.7",
"vue-qrcode": "0.4.0",
"zksync": "^0.13.1"
"zksync": "0.13.0"
},
"devDependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
Expand Down Expand Up @@ -131,17 +131,16 @@
"build": "yarn local && nuxt build",
"ci:build:dev-mainnet": "sh cli-process-env.sh 'mainnet' dev 1 && yarn generate",
"ci:build:prod": "yarn ci:prepare:mainnet && yarn generate",
"ci:build:goerli": "yarn ci:prepare:goerli && yarn generate",
"ci:build:goerli-beta": "yarn ci:prepare:goerli-beta && yarn generate",
"ci:build:sepolia": "yarn ci:prepare:sepolia && yarn generate",
"ci:check": "yarn lint && yarn spell-check",
"ci:prepare:mainnet": "sh cli-process-env.sh 'mainnet' prod 1",
"ci:prepare:goerli": "sh cli-process-env.sh 'goerli' prod 1",
"ci:prepare:sepolia": "sh cli-process-env.sh 'sepolia' prod 1",
"dev": "yarn local && nuxt",
"format": "prettier -w --ignore-path .eslintignore **/*.{ts,vue,ks}",
"generate": "nuxt generate --fail-on-error",
"lint": "eslint --config .eslintrc.js --ignore-path .eslintignore src/**/*.{ts,vue,js}",
"lint:fix": "eslint --fix --config .eslintrc.js --ignore-path .eslintignore src/**/*.{ts,vue,js} --fix",
"local": "sh ./cli-process-env.sh 'goerli' 'dev' 1 1",
"local": "sh ./cli-process-env.sh 'sepolia' 'dev' 1 1",
"postinstall": "husky install",
"semantic-release": "semantic-release",
"spell-check": "cspell -c cspell.json src/**/*.{ts,vue,js} *.md",
Expand Down
5 changes: 2 additions & 3 deletions src/blocks/modals/BalanceInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ export default Vue.extend({
etherscanDomain(): string {
const network: Network = this.$store.getters["zk-provider/network"];
switch (network) {
case "goerli":
case "goerli-beta":
return "goerli.etherscan.io";
case "sepolia":
return "sepolia.etherscan.io";
case "mainnet":
default:
return "etherscan.io";
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3550,9 +3550,9 @@ __metadata:
languageName: node
linkType: hard

"@matterlabs/zksync-nuxt-core@npm:^1.12.1":
version: 1.12.1
resolution: "@matterlabs/zksync-nuxt-core@npm:1.12.1"
"@matterlabs/zksync-nuxt-core@npm:^1.12.3":
version: 1.12.3
resolution: "@matterlabs/zksync-nuxt-core@npm:1.12.3"
dependencies:
"@nuxtjs/axios": ^5.13.1
"@walletconnect/web3-provider": ^1.8.0
Expand All @@ -3577,8 +3577,8 @@ __metadata:
nuxt: ^2.15.3
ts-node: ^9.1.1
web3: ^1.5.3
zksync: ^0.13.1
checksum: bf0b428afec60f5835e23cc21bfcbd5e813a4503252fc703bc18fa8bc8fafbe8d5f068454366d7be6453762d88484cb1c0fee8b375a227337e3e29d7122093d2
zksync: 0.13.0
checksum: 61c115ca33fecc8f2481f840e539ad89bd585b6eed2ebbbfa5025c245c38e4ff532fb108f9a638e071308827373ce2b715417e41a549226076d53f4266ff259f
languageName: node
linkType: hard

Expand All @@ -3596,7 +3596,7 @@ __metadata:
"@inkline/nuxt": ^2.3.6
"@matterlabs/eslint-config-nuxt": ^1.0.6
"@matterlabs/prettier-config": ^1.0.2
"@matterlabs/zksync-nuxt-core": ^1.12.1
"@matterlabs/zksync-nuxt-core": ^1.12.3
"@nuxt/types": ^2.15.8
"@nuxt/typescript-build": ^2.1.0
"@nuxt/typescript-runtime": ^2.1.0
Expand Down Expand Up @@ -3635,7 +3635,7 @@ __metadata:
semantic-release: ^19.0.2
stylelint-config-standard-scss: ^3.0.0
vue-qrcode: 0.4.0
zksync: ^0.13.1
zksync: 0.13.0
peerDependencies:
"@ethersproject/hash": ^5.5.0
dependenciesMeta:
Expand Down Expand Up @@ -25745,9 +25745,9 @@ __metadata:
languageName: node
linkType: hard

"zksync@npm:^0.13.1":
version: 0.13.1
resolution: "zksync@npm:0.13.1"
"zksync@npm:0.13.0":
version: 0.13.0
resolution: "zksync@npm:0.13.0"
dependencies:
axios: ^0.21.2
websocket: ^1.0.30
Expand All @@ -25756,6 +25756,6 @@ __metadata:
peerDependencies:
"@ethersproject/logger": ^5.4.0
ethers: ^5.4.4
checksum: dee05af41b15a5c89aafa0cebc3647895baa13bb5a06f37178fa98e499229224b649b1eee3d86f60967167cad8ab49e9a6d97c96a5029734c41e645ed1e99859
checksum: a9e3b32e2e48d941f60b8e2a1aae7e283b40440b62610935fcf02b8e27a235a284a263a8d03f298bfa29e67c190589d074da6a90220b4b957944670bcf0d75ea
languageName: node
linkType: hard
Loading