From f9e89ccdfa306a8429268d9f7152d97af7d35b03 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Sat, 17 Aug 2024 04:28:31 -0400 Subject: [PATCH] chore: go fmt --- commitments/da_service_op.go | 3 +-- commitments/eigenda.go | 4 +--- commitments/mode.go | 17 ++++++++-------- commitments/op.go | 5 ++--- e2e/server_test.go | 39 ++++++++++++++++++------------------ server/config.go | 9 ++++----- server/load_store.go | 4 ++-- server/server.go | 8 ++++---- store/eigenda.go | 3 +-- store/router.go | 2 +- store/s3.go | 2 +- store/store.go | 1 - verify/cert.go | 22 ++++++++++---------- 13 files changed, 55 insertions(+), 64 deletions(-) diff --git a/commitments/da_service_op.go b/commitments/da_service_op.go index 820be73..2c923a1 100644 --- a/commitments/da_service_op.go +++ b/commitments/da_service_op.go @@ -17,7 +17,6 @@ type DaSvcCommitment interface { type EigenDASvcCommitment []byte - // NewEigenDASvcCommitment creates a new commitment from the given input. func NewEigenDASvcCommitment(input []byte) EigenDASvcCommitment { return EigenDASvcCommitment(crypto.Keccak256(input)) @@ -40,4 +39,4 @@ func (c EigenDASvcCommitment) CommitmentType() DAServiceOPCommitmentType { // Encode adds a commitment type prefix self describing the commitment. func (c EigenDASvcCommitment) Encode() []byte { return append([]byte{byte(EigenDACommitmentType)}, c...) -} \ No newline at end of file +} diff --git a/commitments/eigenda.go b/commitments/eigenda.go index f8c9d48..2a6686d 100644 --- a/commitments/eigenda.go +++ b/commitments/eigenda.go @@ -1,6 +1,5 @@ package commitments - type CertEncodingCommitment byte const ( @@ -16,7 +15,6 @@ type CertCommitment interface { type CertCommitmentV0 []byte - // NewV0CertCommitment creates a new commitment from the given input. func NewV0CertCommitment(input []byte) CertCommitmentV0 { return CertCommitmentV0(input) @@ -38,4 +36,4 @@ func (c CertCommitmentV0) CommitmentType() CertEncodingCommitment { // Encode adds a commitment type prefix self describing the commitment. func (c CertCommitmentV0) Encode() []byte { return append([]byte{byte(CertV0)}, c...) -} \ No newline at end of file +} diff --git a/commitments/mode.go b/commitments/mode.go index 182c933..9788fe5 100644 --- a/commitments/mode.go +++ b/commitments/mode.go @@ -8,9 +8,9 @@ import ( type CommitmentMode string const ( - OptimismGeneric CommitmentMode = "optimism_keccak256" - OptimismAltDA CommitmentMode = "optimism_generic" - SimpleCommitmentMode CommitmentMode = "simple" + OptimismGeneric CommitmentMode = "optimism_keccak256" + OptimismAltDA CommitmentMode = "optimism_generic" + SimpleCommitmentMode CommitmentMode = "simple" ) func StringToCommitmentMode(s string) (CommitmentMode, error) { @@ -49,7 +49,7 @@ func StringToDecodedCommitment(key string, c CommitmentMode) ([]byte, error) { return b[3:], nil case SimpleCommitmentMode: // [cert_version, ...] - return b[1:], nil + return b[1:], nil default: return nil, fmt.Errorf("unknown commitment type") @@ -57,22 +57,21 @@ func StringToDecodedCommitment(key string, c CommitmentMode) ([]byte, error) { } func EncodeCommitment(b []byte, c CommitmentMode) ([]byte, error) { - + switch c { case OptimismGeneric: return Keccak256Commitment(b).Encode(), nil case OptimismAltDA: - certCommit := NewV0CertCommitment(b).Encode() + certCommit := NewV0CertCommitment(b).Encode() svcCommit := EigenDASvcCommitment(certCommit).Encode() altDACommit := NewGenericCommitment(svcCommit).Encode() return altDACommit, nil - + case SimpleCommitmentMode: return NewV0CertCommitment(b).Encode(), nil } return nil, fmt.Errorf("unknown commitment mode") -} - +} diff --git a/commitments/op.go b/commitments/op.go index 01bc60c..f14c661 100644 --- a/commitments/op.go +++ b/commitments/op.go @@ -14,7 +14,6 @@ var ErrInvalidCommitment = errors.New("invalid commitment") // ErrCommitmentMismatch is returned when the commitment does not match the given input. var ErrCommitmentMismatch = errors.New("commitment mismatch") - // OPCommitmentType is the commitment type prefix. type OPCommitmentType byte @@ -35,8 +34,8 @@ func CommitmentTypeFromString(s string) (OPCommitmentType, error) { const ( Keccak256CommitmentType OPCommitmentType = 0 GenericCommitmentType OPCommitmentType = 1 - KeccakCommitmentString string = "KeccakCommitment" - GenericCommitmentString string = "GenericCommitment" + KeccakCommitmentString string = "KeccakCommitment" + GenericCommitmentString string = "GenericCommitment" ) // OPCommitment is the binary representation of a commitment. diff --git a/e2e/server_test.go b/e2e/server_test.go index 804a18e..d3e0ecc 100644 --- a/e2e/server_test.go +++ b/e2e/server_test.go @@ -158,7 +158,6 @@ func TestProxyClientWithOversizedBlob(t *testing.T) { func TestProxyClient_MultiSameContentBlobs_SameBatch(t *testing.T) { t.Skip("Skipping test until fix is applied to holesky") - t.Parallel() ts, kill := e2e.CreateTestSuite(t, useMemory(), false) @@ -167,32 +166,32 @@ func TestProxyClient_MultiSameContentBlobs_SameBatch(t *testing.T) { cfg := &client.Config{ URL: ts.Address(), } - + errChan := make(chan error, 10) var wg sync.WaitGroup // disperse 10 blobs with the same content in the same batch - for i := 0; i < 4; i ++ { + for i := 0; i < 4; i++ { wg.Add(1) - go func(){ + go func() { defer wg.Done() daClient := client.New(cfg) testPreimage := []byte("hellooooooooooo world!") - + t.Log("Setting input data on proxy server...") blobInfo, err := daClient.SetData(ts.Ctx, testPreimage) if err != nil { errChan <- err return } - + t.Log("Getting input data from proxy server...") preimage, err := daClient.GetData(ts.Ctx, blobInfo) if err != nil { errChan <- err return } - + if !utils.EqualSlices(preimage, testPreimage) { errChan <- fmt.Errorf("expected preimage %s, got %s", testPreimage, preimage) return @@ -206,7 +205,7 @@ func TestProxyClient_MultiSameContentBlobs_SameBatch(t *testing.T) { } if len(errChan) > 0 { - // iterate over channel and log errors + // iterate over channel and log errors for i := 0; i < len(errChan); i++ { err := <-errChan t.Log(err.Error()) @@ -218,15 +217,15 @@ func TestProxyClient_MultiSameContentBlobs_SameBatch(t *testing.T) { // waitTimeout waits for the waitgroup for the specified max timeout. // Returns true if waiting timed out. func waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool { - c := make(chan struct{}) - go func() { - defer close(c) - wg.Wait() - }() - select { - case <-c: - return false - case <-time.After(timeout): - return true - } -} \ No newline at end of file + c := make(chan struct{}) + go func() { + defer close(c) + wg.Wait() + }() + select { + case <-c: + return false + case <-time.After(timeout): + return true + } +} diff --git a/server/config.go b/server/config.go index cb2a48e..e9b9384 100644 --- a/server/config.go +++ b/server/config.go @@ -68,16 +68,15 @@ type Config struct { EthConfirmationDepth int64 // KZG vars - CacheDir string - G1Path string - G2Path string + CacheDir string + G1Path string + G2Path string G2PowerOfTauPath string // Size constraints MaxBlobLength string maxBlobLengthBytes uint64 - // Memstore MemstoreEnabled bool MemstoreBlobExpiration time.Duration @@ -360,4 +359,4 @@ func CLIFlags(envPrefix string) []cli.Flag { EnvVars: prefixEnvVars("S3_ACCESS_KEY_SECRET"), }, } -} \ No newline at end of file +} diff --git a/server/load_store.go b/server/load_store.go index 94cadbe..af1c039 100644 --- a/server/load_store.go +++ b/server/load_store.go @@ -3,7 +3,7 @@ package server import ( "context" "fmt" - + "github.com/Layr-Labs/eigenda-proxy/store" "github.com/Layr-Labs/eigenda-proxy/verify" "github.com/Layr-Labs/eigenda/api/clients" @@ -57,7 +57,7 @@ func LoadStoreRouter(cfg CLIConfig, ctx context.Context, log log.Logger) (*store if err != nil { return nil, err } - + eigenda, err := store.NewEigenDAStore( ctx, client, diff --git a/server/server.go b/server/server.go index b30ac87..a1be6e6 100644 --- a/server/server.go +++ b/server/server.go @@ -38,7 +38,7 @@ const ( type Server struct { log log.Logger endpoint string - router *store.Router + router *store.Router m metrics.Metricer tls *rpc.ServerTLSConfig httpServer *http.Server @@ -51,7 +51,7 @@ func NewServer(host string, port int, router *store.Router, log log.Logger, m me m: m, log: log, endpoint: endpoint, - router: router, + router: router, httpServer: &http.Server{ Addr: endpoint, ReadHeaderTimeout: 10 * time.Second, @@ -279,7 +279,7 @@ func ReadCommitmentMode(r *http.Request) (commitments.CommitmentMode, error) { default: return commitments.SimpleCommitmentMode, fmt.Errorf("unknown commit byte prefix") - + } } @@ -295,4 +295,4 @@ func (svr *Server) GetMemStats() *store.Stats { func (svr *Server) GetS3Stats() *store.Stats { return svr.router.GetS3Store().Stats() -} \ No newline at end of file +} diff --git a/store/eigenda.go b/store/eigenda.go index d8b1c25..bee0c90 100644 --- a/store/eigenda.go +++ b/store/eigenda.go @@ -83,7 +83,6 @@ func (e EigenDAStore) Put(ctx context.Context, value []byte) (comm []byte, err e } cert := (*verify.Certificate)(blobInfo) - err = e.verifier.VerifyCommitment(cert.BlobHeader.Commitment, encodedBlob) if err != nil { return nil, err @@ -152,4 +151,4 @@ func (e EigenDAStore) EncodeAndVerify(ctx context.Context, key []byte, value []b } return value, nil -} \ No newline at end of file +} diff --git a/store/router.go b/store/router.go index b5a594a..ea5fa56 100644 --- a/store/router.go +++ b/store/router.go @@ -149,4 +149,4 @@ func (r *Router) GetMemStore() *MemStore { func (r *Router) GetS3Store() *S3Store { return r.s3 -} \ No newline at end of file +} diff --git a/store/s3.go b/store/s3.go index 5d4ed9c..56bf282 100644 --- a/store/s3.go +++ b/store/s3.go @@ -5,10 +5,10 @@ import ( "context" "encoding/hex" "errors" + "github.com/minio/minio-go/v7" "io" "path" "time" - "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" ) diff --git a/store/store.go b/store/store.go index 3aa21a3..bde5d43 100644 --- a/store/store.go +++ b/store/store.go @@ -2,7 +2,6 @@ package store import "context" - type Stats struct { Entries int Reads int diff --git a/verify/cert.go b/verify/cert.go index a520e19..9a727dd 100644 --- a/verify/cert.go +++ b/verify/cert.go @@ -21,7 +21,7 @@ var ErrBatchMetadataHashNotFound = errors.New("BatchMetadataHash not found for B // CertVerifier verifies the DA certificate against on-chain EigenDA contracts // to ensure disperser returned fields haven't been tampered with type CertVerifier struct { - l log.Logger + l log.Logger ethConfirmationDepth uint64 manager *binding.ContractEigenDAServiceManagerCaller ethClient *ethclient.Client @@ -42,7 +42,7 @@ func NewCertVerifier(cfg *Config, l log.Logger) (*CertVerifier, error) { } return &CertVerifier{ - l: l, + l: l, manager: m, ethConfirmationDepth: cfg.EthConfirmationDepth, ethClient: client, @@ -104,17 +104,17 @@ func (cv *CertVerifier) VerifyMerkleProof(inclusionProof []byte, root []byte, bl func (cv *CertVerifier) getContextBlock() (*big.Int, error) { var blockNumber *big.Int - blockHeader, err := cv.ethClient.BlockByNumber(context.Background(), nil) - if err != nil { - return nil, err - } + blockHeader, err := cv.ethClient.BlockByNumber(context.Background(), nil) + if err != nil { + return nil, err + } - if cv.ethConfirmationDepth == 0 { - return blockHeader.Number(), nil - } + if cv.ethConfirmationDepth == 0 { + return blockHeader.Number(), nil + } - blockNumber = new(big.Int) - blockNumber.Sub(blockHeader.Number(), big.NewInt(int64(cv.ethConfirmationDepth-1))) + blockNumber = new(big.Int) + blockNumber.Sub(blockHeader.Number(), big.NewInt(int64(cv.ethConfirmationDepth-1))) return blockNumber, nil }