Skip to content

Commit

Permalink
Merge branch 'main' into gas-estimation-fix-5
Browse files Browse the repository at this point in the history
  • Loading branch information
jlwllmr authored Sep 9, 2024
2 parents 9668c20 + 06b09f3 commit 1ce7df8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ to manage Node.js versions on your machine.

### Build

$ npm run build
$ npm run build

This command generates static content into the `build` directory and can be served using any static
contents hosting service.

### Adding new words to the dictionary

This repository includes a _linter_, which you can think of as a spell-check that also checks code
formatting and standards, and a lot more. It's possible that you will use a word in your content
formatting and standards, and a lot more. It's possible that you might use a word in your content
that is not known to the linter, and your build, or commit, will fail.

You can run the linter any time with the command `npm run lint`.
Expand Down
6 changes: 3 additions & 3 deletions docs/architecture/overview/transaction-lifecycle.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ image: /img/socialCards/transaction-lifecycle.jpg

Finality has two definitions on Linea:
- Soft finality: The transaction is confirmed on Linea. This takes two seconds, i.e Linea's block
time. See [step 3](#step-3-transaction-data-sent-to-the-state-manager). For simplicity, Linea does
not reorg—remove competing versions of blockchain history in favor of a canonical one—when there
are reorgs on L1.
time. See [step 3](#step-3-transaction-data-sent-to-the-state-manager). For simplicity, Linea is
guaranteed to not reorg—remove competing versions of blockchain history in favor of a canonical
one—when there are reorgs on L1.
- Hard finality: The proof submitted to L1 has been verified, and two epochs have elapsed. The
typical time before hard finality is 8-32 hours, although the 8-hour minimum will be reduced to
zero in a future release. See [step 6](#step-6-batch-finalization).
Expand Down
8 changes: 4 additions & 4 deletions docs/developers/linea-version/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,8 @@ Contracts audit is in progress. This does not reflect final versions.
</details>

- Contracts
- [Transparent Proxy](https://goerli.lineascan.build/address/0xC499a572640B64eA1C8c194c43Bc3E19940719dC/contracts#address-tabs)
- [Implementation](https://goerli.lineascan.build/address/0xc0557e2149751e201749b87f86acd91DB22e2662/contracts#address-tabs)
- Transparent Proxy: `0xC499a572640B64eA1C8c194c43Bc3E19940719dC`
- Implementation: `0xc0557e2149751e201749b87f86acd91DB22e2662`

- Bridging partners, before sending messages on L2, need to retrieve the service protection fee before sending messages and include it in the value sent.

Expand All @@ -637,7 +637,7 @@ Major changes are applied to the Canonical Token Bridge as described in our [doc
</details>

- Contracts
- [Transparent Proxy](https://goerli.lineascan.build/address/0xB191E3d98074f92584E5205B99c3F17fB2068927)
- [Implementation](https://goerli.lineascan.build/address/0x6081C1392793e22dA39871D4362c1e7045A5bace)
- Transparent Proxy: `0xB191E3d98074f92584E5205B99c3F17fB2068927`
- Implementation: `0x6081C1392793e22dA39871D4362c1e7045A5bace`

If you have any questions, please reach out in the **Developer Support** channel in our [community forum](https://community.linea.build/c/developer-support)!

0 comments on commit 1ce7df8

Please sign in to comment.