Skip to content

Commit dd74c1a

Browse files
authored
Merge branch 'sepolia' into renovate/configure
2 parents e540eee + b04841f commit dd74c1a

File tree

26 files changed

+530
-83
lines changed

26 files changed

+530
-83
lines changed

.env.template

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
REACT_APP_VERSION="1.0.0"
2+
23
REACT_APP_MAIN_ENVIRONMENT = "Mainnet" # used to determine which SCROLL_ENVIRONMENT is to be treated as the main/production one
34
REACT_APP_ETH_SYMBOL = "ETH"
45
REACT_APP_PREFIX_CLS = "scroll"
@@ -10,7 +11,7 @@ REACT_APP_NFT_VIEWER_URL="https://nft.scroll.io"
1011
REACT_APP_NFT_API_URI="https://nft.scroll.io"
1112
REACT_APP_SCROLL_ENVIRONMENT = "Staging"
1213
REACT_APP_API_BASE_URI = "https://sepolia-api.scroll.io"
13-
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge.scroll.io/api"
14+
REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge-v2.scroll.io/api"
1415
REACT_APP_ROLLUPSCAN_API_URI = "https://sepolia-api-re.scroll.io/api"
1516
REACT_APP_CHAIN_ID_L1 = "11155111"
1617
REACT_APP_CHAIN_ID_L2 = "534351"
@@ -32,8 +33,8 @@ REACT_APP_L1_USDC_GATEWAY_PROXY_ADDR = ""
3233
REACT_APP_L2_USDC_GATEWAY_PROXY_ADDR= ""
3334
REACT_APP_L1_DAI_GATEWAY_PROXY_ADDR = "0x8b0B9c4e9f41b9bbDEfFee24F9f11C328093d248"
3435
REACT_APP_L2_DAI_GATEWAY_PROXY_ADDR = "0xbF28c28490988026Dca2396148DE50136A54534e"
35-
REACT_APP_L1_LIDO_GATEWAY_PROXY_ADDR = ""
36-
REACT_APP_L2_LIDO_GATEWAY_PROXY_ADDR = ""
36+
REACT_APP_L1_LIDO_GATEWAY_PROXY_ADDR = "0xF22B24fa7c3168f30b17fd97b71bdd3162DDe029"
37+
REACT_APP_L2_LIDO_GATEWAY_PROXY_ADDR = "0x635B054A092F6aE61Ce0Fddc397A704F6626510D"
3738
REACT_APP_L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR = "0x65D123d6389b900d954677c26327bfc1C3e88A13"
3839
REACT_APP_L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = "0xaDcA915971A336EA2f5b567e662F5bd74AEf9582"
3940
REACT_APP_L1_SCROLL_MESSENGER = "0x50c7d3e7f7c656493D1D76aaa1a836CedfCBB16A"
@@ -45,4 +46,4 @@ REACT_APP_SCROLL_CHAIN = "0x2D567EcE699Eabe5afCd141eDB7A4f2D0D6ce8a0"
4546
REACT_APP_L1_MESSAGE_QUEUE = "0xF0B2293F5D834eAe920c6974D50957A1732de763"
4647
REACT_APP_SCROLL_ORIGINS_NFT="0x90a274D591d5AB1a25f0DD0F06F28533C34D7d9f"
4748
REACT_APP_SCROLL_ORIGINS_NFT_V2="0xDd7d857F570B0C211abfe05cd914A85BefEC2464"
48-
REACT_APP_L1_MESSAGE_QUEUE_WITH_GAS_PRICE_ORACLE=""
49+
REACT_APP_L1_MESSAGE_QUEUE_WITH_GAS_PRICE_ORACLE="0xF0B2293F5D834eAe920c6974D50957A1732de763"

netlify.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ from = "/blog/scrollsFreshCoat"
6363
to = "/blog/scrolls-fresh-coat"
6464
status = 301
6565

66+
[[redirects]]
67+
from = "/sticker-vote"
68+
to = "/sticker-winners"
69+
status = 301
6670

6771

6872

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "scroll.io",
3-
"version": "5.0.73",
3+
"version": "5.0.83",
44
"private": false,
55
"license": "MIT",
66
"scripts": {
@@ -108,6 +108,7 @@
108108
"husky": "^8.0.2",
109109
"less": "^4.1.3",
110110
"less-loader": "^11.1.0",
111+
"lint-staged": "^15.2.2",
111112
"os-browserify": "^0.3.0",
112113
"postcss": "^8.4.17",
113114
"prettier": "^2.8.1",

src/Homepage.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ function Homepage() {
3333
return window.location.origin + `/og_scroll_brand.png`
3434
} else if (window.location.pathname.startsWith("/sticker-vote")) {
3535
return window.location.origin + `/${type}_sticker_vote.png`
36+
} else if (window.location.pathname.startsWith("/sticker-winners")) {
37+
return window.location.origin + `/${type}_sticker_vote.png`
3638
}
3739
return window.location.origin + "/og_scroll.png"
3840
}

src/assets/blog/architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ If our vision of scaling Ethereum in an open and community-driven way resonates
7474
- If you are a ZK researcher, ZKP, Go or Solidity developer, or a GPU engineer, we are working on many interesting technical challenges at the edge of what’s possible. Come build cutting-edge solutions to these problems with us in the open!
7575
- If you love nurturing and growing ecosystems or communities, we are looking for developer advocates and community organizers to make sure we are building in a community-aligned and user-friendly way.
7676

77-
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://jobs.lever.co/ScrollFoundation). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](http://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](http://github.com/privacy-scaling-explorations/zkevm-circuits).
77+
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://boards.greenhouse.io/scrollio). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](http://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](http://github.com/privacy-scaling-explorations/zkevm-circuits).

src/assets/blog/pre-alpha-testnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ To become an early tester or contributor, sign up to try out our pre-alpha testn
3939
- If you are a ZK researcher, ZKP, Go or Solidity developer, or a GPU engineer, we are working on many interesting technical challenges at the edge of what’s possible. Come build cutting-edge solutions to these problems with us in the open!
4040
- If you love nurturing and growing ecosystems or communities, we are looking for developer advocates and community organizers to make sure we are building in a community-aligned and user-friendly way.
4141

42-
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://jobs.lever.co/ScrollFoundation). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](https://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](https://github.com/privacy-scaling-explorations/zkevm-circuits).
42+
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://boards.greenhouse.io/scrollio). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](https://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](https://github.com/privacy-scaling-explorations/zkevm-circuits).

src/assets/blog/technical-principles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ If our vision of scaling Ethereum in an open and community-driven way resonates
6767
- If you are a ZK researcher, ZKP, Go or Solidity developer, or a GPU engineer, we are working on many interesting technical challenges at the edge of what’s possible. Come build cutting-edge solutions to these problems with us in the open!
6868
- If you love nurturing and growing ecosystems or communities, we are looking for developer advocates and community organizers to make sure we are building in a community-aligned and user-friendly way.
6969

70-
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://jobs.lever.co/ScrollFoundation). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](http://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](http://github.com/privacy-scaling-explorations/zkevm-circuits).
70+
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://boards.greenhouse.io/scrollio). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](http://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](http://github.com/privacy-scaling-explorations/zkevm-circuits).

src/assets/blog/upgrading-pre-alpha-testnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ To become an early tester or contributor, sign up to try out our Pre-Alpha Testn
4444

4545
- If you love nurturing and growing ecosystems or communities, we are looking for developer advocates and community organizers to build with us in a community-aligned and user-friendly way.
4646

47-
To learn more about these roles, check out our [jobs page](https://jobs.lever.co/ScrollFoundation). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](http://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](http://github.com/privacy-scaling-explorations/zkevm-circuits).
47+
To learn more about these roles, check out our [jobs page](https://boards.greenhouse.io/scrollio). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](http://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](http://github.com/privacy-scaling-explorations/zkevm-circuits).

src/assets/blog/vision-and-values.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ If our vision of scaling Ethereum in an open and community-driven way resonates
4747
- If you are a ZK researcher, ZKP, Go or Solidity developer, or a GPU engineer, we are working on many interesting technical challenges at the edge of what’s possible. Come build cutting-edge solutions to these problems with us in the open!
4848
- If you love nurturing and growing ecosystems or communities, we are looking for developer advocates and community organizers to make sure we are building in a community-aligned and user-friendly way.
4949

50-
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://jobs.lever.co/ScrollFoundation). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](https://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](https://github.com/privacy-scaling-explorations/zkevm-circuits).
50+
To learn more about these roles and about Scroll, check out our [website](https://scroll.io/), [Twitter](https://twitter.com/Scroll_ZKP), [Discord](https://discord.gg/scroll), or [jobs page](https://boards.greenhouse.io/scrollio). If you want to get straight to the code and build with us, you can find our repos at [github.com/scroll-tech](https://github.com/scroll-tech) and [github.com/privacy-scaling-explorations/zkevm-circuits](https://github.com/privacy-scaling-explorations/zkevm-circuits).

src/assets/svgs/bridge/edit.svg

Lines changed: 10 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)