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

Merge sepolia into mainnet #933

Merged
merged 30 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0769d42
Auto-merge prod back to dev [bot]
actions-user Jan 5, 2024
12a0520
Auto merge #913  [bot]
zzq0826 Jan 5, 2024
f775882
Auto squash #914  [bot]
zzq0826 Jan 5, 2024
2e7a854
upgrade: node 16.x -> node 20.x
Holybasil Jan 5, 2024
402beae
upgrade: browserslist from >0.2% to >0.5%
Holybasil Jan 5, 2024
958db25
doc: update readme.MD
Holybasil Jan 8, 2024
61a8169
Merge pull request #911 from scroll-tech/upgrade-nodejs
Holybasil Jan 9, 2024
8bc3b00
Fix warning (#907)
zzq0826 Jan 9, 2024
559539a
Bridge history refactor (#896)
zzq0826 Jan 10, 2024
2917d8c
Update transation storagekey
zzq0826 Jan 10, 2024
5f7fb82
Update bridge history api fields (#917)
zzq0826 Jan 11, 2024
1f3a634
Auto-merge prod back to dev [bot]
actions-user Jan 17, 2024
fab9303
Auto merge #920  [bot]
zzq0826 Jan 17, 2024
b1e8cde
Auto squash #921  [bot]
zzq0826 Jan 17, 2024
13f338f
fix: support long list
Holybasil Jan 15, 2024
f83ba4c
fix: measure only when getting the final height
Holybasil Jan 18, 2024
ae5b3bb
Merge pull request #918 from scroll-tech/virtualized-list
Holybasil Jan 18, 2024
cecf1ee
feat: change bridge-history backend api to v2 (#922)
colinlyguo Jan 20, 2024
3ead151
fix typos (#925)
colinlyguo Jan 23, 2024
c5a80c2
fix: custom navbar bg color
Holybasil Jan 23, 2024
8688bf8
Merge pull request #926 from scroll-tech/fix-style
Holybasil Jan 23, 2024
4e7cdd1
Auto-merge prod back to dev [bot]
actions-user Jan 23, 2024
98efe93
Auto merge #929  [bot]
zzq0826 Jan 23, 2024
d34f5a9
Auto squash #930  [bot]
zzq0826 Jan 23, 2024
f61221a
Bridge costs optimization (#916)
zzq0826 Jan 24, 2024
2cbbd38
Auto-merge prod back to dev [bot]
actions-user Jan 24, 2024
cbf0705
Auto merge #931  [bot]
zzq0826 Jan 24, 2024
045d43a
Auto squash #932  [bot]
zzq0826 Jan 24, 2024
bd89618
FailedRelayed tx support retry feature (#924)
zzq0826 Jan 25, 2024
b80ffc8
Revert "Bridge costs optimization (#916)"
zzq0826 Jan 25, 2024
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ yarn-error.log*

.vscode
.env
.tool-versions


.next
next-env.d.ts
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If you encounter bugs or have feature ideas, feel free to [create an issue](/../

## Node Version

Tested with v16.20.1 (npm v8.19.4).
Tested with v20.10.0 (npm v10.2.3).

## Available Scripts

Expand Down
8 changes: 4 additions & 4 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ REACT_APP_NFT_API_URI="https://nft.scroll.io"
[context.deploy-preview.environment]
REACT_APP_SCROLL_ENVIRONMENT = "Staging"
REACT_APP_API_BASE_URI = "https://sepolia-api.scroll.io"
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge.scroll.io/api"
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge-v2.scroll.io/api"
REACT_APP_ROLLUPSCAN_API_URI = "https://sepolia-api-re.scroll.io/api"
REACT_APP_CHAIN_ID_L1 = "11155111"
REACT_APP_CHAIN_ID_L2 = "534351"
Expand Down Expand Up @@ -72,7 +72,7 @@ REACT_APP_SCROLL_ORIGINS_NFT_V2="0xDd7d857F570B0C211abfe05cd914A85BefEC2464"
[context.staging.environment]
REACT_APP_SCROLL_ENVIRONMENT = "Staging"
REACT_APP_API_BASE_URI = "https://sepolia-api.scroll.io"
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge.scroll.io/api"
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge-v2.scroll.io/api"
REACT_APP_ROLLUPSCAN_API_URI = "https://sepolia-api-re.scroll.io/api"
REACT_APP_CHAIN_ID_L1 = "11155111"
REACT_APP_CHAIN_ID_L2 = "534351"
Expand Down Expand Up @@ -112,7 +112,7 @@ REACT_APP_SCROLL_ORIGINS_NFT_V2="0xDd7d857F570B0C211abfe05cd914A85BefEC2464"
[context.sepolia.environment]
REACT_APP_SCROLL_ENVIRONMENT = "Sepolia"
REACT_APP_API_BASE_URI = "https://sepolia-api.scroll.io"
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge.scroll.io/api"
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge-v2.scroll.io/api"
REACT_APP_ROLLUPSCAN_API_URI = "https://sepolia-api-re.scroll.io/api"
REACT_APP_CHAIN_ID_L1 = "11155111"
REACT_APP_CHAIN_ID_L2 = "534351"
Expand Down Expand Up @@ -152,7 +152,7 @@ REACT_APP_SCROLL_ORIGINS_NFT_V2="0xDd7d857F570B0C211abfe05cd914A85BefEC2464"
[context.mainnet.environment]
REACT_APP_SCROLL_ENVIRONMENT = "Mainnet"
REACT_APP_API_BASE_URI = "https://mainnet-api.scroll.io"
REACT_APP_BRIDGE_API_URI = "https://mainnet-api-bridge.scroll.io/api"
REACT_APP_BRIDGE_API_URI = "https://mainnet-api-bridge-v2.scroll.io/api"
REACT_APP_ROLLUPSCAN_API_URI = "https://mainnet-api-re.scroll.io/api"
REACT_APP_CHAIN_ID_L1 = "1"
REACT_APP_CHAIN_ID_L2 = "534352"
Expand Down
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scroll.io",
"version": "5.0.63",
"version": "5.0.67",
"private": false,
"license": "MIT",
"scripts": {
Expand All @@ -21,7 +21,7 @@
},
"browserslist": {
"production": [
">0.2%",
">0.5%",
"not dead",
"not op_mini all"
],
Expand All @@ -45,7 +45,7 @@
"@sentry/react": "^7.43.0",
"@sentry/tracing": "^7.43.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.11.43",
"@types/node": "^20.10.6",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@web3-onboard/injected-wallets": "^2.2.4",
Expand All @@ -63,12 +63,12 @@
"react-dom": "^18.2.0",
"react-ga4": "^1.4.1",
"react-helmet-async": "^1.3.0",
"react-lines-ellipsis": "^0.15.4",
"react-mailchimp-subscribe": "^2.1.3",
"react-markdown": "^8.0.3",
"react-query": "^3.39.2",
"react-scripts": "5.0.1",
"react-use": "^17.4.0",
"react-virtualized": "^9.22.5",
"rehype-katex": "^6.0.2",
"rehype-raw": "^6.1.1",
"remark-gfm": "^3.0.1",
Expand Down Expand Up @@ -112,7 +112,7 @@
"postcss": "^8.4.17",
"prettier": "^2.8.1",
"process": "^0.11.10",
"react-device-detect": "^1.6.2",
"react-device-detect": "^2.2.3",
"react-redux": "^7.2.0",
"react-router-dom": "^6.3.0",
"stream": "^0.0.2",
Expand All @@ -127,5 +127,8 @@
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0"
}
},
"engines": {
"node": ">=20.10.0"
}
}
6 changes: 3 additions & 3 deletions public/imgs/homepage/blog/scrollOriginsNFT/cubic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/imgs/homepage/blog/scrollOriginsNFT/quartic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/imgs/homepage/blog/scrollOriginsNFT/quintic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/imgs/homepage/blog/scrollOriginsNFT/rainbow-stroke.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions public/imgs/nft/placeholder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/apis/bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const baseUrl = requireEnv("REACT_APP_BRIDGE_API_URI")

export const fetchTxByHashUrl = `${baseUrl}/txsbyhashes`

export const fetchWithdrawalListUrl = `${baseUrl}/l2/withdrawals`

export const fetchTxListUrl = `${baseUrl}/txs`

export const fetchClaimableTxListUrl = `${baseUrl}/claimable`
export const fetchClaimableTxListUrl = `${baseUrl}/l2/unclaimed/withdrawals`
Loading
Loading