Merge branch 'main' into feat/blobstorage-blocks_meta-table

taikoxyz · Apr 10, 2024 · 564858e · 564858e
2 parents c7ff140 + e25ad9f
commit 564858e
Show file tree

Hide file tree

Showing 20 changed files with 112 additions and 92 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -6,6 +6,6 @@
   "packages/fork-diff": "0.4.0",
   "packages/guardian-prover-health-check": "0.1.0",
   "packages/guardian-prover-health-check-ui": "0.1.0",
-  "packages/protocol": "1.2.0",
+  "packages/protocol": "1.3.0",
   "packages/relayer": "0.12.0"
 }
diff --git a/packages/blobstorage/.default.indexer.env b/packages/blobstorage/.default.indexer.env
@@ -3,7 +3,7 @@ BEACON_URL=https://l1beacon.hekla.taiko.xyz
 TAIKO_L1_CONTRACT_ADDRESS=0xC069c3d2a9f2479F559AD34485698ad5199C555f
 DATABASE_HOST=localhost
 DATABASE_PORT=3306
-DATABASE_USER=root
-DATABASE_PASSWORD=passw00d
+DATABASE_USER=
+DATABASE_PASSWORD=
 DATABASE_NAME=blobs
 METRICS_HTTP_PORT=7472
diff --git a/packages/blobstorage/.default.server.env b/packages/blobstorage/.default.server.env
@@ -1,7 +1,7 @@
 HTTP_PORT=3282
 DATABASE_HOST=localhost
 DATABASE_PORT=3306
-DATABASE_USER=root
-DATABASE_PASSWORD=passw00d
+DATABASE_USER=
+DATABASE_PASSWORD=
 DATABASE_NAME=blobs
 METRICS_HTTP_PORT=7471
diff --git a/packages/blobstorage/README.md b/packages/blobstorage/README.md
@@ -28,8 +28,8 @@ Repository for BLOB storage (archive and serve data)
 
    ```bash
    cd ./migrations
-   goose mysql "root:passw00d@tcp(localhost:3306)/blobs" status
-   goose mysql "root:passw00d@tcp(localhost:3306)/blobs" up
+   goose mysql "<user>:<password>@tcp(localhost:3306)/blobs" status
+   goose mysql "<user>:<password>@tcp(localhost:3306)/blobs" up
    ```
 
    These commands apply migrations to the `blobs` database.

diff --git a/packages/eventindexer/.l1.env b/packages/eventindexer/.l1.env
@@ -1,7 +1,7 @@
 HTTP_PORT=4100
 PROMETHEUS_HTTP_PORT=6063
-DATABASE_USER=root
-DATABASE_PASSWORD=root
+DATABASE_USER=
+DATABASE_PASSWORD=
 DATABASE_NAME=eventindexer
 DATABASE_HOST=localhost:3306
 DATABASE_MAX_IDLE_CONNS=50

diff --git a/packages/eventindexer/.l2.env b/packages/eventindexer/.l2.env
@@ -1,7 +1,7 @@
 HTTP_PORT=4009
 METRICS_HTTP_PORT=6067
-DATABASE_USER=root
-DATABASE_PASSWORD=root
+DATABASE_USER=
+DATABASE_PASSWORD=
 DATABASE_NAME=eventindexer
 DATABASE_HOST=localhost:3306
 DATABASE_MAX_IDLE_CONNS=50

diff --git a/packages/eventindexer/cmd/flags/disperser.go b/packages/eventindexer/cmd/flags/disperser.go
@@ -18,7 +18,7 @@ var (
 		EnvVars:  []string{"TAIKO_TOKEN_ADDRESS"},
 	}
 	DispersalAmount = &cli.StringFlag{
-		Name:     "taikoTokenAddress",
+		Name:     "dispersalAmount",
 		Usage:    "Dispersal amount in wei",
 		Required: true,
 		Category: disperserCategory,

diff --git a/packages/eventindexer/pkg/tasks/tasks.go b/packages/eventindexer/pkg/tasks/tasks.go
@@ -3,8 +3,6 @@ package tasks
 var (
 	TotalTransactions               = "total-transactions"
 	TransactionsPerDay              = "transactions-per-day"
-	TotalBlocks                     = "total-blocks"
-	BlocksPerDay                    = "blocks-per-day"
 	TotalAccounts                   = "total-accounts"
 	AccountsPerDay                  = "accounts-per-day"
 	UniqueProposersPerDay           = "unique-proposers-per-day"
@@ -32,8 +30,6 @@ var (
 var Tasks = []string{
 	TotalTransactions,
 	TransactionsPerDay,
-	TotalBlocks,
-	BlocksPerDay,
 	TotalAccounts,
 	AccountsPerDay,
 	UniqueProposersPerDay,

diff --git a/packages/protocol/CHANGELOG.md b/packages/protocol/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.3.0](https://github.com/taikoxyz/taiko-mono/compare/protocol-v1.2.0...protocol-v1.3.0) (2024-04-10)
+
+
+### Features
+
+* **protocol:** add `TaikoL1.getTransition(blockId, transitionID)` function ([2c63cb0](https://github.com/taikoxyz/taiko-mono/commit/2c63cb0c796495948f1dd887662044397394d852))
+* **protocol:** allow assigned prover to prove blocks outside proving window (liveness bond not returned) ([2c63cb0](https://github.com/taikoxyz/taiko-mono/commit/2c63cb0c796495948f1dd887662044397394d852))
+* **protocol:** allow bridge to fail a message by the owner without retrying it ([#16669](https://github.com/taikoxyz/taiko-mono/issues/16669)) ([dce651e](https://github.com/taikoxyz/taiko-mono/commit/dce651e2647013b0d13d7947e0fd0115f38fe639))
+* **protocol:** remove `contestations` from `TransitionState` and events (it's buggy) ([2c63cb0](https://github.com/taikoxyz/taiko-mono/commit/2c63cb0c796495948f1dd887662044397394d852))
+* **protocol:** use 35000 as gas limit for sending Ether in Brdge ([#16666](https://github.com/taikoxyz/taiko-mono/issues/16666)) ([4909782](https://github.com/taikoxyz/taiko-mono/commit/4909782194ae025ff78438126c1e595f404e16a9))
+
+
+### Bug Fixes
+
+* **protocol:** add GovernorSettingsUpgradeable ([#16687](https://github.com/taikoxyz/taiko-mono/issues/16687)) ([eba82ba](https://github.com/taikoxyz/taiko-mono/commit/eba82bad1075afc695f3203304160f26e42627a9))
+* **protocol:** check invocation gas limit also in `retryMessage` ([#16660](https://github.com/taikoxyz/taiko-mono/issues/16660)) ([8209a43](https://github.com/taikoxyz/taiko-mono/commit/8209a437436f9a84d1e75bbafe6780952401d6a2))
+* **protocol:** check no loops in multi-hop in Bridge ([#16659](https://github.com/taikoxyz/taiko-mono/issues/16659)) ([447cd52](https://github.com/taikoxyz/taiko-mono/commit/447cd5252d141dfd38a2764d570b9168762c0d4b))
+* **protocol:** fix potential 1271 signature replay if proposers are smart contracts ([#16665](https://github.com/taikoxyz/taiko-mono/issues/16665)) ([2b27477](https://github.com/taikoxyz/taiko-mono/commit/2b27477ec0f9e5f0e0326d302531f93ff2c65de3))
+* **protocol:** return liveness bond only to assigned prover ([2c63cb0](https://github.com/taikoxyz/taiko-mono/commit/2c63cb0c796495948f1dd887662044397394d852))
+
 ## [1.2.0](https://github.com/taikoxyz/taiko-mono/compare/protocol-v1.1.0...protocol-v1.2.0) (2024-04-05)
 
 

diff --git a/packages/protocol/contracts/bridge/Bridge.sol b/packages/protocol/contracts/bridge/Bridge.sol
@@ -473,11 +473,11 @@ contract Bridge is EssentialContract, IBridge {
         );
     }
 
-    /// @notice Checks if a msgHash has failed on its destination chain.
+    /// @notice Checks if a msgHash has been received on its source chain.
     /// This is the 'readonly' version of proveMessageReceived.
     /// @param _message The message.
     /// @param _proof The merkle inclusion proof.
-    /// @return true if the message has failed, false otherwise.
+    /// @return true if the message has been received, false otherwise.
     function isMessageReceived(
         Message calldata _message,
         bytes calldata _proof

diff --git a/packages/protocol/package.json b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taiko/protocol",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": true,
   "scripts": {
     "buildMerkle": "ts-node ./utils/airdrop/buildMerkleTree.ts ./utils/airdrop/airdrop_db/example_claimList.json",

diff --git a/packages/relayer/.default.env b/packages/relayer/.default.env
@@ -1,7 +1,7 @@
 HTTP_PORT=4101
 PROMETHEUS_HTTP_PORT=6061
-MYSQL_USER=root
-MYSQL_PASSWORD=root
+MYSQL_USER=
+MYSQL_PASSWORD=
 MYSQL_DATABASE=relayer
 MYSQL_HOST=localhost:3306
 MYSQL_MAX_IDLE_CONNS=50

diff --git a/packages/relayer/.l1indexer.example.env b/packages/relayer/.l1indexer.example.env
@@ -1,14 +1,14 @@
 HTTP_PORT=4103
 METRICS_HTTP_PORT=6062
-DATABASE_USER=root
-DATABASE_PASSWORD=root
+DATABASE_USER=
+DATABASE_PASSWORD=
 DATABASE_NAME=relayer
 DATABASE_HOST=localhost:3306
 DATABASE_MAX_IDLE_CONNS=50
 DATABASE_MAX_OPEN_CONNS=3000
 DATABASE_CONN_MAX_LIFETIME=100000
-QUEUE_USER=guest
-QUEUE_PASSWORD=guest
+QUEUE_USER=
+QUEUE_PASSWORD=
 QUEUE_HOST=localhost
 QUEUE_PORT=5672
 EVENT_NAME=MessageSent

diff --git a/packages/relayer/.l1processor.example.env b/packages/relayer/.l1processor.example.env
@@ -1,13 +1,13 @@
 PROMETHEUS_HTTP_PORT=6062
-DATABASE_USER=root
-DATABASE_PASSWORD=passw00d
+DATABASE_USER=
+DATABASE_PASSWORD=
 DATABASE_NAME=relayer
 DATABASE_HOST=localhost:3306
 DATABASE_MAX_IDLE_CONNS=50
 DATABASE_MAX_OPEN_CONNS=3000
 DATABASE_CONN_MAX_LIFETIME=100000
-QUEUE_USER=guest
-QUEUE_PASSWORD=guest
+QUEUE_USER=
+QUEUE_PASSWORD=
 QUEUE_HOST=localhost
 QUEUE_PORT=5672
 PROCESSOR_PRIVATE_KEY=

diff --git a/packages/relayer/README.md b/packages/relayer/README.md
@@ -36,8 +36,8 @@ To migrate the database schema in MySQL:
 
 ```sh
 cd ./migrations
-goose mysql "root:passw00d@tcp(localhost:3306)/relayer" status
-goose mysql "root:passw00d@tcp(localhost:3306)/relayer" up
+goose mysql "<user>:<password>@tcp(localhost:3306)/relayer" status
+goose mysql "<user>:<password>@tcp(localhost:3306)/relayer" up
 ```
 
 ### Configure Environment Variables

diff --git a/packages/relayer/docker-compose/docker-compose.yml b/packages/relayer/docker-compose/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     restart: always
     environment:
       - MYSQL_DATABASE=relayer
-      - MYSQL_ROOT_PASSWORD=passw00d
+      - MYSQL_ROOT_PASSWORD=<password>
     ports:
       - "3306:3306"
     volumes: