Skip to content

Commit

Permalink
Merge pull request #437 from trilitech/staging
Browse files Browse the repository at this point in the history
Update main from staging, 28 August
  • Loading branch information
timothymcmackin authored Aug 28, 2024
2 parents 888a87d + f78ec42 commit 7569fa3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/overview/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Tezos has robust applications ranging from NFTs, DeFi, and gaming to enterprise

With recent Tezos upgrades heavily focusing on scaling solutions, Tezos has been at the forefront of blockchain research. Up to 1 million transactions per second (TPS) are theoretically possible on Tezos with the advent of Smart Rollups, which have emerged as a strong scaling solution. With Smart Rollups (also known as optimistic rollups), transactions can be performed more quickly and cheaply and use other VMs that “roll up” their state changes onto Tezos.

[Etherlink](https://www.etherlink.com) is another exciting technology in development that will greatly enlarge the possible applications and versatility of Tezos. Etherlink builds on Smart Rollups and combines them with [DAL (Data Availability Layer)](https://research-development.nomadic-labs.com/dal-testers.html>) to provide an EVM-compatible Layer 2 solution which is truly decentralized, low-latency, and low-cost.
[Etherlink](https://www.etherlink.com) is another exciting technology in development that will greatly enlarge the possible applications and versatility of Tezos. Etherlink builds on Smart Rollups and combines them with [DAL (Data Availability Layer)](https://research-development.nomadic-labs.com/dal-testers.html) to provide an EVM-compatible Layer 2 solution which is truly decentralized, low-latency, and low-cost.

These innovations demonstrate the ongoing dedication of Tezos to foster innovation in the blockchain industry.
2 changes: 1 addition & 1 deletion src/components/Footer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styles from './styles.module.css';
import { ChatBob } from '@site/src/components/ChatBob'

const socialLinks = [
{ name: 'Discord', link: 'https://discord.gg/yXaPy6s5Nr', icon: '/img/socials/Tezos-social-icon-white-01.svg' },
{ name: 'Discord', link: 'https://discord.gg/tezos-blockchain-699325006928281720', icon: '/img/socials/Tezos-social-icon-white-01.svg' },
{ name: 'Telegram', link: 'https://t.me/tezosplatform', icon: '/img/socials/Tezos-social-icon-white-02.svg' },
{ name: 'TezosAgora', link: 'https://forum.tezosagora.org/', icon: '/img/socials/Tezos-social-icon-white-03.svg' },
{ name: 'Github', link: 'https://github.com/tezos/tezos', icon: '/img/socials/Tezos-social-icon-white-04.svg' },
Expand Down

0 comments on commit 7569fa3

Please sign in to comment.