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 #142

Open
wants to merge 4 commits into
base: main
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
4 changes: 2 additions & 2 deletions .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"prod-mainnet": [
"zsync-dapp-checkout"
],
"prod-goerli": [
"goerli-checkout-zksync"
"prod-sepolia": [
"sepolia-checkout-zksync-lite"
],
"staging": [
"staging-checkout-v1-zksync"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
yarn lint --max-warnings 0

- name: "Build: dapp"
run: yarn run ci:build:goerli
run: yarn run ci:build:sepolia

- name: "Setup node@18"
uses: actions/setup-node@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: "Deploy production"
default: "main"
preview_env:
type: string
description: "Test on goerli or mainnet"
description: "Test on sepolia or mainnet"
required: true
default: "goerli"
default: "sepolia"
jobs:
build_and_preview:
if: ${{ github.event.repository.full_name == github.repository }}
Expand Down Expand Up @@ -102,8 +102,8 @@ jobs:
with:
node-version: 16

- name: "Build goerli"
run: yarn run ci:build:goerli
- name: "Build sepolia"
run: yarn run ci:build:sepolia

- name: "Setup node@18"
uses: actions/setup-node@v2
Expand All @@ -114,6 +114,6 @@ jobs:
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_ZSYNC_DAPP_CHECKOUT_PROD }}"
target: "prod-goerli"
target: "prod-sepolia"
projectId: zsync-dapp-checkout
channelID: live
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
run: |
yarn lint --max-warnings 0

- name: "Deploy target: goerli"
run: yarn run ci:build:goerli
- name: "Deploy target: sepolia"
run: yarn run ci:build:sepolia

- name: "Setup node@18"
uses: actions/setup-node@v2
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Resource targets for the zkCheckout are:
### Available Hosts

* [```prod-mainnet```](https://checkout.zksync.io)
* [```prod-goerli```](https://checkout-goerli.zksync.io)
* [```prod-sepolia```](https://checkout-sepolia.zksync.io)
* [```staging```](https://staging-checkout-v1.zksync.dev/link)

## Initial Setup / Static version generation
Expand All @@ -23,11 +23,11 @@ Resource targets for the zkCheckout are:
# install dependencies
$ sh cli-dev.sh ci

# Populate .env file as of goerli connection && serve with hot reload at localhost:3000
# Populate .env file as of sepolia connection && serve with hot reload at localhost:3000
$ yarn dev

# static version generation
$ yarn ci:build:goerli
$ yarn ci:build:sepolia
# afterward you'll have prepared distributive in /public folder

# generate static for the mainnet release
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
1 change: 0 additions & 1 deletion environments/.env.mainnet
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ ZK_NETWORK="mainnet"
UNS_KEY=356a3eb3-d413-490a-94ac-4c9bb312ff49

RAMP_MAINNET_HOST_API_KEY=j3b3oszn2vsr4qkz4att67zrucm6m6yjpfvxvtyy
RAMP_GOERLI_HOST_API_KEY=pcrtzve8ax7vjamoct77ombequtqhuxbc8wdknwg
RAMP_SEPOLIA_HOST_API_KEY=85quy9gjwceh3rnca2nffo6wq67q776u6rjkyajf

5 changes: 2 additions & 3 deletions environments/.env.goerli → environments/.env.sepolia
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ APP_INFURA_API_KEY=f60769ea380544dfa0d2c28bdf869a38
APP_ONBOARDING_APP_ID=c4b83f7e-9bea-40d8-ad61-539f800863ee
APP_FORTMATIC=pk_test_6CCD7EB1D7A9D0DB
APP_PORTIS=68099bdc-3de9-4adc-ace0-e4664c1e77b4
APP_CURRENT_NETWORK=goerli
ZK_NETWORK="goerli"
APP_CURRENT_NETWORK=sepolia
ZK_NETWORK="sepolia"

UNS_KEY=356a3eb3-d413-490a-94ac-4c9bb312ff49

RAMP_MAINNET_HOST_API_KEY=j3b3oszn2vsr4qkz4att67zrucm6m6yjpfvxvtyy
RAMP_GOERLI_HOST_API_KEY=pcrtzve8ax7vjamoct77ombequtqhuxbc8wdknwg
RAMP_SEPOLIA_HOST_API_KEY=85quy9gjwceh3rnca2nffo6wq67q776u6rjkyajf

2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
]
},
{
"target": "prod-goerli",
"target": "prod-sepolia",
"public": "public",
"ignore": [
"firebase.json",
Expand Down
2 changes: 1 addition & 1 deletion nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ const config: NuxtConfig = {
anonymize_ip: true, // anonymize IP
send_page_view: isProduction, // might be necessary to avoid duplicated page track on page reload
linker: {
domains: ["checkout.zksync.io", "checkout-goerli.zksync.io", "web.app"],
domains: ["checkout.zksync.io", "checkout-sepolia.zksync.io", "web.app"],
},
},
debug: isDebugEnabled, // enable to track in dev mode
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@commitlint/config-conventional": "^16.0.0",
"@matterlabs/eslint-config-nuxt": "^2.0.0",
"@matterlabs/prettier-config": "^1.0.2",
"@matterlabs/zksync-nuxt-core": "^1.12.1",
"@matterlabs/zksync-nuxt-core": "^1.12.3",
"@matterlabs/zksync-nuxt-ui": "^0.0.0",
"@nuxt/types": "^2.15.7",
"@nuxt/typescript-build": "^2.1.0",
Expand Down Expand Up @@ -101,7 +101,7 @@
"vue": "^2.6.12",
"vue-custom-scrollbar": "^1.4.0",
"vue-js-popover": "^1.2.1",
"zksync": "^0.13.1",
"zksync": "0.13.0",
"zksync-checkout": "latest",
"zksync-checkout-internal": "latest"
},
Expand All @@ -121,15 +121,15 @@
"*.{md,vue}": "yarn lint:spell-check"
},
"scripts": {
"local": "yarn ci:env 'goerli' 'dev' 1 1",
"local": "yarn ci:env 'sepolia' 'dev' 1 1",
"dev": "yarn local && nuxt",
"generate": "nuxt generate ",
"start": "yarn local && nuxt start",
"build": "yarn local && nuxt build",
"ci:build:mainnet": "yarn ci:prepare:mainnet && yarn generate --fail-on-error",
"ci:build:goerli": "yarn ci:prepare:goerli && yarn generate --fail-on-error",
"ci:build:sepolia": "yarn ci:prepare:sepolia && yarn generate --fail-on-error",
"ci:env": "sh cli-process-env.sh",
"ci:prepare:goerli": "yarn ci:env 'goerli' 'prod' 1",
"ci:prepare:sepolia": "yarn ci:env 'sepolia' 'prod' 1",
"ci:prepare:mainnet": "yarn ci:env 'mainnet' 'prod' 1",
"format:prettier": "prettier --config .prettierrc --ignore-path .prettierignore --write ./src/**/*.{ts,vue,js,scss,css}",
"lint:spell-check": "cspell src/**/*.{ts,vue,js} README.md",
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const rampConfig: ZKIRampConfig = {
url: undefined, // default
hostApiKey: process.env.RAMP_MAINNET_HOST_API_KEY as string,
},
goerli: {
sepolia: {
url: undefined,
hostApiKey: process.env.RAMP_GOERLI_HOST_API_KEY as string,
hostApiKey: process.env.RAMP_SEPOLIA_HOST_API_KEY as string,
},
};
2 changes: 1 addition & 1 deletion src/static/ilol48zhg7zypovk.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ <h2>Initiate and launch the checkout for testing purposes</h2>
<div style="display: flex;
justify-content: space-between;
align-items: center">
<button onclick="f('goerli')" style="background-color: blueviolet">Start “goerli” testing</button>
<button onclick="f('sepolia')" style="background-color: blueviolet">Start “sepolia” testing</button>
</div>
</div>
<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion src/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ export type ZKISingleRampConfig = {
hostApiKey: string;
};
export type ZKIRampConfig = {
goerli: ZKISingleRampConfig;
sepolia: ZKISingleRampConfig;
mainnet: ZKISingleRampConfig;
};
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3133,7 +3133,7 @@ __metadata:
"@commitlint/config-conventional": ^16.0.0
"@matterlabs/eslint-config-nuxt": ^2.0.0
"@matterlabs/prettier-config": ^1.0.2
"@matterlabs/zksync-nuxt-core": ^1.12.1
"@matterlabs/zksync-nuxt-core": ^1.12.3
"@matterlabs/zksync-nuxt-ui": ^0.0.0
"@nuxt/types": ^2.15.7
"@nuxt/typescript-build": ^2.1.0
Expand Down Expand Up @@ -3175,15 +3175,15 @@ __metadata:
vue: ^2.6.12
vue-custom-scrollbar: ^1.4.0
vue-js-popover: ^1.2.1
zksync: ^0.13.1
zksync: 0.13.0
zksync-checkout: latest
zksync-checkout-internal: latest
languageName: unknown
linkType: soft

"@matterlabs/zksync-nuxt-core@npm:^1.12.1":
version: 1.12.1
resolution: "@matterlabs/zksync-nuxt-core@npm:1.12.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2F%40matterlabs%2Fzksync-nuxt-core%2F-%2Fzksync-nuxt-core-1.12.1.tgz"
"@matterlabs/zksync-nuxt-core@npm:^1.12.3":
version: 1.12.3
resolution: "@matterlabs/zksync-nuxt-core@npm:1.12.3::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2F%40matterlabs%2Fzksync-nuxt-core%2F-%2Fzksync-nuxt-core-1.12.3.tgz"
dependencies:
"@nuxtjs/axios": ^5.13.1
"@walletconnect/web3-provider": ^1.8.0
Expand All @@ -3208,8 +3208,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 Down Expand Up @@ -26160,9 +26160,9 @@ __metadata:
languageName: node
linkType: hard

"zksync@npm:^0.13.1":
version: 0.13.1
resolution: "zksync@npm:0.13.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fzksync%2F-%2Fzksync-0.13.1.tgz"
"zksync@npm:0.13.0":
version: 0.13.0
resolution: "zksync@npm:0.13.0::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fzksync%2F-%2Fzksync-0.13.0.tgz"
dependencies:
axios: ^0.21.2
websocket: ^1.0.30
Expand All @@ -26171,7 +26171,7 @@ __metadata:
peerDependencies:
"@ethersproject/logger": ^5.4.0
ethers: ^5.4.4
checksum: dee05af41b15a5c89aafa0cebc3647895baa13bb5a06f37178fa98e499229224b649b1eee3d86f60967167cad8ab49e9a6d97c96a5029734c41e645ed1e99859
checksum: a9e3b32e2e48d941f60b8e2a1aae7e283b40440b62610935fcf02b8e27a235a284a263a8d03f298bfa29e67c190589d074da6a90220b4b957944670bcf0d75ea
languageName: node
linkType: hard

Expand Down
Loading