Skip to content

Commit ae61f30

Browse files
authored
fix(docs): update supported evm to cancun (#1062)
2 parents d1d95a0 + 18e6a7c commit ae61f30

File tree

15 files changed

+613
-37
lines changed

15 files changed

+613
-37
lines changed

docs/fassets/developer-guides/3-fassets-settings-solidity.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ npx hardhat run scripts/fassets/getLotSize.ts --network coston2
103103
You should see the following output:
104104

105105
```bash
106-
Compiled 1 Solidity file successfully (evm target: shanghai).
106+
Compiled 1 Solidity file successfully (evm target: cancun).
107107
Deploying FAssetsSettings...
108108
FAssetsSettings deployed to: 0x40deEaA76224Ca9439D4e1c86F827Be829b89D9E
109109
Lot size: 20000000n

docs/fdc/2-getting-started.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ The response consists of several key components:
379379

380380
:::warning
381381

382-
Don't forget to set the EVM version to `shanghai` in Remix before compiling the contract.
382+
Don't forget to set the EVM version to `cancun` in Remix before compiling the contract.
383383

384384
:::
385385

docs/ftso/1-getting-started.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ If you have not already configured your MetaMask wallet to support Flare Testnet
124124
:::
125125

126126
{/* prettier-ignore */}
127-
1. <Remix feedName="FtsoV2FeedConsumer.sol">Open contract in Remix</Remix>
127+
1. <Remix fileName="FtsoV2FeedConsumer.sol">Open contract in Remix</Remix>
128128

129129
2. Click on `FtsoV2FeedConsumer.sol` in the file explorer to open the contract in the editor.
130130

131131
2. On the left side of Remix, click the **Solidity Compiler** tab to view the compiler settings.
132132

133133
<img src={OpenSolidityCompiler} style={{ width: 300 }} />
134134

135-
3. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `shanghai`.
135+
3. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `cancun`.
136136

137137
<img src={SetEvmVersion} style={{ width: 300 }} />
138138

docs/ftso/guides/build-first-app.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ This guide is for developers who want to build an FTSOv2 application using eithe
148148
{FtsoV2FeedConsumerFoundry}
149149
</CodeBlock>
150150

151-
2. Set EVM version to `shanghai` in `foundry.toml`:
151+
2. Set EVM version to `cancun` in `foundry.toml`:
152152

153153
```toml title="foundry.toml"
154154
[profile.default]
155155
...
156-
evm_version = "shanghai"
156+
evm_version = "cancun"
157157
```
158158

159159
3. To ensure everything is set up correctly, compile the contract by running:
@@ -180,14 +180,14 @@ This guide is for developers who want to build an FTSOv2 application using eithe
180180
{FtsoV2ConsumerHardhat}
181181
</CodeBlock>
182182

183-
2. Set EVM version to `shanghai` in `hardhat.config.ts`:
183+
2. Set EVM version to `cancun` in `hardhat.config.ts`:
184184

185185
```typescript
186186
module.exports = {
187187
solidity: {
188188
version: "0.8.27",
189189
settings: {
190-
evmVersion: "shanghai",
190+
evmVersion: "cancun",
191191
optimizer: {
192192
enabled: true,
193193
runs: 200,

docs/ftso/guides/change-quote-feed.mdx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,33 @@ contract FtsoV2ChangeQuoteFeed {
5151

5252
:::
5353

54-
:::warning[Set EVM Version to shanghai]
54+
:::warning[Set EVM Version to Cancun]
5555

56-
- **Using Remix:** Set EVM version to `shanghai` in the **Advanced Configurations** section of the **Solidity Compiler** tab:
56+
- **Using Remix:** Set EVM version to `cancun` in the **Advanced Configurations** section of the **Solidity Compiler** tab:
5757

5858
{" "}
5959

6060
<img src={SetEvmVersionRemix} style={{ width: 300 }} />
6161

62-
- **Using Hardhat or Foundry:** Set EVM version to `shanghai` in [hardhat.config.ts](https://github.com/flare-foundation/flare-hardhat-starter/blob/master/hardhat.config.ts#L34) or [foundry.toml](https://github.com/flare-foundation/flare-foundry-starter/blob/master/foundry.toml).
62+
- **Using Hardhat or Foundry:** Set EVM version to `cancun` in [hardhat.config.ts](https://github.com/flare-foundation/flare-hardhat-starter/blob/master/hardhat.config.ts#L34) or [foundry.toml](https://github.com/flare-foundation/flare-foundry-starter/blob/master/foundry.toml).
6363

64-
- **Using Standard Solidity JSON:** Set `evmVersion` to `shanghai`:
64+
- **Using Standard Solidity JSON:** Set `evmVersion` to `cancun`:
6565

6666
```json
6767
{
6868
"settings": {
6969
"optimizer": {
7070
/* ... */
7171
},
72-
"evmVersion": "shanghai"
72+
"evmVersion": "cancun"
7373
}
7474
}
7575
```
7676

77-
- **Using `solc` CLI:** Set `--evm-version` to `shanghai`:
77+
- **Using `solc` CLI:** Set `--evm-version` to `cancun`:
7878

7979
```bash
80-
solc --evm-version shanghai <args>
80+
solc --evm-version cancun <args>
8181
```
8282

8383
:::

docs/network/0-overview.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ Discover suitable options for your needs on the [Flare Wallets](https://flare.ne
349349

350350
- **RPC-API:** [Ethereum RPC API](https://ethereum.org/developers/docs/apis/json-rpc/)
351351

352-
- **Supported opcodes:** Supports all EVM [opcodes](https://www.evm.codes/?fork=shanghai) up to and including the Shanghai hard fork.
352+
- **Supported opcodes:** Supports all EVM [opcodes](https://www.evm.codes/?fork=cancun) up to and including the Cancun hard fork.
353353

354354
## Consensus mechanism
355355

docs/network/1-getting-started.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Let's break down the `HelloWorld` contract:
117117

118118
<img src={OpenSolidityCompiler} style={{ width: 300 }} />
119119

120-
4. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `shanghai`.
120+
4. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `cancun`.
121121

122122
<img src={SetEvmVersion} style={{ width: 300 }} />
123123

docs/network/guides/flare-for-go-developers.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Note that the contract interface dependencies have been inlined to avoid any imp
170170
To compile the contract, use the Solidity compiler:
171171

172172
```bash
173-
solc --evm-version shanghai --abi --bin FtsoV2FeedConsumer.sol -o build
173+
solc --evm-version cancun --abi --bin FtsoV2FeedConsumer.sol -o build
174174
```
175175

176176
The compiled contract will be saved in the `build/` folder.

docs/network/guides/flare-for-javascript-developers.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Note that the contract interface dependencies have been inlined to avoid any imp
176176
</details>
177177

178178
```bash
179-
solc --evm-version shanghai FtsoV2FeedConsumer.sol --abi --bin -o build
179+
solc --evm-version cancun FtsoV2FeedConsumer.sol --abi --bin -o build
180180
```
181181

182182
This will generate two files `build/FtsoV2FeedConsumer.abi` and `build/FtsoV2FeedConsumer.bin` files with the contract's ABI and bytecode. Rename `FtsoV2FeedConsumer.abi` to `FtsoV2FeedConsumer.json`.

docs/network/guides/secure-random-numbers.mdx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ In addition to the `randomNumber` itself, two other variables are retrieved:
9898
- `timestamp`: The UNIX timestamp marking the end of the voting round during which data was collected from data providers to generate the specific number.
9999
Each voting round lasts for a fixed 90-second window.
100100

101-
:::warning[Set EVM Version to Shanghai]
101+
:::warning[Set EVM Version to Cancun]
102102

103-
- **Using Remix:** Set EVM version to `shanghai` under **Solidity Compiler****Advanced Configurations**.
103+
- **Using Remix:** Set EVM version to `cancun` under **Solidity Compiler****Advanced Configurations**.
104104

105-
- **Using Hardhat or Foundry:** Set EVM version to `shanghai` in [hardhat.config.ts](https://github.com/flare-foundation/flare-hardhat-starter/blob/master/hardhat.config.ts#L34) or [foundry.toml](https://github.com/flare-foundation/flare-foundry-starter/blob/master/foundry.toml).
106-
- **Using Standard Solidity JSON:** Set `"evmVersion": "shaghai"` in `settings`.
107-
- **Using `solc`:** Add `--evm-version shanghai` flag to your command.
105+
- **Using Hardhat or Foundry:** Set EVM version to `cancun` in [hardhat.config.ts](https://github.com/flare-foundation/flare-hardhat-starter/blob/master/hardhat.config.ts#L34) or [foundry.toml](https://github.com/flare-foundation/flare-foundry-starter/blob/master/foundry.toml).
106+
- **Using Standard Solidity JSON:** Set `"evmVersion": "cancun"` in `settings`.
107+
- **Using `solc`:** Add `--evm-version cancun` flag to your command.
108108

109109
:::
110110

0 commit comments

Comments
 (0)