diff --git a/.firebaserc b/.firebaserc index 72b48e2ed..936ba0bac 100644 --- a/.firebaserc +++ b/.firebaserc @@ -8,11 +8,8 @@ "stage-mainnet": [ "zksync-vue" ], - "prod-goerli": [ - "goerli-wallet-zksync" - ], - "goerli-beta": [ - "goerli-beta-wallet-zksync" + "prod-sepolia": [ + "sepolia-wallet-zksync" ] } }, diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 80e60513c..d11bdb664 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -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 }} @@ -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 diff --git a/README.md b/README.md index edb379080..5a676dc3a 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/cli-dev.sh b/cli-dev.sh index 74d6bf5e0..d46cd752d 100644 --- a/cli-dev.sh +++ b/cli-dev.sh @@ -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 diff --git a/cli-process-env.sh b/cli-process-env.sh index b25a11094..715748aef 100644 --- a/cli-process-env.sh +++ b/cli-process-env.sh @@ -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 diff --git a/environments/.env.goerli-beta b/environments/.env.goerli-beta deleted file mode 100755 index d6a093fd9..000000000 --- a/environments/.env.goerli-beta +++ /dev/null @@ -1,10 +0,0 @@ -APP_FORTMATIC=pk_test_6CCD7EB1D7A9D0DB -APP_PORTIS=68099bdc-3de9-4adc-ace0-e4664c1e77b4 -ZK_NETWORK="goerli-beta" -RAMP_MAINNET_HOST_API_KEY=j3b3oszn2vsr4qkz4att67zrucm6m6yjpfvxvtyy -UTORG_MAINNET_SID=zksynkio -MOONPAY_MAINNET_API_PUBLIC_KEY=pk_live_cS0AkN9LR0qquMUk9w4JGsaeoplwEuD -MIXPANEL_TOKEN=5600dbc62a772c26f25b8df97ee54701 -UNS_KEY=356a3eb3-d413-490a-94ac-4c9bb312ff49 -FIREBASE_FUNCTIONS_BASE_URL=https://us-central1-zksync-vue.cloudfunctions.net/ -SCREENING_API_URL=https://us-central1-screening-service.cloudfunctions.net/validate \ No newline at end of file diff --git a/environments/.env.goerli b/environments/.env.sepolia similarity index 99% rename from environments/.env.goerli rename to environments/.env.sepolia index 35a3298fb..e938387ed 100755 --- a/environments/.env.goerli +++ b/environments/.env.sepolia @@ -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 diff --git a/environments/README.md b/environments/README.md index 78d49ca47..106964efa 100644 --- a/environments/README.md +++ b/environments/README.md @@ -6,7 +6,4 @@ This directory contains your .env-files: `Production` * mainnet -* goerli - -`Beta releases` -* goerli-beta +* sepolia diff --git a/firebase.json b/firebase.json index 22ebe9c50..9d3e5119e 100644 --- a/firebase.json +++ b/firebase.json @@ -67,7 +67,7 @@ ] }, { - "target": "goerli-beta", + "target": "prod-sepolia", "public": "public", "ignore": [ "firebase.json", @@ -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" } ] }, diff --git a/package.json b/package.json index a9c79c83e..105b851e7 100755 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", diff --git a/src/blocks/modals/BalanceInfo.vue b/src/blocks/modals/BalanceInfo.vue index 11d19996c..00d3a0901 100644 --- a/src/blocks/modals/BalanceInfo.vue +++ b/src/blocks/modals/BalanceInfo.vue @@ -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"; diff --git a/yarn.lock b/yarn.lock index 24f4cc597..c52f5b92b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -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 @@ -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 @@ -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: @@ -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 @@ -25756,6 +25756,6 @@ __metadata: peerDependencies: "@ethersproject/logger": ^5.4.0 ethers: ^5.4.4 - checksum: dee05af41b15a5c89aafa0cebc3647895baa13bb5a06f37178fa98e499229224b649b1eee3d86f60967167cad8ab49e9a6d97c96a5029734c41e645ed1e99859 + checksum: a9e3b32e2e48d941f60b8e2a1aae7e283b40440b62610935fcf02b8e27a235a284a263a8d03f298bfa29e67c190589d074da6a90220b4b957944670bcf0d75ea languageName: node linkType: hard