Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit e550aae

Browse files
authored
Merge branch 'main' into bitcoin-bridge-update
2 parents 26e94fb + 17049b3 commit e550aae

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

docs/technical/bitcoin-bridge.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ it is broadcast to bitcoin for confirmation.
3131

3232
Deposits and withdrawals are allowed in a denomination of $D$ BTC where
3333
$D = 10 \ \text{BTC}$ is a value predefined by the bridge federation.
34-
The operator fee is set at 5% of the bridge denomination.
34+
35+
The operator fee is set at 5% of the bridge denomination.
3536
The minimum relay fee for transactions is 10 satoshis per vByte.
3637

3738
!!! info
@@ -46,7 +47,9 @@ it is broadcast to bitcoin for confirmation.
4647
The deposit process is initiated by the user,
4748
who sends 10[^fees] BTC to a P2TR address, where:
4849

49-
[^fees]: The user must pay the bitcoin network fees for both the Deposit Request and Deposit Transactions.
50+
[^fees]:
51+
The user must pay the bitcoin network fees for both
52+
the Deposit Request and Deposit Transactions.
5053

5154
1. The key path spend is unspendable, following
5255
[BIP 341](https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#constructing-and-spending-taproot-outputs)

docs/technical/comparing-ethereum.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
## EVM compatibility
44

55
Strata is an EVM-compatible blockchain.
6-
The execution client used by the Strata block producer is based on reth
7-
and is fully compatible with the EVM spec.
8-
During the devnet phase, Strata can be considered a Type 1 zkEVM.
6+
The execution client used by the Strata block producer is based on Reth
7+
and is fully compatible with the EVM spec up to the
8+
[Shanghai](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
9+
release. During the devnet phase, Strata can be considered a Type 1 zkEVM.
910

1011
!!! note
1112

@@ -19,9 +20,9 @@ Comparing differences in how Strata and Ethereum functionally operate:
1920

2021
<!-- markdownlint-disable line-length -->
2122

22-
| | Strata | Ethereum |
23+
| | Strata Devnet | Ethereum |
2324
| ---------------- | ------------------------------------------------------------------------------------------------------ | -------------- |
24-
| Consensus: | Proof of Work | Proof of Stake |
25+
| Consensus: | Proof of Authority | Proof of Stake |
2526
| Gas asset: | BTC | ETH |
2627
| Block gas limit: | 15,000,000 | 30,000,000 |
2728
| Block time: | ~5s | ~12s |

mkdocs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ nav:
7979
- Transaction lifecycle: technical/transaction-lifecycle.md
8080
- Bitcoin bridge: technical/bitcoin-bridge.md
8181
- Comparing Strata and Ethereum: technical/comparing-ethereum.md
82+
- Security: security.txt
8283
- Community:
8384
- Website: https://stratabtc.org
84-
#- GitHub: https://github.com/alpenlabs/docs/pull/5
85+
- GitHub: https://github.com/alpenlabs/strata
8586
- Telegram: https://t.me/Strata_Community
8687
- Twitter: https://twitter.com/Strata_BTC

0 commit comments

Comments
 (0)