Skip to content

Commit 4b0a7bb

Browse files
Merge branch 'main' of https://github.com/0xPolygon/polygon-docs into cdk/erigon-setup
2 parents ba3d4e3 + c2d0926 commit 4b0a7bb

File tree

9 files changed

+84
-7
lines changed

9 files changed

+84
-7
lines changed

.github/assets/nginx.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ server {
55

66
error_page 404 /404.html;
77

8+
add_header Content-Security-Policy upgrade-insecure-requests;
9+
810
location / {
911
try_files $uri.html $uri $uri/ =404;
1012
}

docs/img/404.png

68.4 KB
Loading

docs/pos/concepts/tokens/matic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ You can obtain test MATIC for testing purposes on the Amoy testnet. Testnet toke
1919
3. Choose the **Polygon PoS (Amoy)** network.
2020
4. Enter your account address and confirm.
2121

22-
For interactions between Sepolia and Amoy, consider using tools like [Matic.js](https://maticnetwork.github.io/matic.js/), or use the the [Polygon Portal](https://portal.polygon.technology/).
22+
For interactions between Sepolia and Amoy, consider using tools like [Matic.js](https://maticnetwork.github.io/matic.js/), or use the [Polygon Portal](https://portal.polygon.technology/).

docs/tools/dApp-development/common-tools/hardhat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Choose the JavaScript project and go through these steps to compile, test and de
4242

4343
### Checking the contract
4444

45-
The `contracts` folder contains `Lock.sol`, which is a sample contract which consistis of a simple digital lock, where users could only withdraw funds after a given period of time.
45+
The `contracts` folder contains `Lock.sol`, which is a sample contract which consists of a simple digital lock, where users could only withdraw funds after a given period of time.
4646

4747
```solidity
4848
// SPDX-License-Identifier: UNLICENSED

docs/tools/dApp-development/common-tools/remix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,6 @@ sol-merger \"./contracts/*.sol\" ./build
162162

163163
- Choose the license type of your contract
164164

165-
In the next section, paste your flattened samrt contract here. If you had enabled optimization, then adjust the `optimization` section accordingly.
165+
In the next section, paste your flattened smart contract here. If you had enabled optimization, then adjust the `optimization` section accordingly.
166166

167167
Constructor arguments should have been filled in automatically. If not, they can be retrieved from the trailing bytes of the deployment transaction (example: `000000000000000000000000a6fa4fb5f76172d178d61b04b0ecd319c5d1c0aa`).

docs/zkEVM/architecture/data-streamer/client-server-messages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The stream client-server protocol messages are $\texttt{Start}$, $\texttt{StartB
88

99
If the stream client knows the entry number at which the stream should start, it sends a $\texttt{Start}$ message with that particular entry number. That is, $\mathtt{entryNumber} \not= \texttt{0}$.
1010

11-
- $\texttt{StartBookmark}$ message is the type of message the stream client can send if the the stream client does not the know entry number, but knows something more meaningful to the application, like a bookmark.
11+
- $\texttt{StartBookmark}$ message is the type of message the stream client can send if the stream client does not the know entry number, but knows something more meaningful to the application, like a bookmark.
1212

1313
In the case of the Polygon zkEVM, if the stream client wants to receive information from a certain L2 block number, then it provides the appropriate bookmark by sending a $\texttt{StartBookmark}$ message.
1414

docs/zkEVM/architecture/zkprover/stark-recursion/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In the non-recursive case, a PIL specification is transformed into a verifiable
2727

2828
Subsequently, CIRCOM takes the above _STARK_ proof as an input and generates an _Arithmetic circuit_ and its corresponding _witness_.
2929

30-
The Arithmetic circuit is expressed in terms of its equivalent _Rank-1 Constraint System (R1CS)_, while the _witness_ is actuallly a set of input, intermediate and output values of the circuit wires, satisfying the R1CS.
30+
The Arithmetic circuit is expressed in terms of its equivalent _Rank-1 Constraint System (R1CS)_, while the _witness_ is actually a set of input, intermediate and output values of the circuit wires, satisfying the R1CS.
3131

3232
Finally, _Rapid SNARK_ takes the above Witness together with the _STARK Verifier data_ and generates a _SNARK_ proof corresponding to the previous _STARK_ proof.
3333

docs/zkEVM/architecture/zkprover/stark-recursion/intermediate-recursion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ A schema of the _recursive2_ circuit generated is as shown in the below Figure.
7070

7171
![Figure 16: Convert the _recursive1_ circuit to its associated STARK](../../../../img/zkEVM/16prf-rec-recursive2-circuit.png)
7272

73-
Observe that, since the upper proof is of the $\mathtt{\pi_{rec2}}$-type, the multiplexor does not provides the constant root _rootC_ to the _Verifier A_ for hardcoding it, because this verifier should get it through a public input from the previous circuit.
73+
Observe that, since the upper proof is of the $\mathtt{\pi_{rec2}}$-type, the multiplexor does not provide the constant root _rootC_ to the _Verifier A_ for hardcoding it, because this verifier should get it through a public input from the previous circuit.
7474

7575
Otherwise, since the lower proof has the $\mathtt{\pi_{rec1}}$-type, the Multiplexor lets it pass through by providing the constant root to the Verifier B, so that it can be hardcoded when the corresponding template is filled.
7676

overrides/404.html

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,82 @@
11
{% extends "main.html" %}
22

33
{% block content %}
4-
<h1>404 - Not found</h1>
4+
<body
5+
style="
6+
height: 100dvh;
7+
padding: 20px;
8+
margin: 0;
9+
width: 100%;
10+
"
11+
>
12+
<div class="container"
13+
style="
14+
display: flex;
15+
flex-direction: column;
16+
align-items: center;
17+
justify-content: center;
18+
"
19+
>
20+
<p style="
21+
font-size: 20px;
22+
line-height: 26px;
23+
font-family: Space Mono, monospace;
24+
">
25+
ERROR
26+
</p>
27+
<p style="
28+
font-size: 120px;
29+
line-height: 120px;
30+
margin: 0;
31+
font-family: Space Mono, monospace;
32+
">
33+
404
34+
</p>
35+
<img src="/img/404.png" alt="404 image" width="294" height="282">
36+
<p
37+
style="
38+
font-size: 42px;
39+
line-height: 48px;
40+
font-weight: 500;
41+
text-align: center;
42+
margin: 0;
43+
max-width: 100%;
44+
"
45+
>
46+
Uh Oh. Sorry there&apos;s something wrong.
47+
</p>
48+
<p
49+
style="
50+
font-size: 20px;
51+
line-height: 26px;
52+
font-weight: 500;
53+
color: #67666e;
54+
text-align: center;
55+
max-width: 100%;
56+
"
57+
>
58+
We couldn&apos;t find the page you&apos;re looking for.
59+
</p>
60+
<button
61+
style="
62+
padding: 10px 14px 10px 14px;
63+
border-radius: 48px;
64+
outline: none;
65+
border: none;
66+
background: #7047eb;
67+
color: #fff;
68+
font-size: 12px;
69+
line-height: 15.6px;
70+
font-weight: 500;
71+
cursor: pointer;
72+
"
73+
onclick="window.location.href = 'https://docs.polygon.technology'"
74+
>
75+
Back to Home
76+
</button>
77+
</body>
78+
</html>
79+
580
{% endblock %}
681

782
{% block htmltitle %}

0 commit comments

Comments
 (0)