Skip to content

Commit df9ab4a

Browse files
fix(docs): update from london to shanghai fork (#800)
2 parents f57248d + b886585 commit df9ab4a

File tree

17 files changed

+35
-112
lines changed

17 files changed

+35
-112
lines changed

docs/fassets/developer-guides/3-fassets-asset-manager-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: london).
106+
Compiled 1 Solidity file successfully (evm target: shanghai).
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 `london` in Remix before compiling the contract.
382+
Don't forget to set the EVM version to `shanghai` 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
@@ -20,7 +20,7 @@ import CodeBlock from "@theme/CodeBlock";
2020
import YoutubeEmbed from "@site/src/components/youtube";
2121
import FtsoV2FeedConsumer from "!!raw-loader!/examples/developer-hub-solidity/FtsoV2FeedConsumer.sol";
2222
import OpenSolidityCompiler from "/static/img/ftso-getting-started/0-open-solidity-compiler-tab.png";
23-
import SetEvmVersion from "/static/img/ftso-getting-started/1-set-evm-version.png";
23+
import SetEvmVersion from "/static/img/set-evm-version-remix.png";
2424
import SetInjectedProvider from "/static/img/ftso-getting-started/1-set-injected-provider.png";
2525
import CompileContract from "/static/img/ftso-getting-started/2-compile-contract.png";
2626
import OpenDeploy from "/static/img/ftso-getting-started/3-open-deploy.png";
@@ -132,7 +132,7 @@ If you have not already configured your MetaMask wallet to support Flare Testnet
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 `london`.
135+
3. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `shanghai`.
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 `london` in `foundry.toml`:
151+
2. Set EVM version to `shanghai` in `foundry.toml`:
152152

153153
```toml title="foundry.toml"
154154
[profile.default]
155155
...
156-
evm_version = "london"
156+
evm_version = "shanghai"
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 `london` in `hardhat.config.ts`:
183+
2. Set EVM version to `shanghai` in `hardhat.config.ts`:
184184

185185
```typescript
186186
module.exports = {
187187
solidity: {
188188
version: "0.8.27",
189189
settings: {
190-
evmVersion: "london",
190+
evmVersion: "shanghai",
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 London]
54+
:::warning[Set EVM Version to Shanghai]
5555

56-
- **Using Remix:** Set EVM version to `london` in the **Advanced Configurations** section of the **Solidity Compiler** tab:
56+
- **Using Remix:** Set EVM version to `shanghai` 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 `london` 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 `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).
6363

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

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

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

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

8383
:::

docs/network/0-overview.mdx

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

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

348-
- **Supported opcodes:** Supports all EVM [opcodes](https://www.evm.codes/?fork=london) up to and including the London hard fork.
348+
- **Supported opcodes:** Supports all EVM [opcodes](https://www.evm.codes/?fork=shanghai) up to and including the Shanghai hard fork.
349349

350350
## Consensus mechanism
351351

docs/network/1-getting-started.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import CopyAddress from "/static/img/deploy-first-contract/4-copy-address.png";
1717
import PasteAddress from "/static/img/deploy-first-contract/5-paste-address.png";
1818
import AfterFaucetConfirmation from "/static/img/deploy-first-contract/6-after-faucet-confirmation.png";
1919
import OpenSolidityCompiler from "/static/img/deploy-first-contract/7-open-solidity-compiler.png";
20-
import SetEvmVersion from "/static/img/deploy-first-contract/8-set-evm-version.png";
20+
import SetEvmVersion from "/static/img/set-evm-version-remix.png";
2121
import CompileContract from "/static/img/deploy-first-contract/9-compile-contract.png";
2222
import DeployAndRunTxs from "/static/img/deploy-first-contract/10-deploy-and-run-transactions.png";
2323
import SetInjectedProvider from "/static/img/deploy-first-contract/11-set-injected-provider.png";
@@ -120,7 +120,7 @@ Let's break down the `HelloWorld` contract:
120120

121121
<img src={OpenSolidityCompiler} style={{ width: 300 }} />
122122

123-
4. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `london`.
123+
4. Expand the **Advanced Configurations** section and make sure the **EVM Version** is set to `shanghai`.
124124

125125
<img src={SetEvmVersion} style={{ width: 300 }} />
126126

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 london --abi --bin FtsoV2FeedConsumer.sol -o build
173+
solc --evm-version shanghai --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 london FtsoV2FeedConsumer.sol --abi --bin -o build
179+
solc --evm-version shanghai 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,31 +105,31 @@ In addition to the `randomNumber` itself, two other variables are retrieved:
105105

106106
- `timestamp`: The UNIX timestamp marking the end of the voting epoch during which data was collected from data providers to generate the specific number. Each voting epoch lasts for a fixed 90-second window.
107107

108-
:::warning[Set EVM Version to London]
108+
:::warning[Set EVM Version to Shanghai]
109109

110-
- **Using Remix:** Set EVM version to `london` in the **Advanced Configurations** section of the **Solidity Compiler** tab:
110+
- **Using Remix:** Set EVM version to `shanghai` in the **Advanced Configurations** section of the **Solidity Compiler** tab:
111111

112112
<img src={SetEvmVersionRemix} style={{ width: 300 }} />
113113

114-
- **Using Hardhat or Foundry:** Set EVM version to `london` 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).
114+
- **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).
115115

116-
- **Using Standard Solidity JSON:** Set `evmVersion` to `london`:
116+
- **Using Standard Solidity JSON:** Set `evmVersion` to `shanghai`:
117117

118118
```json
119119
{
120120
"settings": {
121121
"optimizer": {
122122
/* ... */
123123
},
124-
"evmVersion": "london"
124+
"evmVersion": "shanghai"
125125
}
126126
}
127127
```
128128

129-
- **Using `solc` CLI:** Set `--evm-version` to `london`:
129+
- **Using `solc` CLI:** Set `--evm-version` to `shanghai`:
130130

131131
```bash
132-
solc --evm-version london <args>
132+
solc --evm-version shanghai <args>
133133
```
134134

135135
:::

0 commit comments

Comments
 (0)