Skip to content

Commit

Permalink
Merge branch 'main' into remove-ga-tag
Browse files Browse the repository at this point in the history
  • Loading branch information
jlwllmr authored Nov 7, 2024
2 parents b010540 + 5dbd897 commit f5dfe79
Show file tree
Hide file tree
Showing 223 changed files with 126 additions and 2,913 deletions.
6 changes: 3 additions & 3 deletions docs/architecture/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The following is a good representation of the main components of Linea, and how
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Architecture_of_Linea/Linea_architecture_map.png"
src="/img/architecture/index/Linea_architecture_map.png"
alt="Linea architecture"
/>
</div>
Expand Down Expand Up @@ -77,7 +77,7 @@ network.
<div class="center-container">
<div class="img-xsmall">
<img
src="/img/article_images/Architecture_of_Linea/Linea_bluecircle.png"
src="/img/architecture/index/Linea_bluecircle.png"
alt="Linea blue circle"
/>
</div>
Expand Down Expand Up @@ -106,7 +106,7 @@ _...in other words, there's a lot involved._
<div class="center-container">
<div class="img-xsmall">
<img
src="/img/article_images/Architecture_of_Linea/Linea_redcircle.png"
src="/img/architecture/index/Linea_redcircle.png"
alt="Linea red circle"
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ in collaboration with the broader Linea ecosystem and community.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Decentralization_roadmap/Linea_decentralization_roadmap.png"
src="/img/architecture/overview/decentralization_roadmap/Linea_decentralization_roadmap.png"
alt="Linea Decentralization Roadmap"
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/architecture/overview/transaction-lifecycle.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ before true finality is reached.

## Step 4: Conflation

The transaction's block will then be subject to [conflation](../stack/sequencer/conflation.md), which
The transaction's block will then be subject to [conflation](../stack/sequencer/conflation.mdx), which
combines two or more blocks' transaction data into a single data set (batch) that forms part of
the package of data passed on to Ethereum. Combining the transaction data of multiple blocks
means that a single proof can be used to verify a large volume of transactions, minimizing the
Expand Down
2 changes: 1 addition & 1 deletion docs/architecture/stack/bridges/canonical-token-bridge.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import CodeBlock from "@theme/CodeBlock";
import TokenBridge from "!!raw-loader!/files/testnet/ITokenBridge.sol";
import TokenBridgeL1 from "!!raw-loader!/files/testnet/canonical-token-bridge/TokenBridgeL1.abi";
import TokenBridgeL2 from "!!raw-loader!/files/testnet/canonical-token-bridge/TokenBridgeL2.abi";
import LineaBridgeGraphic from "/img/article_images/Architecture_of_Linea/Bridges/Canonical_token_bridge/Linea_canonical_token_bridge.svg";
import LineaBridgeGraphic from "/img/architecture/stack/bridges/canonical_token_bridge/Linea_canonical_token_bridge.svg";
import Tabs from "@theme/Tabs";
import TabItem from "@theme/TabItem";

Expand Down
6 changes: 3 additions & 3 deletions docs/architecture/stack/canonical-msg-service/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ image: /img/socialCards/canonical-message-service-overview.jpg
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Architecture_of_Linea/Canonical_Message_Service_overview/Linea_message_service_2.png"
src="/img/architecture/stack/canonical_msg_service/index/Linea_message_service_2.png"
alt="Linea message service architecture"
/>
</div>
Expand All @@ -30,7 +30,7 @@ However, the Service is not limited or restricted to use by Linea's core functio
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Architecture_of_Linea/Canonical_Message_Service_overview/Linea_bridge_architecture.png"
src="/img/architecture/stack/canonical_msg_service/index/Linea_bridge_architecture.png"
alt="Linea bridge architecture"
/>
</div>
Expand All @@ -51,7 +51,7 @@ There's an additional layer of logic, though, which serves to ensure that the me
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Architecture_of_Linea/Canonical_Message_Service_overview/Linea_message_service_1.png"
src="/img/architecture/stack/canonical_msg_service/index/Linea_message_service_1.png"
alt="Linea message service verification"
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sidebar_position: 2
image: /img/socialCards/conflation.jpg
---

import ConflationGraphic from '/img/article_images/Architecture_of_Linea/Sequencer/Conflation/Linea_block_conflation.svg';
import ConflationGraphic from '/img/architecture/stack/sequencer/conflation/Linea_block_conflation.svg';

## Conflation

Expand Down
8 changes: 4 additions & 4 deletions docs/developers/guides/bridge/how-to-bridge-erc20-tokens.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ and appropriately fund your wallet.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_connect_wallet_button.png"
src="/img/developers/guides/bridge/how_to_bridge_erc20_tokens/Linea_Bridge_connect_wallet_button.png"
alt="Linea bridge connect wallet button"
/>
</div>
Expand All @@ -49,7 +49,7 @@ and appropriately fund your wallet.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ERC20_tokens_between_Ethereum_and_Linea/Linea_Bridge_select_token.png"
src="/img/developers/guides/bridge/how_to_bridge_erc20_tokens/Linea_Bridge_select_token.png"
alt="Linea bridge select token"
/>
</div>
Expand All @@ -62,7 +62,7 @@ select it.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ERC20_tokens_between_Ethereum_and_Linea/Linea_Bridge_select_token_list.png"
src="/img/developers/guides/bridge/how_to_bridge_erc20_tokens/Linea_Bridge_select_token_list.png"
alt="Linea bridge select token list"
/>
</div>
Expand All @@ -73,7 +73,7 @@ select it.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ERC20_tokens_between_Ethereum_and_Linea/Linea_Bridge_selected_token.png"
src="/img/developers/guides/bridge/how_to_bridge_erc20_tokens/Linea_Bridge_selected_token.png"
alt="Linea bridge selected token"
/>
</div>
Expand Down
42 changes: 21 additions & 21 deletions docs/developers/guides/bridge/how-to-bridge-eth.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ until you can cover the fees.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_connect_wallet_button.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_connect_wallet_button.png"
alt="Linea bridge connect wallet button"
/>
</div>
Expand All @@ -64,7 +64,7 @@ until you can cover the fees.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_automatic_claim_set_eth_to_linea.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_automatic_claim_set_eth_to_linea.png"
alt="Linea bridge choose networks"
/>
</div>
Expand All @@ -75,7 +75,7 @@ until you can cover the fees.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_automatic_claim_eth_to_linea_amount.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_automatic_claim_eth_to_linea_amount.png"
alt="Linea bridge choose amount"
/>
</div>
Expand All @@ -86,7 +86,7 @@ until you can cover the fees.
<div class="center-container">
<div class="img-small">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_eth_to_linea_confirm.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_eth_to_linea_confirm.png"
alt="Confirm Linea bridge transaction in MetaMask"
/>
</div>
Expand All @@ -98,7 +98,7 @@ Linea Mainnet. You can see your pending transaction under the "Transactions" tab
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_eth_to_linea_pending.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_eth_to_linea_pending.png"
alt="Linea bridge pending transaction"
/>
</div>
Expand All @@ -110,7 +110,7 @@ Linea Mainnet.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_automatic_claim_eth_to_linea_completed.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_automatic_claim_eth_to_linea_completed.png"
alt="Linea bridge complete transaction"
/>
</div>
Expand All @@ -130,7 +130,7 @@ account's balance.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_connect_wallet_button.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_connect_wallet_button.png"
alt="Linea bridge connect wallet button"
/>
</div>
Expand All @@ -141,7 +141,7 @@ account's balance.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_manual_claim_set_eth_to_linea.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_manual_claim_set_eth_to_linea.png"
alt="Linea bridge choose networks"
/>
</div>
Expand All @@ -153,7 +153,7 @@ button.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_manual_claim_eth_to_linea_amount.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_manual_claim_eth_to_linea_amount.png"
alt="Linea bridge choose amount"
/>
</div>
Expand All @@ -164,7 +164,7 @@ button.
<div class="center-container">
<div class="img-small">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_eth_to_linea_confirm.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_eth_to_linea_confirm.png"
alt="Confirm Linea bridge transaction in MetaMask"
/>
</div>
Expand All @@ -176,7 +176,7 @@ labelled "Pending" until it is ready to claim. When it is ready, it will change
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_eth_to_linea_ready_to_claim.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_eth_to_linea_ready_to_claim.png"
alt="Linea bridge transaction ready to claim"
/>
</div>
Expand All @@ -187,7 +187,7 @@ To claim, click on the transaction to open its details, then click "Claim".
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_manual_claim_button.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_manual_claim_button.png"
alt="Confirm Linea bridge claim funds manually"
/>
</div>
Expand All @@ -198,7 +198,7 @@ To claim, click on the transaction to open its details, then click "Claim".
<div class="center-container">
<div class="img-small">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_manual_claim_confirm.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_manual_claim_confirm.png"
alt="Linea Bridge MetaMask manual claim confirmation"
/>
</div>
Expand All @@ -210,7 +210,7 @@ should be on Linea Mainnet.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_automatic_claim_eth_to_linea_completed.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_automatic_claim_eth_to_linea_completed.png"
alt="Linea bridge complete transaction"
/>
</div>
Expand All @@ -237,7 +237,7 @@ this option for L2 to L1 bridging.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_connect_wallet_button.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_connect_wallet_button.png"
alt="Linea bridge connect wallet button"
/>
</div>
Expand All @@ -249,7 +249,7 @@ option for L2 to L1 bridging.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_set_linea_to_eth.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_set_linea_to_eth.png"
alt="Linea bridge set Linea mainnet to Ethereum"
/>
</div>
Expand All @@ -261,7 +261,7 @@ button.
<div class="center-container">
<div class="img-medium">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_linea_to_eth_amount.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_linea_to_eth_amount.png"
alt="Linea bridge choose amount"
/>
</div>
Expand All @@ -272,7 +272,7 @@ button.
<div class="center-container">
<div class="img-small">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_linea_to_eth_confirm.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_linea_to_eth_confirm.png"
alt="Confirm Linea bridge transaction in MetaMask"
/>
</div>
Expand All @@ -284,7 +284,7 @@ at least 8 hours for the transaction to go through from L2 to L1.
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_linea_to_eth_pending.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_linea_to_eth_pending.png"
alt="Linea bridge pending transaction"
/>
</div>
Expand All @@ -297,7 +297,7 @@ To claim, click on the transaction to open its details, then click "Claim".
<div class="center-container">
<div class="img-large">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_linea_to_eth_manual_claim_button.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_linea_to_eth_manual_claim_button.png"
alt="Linea bridge claim manual transaction"
/>
</div>
Expand All @@ -308,7 +308,7 @@ To claim, click on the transaction to open its details, then click "Claim".
<div class="center-container">
<div class="img-small">
<img
src="/img/article_images/Use_Linea/Bridge_your_tokens/How_to_bridge_ETH_between_Ethereum_and_Linea/Linea_Bridge_linea_to_eth_manual_claim_confirm.png"
src="/img/developers/guides/bridge/how_to_bridge_eth/Linea_Bridge_linea_to_eth_manual_claim_confirm.png"
alt="MetaMask contract interaction notification"
/>
</div>
Expand Down
Loading

0 comments on commit f5dfe79

Please sign in to comment.