Skip to content

Commit

Permalink
Merge sepolia into mainnet (#933)
Browse files Browse the repository at this point in the history
* Auto squash #914  [bot]

* upgrade: node 16.x -> node 20.x

* upgrade: browserslist from >0.2% to >0.5%

* doc: update readme.MD

* Fix warning (#907)

* fix warning

* Fix warning

* Fix warning

* Change tag name

* Update sepolia banner

* Bridge history refactor (#896)

* Transaction history is changed to be obtained from the backend

Update

* Only show unclaimed txs in claim page

* Only show unclaimed txs in claim page

* Rename var

* fix typo

* Update transation storagekey

* Update bridge history api fields (#917)

* Update bridge history api fields

* fix apis error

* Auto squash #921  [bot]

* fix: support long list

* fix: measure only when getting the final height

* feat: change bridge-history backend api to v2 (#922)

* fix typos (#925)

* fix: custom navbar bg color

* Auto squash #930  [bot]

* Bridge costs optimization (#916)

* Contract upgrade: Bridge cost optimization

* Update netlify.toml

* Auto squash #932  [bot]

* FailedRelayed tx support retry feature (#924)

* Revert "Bridge costs optimization (#916)"

This reverts commit f61221a.

---------

Co-authored-by: github-actions <actions@github.com>
Co-authored-by: holybasil <holybasil.1128@gmail.com>
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
  • Loading branch information
4 people authored Jan 25, 2024
1 parent 84aa201 commit bd46c1c
Show file tree
Hide file tree
Showing 72 changed files with 1,881 additions and 1,655 deletions.
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

0 comments on commit bd46c1c

Please sign in to comment.