From dd31ca68d9a80f22374dc463939d79e73301d9a0 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 12:03:23 -0700 Subject: [PATCH 001/113] checks the target size against the max block size --- test/e2e/benchmark/benchmark.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index cb1a678e5e..baee5a2881 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -160,13 +160,13 @@ func (b *BenchmarkTest) CheckResults(expectedBlockSizeBytes int64) error { return fmt.Errorf("expected app version %d, got %d", appconsts.LatestVersion, block.Version.App) } size := int64(block.Size()) - if size >= expectedBlockSizeBytes { - targetSizeReached = true - break - } if size > maxBlockSize { maxBlockSize = size } + if maxBlockSize >= expectedBlockSizeBytes { + targetSizeReached = true + break + } } if !targetSizeReached { return fmt.Errorf("max reached block size is %d byte and is not within the expected range of %d and %d bytes", maxBlockSize, expectedBlockSizeBytes, b.manifest.MaxBlockBytes) From 810bf331a3ac61da67ac48a6ec43b912538d8488 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 12:03:43 -0700 Subject: [PATCH 002/113] removes unnecessary usage of Printf for logs --- test/e2e/benchmark/throughput.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index ef0080029e..4fe0d84250 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -58,7 +58,7 @@ func TwoNodeSimple(logger *log.Logger) error { testnet.NoError("failed to get latest version", err) testName := "TwoNodeSimple" - logger.Printf("Running %s\n", testName) + logger.Println("Running", testName) logger.Println("version", latestVersion) manifest := Manifest{ @@ -108,7 +108,7 @@ func TwoNodeSimple(logger *log.Logger) error { } func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { - logger.Printf("Running %s\n", testName) + logger.Println("Running", testName) manifest.ChainID = manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) From d09f00f8dea3f8614ed3e915248f50962477112a Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 13:16:40 -0700 Subject: [PATCH 003/113] adds benchtest with latency --- test/e2e/benchmark/throughput.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 4fe0d84250..20388e2410 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -179,3 +179,14 @@ func LargeNetworkBigBlock64MB(logger *log.Logger) error { manifest.BlobSequences = 2 return runBenchmarkTest(logger, "LargeNetworkBigBlock64MB", manifest) } + +func LargeNetworkBigBlock64MBLatency(logger *log.Logger) error { + manifest := bigBlockManifest + manifest.MaxBlockBytes = 64 * testnet.MB + manifest.Validators = 50 + manifest.TxClients = 50 + manifest.BlobSequences = 2 + manifest.EnableLatency = true + manifest.LatencyParams = LatencyParams{70, 0} + return runBenchmarkTest(logger, "LargeNetworkBigBlock64MB", manifest) +} From 0d9abd00bf3050275b25c18d51f631d31f64ffb0 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 14:32:46 -0700 Subject: [PATCH 004/113] adds ReadBlockchainInfo --- test/util/testnode/read.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 1e5983480c..5245397c67 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -9,6 +9,7 @@ import ( "github.com/celestiaorg/go-square/blob" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/rpc/client/http" + ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" ) @@ -39,6 +40,26 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err return ReadBlockHeights(ctx, rpcAddress, 1, status.SyncInfo.LatestBlockHeight) } +// ReadBlockchainInfo reads the blockchain info from the node at rpcAddress and returns it. +func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultBlockchainInfo, + error) { + client, err := http.New(rpcAddress, "/websocket") + if err != nil { + return nil, err + } + resp, err := client.Status(ctx) + if err != nil { + return nil, err + + } + lastHeight := resp.SyncInfo.LatestBlockHeight + res, err := client.BlockchainInfo(ctx, 0, lastHeight) + if err != nil { + return nil, err + } + return res, nil +} + func ReadBlockHeights(ctx context.Context, rpcAddress string, fromHeight, toHeight int64) ([]*types.Block, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { From 48adbefe064279c2454da8f564b63a2c0fbc6556 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 14:33:51 -0700 Subject: [PATCH 005/113] retrieves block metadata --- test/e2e/benchmark/benchmark.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index cb1a678e5e..2f49006409 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -149,17 +149,17 @@ func (b *BenchmarkTest) CheckResults(expectedBlockSizeBytes int64) error { } log.Println("Reading blockchain") - blockchain, err := testnode.ReadBlockchain(context.Background(), + blockchain, err := testnode.ReadBlockchainInfo(context.Background(), b.Node(0).AddressRPC()) - testnet.NoError("failed to read blockchain", err) + testnet.NoError("failed to read blockchain information", err) targetSizeReached := false maxBlockSize := int64(0) - for _, block := range blockchain { - if appconsts.LatestVersion != block.Version.App { - return fmt.Errorf("expected app version %d, got %d", appconsts.LatestVersion, block.Version.App) + for _, blockMeta := range blockchain.BlockMetas { + if appconsts.LatestVersion != blockMeta.Header.Version.App { + return fmt.Errorf("expected app version %d, got %d", appconsts.LatestVersion, blockMeta.Header.Version.App) } - size := int64(block.Size()) + size := int64(blockMeta.BlockSize) if size >= expectedBlockSizeBytes { targetSizeReached = true break From 423a8db2f8342c2178aa57a61f147d725a9218a9 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 14:34:25 -0700 Subject: [PATCH 006/113] reads block headers in E2ESimple --- test/e2e/simple.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 9cb2699310..b4c98aa3f4 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -44,15 +44,16 @@ func E2ESimple(logger *log.Logger) error { time.Sleep(30 * time.Second) logger.Println("Reading blockchain") - blockchain, err := testnode.ReadBlockchain(context.Background(), testNet.Node(0).AddressRPC()) + blockchain, err := testnode.ReadBlockchainInfo(context.Background(), testNet.Node(0).AddressRPC()) testnet.NoError("failed to read blockchain", err) totalTxs := 0 - for _, block := range blockchain { - if appconsts.LatestVersion != block.Version.App { - return fmt.Errorf("expected app version %d, got %d in block %d", appconsts.LatestVersion, block.Version.App, block.Height) + for _, blockMeta := range blockchain.BlockMetas { + version := blockMeta.Header.Version.App + if appconsts.LatestVersion != version { + return fmt.Errorf("expected app version %d, got %d in blockMeta %d", appconsts.LatestVersion, version, blockMeta.Header.Height) } - totalTxs += len(block.Data.Txs) + totalTxs += blockMeta.NumTxs } if totalTxs < 10 { return fmt.Errorf("expected at least 10 transactions, got %d", totalTxs) From 48a7014525ceb607cb24f862fa1e0591b0e417f5 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 14:37:22 -0700 Subject: [PATCH 007/113] updates log messages --- test/e2e/simple.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index b4c98aa3f4..8428fde9e5 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -43,9 +43,9 @@ func E2ESimple(logger *log.Logger) error { // wait for 30 seconds time.Sleep(30 * time.Second) - logger.Println("Reading blockchain") + logger.Println("Reading blockchain information") blockchain, err := testnode.ReadBlockchainInfo(context.Background(), testNet.Node(0).AddressRPC()) - testnet.NoError("failed to read blockchain", err) + testnet.NoError("failed to read blockchain information", err) totalTxs := 0 for _, blockMeta := range blockchain.BlockMetas { From 3b87baadad75b6f83a84d18fb0f4e2605a948605 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 14:58:19 -0700 Subject: [PATCH 008/113] resolves linter issues --- test/util/testnode/read.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 5245397c67..acd03a329c 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -41,8 +41,7 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err } // ReadBlockchainInfo reads the blockchain info from the node at rpcAddress and returns it. -func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultBlockchainInfo, - error) { +func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultBlockchainInfo, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { return nil, err @@ -50,7 +49,6 @@ func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultB resp, err := client.Status(ctx) if err != nil { return nil, err - } lastHeight := resp.SyncInfo.LatestBlockHeight res, err := client.BlockchainInfo(ctx, 0, lastHeight) From 8ee445feb026396a37a131ce69305dec2f1962b7 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 15:09:36 -0700 Subject: [PATCH 009/113] increase seq count per txclient in E2ESimple --- test/e2e/simple.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 8428fde9e5..6d1eab2e19 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -31,7 +31,8 @@ func E2ESimple(logger *log.Logger) error { logger.Println("Creating txsim") endpoints, err := testNet.RemoteGRPCEndpoints() testnet.NoError("failed to get remote gRPC endpoints", err) - err = testNet.CreateTxClient("txsim", testnet.TxsimVersion, 1, "100-2000", 100, testnet.DefaultResources, endpoints[0]) + err = testNet.CreateTxClient("txsim", testnet.TxsimVersion, 10, + "100-2000", 100, testnet.DefaultResources, endpoints[0]) testnet.NoError("failed to create tx client", err) logger.Println("Setting up testnets") From 3af0a79026b8270fc4a38ef4cfdc55ebe8f4e1f1 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 8 Jul 2024 15:23:18 -0700 Subject: [PATCH 010/113] expands on the godoc --- test/util/testnode/read.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index acd03a329c..92c0198873 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -40,7 +40,8 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err return ReadBlockHeights(ctx, rpcAddress, 1, status.SyncInfo.LatestBlockHeight) } -// ReadBlockchainInfo reads the blockchain info from the node at rpcAddress and returns it. +// ReadBlockchainInfo retrieves the blockchain information from height 0 up to the latest height from the node at +// rpcAddress and returns it. func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultBlockchainInfo, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { From e4e53332a00fb07db34bf9e5b707af99390a4e6c Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 9 Jul 2024 10:20:12 -0700 Subject: [PATCH 011/113] includes LargeNetworkBigBlock64MBLatency in the list of available tests --- test/e2e/benchmark/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/benchmark/main.go b/test/e2e/benchmark/main.go index be4eb1e126..00bcaec154 100644 --- a/test/e2e/benchmark/main.go +++ b/test/e2e/benchmark/main.go @@ -18,6 +18,7 @@ func main() { {"LargeNetworkBigBlock8MB", LargeNetworkBigBlock8MB}, {"LargeNetworkBigBlock32MB", LargeNetworkBigBlock32MB}, {"LargeNetworkBigBlock64MB", LargeNetworkBigBlock64MB}, + {"LargeNetworkBigBlock64MBLatency", LargeNetworkBigBlock64MBLatency}, } // check the test name passed as an argument and run it From b7896f36f10173e454cfd1e24351689601635db5 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 9 Jul 2024 10:37:02 -0700 Subject: [PATCH 012/113] sets txsim volume to 0 --- test/e2e/testnet/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index 1ea4bbb585..754a1bf8b5 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -4,7 +4,7 @@ var DefaultResources = Resources{ MemoryRequest: "400Mi", MemoryLimit: "400Mi", CPU: "300m", - Volume: "1Gi", + Volume: "0Gi", } const ( From d09f96ee24ae4c9e6f922eedffc15d476e48979e Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 10 Jul 2024 15:34:01 -0700 Subject: [PATCH 013/113] reads the entire history --- test/util/testnode/read.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 92c0198873..b85a1d9947 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -9,7 +9,6 @@ import ( "github.com/celestiaorg/go-square/blob" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/rpc/client/http" - ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" ) @@ -42,7 +41,7 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err // ReadBlockchainInfo retrieves the blockchain information from height 0 up to the latest height from the node at // rpcAddress and returns it. -func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultBlockchainInfo, error) { +func ReadBlockchainInfo(ctx context.Context, rpcAddress string) ([]*types.BlockMeta, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { return nil, err @@ -51,12 +50,23 @@ func ReadBlockchainInfo(ctx context.Context, rpcAddress string) (*ctypes.ResultB if err != nil { return nil, err } + blocksMeta := make([]*types.BlockMeta, 0) lastHeight := resp.SyncInfo.LatestBlockHeight - res, err := client.BlockchainInfo(ctx, 0, lastHeight) - if err != nil { - return nil, err + i := int64(0) + for { + print("Reading blockchain info from height ", i, " to ", lastHeight, "\n") + res, err := client.BlockchainInfo(ctx, i, lastHeight) + if err != nil { + return nil, err + } + blocksMeta = append(blocksMeta, res.BlockMetas...) + if res.LastHeight == 0 || res.LastHeight >= lastHeight { + break + } + i += res.LastHeight } - return res, nil + + return blocksMeta, nil } func ReadBlockHeights(ctx context.Context, rpcAddress string, fromHeight, toHeight int64) ([]*types.Block, error) { From 2909d2e148f798c4ed205f893ccedf542e37f7eb Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 10 Jul 2024 18:14:21 -0700 Subject: [PATCH 014/113] extends wait time --- test/e2e/testnet/testnet.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index e300a77288..b0f500d8eb 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -356,10 +356,10 @@ func (t *Testnet) Start() error { if err != nil { return fmt.Errorf("failed to initialized node %s: %w", node.Name, err) } - for i := 0; i < 10; i++ { + for i := 0; i < 20; i++ { resp, err := client.Status(context.Background()) if err != nil { - if i == 9 { + if i == 19 { return fmt.Errorf("node %s status response: %w", node.Name, err) } time.Sleep(time.Second) @@ -372,7 +372,7 @@ func (t *Testnet) Start() error { } log.Info().Int64("height", resp.SyncInfo.LatestBlockHeight).Msg( "height is 0, waiting...") - if i == 9 { + if i == 19 { return fmt.Errorf("failed to start node %s", node.Name) } fmt.Printf("node %s is not synced yet, waiting...\n", node.Name) From 0f218bb7bb9072c58ab403f1d13c8773e8b3c98b Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 10 Jul 2024 18:14:51 -0700 Subject: [PATCH 015/113] updates read blockchain info --- test/e2e/benchmark/benchmark.go | 2 +- test/e2e/simple.go | 2 +- test/util/testnode/read.go | 27 +++++++++++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 2f49006409..39a2022e84 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -155,7 +155,7 @@ func (b *BenchmarkTest) CheckResults(expectedBlockSizeBytes int64) error { targetSizeReached := false maxBlockSize := int64(0) - for _, blockMeta := range blockchain.BlockMetas { + for _, blockMeta := range blockchain { if appconsts.LatestVersion != blockMeta.Header.Version.App { return fmt.Errorf("expected app version %d, got %d", appconsts.LatestVersion, blockMeta.Header.Version.App) } diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 6d1eab2e19..2a148f3ddf 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -49,7 +49,7 @@ func E2ESimple(logger *log.Logger) error { testnet.NoError("failed to read blockchain information", err) totalTxs := 0 - for _, blockMeta := range blockchain.BlockMetas { + for _, blockMeta := range blockchain { version := blockMeta.Header.Version.App if appconsts.LatestVersion != version { return fmt.Errorf("expected app version %d, got %d in blockMeta %d", appconsts.LatestVersion, version, blockMeta.Header.Height) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index b85a1d9947..8cb018c92c 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -46,26 +46,41 @@ func ReadBlockchainInfo(ctx context.Context, rpcAddress string) ([]*types.BlockM if err != nil { return nil, err } + + // fetch the latest height resp, err := client.Status(ctx) if err != nil { return nil, err } + + // fetch the blocks meta data blocksMeta := make([]*types.BlockMeta, 0) - lastHeight := resp.SyncInfo.LatestBlockHeight - i := int64(0) + maxHeight := resp.SyncInfo.LatestBlockHeight + lastFetchedHeight := int64(0) + println("max height: ", maxHeight) for { - print("Reading blockchain info from height ", i, " to ", lastHeight, "\n") - res, err := client.BlockchainInfo(ctx, i, lastHeight) + // BlockchainInfo may not return the requested number of blocks (a limit of 20 may be applied), + // so we need to request them iteratively + println("fetching blocks from ", lastFetchedHeight+1, " to ", maxHeight) + res, err := client.BlockchainInfo(ctx, lastFetchedHeight+1, maxHeight) if err != nil { return nil, err } + blocksMeta = append(blocksMeta, res.BlockMetas...) - if res.LastHeight == 0 || res.LastHeight >= lastHeight { + println("fetched ", len(res.BlockMetas), " blocks") + + lastFetchedHeight = res.BlockMetas[len(res.BlockMetas)-1].Header.Height + println("last seen height: ", lastFetchedHeight) + + if lastFetchedHeight >= maxHeight { break } - i += res.LastHeight + } + println("Read ", len(blocksMeta), " blocks") + return blocksMeta, nil } From 22f6f1f48cd32d009433ca213b78aff1c40b7da2 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 13:12:16 -0700 Subject: [PATCH 016/113] refactors the implementation --- test/e2e/benchmark/benchmark.go | 2 +- test/e2e/simple.go | 2 +- test/util/testnode/read.go | 27 ++++++++++++++++++++------- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 39a2022e84..60dc90cbc5 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -149,7 +149,7 @@ func (b *BenchmarkTest) CheckResults(expectedBlockSizeBytes int64) error { } log.Println("Reading blockchain") - blockchain, err := testnode.ReadBlockchainInfo(context.Background(), + blockchain, err := testnode.ReadBlockchainHeaders(context.Background(), b.Node(0).AddressRPC()) testnet.NoError("failed to read blockchain information", err) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 2a148f3ddf..5d35d1bc52 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -45,7 +45,7 @@ func E2ESimple(logger *log.Logger) error { time.Sleep(30 * time.Second) logger.Println("Reading blockchain information") - blockchain, err := testnode.ReadBlockchainInfo(context.Background(), testNet.Node(0).AddressRPC()) + blockchain, err := testnode.ReadBlockchainHeaders(context.Background(), testNet.Node(0).AddressRPC()) testnet.NoError("failed to read blockchain information", err) totalTxs := 0 diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 8cb018c92c..9e5cc771e4 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -39,9 +39,9 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err return ReadBlockHeights(ctx, rpcAddress, 1, status.SyncInfo.LatestBlockHeight) } -// ReadBlockchainInfo retrieves the blockchain information from height 0 up to the latest height from the node at -// rpcAddress and returns it. -func ReadBlockchainInfo(ctx context.Context, rpcAddress string) ([]*types.BlockMeta, error) { +// ReadBlockchainHeaders retrieves the blockchain headers from height 0 up to +// latest available height from the node at rpcAddress and returns it. +func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.BlockMeta, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { return nil, err @@ -55,14 +55,16 @@ func ReadBlockchainInfo(ctx context.Context, rpcAddress string) ([]*types.BlockM // fetch the blocks meta data blocksMeta := make([]*types.BlockMeta, 0) + // fetch headers up to maxHeight maxHeight := resp.SyncInfo.LatestBlockHeight lastFetchedHeight := int64(0) println("max height: ", maxHeight) for { - // BlockchainInfo may not return the requested number of blocks (a limit of 20 may be applied), + // BlockchainInfo applies a limit of 20 may on the range of blocks to fetch // so we need to request them iteratively - println("fetching blocks from ", lastFetchedHeight+1, " to ", maxHeight) - res, err := client.BlockchainInfo(ctx, lastFetchedHeight+1, maxHeight) + println("fetching blocks from ", 1, " to ", maxHeight) + // Block headers are returned in descending order (highest first). + res, err := client.BlockchainInfo(ctx, 1, maxHeight) if err != nil { return nil, err } @@ -73,17 +75,28 @@ func ReadBlockchainInfo(ctx context.Context, rpcAddress string) ([]*types.BlockM lastFetchedHeight = res.BlockMetas[len(res.BlockMetas)-1].Header.Height println("last seen height: ", lastFetchedHeight) - if lastFetchedHeight >= maxHeight { + // fetch until the first block + if lastFetchedHeight <= 1 { break } + maxHeight = lastFetchedHeight - 1 } println("Read ", len(blocksMeta), " blocks") + // Block headers are returned in descending order (highest first). We need to reverse the order + reverseSlice(blocksMeta) + + println(blocksMeta[0].Header.Height, blocksMeta[len(blocksMeta)-1].Header.Height) return blocksMeta, nil } +func reverseSlice[T any](s []T) { + for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 { + s[i], s[j] = s[j], s[i] + } +} func ReadBlockHeights(ctx context.Context, rpcAddress string, fromHeight, toHeight int64) ([]*types.Block, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { From 0901d092b1ff8108b807101becbf71420c5958d7 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 14:05:10 -0700 Subject: [PATCH 017/113] swaps info with headers --- test/e2e/benchmark/benchmark.go | 4 ++-- test/e2e/simple.go | 4 ++-- test/util/testnode/read.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 60dc90cbc5..b4e2330f33 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -148,10 +148,10 @@ func (b *BenchmarkTest) CheckResults(expectedBlockSizeBytes int64) error { } } - log.Println("Reading blockchain") + log.Println("Reading blockchain headers") blockchain, err := testnode.ReadBlockchainHeaders(context.Background(), b.Node(0).AddressRPC()) - testnet.NoError("failed to read blockchain information", err) + testnet.NoError("failed to read blockchain headers", err) targetSizeReached := false maxBlockSize := int64(0) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 5d35d1bc52..3ad14f604f 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -44,9 +44,9 @@ func E2ESimple(logger *log.Logger) error { // wait for 30 seconds time.Sleep(30 * time.Second) - logger.Println("Reading blockchain information") + logger.Println("Reading blockchain headers") blockchain, err := testnode.ReadBlockchainHeaders(context.Background(), testNet.Node(0).AddressRPC()) - testnet.NoError("failed to read blockchain information", err) + testnet.NoError("failed to read blockchain headers", err) totalTxs := 0 for _, blockMeta := range blockchain { diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 9e5cc771e4..0c470d3edd 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -53,7 +53,7 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo return nil, err } - // fetch the blocks meta data + // fetch the blocks metadata/headers blocksMeta := make([]*types.BlockMeta, 0) // fetch headers up to maxHeight maxHeight := resp.SyncInfo.LatestBlockHeight From c7bede76c7ebc0be2e46293c2188382decfeed08 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 14:13:48 -0700 Subject: [PATCH 018/113] minor doc fix --- test/util/testnode/read.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 0c470d3edd..457096409e 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -60,10 +60,10 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo lastFetchedHeight := int64(0) println("max height: ", maxHeight) for { - // BlockchainInfo applies a limit of 20 may on the range of blocks to fetch - // so we need to request them iteratively + // BlockchainInfo may apply on the range of blocks to fetch, + // so we need to request them iteratively. println("fetching blocks from ", 1, " to ", maxHeight) - // Block headers are returned in descending order (highest first). + // block headers are returned in descending order (highest first). res, err := client.BlockchainInfo(ctx, 1, maxHeight) if err != nil { return nil, err From 070101efc27820a43be90a9678165b03e0829401 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 14:24:23 -0700 Subject: [PATCH 019/113] deletes print statements --- test/util/testnode/read.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 457096409e..b90670fbb2 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -41,6 +41,7 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err // ReadBlockchainHeaders retrieves the blockchain headers from height 0 up to // latest available height from the node at rpcAddress and returns it. +// The headers are returned in ascending order (lowest first). func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.BlockMeta, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { @@ -62,7 +63,6 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo for { // BlockchainInfo may apply on the range of blocks to fetch, // so we need to request them iteratively. - println("fetching blocks from ", 1, " to ", maxHeight) // block headers are returned in descending order (highest first). res, err := client.BlockchainInfo(ctx, 1, maxHeight) if err != nil { @@ -70,10 +70,8 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo } blocksMeta = append(blocksMeta, res.BlockMetas...) - println("fetched ", len(res.BlockMetas), " blocks") lastFetchedHeight = res.BlockMetas[len(res.BlockMetas)-1].Header.Height - println("last seen height: ", lastFetchedHeight) // fetch until the first block if lastFetchedHeight <= 1 { @@ -83,15 +81,14 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo } - println("Read ", len(blocksMeta), " blocks") - // Block headers are returned in descending order (highest first). We need to reverse the order + // blocksMeta is in descending order (highest first). + // We need to reverse the order. reverseSlice(blocksMeta) - - println(blocksMeta[0].Header.Height, blocksMeta[len(blocksMeta)-1].Header.Height) - + return blocksMeta, nil } +// reverseSlice reverses the order of elements in a slice in place. func reverseSlice[T any](s []T) { for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 { s[i], s[j] = s[j], s[i] From b52cb0870064289e724fe295be3c57dd8ebc66f9 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 16:14:54 -0700 Subject: [PATCH 020/113] retracts old waiting values --- test/e2e/testnet/testnet.go | 6 +++--- test/util/testnode/read.go | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index b0f500d8eb..328cd5c6a9 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -356,10 +356,10 @@ func (t *Testnet) Start() error { if err != nil { return fmt.Errorf("failed to initialized node %s: %w", node.Name, err) } - for i := 0; i < 20; i++ { + for i := 0; i < 10; i++ { resp, err := client.Status(context.Background()) if err != nil { - if i == 19 { + if i == 9 { return fmt.Errorf("node %s status response: %w", node.Name, err) } time.Sleep(time.Second) @@ -372,7 +372,7 @@ func (t *Testnet) Start() error { } log.Info().Int64("height", resp.SyncInfo.LatestBlockHeight).Msg( "height is 0, waiting...") - if i == 19 { + if i == 10 { return fmt.Errorf("failed to start node %s", node.Name) } fmt.Printf("node %s is not synced yet, waiting...\n", node.Name) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index b90670fbb2..9f9a26da4f 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -84,7 +84,7 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo // blocksMeta is in descending order (highest first). // We need to reverse the order. reverseSlice(blocksMeta) - + return blocksMeta, nil } @@ -94,6 +94,7 @@ func reverseSlice[T any](s []T) { s[i], s[j] = s[j], s[i] } } + func ReadBlockHeights(ctx context.Context, rpcAddress string, fromHeight, toHeight int64) ([]*types.Block, error) { client, err := http.New(rpcAddress, "/websocket") if err != nil { From 8ae64a3fe7c116f8ee6e7653ea37ce26b493d5e1 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 16:16:08 -0700 Subject: [PATCH 021/113] fix a bug --- test/e2e/testnet/testnet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 328cd5c6a9..e300a77288 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -372,7 +372,7 @@ func (t *Testnet) Start() error { } log.Info().Int64("height", resp.SyncInfo.LatestBlockHeight).Msg( "height is 0, waiting...") - if i == 10 { + if i == 9 { return fmt.Errorf("failed to start node %s", node.Name) } fmt.Printf("node %s is not synced yet, waiting...\n", node.Name) From c89ac2c967cd38a865f5f9697419461c872115fc Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 16:23:01 -0700 Subject: [PATCH 022/113] updates some of the comments for clarity --- test/util/testnode/read.go | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/util/testnode/read.go b/test/util/testnode/read.go index 9f9a26da4f..c86835f2b7 100644 --- a/test/util/testnode/read.go +++ b/test/util/testnode/read.go @@ -39,7 +39,7 @@ func ReadBlockchain(ctx context.Context, rpcAddress string) ([]*types.Block, err return ReadBlockHeights(ctx, rpcAddress, 1, status.SyncInfo.LatestBlockHeight) } -// ReadBlockchainHeaders retrieves the blockchain headers from height 0 up to +// ReadBlockchainHeaders retrieves the blockchain headers from height 1 up to // latest available height from the node at rpcAddress and returns it. // The headers are returned in ascending order (lowest first). func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.BlockMeta, error) { @@ -53,23 +53,23 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo if err != nil { return nil, err } + maxHeight := resp.SyncInfo.LatestBlockHeight - // fetch the blocks metadata/headers - blocksMeta := make([]*types.BlockMeta, 0) + blockHeaders := make([]*types.BlockMeta, 0) // fetch headers up to maxHeight - maxHeight := resp.SyncInfo.LatestBlockHeight lastFetchedHeight := int64(0) println("max height: ", maxHeight) for { - // BlockchainInfo may apply on the range of blocks to fetch, + // BlockchainInfo may apply a limit on the range of blocks to fetch, // so we need to request them iteratively. - // block headers are returned in descending order (highest first). + // note that block headers returned by BlockchainInfo are in descending + // order (highest first). res, err := client.BlockchainInfo(ctx, 1, maxHeight) if err != nil { return nil, err } - blocksMeta = append(blocksMeta, res.BlockMetas...) + blockHeaders = append(blockHeaders, res.BlockMetas...) lastFetchedHeight = res.BlockMetas[len(res.BlockMetas)-1].Header.Height @@ -77,15 +77,16 @@ func ReadBlockchainHeaders(ctx context.Context, rpcAddress string) ([]*types.Blo if lastFetchedHeight <= 1 { break } + + // set the new maxHeight to fetch the next batch of headers maxHeight = lastFetchedHeight - 1 } - // blocksMeta is in descending order (highest first). - // We need to reverse the order. - reverseSlice(blocksMeta) + // reverse the order of headers to be ascending (lowest first). + reverseSlice(blockHeaders) - return blocksMeta, nil + return blockHeaders, nil } // reverseSlice reverses the order of elements in a slice in place. From 9be60489851a73e12a386d777f9be13ee7f20acb Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 16:39:41 -0700 Subject: [PATCH 023/113] adds network test with latency and 8 MB block size --- test/e2e/benchmark/main.go | 1 + test/e2e/benchmark/throughput.go | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/test/e2e/benchmark/main.go b/test/e2e/benchmark/main.go index 00bcaec154..bc2c19cf30 100644 --- a/test/e2e/benchmark/main.go +++ b/test/e2e/benchmark/main.go @@ -19,6 +19,7 @@ func main() { {"LargeNetworkBigBlock32MB", LargeNetworkBigBlock32MB}, {"LargeNetworkBigBlock64MB", LargeNetworkBigBlock64MB}, {"LargeNetworkBigBlock64MBLatency", LargeNetworkBigBlock64MBLatency}, + {"LargeNetworkBigBlock8MBLatency", LargeNetworkBigBlock8MBLatency}, } // check the test name passed as an argument and run it diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 20388e2410..096db9ea9d 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -188,5 +188,15 @@ func LargeNetworkBigBlock64MBLatency(logger *log.Logger) error { manifest.BlobSequences = 2 manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} - return runBenchmarkTest(logger, "LargeNetworkBigBlock64MB", manifest) + return runBenchmarkTest(logger, "LargeNetworkBigBlock64MBLatency", manifest) +} +func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { + manifest := bigBlockManifest + manifest.MaxBlockBytes = 8 * testnet.MB + manifest.Validators = 50 + manifest.TxClients = 50 + manifest.BlobSequences = 2 + manifest.EnableLatency = true + manifest.LatencyParams = LatencyParams{70, 0} + return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 074bea10616fe9895d4354f2934796fb63353e67 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 11 Jul 2024 16:39:57 -0700 Subject: [PATCH 024/113] extends wait time for genesis nodes to sync --- test/e2e/testnet/testnet.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index e300a77288..28858f2a8e 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -356,10 +356,10 @@ func (t *Testnet) Start() error { if err != nil { return fmt.Errorf("failed to initialized node %s: %w", node.Name, err) } - for i := 0; i < 10; i++ { + for i := 0; i < 100; i++ { resp, err := client.Status(context.Background()) if err != nil { - if i == 9 { + if i == 99 { return fmt.Errorf("node %s status response: %w", node.Name, err) } time.Sleep(time.Second) @@ -372,7 +372,7 @@ func (t *Testnet) Start() error { } log.Info().Int64("height", resp.SyncInfo.LatestBlockHeight).Msg( "height is 0, waiting...") - if i == 9 { + if i == 99 { return fmt.Errorf("failed to start node %s", node.Name) } fmt.Printf("node %s is not synced yet, waiting...\n", node.Name) From c925179cbbc08026fa05256ff8ea967604493126 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 12 Jul 2024 09:12:02 -0700 Subject: [PATCH 025/113] adds a prefix --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 096db9ea9d..ec55d6d353 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = manifest.summary() + manifest.ChainID = "second-" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) From 222d45d3326503e0a04976bfd90e366a42940949 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 12 Jul 2024 10:26:14 -0700 Subject: [PATCH 026/113] extends test duration --- test/e2e/benchmark/throughput.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index ec55d6d353..4aaf457205 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = "second-" + manifest.summary() + manifest.ChainID = "third-" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) @@ -198,5 +198,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.BlobSequences = 2 manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} + manifest.TestDuration = 10 * time.Minute return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From af001b27e0cb3ee129377bcdb1d828f9211f9d0e Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 12 Jul 2024 11:29:22 -0700 Subject: [PATCH 027/113] reduces sequences to 1 --- test/e2e/benchmark/throughput.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 4aaf457205..3f92b6ab22 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = "third-" + manifest.summary() + manifest.ChainID = manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) @@ -195,9 +195,9 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.MaxBlockBytes = 8 * testnet.MB manifest.Validators = 50 manifest.TxClients = 50 - manifest.BlobSequences = 2 + manifest.BlobSequences = 1 manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} - manifest.TestDuration = 10 * time.Minute + //manifest.TestDuration = 10 * time.Minute return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 74977145e703cab72c3d1fa1aa3192fb4b4ca015 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 12 Jul 2024 12:04:18 -0700 Subject: [PATCH 028/113] manifest of next experiment --- test/e2e/benchmark/throughput.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 3f92b6ab22..87de5c9419 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = manifest.summary() + manifest.ChainID = "fifth" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) @@ -195,9 +195,9 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.MaxBlockBytes = 8 * testnet.MB manifest.Validators = 50 manifest.TxClients = 50 - manifest.BlobSequences = 1 + manifest.BlobSequences = 2 manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} - //manifest.TestDuration = 10 * time.Minute + manifest.TestDuration = 10 * time.Minute return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From bb76a42426cb9011fc9ecc21e25c7556316d7796 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 14:22:02 -0700 Subject: [PATCH 029/113] points to the new core version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f00f22ebbc..2120182ad0 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa ) diff --git a/go.sum b/go.sum index 65226ef709..07adabc114 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29 h1:HwbA4OegRvXX0aNchBA7Cmu+oIxnH7xRcOhISuDP0ak= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29/go.mod h1:MyElURdWAOJkOp84WZnfEUJ+OLvTwOOHG2lbK9E8XRI= +github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa h1:xWXuIEllfNt1c6V/W3GiSPpR8D77svwCoAsKJf9oFRA= +github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa/go.mod h1:uNS+zudfsuIhLCEGKbWcvt4bE+puViXWPW6N/30+s3M= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 71cfbd6849db241f8377cbed4a893d4302b652eb Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 16:04:25 -0700 Subject: [PATCH 030/113] uses custom app version for validators --- test/e2e/benchmark/throughput.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index c38debbf3d..11fea9da86 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = manifest.summary() + manifest.ChainID = "new-" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) @@ -199,5 +199,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute + manifest.CelestiaAppVersion = "pr-3737" return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From a77bc2a54cc07fe7996590bd8ba58b9d63ae0034 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 16:04:58 -0700 Subject: [PATCH 031/113] uses go1.22.5 --- go.mod | 25 ++++++++++++++----------- go.sum | 46 ++++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 2120182ad0..cc234f9d59 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/celestiaorg/celestia-app/v3 -go 1.22.4 +go 1.22.5 require ( cosmossdk.io/errors v1.0.1 @@ -85,7 +85,7 @@ require ( github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/distribution/reference v0.5.0 // indirect - github.com/docker/docker v26.1.3+incompatible // indirect + github.com/docker/docker v26.1.4+incompatible // indirect github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect @@ -94,6 +94,7 @@ require ( github.com/ethereum/c-kzg-4844 v1.0.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-ini/ini v1.67.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect @@ -104,7 +105,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/go-playground/validator/v10 v10.11.2 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect github.com/golang/glog v1.2.1 // indirect @@ -147,8 +148,8 @@ require ( github.com/joho/godotenv v1.5.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.6 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/klauspost/reedsolomon v1.12.1 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect @@ -161,7 +162,7 @@ require ( github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/minio/md5-simd v1.1.2 // indirect - github.com/minio/minio-go/v7 v7.0.70 // indirect + github.com/minio/minio-go/v7 v7.0.74 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -219,13 +220,13 @@ require ( go.opentelemetry.io/proto/otlp v1.1.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.23.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/crypto v0.24.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/oauth2 v0.20.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/term v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/term v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/api v0.169.0 // indirect google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect @@ -255,3 +256,5 @@ replace ( github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa ) + +//replace github.com/celestiaorg/knuu => github.com/celestiaorg/knuu v0.14.1-0.20240725134313-0379bcaa9c1e diff --git a/go.sum b/go.sum index 07adabc114..bc2f3cddf0 100644 --- a/go.sum +++ b/go.sum @@ -486,8 +486,8 @@ github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwu github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo= -github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= +github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 h1:IPrmumsT9t5BS7XcPhgsCTlkWbYg80SEXUzDpReaU6Y= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11/go.mod h1:a6bNUGTbQBsY6VRHTr4h/rkOXjl244DyRD0tx3fgq4Q= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -569,6 +569,8 @@ github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -622,8 +624,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -928,12 +930,12 @@ github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= -github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/reedsolomon v1.12.1 h1:NhWgum1efX1x58daOBGCFWcxtEhOhXKKl1HAPQUp03Q= @@ -1011,8 +1013,8 @@ github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.70 h1:1u9NtMgfK1U42kUxcsl5v0yj6TEOPR497OAQxpJnn2g= -github.com/minio/minio-go/v7 v7.0.70/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo= +github.com/minio/minio-go/v7 v7.0.74 h1:fTo/XlPBTSpo3BAMshlwKL5RspXRv9us5UeHEGYCFe0= +github.com/minio/minio-go/v7 v7.0.74/go.mod h1:qydcVzV8Hqtj1VtEocfxbmVFa2siu6HGa+LDEPogjD8= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -1435,8 +1437,8 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1544,8 +1546,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1701,14 +1703,14 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1719,8 +1721,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1793,8 +1795,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From b39bb9afb09f7713fd4989cefac0b1d4de40db6d Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 16:52:27 -0700 Subject: [PATCH 032/113] modifies manifet for gradual increase in block size --- test/e2e/benchmark/throughput.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 11fea9da86..7fd6765088 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -157,8 +157,10 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest := bigBlockManifest manifest.MaxBlockBytes = 8 * testnet.MB manifest.Validators = 50 - manifest.TxClients = 50 - manifest.BlobSequences = 2 + manifest.TxClients = 25 + manifest.BlobSequences = 1 + manifest.TimeoutCommit = 1 * time.Second + manifest.TimeoutPropose = 10 * time.Second return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) } From 2ed2cf8222022e16a1e64f511f0b04ca480a16f4 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 17:09:30 -0700 Subject: [PATCH 033/113] updates go.mod --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index cc234f9d59..bf8e001a3b 100644 --- a/go.mod +++ b/go.mod @@ -254,7 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240726000400-7a727d7ed5e0 ) - -//replace github.com/celestiaorg/knuu => github.com/celestiaorg/knuu v0.14.1-0.20240725134313-0379bcaa9c1e diff --git a/go.sum b/go.sum index bc2f3cddf0..ce39cfb64f 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa h1:xWXuIEllfNt1c6V/W3GiSPpR8D77svwCoAsKJf9oFRA= -github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240725211529-5a90ec5e63aa/go.mod h1:uNS+zudfsuIhLCEGKbWcvt4bE+puViXWPW6N/30+s3M= +github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240726000400-7a727d7ed5e0 h1:bsy9wGxlGm0lX2iuz5S5ZfebbP3GqPkSoEH30ovQ0dM= +github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240726000400-7a727d7ed5e0/go.mod h1:uNS+zudfsuIhLCEGKbWcvt4bE+puViXWPW6N/30+s3M= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 7311c41213a242782274da4a29f0e8a42a1055d6 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 17:12:00 -0700 Subject: [PATCH 034/113] changes celestia-app version for validators --- test/e2e/benchmark/throughput.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 7fd6765088..51451c1037 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -161,6 +161,7 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest.BlobSequences = 1 manifest.TimeoutCommit = 1 * time.Second manifest.TimeoutPropose = 10 * time.Second + manifest.CelestiaAppVersion = "pr-3737" return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) } From 777e9c4f1bb0b62341ebdc98282821978e5c464c Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 17:23:42 -0700 Subject: [PATCH 035/113] downgrades go version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bf8e001a3b..5b818d7f9b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/celestiaorg/celestia-app/v3 -go 1.22.5 +go 1.22.4 require ( cosmossdk.io/errors v1.0.1 From 6c75aa77dda310417641ea740ddeee65a6628582 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 25 Jul 2024 18:03:20 -0700 Subject: [PATCH 036/113] adds a prefix to test chainid --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 51451c1037..8dcad92822 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = "new-" + manifest.summary() + manifest.ChainID = "del-" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) From 59aee0a2ef3072bdc8ea11e443192e7d6c8018e3 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 29 Jul 2024 12:16:47 -0700 Subject: [PATCH 037/113] points to the newer version of core with fixes --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5b818d7f9b..f11b93298f 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240726000400-7a727d7ed5e0 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729185455-7ca9f7c7096e ) diff --git a/go.sum b/go.sum index ce39cfb64f..81bc06443c 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240726000400-7a727d7ed5e0 h1:bsy9wGxlGm0lX2iuz5S5ZfebbP3GqPkSoEH30ovQ0dM= -github.com/celestiaorg/celestia-core v1.36.1-tm-v0.34.29.0.20240726000400-7a727d7ed5e0/go.mod h1:uNS+zudfsuIhLCEGKbWcvt4bE+puViXWPW6N/30+s3M= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729185455-7ca9f7c7096e h1:ouiQXoq1NQTbd1smbGvt6hsJO28KeqjcYXpIybiPUIw= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729185455-7ca9f7c7096e/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 38ae783c96c78dcdf71c912dcdfaf5525ee52e10 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 29 Jul 2024 13:47:44 -0700 Subject: [PATCH 038/113] sets tx client version to the same PR --- test/e2e/benchmark/throughput.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 8dcad92822..a0d1f90090 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -162,6 +162,7 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest.TimeoutCommit = 1 * time.Second manifest.TimeoutPropose = 10 * time.Second manifest.CelestiaAppVersion = "pr-3737" + manifest.TxClientVersion = "pr-3737" return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) } From b88fb795ea3c893c96ac1bcabe74e8e46b31e1a5 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 29 Jul 2024 13:49:20 -0700 Subject: [PATCH 039/113] sets chain id inside the test --- test/e2e/benchmark/throughput.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index a0d1f90090..b57cc033f3 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,7 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - manifest.ChainID = "del-" + manifest.summary() + //manifest.ChainID = "del-" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) @@ -163,6 +163,7 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest.TimeoutPropose = 10 * time.Second manifest.CelestiaAppVersion = "pr-3737" manifest.TxClientVersion = "pr-3737" + manifest.ChainID = "fix-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) } From 44ac183a8c48389cd2e0eb1d47186ee7972f7912 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 30 Jul 2024 08:39:07 -0700 Subject: [PATCH 040/113] bumps core version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f11b93298f..35532afb79 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729185455-7ca9f7c7096e + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729232239-8a90067c6439 ) diff --git a/go.sum b/go.sum index 81bc06443c..4e8341998a 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729185455-7ca9f7c7096e h1:ouiQXoq1NQTbd1smbGvt6hsJO28KeqjcYXpIybiPUIw= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729185455-7ca9f7c7096e/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729232239-8a90067c6439 h1:KEPBXJhOKnvOMPhTiQKz9v2XdJCp6FwvAyHJZJBN3TI= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729232239-8a90067c6439/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 144a1e0b5c543c97ac75eb8b69046a319fed9691 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 30 Jul 2024 11:32:14 -0700 Subject: [PATCH 041/113] prepares network test with latency --- test/e2e/benchmark/throughput.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index b57cc033f3..4eb12927d6 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -199,11 +199,15 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest := bigBlockManifest manifest.MaxBlockBytes = 8 * testnet.MB manifest.Validators = 50 - manifest.TxClients = 50 - manifest.BlobSequences = 2 + manifest.TxClients = 25 + manifest.BlobSequences = 1 + manifest.TimeoutCommit = 1 * time.Second + manifest.TimeoutPropose = 10 * time.Second + manifest.CelestiaAppVersion = "pr-3737" + manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} - manifest.TestDuration = 10 * time.Minute - manifest.CelestiaAppVersion = "pr-3737" + manifest.TestDuration = 15 * time.Minute + manifest.ChainID = "1-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 5d050846b89f4fd1d8b1046f11fc3316f4ddeb07 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 30 Jul 2024 17:42:58 -0700 Subject: [PATCH 042/113] points to a version of core that tracks precommit time --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 35532afb79..1262e057e2 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729232239-8a90067c6439 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731003357-de810b1f7e89 ) diff --git a/go.sum b/go.sum index 4e8341998a..f73800c124 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729232239-8a90067c6439 h1:KEPBXJhOKnvOMPhTiQKz9v2XdJCp6FwvAyHJZJBN3TI= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729232239-8a90067c6439/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731003357-de810b1f7e89 h1:vbtvBwHpQFqZXwTKYUDPWXpWANSQnIAPD8pGDJNwEt8= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731003357-de810b1f7e89/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 9bbe7b322d2351f48cc59369717d2ae042aa0e61 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 30 Jul 2024 17:47:18 -0700 Subject: [PATCH 043/113] points to a version of core that does not shorten wait time --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1262e057e2..1711f3f395 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731003357-de810b1f7e89 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2 ) diff --git a/go.sum b/go.sum index f73800c124..687f1202a7 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731003357-de810b1f7e89 h1:vbtvBwHpQFqZXwTKYUDPWXpWANSQnIAPD8pGDJNwEt8= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731003357-de810b1f7e89/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2 h1:66MyFXfm7xmhGaadcalR6RbmNS6rhFI9NBAop/+DoSc= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From df8f86825704f9ef3a138f023102e61335363192 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 31 Jul 2024 08:15:10 -0700 Subject: [PATCH 044/113] increases chain id prefix counter --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 4eb12927d6..eee52ad461 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -208,6 +208,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 15 * time.Minute - manifest.ChainID = "1-" + manifest.summary() + manifest.ChainID = "2-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 9a29e92c6fcab7e158aa300d0b6effc971e5c7d8 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 31 Jul 2024 08:38:48 -0700 Subject: [PATCH 045/113] breaks start into smaller methods --- test/e2e/testnet/testnet.go | 64 ++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 2e20386ae8..7c9e2440d6 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -323,30 +323,15 @@ func (t *Testnet) RemoteRPCEndpoints() ([]string, error) { return rpcEndpoints, nil } -func (t *Testnet) Start() error { +// WaitToSync waits for the started nodes to sync with the network and move +// past the genesis block. +func (t *Testnet) WaitToSync() error { genesisNodes := make([]*Node, 0) for _, node := range t.nodes { if node.StartHeight == 0 { genesisNodes = append(genesisNodes, node) } } - // start genesis nodes asynchronously - for _, node := range genesisNodes { - err := node.StartAsync() - if err != nil { - return fmt.Errorf("node %s failed to start: %w", node.Name, err) - } - } - log.Info().Msg("forwarding ports for genesis nodes") - // wait for instances to be running - for _, node := range genesisNodes { - err := node.WaitUntilStartedAndForwardPorts() - if err != nil { - return fmt.Errorf("node %s failed to start: %w", node.Name, err) - } - } - // wait for nodes to sync - log.Info().Msg("waiting for genesis nodes to sync") for _, node := range genesisNodes { log.Info().Str("name", node.Name).Msg( "waiting for node to sync") @@ -373,6 +358,49 @@ func (t *Testnet) Start() error { time.Sleep(time.Duration(i) * time.Second) } } + return nil +} + +// StartNodes starts the testnet nodes and forwards the ports. +// It does not wait for the nodes to produce blocks. +// For that, use WaitToSync. +func (t *Testnet) StartNodes() error { + genesisNodes := make([]*Node, 0) + for _, node := range t.nodes { + if node.StartHeight == 0 { + genesisNodes = append(genesisNodes, node) + } + } + // start genesis nodes asynchronously + for _, node := range genesisNodes { + err := node.StartAsync() + if err != nil { + return fmt.Errorf("node %s failed to start: %w", node.Name, err) + } + } + log.Info().Msg("forwarding ports for genesis nodes") + // wait for instances to be running + for _, node := range genesisNodes { + err := node.WaitUntilStartedAndForwardPorts() + if err != nil { + return fmt.Errorf("node %s failed to start: %w", node.Name, err) + } + } + return nil +} +func (t *Testnet) Start() error { + // start nodes and forward ports + err := t.StartNodes() + if err != nil { + return err + } + // wait for nodes to sync + log.Info().Msg("waiting for genesis nodes to sync") + err = t.WaitToSync() + if err != nil { + return err + } + return t.StartTxClients() } From 70ddeb94c538c2e7231ab83b2726bb5da8aa1626 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 31 Jul 2024 08:39:06 -0700 Subject: [PATCH 046/113] refactors benchamrk Run --- test/e2e/benchmark/benchmark.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 39872f1da8..f7a2426a24 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -100,8 +100,10 @@ func (b *BenchmarkTest) SetupNodes() error { // Run runs the benchmark test for the specified duration in the manifest. func (b *BenchmarkTest) Run() error { - log.Println("Starting testnet") - err := b.Start() + log.Println("Starting benchmark testnet") + + log.Println("Starting nodes") + err := b.StartNodes() if err != nil { return fmt.Errorf("failed to start testnet: %v", err) } @@ -116,6 +118,17 @@ func (b *BenchmarkTest) Run() error { } } + // wait for the nodes to sync + log.Println("Waiting for nodes to sync") + err = b.WaitToSync() + if err != nil { + return err + } + + // start tx clients + log.Println("Starting tx clients") + b.StartTxClients() + // wait some time for the tx clients to submit transactions time.Sleep(b.manifest.TestDuration) From fd0aa9c65aceee97b1988b4cf4a18e374305c784 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 31 Jul 2024 10:52:10 -0700 Subject: [PATCH 047/113] fixes linter complaints --- test/e2e/benchmark/benchmark.go | 6 +++++- test/e2e/testnet/testnet.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index f7a2426a24..dbe4ae8f0d 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -127,7 +127,11 @@ func (b *BenchmarkTest) Run() error { // start tx clients log.Println("Starting tx clients") - b.StartTxClients() + err = b.StartTxClients() + if err != nil { + return fmt.Errorf("failed to start tx clients: %v", err) + + } // wait some time for the tx clients to submit transactions time.Sleep(b.manifest.TestDuration) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 7c9e2440d6..4b3beebe99 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -388,6 +388,7 @@ func (t *Testnet) StartNodes() error { } return nil } + func (t *Testnet) Start() error { // start nodes and forward ports err := t.StartNodes() From 26bad96b15bb9d3f60a51e201534a4a7ce3024f5 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 31 Jul 2024 10:52:47 -0700 Subject: [PATCH 048/113] removes excess new line --- test/e2e/benchmark/benchmark.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index dbe4ae8f0d..356bc870e7 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -130,7 +130,6 @@ func (b *BenchmarkTest) Run() error { err = b.StartTxClients() if err != nil { return fmt.Errorf("failed to start tx clients: %v", err) - } // wait some time for the tx clients to submit transactions From 4e6299a277808aa0461a9ee0655361718484aa3f Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 31 Jul 2024 12:21:42 -0700 Subject: [PATCH 049/113] bumps chain id counter prefix --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index eee52ad461..54d6b45b48 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -208,6 +208,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 15 * time.Minute - manifest.ChainID = "2-" + manifest.summary() + manifest.ChainID = "3-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From c667a2731359a92783e54e4b75ac0a3343433758 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 2 Aug 2024 13:06:45 -0700 Subject: [PATCH 050/113] another test setup --- test/e2e/benchmark/throughput.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 54d6b45b48..acc2c65d06 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -201,13 +201,13 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.Validators = 50 manifest.TxClients = 25 manifest.BlobSequences = 1 - manifest.TimeoutCommit = 1 * time.Second + manifest.TimeoutCommit = 11 * time.Second manifest.TimeoutPropose = 10 * time.Second manifest.CelestiaAppVersion = "pr-3737" manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 15 * time.Minute - manifest.ChainID = "3-" + manifest.summary() + manifest.ChainID = "28-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 2783e1362d48a18705115febe1daf170805ca566 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 2 Aug 2024 15:12:26 -0700 Subject: [PATCH 051/113] adds the next test manifest --- test/e2e/benchmark/throughput.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index acc2c65d06..5c7700cf7c 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -201,13 +201,13 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.Validators = 50 manifest.TxClients = 25 manifest.BlobSequences = 1 - manifest.TimeoutCommit = 11 * time.Second - manifest.TimeoutPropose = 10 * time.Second + manifest.TimeoutCommit = 1 * time.Second + manifest.TimeoutPropose = 14 * time.Second manifest.CelestiaAppVersion = "pr-3737" manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} - manifest.TestDuration = 15 * time.Minute - manifest.ChainID = "28-" + manifest.summary() + manifest.TestDuration = 10 * time.Minute + manifest.ChainID = "29-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From ffc585abf263f323a2ba810da3c9475a505403ba Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 6 Aug 2024 11:13:09 -0700 Subject: [PATCH 052/113] bumps chain id and timeout propose --- test/e2e/benchmark/throughput.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 5c7700cf7c..895be1df53 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -201,13 +201,13 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.Validators = 50 manifest.TxClients = 25 manifest.BlobSequences = 1 - manifest.TimeoutCommit = 1 * time.Second - manifest.TimeoutPropose = 14 * time.Second + manifest.TimeoutCommit = 11 * time.Second + manifest.TimeoutPropose = 80 * time.Second manifest.CelestiaAppVersion = "pr-3737" manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "29-" + manifest.summary() + manifest.ChainID = "30-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From b744d239b2520e96a63b299b7269e1106af5d646 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 6 Aug 2024 12:14:15 -0700 Subject: [PATCH 053/113] bumps chain id --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 895be1df53..9d16235f89 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -208,6 +208,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "30-" + manifest.summary() + manifest.ChainID = "31-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 0c8203a0fec3164e4fbf9f6616de049def08c6bb Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 6 Aug 2024 13:15:41 -0700 Subject: [PATCH 054/113] retracts old chain id --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 9d16235f89..895be1df53 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -208,6 +208,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "31-" + manifest.summary() + manifest.ChainID = "30-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 516827e3f7d69de30e1ba8ea08c44c957a87eaab Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 6 Aug 2024 15:27:10 -0700 Subject: [PATCH 055/113] wip --- test/e2e/benchmark/throughput.go | 6 +++--- test/e2e/testnet/setup.go | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 895be1df53..b323ae9b36 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -203,11 +203,11 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.BlobSequences = 1 manifest.TimeoutCommit = 11 * time.Second manifest.TimeoutPropose = 80 * time.Second - manifest.CelestiaAppVersion = "pr-3737" - manifest.TxClientVersion = "pr-3737" + //manifest.CelestiaAppVersion = "pr-3737" + //manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "30-" + manifest.summary() + manifest.ChainID = "31-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } diff --git a/test/e2e/testnet/setup.go b/test/e2e/testnet/setup.go index 758299ef90..473cc1cfec 100644 --- a/test/e2e/testnet/setup.go +++ b/test/e2e/testnet/setup.go @@ -22,6 +22,8 @@ func MakeConfig(node *Node, opts ...Option) (*config.Config, error) { cfg.P2P.ExternalAddress = fmt.Sprintf("tcp://%v", node.AddressP2P(false)) cfg.P2P.PersistentPeers = strings.Join(node.InitialPeers, ",") cfg.Instrumentation.Prometheus = true + cfg.P2P.MaxNumInboundPeers = 6 + cfg.P2P.MaxNumOutboundPeers = 6 for _, opt := range opts { opt(cfg) From 6da3840cafb54a1a1d97ba266b610961e5c811b0 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 6 Aug 2024 16:16:16 -0700 Subject: [PATCH 056/113] bumps core version --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1711f3f395..e16ee44958 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2 -) + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240806230210-9b7daaba0542 +) \ No newline at end of file From 9ba0a2289d076356cbbcc96dc0472aae9c3fe922 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 6 Aug 2024 16:35:00 -0700 Subject: [PATCH 057/113] bumps core --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 687f1202a7..3a4903e227 100644 --- a/go.sum +++ b/go.sum @@ -320,6 +320,7 @@ github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZI github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2 h1:66MyFXfm7xmhGaadcalR6RbmNS6rhFI9NBAop/+DoSc= github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240806230210-9b7daaba0542/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 4b7d3f6a2d5f3b2416408874925f05e7d9480844 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 7 Aug 2024 15:20:18 -0700 Subject: [PATCH 058/113] bumps core --- go.mod | 4 ++-- go.sum | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e16ee44958..1d7d488b57 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240806230210-9b7daaba0542 -) \ No newline at end of file + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240807221650-35a0e3ec5a5e +) diff --git a/go.sum b/go.sum index 3a4903e227..b5f0cf2da6 100644 --- a/go.sum +++ b/go.sum @@ -318,9 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2 h1:66MyFXfm7xmhGaadcalR6RbmNS6rhFI9NBAop/+DoSc= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731004513-c544f8a947c2/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240806230210-9b7daaba0542/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240807221650-35a0e3ec5a5e h1:Gn6w9ZPG4gEqqQ/pf6aWlIcoefoIvS/RjFvj3w5ysPg= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240807221650-35a0e3ec5a5e/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16 h1:AlBZS4WykzrwfcNbKD+yQQM1RTMz7lYDC1NS7ClAidM= github.com/celestiaorg/cosmos-sdk v1.24.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From f16e4e17223f4e2aff2b304f0017d9217e0953da Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 7 Aug 2024 18:31:26 -0700 Subject: [PATCH 059/113] uses old PR for the validators --- test/e2e/benchmark/throughput.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index b323ae9b36..cb92cba184 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -203,11 +203,11 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.BlobSequences = 1 manifest.TimeoutCommit = 11 * time.Second manifest.TimeoutPropose = 80 * time.Second - //manifest.CelestiaAppVersion = "pr-3737" - //manifest.TxClientVersion = "pr-3737" + manifest.CelestiaAppVersion = "pr-3737" + manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "31-" + manifest.summary() + manifest.ChainID = "34-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 605623af9ffda30a7730ebfb60d3f79af1714190 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 7 Aug 2024 18:32:38 -0700 Subject: [PATCH 060/113] reset experimental configs --- test/e2e/testnet/setup.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/testnet/setup.go b/test/e2e/testnet/setup.go index ba1a8d0923..620b46cb66 100644 --- a/test/e2e/testnet/setup.go +++ b/test/e2e/testnet/setup.go @@ -22,8 +22,6 @@ func MakeConfig(node *Node, opts ...Option) (*config.Config, error) { cfg.P2P.ExternalAddress = fmt.Sprintf("tcp://%v", node.AddressP2P(false)) cfg.P2P.PersistentPeers = strings.Join(node.InitialPeers, ",") cfg.Instrumentation.Prometheus = true - cfg.P2P.MaxNumInboundPeers = 6 - cfg.P2P.MaxNumOutboundPeers = 6 for _, opt := range opts { opt(cfg) From ec77b1afe886503d003eb95185e6a5ef1d055ea2 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 8 Aug 2024 12:50:09 -0700 Subject: [PATCH 061/113] bumps core version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e2e4dacf79..53c51d98ac 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240807221650-35a0e3ec5a5e + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808193911-fd04b4fc469e ) diff --git a/go.sum b/go.sum index 6914a16647..783bc8693a 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240807221650-35a0e3ec5a5e h1:Gn6w9ZPG4gEqqQ/pf6aWlIcoefoIvS/RjFvj3w5ysPg= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240807221650-35a0e3ec5a5e/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808193911-fd04b4fc469e h1:pbi7WUGKt8QZ0KAUh3yG5F7x+ledYx60BP/YzpgWa9g= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808193911-fd04b4fc469e/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 2692e38b80522ffc18f5800bb728eb0d3abc825e Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 8 Aug 2024 13:01:17 -0700 Subject: [PATCH 062/113] deletes unused comment --- test/e2e/benchmark/throughput.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index cb92cba184..d88bf8c7b8 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -109,7 +109,6 @@ func TwoNodeSimple(logger *log.Logger) error { func runBenchmarkTest(logger *log.Logger, testName string, manifest Manifest) error { logger.Println("Running", testName) - //manifest.ChainID = "del-" + manifest.summary() log.Println("ChainID: ", manifest.ChainID) benchTest, err := NewBenchmarkTest(testName, &manifest) testnet.NoError("failed to create benchmark test", err) @@ -208,6 +207,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "34-" + manifest.summary() + manifest.ChainID = "35-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 616c50ff96b29c275adf66dee67db8be5de73be3 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 8 Aug 2024 13:01:32 -0700 Subject: [PATCH 063/113] retracts old amount of txclient volume --- test/e2e/testnet/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index 754a1bf8b5..1ea4bbb585 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -4,7 +4,7 @@ var DefaultResources = Resources{ MemoryRequest: "400Mi", MemoryLimit: "400Mi", CPU: "300m", - Volume: "0Gi", + Volume: "1Gi", } const ( From b2ecf87824baf24e7c61a3fff98a1194ec12d037 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 9 Aug 2024 11:19:32 -0700 Subject: [PATCH 064/113] bumps core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 53c51d98ac..9d1940997a 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808193911-fd04b4fc469e + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5 ) diff --git a/go.sum b/go.sum index 783bc8693a..54bd0e7ea9 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808193911-fd04b4fc469e h1:pbi7WUGKt8QZ0KAUh3yG5F7x+ledYx60BP/YzpgWa9g= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808193911-fd04b4fc469e/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5 h1:WtlBLt1J5N/N9c6PbgP8oqjuBiqLBN3kOvoU3VJZAlA= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From de68c0ac49d19a3ad34125dee253e33b7c6acc8e Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 9 Aug 2024 11:46:36 -0700 Subject: [PATCH 065/113] bumps chain id counter --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index d88bf8c7b8..6035c00eac 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -207,6 +207,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "35-" + manifest.summary() + manifest.ChainID = "36-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From bafb2ac7b1f163342a1cba3811d7a18b98e92f0c Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 21 Aug 2024 16:20:53 -0700 Subject: [PATCH 066/113] updates test manifest for 37th --- test/e2e/benchmark/throughput.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 6035c00eac..ba7b03e24b 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -137,6 +137,8 @@ func TwoNodeBigBlock8MBLatency(logger *log.Logger) error { manifest.MaxBlockBytes = 8 * testnet.MB manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} + manifest.CelestiaAppVersion = "pr-3737" + manifest.TxClientVersion = "pr-3737" return runBenchmarkTest(logger, "TwoNodeBigBlock8MBLatency", manifest) } @@ -200,13 +202,13 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.Validators = 50 manifest.TxClients = 25 manifest.BlobSequences = 1 - manifest.TimeoutCommit = 11 * time.Second - manifest.TimeoutPropose = 80 * time.Second + manifest.TimeoutCommit = 1 * time.Second + manifest.TimeoutPropose = 11 * time.Second manifest.CelestiaAppVersion = "pr-3737" manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "36-" + manifest.summary() + manifest.ChainID = "37-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 7eddad558de53a6e3f372fb0196d453ff159c111 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 21 Aug 2024 16:21:02 -0700 Subject: [PATCH 067/113] points to new version of the core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9d1940997a..946ebb9885 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac ) diff --git a/go.sum b/go.sum index 54bd0e7ea9..16f1560370 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5 h1:WtlBLt1J5N/N9c6PbgP8oqjuBiqLBN3kOvoU3VJZAlA= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac h1:3C53cf2raUqGiX2uBi6opk+6TijLAw5l/UmouRlYYhU= +github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac/go.mod h1:5jJ5magtH7gQOwSYfS/m5fliIS7irKunLV7kLNaD8o0= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From b683c00a1f1f87398156534423b2b3633e4d4283 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 21 Aug 2024 16:21:02 -0700 Subject: [PATCH 068/113] points to new version of the core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9d1940997a..946ebb9885 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac ) diff --git a/go.sum b/go.sum index 54bd0e7ea9..16f1560370 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5 h1:WtlBLt1J5N/N9c6PbgP8oqjuBiqLBN3kOvoU3VJZAlA= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809181741-c44cdc4cc6f5/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac h1:3C53cf2raUqGiX2uBi6opk+6TijLAw5l/UmouRlYYhU= +github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac/go.mod h1:5jJ5magtH7gQOwSYfS/m5fliIS7irKunLV7kLNaD8o0= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 737d1776348cdca1a14995774b0db28facc5cd2e Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 22 Aug 2024 08:02:02 -0700 Subject: [PATCH 069/113] adjusts manifest --- test/e2e/benchmark/throughput.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index ba7b03e24b..51d6299100 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -203,12 +203,12 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.TxClients = 25 manifest.BlobSequences = 1 manifest.TimeoutCommit = 1 * time.Second - manifest.TimeoutPropose = 11 * time.Second + manifest.TimeoutPropose = 4 * time.Second manifest.CelestiaAppVersion = "pr-3737" manifest.TxClientVersion = "pr-3737" manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "37-" + manifest.summary() + manifest.ChainID = "38-" + manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 7c630c26efb382e70a0fe545231a40a21d87e7e8 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 22 Aug 2024 15:13:18 -0700 Subject: [PATCH 070/113] removes remnants of debugging --- test/e2e/benchmark/main.go | 1 - test/e2e/benchmark/throughput.go | 21 ++------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/test/e2e/benchmark/main.go b/test/e2e/benchmark/main.go index bc2c19cf30..df3261f2e6 100644 --- a/test/e2e/benchmark/main.go +++ b/test/e2e/benchmark/main.go @@ -18,7 +18,6 @@ func main() { {"LargeNetworkBigBlock8MB", LargeNetworkBigBlock8MB}, {"LargeNetworkBigBlock32MB", LargeNetworkBigBlock32MB}, {"LargeNetworkBigBlock64MB", LargeNetworkBigBlock64MB}, - {"LargeNetworkBigBlock64MBLatency", LargeNetworkBigBlock64MBLatency}, {"LargeNetworkBigBlock8MBLatency", LargeNetworkBigBlock8MBLatency}, } diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 51d6299100..b1f8c759ea 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -137,8 +137,6 @@ func TwoNodeBigBlock8MBLatency(logger *log.Logger) error { manifest.MaxBlockBytes = 8 * testnet.MB manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} - manifest.CelestiaAppVersion = "pr-3737" - manifest.TxClientVersion = "pr-3737" return runBenchmarkTest(logger, "TwoNodeBigBlock8MBLatency", manifest) } @@ -158,13 +156,8 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest := bigBlockManifest manifest.MaxBlockBytes = 8 * testnet.MB manifest.Validators = 50 - manifest.TxClients = 25 - manifest.BlobSequences = 1 - manifest.TimeoutCommit = 1 * time.Second - manifest.TimeoutPropose = 10 * time.Second - manifest.CelestiaAppVersion = "pr-3737" - manifest.TxClientVersion = "pr-3737" - manifest.ChainID = "fix-" + manifest.summary() + manifest.TxClients = 50 + manifest.BlobSequences = 2 return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) } @@ -186,16 +179,6 @@ func LargeNetworkBigBlock64MB(logger *log.Logger) error { return runBenchmarkTest(logger, "LargeNetworkBigBlock64MB", manifest) } -func LargeNetworkBigBlock64MBLatency(logger *log.Logger) error { - manifest := bigBlockManifest - manifest.MaxBlockBytes = 64 * testnet.MB - manifest.Validators = 50 - manifest.TxClients = 50 - manifest.BlobSequences = 2 - manifest.EnableLatency = true - manifest.LatencyParams = LatencyParams{70, 0} - return runBenchmarkTest(logger, "LargeNetworkBigBlock64MBLatency", manifest) -} func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest := bigBlockManifest manifest.MaxBlockBytes = 8 * testnet.MB From a55f1f4c7b10f66f2580184bd09bd1577abab2c1 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 23 Aug 2024 10:34:14 -0700 Subject: [PATCH 071/113] adds the ability to set or unset bbr in e2e tests --- test/e2e/benchmark/benchmark.go | 3 ++- test/e2e/major_upgrade_v2.go | 2 +- test/e2e/minor_version_compatibility.go | 2 +- test/e2e/simple.go | 2 +- test/e2e/testnet/node.go | 5 +++++ test/e2e/testnet/testnet.go | 17 ++++++++++------- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 456f8da0dd..5fb3b4225f 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -21,7 +21,7 @@ type BenchmarkTest struct { func NewBenchmarkTest(name string, manifest *Manifest) (*BenchmarkTest, error) { // create a new testnet testNet, err := testnet.New(name, seed, - testnet.GetGrafanaInfoFromEnvVar(), manifest.ChainID, + testnet.GetGrafanaInfoFromEnvVar(), manifest.ChainID, false, manifest.GetGenesisModifiers()...) if err != nil { return nil, err @@ -46,6 +46,7 @@ func (b *BenchmarkTest) SetupNodes() error { if err := node.Instance.EnableBitTwister(); err != nil { return fmt.Errorf("failed to enable bit twister: %v", err) } + } } // obtain the GRPC endpoints of the validators diff --git a/test/e2e/major_upgrade_v2.go b/test/e2e/major_upgrade_v2.go index f595be542d..f2550f5ab2 100644 --- a/test/e2e/major_upgrade_v2.go +++ b/test/e2e/major_upgrade_v2.go @@ -28,7 +28,7 @@ func MajorUpgradeToV2(logger *log.Logger) error { defer cancel() logger.Println("Creating testnet") - testNet, err := testnet.New("runMajorUpgradeToV2", seed, nil, "test") + testNet, err := testnet.New("runMajorUpgradeToV2", seed, nil, "test", false) testnet.NoError("failed to create testnet", err) defer testNet.Cleanup() diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index d0fd6314e9..6601f99639 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -32,7 +32,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { r := rand.New(rand.NewSource(seed)) logger.Println("Running minor version compatibility test", "versions", versions) - testNet, err := testnet.New("runMinorVersionCompatibility", seed, nil, "test") + testNet, err := testnet.New("runMinorVersionCompatibility", seed, nil, "test", false) testnet.NoError("failed to create testnet", err) ctx, cancel := context.WithCancel(context.Background()) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 6673129f41..b59d94dd16 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -20,7 +20,7 @@ func E2ESimple(logger *log.Logger) error { logger.Println("Running simple e2e test", "version", latestVersion) - testNet, err := testnet.New("E2ESimple", seed, nil, "test") + testNet, err := testnet.New("E2ESimple", seed, nil, "test", false) testnet.NoError("failed to create testnet", err) defer testNet.Cleanup() diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index addbc98066..ce50c6e41e 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -97,6 +97,7 @@ func NewNode( upgradeHeight int64, resources Resources, grafana *GrafanaInfo, + enableBBR bool, ) (*Node, error) { instance, err := knuu.NewInstance(name) if err != nil { @@ -148,8 +149,12 @@ func NewNode( return nil, err } args := []string{"start", fmt.Sprintf("--home=%s", remoteRootDir), "--rpc.laddr=tcp://0.0.0.0:26657"} + if !enableBBR { + args = append(args, "--force-no-bbr") + } if upgradeHeight != 0 { args = append(args, fmt.Sprintf("--v2-upgrade-height=%d", upgradeHeight)) + } err = instance.SetArgs(args...) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 4b3beebe99..4b806091ea 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -26,9 +26,11 @@ type Testnet struct { keygen *keyGenerator grafana *GrafanaInfo txClients []*TxSim + enableBBR bool } func New(name string, seed int64, grafana *GrafanaInfo, chainID string, + enableBBR bool, genesisModifiers ...genesis.Modifier) ( *Testnet, error, ) { @@ -38,11 +40,12 @@ func New(name string, seed int64, grafana *GrafanaInfo, chainID string, } return &Testnet{ - seed: seed, - nodes: make([]*Node, 0), - genesis: genesis.NewDefaultGenesis().WithChainID(chainID).WithModifiers(genesisModifiers...), - keygen: newKeyGenerator(seed), - grafana: grafana, + seed: seed, + nodes: make([]*Node, 0), + genesis: genesis.NewDefaultGenesis().WithChainID(chainID).WithModifiers(genesisModifiers...), + keygen: newKeyGenerator(seed), + grafana: grafana, + enableBBR: enableBBR, }, nil } @@ -59,7 +62,7 @@ func (t *Testnet) CreateGenesisNode(version string, selfDelegation, upgradeHeigh networkKey := t.keygen.Generate(ed25519Type) node, err := NewNode(fmt.Sprintf("val%d", len(t.nodes)), version, 0, selfDelegation, nil, signerKey, networkKey, upgradeHeight, resources, - t.grafana) + t.grafana, t.enableBBR) if err != nil { return err } @@ -237,7 +240,7 @@ func (t *Testnet) CreateNode(version string, startHeight, upgradeHeight int64, r networkKey := t.keygen.Generate(ed25519Type) node, err := NewNode(fmt.Sprintf("val%d", len(t.nodes)), version, startHeight, 0, nil, signerKey, networkKey, upgradeHeight, resources, - t.grafana) + t.grafana, t.enableBBR) if err != nil { return err } From 5268516d3c6e9c8fda4d5c5f56e2bcd6277267ae Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 23 Aug 2024 11:37:57 -0700 Subject: [PATCH 072/113] resolves linter issues --- test/e2e/benchmark/benchmark.go | 1 - test/e2e/testnet/node.go | 1 - 2 files changed, 2 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 5fb3b4225f..108180df0c 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -46,7 +46,6 @@ func (b *BenchmarkTest) SetupNodes() error { if err := node.Instance.EnableBitTwister(); err != nil { return fmt.Errorf("failed to enable bit twister: %v", err) } - } } // obtain the GRPC endpoints of the validators diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index ce50c6e41e..209dee150e 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -154,7 +154,6 @@ func NewNode( } if upgradeHeight != 0 { args = append(args, fmt.Sprintf("--v2-upgrade-height=%d", upgradeHeight)) - } err = instance.SetArgs(args...) From 0492a829f0739260ac2834777b5b3eb35033d728 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 23 Aug 2024 12:37:34 -0700 Subject: [PATCH 073/113] pass bbr flag for the versions that support it --- test/e2e/testnet/node.go | 4 +++- test/e2e/testnet/util.go | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index 209dee150e..dbef9e88b3 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -31,6 +31,8 @@ const ( ed25519Type = "ed25519" remoteRootDir = "/home/celestia/.celestia-app" txsimRootDir = "/home/celestia" + // the version from which the bbr flag was introduced + appVersiopnWithBBRFlag = "v2.1.2" ) type Node struct { @@ -149,7 +151,7 @@ func NewNode( return nil, err } args := []string{"start", fmt.Sprintf("--home=%s", remoteRootDir), "--rpc.laddr=tcp://0.0.0.0:26657"} - if !enableBBR { + if !enableBBR && equalOrHigher(version, appVersiopnWithBBRFlag) { args = append(args, "--force-no-bbr") } if upgradeHeight != 0 { diff --git a/test/e2e/testnet/util.go b/test/e2e/testnet/util.go index 0d89494858..aa083d8c1e 100644 --- a/test/e2e/testnet/util.go +++ b/test/e2e/testnet/util.go @@ -61,3 +61,14 @@ func GetGrafanaInfoFromEnvVar() *GrafanaInfo { Token: os.Getenv("GRAFANA_TOKEN"), } } + +func equalOrHigher(v1, v2 string) bool { + + if v1 >= v2 { + print(v1, v2, "equalOrHigher", true) + return true + } + print(v1, v2, "equalOrHigher", false) + return false + +} From f47262bacd2c0f65b7057c20126461c25fd8d03a Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 23 Aug 2024 15:12:47 -0700 Subject: [PATCH 074/113] checks against the latest version as well --- test/e2e/testnet/util.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/e2e/testnet/util.go b/test/e2e/testnet/util.go index aa083d8c1e..bf2c0e1e1c 100644 --- a/test/e2e/testnet/util.go +++ b/test/e2e/testnet/util.go @@ -63,7 +63,10 @@ func GetGrafanaInfoFromEnvVar() *GrafanaInfo { } func equalOrHigher(v1, v2 string) bool { - + latest, err := GetLatestVersion() + if err != nil && v1 == latest { + return true + } if v1 >= v2 { print(v1, v2, "equalOrHigher", true) return true From c9e738ffd81f7dec2ce4d2b0ffa0b98788110023 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 23 Aug 2024 15:35:18 -0700 Subject: [PATCH 075/113] removes print statements --- test/e2e/testnet/util.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/testnet/util.go b/test/e2e/testnet/util.go index bf2c0e1e1c..619135ef86 100644 --- a/test/e2e/testnet/util.go +++ b/test/e2e/testnet/util.go @@ -62,16 +62,15 @@ func GetGrafanaInfoFromEnvVar() *GrafanaInfo { } } +// equalOrHigher returns true if v1 is equal to or higher than v2 func equalOrHigher(v1, v2 string) bool { latest, err := GetLatestVersion() if err != nil && v1 == latest { return true } if v1 >= v2 { - print(v1, v2, "equalOrHigher", true) return true } - print(v1, v2, "equalOrHigher", false) return false } From 64328e30c94ba806f89ad5acd48955012a0b3966 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 26 Aug 2024 11:39:28 -0700 Subject: [PATCH 076/113] does not compare with the bbr version --- test/e2e/testnet/node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index dbef9e88b3..c5e50933d8 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -151,7 +151,7 @@ func NewNode( return nil, err } args := []string{"start", fmt.Sprintf("--home=%s", remoteRootDir), "--rpc.laddr=tcp://0.0.0.0:26657"} - if !enableBBR && equalOrHigher(version, appVersiopnWithBBRFlag) { + if !enableBBR { //&& equalOrHigher(version, appVersiopnWithBBRFlag) args = append(args, "--force-no-bbr") } if upgradeHeight != 0 { From c3c47b7dfd667fce2f1b9ea06588399431246508 Mon Sep 17 00:00:00 2001 From: sanaz Date: Mon, 26 Aug 2024 11:52:41 -0700 Subject: [PATCH 077/113] bumps core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 26c706168b..3e149a861c 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240826184730-3d130ac195f7 ) diff --git a/go.sum b/go.sum index dd41d645ab..4ec7f81e8f 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac h1:3C53cf2raUqGiX2uBi6opk+6TijLAw5l/UmouRlYYhU= -github.com/celestiaorg/celestia-core v1.40.0-tm-v0.34.29.0.20240821195915-d5037d6b5dac/go.mod h1:5jJ5magtH7gQOwSYfS/m5fliIS7irKunLV7kLNaD8o0= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240826184730-3d130ac195f7 h1:FzNZ74VOFN12v8RVLhSW3oNwO637MT6y/GiTSJ/DVF0= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240826184730-3d130ac195f7/go.mod h1:oZF2FIFzaKIw0FdR7leR5P9SQSVaGsRoro2FhK35i7g= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From a9df0b1503338ff64258e92cdd525512672fad2b Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 27 Aug 2024 13:27:11 -0700 Subject: [PATCH 078/113] bumps core to a version with delay set to 14s --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3e149a861c..98e71a81e9 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240826184730-3d130ac195f7 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240827202430-8e974ca0a3df ) diff --git a/go.sum b/go.sum index 4ec7f81e8f..0604e8a5ec 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240826184730-3d130ac195f7 h1:FzNZ74VOFN12v8RVLhSW3oNwO637MT6y/GiTSJ/DVF0= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240826184730-3d130ac195f7/go.mod h1:oZF2FIFzaKIw0FdR7leR5P9SQSVaGsRoro2FhK35i7g= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240827202430-8e974ca0a3df h1:qO++CNiTJFJFsqhKTlJPmzpEszJNFk7rQw4EEy4J9uE= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240827202430-8e974ca0a3df/go.mod h1:oZF2FIFzaKIw0FdR7leR5P9SQSVaGsRoro2FhK35i7g= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 9265070238bf158cd7e2ba9c82b9c9a4ea9a58ba Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 11:38:33 -0700 Subject: [PATCH 079/113] adds a parameter to set bbr in the node creation methods instead of using testnet fields --- test/e2e/testnet/node.go | 5 ++--- test/e2e/testnet/testnet.go | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index c5e50933d8..8121acd1c3 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -32,7 +32,6 @@ const ( remoteRootDir = "/home/celestia/.celestia-app" txsimRootDir = "/home/celestia" // the version from which the bbr flag was introduced - appVersiopnWithBBRFlag = "v2.1.2" ) type Node struct { @@ -99,7 +98,7 @@ func NewNode( upgradeHeight int64, resources Resources, grafana *GrafanaInfo, - enableBBR bool, + disableBBR bool, ) (*Node, error) { instance, err := knuu.NewInstance(name) if err != nil { @@ -151,7 +150,7 @@ func NewNode( return nil, err } args := []string{"start", fmt.Sprintf("--home=%s", remoteRootDir), "--rpc.laddr=tcp://0.0.0.0:26657"} - if !enableBBR { //&& equalOrHigher(version, appVersiopnWithBBRFlag) + if disableBBR { args = append(args, "--force-no-bbr") } if upgradeHeight != 0 { diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 4b806091ea..422743b08b 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -26,7 +26,6 @@ type Testnet struct { keygen *keyGenerator grafana *GrafanaInfo txClients []*TxSim - enableBBR bool } func New(name string, seed int64, grafana *GrafanaInfo, chainID string, @@ -40,12 +39,12 @@ func New(name string, seed int64, grafana *GrafanaInfo, chainID string, } return &Testnet{ - seed: seed, - nodes: make([]*Node, 0), - genesis: genesis.NewDefaultGenesis().WithChainID(chainID).WithModifiers(genesisModifiers...), - keygen: newKeyGenerator(seed), - grafana: grafana, - enableBBR: enableBBR, + seed: seed, + nodes: make([]*Node, 0), + genesis: genesis.NewDefaultGenesis().WithChainID(chainID).WithModifiers(genesisModifiers...), + keygen: newKeyGenerator(seed), + grafana: grafana, + //enableBBR: enableBBR, }, nil } @@ -57,12 +56,12 @@ func (t *Testnet) SetConsensusMaxBlockSize(size int64) { t.genesis.ConsensusParams.Block.MaxBytes = size } -func (t *Testnet) CreateGenesisNode(version string, selfDelegation, upgradeHeight int64, resources Resources) error { +func (t *Testnet) CreateGenesisNode(version string, selfDelegation, upgradeHeight int64, resources Resources, disableBBR bool) error { signerKey := t.keygen.Generate(ed25519Type) networkKey := t.keygen.Generate(ed25519Type) node, err := NewNode(fmt.Sprintf("val%d", len(t.nodes)), version, 0, selfDelegation, nil, signerKey, networkKey, upgradeHeight, resources, - t.grafana, t.enableBBR) + t.grafana, disableBBR) if err != nil { return err } @@ -73,9 +72,9 @@ func (t *Testnet) CreateGenesisNode(version string, selfDelegation, upgradeHeigh return nil } -func (t *Testnet) CreateGenesisNodes(num int, version string, selfDelegation, upgradeHeight int64, resources Resources) error { +func (t *Testnet) CreateGenesisNodes(num int, version string, selfDelegation, upgradeHeight int64, resources Resources, disableBBR bool) error { for i := 0; i < num; i++ { - if err := t.CreateGenesisNode(version, selfDelegation, upgradeHeight, resources); err != nil { + if err := t.CreateGenesisNode(version, selfDelegation, upgradeHeight, resources, disableBBR); err != nil { return err } } @@ -235,12 +234,12 @@ func (t *Testnet) CreateAccount(name string, tokens int64, txsimKeyringDir strin return kr, nil } -func (t *Testnet) CreateNode(version string, startHeight, upgradeHeight int64, resources Resources) error { +func (t *Testnet) CreateNode(version string, startHeight, upgradeHeight int64, resources Resources, enableBBR bool) error { signerKey := t.keygen.Generate(ed25519Type) networkKey := t.keygen.Generate(ed25519Type) node, err := NewNode(fmt.Sprintf("val%d", len(t.nodes)), version, startHeight, 0, nil, signerKey, networkKey, upgradeHeight, resources, - t.grafana, t.enableBBR) + t.grafana, enableBBR) if err != nil { return err } From 5eab0b8aaf868ebd1c408e83974e428e2acb4611 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 11:38:55 -0700 Subject: [PATCH 080/113] replaces equalOrHigher with isBBRCompatible --- test/e2e/minor_version_compatibility.go | 19 ++++++++++++++++++- test/e2e/testnet/util.go | 13 ------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index 6601f99639..055300f327 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -55,7 +55,15 @@ func MinorVersionCompatibility(logger *log.Logger) error { // each node begins with a random version within the same major version set v := versions.Random(r).String() logger.Println("Starting node", "node", i, "version", v) - testnet.NoError("failed to create genesis node", testNet.CreateGenesisNode(v, 10000000, 0, testnet.DefaultResources)) + var disableBBR = false + // bbr is only available after a certain version, + // the flag needs to be passed only for versions that support it + if isBBRCompatible(v) { + disableBBR = true + } + testnet.NoError("failed to create genesis node", + testNet.CreateGenesisNode(v, 10000000, 0, + testnet.DefaultResources, disableBBR)) } logger.Println("Creating txsim") @@ -121,3 +129,12 @@ func getAllVersions() (string, error) { allVersions := strings.Split(strings.TrimSpace(string(output)), "\n") return strings.Join(allVersions, " "), nil } + +// isBBRCompatible returns true if version is bbr compatible +// MUST be called only for versions that follow semver +func isBBRCompatible(v string) bool { + if v >= "v2.1.2" { + return true + } + return false +} diff --git a/test/e2e/testnet/util.go b/test/e2e/testnet/util.go index 619135ef86..0d89494858 100644 --- a/test/e2e/testnet/util.go +++ b/test/e2e/testnet/util.go @@ -61,16 +61,3 @@ func GetGrafanaInfoFromEnvVar() *GrafanaInfo { Token: os.Getenv("GRAFANA_TOKEN"), } } - -// equalOrHigher returns true if v1 is equal to or higher than v2 -func equalOrHigher(v1, v2 string) bool { - latest, err := GetLatestVersion() - if err != nil && v1 == latest { - return true - } - if v1 >= v2 { - return true - } - return false - -} From fc8adfc96959f89fc1e1e2a39c725821c9471e9f Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 11:39:17 -0700 Subject: [PATCH 081/113] disables BBR for e2e tests --- test/e2e/major_upgrade_v2.go | 2 +- test/e2e/simple.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/major_upgrade_v2.go b/test/e2e/major_upgrade_v2.go index f2550f5ab2..73c697ebc4 100644 --- a/test/e2e/major_upgrade_v2.go +++ b/test/e2e/major_upgrade_v2.go @@ -43,7 +43,7 @@ func MajorUpgradeToV2(logger *log.Logger) error { logger.Println("Creating genesis nodes") for i := 0; i < numNodes; i++ { - err := testNet.CreateGenesisNode(latestVersion, 10000000, upgradeHeight, testnet.DefaultResources) + err := testNet.CreateGenesisNode(latestVersion, 10000000, upgradeHeight, testnet.DefaultResources, false) testnet.NoError("failed to create genesis node", err) } diff --git a/test/e2e/simple.go b/test/e2e/simple.go index b59d94dd16..110d11743a 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -26,7 +26,7 @@ func E2ESimple(logger *log.Logger) error { defer testNet.Cleanup() logger.Println("Creating testnet validators") - testnet.NoError("failed to create genesis nodes", testNet.CreateGenesisNodes(4, latestVersion, 10000000, 0, testnet.DefaultResources)) + testnet.NoError("failed to create genesis nodes", testNet.CreateGenesisNodes(4, latestVersion, 10000000, 0, testnet.DefaultResources, false)) logger.Println("Creating txsim") endpoints, err := testNet.RemoteGRPCEndpoints() From ac5975d3caa6a4bb69ee1d3d5033b960473b8ac7 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:03:54 -0700 Subject: [PATCH 082/113] disables bbr on upgrade if applicable --- test/e2e/major_upgrade_v2.go | 5 +++-- test/e2e/minor_version_compatibility.go | 13 +++++++++++-- test/e2e/testnet/node.go | 24 +++++++++++++++++++++++- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/test/e2e/major_upgrade_v2.go b/test/e2e/major_upgrade_v2.go index 73c697ebc4..fb01886105 100644 --- a/test/e2e/major_upgrade_v2.go +++ b/test/e2e/major_upgrade_v2.go @@ -43,7 +43,8 @@ func MajorUpgradeToV2(logger *log.Logger) error { logger.Println("Creating genesis nodes") for i := 0; i < numNodes; i++ { - err := testNet.CreateGenesisNode(latestVersion, 10000000, upgradeHeight, testnet.DefaultResources, false) + err := testNet.CreateGenesisNode(latestVersion, 10000000, + upgradeHeight, testnet.DefaultResources, true) testnet.NoError("failed to create genesis node", err) } @@ -90,7 +91,7 @@ func MajorUpgradeToV2(logger *log.Logger) error { return fmt.Errorf("failed to get height: %w", err) } - if err := node.Upgrade(latestVersion); err != nil { + if err := node.Upgrade(latestVersion, true); err != nil { return fmt.Errorf("failed to restart node: %w", err) } diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index 055300f327..1ef5417616 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -28,7 +28,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { if len(versions) == 0 { logger.Fatal("no versions to test") } - numNodes := 4 + numNodes := 3 r := rand.New(rand.NewSource(seed)) logger.Println("Running minor version compatibility test", "versions", versions) @@ -59,6 +59,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { // bbr is only available after a certain version, // the flag needs to be passed only for versions that support it if isBBRCompatible(v) { + fmt.Println("Disabling BBR for version ", v) disableBBR = true } testnet.NoError("failed to create genesis node", @@ -92,7 +93,15 @@ func MinorVersionCompatibility(logger *log.Logger) error { newVersion := versions.Random(r).String() logger.Println("Upgrading node", "node", i%numNodes+1, "version", newVersion) - testnet.NoError("failed to upgrade node", testNet.Node(i%numNodes).Upgrade(newVersion)) + var disableBBR = false + // bbr is only available after a certain version, + // the flag needs to be passed only for versions that support it + if isBBRCompatible(newVersion) { + fmt.Println("Disabling BBR for version ", newVersion) + disableBBR = true + } + testnet.NoError("failed to upgrade node", + testNet.Node(i%numNodes).Upgrade(newVersion, disableBBR)) time.Sleep(10 * time.Second) // wait for the node to reach two more heights testnet.NoError("failed to wait for height", waitForHeight(ctx, client, heightBefore+2, 30*time.Second)) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index 8121acd1c3..fb459216d3 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -48,6 +48,7 @@ type Node struct { // FIXME: This does not work currently with the reverse proxy // grpcProxyHost string traceProxyHost string + args []string } // PullRoundStateTraces retrieves the round state traces from a node. @@ -171,6 +172,7 @@ func NewNode( SignerKey: signerKey, NetworkKey: networkKey, SelfDelegation: selfDelegation, + args: args, }, nil } @@ -369,14 +371,34 @@ func (n *Node) GenesisValidator() genesis.Validator { } } -func (n *Node) Upgrade(version string) error { +func (n *Node) Upgrade(version string, disableBBR bool) error { if err := n.Instance.SetImageInstant(DockerImageName(version)); err != nil { return err } + if disableBBR { + //if !contains(n.args, "--force-no-bbr") { + n.args = append(n.args, "--force-no-bbr") + n.Instance.SetArgs(n.args...) + //} + } + return n.Instance.WaitInstanceIsRunning() } func DockerImageName(version string) string { return fmt.Sprintf("%s:%s", dockerSrcURL, version) } + +func (n *Node) GetArgs() []string { + return n.args +} + +func contains(slice []string, str string) bool { + for _, v := range slice { + if v == str { + return true + } + } + return false +} From ed8cd890b7a81d32b4328067490f2b45ad55eedb Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:08:04 -0700 Subject: [PATCH 083/113] logs state of nodes while forwarding ports --- test/e2e/testnet/testnet.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 422743b08b..39dc18e031 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -385,8 +385,12 @@ func (t *Testnet) StartNodes() error { for _, node := range genesisNodes { err := node.WaitUntilStartedAndForwardPorts() if err != nil { + log.Err(err).Str("name", node.Name).Str("version", + node.Version).Msg("failed to start and forward ports") return fmt.Errorf("node %s failed to start: %w", node.Name, err) } + log.Info().Str("name", node.Name).Str("version", + node.Version).Msg("started and ports forwarded") } return nil } From a92ee08866c5c562c63963fa50ccc2e403c6a0dd Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:10:29 -0700 Subject: [PATCH 084/113] adds bbr option to the benchmark tests --- test/e2e/benchmark/benchmark.go | 2 +- test/e2e/benchmark/manifest.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index 108180df0c..ba43c4d9e4 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -38,7 +38,7 @@ func (b *BenchmarkTest) SetupNodes() error { testnet.NoError("failed to create genesis nodes", b.CreateGenesisNodes(b.manifest.Validators, b.manifest.CelestiaAppVersion, b.manifest.SelfDelegation, - b.manifest.UpgradeHeight, b.manifest.ValidatorResource)) + b.manifest.UpgradeHeight, b.manifest.ValidatorResource, b.manifest.DisableBBR)) // enable latency if specified in the manifest if b.manifest.EnableLatency { diff --git a/test/e2e/benchmark/manifest.go b/test/e2e/benchmark/manifest.go index f130069657..2b94a41585 100644 --- a/test/e2e/benchmark/manifest.go +++ b/test/e2e/benchmark/manifest.go @@ -78,6 +78,8 @@ type Manifest struct { UpgradeHeight int64 GovMaxSquareSize int64 + + DisableBBR bool } func (m *Manifest) GetGenesisModifiers() []genesis.Modifier { @@ -104,11 +106,11 @@ func (m *Manifest) summary() string { latency = 1 } maxBlockMB := m.MaxBlockBytes / testnet.MB - summary := fmt.Sprintf("v%d-t%d-b%d-bw%dmb-tc%d-tp%d-l%d-%s-%dmb", + summary := fmt.Sprintf("v%d-t%d-b%d-bw%dmb-tc%d-tp%d-l%d-%s-br%d-%dmb", m.Validators, m.TxClients, m.BlobSequences, m.PerPeerBandwidth/testnet.MB, m.TimeoutCommit/time.Second, m.TimeoutPropose/time.Second, - latency, m.Mempool, maxBlockMB) + latency, m.Mempool, m.DisableBBR, maxBlockMB) if len(summary) > 50 { return summary[:50] } From 64cf5ec4ebbd973c0075e3e1853cc5ccf69cef34 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:11:52 -0700 Subject: [PATCH 085/113] removes unused enableBBR parameter from testnet.New --- test/e2e/testnet/testnet.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 39dc18e031..ff5a315489 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -29,7 +29,6 @@ type Testnet struct { } func New(name string, seed int64, grafana *GrafanaInfo, chainID string, - enableBBR bool, genesisModifiers ...genesis.Modifier) ( *Testnet, error, ) { @@ -44,7 +43,6 @@ func New(name string, seed int64, grafana *GrafanaInfo, chainID string, genesis: genesis.NewDefaultGenesis().WithChainID(chainID).WithModifiers(genesisModifiers...), keygen: newKeyGenerator(seed), grafana: grafana, - //enableBBR: enableBBR, }, nil } From 7f2e46f9a9e10eb6fe546cadbb50864e69ec62cd Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:13:11 -0700 Subject: [PATCH 086/113] deletes enableBBR as argument in e2e tests initialization --- test/e2e/major_upgrade_v2.go | 2 +- test/e2e/minor_version_compatibility.go | 2 +- test/e2e/simple.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/major_upgrade_v2.go b/test/e2e/major_upgrade_v2.go index fb01886105..33040b5ca1 100644 --- a/test/e2e/major_upgrade_v2.go +++ b/test/e2e/major_upgrade_v2.go @@ -28,7 +28,7 @@ func MajorUpgradeToV2(logger *log.Logger) error { defer cancel() logger.Println("Creating testnet") - testNet, err := testnet.New("runMajorUpgradeToV2", seed, nil, "test", false) + testNet, err := testnet.New("runMajorUpgradeToV2", seed, nil, "test") testnet.NoError("failed to create testnet", err) defer testNet.Cleanup() diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index 1ef5417616..31664f4894 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -32,7 +32,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { r := rand.New(rand.NewSource(seed)) logger.Println("Running minor version compatibility test", "versions", versions) - testNet, err := testnet.New("runMinorVersionCompatibility", seed, nil, "test", false) + testNet, err := testnet.New("runMinorVersionCompatibility", seed, nil, "test") testnet.NoError("failed to create testnet", err) ctx, cancel := context.WithCancel(context.Background()) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 110d11743a..7c0757b252 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -20,7 +20,7 @@ func E2ESimple(logger *log.Logger) error { logger.Println("Running simple e2e test", "version", latestVersion) - testNet, err := testnet.New("E2ESimple", seed, nil, "test", false) + testNet, err := testnet.New("E2ESimple", seed, nil, "test") testnet.NoError("failed to create testnet", err) defer testNet.Cleanup() From 95822b7adfc305066a6361b6ca8fa6ad73458e18 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:17:47 -0700 Subject: [PATCH 087/113] removes an old comment --- test/e2e/testnet/node.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index fb459216d3..3f41274d6b 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -31,7 +31,6 @@ const ( ed25519Type = "ed25519" remoteRootDir = "/home/celestia/.celestia-app" txsimRootDir = "/home/celestia" - // the version from which the bbr flag was introduced ) type Node struct { From 25ab5a6f7eabf292a562581343af43be30a1ec0a Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:18:03 -0700 Subject: [PATCH 088/113] renames enableBBR to disableBBR --- test/e2e/testnet/testnet.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index ff5a315489..76d0bc15df 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -232,12 +232,12 @@ func (t *Testnet) CreateAccount(name string, tokens int64, txsimKeyringDir strin return kr, nil } -func (t *Testnet) CreateNode(version string, startHeight, upgradeHeight int64, resources Resources, enableBBR bool) error { +func (t *Testnet) CreateNode(version string, startHeight, upgradeHeight int64, resources Resources, disableBBR bool) error { signerKey := t.keygen.Generate(ed25519Type) networkKey := t.keygen.Generate(ed25519Type) node, err := NewNode(fmt.Sprintf("val%d", len(t.nodes)), version, startHeight, 0, nil, signerKey, networkKey, upgradeHeight, resources, - t.grafana, enableBBR) + t.grafana, disableBBR) if err != nil { return err } From 20c82d5f72df3eb8f5279cd6063f903052a3019d Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:39:26 -0700 Subject: [PATCH 089/113] brings back original number of nodes --- test/e2e/minor_version_compatibility.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index 31664f4894..0a715cb254 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -28,7 +28,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { if len(versions) == 0 { logger.Fatal("no versions to test") } - numNodes := 3 + numNodes := 4 r := rand.New(rand.NewSource(seed)) logger.Println("Running minor version compatibility test", "versions", versions) From 366d55a369ec41e281779fbd4b6beff4b9d5e621 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:39:37 -0700 Subject: [PATCH 090/113] disables bbr in E2ESimple --- test/e2e/simple.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 7c0757b252..12e493de49 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -26,7 +26,9 @@ func E2ESimple(logger *log.Logger) error { defer testNet.Cleanup() logger.Println("Creating testnet validators") - testnet.NoError("failed to create genesis nodes", testNet.CreateGenesisNodes(4, latestVersion, 10000000, 0, testnet.DefaultResources, false)) + testnet.NoError("failed to create genesis nodes", + testNet.CreateGenesisNodes(4, latestVersion, 10000000, 0, + testnet.DefaultResources, true)) logger.Println("Creating txsim") endpoints, err := testNet.RemoteGRPCEndpoints() From 46c5799f97ea33a3af298db6767325eeedfb9fd5 Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 13:41:02 -0700 Subject: [PATCH 091/113] makes disableBBR parameter ineffective in the Node's Upgrade --- test/e2e/testnet/node.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index 3f41274d6b..32d26d7c60 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -375,12 +375,14 @@ func (n *Node) Upgrade(version string, disableBBR bool) error { return err } - if disableBBR { - //if !contains(n.args, "--force-no-bbr") { - n.args = append(n.args, "--force-no-bbr") - n.Instance.SetArgs(n.args...) - //} - } + //if disableBBR { + // // FIXME: This does not work currently since the node is not in state 'Preparing' or 'Committed' + // //n.args = append(n.args, "--force-no-bbr") + // //err := n.Instance.SetArgs(n.args...) + // //if err != nil { + // // return fmt.Errorf("cannot pass --force-no-bbr flag: %w", err) + // //} + //} return n.Instance.WaitInstanceIsRunning() } From 9769d0812a1c4ec702d8561166e7d45e57b5830e Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 14:10:05 -0700 Subject: [PATCH 092/113] fixes left-over of refactoring --- test/e2e/benchmark/benchmark.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index ba43c4d9e4..e34d322bb8 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -21,7 +21,7 @@ type BenchmarkTest struct { func NewBenchmarkTest(name string, manifest *Manifest) (*BenchmarkTest, error) { // create a new testnet testNet, err := testnet.New(name, seed, - testnet.GetGrafanaInfoFromEnvVar(), manifest.ChainID, false, + testnet.GetGrafanaInfoFromEnvVar(), manifest.ChainID, manifest.GetGenesisModifiers()...) if err != nil { return nil, err From 9256ec6c92d90a80c724dcf9528dac82f0f4734e Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 15:21:51 -0700 Subject: [PATCH 093/113] resolves some of the linter issues --- test/e2e/minor_version_compatibility.go | 9 +++------ test/e2e/testnet/node.go | 11 +---------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index 0a715cb254..f0d2cae81b 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -55,7 +55,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { // each node begins with a random version within the same major version set v := versions.Random(r).String() logger.Println("Starting node", "node", i, "version", v) - var disableBBR = false + disableBBR := false // bbr is only available after a certain version, // the flag needs to be passed only for versions that support it if isBBRCompatible(v) { @@ -93,7 +93,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { newVersion := versions.Random(r).String() logger.Println("Upgrading node", "node", i%numNodes+1, "version", newVersion) - var disableBBR = false + disableBBR := false // bbr is only available after a certain version, // the flag needs to be passed only for versions that support it if isBBRCompatible(newVersion) { @@ -142,8 +142,5 @@ func getAllVersions() (string, error) { // isBBRCompatible returns true if version is bbr compatible // MUST be called only for versions that follow semver func isBBRCompatible(v string) bool { - if v >= "v2.1.2" { - return true - } - return false + return v >= "v2.1.2" } diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index 32d26d7c60..c3223fc977 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -375,7 +375,7 @@ func (n *Node) Upgrade(version string, disableBBR bool) error { return err } - //if disableBBR { + // if disableBBR { // // FIXME: This does not work currently since the node is not in state 'Preparing' or 'Committed' // //n.args = append(n.args, "--force-no-bbr") // //err := n.Instance.SetArgs(n.args...) @@ -394,12 +394,3 @@ func DockerImageName(version string) string { func (n *Node) GetArgs() []string { return n.args } - -func contains(slice []string, str string) bool { - for _, v := range slice { - if v == str { - return true - } - } - return false -} From e1eca7b1c2fd774726c6354d388921c53ea2abbd Mon Sep 17 00:00:00 2001 From: sanaz Date: Wed, 28 Aug 2024 17:14:01 -0700 Subject: [PATCH 094/113] adds bbr to the chain id --- test/e2e/benchmark/manifest.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/e2e/benchmark/manifest.go b/test/e2e/benchmark/manifest.go index 2b94a41585..1f8c5005b8 100644 --- a/test/e2e/benchmark/manifest.go +++ b/test/e2e/benchmark/manifest.go @@ -105,12 +105,16 @@ func (m *Manifest) summary() string { if m.EnableLatency { latency = 1 } + bbr := 1 + if m.DisableBBR { + latency = 0 + } maxBlockMB := m.MaxBlockBytes / testnet.MB summary := fmt.Sprintf("v%d-t%d-b%d-bw%dmb-tc%d-tp%d-l%d-%s-br%d-%dmb", m.Validators, m.TxClients, m.BlobSequences, m.PerPeerBandwidth/testnet.MB, m.TimeoutCommit/time.Second, m.TimeoutPropose/time.Second, - latency, m.Mempool, m.DisableBBR, maxBlockMB) + latency, m.Mempool, bbr, maxBlockMB) if len(summary) > 50 { return summary[:50] } From 8b374cd2d733b65527c56de7fb146b4f364b037d Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 29 Aug 2024 14:19:13 -0700 Subject: [PATCH 095/113] refactors isBBRCompatible --- test/e2e/minor_version_compatibility.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index f0d2cae81b..c0f4755255 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -142,5 +142,12 @@ func getAllVersions() (string, error) { // isBBRCompatible returns true if version is bbr compatible // MUST be called only for versions that follow semver func isBBRCompatible(v string) bool { - return v >= "v2.1.2" + // bbr is only available after v2.1.2 + bbrVersion, _ := testnet.ParseVersion("v2.1.2") + parsedVersion, ok := testnet.ParseVersion(v) + if !ok { + panic("isBBRCompatible called with invalid version") + } + // versions less than bbr version are not compatible with bbr + return !bbrVersion.IsGreater(parsedVersion) } From 3bb0939cabf6ddbf7b8ef17bc5631481cd000fb5 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 29 Aug 2024 14:43:17 -0700 Subject: [PATCH 096/113] retrieves the old version of Upgrade --- test/e2e/major_upgrade_v2.go | 2 +- test/e2e/minor_version_compatibility.go | 9 +-------- test/e2e/testnet/node.go | 11 +---------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/test/e2e/major_upgrade_v2.go b/test/e2e/major_upgrade_v2.go index 33040b5ca1..9797aa9c26 100644 --- a/test/e2e/major_upgrade_v2.go +++ b/test/e2e/major_upgrade_v2.go @@ -91,7 +91,7 @@ func MajorUpgradeToV2(logger *log.Logger) error { return fmt.Errorf("failed to get height: %w", err) } - if err := node.Upgrade(latestVersion, true); err != nil { + if err := node.Upgrade(latestVersion); err != nil { return fmt.Errorf("failed to restart node: %w", err) } diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index c0f4755255..1148c0ca7b 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -93,15 +93,8 @@ func MinorVersionCompatibility(logger *log.Logger) error { newVersion := versions.Random(r).String() logger.Println("Upgrading node", "node", i%numNodes+1, "version", newVersion) - disableBBR := false - // bbr is only available after a certain version, - // the flag needs to be passed only for versions that support it - if isBBRCompatible(newVersion) { - fmt.Println("Disabling BBR for version ", newVersion) - disableBBR = true - } testnet.NoError("failed to upgrade node", - testNet.Node(i%numNodes).Upgrade(newVersion, disableBBR)) + testNet.Node(i%numNodes).Upgrade(newVersion)) time.Sleep(10 * time.Second) // wait for the node to reach two more heights testnet.NoError("failed to wait for height", waitForHeight(ctx, client, heightBefore+2, 30*time.Second)) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index c3223fc977..d1ec9ad03a 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -370,20 +370,11 @@ func (n *Node) GenesisValidator() genesis.Validator { } } -func (n *Node) Upgrade(version string, disableBBR bool) error { +func (n *Node) Upgrade(version string) error { if err := n.Instance.SetImageInstant(DockerImageName(version)); err != nil { return err } - // if disableBBR { - // // FIXME: This does not work currently since the node is not in state 'Preparing' or 'Committed' - // //n.args = append(n.args, "--force-no-bbr") - // //err := n.Instance.SetArgs(n.args...) - // //if err != nil { - // // return fmt.Errorf("cannot pass --force-no-bbr flag: %w", err) - // //} - //} - return n.Instance.WaitInstanceIsRunning() } From c807319af1e7670ce53e7912699022af39d07f0b Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 29 Aug 2024 15:00:30 -0700 Subject: [PATCH 097/113] disables bbr for MinorVersionCompatibility --- test/e2e/minor_version_compatibility.go | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index 1148c0ca7b..cc618bd33b 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -55,16 +55,9 @@ func MinorVersionCompatibility(logger *log.Logger) error { // each node begins with a random version within the same major version set v := versions.Random(r).String() logger.Println("Starting node", "node", i, "version", v) - disableBBR := false - // bbr is only available after a certain version, - // the flag needs to be passed only for versions that support it - if isBBRCompatible(v) { - fmt.Println("Disabling BBR for version ", v) - disableBBR = true - } testnet.NoError("failed to create genesis node", testNet.CreateGenesisNode(v, 10000000, 0, - testnet.DefaultResources, disableBBR)) + testnet.DefaultResources, false)) } logger.Println("Creating txsim") @@ -131,16 +124,3 @@ func getAllVersions() (string, error) { allVersions := strings.Split(strings.TrimSpace(string(output)), "\n") return strings.Join(allVersions, " "), nil } - -// isBBRCompatible returns true if version is bbr compatible -// MUST be called only for versions that follow semver -func isBBRCompatible(v string) bool { - // bbr is only available after v2.1.2 - bbrVersion, _ := testnet.ParseVersion("v2.1.2") - parsedVersion, ok := testnet.ParseVersion(v) - if !ok { - panic("isBBRCompatible called with invalid version") - } - // versions less than bbr version are not compatible with bbr - return !bbrVersion.IsGreater(parsedVersion) -} From 91b91b40c84f384012f8ab3a09a43e7d5c74f814 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 29 Aug 2024 15:07:32 -0700 Subject: [PATCH 098/113] disables BBR in benchmark tests --- test/e2e/benchmark/throughput.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index b919093d8a..280180a278 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -51,6 +51,7 @@ var bigBlockManifest = Manifest{ TestDuration: 5 * time.Minute, LocalTracingType: "local", PushTrace: true, + DisableBBR: true, } func TwoNodeSimple(logger *log.Logger) error { @@ -88,6 +89,7 @@ func TwoNodeSimple(logger *log.Logger) error { DownloadTraces: false, TestDuration: 3 * time.Minute, TxClients: 2, + DisableBBR: true } benchTest, err := NewBenchmarkTest(testName, &manifest) From 6b108ad200a18b5303b3a1c2ed2b3e86520f1e30 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 29 Aug 2024 15:13:41 -0700 Subject: [PATCH 099/113] fixes a bug --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 280180a278..b0392468ce 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -89,7 +89,7 @@ func TwoNodeSimple(logger *log.Logger) error { DownloadTraces: false, TestDuration: 3 * time.Minute, TxClients: 2, - DisableBBR: true + DisableBBR: true, } benchTest, err := NewBenchmarkTest(testName, &manifest) From 6a831a6b216293330b5b4632b771633f14d3136d Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 08:10:14 -0700 Subject: [PATCH 100/113] deletes args field from Node --- test/e2e/testnet/node.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index d1ec9ad03a..270cd545b7 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -47,7 +47,6 @@ type Node struct { // FIXME: This does not work currently with the reverse proxy // grpcProxyHost string traceProxyHost string - args []string } // PullRoundStateTraces retrieves the round state traces from a node. @@ -171,7 +170,6 @@ func NewNode( SignerKey: signerKey, NetworkKey: networkKey, SelfDelegation: selfDelegation, - args: args, }, nil } @@ -381,7 +379,3 @@ func (n *Node) Upgrade(version string) error { func DockerImageName(version string) string { return fmt.Sprintf("%s:%s", dockerSrcURL, version) } - -func (n *Node) GetArgs() []string { - return n.args -} From d2f5eb7ef6c0209db93a3392af918397e3220562 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 08:15:16 -0700 Subject: [PATCH 101/113] minor formatting fix --- test/e2e/minor_version_compatibility.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/minor_version_compatibility.go b/test/e2e/minor_version_compatibility.go index cc618bd33b..9c09b57895 100644 --- a/test/e2e/minor_version_compatibility.go +++ b/test/e2e/minor_version_compatibility.go @@ -86,8 +86,7 @@ func MinorVersionCompatibility(logger *log.Logger) error { newVersion := versions.Random(r).String() logger.Println("Upgrading node", "node", i%numNodes+1, "version", newVersion) - testnet.NoError("failed to upgrade node", - testNet.Node(i%numNodes).Upgrade(newVersion)) + testnet.NoError("failed to upgrade node", testNet.Node(i%numNodes).Upgrade(newVersion)) time.Sleep(10 * time.Second) // wait for the node to reach two more heights testnet.NoError("failed to wait for height", waitForHeight(ctx, client, heightBefore+2, 30*time.Second)) From 7d02543367c46ad2726b1a40981144a355f99db8 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 10:17:05 -0700 Subject: [PATCH 102/113] bums to the core in which the amount of delayed is dynamically set based on timeout porpose --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 98e71a81e9..4535a59217 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240827202430-8e974ca0a3df + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830171137-5bdedc84a83d ) diff --git a/go.sum b/go.sum index 0604e8a5ec..38e89c050e 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240827202430-8e974ca0a3df h1:qO++CNiTJFJFsqhKTlJPmzpEszJNFk7rQw4EEy4J9uE= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240827202430-8e974ca0a3df/go.mod h1:oZF2FIFzaKIw0FdR7leR5P9SQSVaGsRoro2FhK35i7g= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830171137-5bdedc84a83d h1:P5NxeBCYTTK9XAwp8i6T+JlDKEtopIAn1ZxIDUlMCrg= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830171137-5bdedc84a83d/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 99e134f488ec0c7276e87955dae6926e8beab4c8 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 10:30:59 -0700 Subject: [PATCH 103/113] bumps core to the version with the addition of block prop time to the total delay --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4535a59217..1118ad784b 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830171137-5bdedc84a83d + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830172913-af3a91f48c38 ) diff --git a/go.sum b/go.sum index 38e89c050e..5c8c06b3db 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830171137-5bdedc84a83d h1:P5NxeBCYTTK9XAwp8i6T+JlDKEtopIAn1ZxIDUlMCrg= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830171137-5bdedc84a83d/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830172913-af3a91f48c38 h1:AcgVDkSQKUItwqKXORebkzslRkuljPmpb3Vht1QT8BI= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830172913-af3a91f48c38/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 35c88cdf5ac869f1e8014922235d4bca4536626d Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 14:23:10 -0700 Subject: [PATCH 104/113] removes chain counter --- test/e2e/benchmark/throughput.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index eda893456f..115e36c264 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -194,6 +194,6 @@ func LargeNetworkBigBlock8MBLatency(logger *log.Logger) error { manifest.EnableLatency = true manifest.LatencyParams = LatencyParams{70, 0} manifest.TestDuration = 10 * time.Minute - manifest.ChainID = "38-" + manifest.summary() + manifest.ChainID = manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MBLatency", manifest) } From 828121646a1ddaabe5da8ad2bb1528e62b6f80b6 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 17:39:27 -0700 Subject: [PATCH 105/113] bumps core to a version with delay precommit as env var --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1118ad784b..4a313069d4 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830172913-af3a91f48c38 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240831003419-dd2274ca91fd ) diff --git a/go.sum b/go.sum index 5c8c06b3db..58bd66df07 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830172913-af3a91f48c38 h1:AcgVDkSQKUItwqKXORebkzslRkuljPmpb3Vht1QT8BI= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240830172913-af3a91f48c38/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240831003419-dd2274ca91fd h1:ykYVbnIrfBX9QFqRoPOIzu7V24SjJE4zn65z4giHpbE= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240831003419-dd2274ca91fd/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 15c37b4a21fb7024eb2c73b0a978a3ba511c068c Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 30 Aug 2024 17:55:47 -0700 Subject: [PATCH 106/113] adds env var to the bash script --- scripts/single-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/single-node.sh b/scripts/single-node.sh index d7d19b4f07..8f91b6ea2a 100755 --- a/scripts/single-node.sh +++ b/scripts/single-node.sh @@ -1,5 +1,5 @@ #!/bin/sh - +export PRECOMMIT_DELAY="19" # Stop script execution if an error is encountered set -o errexit # Stop script execution if an undefined variable is used From 35e681ccaa3d986726c3f9e8f0a256870e3708ef Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 10 Sep 2024 10:27:37 -0700 Subject: [PATCH 107/113] reduces batch size --- scripts/single-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/single-node.sh b/scripts/single-node.sh index 8f91b6ea2a..6090195915 100755 --- a/scripts/single-node.sh +++ b/scripts/single-node.sh @@ -84,7 +84,7 @@ createGenesis() { trace_pull_address=":26661" sed -i.bak -e "s/^trace_pull_address *=.*/trace_pull_address = \"$trace_pull_address\"/" ${CELESTIA_APP_HOME}/config/config.toml - trace_push_batch_size=1000 + trace_push_batch_size=10 sed -i.bak -e "s/^trace_push_batch_size *=.*/trace_push_batch_size = \"$trace_push_batch_size\"/" ${CELESTIA_APP_HOME}/config/config.toml echo "Tracing is set up with the ability to pull traced data from the node on the address http://127.0.0.1${trace_pull_address}" From d4a1d067771aac107d1d8def9846e034cd4a0536 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 10 Sep 2024 10:34:35 -0700 Subject: [PATCH 108/113] bumps core --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4a313069d4..3c2daafd39 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240831003419-dd2274ca91fd + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910171749-45de508bc6a0 ) diff --git a/go.sum b/go.sum index 58bd66df07..f1b869d919 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240831003419-dd2274ca91fd h1:ykYVbnIrfBX9QFqRoPOIzu7V24SjJE4zn65z4giHpbE= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240831003419-dd2274ca91fd/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910171749-45de508bc6a0 h1:9lgXmx2mUDDavBfR72a/qLfaApaH8opwqc3+OYhWkjw= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910171749-45de508bc6a0/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 789b912dd00a0f3963beb9d1a2b69be948a8b990 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 10 Sep 2024 10:41:08 -0700 Subject: [PATCH 109/113] bums core to the version that traces proposer of all heights --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3c2daafd39..c5d4a61ba7 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910171749-45de508bc6a0 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910173515-91987000ae82 ) diff --git a/go.sum b/go.sum index f1b869d919..c80cd0e405 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,8 @@ github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 h1:nxplQi8w github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7/go.mod h1:1EF5MfOxVf0WC51Gb7pJ6bcZxnXKNAf9pqWtjgPBAYc= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 h1:h1Y4V3EMQ2mFmNtWt2sIhZIuyASInj1a9ExI8xOsTOw= github.com/celestiaorg/blobstream-contracts/v3 v3.1.0/go.mod h1:x4DKyfKOSv1ZJM9NwV+Pw01kH2CD7N5zTFclXIVJ6GQ= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910171749-45de508bc6a0 h1:9lgXmx2mUDDavBfR72a/qLfaApaH8opwqc3+OYhWkjw= -github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910171749-45de508bc6a0/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910173515-91987000ae82 h1:gZhZ4uvKQHIh3j0dkpQlMBsu740ZguAUyIZwC+bBpN0= +github.com/celestiaorg/celestia-core v1.40.1-tm-v0.34.29-rc0.0.20240910173515-91987000ae82/go.mod h1:H6vjzdoqTt4qmbf11z1Lnc9YLUp/B8ITEQLhU92ghqQ= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16 h1:SeQ7Y/CyOcUMKo7mQiexaj/pZ/xIgyuZFIwYZwpSkWE= github.com/celestiaorg/cosmos-sdk v1.24.1-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square/v2 v2.0.0-rc2 h1:4D+ASgZGYVCsffc2uhPagACrvNiLZu9/CqNYvnlHCgg= From 2fc32530d9ad40a5e1e007361e08dd53277b74d8 Mon Sep 17 00:00:00 2001 From: sanaz Date: Tue, 10 Sep 2024 10:54:31 -0700 Subject: [PATCH 110/113] updates go.mod and go.sum --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 4382bd342a..ad5dd7be09 100644 --- a/go.mod +++ b/go.mod @@ -147,8 +147,8 @@ require ( github.com/joho/godotenv v1.5.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/klauspost/reedsolomon v1.12.1 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect diff --git a/go.sum b/go.sum index 70ec476742..d4bcb38a6c 100644 --- a/go.sum +++ b/go.sum @@ -927,8 +927,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= From a0829602806114d79c480cef9a16569f9afb1d24 Mon Sep 17 00:00:00 2001 From: sanaz Date: Thu, 12 Sep 2024 17:27:46 -0700 Subject: [PATCH 111/113] updates LargeNetworkBigBlock8MB with another manifest --- test/e2e/benchmark/throughput.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 115e36c264..14c39e6dbf 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -158,8 +158,14 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest := bigBlockManifest manifest.MaxBlockBytes = 8 * testnet.MB manifest.Validators = 50 - manifest.TxClients = 50 - manifest.BlobSequences = 2 + manifest.TxClients = 25 + manifest.BlobSequences = 1 + manifest.TimeoutCommit = 1 * time.Second + manifest.TimeoutPropose = 4 * time.Second + manifest.CelestiaAppVersion = "pr-3737" + manifest.TxClientVersion = "pr-3737" + manifest.TestDuration = 10 * time.Minute + manifest.ChainID = manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) } From 85ae86b1e9e6b93bc02dd4c742b08ec8bfdeeda0 Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 13 Sep 2024 11:55:21 -0700 Subject: [PATCH 112/113] adds the ability to pass the amount of delay to each validator --- test/e2e/benchmark/benchmark.go | 9 +++++++++ test/e2e/benchmark/manifest.go | 2 ++ test/e2e/benchmark/throughput.go | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/e2e/benchmark/benchmark.go b/test/e2e/benchmark/benchmark.go index e34d322bb8..37c7e7c137 100644 --- a/test/e2e/benchmark/benchmark.go +++ b/test/e2e/benchmark/benchmark.go @@ -97,6 +97,15 @@ func (b *BenchmarkTest) SetupNodes() error { } } } + if b.manifest.PrecommitDelay != "" { + log.Println("Setting up precommit delay") + for _, node := range b.Nodes() { + if err = node.Instance.SetEnvironmentVariable("PRECOMMIT_DELAY", b.manifest.PrecommitDelay); err != nil { + return fmt.Errorf("failed to set precommit delay: %v", err) + } + } + + } return nil } diff --git a/test/e2e/benchmark/manifest.go b/test/e2e/benchmark/manifest.go index 64b319fcc8..3fa97580c5 100644 --- a/test/e2e/benchmark/manifest.go +++ b/test/e2e/benchmark/manifest.go @@ -80,6 +80,8 @@ type Manifest struct { GovMaxSquareSize int64 DisableBBR bool + + PrecommitDelay string //in seconds } func (m *Manifest) GetGenesisModifiers() []genesis.Modifier { diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 14c39e6dbf..16821d798b 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -161,9 +161,9 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { manifest.TxClients = 25 manifest.BlobSequences = 1 manifest.TimeoutCommit = 1 * time.Second - manifest.TimeoutPropose = 4 * time.Second + manifest.TimeoutPropose = 3 * time.Second manifest.CelestiaAppVersion = "pr-3737" - manifest.TxClientVersion = "pr-3737" + //manifest.TxClientVersion = "pr-3737" manifest.TestDuration = 10 * time.Minute manifest.ChainID = manifest.summary() return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) From e39d9fb0cbd8ecc6f28ec12e80b0d5716cf2096c Mon Sep 17 00:00:00 2001 From: sanaz Date: Fri, 13 Sep 2024 11:57:34 -0700 Subject: [PATCH 113/113] modifies manifest to target block time of 6s --- test/e2e/benchmark/throughput.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 16821d798b..0efc51bc20 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -166,6 +166,7 @@ func LargeNetworkBigBlock8MB(logger *log.Logger) error { //manifest.TxClientVersion = "pr-3737" manifest.TestDuration = 10 * time.Minute manifest.ChainID = manifest.summary() + manifest.PrecommitDelay = "5" return runBenchmarkTest(logger, "LargeNetworkBigBlock8MB", manifest) }