Merge branch 'main' into fallback-builder

go.mod

@@ -42,8 +42,8 @@ require (
 	gopkg.in/go-playground/assert.v1 v1.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/datatypes v1.2.5
-	gorm.io/driver/mysql v1.5.6
-	gorm.io/gorm v1.25.11
+	gorm.io/driver/mysql v1.5.7
+	gorm.io/gorm v1.25.12
 	gotest.tools v2.2.0+incompatible
 )
 

go.sum

@@ -876,8 +876,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/datatypes v1.2.5 h1:9UogU3jkydFVW1bIVVeoYsTpLRgwDVW3rHfJG6/Ek9I=
 gorm.io/datatypes v1.2.5/go.mod h1:I5FUdlKpLb5PMqeMQhm30CQ6jXP8Rj89xkTeCSAaAD4=
-gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
-gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
 gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
 gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
 gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw=
@@ -888,8 +888,8 @@ gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH
 gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
-gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg=
-gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=

packages/guardian-prover-health-check/http/server.go

@@ -23,7 +23,7 @@ import (
 // @license.name MIT
 
 // @host healthcheck.internal.taiko.xyz
-// Server represents an guardian prover health check http server instance.
+// Server represents a guardian prover health check http server instance.
 type Server struct {
 	echo            *echo.Echo
 	ethClient       *ethclient.Client

packages/protocol/test/layer1/automata-attestation/utils/DcapTestUtils.t.sol

@@ -235,7 +235,7 @@ contract DcapTestUtils {
     // Converts a string to a hexstring (of bytes type)
     // https://ethereum.stackexchange.com/questions/39989/solidity-convert-hex-string-to-bytes
 
-    // Convert an hexadecimal character to their value
+    // Convert a hexadecimal character to their value
     function _fromHexChar(uint8 c) private pure returns (uint8) {
         if (bytes1(c) >= bytes1("0") && bytes1(c) <= bytes1("9")) {
             return c - uint8(bytes1("0"));
@@ -249,7 +249,7 @@ contract DcapTestUtils {
         revert("failed to convert hex value");
     }
 
-    // Convert an hexadecimal string to raw bytes
+    // Convert a hexadecimal string to raw bytes
     function _fromHex(string memory s) private pure returns (bytes memory) {
         bytes memory ss = bytes(s);
         require(ss.length % 2 == 0); // length must be even

packages/protocol/test/shared/bridge/Bridge2_sendMessage.t.sol

@@ -31,7 +31,7 @@ contract BridgeTest2_sendMessage is BridgeTest2 {
         vm.expectRevert(Bridge.B_INVALID_CHAINID.selector);
         bridge.sendMessage(message);
 
-        // an bridge has been registered for remoteChainId
+        // a bridge has been registered for remoteChainId
         message.destChainId = remoteChainId;
         bridge.sendMessage(message); // id = 0