Merge branch 'main' into switch-to-use-gar

taikoxyz · Apr 21, 2024 · c2b6db4 · c2b6db4
2 parents 5239d8f + b96dc31
commit c2b6db4
Show file tree

Hide file tree

Showing 9 changed files with 618 additions and 12 deletions.
diff --git a/bindings/.githead b/bindings/.githead
@@ -1 +1 @@
-3049b0c96812d8994117e3bda3bb56c1772b12a3
+00f8954536c3572fe0062b7de0a9537921f38323
diff --git a/bindings/gen_lib_verifying.go b/bindings/gen_lib_verifying.go
diff --git a/bindings/gen_taiko_l1.go b/bindings/gen_taiko_l1.go
diff --git a/bindings/gen_taiko_l2.go b/bindings/gen_taiko_l2.go
diff --git a/bindings/gen_taiko_token.go b/bindings/gen_taiko_token.go
diff --git a/driver/state/l1_current.go b/driver/state/l1_current.go
@@ -2,7 +2,7 @@ package state
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -29,7 +29,7 @@ func (s *State) SetL1Current(h *types.Header) {
 // BlockProposed event with given blockID / blockHash.
 func (s *State) ResetL1Current(ctx context.Context, blockID *big.Int) error {
 	if blockID == nil {
-		return fmt.Errorf("empty block ID")
+		return errors.New("empty block ID")
 	}
 
 	log.Info("Reset L1 current cursor", "blockID", blockID)

diff --git a/integration_test/l1_env.sh b/integration_test/l1_env.sh
@@ -10,7 +10,7 @@ export TAIKO_TOKEN_PREMINT_RECIPIENT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 export TAIKO_TOKEN_NAME="Taiko Token Test"
 export TAIKO_TOKEN_SYMBOL="TTKOt"
 export TIER_PROVIDER="devnet"
-
+export TAIKO_TOKEN=0x0000000000000000000000000000000000000000
 export SHARED_ADDRESS_MANAGER=0x0000000000000000000000000000000000000000
 export PROPOSER=0x0000000000000000000000000000000000000000
 export PROPOSER_ONE=0x0000000000000000000000000000000000000000

diff --git a/pkg/rpc/engine.go b/pkg/rpc/engine.go
@@ -2,7 +2,7 @@ package rpc
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/beacon/engine"
@@ -22,7 +22,7 @@ type EngineClient struct {
 func NewJWTEngineClient(url, jwtSecret string) (*EngineClient, error) {
 	var jwt = StringToBytes32(jwtSecret)
 	if jwt == (common.Hash{}) || url == "" {
-		return nil, fmt.Errorf("url is empty or jwt secret is illegal")
+		return nil, errors.New("url is empty or jwt secret is illegal")
 	}
 	authClient, err := rpc.DialOptions(context.Background(), url, rpc.WithHTTPAuth(node.NewJWTAuth(jwt)))
 	if err != nil {

diff --git a/prover/config.go b/prover/config.go
@@ -120,7 +120,7 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 
 	// If we are not running a guardian prover, a raiko host endpoint is required.
 	if !c.IsSet(flags.GuardianProver.Name) && !c.IsSet(flags.RaikoHostEndpoint.Name) {
-		return nil, fmt.Errorf("raiko host not provided")
+		return nil, errors.New("raiko host not provided")
 	}
 
 	var (