Skip to content

Commit d36cad2

Browse files
TurupawnTurupawn
authored
Merge pull request #4 from scroll-tech/develop
Update from Scroll
2 parents 2f7b5bb + d32c402 commit d36cad2

39 files changed

+815
-465
lines changed

‎package-lock.json‎

Lines changed: 139 additions & 284 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"turndown": "^7.1.2"
5353
},
5454
"devDependencies": {
55-
"@astrojs/mdx": "^0.11.6",
55+
"@astrojs/mdx": "^0.19.7",
5656
"@astrojs/preact": "^1.2.0",
5757
"@astrojs/react": "^2.2.0",
5858
"@astrojs/sitemap": "^1.0.0",

‎public/locales/en/translation.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"commonErrors": "Common Errors",
6767
"rollupExplorer": "Rollup Explorer",
6868
"scrollSepoliaBlockExplorer": "Scroll Sepolia Explorer",
69+
"scrollMainnet": "Scroll Mainnet",
70+
"scrollscan": "Scrollscan Block Explorer",
6971
"sepoliaBlockExplorer": "Sepolia Explorer",
7072
"community": "Community",
7173
"discord": "Discord",
@@ -96,9 +98,13 @@
9698
"bridgingERC1155ThroughCustomGateway": "Bridging ERC1155 through Custom Gateway",
9799
"estimatingGasAndTxFees": "Estimating Gas & Tx Fees",
98100
"resources": "Resources",
101+
"mainnetResources": "Mainnet Resources",
102+
"sepoliaResources": "Sepolia Resources",
103+
"scrollBlockExplorer": "Scrollscan Explorer",
99104
"rollupExplorer": "Rollup Explorer",
100105
"scrollSepoliaBlockExplorer": "Scroll Sepolia Explorer",
101-
"sepoliaBlockExplorer": "Sepolia Explorer"
106+
"sepoliaRollupExplorer": "Rollup Explorer",
107+
"sepoliaBlockExplorer": "Scrollscan Explorer"
102108
},
103109
"technology": {
104110
"introduction": "Introduction",
@@ -129,7 +135,11 @@
129135
"bridgeOverview": "Bridge Overview",
130136
"prover": "Prover",
131137
"proofGeneration": "Proof Generation",
132-
"cpuProverRepo": "CPU Prover Repo"
138+
"cpuProverRepo": "CPU Prover Repo",
139+
140+
"security": "Security",
141+
"auditsAndBugBounty": "Audits & Bug Bounty",
142+
"l2BeatAssessment": "L2Beat Assessment"
133143
},
134144
"learn": {
135145
"ethereumAndProtocols": "Ethereum & Protocols",

‎public/locales/es/translation.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"commonErrors": "Errores Comunes",
6767
"rollupExplorer": "Rollup Explorer",
6868
"scrollSepoliaBlockExplorer": "Scroll Sepolia Explorer",
69+
"scrollMainnet": "Scroll Mainnet",
70+
"scrollscan": "Explorador Scrollscan",
6971
"sepoliaBlockExplorer": "Sepolia Explorer",
7072
"community": "Comunidad",
7173
"discord": "Discord",
@@ -96,9 +98,13 @@
9698
"bridgingERC1155ThroughCustomGateway": "Bridging de un ERC1155 a través de una Gateway Personalizada",
9799
"estimatingGasAndTxFees": "Estimación de las Tarifas de Gas y Tx",
98100
"resources": "Recursos",
101+
"mainnetResources": "Recursos de Mainnet",
102+
"sepoliaResources": "Recursos de Sepolia",
103+
"scrollBlockExplorer": "Explorador Scrollscan",
99104
"rollupExplorer": "Rollup Explorer",
100105
"scrollSepoliaBlockExplorer": "Scroll Sepolia Explorer",
101-
"sepoliaBlockExplorer": "Sepolia Explorer"
106+
"sepoliaRollupExplorer": "Explorador de Rollup",
107+
"sepoliaBlockExplorer": "Explorador de bloques Scrollscan"
102108
},
103109
"technology": {
104110
"introduction": "Introducción",
@@ -129,7 +135,11 @@
129135
"bridgeOverview": "Vista General del Bridge",
130136
"prover": "Prover",
131137
"proofGeneration": "Proof Generation",
132-
"cpuProverRepo": "CPU Prover Repo"
138+
"cpuProverRepo": "Repo de probador de CPU",
139+
140+
"security": "Seguridad",
141+
"auditsAndBugBounty": "Auditorías y recompenzas por encontrar bugs",
142+
"l2BeatAssessment": "Análisis de L2Beat"
133143
},
134144
"learn": {
135145
"ethereumAndProtocols": "Ethereum y Protocolos",

‎src/components/Footer/helper.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ const TwitterIcon: React.FC<React.SVGProps<SVGSVGElement>> = (props) => (
2222
)
2323

2424
export const aboutList = [
25+
{
26+
name: "Bug Bounty",
27+
href: "https://immunefi.com/bounty/scroll/",
28+
},
2529
{
2630
name: "Join Us",
2731
href: "https://jobs.lever.co/ScrollFoundation",

‎src/config/sidebar.ts‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,19 @@ export const getSidebar = () => {
4040
},
4141
{
4242
title: t("sidebar.gettingStarted.scrollSepoliaBlockExplorer"),
43-
url: "https://sepolia-blockscout.scroll.io/",
43+
url: "https://sepolia.scrollscan.com/",
4444
},
4545
{ title: t("sidebar.gettingStarted.sepoliaBlockExplorer"), url: "https://sepolia.etherscan.io/" },
46+
{ title: t("sidebar.gettingStarted.rollupExplorer"), url: "https://sepolia.scroll.io/rollupscan" },
47+
],
48+
},
49+
{
50+
section: t("sidebar.gettingStarted.scrollMainnet"),
51+
contents: [
52+
{
53+
title: t("sidebar.gettingStarted.scrollscan"),
54+
url: "https://scrollscan.com/",
55+
},
4656
{ title: t("sidebar.gettingStarted.rollupExplorer"), url: "https://scroll.io/rollupscan" },
4757
],
4858
},
@@ -154,11 +164,17 @@ export const getSidebar = () => {
154164
],
155165
},
156166
{
157-
section: t("sidebar.developers.resources"),
167+
section: t("sidebar.developers.mainnetResources"),
158168
contents: [
159169
{ title: t("sidebar.developers.rollupExplorer"), url: "https://scroll.io/rollupscan" },
160-
{ title: t("sidebar.developers.scrollSepoliaBlockExplorer"), url: "https://sepolia-blockscout.scroll.io/" },
161-
{ title: t("sidebar.developers.sepoliaBlockExplorer"), url: "https://sepolia.etherscan.io/" },
170+
{ title: t("sidebar.developers.scrollBlockExplorer"), url: "https://scrollscan.com/" },
171+
],
172+
},
173+
{
174+
section: t("sidebar.developers.sepoliaResources"),
175+
contents: [
176+
{ title: t("sidebar.developers.sepoliaRollupExplorer"), url: "https://sepolia.scroll.io/rollupscan" },
177+
{ title: t("sidebar.developers.scrollSepoliaBlockExplorer"), url: "https://sepolia.scrollscan.dev/" },
162178
],
163179
},
164180
],
@@ -252,6 +268,23 @@ export const getSidebar = () => {
252268
},
253269
],
254270
},
271+
{
272+
section: t("sidebar.technology.security"),
273+
contents: [
274+
{
275+
title: t("sidebar.technology.auditsAndBugBounty"),
276+
url: formatUrl("technology/security/audits-and-bug-bounty"),
277+
},
278+
// {
279+
// title: t("sidebar.technology.risks"),
280+
// url: formatUrl("technology/security/risks"),
281+
// },
282+
// {
283+
// title: t("sidebar.technology.l2BeatAssessment"),
284+
// url: "https://l2beat.com/scaling/projects/scroll",
285+
// },
286+
],
287+
},
255288
],
256289
learn: [
257290
{

‎src/content/docs/en/developers/developer-quickstart.mdx‎

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,69 @@ import Aside from "../../../../components/Aside.astro"
1212
import ClickToZoom from "../../../../components/ClickToZoom.astro"
1313
import networkSelection from "./_images/mmNetworkSelection.png"
1414
import injectedProviderMM from "./_images/injectedProviderMM.png"
15+
import ToggleElement from "../../../../components/ToggleElement.astro"
1516

1617
With Scroll, your favorite tools for building and testing smart contracts just work.
1718

18-
Since Scroll is bytecode equivalent with the EVM, you’ll just need to point your favorite builder tools at a Scroll Sepolia Testnet RPC Provider.
19+
Since Scroll is bytecode equivalent with the EVM, you’ll just need to point your favorite builder tools at a Scroll RPC Provider.
1920

2021
If you run into any issues, please reach out in [our Discord](https://discord.gg/scroll).
2122

22-
## Acquiring Testnet Ether
23+
## Acquiring Ether
2324

24-
To start building on Scroll, you'll first need to acquire some testnet ETH. See the [Faucet](/user-guide/faucet) page for tips on getting test tokens on Sepolia. After this, you can bridge your testnet ETH to the Scroll Sepolia Testnet (Layer 2) using our [Bridge](/user-guide/bridge).
25+
Scroll uses ETH as its native currency, which will be needed to pay transaction fees for deploying and interacting with the network.
26+
27+
To start building on Scroll, we suggest you begin with using our Scroll Sepolia testnet. You'll first need to acquire some testnet ETH. See the [Faucet](/user-guide/faucet) page for tips on getting test tokens on Sepolia. After this, you can bridge your testnet ETH to the Scroll Sepolia Testnet (Layer 2) using our [Sepolia Bridge](https://sepolia.scroll.io/bridge), as described in the [Bridge article](/user-guide/bridge).
2528

2629
For a walkthrough, start with the User Guide's [Setup](/user-guide/setup) page.
2730

31+
Once you're ready to deploy on Scroll's mainnet, you can bridge over ETH using [our native bridge](https://scroll.io/bridge/) or one of the 3rd-party bridges.
32+
2833
## Network Configuration
2934

35+
### Scroll Mainnet
36+
37+
Use the table below to configure your Ethereum tools to the Scroll mainnet.
38+
39+
| Network Name | Scroll | Ethereum Mainnet |
40+
| ------------------ | -------------------------------------------------- | ---------------------------------------------------- |
41+
| RPC URL | [https://rpc.scroll.io/](https://rpc.scroll.io/) | [https://eth.llamarpc.com](https://eth.llamarpc.com) |
42+
| Chain ID | 534352 | 1 |
43+
| Currency Symbol | ETH | ETH |
44+
| Block Explorer URL | [https://scrollscan.com/](https://scrollscan.com/) | [https://etherscan.io](https://etherscan.io) |
45+
46+
<ToggleElement anchor="mainnet-additional-infra">
47+
<div slot="title">Additional Scroll Mainnet RPCs and Infra</div>
48+
- [Scroll Native Bridge](https://scroll.io/bridge)
49+
- [Scroll RPC Providers on ChainList.org](https://chainlist.org/chain/534352)
50+
- [Ethereum RPC Providers on ChainList.org](https://chainlist.org/chain/1)
51+
{/* - Additional Block Explorers:
52+
- [Dora](https://www.ondora.xyz/network/scroll/interactions)
53+
- [L2Scan](https://scroll.l2scan.co/) */}
54+
55+
</ToggleElement>
56+
57+
### Scroll Sepolia Testnet
58+
3059
Use the table below to configure your Ethereum tools to the Scroll Sepolia Testnet.
3160

32-
| Network Name | Scroll Sepolia Testnet | Sepolia Testnet |
33-
| ------------------ | ----------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
34-
| RPC URL | [https://sepolia-rpc.scroll.io/](https://sepolia-rpc.scroll.io/) | [https://eth-sepolia-public.unifra.io](https://eth-sepolia-public.unifra.io) |
35-
| Chain ID | 534351 | 11155111 |
36-
| Currency Symbol | ETH | ETH |
37-
| Block Explorer URL | [https://sepolia-blockscout.scroll.io](https://sepolia-blockscout.scroll.io/) | [https://sepolia.etherscan.io](https://sepolia.etherscan.io) |
61+
| Network Name | Scroll Sepolia | Ethereum Sepolia |
62+
| ------------------ | ----------------------------------------------------------------- | ------------------------------------------------------------ |
63+
| RPC URL | [https://sepolia-rpc.scroll.io/](https://sepolia-rpc.scroll.io/) | [https://rpc2.sepolia.org](https://rpc2.sepolia.org) |
64+
| Chain ID | 534351 | 11155111 |
65+
| Currency Symbol | ETH | ETH |
66+
| Block Explorer URL | [https://sepolia.scrollscan.com](https://sepolia.scrollscan.com/) | [https://sepolia.etherscan.io](https://sepolia.etherscan.io) |
67+
68+
<ToggleElement anchor="sepolia-additional-infra">
69+
<div slot="title">Additional Scroll Sepolia RPCs and Infra</div>
70+
- [Scroll Sepolia Native Bridge](https://sepolia.scroll.io/bridge)
71+
- [Scroll Sepolia RPC Providers on ChainList.org](https://chainlist.org/chain/534351)
72+
- [Ethereum Sepolia RPC Providers on ChainList.org](https://chainlist.org/chain/11155111)
73+
- Additional Block Explorers:
74+
- [Dora](https://www.ondora.xyz/network/scroll-sepolia/interactions)
75+
- [L2Scan](https://scroll.l2scan.co/)
76+
77+
</ToggleElement>
3878

3979
## Configure your tooling
4080

@@ -126,7 +166,7 @@ live:
126166
- name: Ethereum
127167
networks:
128168
- chainid: 534351
129-
explorer: https://sepolia-blockscout.scroll.io/
169+
explorer: https://sepolia.scrollscan.com/
130170
host: https://sepolia-rpc.scroll.io
131171
id: scrollSepolia
132172
name: Scroll Sepolia Testnet
@@ -195,7 +235,7 @@ Be sure to fund the deployment wallet as well! Run `yarn generate` to create the
195235

196236
To configure your frontend, you need to add the Scroll Sepolia Testnet as a network option, then select it as default.
197237

198-
To add the network, modify `packages/react-app/src/constants.js` .
238+
To add the network, modify `packages/react-app/src/constants.js`.
199239

200240
```jsx
201241
...
@@ -206,7 +246,7 @@ export const NETWORKS = {
206246
color: "#e9d0b8",
207247
chainId: 534351,
208248
rpcUrl: "https://sepolia-rpc.scroll.io/",
209-
blockExplorer: "https://sepolia-blockscout.scroll.io",
249+
blockExplorer: "https://sepolia.scrollscan.com",
210250
},
211251
...
212252
}

‎src/content/docs/en/developers/ethereum-and-scroll-differences.mdx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ excerpt: "There are a number of technical details that differ between Ethereum m
1010

1111
import Aside from "../../../../components/Aside.astro"
1212

13-
A number of technical details differ between Ethereum mainnet's EVM and Scroll's modified design for a zkEVM. Below you can see those differences as they exist on Scroll Sepolia.
13+
A number of technical details differ between Ethereum mainnet's EVM and Scroll's modified design for a zkEVM. Below you can see those differences as they exist on Scroll and Scroll Sepolia.
1414

1515
For open-source contributors and infrastructure builders, please contact our team for additional support.
1616

@@ -71,7 +71,7 @@ When verifying `EXTCODESIZE`, it is expensive to load the whole contract data in
7171

7272
## Block Time
7373

74-
The Sepolia Testnet aims for a constant block time of 3 seconds. This is shorter and more consistent than the 12 seconds used in the Ethereum under ideal conditions.
74+
Scroll aims for a constant block time of 3 seconds. This is shorter and more consistent than the 12 seconds used in the Ethereum under ideal conditions.
7575

7676
This was chosen for two reasons:
7777

@@ -90,7 +90,7 @@ You can read in more detail on Shanghai hard fork differences from London on the
9090

9191
## Transaction Fees
9292

93-
The fee charged to Scroll Sepolia transactions contains two parts:
93+
The fee charged to Scroll transactions contains two parts:
9494

9595
- **L2 gas fee:** similar to L1, the amount of L2 execution fee equals to `L2_gas_price * L2_gas_used`, covering the following costs:
9696
- L2 sequencer execution & storage cost

‎src/content/docs/en/developers/guides/estimating-gas-and-tx-fees.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ But it also exposes the `getL1Fee(bytes memory data)` function, which abstracts
5353

5454
First of all, let’s quickly go over the key folders inside our project structure.
5555

56-
It’s a standard Hardhat project, but most of our work is inside the c*ontracts* and _scripts_ folders.
56+
It’s a standard Hardhat project, but most of our work is inside the *contracts* and _scripts_ folders.
5757

5858
<ClickToZoom src={txFeesProjectStructure} />
5959

‎src/content/docs/en/developers/index.mdx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ensuring that all code executed on the Scroll Layer 2 behaves just as if it were
2828

2929
## Getting Started
3030

31-
**Looking to build on the Scroll Sepolia Testnet?**
31+
**Looking to build on the Scroll?**
3232

3333
- For the essentials: Check out the [Developer Quickstart](/developers/developer-quickstart)
3434
- For a tutorial walking through deploying your first smart contract on Scroll, read our [contract deployment tutorial](/developers/guides/contract-deployment-tutorial)
@@ -78,9 +78,9 @@ ensuring that all code executed on the Scroll Layer 2 behaves just as if it were
7878
<ToggleElement anchor="community">
7979
<div slot="title">Community — Scroll brings together users and builders.</div>
8080
<p>
81-
We know the challenges of building in the open and getting user engagement before mainnet release! Scroll has a
82-
blossoming community of users and builders, and with a Discord community of over 100,000 users eager to try out
83-
applications on our testnet, we’re excited to connect builders with users that can provide real-world feedback.
81+
We know the challenges of building in the open and getting user engagement! Scroll has a blossoming community of
82+
users and builders, and with a Discord community of over 500,000 members eager to try out applications on our
83+
testnet or mainnet, we’re excited to connect builders with users that can provide real-world feedback.
8484
</p>
8585
</ToggleElement>
8686

0 commit comments

Comments
 (0)