Skip to content

Commit

Permalink
Merge branch 'main' into pacaya_fork
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaikocha authored Jan 13, 2025
2 parents 5d28e03 + 70942ea commit 180d529
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages/bridge-ui": "2.13.0",
"packages/docs-site": "1.21.2",
"packages/docs-site": "1.21.3",
"packages/eventindexer": "0.13.0",
"packages/fork-diff": "0.6.1",
"packages/guardian-prover-health-check": "0.1.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/docs-site/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [1.21.3](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.21.2...docs-site-v1.21.3) (2025-01-13)


### Chores

* **docs-site:** update mainnet config graphic ([#18758](https://github.com/taikoxyz/taiko-mono/issues/18758)) ([b36576a](https://github.com/taikoxyz/taiko-mono/commit/b36576a367fbf3084aed3a9334821f7893d9c270))
* **docs-site:** update mainnet verifier addresses ([#18756](https://github.com/taikoxyz/taiko-mono/issues/18756)) ([eaa47bd](https://github.com/taikoxyz/taiko-mono/commit/eaa47bd2c82a4678e0e1b65c076693b4b3015c26))
* **docs-site:** update verifier addresses ([#18749](https://github.com/taikoxyz/taiko-mono/issues/18749)) ([bd0cb95](https://github.com/taikoxyz/taiko-mono/commit/bd0cb95c054075b32bf571d7c89a4768d370cb59))

## [1.21.2](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.21.1...docs-site-v1.21.2) (2025-01-07)


Expand Down
2 changes: 1 addition & 1 deletion packages/docs-site/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "docs-site",
"type": "module",
"version": "1.21.2",
"version": "1.21.3",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ description: Network reference page describing various important addresses on Ta
| AssignmentHook | `0x537a2f0D3a5879b41BCb5A2afE2EA5c4961796F6` | N/A |
| TierProvider | `0x4cffe56C947E26D07C14020499776DB3e9AE3a23` | N/A |
| SgxVerifier | `0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81` | N/A |
| Risc0Verifier | `0x55902b2D3DF2A65370A89C86Ae9dd71Ecd508edc` | N/A |
| SP1Verifier | `0x5c44f2239925b0d86d2BFEe539f19CD0A08Af452` | N/A |
| AutomataDcapAttestation | `0x8d7C954960a36a7596d7eA4945dDf891967ca8A3` | N/A |
| PemCertChainLib | `0x02772b7B3a5Bea0141C993Dbb8D0733C19F46169` | N/A |
| P256Verifier | `0x11A9ebA17EbF92b40fcf9a640Ebbc47Db6fBeab0` | N/A |
Expand Down
33 changes: 6 additions & 27 deletions packages/protocol/CHANGELOG.md

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions packages/protocol/deployments/mainnet-contract-logs-L1.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@
- taiko: `0x06a9Ab27c7e2255df1815E6CC0168d7755Feb19a`
- tier_router: `0x8a4c692F12d3a9750E744A4CE24a1d351bE52E66`
- tier_sgx: `0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81`
- risc0_groth16_verifier: `0xcF706D99C265fC2349AE43c5f6BFD7931FE5308D`
- risc0_groth16_verifier: `0xf31DE43cc0cF75245adE63d3Dabf58d4332855e9`
- tier_zkvm_risc0: `0x55902b2D3DF2A65370A89C86Ae9dd71Ecd508edc`
- sp1_remote_verifier: `0x2D33d748644dAb8B3FB0E07642d9dE96b816d067`
- sp1_remote_verifier: `0x68593ad19705E9Ce919b2E368f5Cb7BAF04f7371`
- tier_zkvm_sp1: `0x5c44f2239925b0d86d2BFEe539f19CD0A08Af452`
- tier_guardian_minority: `0x579A8d63a2Db646284CBFE31FE5082c9989E985c`
- tier_guardian: `0xE3D777143Ea25A6E031d1e921F396750885f43aC`
Expand Down Expand Up @@ -357,15 +357,17 @@

#### risc0_groth16_verifier

- impl: `0xcF706D99C265fC2349AE43c5f6BFD7931FE5308D`
- impl: `0xf31DE43cc0cF75245adE63d3Dabf58d4332855e9`
- logs:
- deployed on Nov 6, 2024 @commit`bfb0386`
- deployed on Jan 13, 2025 @commit`a58852f`

#### sp1_remote_verifier

- impl: `0x2D33d748644dAb8B3FB0E07642d9dE96b816d067`
- impl: `0x68593ad19705E9Ce919b2E368f5Cb7BAF04f7371`
- logs:
- deployed on Nov 8, 2024 @commit`0b11101`
- deployed on Jan 13, 2025 @commit`a58852f`

#### automata_dcap_attestation

Expand Down
4 changes: 4 additions & 0 deletions packages/taiko-client/driver/txlist_fetcher/calldata.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,9 @@ func (d *CalldataFetcher) Fetch(
return iter.Event.TxList, nil
}

if iter.Error() != nil {
return nil, fmt.Errorf("failed to fetch calldata for block %d: %w", meta.GetBlockID(), iter.Error())
}

return nil, fmt.Errorf("calldata for block %d not found", meta.GetBlockID())
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,6 @@ func assembleBlockProposedIteratorCallback(
) error {
endHeight := end.Number.Uint64()

iter, err := taikoL1.FilterBlockProposed(
&bind.FilterOpts{Start: start.Number.Uint64(), End: &endHeight, Context: ctx},
filterQuery,
nil,
)
if err != nil {
return err
}
defer iter.Close()

iterOntake, err := taikoL1.FilterBlockProposedV2(
&bind.FilterOpts{Start: start.Number.Uint64(), End: &endHeight, Context: ctx},
filterQuery,
Expand All @@ -130,26 +120,6 @@ func assembleBlockProposedIteratorCallback(
}
defer iterOntake.Close()

for iter.Next() {
event := iter.Event

if err := callback(ctx, metadata.NewTaikoDataBlockMetadataLegacy(event), eventIter.end); err != nil {
return err
}

if eventIter.isEnd {
endFunc()
return nil
}

current, err := client.HeaderByHash(ctx, event.Raw.BlockHash)
if err != nil {
return err
}

updateCurrentFunc(current)
}

for iterOntake.Next() {
event := iterOntake.Event

Expand All @@ -170,6 +140,6 @@ func assembleBlockProposedIteratorCallback(
updateCurrentFunc(current)
}

return nil
return iterOntake.Error()
}
}
9 changes: 9 additions & 0 deletions packages/taiko-client/pkg/rpc/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ func (c *Client) ensureGenesisMatched(ctx context.Context) error {
if iter.Next() {
l2GenesisHash = iter.Event.BlockHash
}
if iter.Error() != nil {
return iter.Error()
}
} else {
// Fetch the genesis `BlockVerified` event.
iter, err := c.TaikoL1.FilterBlockVerified(filterOpts, []*big.Int{common.Big0}, nil)
Expand All @@ -84,6 +87,9 @@ func (c *Client) ensureGenesisMatched(ctx context.Context) error {
if iter.Next() {
l2GenesisHash = iter.Event.BlockHash
}
if iter.Error() != nil {
return iter.Error()
}
}

log.Debug("Genesis hash", "node", nodeGenesis.Hash(), "TaikoL1", common.BytesToHash(l2GenesisHash[:]))
Expand Down Expand Up @@ -836,6 +842,9 @@ func (c *Client) GetTaikoDataSlotBByNumber(ctx context.Context, number uint64) (
for iter.Next() {
return &iter.Event.SlotB, nil
}
if iter.Error() != nil {
return nil, fmt.Errorf("failed to get state variables by block number %d: %w", number, iter.Error())
}

return nil, fmt.Errorf("failed to get state variables by block number %d", number)
}
Expand Down

0 comments on commit 180d529

Please sign in to comment.