From 959a4b8d5491631cd3ce53c1ffaadfce2799bb1b Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 19 Jul 2024 17:10:12 +0200 Subject: [PATCH 01/56] use celestia-core branch with compact blocks --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ee75956951..f8c68e81ec 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.38.0-tm-v0.34.29.0.20240719150737-c2e6331b8f0c ) diff --git a/go.sum b/go.sum index 42ba33e2ce..7f22b48b00 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.38.0-tm-v0.34.29.0.20240719150737-c2e6331b8f0c h1:zggZuJqcA+3KMhp7UKNY/GkrQJy/7MnRPlx3C/a0DA4= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240719150737-c2e6331b8f0c/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.23.0-sdk-v0.46.16 h1:N2uETI13szEKnGAdKhtTR0EsrpcW0AwRKYER74WLnuw= github.com/celestiaorg/cosmos-sdk v1.23.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= From 79cbec4687ea3504bb54ed0b3a43b0b521212d68 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 19 Jul 2024 17:44:58 +0200 Subject: [PATCH 02/56] modify two node simple benchmark --- test/e2e/benchmark/throughput.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 4fe0d84250..5622f434b8 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -67,7 +67,7 @@ func TwoNodeSimple(logger *log.Logger) error { ValidatorResource: testnet.DefaultResources, TxClientsResource: testnet.DefaultResources, SelfDelegation: 10000000, - CelestiaAppVersion: latestVersion, + CelestiaAppVersion: "6f334a2", TxClientVersion: testnet.TxsimVersion, EnableLatency: false, LatencyParams: LatencyParams{70, 0}, // in milliseconds @@ -76,16 +76,16 @@ func TwoNodeSimple(logger *log.Logger) error { BlobSizes: "200000", PerPeerBandwidth: 5 * testnet.MB, UpgradeHeight: 0, - TimeoutCommit: 1 * time.Second, - TimeoutPropose: 1 * time.Second, - Mempool: "v1", + TimeoutCommit: 5 * time.Second, + TimeoutPropose: 4 * time.Second, + Mempool: "v2", BroadcastTxs: true, Prometheus: true, GovMaxSquareSize: appconsts.DefaultGovMaxSquareSize, MaxBlockBytes: appconsts.DefaultMaxBytes, LocalTracingType: "local", - PushTrace: false, - DownloadTraces: false, + PushTrace: true, + DownloadTraces: true, TestDuration: 3 * time.Minute, TxClients: 2, } From 6f5018e037901d17528dccb971eff1307fc16342 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 22 Jul 2024 11:03:15 +0200 Subject: [PATCH 03/56] update go mod --- go.mod | 21 ++++++++------- go.sum | 46 +++++++++++++++++--------------- test/e2e/benchmark/throughput.go | 4 +-- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index f8c68e81ec..d7ddedba49 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,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 @@ -93,6 +93,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 @@ -103,7 +104,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 @@ -146,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.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 @@ -160,7 +161,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 diff --git a/go.sum b/go.sum index 7f22b48b00..fc23475e33 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= diff --git a/test/e2e/benchmark/throughput.go b/test/e2e/benchmark/throughput.go index 5622f434b8..d0c409e6a6 100644 --- a/test/e2e/benchmark/throughput.go +++ b/test/e2e/benchmark/throughput.go @@ -76,8 +76,8 @@ func TwoNodeSimple(logger *log.Logger) error { BlobSizes: "200000", PerPeerBandwidth: 5 * testnet.MB, UpgradeHeight: 0, - TimeoutCommit: 5 * time.Second, - TimeoutPropose: 4 * time.Second, + TimeoutCommit: 1 * time.Second, + TimeoutPropose: 5 * time.Second, Mempool: "v2", BroadcastTxs: true, Prometheus: true, From 0d92d07d836a39def410de9427633ed376df9113 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 23 Jul 2024 11:41:24 +0200 Subject: [PATCH 04/56] start the tx client later --- test/e2e/experiment/compact_blocks/main.go | 163 +++++++++++++++++++++ test/e2e/testnet/testnet.go | 16 +- 2 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 test/e2e/experiment/compact_blocks/main.go diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go new file mode 100644 index 0000000000..e6f2f2726a --- /dev/null +++ b/test/e2e/experiment/compact_blocks/main.go @@ -0,0 +1,163 @@ +package main + +import ( + "context" + "encoding/csv" + "fmt" + "log" + "os" + "time" + + "github.com/celestiaorg/celestia-app/v2/test/e2e/testnet" + "github.com/tendermint/tendermint/rpc/client/http" +) + +const ( + compactBlocksVersion = "6f334a2" +) + +func main() { + if err := Run(); err != nil { + log.Fatalf("failed to run experiment: %v", err) + } +} + +func Run() error { + const ( + nodes = 5 + timeoutCommit = 5 * time.Second + timeoutPropose = 4 * time.Second + version = compactBlocksVersion + ) + + network, err := testnet.New("compact-blocks", 864, nil, "test") + if err != nil { + return err + } + defer network.Cleanup() + + err = network.CreateGenesisNodes(nodes, version, 10000000, 0, testnet.DefaultResources) + if err != nil { + return err + } + + gRPCEndpoints, err := network.RemoteGRPCEndpoints() + if err != nil { + return err + } + + err = network.CreateTxClients( + compactBlocksVersion, + 5, + "1000-8000", + 1, + testnet.DefaultResources, + gRPCEndpoints[:2], + ) + if err != nil { + return err + } + + log.Printf("Setting up network\n") + err = network.Setup( + testnet.WithTimeoutCommit(timeoutCommit), + testnet.WithTimeoutPropose(timeoutPropose), + testnet.WithMempool("v2"), + ) + if err != nil { + return err + } + + log.Printf("Starting network\n") + err = network.Start() + if err != nil { + return err + } + + for _, node := range network.Nodes() { + err = node.Instance.SetLatencyAndJitter(100, 10) + if err != nil { + return err + } + } + + // run the test for 5 minutes + heightTicker := time.NewTicker(20 * time.Second) + timeout := time.NewTimer(5 * time.Minute) + client, err := network.Node(0).Client() + if err != nil { + return err + } + for { + select { + case <-heightTicker.C: + status, err := client.Status(context.Background()) + if err != nil { + log.Printf("Error getting status: %v", err) + continue + } + log.Printf("Height: %v", status.SyncInfo.LatestBlockHeight) + + case <-timeout.C: + network.StopTxClients() + log.Println("--- COLLECTING DATA") + if err := saveBlockTimes(network); err != nil { + log.Printf("Error saving block times: %v", err) + } + log.Println("--- FINISHED ✅: Dynamic Timeouts") + return nil + } + } +} + +func saveBlockTimes(testnet *testnet.Testnet) error { + file, err := os.Create(fmt.Sprintf("%s-%s-block-times.csv", time.Now().Format("2006-01-02-15-04-05"), testnet.Node(0).Version)) + if err != nil { + return err + } + defer file.Close() + + writer := csv.NewWriter(file) + defer writer.Flush() + + err = writer.Write([]string{"height", "block time", "block size", "last commit round"}) + if err != nil { + return err + } + + nodes := testnet.Nodes() + clients := make([]*http.HTTP, len(nodes)) + for i, node := range nodes { + clients[i], err = node.Client() + if err != nil { + return err + } + } + status, err := clients[0].Status(context.Background()) + if err != nil { + return err + } + index := 0 + for height := status.SyncInfo.EarliestBlockHeight; height <= status.SyncInfo.LatestBlockHeight; height++ { + resp, err := clients[index].Block(context.Background(), &height) + if err != nil { + log.Printf("Error getting header for height %d: %v", height, err) + index++ + if index == len(nodes) { + return fmt.Errorf("all nodes failed to get header for height %d", height) + } + // retry the height + height-- + continue + } + blockSize := 0 + for _, tx := range resp.Block.Txs { + blockSize += len(tx) + } + err = writer.Write([]string{fmt.Sprintf("%d", height), fmt.Sprintf("%d", resp.Block.Time.UnixNano()), fmt.Sprintf("%d", blockSize), fmt.Sprintf("%d", resp.Block.LastCommit.Round)}) + if err != nil { + return err + } + } + return nil +} diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 9a37d87e7a..8ce5664317 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -188,6 +188,16 @@ func (t *Testnet) StartTxClients() error { return nil } +func (t *Testnet) StopTxClients() error { + for _, txsim := range t.txClients { + err := txsim.Instance.Stop() + if err != nil { + return err + } + } + return nil +} + // CreateAccount creates an account and adds it to the // testnet genesis. The account is created with the given name and tokens and // is persisted in the given txsimKeyringDir. @@ -336,10 +346,6 @@ func (t *Testnet) Start() error { return fmt.Errorf("node %s failed to start: %w", node.Name, err) } } - err := t.StartTxClients() - if err != nil { - return err - } log.Info().Msg("forwarding ports for genesis nodes") // wait for instances to be running for _, node := range genesisNodes { @@ -380,7 +386,7 @@ func (t *Testnet) Start() error { time.Sleep(1 * time.Second) } } - return nil + return t.StartTxClients() } func (t *Testnet) Cleanup() { From fe475f1321894ff646ce22150083691bbe5a6044 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 23 Jul 2024 14:14:49 +0200 Subject: [PATCH 05/56] make some modifications to e2e simple --- test/e2e/simple.go | 4 ++-- test/e2e/testnet/testnet.go | 26 ++++++++++---------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 9cb2699310..427a1e2730 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -31,7 +31,7 @@ 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", 1, testnet.DefaultResources, endpoints[0]) testnet.NoError("failed to create tx client", err) logger.Println("Setting up testnets") @@ -40,10 +40,10 @@ func E2ESimple(logger *log.Logger) error { logger.Println("Starting testnets") testnet.NoError("failed to start testnets", testNet.Start()) + logger.Println("Waiting for 30 seconds to produce blocks") // wait for 30 seconds time.Sleep(30 * time.Second) - logger.Println("Reading blockchain") blockchain, err := testnode.ReadBlockchain(context.Background(), testNet.Node(0).AddressRPC()) testnet.NoError("failed to read blockchain", err) diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 8ce5664317..350da4b203 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -361,29 +361,23 @@ func (t *Testnet) Start() error { "waiting for node to sync") client, err := node.Client() if err != nil { - return fmt.Errorf("failed to initialized node %s: %w", node.Name, err) + return fmt.Errorf("failed to initialize client for node %s: %w", node.Name, err) } for i := 0; i < 10; i++ { resp, err := client.Status(context.Background()) - if err != nil { - if i == 9 { - return fmt.Errorf("node %s status response: %w", node.Name, err) + if err == nil { + if resp.SyncInfo.LatestBlockHeight > 0 { + log.Info().Int("attempts", i).Str("name", node.Name).Msg( + "node has synced") + break } - time.Sleep(time.Second) - continue } - if resp.SyncInfo.LatestBlockHeight > 0 { - log.Info().Int("Index", i).Str("name", node.Name).Msg( - "node has synced") - break - } - log.Info().Int64("height", resp.SyncInfo.LatestBlockHeight).Msg( - "height is 0, waiting...") if i == 9 { - return fmt.Errorf("failed to start node %s", node.Name) + return fmt.Errorf("failed to start node %s: %w", node.Name, err) } - fmt.Printf("node %s is not synced yet, waiting...\n", node.Name) - time.Sleep(1 * time.Second) + log.Info().Str("name", node.Name).Msg( + "node is not synced yet, waiting...") + time.Sleep(time.Duration(i) * time.Second) } } return t.StartTxClients() From 15847264f6ea85eaeb6141dc77a6f81bc0ce7fa4 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 24 Jul 2024 15:12:43 +0200 Subject: [PATCH 06/56] use latest compact blocks changes --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 10 ++++++++-- test/e2e/testnet/testnet.go | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d7ddedba49..6f7f52ac1b 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.20240719150737-c2e6331b8f0c + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240724130947-1cbd36171918 ) diff --git a/go.sum b/go.sum index fc23475e33..d6efb4f9a0 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.20240719150737-c2e6331b8f0c h1:zggZuJqcA+3KMhp7UKNY/GkrQJy/7MnRPlx3C/a0DA4= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240719150737-c2e6331b8f0c/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240724130947-1cbd36171918 h1:od7w4hRR8OwnoKjJZWb9sDCvQxUm1hWWV6JpyktZrxM= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240724130947-1cbd36171918/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= github.com/celestiaorg/cosmos-sdk v1.23.0-sdk-v0.46.16 h1:N2uETI13szEKnGAdKhtTR0EsrpcW0AwRKYER74WLnuw= github.com/celestiaorg/cosmos-sdk v1.23.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/go-square v1.1.0 h1:K4tBL5PCJwDtpBfyDxxZ3N962aC9VYb5/bw3LjagEtY= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index e6f2f2726a..3c2bbb0e0e 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -13,7 +13,7 @@ import ( ) const ( - compactBlocksVersion = "6f334a2" + compactBlocksVersion = "d0e24bb" //"6f334a2" ) func main() { @@ -46,6 +46,12 @@ func Run() error { return err } + for _, node := range network.Nodes() { + if err := node.Instance.EnableBitTwister(); err != nil { + return fmt.Errorf("failed to enable bit twister: %v", err) + } + } + err = network.CreateTxClients( compactBlocksVersion, 5, @@ -104,7 +110,7 @@ func Run() error { if err := saveBlockTimes(network); err != nil { log.Printf("Error saving block times: %v", err) } - log.Println("--- FINISHED ✅: Dynamic Timeouts") + log.Println("--- FINISHED ✅: Compact Blocks") return nil } } diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 350da4b203..3bfe7d3085 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -3,6 +3,7 @@ package testnet import ( "context" + "errors" "fmt" "os" "path/filepath" @@ -371,6 +372,8 @@ func (t *Testnet) Start() error { "node has synced") break } + } else { + err = errors.New("failed to get status") } if i == 9 { return fmt.Errorf("failed to start node %s: %w", node.Name, err) From a7ea55b134bee0036c4c83abc7c60fae85cbe622 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 24 Jul 2024 18:34:42 +0200 Subject: [PATCH 07/56] add docker container version --- test/e2e/experiment/compact_blocks/main.go | 2 +- test/e2e/testnet/testnet.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 398d1e8186..bafa03deb4 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -13,7 +13,7 @@ import ( ) const ( - compactBlocksVersion = "d0e24bb" //"6f334a2" + compactBlocksVersion = "a77609b" ) func main() { diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 86c55dc71d..464d81437b 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -3,7 +3,6 @@ package testnet import ( "context" - "errors" "fmt" "os" "path/filepath" @@ -373,10 +372,11 @@ func (t *Testnet) Start() error { break } } else { - err = errors.New("error getting status") + log.Info().Err(err).Str("name", node.Name).Msg( + "getting status") } if i == 9 { - return fmt.Errorf("failed to start node %s: %w", node.Name, err) + return fmt.Errorf("failed to start node %s", node.Name) } log.Info().Str("name", node.Name).Int("attempt", i).Msg( "node is not synced yet, waiting...") From 12d9412c4f9623eae8c653da8f1f13bee7f846b1 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 29 Jul 2024 13:41:28 +0200 Subject: [PATCH 08/56] bump go mod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 204b892a13..dcb94a3130 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.20240724130947-1cbd36171918 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729113723-1fe85226cd97 ) diff --git a/go.sum b/go.sum index fbbd90879d..c2f9c8f961 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.20240724130947-1cbd36171918 h1:od7w4hRR8OwnoKjJZWb9sDCvQxUm1hWWV6JpyktZrxM= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240724130947-1cbd36171918/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729113723-1fe85226cd97 h1:X/24MDd5vir5as2ZI7GaDn63gpB7zosSKIfZidfkytw= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729113723-1fe85226cd97/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 5b4d614bae1c6beeb9f526c618cbd7643a22fa83 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 30 Jul 2024 13:45:08 +0200 Subject: [PATCH 09/56] udpate metric gathering --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 24 +++++++++++++++------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index dcb94a3130..2c2d2314d8 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.20240729113723-1fe85226cd97 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730114309-1846523a16b2 ) diff --git a/go.sum b/go.sum index c2f9c8f961..21f017bf85 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.20240729113723-1fe85226cd97 h1:X/24MDd5vir5as2ZI7GaDn63gpB7zosSKIfZidfkytw= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240729113723-1fe85226cd97/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730114309-1846523a16b2 h1:Qx0po1WHgh4RxMy6tES51dOCzWv9u6z1enE04i7tO2w= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730114309-1846523a16b2/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index bafa03deb4..2839f50e46 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -9,11 +9,12 @@ import ( "time" "github.com/celestiaorg/celestia-app/v3/test/e2e/testnet" + // "github.com/celestiaorg/celestia-app/v3/test/util/genesis" "github.com/tendermint/tendermint/rpc/client/http" ) const ( - compactBlocksVersion = "a77609b" + compactBlocksVersion = "db47b99" ) func main() { @@ -24,13 +25,18 @@ func main() { func Run() error { const ( - nodes = 5 - timeoutCommit = 5 * time.Second - timeoutPropose = 4 * time.Second + nodes = 4 + timeoutCommit = 3 * time.Second + timeoutPropose = 2 * time.Second version = compactBlocksVersion ) - network, err := testnet.New("compact-blocks", 864, nil, "test") + // blobParams := blobtypes.DefaultParams() + // // set the square size to 128 + // blobParams.GovMaxSquareSize = 128 + // ecfg := encoding.MakeConfig(app.ModuleBasics) + + network, err := testnet.New("compact-blocks", 864, testnet.GetGrafanaInfoFromEnvVar(), "test") if err != nil { return err } @@ -41,6 +47,10 @@ func Run() error { return err } + // cparams := app.DefaultConsensusParams() + // cparams.Block.MaxBytes = 8 * 1024 * 1024 + // network.SetConsensusParams(cparams) + gRPCEndpoints, err := network.RemoteGRPCEndpoints() if err != nil { return err @@ -54,11 +64,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 5, + 40, "1000-8000", 1, testnet.DefaultResources, - gRPCEndpoints[:2], + gRPCEndpoints, ) if err != nil { return err From 28f3f036882c5893c50f79dbdde68aab95b09d23 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 30 Jul 2024 13:59:22 +0200 Subject: [PATCH 10/56] fix metrics --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2c2d2314d8..e35062cc26 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.20240730114309-1846523a16b2 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730115747-1c4f76eca6f0 ) diff --git a/go.sum b/go.sum index 21f017bf85..5f20d20e95 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.20240730114309-1846523a16b2 h1:Qx0po1WHgh4RxMy6tES51dOCzWv9u6z1enE04i7tO2w= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730114309-1846523a16b2/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730115747-1c4f76eca6f0 h1:b4jp+HYxbITM3rNzGJsoDb9EfP2w9PYjnhJe4fJUZgA= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730115747-1c4f76eca6f0/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 3cb2353d66dfef4ca4bf29e4cff27eeb77b861e2 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 30 Jul 2024 15:21:20 +0200 Subject: [PATCH 11/56] panic in ante handler with 0 version --- app/ante/msg_gatekeeper.go | 12 ++++++++++-- test/e2e/experiment/compact_blocks/main.go | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/ante/msg_gatekeeper.go b/app/ante/msg_gatekeeper.go index 9f4841448a..33297e6304 100644 --- a/app/ante/msg_gatekeeper.go +++ b/app/ante/msg_gatekeeper.go @@ -2,6 +2,7 @@ package ante import ( "context" + "fmt" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" @@ -29,6 +30,9 @@ func NewMsgVersioningGateKeeper(acceptedList map[uint64]map[string]struct{}) *Ms // AnteHandle implements the ante.Decorator interface func (mgk MsgVersioningGateKeeper) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { + if ctx.BlockHeader().Version.App == 0 { + panic(fmt.Sprintf("app version is 0, %v", ctx.BlockHeader())) + } acceptedMsgs, exists := mgk.acceptedMsgs[ctx.BlockHeader().Version.App] if !exists { return ctx, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", ctx.BlockHeader().Version.App) @@ -65,10 +69,14 @@ func (mgk MsgVersioningGateKeeper) hasInvalidMsg(ctx sdk.Context, acceptedMsgs m } func (mgk MsgVersioningGateKeeper) IsAllowed(ctx context.Context, msgName string) (bool, error) { - appVersion := sdk.UnwrapSDKContext(ctx).BlockHeader().Version.App + sdkCtx := sdk.UnwrapSDKContext(ctx) + appVersion := sdkCtx.BlockHeader().Version.App + if appVersion == 0 { + panic(fmt.Sprintf("app version is 0, %v", sdkCtx.BlockHeader())) + } acceptedMsgs, exists := mgk.acceptedMsgs[appVersion] if !exists { - return false, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", appVersion) + return false, sdkerrors.ErrNotSupported.Wrapf("circuit breaker: app version %d is not supported", appVersion) } _, exists = acceptedMsgs[msgName] if !exists { diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 2839f50e46..ff32178466 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -36,7 +36,7 @@ func Run() error { // blobParams.GovMaxSquareSize = 128 // ecfg := encoding.MakeConfig(app.ModuleBasics) - network, err := testnet.New("compact-blocks", 864, testnet.GetGrafanaInfoFromEnvVar(), "test") + network, err := testnet.New("compact-blocks", 864, nil, "test") if err != nil { return err } From 9bc97a287fbb5af1dc449e072bd8cf4269943a65 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 30 Jul 2024 18:31:32 +0200 Subject: [PATCH 12/56] checkpoint --- app/ante/msg_gatekeeper.go | 13 +++------- pkg/user/tx_client.go | 1 + test/e2e/experiment/compact_blocks/main.go | 30 ++++++++-------------- test/e2e/testnet/defaults.go | 4 +-- 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/app/ante/msg_gatekeeper.go b/app/ante/msg_gatekeeper.go index 33297e6304..93791af9b6 100644 --- a/app/ante/msg_gatekeeper.go +++ b/app/ante/msg_gatekeeper.go @@ -2,7 +2,6 @@ package ante import ( "context" - "fmt" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" @@ -30,12 +29,9 @@ func NewMsgVersioningGateKeeper(acceptedList map[uint64]map[string]struct{}) *Ms // AnteHandle implements the ante.Decorator interface func (mgk MsgVersioningGateKeeper) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { - if ctx.BlockHeader().Version.App == 0 { - panic(fmt.Sprintf("app version is 0, %v", ctx.BlockHeader())) - } - acceptedMsgs, exists := mgk.acceptedMsgs[ctx.BlockHeader().Version.App] + acceptedMsgs, exists := mgk.acceptedMsgs[ctx.ConsensusParams().Version.AppVersion] if !exists { - return ctx, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", ctx.BlockHeader().Version.App) + return ctx, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", ctx.ConsensusParams().Version.AppVersion) } if err := mgk.hasInvalidMsg(ctx, acceptedMsgs, tx.GetMsgs()); err != nil { @@ -70,10 +66,7 @@ func (mgk MsgVersioningGateKeeper) hasInvalidMsg(ctx sdk.Context, acceptedMsgs m func (mgk MsgVersioningGateKeeper) IsAllowed(ctx context.Context, msgName string) (bool, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - appVersion := sdkCtx.BlockHeader().Version.App - if appVersion == 0 { - panic(fmt.Sprintf("app version is 0, %v", sdkCtx.BlockHeader())) - } + appVersion := sdkCtx.ConsensusParams().Version.AppVersion acceptedMsgs, exists := mgk.acceptedMsgs[appVersion] if !exists { return false, sdkerrors.ErrNotSupported.Wrapf("circuit breaker: app version %d is not supported", appVersion) diff --git a/pkg/user/tx_client.go b/pkg/user/tx_client.go index caaed72f82..6ce61b8312 100644 --- a/pkg/user/tx_client.go +++ b/pkg/user/tx_client.go @@ -339,6 +339,7 @@ func (client *TxClient) broadcastTx(ctx context.Context, txBytes []byte, signer if err := client.signer.SetSequence(signer, seqNum); err != nil { return nil, fmt.Errorf("setting sequence: %w", err) } + fmt.Println("retrying broadcast with new sequence", signer, seqNum, resp.TxResponse.RawLog) return client.retryBroadcastingTx(ctx, txBytes) } return resp.TxResponse, fmt.Errorf("tx failed with code %d: %s", resp.TxResponse.Code, resp.TxResponse.RawLog) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index ff32178466..e30c0b7873 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -10,11 +10,12 @@ import ( "github.com/celestiaorg/celestia-app/v3/test/e2e/testnet" // "github.com/celestiaorg/celestia-app/v3/test/util/genesis" + "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/rpc/client/http" ) const ( - compactBlocksVersion = "db47b99" + compactBlocksVersion = "60e2d6b" ) func main() { @@ -25,9 +26,9 @@ func main() { func Run() error { const ( - nodes = 4 - timeoutCommit = 3 * time.Second - timeoutPropose = 2 * time.Second + nodes = 20 + timeoutCommit = time.Second + timeoutPropose = 4 * time.Second version = compactBlocksVersion ) @@ -56,19 +57,13 @@ func Run() error { return err } - for _, node := range network.Nodes() { - if err := node.Instance.EnableBitTwister(); err != nil { - return fmt.Errorf("failed to enable bit twister: %v", err) - } - } - err = network.CreateTxClients( compactBlocksVersion, - 40, + 50, "1000-8000", 1, testnet.DefaultResources, - gRPCEndpoints, + gRPCEndpoints[:5], ) if err != nil { return err @@ -79,6 +74,10 @@ func Run() error { testnet.WithTimeoutCommit(timeoutCommit), testnet.WithTimeoutPropose(timeoutPropose), testnet.WithMempool("v2"), + func(cfg *config.Config) { + // create a partially connected network by only dialing 5 peers + cfg.P2P.MaxNumOutboundPeers = 5 + }, ) if err != nil { return err @@ -90,13 +89,6 @@ func Run() error { return err } - for _, node := range network.Nodes() { - err = node.Instance.SetLatencyAndJitter(100, 10) - if err != nil { - return err - } - } - // run the test for 5 minutes heightTicker := time.NewTicker(20 * time.Second) timeout := time.NewTimer(5 * time.Minute) diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index 1ea4bbb585..acba5b8dbb 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -1,8 +1,8 @@ package testnet var DefaultResources = Resources{ - MemoryRequest: "400Mi", - MemoryLimit: "400Mi", + MemoryRequest: "500Mi", + MemoryLimit: "500Mi", CPU: "300m", Volume: "1Gi", } From a8007d8483904da2f80f81892635279d4ba8e7d8 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 30 Jul 2024 19:27:35 +0200 Subject: [PATCH 13/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- pkg/user/tx_client.go | 3 +-- test/e2e/experiment/compact_blocks/main.go | 6 +++--- test/e2e/testnet/defaults.go | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index e35062cc26..0ce0f3b642 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.20240730115747-1c4f76eca6f0 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730172448-9ad05ed17086 ) diff --git a/go.sum b/go.sum index 5f20d20e95..afb4e48740 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.20240730115747-1c4f76eca6f0 h1:b4jp+HYxbITM3rNzGJsoDb9EfP2w9PYjnhJe4fJUZgA= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730115747-1c4f76eca6f0/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730172448-9ad05ed17086 h1:URAA1uRex7IEtDmWrbXyXIHFF9HRvyMUOUHxOqU51Xo= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730172448-9ad05ed17086/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= diff --git a/pkg/user/tx_client.go b/pkg/user/tx_client.go index 6ce61b8312..e9ab35badf 100644 --- a/pkg/user/tx_client.go +++ b/pkg/user/tx_client.go @@ -336,10 +336,9 @@ func (client *TxClient) broadcastTx(ctx context.Context, txBytes []byte, signer if err != nil { return nil, fmt.Errorf("querying account for new sequence number: %w\noriginal tx response: %s", err, resp.TxResponse.RawLog) } - if err := client.signer.SetSequence(signer, seqNum); err != nil { + if err := client.signer.SetSequence(signer, seqNum+1); err != nil { return nil, fmt.Errorf("setting sequence: %w", err) } - fmt.Println("retrying broadcast with new sequence", signer, seqNum, resp.TxResponse.RawLog) return client.retryBroadcastingTx(ctx, txBytes) } return resp.TxResponse, fmt.Errorf("tx failed with code %d: %s", resp.TxResponse.Code, resp.TxResponse.RawLog) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index e30c0b7873..d53951e9d6 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "60e2d6b" + compactBlocksVersion = "05e2acd" ) func main() { @@ -26,7 +26,7 @@ func main() { func Run() error { const ( - nodes = 20 + nodes = 10 timeoutCommit = time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion @@ -76,7 +76,7 @@ func Run() error { testnet.WithMempool("v2"), func(cfg *config.Config) { // create a partially connected network by only dialing 5 peers - cfg.P2P.MaxNumOutboundPeers = 5 + cfg.P2P.MaxNumOutboundPeers = 4 }, ) if err != nil { diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index acba5b8dbb..ca59d73fe3 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -1,8 +1,8 @@ package testnet var DefaultResources = Resources{ - MemoryRequest: "500Mi", - MemoryLimit: "500Mi", + MemoryRequest: "800Mi", + MemoryLimit: "800Mi", CPU: "300m", Volume: "1Gi", } From e4563ba83232a202f0e920a38f05ae2dac9de59b Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 31 Jul 2024 15:17:47 +0200 Subject: [PATCH 14/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0ce0f3b642..e54928d10c 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.20240730172448-9ad05ed17086 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731125049-93774a73d69b ) diff --git a/go.sum b/go.sum index afb4e48740..19ba4ab567 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.20240730172448-9ad05ed17086 h1:URAA1uRex7IEtDmWrbXyXIHFF9HRvyMUOUHxOqU51Xo= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240730172448-9ad05ed17086/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731125049-93774a73d69b h1:wSkwYnc2vlQ/RjbGp3+90e2La5fYspUX/JG4r4Lu4XI= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731125049-93774a73d69b/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 75e4ea666f1cc7e09acc8e8d695da3d328c495f1 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 31 Jul 2024 16:27:34 +0200 Subject: [PATCH 15/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- pkg/user/tx_client.go | 4 +++- test/e2e/experiment/compact_blocks/main.go | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e54928d10c..d9014f3c7f 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.20240731125049-93774a73d69b + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731141122-6f8f70a8ec82 ) diff --git a/go.sum b/go.sum index 19ba4ab567..d954c56016 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.20240731125049-93774a73d69b h1:wSkwYnc2vlQ/RjbGp3+90e2La5fYspUX/JG4r4Lu4XI= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731125049-93774a73d69b/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731141122-6f8f70a8ec82 h1:4i8ds/kk53pskkHxaQIyH8UDA/bPQmkpcggz6dgq5Qk= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731141122-6f8f70a8ec82/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= diff --git a/pkg/user/tx_client.go b/pkg/user/tx_client.go index e9ab35badf..bc6bac41b9 100644 --- a/pkg/user/tx_client.go +++ b/pkg/user/tx_client.go @@ -327,16 +327,18 @@ func (client *TxClient) broadcastTx(ctx context.Context, txBytes []byte, signer }, ) if err != nil { + fmt.Println("error broadcasting tx", err) return nil, err } if resp.TxResponse.Code != abci.CodeTypeOK { if apperrors.IsNonceMismatchCode(resp.TxResponse.Code) { + fmt.Println("retrying to broadcast tx", signer) // query the account to update the sequence number on-chain for the account _, seqNum, err := QueryAccount(ctx, client.grpc, client.registry, client.signer.accounts[signer].address) if err != nil { return nil, fmt.Errorf("querying account for new sequence number: %w\noriginal tx response: %s", err, resp.TxResponse.RawLog) } - if err := client.signer.SetSequence(signer, seqNum+1); err != nil { + if err := client.signer.SetSequence(signer, seqNum); err != nil { return nil, fmt.Errorf("setting sequence: %w", err) } return client.retryBroadcastingTx(ctx, txBytes) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index d53951e9d6..036750c695 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "05e2acd" + compactBlocksVersion = "2cd70a5" ) func main() { From 76c34d644c639521158fe0c6e5d9dff321afabd5 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 1 Aug 2024 18:29:34 +0200 Subject: [PATCH 16/56] checkpoint --- 2024-07-31-16-53-49-73d2276-block-times.csv | 61 ++++++++ 2024-07-31-17-09-13-73d2276-block-times.csv | 145 ++++++++++++++++++++ test/e2e/experiment/compact_blocks/main.go | 11 +- 3 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 2024-07-31-16-53-49-73d2276-block-times.csv create mode 100644 2024-07-31-17-09-13-73d2276-block-times.csv diff --git a/2024-07-31-16-53-49-73d2276-block-times.csv b/2024-07-31-16-53-49-73d2276-block-times.csv new file mode 100644 index 0000000000..4be2a32f84 --- /dev/null +++ b/2024-07-31-16-53-49-73d2276-block-times.csv @@ -0,0 +1,61 @@ +height,block time,block size,last commit round +1,1722437263581335000,0,0 +2,1722437296774242237,0,1 +3,1722437298121091689,0,0 +4,1722437299574460883,0,0 +5,1722437301087808869,0,0 +6,1722437302608495214,0,0 +7,1722437304034441905,0,0 +8,1722437305623283020,0,0 +9,1722437306944846023,0,0 +10,1722437308456742029,0,0 +11,1722437309778869324,0,0 +12,1722437311308917259,0,0 +13,1722437312679913864,0,0 +14,1722437314065355841,0,0 +15,1722437315383903176,7823,0 +16,1722437316675318410,0,0 +17,1722437318094379169,7823,0 +18,1722437319656154051,145332,0 +19,1722437321318441575,172561,0 +20,1722437324367941250,346325,0 +21,1722437327577621491,379891,0 +22,1722437331163013319,406293,0 +23,1722437334992227448,490772,0 +24,1722437339008573110,446691,0 +25,1722437342215426516,452908,0 +26,1722437345835097612,479716,0 +27,1722437349556435503,550171,0 +28,1722437352875589516,353721,0 +29,1722437356967810384,920314,0 +30,1722437365306029379,0,1 +31,1722437366813547847,572360,0 +32,1722437370700538353,488074,0 +33,1722437375875973147,795687,0 +34,1722437378893123868,541739,0 +35,1722437381808946012,1125388,0 +36,1722437387900382089,934558,0 +37,1722437390982768061,561717,0 +38,1722437394647742504,836409,0 +39,1722437397528837692,681949,0 +40,1722437400583693574,764189,0 +41,1722437404157528074,623243,0 +42,1722437407574300584,1063368,0 +43,1722437411078416744,629214,0 +44,1722437414618635331,1240457,0 +45,1722437417918967640,728103,0 +46,1722437421360084467,885970,0 +47,1722437426144015561,825366,0 +48,1722437429952522316,673305,0 +49,1722437434125886549,407885,0 +50,1722437438625317369,701602,0 +51,1722437442157079890,0,0 +52,1722437617023014726,0,10 +53,1722437618447464338,0,0 +54,1722437619764025893,0,0 +55,1722437621080950573,0,0 +56,1722437622399617554,0,0 +57,1722437623921954706,0,0 +58,1722437625250353863,0,0 +59,1722437626560397742,0,0 +60,1722437627944656976,0,0 diff --git a/2024-07-31-17-09-13-73d2276-block-times.csv b/2024-07-31-17-09-13-73d2276-block-times.csv new file mode 100644 index 0000000000..80909af8ec --- /dev/null +++ b/2024-07-31-17-09-13-73d2276-block-times.csv @@ -0,0 +1,145 @@ +height,block time,block size,last commit round +1,1722438204894326000,0,0 +2,1722438231476635282,0,0 +3,1722438232899712191,0,0 +4,1722438237949876370,0,0 +5,1722438239270457665,0,0 +6,1722438240583763837,0,0 +7,1722438241901516657,0,0 +8,1722438243315033454,0,0 +9,1722438244634655645,0,0 +10,1722438245952553019,0,0 +11,1722438247395953491,0,0 +12,1722438248722090307,0,0 +13,1722438250047124317,0,0 +14,1722438251363339365,12413,0 +15,1722438252697358420,0,0 +16,1722438254087340402,28259,0 +17,1722438255724780855,121110,0 +18,1722438257263047599,133221,0 +19,1722438258907121873,119106,0 +20,1722438260790996510,53408,0 +21,1722438262697227033,223856,0 +22,1722438265222261117,72735,0 +23,1722438267122391266,102245,0 +24,1722438269021443630,119665,0 +25,1722438270743083602,94374,0 +26,1722438272529704834,162854,0 +27,1722438275281966345,41442,0 +28,1722438276740865020,139653,0 +29,1722438278493088358,125634,0 +30,1722438280279645903,303584,0 +31,1722438282653687168,212241,0 +32,1722438285636515476,243859,0 +33,1722438288092341524,238414,0 +34,1722438290159354462,134600,0 +35,1722438293022184315,349618,0 +36,1722438295171587915,126266,0 +37,1722438297025829520,96178,0 +38,1722438298868477540,211306,0 +39,1722438301026137885,235666,0 +40,1722438304323243167,129043,0 +41,1722438306290544883,418540,0 +42,1722438309767625047,221509,0 +43,1722438311850007430,299886,0 +44,1722438315132194731,161085,0 +45,1722438317413659524,234359,0 +46,1722438319050561406,464863,0 +47,1722438321991050925,124576,0 +48,1722438323916283091,155572,0 +49,1722438325843570157,247292,0 +50,1722438328114810215,112984,0 +51,1722438330189273971,177563,0 +52,1722438333909785945,104491,0 +53,1722438336879961200,171480,0 +54,1722438338622260455,139909,0 +55,1722438340190247192,204968,0 +56,1722438342644498543,298331,0 +57,1722438345411367727,172913,0 +58,1722438348477741447,256157,0 +59,1722438351279766540,146537,0 +60,1722438353723841403,243567,0 +61,1722438356583413034,228081,0 +62,1722438359460244425,184653,0 +63,1722438362860822215,224908,0 +64,1722438366331823512,209406,0 +65,1722438368204716818,4390,0 +66,1722438369686226396,461481,0 +67,1722438373714314723,0,0 +68,1722438375086951718,74095,0 +69,1722438376647717857,221982,0 +70,1722438378578245174,142924,0 +71,1722438380578940486,141071,0 +72,1722438383224981665,207453,0 +73,1722438386045075108,157536,0 +74,1722438388930785980,212380,0 +75,1722438391104795978,175178,0 +76,1722438393129226925,277223,0 +77,1722438396649151699,118194,0 +78,1722438398611302213,73801,0 +79,1722438400507399455,199278,0 +80,1722438402279121590,176234,0 +81,1722438403907545673,65369,0 +82,1722438405529217195,135872,0 +83,1722438407111700338,214833,0 +84,1722438408747309082,150135,0 +85,1722438410574685163,317191,0 +86,1722438413489044658,217541,0 +87,1722438415653189157,289892,0 +88,1722438417867275235,220253,0 +89,1722438420519680370,231864,0 +90,1722438422607424455,149293,0 +91,1722438424566748564,251288,0 +92,1722438427187402967,102926,0 +93,1722438429375920563,214615,0 +94,1722438432192792167,205508,0 +95,1722438434728010327,99813,0 +96,1722438436396745885,338547,0 +97,1722438439471735211,66063,0 +98,1722438441341421918,105681,0 +99,1722438442935445735,225794,0 +100,1722438444893816546,155631,0 +101,1722438447284060647,261311,0 +102,1722438451050019770,84423,0 +103,1722438453290829060,53995,0 +104,1722438454836683109,95146,0 +105,1722438456351326055,131608,0 +106,1722438458113654601,78216,0 +107,1722438459800684101,99255,0 +108,1722438461404638436,140745,0 +109,1722438463275511393,168441,0 +110,1722438465510264452,126223,0 +111,1722438468234375243,208332,0 +112,1722438471212943934,101498,0 +113,1722438473836806331,182835,0 +114,1722438476341784173,86138,0 +115,1722438478500869482,248880,0 +116,1722438481500795979,125292,0 +117,1722438483508988787,167491,0 +118,1722438485788543634,146730,0 +119,1722438487664024295,171955,0 +120,1722438490231044760,132420,0 +121,1722438493214725090,250396,0 +122,1722438495984963609,83617,0 +123,1722438498230041780,170577,0 +124,1722438500877402114,222933,0 +125,1722438503796093293,79340,0 +126,1722438505416116851,393094,0 +127,1722438507649121458,134571,0 +128,1722438510686894834,274789,0 +129,1722438512928191285,76297,0 +130,1722438514887559316,221485,0 +131,1722438517187956804,161281,0 +132,1722438519234354864,31726,0 +133,1722438520643096719,115123,0 +134,1722438522388830370,212317,0 +135,1722438525027132678,138553,0 +136,1722438527564182759,192949,0 +137,1722438530158510729,171004,0 +138,1722438533625061470,241599,0 +139,1722438536476031830,151644,0 +140,1722438537939874878,149023,0 +141,1722438540635439050,296376,0 +142,1722438543624975886,73500,0 +143,1722438546355529032,256992,0 +144,1722438549547824018,75721,0 diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 036750c695..5bf7bbf7f5 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "2cd70a5" + compactBlocksVersion = "73d2276" ) func main() { @@ -26,7 +26,7 @@ func main() { func Run() error { const ( - nodes = 10 + nodes = 5 timeoutCommit = time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion @@ -57,13 +57,14 @@ func Run() error { return err } - err = network.CreateTxClients( + err = network.CreateTxClient( + "txsim", compactBlocksVersion, - 50, + 80, "1000-8000", 1, testnet.DefaultResources, - gRPCEndpoints[:5], + gRPCEndpoints[0], ) if err != nil { return err From bc97f50e64140a166332762c1c0f8bec68d3b96a Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 8 Aug 2024 16:13:58 +0200 Subject: [PATCH 17/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d9014f3c7f..22bfe3c5d3 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.20240731141122-6f8f70a8ec82 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808140202-82a8958ba2d0 ) diff --git a/go.sum b/go.sum index d954c56016..9a8fd7c034 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.20240731141122-6f8f70a8ec82 h1:4i8ds/kk53pskkHxaQIyH8UDA/bPQmkpcggz6dgq5Qk= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240731141122-6f8f70a8ec82/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808140202-82a8958ba2d0 h1:h/iAOvA75+T3693tizZFqHsVSHUIHSCc3oXUABjgc4E= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808140202-82a8958ba2d0/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 66b38d539d87aebceb20d9be26dadb251c639ead Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 9 Aug 2024 14:51:08 +0200 Subject: [PATCH 18/56] checkpoint --- 2024-07-31-16-53-49-73d2276-block-times.csv | 61 -------- 2024-07-31-17-09-13-73d2276-block-times.csv | 145 -------------------- go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 7 +- 5 files changed, 8 insertions(+), 211 deletions(-) delete mode 100644 2024-07-31-16-53-49-73d2276-block-times.csv delete mode 100644 2024-07-31-17-09-13-73d2276-block-times.csv diff --git a/2024-07-31-16-53-49-73d2276-block-times.csv b/2024-07-31-16-53-49-73d2276-block-times.csv deleted file mode 100644 index 4be2a32f84..0000000000 --- a/2024-07-31-16-53-49-73d2276-block-times.csv +++ /dev/null @@ -1,61 +0,0 @@ -height,block time,block size,last commit round -1,1722437263581335000,0,0 -2,1722437296774242237,0,1 -3,1722437298121091689,0,0 -4,1722437299574460883,0,0 -5,1722437301087808869,0,0 -6,1722437302608495214,0,0 -7,1722437304034441905,0,0 -8,1722437305623283020,0,0 -9,1722437306944846023,0,0 -10,1722437308456742029,0,0 -11,1722437309778869324,0,0 -12,1722437311308917259,0,0 -13,1722437312679913864,0,0 -14,1722437314065355841,0,0 -15,1722437315383903176,7823,0 -16,1722437316675318410,0,0 -17,1722437318094379169,7823,0 -18,1722437319656154051,145332,0 -19,1722437321318441575,172561,0 -20,1722437324367941250,346325,0 -21,1722437327577621491,379891,0 -22,1722437331163013319,406293,0 -23,1722437334992227448,490772,0 -24,1722437339008573110,446691,0 -25,1722437342215426516,452908,0 -26,1722437345835097612,479716,0 -27,1722437349556435503,550171,0 -28,1722437352875589516,353721,0 -29,1722437356967810384,920314,0 -30,1722437365306029379,0,1 -31,1722437366813547847,572360,0 -32,1722437370700538353,488074,0 -33,1722437375875973147,795687,0 -34,1722437378893123868,541739,0 -35,1722437381808946012,1125388,0 -36,1722437387900382089,934558,0 -37,1722437390982768061,561717,0 -38,1722437394647742504,836409,0 -39,1722437397528837692,681949,0 -40,1722437400583693574,764189,0 -41,1722437404157528074,623243,0 -42,1722437407574300584,1063368,0 -43,1722437411078416744,629214,0 -44,1722437414618635331,1240457,0 -45,1722437417918967640,728103,0 -46,1722437421360084467,885970,0 -47,1722437426144015561,825366,0 -48,1722437429952522316,673305,0 -49,1722437434125886549,407885,0 -50,1722437438625317369,701602,0 -51,1722437442157079890,0,0 -52,1722437617023014726,0,10 -53,1722437618447464338,0,0 -54,1722437619764025893,0,0 -55,1722437621080950573,0,0 -56,1722437622399617554,0,0 -57,1722437623921954706,0,0 -58,1722437625250353863,0,0 -59,1722437626560397742,0,0 -60,1722437627944656976,0,0 diff --git a/2024-07-31-17-09-13-73d2276-block-times.csv b/2024-07-31-17-09-13-73d2276-block-times.csv deleted file mode 100644 index 80909af8ec..0000000000 --- a/2024-07-31-17-09-13-73d2276-block-times.csv +++ /dev/null @@ -1,145 +0,0 @@ -height,block time,block size,last commit round -1,1722438204894326000,0,0 -2,1722438231476635282,0,0 -3,1722438232899712191,0,0 -4,1722438237949876370,0,0 -5,1722438239270457665,0,0 -6,1722438240583763837,0,0 -7,1722438241901516657,0,0 -8,1722438243315033454,0,0 -9,1722438244634655645,0,0 -10,1722438245952553019,0,0 -11,1722438247395953491,0,0 -12,1722438248722090307,0,0 -13,1722438250047124317,0,0 -14,1722438251363339365,12413,0 -15,1722438252697358420,0,0 -16,1722438254087340402,28259,0 -17,1722438255724780855,121110,0 -18,1722438257263047599,133221,0 -19,1722438258907121873,119106,0 -20,1722438260790996510,53408,0 -21,1722438262697227033,223856,0 -22,1722438265222261117,72735,0 -23,1722438267122391266,102245,0 -24,1722438269021443630,119665,0 -25,1722438270743083602,94374,0 -26,1722438272529704834,162854,0 -27,1722438275281966345,41442,0 -28,1722438276740865020,139653,0 -29,1722438278493088358,125634,0 -30,1722438280279645903,303584,0 -31,1722438282653687168,212241,0 -32,1722438285636515476,243859,0 -33,1722438288092341524,238414,0 -34,1722438290159354462,134600,0 -35,1722438293022184315,349618,0 -36,1722438295171587915,126266,0 -37,1722438297025829520,96178,0 -38,1722438298868477540,211306,0 -39,1722438301026137885,235666,0 -40,1722438304323243167,129043,0 -41,1722438306290544883,418540,0 -42,1722438309767625047,221509,0 -43,1722438311850007430,299886,0 -44,1722438315132194731,161085,0 -45,1722438317413659524,234359,0 -46,1722438319050561406,464863,0 -47,1722438321991050925,124576,0 -48,1722438323916283091,155572,0 -49,1722438325843570157,247292,0 -50,1722438328114810215,112984,0 -51,1722438330189273971,177563,0 -52,1722438333909785945,104491,0 -53,1722438336879961200,171480,0 -54,1722438338622260455,139909,0 -55,1722438340190247192,204968,0 -56,1722438342644498543,298331,0 -57,1722438345411367727,172913,0 -58,1722438348477741447,256157,0 -59,1722438351279766540,146537,0 -60,1722438353723841403,243567,0 -61,1722438356583413034,228081,0 -62,1722438359460244425,184653,0 -63,1722438362860822215,224908,0 -64,1722438366331823512,209406,0 -65,1722438368204716818,4390,0 -66,1722438369686226396,461481,0 -67,1722438373714314723,0,0 -68,1722438375086951718,74095,0 -69,1722438376647717857,221982,0 -70,1722438378578245174,142924,0 -71,1722438380578940486,141071,0 -72,1722438383224981665,207453,0 -73,1722438386045075108,157536,0 -74,1722438388930785980,212380,0 -75,1722438391104795978,175178,0 -76,1722438393129226925,277223,0 -77,1722438396649151699,118194,0 -78,1722438398611302213,73801,0 -79,1722438400507399455,199278,0 -80,1722438402279121590,176234,0 -81,1722438403907545673,65369,0 -82,1722438405529217195,135872,0 -83,1722438407111700338,214833,0 -84,1722438408747309082,150135,0 -85,1722438410574685163,317191,0 -86,1722438413489044658,217541,0 -87,1722438415653189157,289892,0 -88,1722438417867275235,220253,0 -89,1722438420519680370,231864,0 -90,1722438422607424455,149293,0 -91,1722438424566748564,251288,0 -92,1722438427187402967,102926,0 -93,1722438429375920563,214615,0 -94,1722438432192792167,205508,0 -95,1722438434728010327,99813,0 -96,1722438436396745885,338547,0 -97,1722438439471735211,66063,0 -98,1722438441341421918,105681,0 -99,1722438442935445735,225794,0 -100,1722438444893816546,155631,0 -101,1722438447284060647,261311,0 -102,1722438451050019770,84423,0 -103,1722438453290829060,53995,0 -104,1722438454836683109,95146,0 -105,1722438456351326055,131608,0 -106,1722438458113654601,78216,0 -107,1722438459800684101,99255,0 -108,1722438461404638436,140745,0 -109,1722438463275511393,168441,0 -110,1722438465510264452,126223,0 -111,1722438468234375243,208332,0 -112,1722438471212943934,101498,0 -113,1722438473836806331,182835,0 -114,1722438476341784173,86138,0 -115,1722438478500869482,248880,0 -116,1722438481500795979,125292,0 -117,1722438483508988787,167491,0 -118,1722438485788543634,146730,0 -119,1722438487664024295,171955,0 -120,1722438490231044760,132420,0 -121,1722438493214725090,250396,0 -122,1722438495984963609,83617,0 -123,1722438498230041780,170577,0 -124,1722438500877402114,222933,0 -125,1722438503796093293,79340,0 -126,1722438505416116851,393094,0 -127,1722438507649121458,134571,0 -128,1722438510686894834,274789,0 -129,1722438512928191285,76297,0 -130,1722438514887559316,221485,0 -131,1722438517187956804,161281,0 -132,1722438519234354864,31726,0 -133,1722438520643096719,115123,0 -134,1722438522388830370,212317,0 -135,1722438525027132678,138553,0 -136,1722438527564182759,192949,0 -137,1722438530158510729,171004,0 -138,1722438533625061470,241599,0 -139,1722438536476031830,151644,0 -140,1722438537939874878,149023,0 -141,1722438540635439050,296376,0 -142,1722438543624975886,73500,0 -143,1722438546355529032,256992,0 -144,1722438549547824018,75721,0 diff --git a/go.mod b/go.mod index c06ca8d374..f2b6a448e8 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.20240808140202-82a8958ba2d0 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809124939-8a5d7971f8f0 ) diff --git a/go.sum b/go.sum index 786153a8f3..cf31569ade 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.20240808140202-82a8958ba2d0 h1:h/iAOvA75+T3693tizZFqHsVSHUIHSCc3oXUABjgc4E= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240808140202-82a8958ba2d0/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809124939-8a5d7971f8f0 h1:8o3UIjp2T86c/3k5TogHkvZodz0zs0aJuRJAoBfbH6I= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809124939-8a5d7971f8f0/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 5bf7bbf7f5..7f937ca85e 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "73d2276" + compactBlocksVersion = "a2ed41f" ) func main() { @@ -60,7 +60,7 @@ func Run() error { err = network.CreateTxClient( "txsim", compactBlocksVersion, - 80, + 100, "1000-8000", 1, testnet.DefaultResources, @@ -78,6 +78,9 @@ func Run() error { func(cfg *config.Config) { // create a partially connected network by only dialing 5 peers cfg.P2P.MaxNumOutboundPeers = 4 + cfg.Mempool.TTLNumBlocks = 100 + cfg.Mempool.TTLDuration = 10 * time.Minute + cfg.Mempool.MaxTxsBytes *= 4 }, ) if err != nil { From 0c3586bff90426006fc85b20b4d210d34d0c2e5c Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 9 Aug 2024 15:31:26 +0200 Subject: [PATCH 19/56] checkpoint --- 2024-08-09-15-08-14-8f93462-block-times.csv | 213 ++++++++++++++++++++ 2024-08-09-15-23-10-8f93462-block-times.csv | 57 ++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 47 +++-- test/e2e/testnet/defaults.go | 4 +- 6 files changed, 307 insertions(+), 20 deletions(-) create mode 100644 2024-08-09-15-08-14-8f93462-block-times.csv create mode 100644 2024-08-09-15-23-10-8f93462-block-times.csv diff --git a/2024-08-09-15-08-14-8f93462-block-times.csv b/2024-08-09-15-08-14-8f93462-block-times.csv new file mode 100644 index 0000000000..35ba678edf --- /dev/null +++ b/2024-08-09-15-08-14-8f93462-block-times.csv @@ -0,0 +1,213 @@ +height,block time,block size,last commit round +1,1723208539066864000,0,0 +2,1723208567942591543,0,0 +3,1723208569266515066,0,0 +4,1723208576208278528,0,1 +5,1723208577529765842,0,0 +6,1723208578849041480,0,0 +7,1723208580272657824,0,0 +8,1723208581690539934,0,0 +9,1723208583011787052,0,0 +10,1723208584331440386,0,0 +11,1723208585628997898,0,0 +12,1723208587051780555,0,0 +13,1723208588368068315,0,0 +14,1723208589816822716,0,0 +15,1723208591275339963,0,0 +16,1723208592593442881,15473,0 +17,1723208593925571568,0,0 +18,1723208595244795931,0,0 +19,1723208596657508264,403700,0 +20,1723208598331634096,0,0 +21,1723208599748151345,281200,0 +22,1723208601369801210,0,0 +23,1723208602766819573,468000,0 +24,1723208604461857783,26455,0 +25,1723208605876783380,214045,0 +26,1723208607516260764,92075,0 +27,1723208609022964727,276225,0 +28,1723208610551202578,108048,0 +29,1723208612031162355,342152,0 +30,1723208613590783503,197592,0 +31,1723208615066362265,625708,0 +32,1723208616756144278,200937,0 +33,1723208618294737890,407963,0 +34,1723208619977015188,286200,0 +35,1723208621561766263,286200,0 +36,1723208623068823791,220308,0 +37,1723208624506144515,113492,0 +38,1723208625898542759,353452,0 +39,1723208627425570816,449848,0 +40,1723208628975868087,281790,0 +41,1723208630499747712,344410,0 +42,1723208632038482178,358450,0 +43,1723208633582932921,358450,0 +44,1723208635082434019,450878,0 +45,1723208636690743438,313322,0 +46,1723208638242947347,285525,0 +47,1723208639763182917,95175,0 +48,1723208641217099772,105980,0 +49,1723208642808642943,45420,0 +50,1723208644275609330,354340,0 +51,1723208645782232947,151860,0 +52,1723208647354655017,549290,0 +53,1723208648968554118,235410,0 +54,1723208650380032221,328926,0 +55,1723208652003292380,92774,0 +56,1723208653373273566,290799,0 +57,1723208655000192110,77301,0 +58,1723208656389691390,295120,0 +59,1723208657935163409,126480,0 +60,1723208659420783235,329250,0 +61,1723208660984700520,109750,0 +62,1723208662383235057,466967,0 +63,1723208664089168529,190733,0 +64,1723208665636598010,501097,0 +65,1723208667256496959,133203,0 +66,1723208668721027800,140175,0 +67,1723208670321630508,17325,0 +68,1723208671659167480,618552,0 +69,1723208673342954035,84348,0 +70,1723208674732800646,152101,0 +71,1723208676377739190,18799,0 +72,1723208677719838688,466100,0 +73,1723208679314055762,123900,0 +74,1723208680772469742,435477,0 +75,1723208682478444677,53823,0 +76,1723208683897353735,679932,0 +77,1723208685633601695,6868,0 +78,1723208687057068576,782100,0 +79,1723208688776513822,84870,0 +80,1723208690209500637,692730,0 +81,1723208691938352132,99372,0 +82,1723208693312873215,282828,0 +83,1723208695005292889,99847,0 +84,1723208696441770413,244453,0 +85,1723208698048542569,196533,0 +86,1723208699569926322,481167,0 +87,1723208701162558758,197956,0 +88,1723208702591781292,251944,0 +89,1723208704087938515,315798,0 +90,1723208705599206854,436102,0 +91,1723208707141140496,75000,0 +92,1723208708692765623,75000,0 +93,1723208710222834286,225216,0 +94,1723208711647628807,264384,0 +95,1723208713161808260,110649,0 +96,1723208714649353041,224651,0 +97,1723208716199007892,154572,0 +98,1723208717662121630,313828,0 +99,1723208719203506473,87676,0 +100,1723208720664616939,102924,0 +101,1723208722292420988,143350,0 +102,1723208723759726155,143350,0 +103,1723208725280787597,269560,0 +104,1723208726881134397,316440,0 +105,1723208728433902905,187030,0 +106,1723208730032231659,129970,0 +107,1723208731505772845,288704,0 +108,1723208733080487705,162396,0 +109,1723208734611387713,290156,0 +110,1723208736188914384,136544,0 +111,1723208737588642077,243672,0 +112,1723208739076085439,125528,0 +113,1723208740601564751,466985,0 +114,1723208742158308717,324515,0 +115,1723208743609725174,302412,0 +116,1723208745247126116,155788,0 +117,1723208746654205138,308322,0 +118,1723208748161251322,181078,0 +119,1723208749674711249,297330,0 +120,1723208751228042891,153170,0 +121,1723208752746303312,203630,0 +122,1723208754351005138,87270,0 +123,1723208755733925321,401148,0 +124,1723208757343575978,206652,0 +125,1723208758847097738,539420,0 +126,1723208760482440722,231180,0 +127,1723208761941559366,206960,0 +128,1723208763562093290,51740,0 +129,1723208765011003537,113120,0 +130,1723208766711900639,28280,0 +131,1723208768059704429,442560,0 +132,1723208769617607931,110640,0 +133,1723208771018176351,330457,0 +134,1723208772610554219,87843,0 +135,1723208773973367496,155680,0 +136,1723208775478433168,66720,0 +137,1723208776932154714,295302,0 +138,1723208778612568950,78498,0 +139,1723208780096127970,213954,0 +140,1723208781691138464,60346,0 +141,1723208783191053118,386532,0 +142,1723208784861907003,90668,0 +143,1723208786248827887,446160,0 +144,1723208787912088366,111540,0 +145,1723208789380205064,129276,0 +146,1723208791007469425,24624,0 +147,1723208792414636974,386148,0 +148,1723208794019922656,73552,0 +149,1723208795421504006,683256,0 +150,1723208797093036417,142484,0 +151,1723208798641536708,296160,0 +152,1723208800315134298,181930,0 +153,1723208801755029898,609070,0 +154,1723208803420586816,126310,0 +155,1723208804888017455,245190,0 +156,1723208806450720337,142450,0 +157,1723208807942430793,264550,0 +158,1723208809494490842,138686,0 +159,1723208810996441752,269214,0 +160,1723208812555442035,83620,0 +161,1723208814062343929,142380,0 +162,1723208815647070515,180668,0 +163,1723208817209295999,203732,0 +164,1723208818738272821,125965,0 +165,1723208820375757820,87535,0 +166,1723208821813619385,259036,0 +167,1723208823369654197,158764,0 +168,1723208824892898600,225240,0 +169,1723208826453090926,150160,0 +170,1723208827938216882,86700,0 +171,1723208829415266352,57800,0 +172,1723208831021861573,485415,0 +173,1723208832781627717,239085,0 +174,1723208834347773966,372704,0 +175,1723208835965839515,117696,0 +176,1723208837419135598,383840,0 +177,1723208838976784659,95960,0 +178,1723208840437062869,341280,0 +179,1723208842095190610,85320,0 +180,1723208843552399242,278000,0 +181,1723208845195129255,69500,0 +182,1723208846606983572,513378,0 +183,1723208848302752697,120422,0 +184,1723208849737703648,442384,0 +185,1723208851276913395,72016,0 +186,1723208852617612716,220418,0 +187,1723208854233362417,35882,0 +188,1723208855659337739,532160,0 +189,1723208857308249119,133040,0 +190,1723208858729984253,193070,0 +191,1723208860291788739,34505,0 +192,1723208861741595595,261375,0 +193,1723208863375355474,43050,0 +194,1723208864859554121,0,0 +195,1723208866279400661,0,0 +196,1723208867699181552,0,0 +197,1723208869041397757,15403,0 +198,1723208870418600613,0,0 +199,1723208871738709433,250294,0 +200,1723208873290559567,153406,0 +201,1723208874842228596,205276,0 +202,1723208876402396551,75924,0 +203,1723208877763863639,290160,0 +204,1723208879285916404,177840,0 +205,1723208880752618095,139490,0 +206,1723208882327390835,101010,0 +207,1723208883847288482,279908,0 +208,1723208885531597024,88392,0 +209,1723208886931453403,297132,0 +210,1723208888460398408,153068,0 +211,1723208890026981384,625708,0 +212,1723208891678114901,197592,0 diff --git a/2024-08-09-15-23-10-8f93462-block-times.csv b/2024-08-09-15-23-10-8f93462-block-times.csv new file mode 100644 index 0000000000..14690c9895 --- /dev/null +++ b/2024-08-09-15-23-10-8f93462-block-times.csv @@ -0,0 +1,57 @@ +height,block time,block size,last commit round +1,1723209427657954000,0,0 +2,1723209458520098013,0,0 +3,1723209459934315074,0,0 +4,1723209461356155947,0,0 +5,1723209462676660861,0,0 +6,1723209463995657277,0,0 +7,1723209465317252515,0,0 +8,1723209466649962284,0,0 +9,1723209467969607865,0,0 +10,1723209469386496710,0,0 +11,1723209470705048562,0,0 +12,1723209472027727612,15473,0 +13,1723209473360397598,0,0 +14,1723209474672482081,117481,0 +15,1723209476136192718,786219,0 +16,1723209477773888878,291924,0 +17,1723209479281213631,789276,0 +18,1723209480863139994,320400,0 +19,1723209482323368344,763073,0 +20,1723209483942694868,301745,0 +21,1723209485459391400,1389419,0 +22,1723209487174628110,849137,0 +23,1723209488760633546,1660752,0 +24,1723209490436507594,476754,0 +25,1723209491939258010,1855045,0 +26,1723209493923486329,1963718,0 +27,1723209501196906060,1016674,1 +28,1723209502936882190,432679,0 +29,1723209504499475667,1779420,0 +30,1723209506405355442,453183,0 +31,1723209507980284566,1581682,0 +32,1723209512405471836,1955776,0 +33,1723209514257652192,1235188,0 +34,1723209516114119569,1477609,0 +35,1723209517886535562,553194,0 +36,1723209519567404037,1943477,0 +37,1723209526567698488,260756,1 +38,1723209528213313170,1622881,0 +39,1723209530101734280,770580,0 +40,1723209531850942491,1949899,0 +41,1723209534209780018,1932003,0 +42,1723209541431588752,99505,1 +43,1723209542954666816,1392122,0 +44,1723209544743805864,444711,0 +45,1723209546413316663,1809955,0 +46,1723209548191797754,1924709,0 +47,1723209603706082907,764217,6 +48,1723209605540471761,512210,0 +49,1723209607253115546,1435519,0 +50,1723209608970582313,965612,0 +51,1723209610581888206,785824,0 +52,1723209612952943981,1932688,0 +53,1723209614705168311,1319412,0 +54,1723209616551784153,1377691,0 +55,1723209618397848100,1945289,0 +56,1723209640918348330,1484052,2 diff --git a/go.mod b/go.mod index f2b6a448e8..d918030a06 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.20240809124939-8a5d7971f8f0 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809132817-e937057ceeca ) diff --git a/go.sum b/go.sum index cf31569ade..c3ae224b1d 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.20240809124939-8a5d7971f8f0 h1:8o3UIjp2T86c/3k5TogHkvZodz0zs0aJuRJAoBfbH6I= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809124939-8a5d7971f8f0/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809132817-e937057ceeca h1:Q0F/wedYAiLVM7063oSsbTzqFJA/48qeM9zPQGjThsI= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809132817-e937057ceeca/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 7f937ca85e..c886394324 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "a2ed41f" + compactBlocksVersion = "8f93462" ) func main() { @@ -57,14 +57,13 @@ func Run() error { return err } - err = network.CreateTxClient( - "txsim", + err = network.CreateTxClients( compactBlocksVersion, 100, - "1000-8000", + "4000-16000", 1, testnet.DefaultResources, - gRPCEndpoints[0], + gRPCEndpoints[:3], ) if err != nil { return err @@ -111,21 +110,25 @@ func Run() error { log.Printf("Height: %v", status.SyncInfo.LatestBlockHeight) case <-timeout.C: - network.StopTxClients() + if err := network.StopTxClients(); err != nil { + log.Printf("Error stopping tx clients: %v", err) + } log.Println("--- COLLECTING DATA") - if err := saveBlockTimes(network); err != nil { + throughput, err := saveBlockTimes(network) + if err != nil { log.Printf("Error saving block times: %v", err) } + log.Printf("Throughput: %v", throughput) log.Println("--- FINISHED ✅: Compact Blocks") return nil } } } -func saveBlockTimes(testnet *testnet.Testnet) error { +func saveBlockTimes(testnet *testnet.Testnet) (float64, error) { file, err := os.Create(fmt.Sprintf("%s-%s-block-times.csv", time.Now().Format("2006-01-02-15-04-05"), testnet.Node(0).Version)) if err != nil { - return err + return 0, err } defer file.Close() @@ -134,7 +137,7 @@ func saveBlockTimes(testnet *testnet.Testnet) error { err = writer.Write([]string{"height", "block time", "block size", "last commit round"}) if err != nil { - return err + return 0, err } nodes := testnet.Nodes() @@ -142,12 +145,15 @@ func saveBlockTimes(testnet *testnet.Testnet) error { for i, node := range nodes { clients[i], err = node.Client() if err != nil { - return err + return 0, err } } + + totalBlockSize := 0 + startTime := int64(0) status, err := clients[0].Status(context.Background()) if err != nil { - return err + return 0, err } index := 0 for height := status.SyncInfo.EarliestBlockHeight; height <= status.SyncInfo.LatestBlockHeight; height++ { @@ -156,7 +162,7 @@ func saveBlockTimes(testnet *testnet.Testnet) error { log.Printf("Error getting header for height %d: %v", height, err) index++ if index == len(nodes) { - return fmt.Errorf("all nodes failed to get header for height %d", height) + return 0, fmt.Errorf("all nodes failed to get header for height %d", height) } // retry the height height-- @@ -166,10 +172,21 @@ func saveBlockTimes(testnet *testnet.Testnet) error { for _, tx := range resp.Block.Txs { blockSize += len(tx) } + if blockSize > 0 { + totalBlockSize += blockSize + if startTime == 0 { + startTime = resp.Block.Time.UnixNano() + } + } + if resp.Block.LastCommit.Round > 0 { + log.Printf("Block %d has a last commit round of %d", resp.Block.LastCommit.Height, resp.Block.LastCommit.Round) + } err = writer.Write([]string{fmt.Sprintf("%d", height), fmt.Sprintf("%d", resp.Block.Time.UnixNano()), fmt.Sprintf("%d", blockSize), fmt.Sprintf("%d", resp.Block.LastCommit.Round)}) if err != nil { - return err + return 0, err } } - return nil + + duration := time.Since(time.Unix(0, startTime)) + return float64(totalBlockSize) / duration.Seconds(), nil } diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index ca59d73fe3..44d2d42046 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -1,8 +1,8 @@ package testnet var DefaultResources = Resources{ - MemoryRequest: "800Mi", - MemoryLimit: "800Mi", + MemoryRequest: "1Gi", + MemoryLimit: "1Gi", CPU: "300m", Volume: "1Gi", } From e1d7500fbc0076140baef1051e839ec34467ec5d Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 9 Aug 2024 17:52:51 +0200 Subject: [PATCH 20/56] checkpoint --- 2024-08-09-15-47-14-27bf8ce-block-times.csv | 172 ++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 6 +- test/e2e/testnet/defaults.go | 8 +- 5 files changed, 182 insertions(+), 10 deletions(-) create mode 100644 2024-08-09-15-47-14-27bf8ce-block-times.csv diff --git a/2024-08-09-15-47-14-27bf8ce-block-times.csv b/2024-08-09-15-47-14-27bf8ce-block-times.csv new file mode 100644 index 0000000000..bab17890f3 --- /dev/null +++ b/2024-08-09-15-47-14-27bf8ce-block-times.csv @@ -0,0 +1,172 @@ +height,block time,block size,last commit round +1,1723210866827326000,0,0 +2,1723210896379609221,0,0 +3,1723210897699276513,0,0 +4,1723210904520929833,0,1 +5,1723210905897559044,0,0 +6,1723210907220049620,0,0 +7,1723210908745936077,0,0 +8,1723210910241597195,0,0 +9,1723210911644848133,0,0 +10,1723210913066228113,0,0 +11,1723210914582096300,0,0 +12,1723210915900638998,0,0 +13,1723210917221961720,0,0 +14,1723210918534669295,0,0 +15,1723210919855714086,0,0 +16,1723210921176293123,0,0 +17,1723210922493678246,15473,0 +18,1723210923931100248,0,0 +19,1723210925243298228,0,0 +20,1723210926655444096,831404,0 +21,1723210928370458220,0,0 +22,1723210929736032782,1082473,0 +23,1723210931452673191,0,0 +24,1723210932928751132,972936,0 +25,1723210934648846069,0,0 +26,1723210935955339032,1839488,0 +27,1723210937771455197,124860,0 +28,1723210939335565179,938829,0 +29,1723210940973332110,0,0 +30,1723210942347895208,1950133,0 +31,1723210944171465308,27510,0 +32,1723210945622099820,786358,0 +33,1723210947234276980,0,0 +34,1723210948547381997,1522702,0 +35,1723210950282511958,0,0 +36,1723210951639364419,281059,0 +37,1723210953111457204,0,0 +38,1723210954503109705,1949058,0 +39,1723210956206057438,0,0 +40,1723210957513247358,199958,0 +41,1723210958912712356,99979,0 +42,1723210960263815119,1839362,0 +43,1723210961991065408,0,0 +44,1723210963274467125,238590,0 +45,1723210964706599150,0,0 +46,1723210966009937864,1959878,0 +47,1723210967871100271,0,0 +48,1723210969199936752,26028,0 +49,1723210970646086637,99774,0 +50,1723210972017278996,602659,0 +51,1723210973660150054,138759,0 +52,1723210975056752944,0,0 +53,1723210976470460613,9089,0 +54,1723210977794611730,1558170,0 +55,1723210979493926759,0,0 +56,1723210980868386379,125802,0 +57,1723210982371742678,418715,0 +58,1723210983821049524,375169,0 +59,1723210985423938244,0,0 +60,1723210986836131892,1958688,0 +61,1723210988632710942,0,0 +62,1723210989958550776,898845,0 +63,1723210991606433575,164844,0 +64,1723210993050952481,1682154,0 +65,1723210994827421438,0,0 +66,1723210996158948196,747049,0 +67,1723210997834572978,0,0 +68,1723210999324229030,1937605,0 +69,1723211001190758152,38049,0 +70,1723211002640994583,0,0 +71,1723211003982284338,52056,0 +72,1723211005324968106,1959068,0 +73,1723211007125476379,0,0 +74,1723211008440399479,399933,0 +75,1723211010023660626,0,0 +76,1723211011365559987,1947281,0 +77,1723211013181225126,0,0 +78,1723211014500131750,256917,0 +79,1723211016108226656,0,0 +80,1723211017456798323,1932637,0 +81,1723211019377481646,0,0 +82,1723211020774296116,366214,0 +83,1723211022309937429,0,0 +84,1723211023641907322,1961252,0 +85,1723211025450776289,0,0 +86,1723211026771271753,267293,0 +87,1723211028209988047,699853,0 +88,1723211029882961778,1867618,0 +89,1723211031676229238,0,0 +90,1723211033052901763,341972,0 +91,1723211034560535287,96675,0 +92,1723211035884900863,239642,0 +93,1723211037345998446,176587,0 +94,1723211038759807773,1956628,0 +95,1723211040606564006,0,0 +96,1723211041926483367,0,0 +97,1723211043269609283,270028,0 +98,1723211044837811516,1354330,0 +99,1723211046500678435,116810,0 +100,1723211047918004755,573100,0 +101,1723211049596296835,209214,0 +102,1723211051101578432,1950891,0 +103,1723211052869889169,0,0 +104,1723211054351404857,17352,0 +105,1723211055715276686,545515,0 +106,1723211057467042142,292505,0 +107,1723211058842207108,0,0 +108,1723211060162993591,55302,0 +109,1723211061531542650,117123,0 +110,1723211062891261286,34170,0 +111,1723211064268160297,1853363,0 +112,1723211066095562191,0,0 +113,1723211067503635977,95459,0 +114,1723211068922014003,168889,0 +115,1723211070519579097,1035588,0 +116,1723211072181420405,0,0 +117,1723211073592246269,138255,0 +118,1723211075072813382,1920752,0 +119,1723211076898668817,0,0 +120,1723211078274855658,892185,0 +121,1723211079937882328,0,0 +122,1723211081226919081,1474298,0 +123,1723211082980177353,417870,0 +124,1723211084445603091,0,0 +125,1723211085898685975,1937036,0 +126,1723211087625589045,0,0 +127,1723211088998522078,48300,0 +128,1723211090380185852,611582,0 +129,1723211092034568091,226403,0 +130,1723211093405876989,22542,0 +131,1723211094772563128,0,0 +132,1723211096187949879,455283,0 +133,1723211097735370208,256808,0 +134,1723211099210267766,0,0 +135,1723211100534734194,1934629,0 +136,1723211102447176519,0,0 +137,1723211103885075663,0,0 +138,1723211105235565485,391755,0 +139,1723211106806543280,0,0 +140,1723211108170852247,131164,0 +141,1723211109717340486,0,0 +142,1723211111071925233,76508,0 +143,1723211112407682870,867514,0 +144,1723211114070366180,0,0 +145,1723211115391965428,46085,0 +146,1723211116716545912,262200,0 +147,1723211118218618127,1927139,0 +148,1723211120071518068,0,0 +149,1723211121502060474,0,0 +150,1723211122884808636,11519,0 +151,1723211124212765644,739479,0 +152,1723211125946305719,0,0 +153,1723211127277570721,534586,0 +154,1723211129012381175,82953,0 +155,1723211130284004815,677498,0 +156,1723211132023569955,0,0 +157,1723211135561915789,1954680,0 +158,1723211137339832987,0,0 +159,1723211138795602360,641570,0 +160,1723211140560144656,1163369,0 +161,1723211142363655946,1926400,0 +162,1723211149442148900,0,1 +163,1723211150838924633,438246,0 +164,1723211152432500911,0,0 +165,1723211153844841027,1946882,0 +166,1723211155652559061,1941649,0 +167,1723211162810926934,0,1 +168,1723211164221726282,415447,0 +169,1723211165733623383,0,0 +170,1723211167178944743,1942941,0 +171,1723211169086627125,997233,0 diff --git a/go.mod b/go.mod index d918030a06..0a0fb8d238 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.20240809132817-e937057ceeca + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70 ) diff --git a/go.sum b/go.sum index c3ae224b1d..4b9ca3521c 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.20240809132817-e937057ceeca h1:Q0F/wedYAiLVM7063oSsbTzqFJA/48qeM9zPQGjThsI= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809132817-e937057ceeca/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70 h1:Z6DirPLysmaYGvsNj8f0CCssythU1wLmCS5hrfM81SU= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index c886394324..770396276b 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "8f93462" + compactBlocksVersion = "27bf8ce" ) func main() { @@ -60,10 +60,10 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, 100, - "4000-16000", + "8000-32000", 1, testnet.DefaultResources, - gRPCEndpoints[:3], + gRPCEndpoints[:5], ) if err != nil { return err diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index 44d2d42046..03831c74e7 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -1,10 +1,10 @@ package testnet var DefaultResources = Resources{ - MemoryRequest: "1Gi", - MemoryLimit: "1Gi", - CPU: "300m", - Volume: "1Gi", + MemoryRequest: "2Gi", + MemoryLimit: "2Gi", + CPU: "500m", + Volume: "2Gi", } const ( From 729e0a10efb12b9730b8c25998ef583dc22d6aa4 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 12 Aug 2024 18:29:46 +0200 Subject: [PATCH 21/56] checkpoint --- 2024-08-09-15-08-14-8f93462-block-times.csv | 213 -------------------- 2024-08-09-15-23-10-8f93462-block-times.csv | 57 ------ 2024-08-09-15-47-14-27bf8ce-block-times.csv | 172 ---------------- go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 41 ++-- 6 files changed, 29 insertions(+), 460 deletions(-) delete mode 100644 2024-08-09-15-08-14-8f93462-block-times.csv delete mode 100644 2024-08-09-15-23-10-8f93462-block-times.csv delete mode 100644 2024-08-09-15-47-14-27bf8ce-block-times.csv diff --git a/2024-08-09-15-08-14-8f93462-block-times.csv b/2024-08-09-15-08-14-8f93462-block-times.csv deleted file mode 100644 index 35ba678edf..0000000000 --- a/2024-08-09-15-08-14-8f93462-block-times.csv +++ /dev/null @@ -1,213 +0,0 @@ -height,block time,block size,last commit round -1,1723208539066864000,0,0 -2,1723208567942591543,0,0 -3,1723208569266515066,0,0 -4,1723208576208278528,0,1 -5,1723208577529765842,0,0 -6,1723208578849041480,0,0 -7,1723208580272657824,0,0 -8,1723208581690539934,0,0 -9,1723208583011787052,0,0 -10,1723208584331440386,0,0 -11,1723208585628997898,0,0 -12,1723208587051780555,0,0 -13,1723208588368068315,0,0 -14,1723208589816822716,0,0 -15,1723208591275339963,0,0 -16,1723208592593442881,15473,0 -17,1723208593925571568,0,0 -18,1723208595244795931,0,0 -19,1723208596657508264,403700,0 -20,1723208598331634096,0,0 -21,1723208599748151345,281200,0 -22,1723208601369801210,0,0 -23,1723208602766819573,468000,0 -24,1723208604461857783,26455,0 -25,1723208605876783380,214045,0 -26,1723208607516260764,92075,0 -27,1723208609022964727,276225,0 -28,1723208610551202578,108048,0 -29,1723208612031162355,342152,0 -30,1723208613590783503,197592,0 -31,1723208615066362265,625708,0 -32,1723208616756144278,200937,0 -33,1723208618294737890,407963,0 -34,1723208619977015188,286200,0 -35,1723208621561766263,286200,0 -36,1723208623068823791,220308,0 -37,1723208624506144515,113492,0 -38,1723208625898542759,353452,0 -39,1723208627425570816,449848,0 -40,1723208628975868087,281790,0 -41,1723208630499747712,344410,0 -42,1723208632038482178,358450,0 -43,1723208633582932921,358450,0 -44,1723208635082434019,450878,0 -45,1723208636690743438,313322,0 -46,1723208638242947347,285525,0 -47,1723208639763182917,95175,0 -48,1723208641217099772,105980,0 -49,1723208642808642943,45420,0 -50,1723208644275609330,354340,0 -51,1723208645782232947,151860,0 -52,1723208647354655017,549290,0 -53,1723208648968554118,235410,0 -54,1723208650380032221,328926,0 -55,1723208652003292380,92774,0 -56,1723208653373273566,290799,0 -57,1723208655000192110,77301,0 -58,1723208656389691390,295120,0 -59,1723208657935163409,126480,0 -60,1723208659420783235,329250,0 -61,1723208660984700520,109750,0 -62,1723208662383235057,466967,0 -63,1723208664089168529,190733,0 -64,1723208665636598010,501097,0 -65,1723208667256496959,133203,0 -66,1723208668721027800,140175,0 -67,1723208670321630508,17325,0 -68,1723208671659167480,618552,0 -69,1723208673342954035,84348,0 -70,1723208674732800646,152101,0 -71,1723208676377739190,18799,0 -72,1723208677719838688,466100,0 -73,1723208679314055762,123900,0 -74,1723208680772469742,435477,0 -75,1723208682478444677,53823,0 -76,1723208683897353735,679932,0 -77,1723208685633601695,6868,0 -78,1723208687057068576,782100,0 -79,1723208688776513822,84870,0 -80,1723208690209500637,692730,0 -81,1723208691938352132,99372,0 -82,1723208693312873215,282828,0 -83,1723208695005292889,99847,0 -84,1723208696441770413,244453,0 -85,1723208698048542569,196533,0 -86,1723208699569926322,481167,0 -87,1723208701162558758,197956,0 -88,1723208702591781292,251944,0 -89,1723208704087938515,315798,0 -90,1723208705599206854,436102,0 -91,1723208707141140496,75000,0 -92,1723208708692765623,75000,0 -93,1723208710222834286,225216,0 -94,1723208711647628807,264384,0 -95,1723208713161808260,110649,0 -96,1723208714649353041,224651,0 -97,1723208716199007892,154572,0 -98,1723208717662121630,313828,0 -99,1723208719203506473,87676,0 -100,1723208720664616939,102924,0 -101,1723208722292420988,143350,0 -102,1723208723759726155,143350,0 -103,1723208725280787597,269560,0 -104,1723208726881134397,316440,0 -105,1723208728433902905,187030,0 -106,1723208730032231659,129970,0 -107,1723208731505772845,288704,0 -108,1723208733080487705,162396,0 -109,1723208734611387713,290156,0 -110,1723208736188914384,136544,0 -111,1723208737588642077,243672,0 -112,1723208739076085439,125528,0 -113,1723208740601564751,466985,0 -114,1723208742158308717,324515,0 -115,1723208743609725174,302412,0 -116,1723208745247126116,155788,0 -117,1723208746654205138,308322,0 -118,1723208748161251322,181078,0 -119,1723208749674711249,297330,0 -120,1723208751228042891,153170,0 -121,1723208752746303312,203630,0 -122,1723208754351005138,87270,0 -123,1723208755733925321,401148,0 -124,1723208757343575978,206652,0 -125,1723208758847097738,539420,0 -126,1723208760482440722,231180,0 -127,1723208761941559366,206960,0 -128,1723208763562093290,51740,0 -129,1723208765011003537,113120,0 -130,1723208766711900639,28280,0 -131,1723208768059704429,442560,0 -132,1723208769617607931,110640,0 -133,1723208771018176351,330457,0 -134,1723208772610554219,87843,0 -135,1723208773973367496,155680,0 -136,1723208775478433168,66720,0 -137,1723208776932154714,295302,0 -138,1723208778612568950,78498,0 -139,1723208780096127970,213954,0 -140,1723208781691138464,60346,0 -141,1723208783191053118,386532,0 -142,1723208784861907003,90668,0 -143,1723208786248827887,446160,0 -144,1723208787912088366,111540,0 -145,1723208789380205064,129276,0 -146,1723208791007469425,24624,0 -147,1723208792414636974,386148,0 -148,1723208794019922656,73552,0 -149,1723208795421504006,683256,0 -150,1723208797093036417,142484,0 -151,1723208798641536708,296160,0 -152,1723208800315134298,181930,0 -153,1723208801755029898,609070,0 -154,1723208803420586816,126310,0 -155,1723208804888017455,245190,0 -156,1723208806450720337,142450,0 -157,1723208807942430793,264550,0 -158,1723208809494490842,138686,0 -159,1723208810996441752,269214,0 -160,1723208812555442035,83620,0 -161,1723208814062343929,142380,0 -162,1723208815647070515,180668,0 -163,1723208817209295999,203732,0 -164,1723208818738272821,125965,0 -165,1723208820375757820,87535,0 -166,1723208821813619385,259036,0 -167,1723208823369654197,158764,0 -168,1723208824892898600,225240,0 -169,1723208826453090926,150160,0 -170,1723208827938216882,86700,0 -171,1723208829415266352,57800,0 -172,1723208831021861573,485415,0 -173,1723208832781627717,239085,0 -174,1723208834347773966,372704,0 -175,1723208835965839515,117696,0 -176,1723208837419135598,383840,0 -177,1723208838976784659,95960,0 -178,1723208840437062869,341280,0 -179,1723208842095190610,85320,0 -180,1723208843552399242,278000,0 -181,1723208845195129255,69500,0 -182,1723208846606983572,513378,0 -183,1723208848302752697,120422,0 -184,1723208849737703648,442384,0 -185,1723208851276913395,72016,0 -186,1723208852617612716,220418,0 -187,1723208854233362417,35882,0 -188,1723208855659337739,532160,0 -189,1723208857308249119,133040,0 -190,1723208858729984253,193070,0 -191,1723208860291788739,34505,0 -192,1723208861741595595,261375,0 -193,1723208863375355474,43050,0 -194,1723208864859554121,0,0 -195,1723208866279400661,0,0 -196,1723208867699181552,0,0 -197,1723208869041397757,15403,0 -198,1723208870418600613,0,0 -199,1723208871738709433,250294,0 -200,1723208873290559567,153406,0 -201,1723208874842228596,205276,0 -202,1723208876402396551,75924,0 -203,1723208877763863639,290160,0 -204,1723208879285916404,177840,0 -205,1723208880752618095,139490,0 -206,1723208882327390835,101010,0 -207,1723208883847288482,279908,0 -208,1723208885531597024,88392,0 -209,1723208886931453403,297132,0 -210,1723208888460398408,153068,0 -211,1723208890026981384,625708,0 -212,1723208891678114901,197592,0 diff --git a/2024-08-09-15-23-10-8f93462-block-times.csv b/2024-08-09-15-23-10-8f93462-block-times.csv deleted file mode 100644 index 14690c9895..0000000000 --- a/2024-08-09-15-23-10-8f93462-block-times.csv +++ /dev/null @@ -1,57 +0,0 @@ -height,block time,block size,last commit round -1,1723209427657954000,0,0 -2,1723209458520098013,0,0 -3,1723209459934315074,0,0 -4,1723209461356155947,0,0 -5,1723209462676660861,0,0 -6,1723209463995657277,0,0 -7,1723209465317252515,0,0 -8,1723209466649962284,0,0 -9,1723209467969607865,0,0 -10,1723209469386496710,0,0 -11,1723209470705048562,0,0 -12,1723209472027727612,15473,0 -13,1723209473360397598,0,0 -14,1723209474672482081,117481,0 -15,1723209476136192718,786219,0 -16,1723209477773888878,291924,0 -17,1723209479281213631,789276,0 -18,1723209480863139994,320400,0 -19,1723209482323368344,763073,0 -20,1723209483942694868,301745,0 -21,1723209485459391400,1389419,0 -22,1723209487174628110,849137,0 -23,1723209488760633546,1660752,0 -24,1723209490436507594,476754,0 -25,1723209491939258010,1855045,0 -26,1723209493923486329,1963718,0 -27,1723209501196906060,1016674,1 -28,1723209502936882190,432679,0 -29,1723209504499475667,1779420,0 -30,1723209506405355442,453183,0 -31,1723209507980284566,1581682,0 -32,1723209512405471836,1955776,0 -33,1723209514257652192,1235188,0 -34,1723209516114119569,1477609,0 -35,1723209517886535562,553194,0 -36,1723209519567404037,1943477,0 -37,1723209526567698488,260756,1 -38,1723209528213313170,1622881,0 -39,1723209530101734280,770580,0 -40,1723209531850942491,1949899,0 -41,1723209534209780018,1932003,0 -42,1723209541431588752,99505,1 -43,1723209542954666816,1392122,0 -44,1723209544743805864,444711,0 -45,1723209546413316663,1809955,0 -46,1723209548191797754,1924709,0 -47,1723209603706082907,764217,6 -48,1723209605540471761,512210,0 -49,1723209607253115546,1435519,0 -50,1723209608970582313,965612,0 -51,1723209610581888206,785824,0 -52,1723209612952943981,1932688,0 -53,1723209614705168311,1319412,0 -54,1723209616551784153,1377691,0 -55,1723209618397848100,1945289,0 -56,1723209640918348330,1484052,2 diff --git a/2024-08-09-15-47-14-27bf8ce-block-times.csv b/2024-08-09-15-47-14-27bf8ce-block-times.csv deleted file mode 100644 index bab17890f3..0000000000 --- a/2024-08-09-15-47-14-27bf8ce-block-times.csv +++ /dev/null @@ -1,172 +0,0 @@ -height,block time,block size,last commit round -1,1723210866827326000,0,0 -2,1723210896379609221,0,0 -3,1723210897699276513,0,0 -4,1723210904520929833,0,1 -5,1723210905897559044,0,0 -6,1723210907220049620,0,0 -7,1723210908745936077,0,0 -8,1723210910241597195,0,0 -9,1723210911644848133,0,0 -10,1723210913066228113,0,0 -11,1723210914582096300,0,0 -12,1723210915900638998,0,0 -13,1723210917221961720,0,0 -14,1723210918534669295,0,0 -15,1723210919855714086,0,0 -16,1723210921176293123,0,0 -17,1723210922493678246,15473,0 -18,1723210923931100248,0,0 -19,1723210925243298228,0,0 -20,1723210926655444096,831404,0 -21,1723210928370458220,0,0 -22,1723210929736032782,1082473,0 -23,1723210931452673191,0,0 -24,1723210932928751132,972936,0 -25,1723210934648846069,0,0 -26,1723210935955339032,1839488,0 -27,1723210937771455197,124860,0 -28,1723210939335565179,938829,0 -29,1723210940973332110,0,0 -30,1723210942347895208,1950133,0 -31,1723210944171465308,27510,0 -32,1723210945622099820,786358,0 -33,1723210947234276980,0,0 -34,1723210948547381997,1522702,0 -35,1723210950282511958,0,0 -36,1723210951639364419,281059,0 -37,1723210953111457204,0,0 -38,1723210954503109705,1949058,0 -39,1723210956206057438,0,0 -40,1723210957513247358,199958,0 -41,1723210958912712356,99979,0 -42,1723210960263815119,1839362,0 -43,1723210961991065408,0,0 -44,1723210963274467125,238590,0 -45,1723210964706599150,0,0 -46,1723210966009937864,1959878,0 -47,1723210967871100271,0,0 -48,1723210969199936752,26028,0 -49,1723210970646086637,99774,0 -50,1723210972017278996,602659,0 -51,1723210973660150054,138759,0 -52,1723210975056752944,0,0 -53,1723210976470460613,9089,0 -54,1723210977794611730,1558170,0 -55,1723210979493926759,0,0 -56,1723210980868386379,125802,0 -57,1723210982371742678,418715,0 -58,1723210983821049524,375169,0 -59,1723210985423938244,0,0 -60,1723210986836131892,1958688,0 -61,1723210988632710942,0,0 -62,1723210989958550776,898845,0 -63,1723210991606433575,164844,0 -64,1723210993050952481,1682154,0 -65,1723210994827421438,0,0 -66,1723210996158948196,747049,0 -67,1723210997834572978,0,0 -68,1723210999324229030,1937605,0 -69,1723211001190758152,38049,0 -70,1723211002640994583,0,0 -71,1723211003982284338,52056,0 -72,1723211005324968106,1959068,0 -73,1723211007125476379,0,0 -74,1723211008440399479,399933,0 -75,1723211010023660626,0,0 -76,1723211011365559987,1947281,0 -77,1723211013181225126,0,0 -78,1723211014500131750,256917,0 -79,1723211016108226656,0,0 -80,1723211017456798323,1932637,0 -81,1723211019377481646,0,0 -82,1723211020774296116,366214,0 -83,1723211022309937429,0,0 -84,1723211023641907322,1961252,0 -85,1723211025450776289,0,0 -86,1723211026771271753,267293,0 -87,1723211028209988047,699853,0 -88,1723211029882961778,1867618,0 -89,1723211031676229238,0,0 -90,1723211033052901763,341972,0 -91,1723211034560535287,96675,0 -92,1723211035884900863,239642,0 -93,1723211037345998446,176587,0 -94,1723211038759807773,1956628,0 -95,1723211040606564006,0,0 -96,1723211041926483367,0,0 -97,1723211043269609283,270028,0 -98,1723211044837811516,1354330,0 -99,1723211046500678435,116810,0 -100,1723211047918004755,573100,0 -101,1723211049596296835,209214,0 -102,1723211051101578432,1950891,0 -103,1723211052869889169,0,0 -104,1723211054351404857,17352,0 -105,1723211055715276686,545515,0 -106,1723211057467042142,292505,0 -107,1723211058842207108,0,0 -108,1723211060162993591,55302,0 -109,1723211061531542650,117123,0 -110,1723211062891261286,34170,0 -111,1723211064268160297,1853363,0 -112,1723211066095562191,0,0 -113,1723211067503635977,95459,0 -114,1723211068922014003,168889,0 -115,1723211070519579097,1035588,0 -116,1723211072181420405,0,0 -117,1723211073592246269,138255,0 -118,1723211075072813382,1920752,0 -119,1723211076898668817,0,0 -120,1723211078274855658,892185,0 -121,1723211079937882328,0,0 -122,1723211081226919081,1474298,0 -123,1723211082980177353,417870,0 -124,1723211084445603091,0,0 -125,1723211085898685975,1937036,0 -126,1723211087625589045,0,0 -127,1723211088998522078,48300,0 -128,1723211090380185852,611582,0 -129,1723211092034568091,226403,0 -130,1723211093405876989,22542,0 -131,1723211094772563128,0,0 -132,1723211096187949879,455283,0 -133,1723211097735370208,256808,0 -134,1723211099210267766,0,0 -135,1723211100534734194,1934629,0 -136,1723211102447176519,0,0 -137,1723211103885075663,0,0 -138,1723211105235565485,391755,0 -139,1723211106806543280,0,0 -140,1723211108170852247,131164,0 -141,1723211109717340486,0,0 -142,1723211111071925233,76508,0 -143,1723211112407682870,867514,0 -144,1723211114070366180,0,0 -145,1723211115391965428,46085,0 -146,1723211116716545912,262200,0 -147,1723211118218618127,1927139,0 -148,1723211120071518068,0,0 -149,1723211121502060474,0,0 -150,1723211122884808636,11519,0 -151,1723211124212765644,739479,0 -152,1723211125946305719,0,0 -153,1723211127277570721,534586,0 -154,1723211129012381175,82953,0 -155,1723211130284004815,677498,0 -156,1723211132023569955,0,0 -157,1723211135561915789,1954680,0 -158,1723211137339832987,0,0 -159,1723211138795602360,641570,0 -160,1723211140560144656,1163369,0 -161,1723211142363655946,1926400,0 -162,1723211149442148900,0,1 -163,1723211150838924633,438246,0 -164,1723211152432500911,0,0 -165,1723211153844841027,1946882,0 -166,1723211155652559061,1941649,0 -167,1723211162810926934,0,1 -168,1723211164221726282,415447,0 -169,1723211165733623383,0,0 -170,1723211167178944743,1942941,0 -171,1723211169086627125,997233,0 diff --git a/go.mod b/go.mod index 0a0fb8d238..453ef233dc 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.20240809145358-dfa438254e70 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240812162729-2273f83d3769 ) diff --git a/go.sum b/go.sum index 4b9ca3521c..055ba4789a 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.20240809145358-dfa438254e70 h1:Z6DirPLysmaYGvsNj8f0CCssythU1wLmCS5hrfM81SU= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240812162729-2273f83d3769 h1:HLWHbabzLW9uT2eEUz+3aYwTRu8vaQRFsz7MMq4FJP4= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240812162729-2273f83d3769/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 770396276b..f77fb59708 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,7 +15,7 @@ import ( ) const ( - compactBlocksVersion = "27bf8ce" + compactBlocksVersion = "pr-3713" ) func main() { @@ -26,17 +26,12 @@ func main() { func Run() error { const ( - nodes = 5 + nodes = 8 timeoutCommit = time.Second - timeoutPropose = 4 * time.Second + timeoutPropose = 5 * time.Second version = compactBlocksVersion ) - // blobParams := blobtypes.DefaultParams() - // // set the square size to 128 - // blobParams.GovMaxSquareSize = 128 - // ecfg := encoding.MakeConfig(app.ModuleBasics) - network, err := testnet.New("compact-blocks", 864, nil, "test") if err != nil { return err @@ -48,9 +43,11 @@ func Run() error { return err } - // cparams := app.DefaultConsensusParams() - // cparams.Block.MaxBytes = 8 * 1024 * 1024 - // network.SetConsensusParams(cparams) + for _, node := range network.Nodes() { + if err := node.Instance.EnableBitTwister(); err != nil { + return fmt.Errorf("failed to enable bit twister: %v", err) + } + } gRPCEndpoints, err := network.RemoteGRPCEndpoints() if err != nil { @@ -59,11 +56,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 100, - "8000-32000", + 120, + "32000-64000", 1, testnet.DefaultResources, - gRPCEndpoints[:5], + gRPCEndpoints[:4], ) if err != nil { return err @@ -87,11 +84,25 @@ func Run() error { } log.Printf("Starting network\n") - err = network.Start() + err = network.StartNodes() if err != nil { return err } + for _, node := range network.Nodes() { + if err = node.Instance.SetLatencyAndJitter(100, 10); err != nil { + return fmt.Errorf("failed to set latency and jitter: %v", err) + } + } + + if err := network.WaitToSync(); err != nil { + return err + } + + if err := network.StartTxClients(); err != nil { + return err + } + // run the test for 5 minutes heightTicker := time.NewTicker(20 * time.Second) timeout := time.NewTimer(5 * time.Minute) From bbce586872bbe17f428bcd558f96cc79e848c539 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 13 Aug 2024 12:14:19 +0200 Subject: [PATCH 22/56] checkpoint --- 2024-08-12-18-44-27-pr-3713-block-times.csv | 122 ++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 2 +- 4 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 2024-08-12-18-44-27-pr-3713-block-times.csv diff --git a/2024-08-12-18-44-27-pr-3713-block-times.csv b/2024-08-12-18-44-27-pr-3713-block-times.csv new file mode 100644 index 0000000000..684a1def27 --- /dev/null +++ b/2024-08-12-18-44-27-pr-3713-block-times.csv @@ -0,0 +1,122 @@ +height,block time,block size,last commit round +1,1723480682796092000,0,0 +2,1723480726296242817,0,1 +3,1723480727910064827,0,0 +4,1723480729563668080,0,0 +5,1723480731626020418,0,0 +6,1723480733684032548,0,0 +7,1723480735809029984,0,0 +8,1723480737848180377,0,0 +9,1723480739669391662,0,0 +10,1723480741675991307,0,0 +11,1723480743558916583,0,0 +12,1723480745292916979,0,0 +13,1723480747089720686,0,0 +14,1723480748804615255,0,0 +15,1723480750817484989,18534,0 +16,1723480752671262882,0,0 +17,1723480754370405758,0,0 +18,1723480756396727360,0,0 +19,1723480758133401066,132160,0 +20,1723480759914538347,297360,0 +21,1723480761806073159,330400,0 +22,1723480763621888795,297360,0 +23,1723480765400668652,231280,0 +24,1723480767311774264,297360,0 +25,1723480769203851753,297360,0 +26,1723480770927712883,231280,0 +27,1723480772719707042,231280,0 +28,1723480774426964689,198240,0 +29,1723480776304381444,330400,0 +30,1723480778181194740,264320,0 +31,1723480779929931597,297360,0 +32,1723480781912327824,264320,0 +33,1723480783648752568,397552,0 +34,1723480785439221708,504595,0 +35,1723480787320060733,0,0 +36,1723480789125942692,0,0 +37,1723480790984876662,495600,0 +38,1723480793007163529,892080,0 +39,1723480795196713913,0,0 +40,1723480798132929996,0,0 +41,1723480804641460545,1907925,0 +42,1723480810049973428,1916320,0 +43,1723480832122231615,1916320,2 +44,1723480834754256530,1916320,0 +45,1723480839952089625,1915312,0 +46,1723480846286135591,1925688,0 +47,1723480857030852571,1936385,1 +48,1723480867287822758,0,1 +49,1723480869125729856,0,0 +50,1723480870919494394,173415,0 +51,1723480872832154019,381513,0 +52,1723480874678552694,381513,0 +53,1723480876502429571,770673,0 +54,1723480878385245529,466488,0 +55,1723480880164201527,1913562,0 +56,1723480888746607777,0,1 +57,1723480890511144081,0,0 +58,1723480892229576487,104049,0 +59,1723480894013956923,242781,0 +60,1723480895795438000,1068619,0 +61,1723480897853773718,313534,0 +62,1723480899715508602,296856,0 +63,1723480901574805288,1930457,0 +64,1723480910083544631,1940750,1 +65,1723480912072274020,0,0 +66,1723480913756373795,34683,0 +67,1723480915745424328,69366,0 +68,1723480917457185391,520245,0 +69,1723480919431110544,381513,0 +70,1723480921271435765,554928,0 +71,1723480923229009362,1906758,0 +72,1723480931801024418,1187424,1 +73,1723480933875896571,42408,0 +74,1723480935818678210,615209,0 +75,1723480937764957636,576321,0 +76,1723480939656652085,529094,0 +77,1723480941609608369,697259,0 +78,1723480943474879689,532614,0 +79,1723480945296394323,1892432,0 +80,1723480953852691639,150020,1 +81,1723480955671673299,0,0 +82,1723480957398273161,150020,0 +83,1723480959218479933,0,0 +84,1723480960954317967,112515,0 +85,1723480962725615214,1934200,0 +86,1723480964656843521,0,0 +87,1723480966518227664,1910070,0 +88,1723480975172485331,0,1 +89,1723480977032405052,0,0 +90,1723480978822391106,34683,0 +91,1723480980575364767,1731003,0 +92,1723480982581028608,212040,0 +93,1723480984463505132,0,0 +94,1723480986281713786,575106,0 +95,1723480988243852370,1919047,0 +96,1723480996826309263,0,1 +97,1723480998712441394,0,0 +98,1723481000417397044,675090,0 +99,1723481002413710882,487565,0 +100,1723481004350964106,1939440,0 +101,1723481006457629840,0,0 +102,1723481008290175329,0,0 +103,1723481009965537260,1939872,0 +104,1723481018587088603,0,1 +105,1723481020446537364,0,0 +106,1723481022223647517,242781,0 +107,1723481023943862184,520245,0 +108,1723481025907236612,1187265,0 +109,1723481028027000584,212040,0 +110,1723481029884268603,593712,0 +111,1723481031814912993,1913410,0 +112,1723481040358962885,0,1 +113,1723481042214063336,0,0 +114,1723481044061063020,0,0 +115,1723481045754469948,1535833,0 +116,1723481047743983414,416327,0 +117,1723481049644935411,0,0 +118,1723481051399070650,154923,0 +119,1723481053247432990,1923804,0 +120,1723481061864303657,0,1 +121,1723481063696889512,0,0 diff --git a/go.mod b/go.mod index 453ef233dc..3c7dcee59e 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.20240812162729-2273f83d3769 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813101204-513949c5c3f1 ) diff --git a/go.sum b/go.sum index 055ba4789a..987f1a8824 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.20240812162729-2273f83d3769 h1:HLWHbabzLW9uT2eEUz+3aYwTRu8vaQRFsz7MMq4FJP4= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240812162729-2273f83d3769/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813101204-513949c5c3f1 h1:fH9Kh5XalS2I1L9YT3vx0tZWBJpn/cIQJhBfSKTdyGM= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813101204-513949c5c3f1/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index f77fb59708..3fe4df5364 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -28,7 +28,7 @@ func Run() error { const ( nodes = 8 timeoutCommit = time.Second - timeoutPropose = 5 * time.Second + timeoutPropose = 4 * time.Second version = compactBlocksVersion ) From 0ab06005ba1b7a848d6853277390de15be3256a3 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 13 Aug 2024 13:55:19 +0200 Subject: [PATCH 23/56] checkpoint --- 2024-08-13-12-29-07-pr-3713-block-times.csv | 156 ++++++++++++++++++++ 2024-08-13-13-31-29-pr-3713-block-times.csv | 122 +++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 20 ++- 5 files changed, 297 insertions(+), 7 deletions(-) create mode 100644 2024-08-13-12-29-07-pr-3713-block-times.csv create mode 100644 2024-08-13-13-31-29-pr-3713-block-times.csv diff --git a/2024-08-13-12-29-07-pr-3713-block-times.csv b/2024-08-13-12-29-07-pr-3713-block-times.csv new file mode 100644 index 0000000000..6b6e2e19d8 --- /dev/null +++ b/2024-08-13-12-29-07-pr-3713-block-times.csv @@ -0,0 +1,156 @@ +height,block time,block size,last commit round +1,1723544569271928000,0,0 +2,1723544603404269710,0,0 +3,1723544606051301996,0,0 +4,1723544610845656498,0,0 +5,1723544612488253695,0,0 +6,1723544614374477808,0,0 +7,1723544616398158916,0,0 +8,1723544618645543243,0,0 +9,1723544620654078111,0,0 +10,1723544622667814130,0,0 +11,1723544624685195780,0,0 +12,1723544626695733295,0,0 +13,1723544628712615508,0,0 +14,1723544630610030114,0,0 +15,1723544632468181391,0,0 +16,1723544634198625621,18534,0 +17,1723544636027636641,0,0 +18,1723544637896106627,0,0 +19,1723544639634742405,0,0 +20,1723544641409325307,198240,0 +21,1723544643270181466,264320,0 +22,1723544645101370419,264320,0 +23,1723544646940649664,165200,0 +24,1723544648856820003,363440,0 +25,1723544650655203642,297360,0 +26,1723544652405480624,198240,0 +27,1723544654176208345,297360,0 +28,1723544656155729102,264320,0 +29,1723544657949519391,264320,0 +30,1723544659694080286,264320,0 +31,1723544661487275900,264320,0 +32,1723544663195703439,264320,0 +33,1723544665105081075,297360,0 +34,1723544666975544645,231280,0 +35,1723544668727526293,548647,0 +36,1723544670741474611,659855,0 +37,1723544672703718283,0,0 +38,1723544674505773555,99120,0 +39,1723544676445551379,660800,0 +40,1723544678622497744,958160,0 +41,1723544681314367853,0,0 +42,1723544692297170028,312147,1 +43,1723544697639718322,1914497,0 +44,1723544701206405894,1916320,0 +45,1723544718153043884,1916320,1 +46,1723544722888680522,1916320,0 +47,1723544733579402026,1916320,1 +48,1723544737031243631,1934048,0 +49,1723544741757267981,508896,0 +50,1723544746320609550,0,0 +51,1723544751790654384,784464,0 +52,1723544753825556897,130744,0 +53,1723544755660427257,0,0 +54,1723544757449416101,450060,0 +55,1723544759523613144,1919790,0 +56,1723544761577978355,0,0 +57,1723544763236568269,0,0 +58,1723544764934521730,208098,0 +59,1723544766762394754,312147,0 +60,1723544768546951465,312147,0 +61,1723544770316268336,346830,0 +62,1723544772073823546,466488,0 +63,1723544773918468469,381672,0 +64,1723544775698897211,508896,0 +65,1723544777636578746,313618,0 +66,1723544779298417600,294174,0 +67,1723544781108963295,294174,0 +68,1723544782920795277,369184,0 +69,1723544784742367519,375050,0 +70,1723544786587104254,300040,0 +71,1723544788365377590,1922410,0 +72,1723544790343752029,0,0 +73,1723544792035596640,0,0 +74,1723544793764388902,242781,0 +75,1723544795603674818,277464,0 +76,1723544797371875855,381513,0 +77,1723544799118347431,389238,0 +78,1723544800922625197,424080,0 +79,1723544802791198295,339264,0 +80,1723544804585119132,678528,0 +81,1723544806460360796,336582,0 +82,1723544808203150860,228802,0 +83,1723544809975322656,359546,0 +84,1723544811785126780,406689,0 +85,1723544813645922679,337545,0 +86,1723544815378225219,337545,0 +87,1723544817208462538,1921100,0 +88,1723544819361764817,0,0 +89,1723544821012826561,0,0 +90,1723544822724261763,485562,0 +91,1723544824655102122,346830,0 +92,1723544826539162272,381513,0 +93,1723544828344076639,212040,0 +94,1723544830113150277,636120,0 +95,1723544831931283864,551304,0 +96,1723544833785499950,84816,0 +97,1723544835575109492,588348,0 +98,1723544837434570659,326860,0 +99,1723544839321543065,228802,0 +100,1723544841130275287,337545,0 +101,1723544842909136692,450060,0 +102,1723544844612540007,1922410,0 +103,1723544846613210584,0,0 +104,1723544848411195835,0,0 +105,1723544850147200879,277464,0 +106,1723544852006235777,1902684,0 +107,1723544854045246150,0,0 +108,1723544855801658211,0,0 +109,1723544857546523071,208098,0 +110,1723544859427578059,1896534,0 +111,1723544861507392561,254448,0 +112,1723544863346593614,169632,0 +113,1723544865164955748,766864,0 +114,1723544867102180623,1094562,0 +115,1723544869133139676,196116,0 +116,1723544870988490684,499928,0 +117,1723544873005454890,1133741,0 +118,1723544874945229384,468289,0 +119,1723544876756724410,375050,0 +120,1723544878498835550,337545,0 +121,1723544880318740541,112515,0 +122,1723544882119814378,1938130,0 +123,1723544884123618554,0,0 +124,1723544885925737764,0,0 +125,1723544887580841811,658977,0 +126,1723544889419539216,867075,0 +127,1723544891343027363,138732,0 +128,1723544893213966095,296856,0 +129,1723544895053074450,1145016,0 +130,1723544897044373764,593712,0 +131,1723544898884504385,0,0 +132,1723544900694339282,784464,0 +133,1723544902530175677,751778,0 +134,1723544904451143781,32686,0 +135,1723544906212464548,562575,0 +136,1723544908149635773,1087645,0 +137,1723544910140603644,1935510,0 +138,1723544912172368330,0,0 +139,1723544913883191342,0,0 +140,1723544915584709892,416196,0 +141,1723544917425969331,971124,0 +142,1723544919399967434,208098,0 +143,1723544921329364544,169632,0 +144,1723544923156287276,1272240,0 +145,1723544925125349846,466488,0 +146,1723544926899542151,42408,0 +147,1723544928697160410,588348,0 +148,1723544930532806850,882522,0 +149,1723544932405064220,0,0 +150,1723544934086773435,295221,0 +151,1723544935925148397,1125150,0 +152,1723544937919287256,300040,0 +153,1723544939769478195,1920833,0 +154,1723544941792059912,1922564,0 +155,1723544943780859612,1922564,0 diff --git a/2024-08-13-13-31-29-pr-3713-block-times.csv b/2024-08-13-13-31-29-pr-3713-block-times.csv new file mode 100644 index 0000000000..fa6818ce4e --- /dev/null +++ b/2024-08-13-13-31-29-pr-3713-block-times.csv @@ -0,0 +1,122 @@ +height,block time,block size,last commit round +1,1723548309833182000,0,0 +2,1723548339027299756,0,0 +3,1723548340655265556,0,0 +4,1723548342546088117,0,0 +5,1723548344155923217,0,0 +6,1723548345873958178,0,0 +7,1723548348276747783,0,0 +8,1723548350181236587,0,0 +9,1723548352110272844,0,0 +10,1723548354133354563,0,0 +11,1723548356125666351,0,0 +12,1723548358122644445,0,0 +13,1723548360130267029,0,0 +14,1723548362179073253,0,0 +15,1723548363953651898,0,0 +16,1723548365823154509,0,0 +17,1723548367560825996,0,0 +18,1723548369268070219,18534,0 +19,1723548371098108095,0,0 +20,1723548372738432012,0,0 +21,1723548374343994446,0,0 +22,1723548376157178381,32378,0 +23,1723548377893360238,259024,0 +24,1723548379726141928,259024,0 +25,1723548381636896937,323780,0 +26,1723548383543462315,226646,0 +27,1723548385416594095,291402,0 +28,1723548387221470748,259024,0 +29,1723548389044358982,259024,0 +30,1723548390857226206,259024,0 +31,1723548392598843480,259024,0 +32,1723548394285338745,259024,0 +33,1723548396202800752,291402,0 +34,1723548397993670026,226646,0 +35,1723548399800572244,259024,0 +36,1723548401538800341,259024,0 +37,1723548403239321924,323430,0 +38,1723548405023724984,516928,0 +39,1723548406960766919,549236,0 +40,1723548408811162822,516928,0 +41,1723548410704985008,613852,0 +42,1723548412696204930,516928,0 +43,1723548414607311687,516928,0 +44,1723548416535435649,549236,0 +45,1723548418412051213,549236,0 +46,1723548420342708326,516928,0 +47,1723548422227657224,516928,0 +48,1723548424152160652,581544,0 +49,1723548426058972226,613852,0 +50,1723548427914995078,484620,0 +51,1723548429805437758,549236,0 +52,1723548431797442385,516928,0 +53,1723548433557841979,516928,0 +54,1723548435551906639,549236,0 +55,1723548437346791137,549236,0 +56,1723548439266536863,549236,0 +57,1723548441162033135,581544,0 +58,1723548443094321681,484620,0 +59,1723548444967652475,516928,0 +60,1723548446795523578,549236,0 +61,1723548448599273944,549236,0 +62,1723548450543669562,516928,0 +63,1723548452487265266,581544,0 +64,1723548454403586626,549236,0 +65,1723548456311753519,581544,0 +66,1723548458607423273,613852,0 +67,1723548461073524806,807700,0 +68,1723548464847026745,904624,0 +69,1723548468826733796,549236,0 +70,1723548472356000996,1647708,0 +71,1723548474757592715,1098472,0 +72,1723548483271749464,1324628,1 +73,1723548487263299603,3133876,0 +74,1723548506726910807,646160,2 +75,1723548517136659329,1712324,1 +76,1723548520008271695,355388,0 +77,1723548522148944192,1163088,0 +78,1723548524247216766,161540,0 +79,1723548526190648662,3036952,0 +80,1723548534613434389,549236,1 +81,1723548536705231843,290772,0 +82,1723548538581926384,32308,0 +83,1723548540571756389,2616948,0 +84,1723548549315881938,710776,1 +85,1723548551904883782,3166184,0 +86,1723548564075129126,258464,0 +87,1723548565992919822,1970788,0 +88,1723548574091807417,646160,1 +89,1723548576030084807,613852,0 +90,1723548578155850373,549236,0 +91,1723548580104680970,2100020,0 +92,1723548587948372521,678468,1 +93,1723548589976202792,516928,0 +94,1723548591934724873,581544,0 +95,1723548593956609500,2100020,0 +96,1723548601760966153,678468,1 +97,1723548603825992362,613852,0 +98,1723548605884617426,516928,0 +99,1723548607910035031,2164636,0 +100,1723548615765343879,646160,1 +101,1723548617772216581,581544,0 +102,1723548619739676833,549236,0 +103,1723548621699718021,2132328,0 +104,1723548629534974216,646160,1 +105,1723548631460392073,581544,0 +106,1723548633468561000,516928,0 +107,1723548635412817067,2100020,0 +108,1723548643312116557,678468,1 +109,1723548645323832553,516928,0 +110,1723548647289861905,581544,0 +111,1723548649332555931,2196944,0 +112,1723548657157323959,581544,1 +113,1723548658951375921,581544,0 +114,1723548660918750282,484620,0 +115,1723548662831904905,2132328,0 +116,1723548670624653818,678468,1 +117,1723548672618922240,516928,0 +118,1723548674652577939,581544,0 +119,1723548676601727568,2132328,0 +120,1723548684336983408,646160,1 +121,1723548686358287519,581544,0 diff --git a/go.mod b/go.mod index 3c7dcee59e..b4acf6b0ed 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.20240813101204-513949c5c3f1 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813114927-567a281a98dc ) diff --git a/go.sum b/go.sum index 987f1a8824..62e956f096 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.20240813101204-513949c5c3f1 h1:fH9Kh5XalS2I1L9YT3vx0tZWBJpn/cIQJhBfSKTdyGM= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813101204-513949c5c3f1/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813114927-567a281a98dc h1:X2R6/wL3Jza7PyaBMj7sywXcCi0/HhRAPF2Lxbd99Lw= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813114927-567a281a98dc/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 3fe4df5364..cd2163db30 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -8,8 +8,11 @@ import ( "os" "time" + "github.com/celestiaorg/celestia-app/v3/app" + "github.com/celestiaorg/celestia-app/v3/app/encoding" "github.com/celestiaorg/celestia-app/v3/test/e2e/testnet" - // "github.com/celestiaorg/celestia-app/v3/test/util/genesis" + blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" + "github.com/celestiaorg/celestia-app/v3/test/util/genesis" "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/rpc/client/http" ) @@ -32,12 +35,21 @@ func Run() error { version = compactBlocksVersion ) - network, err := testnet.New("compact-blocks", 864, nil, "test") + blobParams := blobtypes.DefaultParams() + // set the square size to 128 + blobParams.GovMaxSquareSize = 128 + ecfg := encoding.MakeConfig(app.ModuleBasics) + + network, err := testnet.New("compact-blocks", 864, nil, "test", genesis.SetBlobParams(ecfg.Codec, blobParams)) if err != nil { return err } defer network.Cleanup() + cparams := app.DefaultConsensusParams() + cparams.Block.MaxBytes = 8 * 1024 * 1024 + network.SetConsensusParams(cparams) + err = network.CreateGenesisNodes(nodes, version, 10000000, 0, testnet.DefaultResources) if err != nil { return err @@ -57,10 +69,10 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, 120, - "32000-64000", + "32000-32000", 1, testnet.DefaultResources, - gRPCEndpoints[:4], + gRPCEndpoints[:5], ) if err != nil { return err From c22c57428533f743affb7bc1a2dd4983ca29d2a9 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 13 Aug 2024 14:54:43 +0200 Subject: [PATCH 24/56] checkpoint --- 2024-08-13-14-10-58-e43786b-block-times.csv | 25 +++++++++++++ 2024-08-13-14-19-07-pr-3713-block-times.csv | 40 +++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +-- test/e2e/experiment/compact_blocks/main.go | 35 ++++++++++++++++-- 5 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 2024-08-13-14-10-58-e43786b-block-times.csv create mode 100644 2024-08-13-14-19-07-pr-3713-block-times.csv diff --git a/2024-08-13-14-10-58-e43786b-block-times.csv b/2024-08-13-14-10-58-e43786b-block-times.csv new file mode 100644 index 0000000000..05bcd88b96 --- /dev/null +++ b/2024-08-13-14-10-58-e43786b-block-times.csv @@ -0,0 +1,25 @@ +height,block time,block size,last commit round +1,1723550681515519000,0,0 +2,1723550717464653629,0,1 +3,1723550719078327075,0,0 +4,1723550720820475989,0,0 +5,1723550722351062364,0,0 +6,1723550724216787159,0,0 +7,1723550726172110413,0,0 +8,1723550728334423032,0,0 +9,1723550730540060444,0,0 +10,1723550732418584714,0,0 +11,1723550734261849285,0,0 +12,1723550736363577973,0,0 +13,1723550738493991394,0,0 +14,1723550740795870449,0,0 +15,1723550742839063713,18534,0 +16,1723550744893354428,0,0 +17,1723550746871531711,259024,0 +18,1723550749376203804,309936,0 +19,1723550751700243612,388536,0 +20,1723550753919759281,342314,0 +21,1723550756133191823,587494,0 +22,1723550758507238604,841828,0 +23,1723550762304888188,7705964,0 +24,1723550935902171404,7705090,6 diff --git a/2024-08-13-14-19-07-pr-3713-block-times.csv b/2024-08-13-14-19-07-pr-3713-block-times.csv new file mode 100644 index 0000000000..df941b141a --- /dev/null +++ b/2024-08-13-14-19-07-pr-3713-block-times.csv @@ -0,0 +1,40 @@ +height,block time,block size,last commit round +1,1723551177693292000,0,0 +2,1723551213529064666,0,0 +3,1723551215152025564,0,0 +4,1723551217265613072,0,0 +5,1723551220110378657,0,0 +6,1723551222269330096,0,0 +7,1723551224380669514,0,0 +8,1723551226349516608,0,0 +9,1723551228584983837,0,0 +10,1723551230748120616,0,0 +11,1723551232707176707,0,0 +12,1723551234805371603,0,0 +13,1723551236813058741,18534,0 +14,1723551238816627236,0,0 +15,1723551240804498299,18534,0 +16,1723551242822209601,0,0 +17,1723551244987855633,97134,0 +18,1723551247053207084,259024,0 +19,1723551248967314837,388536,0 +20,1723551251131452012,777072,0 +21,1723551253545428568,647560,0 +22,1723551255805696576,582804,0 +23,1723551258224833841,777072,0 +24,1723551260539347882,809450,0 +25,1723551264000641121,906584,0 +26,1723551266318548055,0,0 +27,1723551268212533741,1165608,0 +28,1723551271029131025,809450,0 +29,1723551273243650235,808470,0 +30,1723551275394642403,969660,0 +31,1723551278167752039,1712324,0 +32,1723551282689904412,7712598,0 +33,1723551320792315086,96924,4 +34,1723551325885131260,7699594,0 +35,1723551420755915730,7697564,8 +36,1723551423739473971,4303614,0 +37,1723551425996034801,2100020,0 +38,1723551428300700559,2649256,0 +39,1723551431615553183,3327724,0 diff --git a/go.mod b/go.mod index b4acf6b0ed..a9e0e37b85 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.20240813114927-567a281a98dc + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813125145-dcea04c5cf69 ) diff --git a/go.sum b/go.sum index 62e956f096..ea908cc71f 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.20240813114927-567a281a98dc h1:X2R6/wL3Jza7PyaBMj7sywXcCi0/HhRAPF2Lxbd99Lw= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813114927-567a281a98dc/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813125145-dcea04c5cf69 h1:yK+3zSN/x2WmMY5Kk6tINZAPpVYXOzPq7VfbtW59unA= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813125145-dcea04c5cf69/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index cd2163db30..32765c4d36 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -11,9 +11,11 @@ import ( "github.com/celestiaorg/celestia-app/v3/app" "github.com/celestiaorg/celestia-app/v3/app/encoding" "github.com/celestiaorg/celestia-app/v3/test/e2e/testnet" - blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/celestiaorg/celestia-app/v3/test/util/genesis" + blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint/pkg/trace" + "github.com/tendermint/tendermint/pkg/trace/schema" "github.com/tendermint/tendermint/rpc/client/http" ) @@ -85,7 +87,8 @@ func Run() error { testnet.WithMempool("v2"), func(cfg *config.Config) { // create a partially connected network by only dialing 5 peers - cfg.P2P.MaxNumOutboundPeers = 4 + cfg.P2P.MaxNumOutboundPeers = 3 + cfg.P2P.MaxNumInboundPeers = 4 cfg.Mempool.TTLNumBlocks = 100 cfg.Mempool.TTLDuration = 10 * time.Minute cfg.Mempool.MaxTxsBytes *= 4 @@ -95,6 +98,29 @@ func Run() error { return err } + pushConfig, err := trace.GetPushConfigFromEnv() + if err != nil { + return err + } + log.Print("Setting up trace push config") + for _, node := range network.Nodes() { + if err = node.Instance.SetEnvironmentVariable(trace.PushBucketName, pushConfig.BucketName); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_BUCKET_NAME: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushRegion, pushConfig.Region); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_REGION: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushAccessKey, pushConfig.AccessKey); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_ACCESS_KEY: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushKey, pushConfig.SecretKey); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_SECRET_KEY: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushDelay, fmt.Sprintf("%d", pushConfig.PushDelay)); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_DELAY: %v", err) + } + } + log.Printf("Starting network\n") err = network.StartNodes() if err != nil { @@ -142,6 +168,11 @@ func Run() error { log.Printf("Error saving block times: %v", err) } log.Printf("Throughput: %v", throughput) + err = trace.S3Download("./traces/", "compact-blocks", + pushConfig, schema.RoundStateTable, schema.BlockTable, schema.ProposalTable, schema.CompactBlockTable) + if err != nil { + return fmt.Errorf("failed to download traces from S3: %w", err) + } log.Println("--- FINISHED ✅: Compact Blocks") return nil } From 6c85542c788b0eeb67d1c0eaf313fb0995fb4427 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 14 Aug 2024 12:55:16 +0200 Subject: [PATCH 25/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index a9e0e37b85..ee23191ea0 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.20240813125145-dcea04c5cf69 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814104547-33004a3541d0 ) diff --git a/go.sum b/go.sum index ea908cc71f..12f54bb0e2 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.20240813125145-dcea04c5cf69 h1:yK+3zSN/x2WmMY5Kk6tINZAPpVYXOzPq7VfbtW59unA= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240813125145-dcea04c5cf69/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814104547-33004a3541d0 h1:7cZ43y/LtwaW+sCGDOhYBovjpv3/H6Aid7z5A5CJzuw= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814104547-33004a3541d0/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 32765c4d36..d2303cf4ee 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -57,11 +57,11 @@ func Run() error { return err } - for _, node := range network.Nodes() { - if err := node.Instance.EnableBitTwister(); err != nil { - return fmt.Errorf("failed to enable bit twister: %v", err) - } - } + // for _, node := range network.Nodes() { + // if err := node.Instance.EnableBitTwister(); err != nil { + // return fmt.Errorf("failed to enable bit twister: %v", err) + // } + // } gRPCEndpoints, err := network.RemoteGRPCEndpoints() if err != nil { @@ -127,11 +127,11 @@ func Run() error { return err } - for _, node := range network.Nodes() { - if err = node.Instance.SetLatencyAndJitter(100, 10); err != nil { - return fmt.Errorf("failed to set latency and jitter: %v", err) - } - } + // for _, node := range network.Nodes() { + // if err = node.Instance.SetLatencyAndJitter(100, 10); err != nil { + // return fmt.Errorf("failed to set latency and jitter: %v", err) + // } + // } if err := network.WaitToSync(); err != nil { return err From 17c3665e5900af081a8a1cf344fe69c677cbb118 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 14 Aug 2024 14:55:22 +0200 Subject: [PATCH 26/56] checkpoint --- 2024-08-14-14-18-22-pr-3713-block-times.csv | 45 +++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 10 ++--- 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 2024-08-14-14-18-22-pr-3713-block-times.csv diff --git a/2024-08-14-14-18-22-pr-3713-block-times.csv b/2024-08-14-14-18-22-pr-3713-block-times.csv new file mode 100644 index 0000000000..48ee508149 --- /dev/null +++ b/2024-08-14-14-18-22-pr-3713-block-times.csv @@ -0,0 +1,45 @@ +height,block time,block size,last commit round +1,1723637515803241000,0,0 +2,1723637555169881851,0,0 +3,1723637556991064306,0,0 +4,1723637558598341777,0,0 +5,1723637560105127626,0,0 +6,1723637561830069536,0,0 +7,1723637563352403596,0,0 +8,1723637564868159777,0,0 +9,1723637566395991335,0,0 +10,1723637567910947891,0,0 +11,1723637569447296689,0,0 +12,1723637571082926696,0,0 +13,1723637572763292852,0,0 +14,1723637574290113283,0,0 +15,1723637575813918560,0,0 +16,1723637577327335176,0,0 +17,1723637578728745616,0,0 +18,1723637580054721613,0,0 +19,1723637581548503218,15473,0 +20,1723637583203887781,0,0 +21,1723637584726056358,0,0 +22,1723637586131434896,0,0 +23,1723637587553142879,15473,0 +24,1723637589031248514,2961434,0 +25,1723637591015587885,3476466,0 +26,1723637592888207045,0,0 +27,1723637594317635520,5358930,0 +28,1723637596551951998,1109916,0 +29,1723637598174271479,0,0 +30,1723637599477938490,980038,0 +31,1723637601251622672,7655151,0 +32,1723637603194274900,7661101,0 +33,1723637605636777515,5020442,0 +34,1723637607536794282,7656831,0 +35,1723637609835579706,7654661,0 +36,1723637612145546889,7652771,0 +37,1723637614320430168,3536995,0 +38,1723637616219786438,3086832,0 +39,1723637618280166336,7652771,0 +40,1723637620250314063,7652771,0 +41,1723637635137644235,7652771,2 +42,1723637643098336052,7652771,1 +43,1723637645511643135,4437321,0 +44,1723637647827831365,4437321,0 diff --git a/go.mod b/go.mod index 6deb761b87..a93f0e5dd2 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.20240814104547-33004a3541d0 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814125354-1bb12bf45b6c ) diff --git a/go.sum b/go.sum index 096bf36cbb..91093f22c6 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.20240814104547-33004a3541d0 h1:7cZ43y/LtwaW+sCGDOhYBovjpv3/H6Aid7z5A5CJzuw= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814104547-33004a3541d0/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814125354-1bb12bf45b6c h1:ih2R7mzJxzQsf8iZSyWY84Mwm09dGYQS4AsH524fmN0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814125354-1bb12bf45b6c/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index d2303cf4ee..a5a363aefc 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -20,7 +20,7 @@ import ( ) const ( - compactBlocksVersion = "pr-3713" + compactBlocksVersion = "dec69e4" ) func main() { @@ -49,7 +49,7 @@ func Run() error { defer network.Cleanup() cparams := app.DefaultConsensusParams() - cparams.Block.MaxBytes = 8 * 1024 * 1024 + cparams.Block.MaxBytes = 4 * 1024 * 1024 // 4MB network.SetConsensusParams(cparams) err = network.CreateGenesisNodes(nodes, version, 10000000, 0, testnet.DefaultResources) @@ -70,11 +70,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 120, - "32000-32000", + 80, + "64000-64000", 1, testnet.DefaultResources, - gRPCEndpoints[:5], + gRPCEndpoints[:4], ) if err != nil { return err From 7e9dcd4a900744b43331457e00e3d6efc82accbb Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 14 Aug 2024 15:24:55 +0200 Subject: [PATCH 27/56] fix msg gatekeeper --- app/ante/msg_gatekeeper.go | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/ante/msg_gatekeeper.go b/app/ante/msg_gatekeeper.go index 93791af9b6..936042b244 100644 --- a/app/ante/msg_gatekeeper.go +++ b/app/ante/msg_gatekeeper.go @@ -29,7 +29,7 @@ func NewMsgVersioningGateKeeper(acceptedList map[uint64]map[string]struct{}) *Ms // AnteHandle implements the ante.Decorator interface func (mgk MsgVersioningGateKeeper) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { - acceptedMsgs, exists := mgk.acceptedMsgs[ctx.ConsensusParams().Version.AppVersion] + acceptedMsgs, exists := mgk.acceptedMsgs[ctx.BlockHeader().Version.App] if !exists { return ctx, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", ctx.ConsensusParams().Version.AppVersion) } @@ -66,7 +66,7 @@ func (mgk MsgVersioningGateKeeper) hasInvalidMsg(ctx sdk.Context, acceptedMsgs m func (mgk MsgVersioningGateKeeper) IsAllowed(ctx context.Context, msgName string) (bool, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - appVersion := sdkCtx.ConsensusParams().Version.AppVersion + appVersion := sdkCtx.BlockHeader().Version.App acceptedMsgs, exists := mgk.acceptedMsgs[appVersion] if !exists { return false, sdkerrors.ErrNotSupported.Wrapf("circuit breaker: app version %d is not supported", appVersion) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index a5a363aefc..53a35389af 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -20,7 +20,7 @@ import ( ) const ( - compactBlocksVersion = "dec69e4" + compactBlocksVersion = "pr-3713" ) func main() { From f4a6dbbc7d058007167a8539de5f2c3bd057e83e Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 14 Aug 2024 15:58:22 +0200 Subject: [PATCH 28/56] checkpoint --- 2024-08-14-15-41-10-pr-3713-block-times.csv | 46 +++++++++++++++++++++ app/ante/msg_gatekeeper.go | 2 +- test/e2e/experiment/compact_blocks/main.go | 2 +- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 2024-08-14-15-41-10-pr-3713-block-times.csv diff --git a/2024-08-14-15-41-10-pr-3713-block-times.csv b/2024-08-14-15-41-10-pr-3713-block-times.csv new file mode 100644 index 0000000000..0f393cf6f4 --- /dev/null +++ b/2024-08-14-15-41-10-pr-3713-block-times.csv @@ -0,0 +1,46 @@ +height,block time,block size,last commit round +1,1723642499097052000,0,0 +2,1723642533346564988,0,0 +3,1723642535059180205,0,0 +4,1723642536871626460,0,0 +5,1723642538896515298,0,0 +6,1723642540506412124,0,0 +7,1723642542124044939,0,0 +8,1723642543811640750,0,0 +9,1723642545437087177,0,0 +10,1723642546968569079,0,0 +11,1723642548452401324,0,0 +12,1723642549959572948,0,0 +13,1723642551527103846,0,0 +14,1723642553117739702,0,0 +15,1723642554631093655,0,0 +16,1723642556139278013,0,0 +17,1723642557704452973,12413,0 +18,1723642559182224192,0,0 +19,1723642560587419260,0,0 +20,1723642561972318845,0,0 +21,1723642563339252858,2136920,0 +22,1723642565279881585,3025813,0 +23,1723642567261016975,0,0 +24,1723642568654748867,12413,0 +25,1723642570115004301,3617637,0 +26,1723642572085936982,1545096,0 +27,1723642573733637308,0,0 +28,1723642575128527678,1673644,0 +29,1723642576775610736,4130289,0 +30,1723642578690393568,4182885,0 +31,1723642580647844201,4183305,0 +32,1723642583065657457,4181485,0 +33,1723642584969341176,4181485,0 +34,1723642586882689883,4184285,0 +35,1723642588888056024,4180085,0 +36,1723642590859468438,4180085,0 +37,1723642592778694002,4180085,0 +38,1723642600010371076,4180085,1 +39,1723642601916790080,4180085,0 +40,1723642604126467384,4180085,0 +41,1723642606192167458,4180085,0 +42,1723642608045710438,3472686,0 +43,1723642610130548027,4180085,0 +44,1723642617696968630,4180085,1 +45,1723642656290130201,4128119,3 diff --git a/app/ante/msg_gatekeeper.go b/app/ante/msg_gatekeeper.go index 936042b244..f9ebd49c42 100644 --- a/app/ante/msg_gatekeeper.go +++ b/app/ante/msg_gatekeeper.go @@ -31,7 +31,7 @@ func NewMsgVersioningGateKeeper(acceptedList map[uint64]map[string]struct{}) *Ms func (mgk MsgVersioningGateKeeper) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { acceptedMsgs, exists := mgk.acceptedMsgs[ctx.BlockHeader().Version.App] if !exists { - return ctx, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", ctx.ConsensusParams().Version.AppVersion) + return ctx, sdkerrors.ErrNotSupported.Wrapf("app version %d is not supported", ctx.BlockHeader().Version.App) } if err := mgk.hasInvalidMsg(ctx, acceptedMsgs, tx.GetMsgs()); err != nil { diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 53a35389af..8572ca688c 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -20,7 +20,7 @@ import ( ) const ( - compactBlocksVersion = "pr-3713" + compactBlocksVersion = "3f358b3" ) func main() { From a16169173fc41921050fa44ede7d61fde412e71a Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 14 Aug 2024 18:05:42 +0200 Subject: [PATCH 29/56] checkpoint --- go.mod | 3 ++- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 14 +++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index a93f0e5dd2..61e77cc432 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,6 @@ 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.20240814125354-1bb12bf45b6c + //v1.39.0-tm-v0.34.29 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70 ) diff --git a/go.sum b/go.sum index 91093f22c6..0e92d7762d 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.20240814125354-1bb12bf45b6c h1:ih2R7mzJxzQsf8iZSyWY84Mwm09dGYQS4AsH524fmN0= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240814125354-1bb12bf45b6c/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70 h1:Z6DirPLysmaYGvsNj8f0CCssythU1wLmCS5hrfM81SU= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 8572ca688c..540cadb40d 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -15,12 +15,12 @@ import ( blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/pkg/trace" - "github.com/tendermint/tendermint/pkg/trace/schema" + // "github.com/tendermint/tendermint/pkg/trace/schema" "github.com/tendermint/tendermint/rpc/client/http" ) const ( - compactBlocksVersion = "3f358b3" + compactBlocksVersion = "ff4e8a3" ) func main() { @@ -168,11 +168,11 @@ func Run() error { log.Printf("Error saving block times: %v", err) } log.Printf("Throughput: %v", throughput) - err = trace.S3Download("./traces/", "compact-blocks", - pushConfig, schema.RoundStateTable, schema.BlockTable, schema.ProposalTable, schema.CompactBlockTable) - if err != nil { - return fmt.Errorf("failed to download traces from S3: %w", err) - } + // err = trace.S3Download("./traces/", "compact-blocks", + // pushConfig, schema.RoundStateTable, schema.BlockTable, schema.ProposalTable, schema.CompactBlockTable) + // if err != nil { + // return fmt.Errorf("failed to download traces from S3: %w", err) + // } log.Println("--- FINISHED ✅: Compact Blocks") return nil } From d57d1aff95aed19369851c0b4b65f8f4ff37e066 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 15 Aug 2024 11:50:59 +0200 Subject: [PATCH 30/56] checkpoint --- 2024-08-15-10-58-51-dec69e4-block-times.csv | 41 ++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- pkg/user/tx_client.go | 2 - test/e2e/experiment/compact_blocks/main.go | 48 ++++++++++----------- 5 files changed, 68 insertions(+), 29 deletions(-) create mode 100644 2024-08-15-10-58-51-dec69e4-block-times.csv diff --git a/2024-08-15-10-58-51-dec69e4-block-times.csv b/2024-08-15-10-58-51-dec69e4-block-times.csv new file mode 100644 index 0000000000..001f5cce4e --- /dev/null +++ b/2024-08-15-10-58-51-dec69e4-block-times.csv @@ -0,0 +1,41 @@ +height,block time,block size,last commit round +1,1723711951383617000,0,0 +2,1723711991781201065,0,1 +3,1723711993651619606,0,0 +4,1723711995213604781,0,0 +5,1723711996981083329,0,0 +6,1723711998565821314,0,0 +7,1723712000067829211,0,0 +8,1723712001577090829,0,0 +9,1723712003201428039,0,0 +10,1723712004766992316,0,0 +11,1723712006232758701,0,0 +12,1723712007759046698,0,0 +13,1723712009293229211,0,0 +14,1723712010828560384,0,0 +15,1723712012346145619,0,0 +16,1723712013851748523,12413,0 +17,1723712015281854461,0,0 +18,1723712016690073036,321895,0 +19,1723712018230558876,1995749,0 +20,1723712020854541089,2832676,0 +21,1723712023516272602,1556405,0 +22,1723712025469561788,2573320,0 +23,1723712027648439820,3487683,0 +24,1723712030414566632,4130921,0 +25,1723712034210859976,4183117,0 +26,1723712117309893736,4182969,3 +27,1723712240112219519,4183289,4 +28,1723712281880188315,4184285,3 +29,1723712287704878701,4181619,0 +30,1723712291946723880,4180997,0 +31,1723712295722453113,4181731,0 +32,1723712300018669991,4181261,0 +33,1723712302731152401,4181189,0 +34,1723712305888971907,4181309,0 +35,1723712308972714682,4181141,0 +36,1723712312171788834,4180901,0 +37,1723712315477966418,4181501,0 +38,1723712319219642733,4181381,0 +39,1723712323284335926,4181069,0 +40,1723712326730901038,4180613,0 diff --git a/go.mod b/go.mod index 61e77cc432..1cf8257201 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240815094657-b1086d24c175 ) diff --git a/go.sum b/go.sum index 0e92d7762d..26ef9ec13e 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.20240809145358-dfa438254e70 h1:Z6DirPLysmaYGvsNj8f0CCssythU1wLmCS5hrfM81SU= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240809145358-dfa438254e70/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240815094657-b1086d24c175 h1:DMXNTEOj0QtynhqWX/MK8eJtDNIa0eN1Dw3jFsyHbOI= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240815094657-b1086d24c175/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= diff --git a/pkg/user/tx_client.go b/pkg/user/tx_client.go index f9adcbec8e..0d14128421 100644 --- a/pkg/user/tx_client.go +++ b/pkg/user/tx_client.go @@ -328,12 +328,10 @@ func (client *TxClient) broadcastTx(ctx context.Context, txBytes []byte, signer }, ) if err != nil { - fmt.Println("error broadcasting tx", err) return nil, err } if resp.TxResponse.Code != abci.CodeTypeOK { if apperrors.IsNonceMismatchCode(resp.TxResponse.Code) { - fmt.Println("retrying to broadcast tx", signer) // query the account to update the sequence number on-chain for the account _, seqNum, err := QueryAccount(ctx, client.grpc, client.registry, client.signer.accounts[signer].address) if err != nil { diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 540cadb40d..bc6ebfdca3 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -14,13 +14,13 @@ import ( "github.com/celestiaorg/celestia-app/v3/test/util/genesis" blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/pkg/trace" + // "github.com/tendermint/tendermint/pkg/trace" // "github.com/tendermint/tendermint/pkg/trace/schema" "github.com/tendermint/tendermint/rpc/client/http" ) const ( - compactBlocksVersion = "ff4e8a3" + compactBlocksVersion = "9e64be9" ) func main() { @@ -98,28 +98,28 @@ func Run() error { return err } - pushConfig, err := trace.GetPushConfigFromEnv() - if err != nil { - return err - } - log.Print("Setting up trace push config") - for _, node := range network.Nodes() { - if err = node.Instance.SetEnvironmentVariable(trace.PushBucketName, pushConfig.BucketName); err != nil { - return fmt.Errorf("failed to set TRACE_PUSH_BUCKET_NAME: %v", err) - } - if err = node.Instance.SetEnvironmentVariable(trace.PushRegion, pushConfig.Region); err != nil { - return fmt.Errorf("failed to set TRACE_PUSH_REGION: %v", err) - } - if err = node.Instance.SetEnvironmentVariable(trace.PushAccessKey, pushConfig.AccessKey); err != nil { - return fmt.Errorf("failed to set TRACE_PUSH_ACCESS_KEY: %v", err) - } - if err = node.Instance.SetEnvironmentVariable(trace.PushKey, pushConfig.SecretKey); err != nil { - return fmt.Errorf("failed to set TRACE_PUSH_SECRET_KEY: %v", err) - } - if err = node.Instance.SetEnvironmentVariable(trace.PushDelay, fmt.Sprintf("%d", pushConfig.PushDelay)); err != nil { - return fmt.Errorf("failed to set TRACE_PUSH_DELAY: %v", err) - } - } + // pushConfig, err := trace.GetPushConfigFromEnv() + // if err != nil { + // return err + // } + // log.Print("Setting up trace push config") + // for _, node := range network.Nodes() { + // if err = node.Instance.SetEnvironmentVariable(trace.PushBucketName, pushConfig.BucketName); err != nil { + // return fmt.Errorf("failed to set TRACE_PUSH_BUCKET_NAME: %v", err) + // } + // if err = node.Instance.SetEnvironmentVariable(trace.PushRegion, pushConfig.Region); err != nil { + // return fmt.Errorf("failed to set TRACE_PUSH_REGION: %v", err) + // } + // if err = node.Instance.SetEnvironmentVariable(trace.PushAccessKey, pushConfig.AccessKey); err != nil { + // return fmt.Errorf("failed to set TRACE_PUSH_ACCESS_KEY: %v", err) + // } + // if err = node.Instance.SetEnvironmentVariable(trace.PushKey, pushConfig.SecretKey); err != nil { + // return fmt.Errorf("failed to set TRACE_PUSH_SECRET_KEY: %v", err) + // } + // if err = node.Instance.SetEnvironmentVariable(trace.PushDelay, fmt.Sprintf("%d", pushConfig.PushDelay)); err != nil { + // return fmt.Errorf("failed to set TRACE_PUSH_DELAY: %v", err) + // } + // } log.Printf("Starting network\n") err = network.StartNodes() From 87d3e219aeab47224367402a5907c0e4c427518d Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 16 Aug 2024 15:07:39 +0200 Subject: [PATCH 31/56] checkpoint --- 2024-08-15-16-05-17-1d1ed35-block-times.csv | 90 +++++++++++++++ 2024-08-16-14-59-51-1d1ed35-block-times.csv | 119 ++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 6 +- test/util/testnode/config.go | 2 +- 6 files changed, 216 insertions(+), 7 deletions(-) create mode 100644 2024-08-15-16-05-17-1d1ed35-block-times.csv create mode 100644 2024-08-16-14-59-51-1d1ed35-block-times.csv diff --git a/2024-08-15-16-05-17-1d1ed35-block-times.csv b/2024-08-15-16-05-17-1d1ed35-block-times.csv new file mode 100644 index 0000000000..4c8244aed8 --- /dev/null +++ b/2024-08-15-16-05-17-1d1ed35-block-times.csv @@ -0,0 +1,90 @@ +height,block time,block size,last commit round +1,1723730327388612000,0,0 +2,1723730365267572608,0,0 +3,1723730366878622609,0,0 +4,1723730368540337632,0,0 +5,1723730370167155625,0,0 +6,1723730371804696949,0,0 +7,1723730373429194583,0,0 +8,1723730380452549474,0,1 +9,1723730381952463639,0,0 +10,1723730383445813431,0,0 +11,1723730385021374643,0,0 +12,1723730386623409644,0,0 +13,1723730388234195675,0,0 +14,1723730389699840065,0,0 +15,1723730391331378433,0,0 +16,1723730392908893426,0,0 +17,1723730394340232307,0,0 +18,1723730395936853607,0,0 +19,1723730397472639671,0,0 +20,1723730398996561459,0,0 +21,1723730400513700867,0,0 +22,1723730402024609634,0,0 +23,1723730403433760365,12413,0 +24,1723730405056916592,0,0 +25,1723730406457884082,0,0 +26,1723730407982711558,0,0 +27,1723730409464618260,1493130,0 +28,1723730411211670526,3669603,0 +29,1723730413364832342,643330,0 +30,1723730415033891073,1106856,0 +31,1723730416642357338,4131749,0 +32,1723730418791409670,4182519,0 +33,1723730420818943071,1157994,0 +34,1723730422606794698,4182473,0 +35,1723730424711925200,4183255,0 +36,1723730426573472237,4183807,0 +37,1723730428627669465,4184221,0 +38,1723730430746383709,4181589,0 +39,1723730432757037028,4181309,0 +40,1723730434913759885,4181477,0 +41,1723730442346205678,4181117,1 +42,1723730444492327318,4180757,0 +43,1723730446557180602,4180277,0 +44,1723730448477219817,4180685,0 +45,1723730450406786874,4180757,0 +46,1723730452671027251,4180877,0 +47,1723730454619905573,4180517,0 +48,1723730456672102728,4180493,0 +49,1723730464278581439,4180973,1 +50,1723730466248376159,4181285,0 +51,1723730468424375235,4180925,0 +52,1723730475894524034,4180949,1 +53,1723730477846434272,4180541,0 +54,1723730480146521769,4180469,0 +55,1723730482270813132,4180277,0 +56,1723730484432286197,4180997,0 +57,1723730627795114490,4181093,12 +58,1723730629627518306,4180421,0 +59,1723730631577394444,4180229,0 +60,1723730638715725065,4180757,1 +61,1723730640650380286,4180829,0 +62,1723730642997060161,4180373,0 +63,1723730644994973560,4180445,0 +64,1723730647072003939,4181261,0 +65,1723730648931678621,4180613,0 +66,1723730650897583234,4180685,0 +67,1723730652828626926,4180661,0 +68,1723730660091845329,4181357,1 +69,1723730661880939364,4181429,0 +70,1723730664047936072,4180925,0 +71,1723730665927297705,4180973,0 +72,1723730668111448793,4181189,0 +73,1723730669889038901,4180829,0 +74,1723730671912352895,4180517,0 +75,1723730673752947994,4181021,0 +76,1723730681008773239,4180709,1 +77,1723730682844699830,4180853,0 +78,1723730685347275174,4180829,0 +79,1723730687642015491,4181021,0 +80,1723730690209223088,4181237,0 +81,1723730692181389432,4180541,0 +82,1723730694040707826,4181021,0 +83,1723730696027819217,4180661,0 +84,1723730703344426302,4180637,1 +85,1723730705327681608,4180853,0 +86,1723730707552547147,4180949,0 +87,1723730709492581360,4181141,0 +88,1723730711723366201,4181189,0 +89,1723730714065656591,4181333,0 diff --git a/2024-08-16-14-59-51-1d1ed35-block-times.csv b/2024-08-16-14-59-51-1d1ed35-block-times.csv new file mode 100644 index 0000000000..5ef595bc2f --- /dev/null +++ b/2024-08-16-14-59-51-1d1ed35-block-times.csv @@ -0,0 +1,119 @@ +height,block time,block size,last commit round +1,1723812822563044000,0,0 +2,1723812855031609293,0,0 +3,1723812856587227359,0,0 +4,1723812858237319451,0,0 +5,1723812859667005798,0,0 +6,1723812861308657320,0,0 +7,1723812862931023912,0,0 +8,1723812864544105703,0,0 +9,1723812866176035566,0,0 +10,1723812867945837705,0,0 +11,1723812869555855302,0,0 +12,1723812871376141720,0,0 +13,1723812872916954928,6292,0 +14,1723812874437631350,0,0 +15,1723812875966306354,0,0 +16,1723812877486789233,0,0 +17,1723812879001852848,2130799,0 +18,1723812881162091881,450653,0 +19,1723812882763446462,0,0 +20,1723812884216221248,6292,0 +21,1723812885685041376,5148480,0 +22,1723812888152789783,0,0 +23,1723812889643326573,0,0 +24,1723812891121810120,6248433,0 +25,1723812893375946969,1479659,0 +26,1723812895084601231,0,0 +27,1723812896535928409,2894985,0 +28,1723812898456450922,6241473,0 +29,1723812900552183372,1157702,0 +30,1723812902304945719,1415302,0 +31,1723812903945729276,6238957,0 +32,1723812905995993541,3022955,0 +33,1723812907982453004,1028944,0 +34,1723812909562909691,6238909,0 +35,1723812911539060330,1414822,0 +36,1723812913302651095,2637653,0 +37,1723812915165961791,5274274,0 +38,1723812917158483218,1414966,0 +39,1723812918782124364,3601640,0 +40,1723812920721670351,2058344,0 +41,1723812922723702391,4630248,0 +42,1723812924593551864,3601304,0 +43,1723812926447942131,385854,0 +44,1723812927929918438,6238909,0 +45,1723812930101594466,1414966,0 +46,1723812931751733426,2637653,0 +47,1723812933573545951,6239341,0 +48,1723812935545356299,1350969,0 +49,1723812937317106402,2701554,0 +50,1723812939207227571,3923977,0 +51,1723812941008380626,3151693,0 +52,1723812942882880026,3408521,0 +53,1723812944711628699,1029040,0 +54,1723812946311254600,5853367,0 +55,1723812948300202566,1994083,0 +56,1723812950114118012,2380321,0 +57,1723812952174132355,6239581,0 +58,1723812954132413375,1672250,0 +59,1723812955793043558,2379769,0 +60,1723812957579717336,4630944,0 +61,1723812959509082974,2058032,0 +62,1723812961349575096,3602144,0 +63,1723812963217865948,2508435,0 +64,1723812964973163437,4181357,0 +65,1723812967239170738,4180685,0 +66,1723812968960255119,1286588,0 +67,1723812970572397280,4823583,0 +68,1723812972560985583,3280335,0 +69,1723812974440666847,1801156,0 +70,1723812976093768212,4696189,0 +71,1723812978074426568,2444630,0 +72,1723812980035824973,3152269,0 +73,1723812982031847982,4566587,0 +74,1723812983919487838,1093493,0 +75,1723812985433308189,4630680,0 +76,1723812987480141376,2315388,0 +77,1723812989440388439,3344476,0 +78,1723812991233733385,4759250,0 +79,1723812993072067264,836041,0 +80,1723812994690251243,4695205,0 +81,1723812997071693078,4437753,0 +82,1723812998937291320,1157754,0 +83,1723813000546610777,4759250,0 +84,1723813002591386527,2701554,0 +85,1723813004445410385,2830244,0 +86,1723813006296391190,4566947,0 +87,1723813008239939546,1350753,0 +88,1723813009846459395,4374212,0 +89,1723813011920796926,2637005,0 +90,1723813013727385537,2701482,0 +91,1723813015611035570,5338103,0 +92,1723813017545649744,1543608,0 +93,1723813019250618562,3408809,0 +94,1723813021171570521,4759226,0 +95,1723813023132426706,1350609,0 +96,1723813024701904607,4116256,0 +97,1723813026847941665,3022523,0 +98,1723813028622267392,3151477,0 +99,1723813030401657262,2765287,0 +100,1723813032140699033,2701002,0 +101,1723813033979849827,5016126,0 +102,1723813035990057686,2058032,0 +103,1723813037779893502,2765287,0 +104,1723813039604701106,3794351,0 +105,1723813041774306083,6238621,0 +106,1723813048951563843,1479203,1 +107,1723813050522233752,771876,0 +108,1723813052097779548,5209893,0 +109,1723813054129421651,1286588,0 +110,1723813055798014553,1221871,0 +111,1723813057487149841,3537619,0 +112,1723813059493889703,2829764,0 +113,1723813061658718781,6239653,0 +114,1723813068987878280,4052475,1 +115,1723813070957438245,0,0 +116,1723813072640621353,4180949,0 +117,1723813074628186990,3280455,0 +118,1723813076507680756,257284,0 diff --git a/go.mod b/go.mod index 1cf8257201..f9c4fd3249 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240815094657-b1086d24c175 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816130534-d46ad2d2f387 ) diff --git a/go.sum b/go.sum index 26ef9ec13e..86190a8855 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.20240815094657-b1086d24c175 h1:DMXNTEOj0QtynhqWX/MK8eJtDNIa0eN1Dw3jFsyHbOI= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240815094657-b1086d24c175/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816130534-d46ad2d2f387 h1:KWbipbTj+eLuuojq0Mh431nI2M4I1/3xdSbTE1JZY7Q= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816130534-d46ad2d2f387/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index bc6ebfdca3..122c949edc 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -20,7 +20,7 @@ import ( ) const ( - compactBlocksVersion = "9e64be9" + compactBlocksVersion = "1d1ed35" ) func main() { @@ -49,7 +49,7 @@ func Run() error { defer network.Cleanup() cparams := app.DefaultConsensusParams() - cparams.Block.MaxBytes = 4 * 1024 * 1024 // 4MB + cparams.Block.MaxBytes = 8 * 1024 * 1024 network.SetConsensusParams(cparams) err = network.CreateGenesisNodes(nodes, version, 10000000, 0, testnet.DefaultResources) @@ -70,7 +70,7 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 80, + 40, "64000-64000", 1, testnet.DefaultResources, diff --git a/test/util/testnode/config.go b/test/util/testnode/config.go index 947df61fa9..95d355a59f 100644 --- a/test/util/testnode/config.go +++ b/test/util/testnode/config.go @@ -133,7 +133,7 @@ func DefaultConfig() *Config { WithAppConfig(DefaultAppConfig()). WithAppOptions(DefaultAppOptions()). WithAppCreator(DefaultAppCreator()). - WithSuppressLogs(true) + WithSuppressLogs(false) } func DefaultConsensusParams() *tmproto.ConsensusParams { From 02b512f79f1cd60c7247afca2091885dd3695ab7 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 16 Aug 2024 17:40:44 +0200 Subject: [PATCH 32/56] checkpoint --- 2024-08-16-14-59-51-1d1ed35-block-times.csv | 119 -------------------- 2024-08-16-17-24-42-8e18957-block-times.csv | 27 +++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 41 +++---- test/e2e/testnet/defaults.go | 6 +- 6 files changed, 55 insertions(+), 144 deletions(-) delete mode 100644 2024-08-16-14-59-51-1d1ed35-block-times.csv create mode 100644 2024-08-16-17-24-42-8e18957-block-times.csv diff --git a/2024-08-16-14-59-51-1d1ed35-block-times.csv b/2024-08-16-14-59-51-1d1ed35-block-times.csv deleted file mode 100644 index 5ef595bc2f..0000000000 --- a/2024-08-16-14-59-51-1d1ed35-block-times.csv +++ /dev/null @@ -1,119 +0,0 @@ -height,block time,block size,last commit round -1,1723812822563044000,0,0 -2,1723812855031609293,0,0 -3,1723812856587227359,0,0 -4,1723812858237319451,0,0 -5,1723812859667005798,0,0 -6,1723812861308657320,0,0 -7,1723812862931023912,0,0 -8,1723812864544105703,0,0 -9,1723812866176035566,0,0 -10,1723812867945837705,0,0 -11,1723812869555855302,0,0 -12,1723812871376141720,0,0 -13,1723812872916954928,6292,0 -14,1723812874437631350,0,0 -15,1723812875966306354,0,0 -16,1723812877486789233,0,0 -17,1723812879001852848,2130799,0 -18,1723812881162091881,450653,0 -19,1723812882763446462,0,0 -20,1723812884216221248,6292,0 -21,1723812885685041376,5148480,0 -22,1723812888152789783,0,0 -23,1723812889643326573,0,0 -24,1723812891121810120,6248433,0 -25,1723812893375946969,1479659,0 -26,1723812895084601231,0,0 -27,1723812896535928409,2894985,0 -28,1723812898456450922,6241473,0 -29,1723812900552183372,1157702,0 -30,1723812902304945719,1415302,0 -31,1723812903945729276,6238957,0 -32,1723812905995993541,3022955,0 -33,1723812907982453004,1028944,0 -34,1723812909562909691,6238909,0 -35,1723812911539060330,1414822,0 -36,1723812913302651095,2637653,0 -37,1723812915165961791,5274274,0 -38,1723812917158483218,1414966,0 -39,1723812918782124364,3601640,0 -40,1723812920721670351,2058344,0 -41,1723812922723702391,4630248,0 -42,1723812924593551864,3601304,0 -43,1723812926447942131,385854,0 -44,1723812927929918438,6238909,0 -45,1723812930101594466,1414966,0 -46,1723812931751733426,2637653,0 -47,1723812933573545951,6239341,0 -48,1723812935545356299,1350969,0 -49,1723812937317106402,2701554,0 -50,1723812939207227571,3923977,0 -51,1723812941008380626,3151693,0 -52,1723812942882880026,3408521,0 -53,1723812944711628699,1029040,0 -54,1723812946311254600,5853367,0 -55,1723812948300202566,1994083,0 -56,1723812950114118012,2380321,0 -57,1723812952174132355,6239581,0 -58,1723812954132413375,1672250,0 -59,1723812955793043558,2379769,0 -60,1723812957579717336,4630944,0 -61,1723812959509082974,2058032,0 -62,1723812961349575096,3602144,0 -63,1723812963217865948,2508435,0 -64,1723812964973163437,4181357,0 -65,1723812967239170738,4180685,0 -66,1723812968960255119,1286588,0 -67,1723812970572397280,4823583,0 -68,1723812972560985583,3280335,0 -69,1723812974440666847,1801156,0 -70,1723812976093768212,4696189,0 -71,1723812978074426568,2444630,0 -72,1723812980035824973,3152269,0 -73,1723812982031847982,4566587,0 -74,1723812983919487838,1093493,0 -75,1723812985433308189,4630680,0 -76,1723812987480141376,2315388,0 -77,1723812989440388439,3344476,0 -78,1723812991233733385,4759250,0 -79,1723812993072067264,836041,0 -80,1723812994690251243,4695205,0 -81,1723812997071693078,4437753,0 -82,1723812998937291320,1157754,0 -83,1723813000546610777,4759250,0 -84,1723813002591386527,2701554,0 -85,1723813004445410385,2830244,0 -86,1723813006296391190,4566947,0 -87,1723813008239939546,1350753,0 -88,1723813009846459395,4374212,0 -89,1723813011920796926,2637005,0 -90,1723813013727385537,2701482,0 -91,1723813015611035570,5338103,0 -92,1723813017545649744,1543608,0 -93,1723813019250618562,3408809,0 -94,1723813021171570521,4759226,0 -95,1723813023132426706,1350609,0 -96,1723813024701904607,4116256,0 -97,1723813026847941665,3022523,0 -98,1723813028622267392,3151477,0 -99,1723813030401657262,2765287,0 -100,1723813032140699033,2701002,0 -101,1723813033979849827,5016126,0 -102,1723813035990057686,2058032,0 -103,1723813037779893502,2765287,0 -104,1723813039604701106,3794351,0 -105,1723813041774306083,6238621,0 -106,1723813048951563843,1479203,1 -107,1723813050522233752,771876,0 -108,1723813052097779548,5209893,0 -109,1723813054129421651,1286588,0 -110,1723813055798014553,1221871,0 -111,1723813057487149841,3537619,0 -112,1723813059493889703,2829764,0 -113,1723813061658718781,6239653,0 -114,1723813068987878280,4052475,1 -115,1723813070957438245,0,0 -116,1723813072640621353,4180949,0 -117,1723813074628186990,3280455,0 -118,1723813076507680756,257284,0 diff --git a/2024-08-16-17-24-42-8e18957-block-times.csv b/2024-08-16-17-24-42-8e18957-block-times.csv new file mode 100644 index 0000000000..1fe2edee3f --- /dev/null +++ b/2024-08-16-17-24-42-8e18957-block-times.csv @@ -0,0 +1,27 @@ +height,block time,block size,last commit round +1,1723821486513604000,0,0 +2,1723821531158398643,0,0 +3,1723821538709967642,0,1 +4,1723821540590299455,0,0 +5,1723821542322201278,0,0 +6,1723821544062648617,0,0 +7,1723821546204858902,0,0 +8,1723821548322398854,0,0 +9,1723821550306668195,0,0 +10,1723821552336070984,0,0 +11,1723821554204920755,0,0 +12,1723821556281375645,0,0 +13,1723821558261136320,0,0 +14,1723821560071683695,0,0 +15,1723821561962784787,9353,0 +16,1723821563968249116,0,0 +17,1723821565823896560,0,0 +18,1723821567680548300,0,0 +19,1723821569692373481,266869,0 +20,1723821571717653738,193137,0 +21,1723821573908395358,1811965,0 +22,1723821582548864381,662496,1 +23,1723821585039526785,772548,0 +24,1723821589408667185,7661101,0 +25,1723821628489073714,7659951,2 +26,1723821717301885072,7657007,2 diff --git a/go.mod b/go.mod index f9c4fd3249..9652198a82 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816130534-d46ad2d2f387 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816153931-5aefb63592d1 ) diff --git a/go.sum b/go.sum index 86190a8855..676882dfad 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.20240816130534-d46ad2d2f387 h1:KWbipbTj+eLuuojq0Mh431nI2M4I1/3xdSbTE1JZY7Q= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816130534-d46ad2d2f387/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816153931-5aefb63592d1 h1:Rqj2Wg5eMaiQMFjuK3ny5lqdpygz6o/XuXeY46PFsMk= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816153931-5aefb63592d1/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 122c949edc..8c5fc06f90 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -14,13 +14,14 @@ import ( "github.com/celestiaorg/celestia-app/v3/test/util/genesis" blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/tendermint/tendermint/config" + // "github.com/tendermint/tendermint/pkg/trace" // "github.com/tendermint/tendermint/pkg/trace/schema" "github.com/tendermint/tendermint/rpc/client/http" ) const ( - compactBlocksVersion = "1d1ed35" + compactBlocksVersion = "8e18957" //"a28b9e7" ) func main() { @@ -31,7 +32,7 @@ func main() { func Run() error { const ( - nodes = 8 + nodes = 20 timeoutCommit = time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion @@ -57,11 +58,11 @@ func Run() error { return err } - // for _, node := range network.Nodes() { - // if err := node.Instance.EnableBitTwister(); err != nil { - // return fmt.Errorf("failed to enable bit twister: %v", err) - // } - // } + for _, node := range network.Nodes() { + if err := node.Instance.EnableBitTwister(); err != nil { + return fmt.Errorf("failed to enable bit twister: %v", err) + } + } gRPCEndpoints, err := network.RemoteGRPCEndpoints() if err != nil { @@ -70,11 +71,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 40, + 60, "64000-64000", 1, testnet.DefaultResources, - gRPCEndpoints[:4], + gRPCEndpoints[:5], ) if err != nil { return err @@ -87,11 +88,11 @@ func Run() error { testnet.WithMempool("v2"), func(cfg *config.Config) { // create a partially connected network by only dialing 5 peers - cfg.P2P.MaxNumOutboundPeers = 3 - cfg.P2P.MaxNumInboundPeers = 4 + cfg.P2P.MaxNumOutboundPeers = 5 + cfg.P2P.MaxNumInboundPeers = 8 cfg.Mempool.TTLNumBlocks = 100 cfg.Mempool.TTLDuration = 10 * time.Minute - cfg.Mempool.MaxTxsBytes *= 4 + cfg.Mempool.MaxTxsBytes *= 5 }, ) if err != nil { @@ -127,11 +128,11 @@ func Run() error { return err } - // for _, node := range network.Nodes() { - // if err = node.Instance.SetLatencyAndJitter(100, 10); err != nil { - // return fmt.Errorf("failed to set latency and jitter: %v", err) - // } - // } + for _, node := range network.Nodes() { + if err = node.Instance.SetLatencyAndJitter(70, 10); err != nil { + return fmt.Errorf("failed to set latency and jitter: %v", err) + } + } if err := network.WaitToSync(); err != nil { return err @@ -205,6 +206,7 @@ func saveBlockTimes(testnet *testnet.Testnet) (float64, error) { totalBlockSize := 0 startTime := int64(0) + endTime := int64(0) status, err := clients[0].Status(context.Background()) if err != nil { return 0, err @@ -231,6 +233,7 @@ func saveBlockTimes(testnet *testnet.Testnet) (float64, error) { if startTime == 0 { startTime = resp.Block.Time.UnixNano() } + endTime = resp.Block.Time.UnixNano() } if resp.Block.LastCommit.Round > 0 { log.Printf("Block %d has a last commit round of %d", resp.Block.LastCommit.Height, resp.Block.LastCommit.Round) @@ -241,6 +244,6 @@ func saveBlockTimes(testnet *testnet.Testnet) (float64, error) { } } - duration := time.Since(time.Unix(0, startTime)) - return float64(totalBlockSize) / duration.Seconds(), nil + duration := (endTime - startTime) / 1e9 + return float64(totalBlockSize) / float64(duration), nil } diff --git a/test/e2e/testnet/defaults.go b/test/e2e/testnet/defaults.go index 03831c74e7..5f7209c5d8 100644 --- a/test/e2e/testnet/defaults.go +++ b/test/e2e/testnet/defaults.go @@ -1,9 +1,9 @@ package testnet var DefaultResources = Resources{ - MemoryRequest: "2Gi", - MemoryLimit: "2Gi", - CPU: "500m", + MemoryRequest: "3Gi", + MemoryLimit: "3Gi", + CPU: "1000m", Volume: "2Gi", } From d6729facee6d59a01fcc6ff22ebbeac21684f45d Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 20 Aug 2024 12:28:01 +0200 Subject: [PATCH 33/56] checkpoint --- 2024-08-16-17-24-42-8e18957-block-times.csv | 27 ------- 2024-08-16-17-53-01-bc218e8-block-times.csv | 85 +++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 10 +-- 5 files changed, 93 insertions(+), 35 deletions(-) delete mode 100644 2024-08-16-17-24-42-8e18957-block-times.csv create mode 100644 2024-08-16-17-53-01-bc218e8-block-times.csv diff --git a/2024-08-16-17-24-42-8e18957-block-times.csv b/2024-08-16-17-24-42-8e18957-block-times.csv deleted file mode 100644 index 1fe2edee3f..0000000000 --- a/2024-08-16-17-24-42-8e18957-block-times.csv +++ /dev/null @@ -1,27 +0,0 @@ -height,block time,block size,last commit round -1,1723821486513604000,0,0 -2,1723821531158398643,0,0 -3,1723821538709967642,0,1 -4,1723821540590299455,0,0 -5,1723821542322201278,0,0 -6,1723821544062648617,0,0 -7,1723821546204858902,0,0 -8,1723821548322398854,0,0 -9,1723821550306668195,0,0 -10,1723821552336070984,0,0 -11,1723821554204920755,0,0 -12,1723821556281375645,0,0 -13,1723821558261136320,0,0 -14,1723821560071683695,0,0 -15,1723821561962784787,9353,0 -16,1723821563968249116,0,0 -17,1723821565823896560,0,0 -18,1723821567680548300,0,0 -19,1723821569692373481,266869,0 -20,1723821571717653738,193137,0 -21,1723821573908395358,1811965,0 -22,1723821582548864381,662496,1 -23,1723821585039526785,772548,0 -24,1723821589408667185,7661101,0 -25,1723821628489073714,7659951,2 -26,1723821717301885072,7657007,2 diff --git a/2024-08-16-17-53-01-bc218e8-block-times.csv b/2024-08-16-17-53-01-bc218e8-block-times.csv new file mode 100644 index 0000000000..ac5a5c5595 --- /dev/null +++ b/2024-08-16-17-53-01-bc218e8-block-times.csv @@ -0,0 +1,85 @@ +height,block time,block size,last commit round +1,1723823201559211000,0,0 +2,1723823243648591828,0,1 +3,1723823245319385732,0,0 +4,1723823247449687544,0,0 +5,1723823249611401812,0,0 +6,1723823251795599827,0,0 +7,1723823254062193255,0,0 +8,1723823256132145996,0,0 +9,1723823258502408514,0,0 +10,1723823260377283818,0,0 +11,1723823262800886637,0,0 +12,1723823264666375879,0,0 +13,1723823266419417141,0,0 +14,1723823268390574421,6292,0 +15,1723823270168332087,0,0 +16,1723823271989869009,0,0 +17,1723823273940217644,521324,0 +18,1723823275820235045,901306,0 +19,1723823277804785397,643790,0 +20,1723823279917820519,1035988,0 +21,1723823281945315606,1557128,0 +22,1723823284026928013,1544498,0 +23,1723823286166805102,2703090,0 +24,1723823288689710501,3732648,0 +25,1723823292986849376,4118244,0 +26,1723823295742938563,965153,0 +27,1723823298627364356,2637839,0 +28,1723823301481839831,2380625,0 +29,1723823304061553167,3280451,0 +30,1723823312766335523,579089,1 +31,1723823314742929812,579043,0 +32,1723823316900327131,2122747,0 +33,1723823319211840725,1351013,0 +34,1723823321275697351,1157918,0 +35,1723823323293858530,7655195,0 +36,1723823340228953458,4953617,2 +37,1723823343731347837,3151645,0 +38,1723823346975496234,7654283,0 +39,1723823358621222183,2958934,1 +40,1723823361339366715,2572792,0 +41,1723823364722135842,5917244,0 +42,1723823374427100044,3537211,1 +43,1723823377844762984,3408977,0 +44,1723823381178872587,4180565,0 +45,1723823383788595623,257332,0 +46,1723823385686059416,192951,0 +47,1723823387672227126,7653779,0 +48,1723823397832645950,4695469,1 +49,1723823401434600470,3987806,0 +50,1723823404836203551,5788818,0 +51,1723823414591766178,128618,1 +52,1723823417341143917,3472998,0 +53,1723823420487688230,4052043,0 +54,1723823424085246636,7653995,0 +55,1723823433590103818,2894553,1 +56,1723823436331543730,2186890,0 +57,1723823439841159353,4888684,0 +58,1723823443952691390,2251199,0 +59,1723823446619129084,6368031,0 +60,1723823459378920946,4824183,1 +61,1723823462937850980,4695181,0 +62,1723823466543437072,5274154,0 +63,1723823469691522456,2701434,0 +64,1723823472918773287,2508483,0 +65,1723823476016885588,7654163,0 +66,1723823492921713573,7654643,2 +67,1723823501971661894,5145920,1 +68,1723823504499543160,2379865,0 +69,1723823507588198216,6946644,0 +70,1723823511021343617,4437993,0 +71,1723823514050989691,3730594,0 +72,1723823517056273525,7653875,0 +73,1723823527798312972,5145680,1 +74,1723823530688472720,3215834,0 +75,1723823533929774281,4309423,0 +76,1723823537378577673,2122821,0 +77,1723823540688663947,5017038,0 +78,1723823545472064869,7654043,0 +79,1723823554425925541,707495,1 +80,1723823556489554862,643186,0 +81,1723823558752600781,4116232,0 +82,1723823562044721569,1672250,0 +83,1723823564676487354,3215906,0 +84,1723823567888421446,3923401,0 diff --git a/go.mod b/go.mod index 9652198a82..0156c4046f 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816153931-5aefb63592d1 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240820102527-178f81a65c0f ) diff --git a/go.sum b/go.sum index 676882dfad..730b80375d 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.20240816153931-5aefb63592d1 h1:Rqj2Wg5eMaiQMFjuK3ny5lqdpygz6o/XuXeY46PFsMk= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240816153931-5aefb63592d1/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240820102527-178f81a65c0f h1:CTxiDW7f/avtlzVAFSYXlVSpG8AZ0yzt7WEfVxOOcz0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240820102527-178f81a65c0f/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 8c5fc06f90..3aa5f11fcf 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -21,7 +21,7 @@ import ( ) const ( - compactBlocksVersion = "8e18957" //"a28b9e7" + compactBlocksVersion = "bc218e8" //"a28b9e7" ) func main() { @@ -32,7 +32,7 @@ func main() { func Run() error { const ( - nodes = 20 + nodes = 12 timeoutCommit = time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion @@ -71,7 +71,7 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 60, + 40, "64000-64000", 1, testnet.DefaultResources, @@ -88,8 +88,8 @@ func Run() error { testnet.WithMempool("v2"), func(cfg *config.Config) { // create a partially connected network by only dialing 5 peers - cfg.P2P.MaxNumOutboundPeers = 5 - cfg.P2P.MaxNumInboundPeers = 8 + cfg.P2P.MaxNumOutboundPeers = 4 + cfg.P2P.MaxNumInboundPeers = 7 cfg.Mempool.TTLNumBlocks = 100 cfg.Mempool.TTLDuration = 10 * time.Minute cfg.Mempool.MaxTxsBytes *= 5 From 1c088cd6726ec56bdcc6619d1284ca8c2c6dbd79 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 20 Aug 2024 15:29:33 +0200 Subject: [PATCH 34/56] fix compile errors --- app/grpc/tx/server.go | 1 - pkg/user/tx_client.go | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/grpc/tx/server.go b/app/grpc/tx/server.go index 417b7c088b..93b3c9da36 100644 --- a/app/grpc/tx/server.go +++ b/app/grpc/tx/server.go @@ -76,7 +76,6 @@ func (s *txServer) TxStatus(ctx context.Context, req *TxStatusRequest) (*TxStatu Height: resTx.Height, Index: resTx.Index, ExecutionCode: resTx.ExecutionCode, - Error: resTx.Error, Status: resTx.Status, }, nil } diff --git a/pkg/user/tx_client.go b/pkg/user/tx_client.go index b2c5b750a3..f600e95aeb 100644 --- a/pkg/user/tx_client.go +++ b/pkg/user/tx_client.go @@ -31,7 +31,6 @@ import ( "github.com/celestiaorg/celestia-app/v3/pkg/appconsts" "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/celestiaorg/celestia-app/v3/x/minfee" - "github.com/tendermint/tendermint/rpc/core" ) const ( @@ -440,7 +439,7 @@ func (client *TxClient) ConfirmTx(ctx context.Context, txHash string) (*TxRespon if err == nil && resp != nil { switch resp.Status { - case core.TxStatusPending: + case "PENDING": // Continue polling if the transaction is still pending select { case <-ctx.Done(): @@ -448,7 +447,7 @@ func (client *TxClient) ConfirmTx(ctx context.Context, txHash string) (*TxRespon case <-pollTicker.C: continue } - case core.TxStatusCommitted: + case "COMMITTED": txResponse := &TxResponse{ Height: resp.Height, TxHash: txHash, @@ -458,7 +457,7 @@ func (client *TxClient) ConfirmTx(ctx context.Context, txHash string) (*TxRespon return txResponse, fmt.Errorf("tx was committed but failed with code %d: %s", resp.ExecutionCode, resp.Error) } return txResponse, nil - case core.TxStatusEvicted: + case "EVICTED": return &TxResponse{TxHash: txHash}, fmt.Errorf("tx: %s was evicted from the mempool", txHash) default: return &TxResponse{}, fmt.Errorf("unknown tx: %s", txHash) From 937d1005fc26c240dd9c09e169f1448b0189803a Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 22 Aug 2024 15:29:04 +0200 Subject: [PATCH 35/56] checkpoint --- 2024-08-21-10-41-43-db3d1a9-block-times.csv | 174 ++++++++++++++++++++ test/e2e/experiment/compact_blocks/main.go | 22 +-- 2 files changed, 185 insertions(+), 11 deletions(-) create mode 100644 2024-08-21-10-41-43-db3d1a9-block-times.csv diff --git a/2024-08-21-10-41-43-db3d1a9-block-times.csv b/2024-08-21-10-41-43-db3d1a9-block-times.csv new file mode 100644 index 0000000000..93b965cb75 --- /dev/null +++ b/2024-08-21-10-41-43-db3d1a9-block-times.csv @@ -0,0 +1,174 @@ +height,block time,block size,last commit round +1,1724229316337713000,0,0 +2,1724229370327470785,0,2 +3,1724229372064794764,0,0 +4,1724229373590103653,0,0 +5,1724229375201242440,0,0 +6,1724229376823948823,0,0 +7,1724229378476948319,0,0 +8,1724229380005854046,0,0 +9,1724229381541519928,0,0 +10,1724229383156575556,0,0 +11,1724229384679935775,0,0 +12,1724229386077712404,0,0 +13,1724229387483807063,0,0 +14,1724229389104331692,0,0 +15,1724229390626197715,6292,0 +16,1724229392139614847,0,0 +17,1724229393675089671,6292,0 +18,1724229395154786290,0,0 +19,1724229396618647936,2446402,0 +20,1724229398963487082,128758,0 +21,1724229400534767195,2388315,0 +22,1724229402467227029,1878379,0 +23,1724229404308944070,900662,0 +24,1724229405926156391,450331,0 +25,1724229407428648716,5213135,0 +26,1724229409542458183,7658961,0 +27,1724229411790590030,0,0 +28,1724229413231773762,4760642,0 +29,1724229415307629001,7654691,0 +30,1724229417399222466,450163,0 +31,1724229418978575976,4759826,0 +32,1724229421246223651,7654715,0 +33,1724229423802623218,450163,0 +34,1724229425360361299,5209029,0 +35,1724229427257811096,7589542,0 +36,1724229429314465308,0,0 +37,1724229430670839693,1736415,0 +38,1724229432267328321,6303002,0 +39,1724229434519568501,4951817,0 +40,1724229436418804853,1157922,0 +41,1724229438120940632,5789346,0 +42,1724229440038267781,6431884,0 +43,1724229442123112823,0,0 +44,1724229443560269391,4694557,0 +45,1724229445704868049,7653899,0 +46,1724229447892080526,321641,0 +47,1724229449398965399,3794855,0 +48,1724229451266915585,7653731,0 +49,1724229453365486850,1222327,0 +50,1724229455035730541,3602648,0 +51,1724229457031364172,7654691,0 +52,1724229459151396225,1415062,0 +53,1724229460810718653,1479443,0 +54,1724229462395913166,5339231,0 +55,1724229464466041335,6883223,0 +56,1724229466513987521,450163,0 +57,1724229467952669285,4437729,0 +58,1724229469929969194,7653179,0 +59,1724229472019948388,578949,0 +60,1724229473584860367,3151909,0 +61,1724229475473094757,7655411,0 +62,1724229477679287472,1865297,0 +63,1724229479387091328,1929582,0 +64,1724229481321690652,7652891,0 +65,1724229483517388120,3087384,0 +66,1724229485366629097,1929606,0 +67,1724229487363752586,7655603,0 +68,1724229489454936474,3023099,0 +69,1724229491350899538,2122605,0 +70,1724229493137942527,7653827,0 +71,1724229495212093120,3087840,0 +72,1724229497069614176,1608325,0 +73,1724229498731617306,5017518,0 +74,1724229500815080199,7589902,0 +75,1724229502966689679,0,0 +76,1724229504415576716,2959270,0 +77,1724229506534433532,7653731,0 +78,1724229508522182322,1993579,0 +79,1724229510314065351,2829596,0 +80,1724229512275833991,7652795,0 +81,1724229514598409855,2122197,0 +82,1724229516473158294,2958262,0 +83,1724229518226006142,7654235,0 +84,1724229520302770925,2058272,0 +85,1724229522249446984,2443742,0 +86,1724229524109449579,7654499,0 +87,1724229526395160973,2444606,0 +88,1724229528235449595,2251655,0 +89,1724229530210145852,7654307,0 +90,1724229532328730170,2637125,0 +91,1724229534312842719,2830652,0 +92,1724229536226858360,7653731,0 +93,1724229538486281750,2057888,0 +94,1724229540346004324,2829596,0 +95,1724229542144492044,7652771,0 +96,1724229544275990160,2057888,0 +97,1724229546216891259,1800652,0 +98,1724229547958402550,7652771,0 +99,1724229550132835390,3086832,0 +100,1724229551946164270,578781,0 +101,1724229553523750745,7652795,0 +102,1724229555609284861,4565987,0 +103,1724229557711964429,257236,0 +104,1724229559202829671,4180397,0 +105,1724229561319993296,7654235,0 +106,1724229563397785232,643090,0 +107,1724229564954441900,3536995,0 +108,1724229566946074633,7653515,0 +109,1724229569081851642,1286564,0 +110,1724229570677226628,2122989,0 +111,1724229572648190347,7655075,0 +112,1724229574754680428,2701482,0 +113,1724229576864914514,3537259,0 +114,1724229578852239199,7654907,0 +115,1724229581006099146,1286612,0 +116,1724229582725344178,2122989,0 +117,1724229584801956342,7654211,0 +118,1724229586921256844,2701626,0 +119,1724229588822684481,2508987,0 +120,1724229590777726064,7655027,0 +121,1724229593314683111,2315460,0 +122,1724229595262164749,4373012,0 +123,1724229597469535713,7074854,0 +124,1724229599541236272,964803,0 +125,1724229601294217908,4309927,0 +126,1724229603487117572,7653299,0 +127,1724229605629593997,450163,0 +128,1724229607103499646,3665613,0 +129,1724229609246458414,7652771,0 +130,1724229611229370799,1093253,0 +131,1724229612889656268,2572360,0 +132,1724229614899897721,7652795,0 +133,1724229617078829699,2186554,0 +134,1724229619060652217,3665925,0 +135,1724229621190866119,7654115,0 +136,1724229623242911315,964827,0 +137,1724229624820188363,1800652,0 +138,1724229626584919844,7654547,0 +139,1724229628754327062,3216602,0 +140,1724229630825929028,1479635,0 +141,1724229632491730948,7654259,0 +142,1724229634603766886,3216242,0 +143,1724229636795257894,1479659,0 +144,1724229638394653806,7655219,0 +145,1724229640589335256,3858972,0 +146,1724229642612808344,771732,0 +147,1724229644302008209,7461572,0 +148,1724229646343329420,4438929,0 +149,1724229648476116376,385974,0 +150,1724229649989091765,5016918,0 +151,1724229652116398166,7140243,0 +152,1724229654243551380,64333,0 +153,1724229655678483371,2766319,0 +154,1724229657551336070,7654547,0 +155,1724229659666174631,1800724,0 +156,1724229661343035224,1286420,0 +157,1724229662863043691,7654835,0 +158,1724229665099737703,4052691,0 +159,1724229667136278646,128642,0 +160,1724229668601169035,7654283,0 +161,1724229671062648631,4502806,0 +162,1724229672978433875,257332,0 +163,1724229674565783592,7396399,0 +164,1724229676790276508,4694845,0 +165,1724229678911310333,64333,0 +166,1724229680297031792,4631112,0 +167,1724229682345833922,0,0 +168,1724229685673158261,7653419,0 +169,1724229688112114051,3864906,0 +170,1724229690450013439,2444510,0 +171,1724229692559450007,7140843,0 +172,1724229694939931999,192999,0 +173,1724229696502793265,2508195,0 diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 3aa5f11fcf..0916e822cd 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -21,7 +21,7 @@ import ( ) const ( - compactBlocksVersion = "bc218e8" //"a28b9e7" + compactBlocksVersion = "db3d1a9" //"a28b9e7" ) func main() { @@ -58,11 +58,11 @@ func Run() error { return err } - for _, node := range network.Nodes() { - if err := node.Instance.EnableBitTwister(); err != nil { - return fmt.Errorf("failed to enable bit twister: %v", err) - } - } + // for _, node := range network.Nodes() { + // if err := node.Instance.EnableBitTwister(); err != nil { + // return fmt.Errorf("failed to enable bit twister: %v", err) + // } + // } gRPCEndpoints, err := network.RemoteGRPCEndpoints() if err != nil { @@ -128,11 +128,11 @@ func Run() error { return err } - for _, node := range network.Nodes() { - if err = node.Instance.SetLatencyAndJitter(70, 10); err != nil { - return fmt.Errorf("failed to set latency and jitter: %v", err) - } - } + // for _, node := range network.Nodes() { + // if err = node.Instance.SetLatencyAndJitter(70, 10); err != nil { + // return fmt.Errorf("failed to set latency and jitter: %v", err) + // } + // } if err := network.WaitToSync(); err != nil { return err From f05744e4b454ba7bf14586286e20b48a4a292b08 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 26 Aug 2024 11:02:21 +0200 Subject: [PATCH 36/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0156c4046f..757c258992 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240820102527-178f81a65c0f + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826085931-c42c67396970 ) diff --git a/go.sum b/go.sum index 730b80375d..2d610e757d 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.20240820102527-178f81a65c0f h1:CTxiDW7f/avtlzVAFSYXlVSpG8AZ0yzt7WEfVxOOcz0= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240820102527-178f81a65c0f/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826085931-c42c67396970 h1:gC746s8EiVx75gxryr+Cqsd2gNu6+e70Dv7kzET2uL0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826085931-c42c67396970/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 44110b01248a8f68188baef3a4a306e918630354 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 26 Aug 2024 22:14:22 +0200 Subject: [PATCH 37/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 757c258992..6de1df64d0 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826085931-c42c67396970 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826201154-9ff3319bfc72 ) diff --git a/go.sum b/go.sum index 2d610e757d..7a00ec7fad 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.20240826085931-c42c67396970 h1:gC746s8EiVx75gxryr+Cqsd2gNu6+e70Dv7kzET2uL0= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826085931-c42c67396970/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826201154-9ff3319bfc72 h1:IO+6Cm+sIzf25/PSrNg3N+EqbUsDHuN15zNpkB4b45g= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826201154-9ff3319bfc72/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 0916e822cd..7342d4dcdb 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -21,7 +21,7 @@ import ( ) const ( - compactBlocksVersion = "db3d1a9" //"a28b9e7" + compactBlocksVersion = "079ea56" //"a28b9e7" ) func main() { @@ -58,11 +58,11 @@ func Run() error { return err } - // for _, node := range network.Nodes() { - // if err := node.Instance.EnableBitTwister(); err != nil { - // return fmt.Errorf("failed to enable bit twister: %v", err) - // } - // } + for _, node := range network.Nodes() { + if err := node.Instance.EnableBitTwister(); err != nil { + return fmt.Errorf("failed to enable bit twister: %v", err) + } + } gRPCEndpoints, err := network.RemoteGRPCEndpoints() if err != nil { @@ -128,11 +128,11 @@ func Run() error { return err } - // for _, node := range network.Nodes() { - // if err = node.Instance.SetLatencyAndJitter(70, 10); err != nil { - // return fmt.Errorf("failed to set latency and jitter: %v", err) - // } - // } + for _, node := range network.Nodes() { + if err = node.Instance.SetLatencyAndJitter(30, 10); err != nil { + return fmt.Errorf("failed to set latency and jitter: %v", err) + } + } if err := network.WaitToSync(); err != nil { return err From d4ba7a0adff831cba0de73349f8fb03fdd401505 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 28 Aug 2024 18:46:22 +0200 Subject: [PATCH 38/56] checkpoint --- 2024-08-26-22-47-06-3807062-block-times.csv | 59 ++++++++++++++ 2024-08-26-23-07-43-3807062-block-times.csv | 88 +++++++++++++++++++++ go.mod | 2 +- go.sum | 4 +- test/e2e/experiment/compact_blocks/main.go | 11 +-- test/e2e/testnet/node.go | 2 +- 6 files changed, 157 insertions(+), 9 deletions(-) create mode 100644 2024-08-26-22-47-06-3807062-block-times.csv create mode 100644 2024-08-26-23-07-43-3807062-block-times.csv diff --git a/2024-08-26-22-47-06-3807062-block-times.csv b/2024-08-26-22-47-06-3807062-block-times.csv new file mode 100644 index 0000000000..a3da5b9902 --- /dev/null +++ b/2024-08-26-22-47-06-3807062-block-times.csv @@ -0,0 +1,59 @@ +height,block time,block size,last commit round +1,1724704866135564000,0,0 +2,1724704899660797574,0,0 +3,1724704901474999436,0,0 +4,1724704903191950467,0,0 +5,1724704905296188342,0,0 +6,1724704907082793885,0,0 +7,1724704908807144937,0,0 +8,1724704910505575978,0,0 +9,1724704912243846744,0,0 +10,1724704914043144645,0,0 +11,1724704915700156434,0,0 +12,1724704917320438199,0,0 +13,1724704919203961617,0,0 +14,1724704920837699098,0,0 +15,1724704922533956289,0,0 +16,1724704924087413465,0,0 +17,1724704925719698588,6292,0 +18,1724704927325925412,0,0 +19,1724704928943628393,0,0 +20,1724704930672307714,901306,0 +21,1724704932524613707,1416338,0 +22,1724704934357723727,257516,0 +23,1724704936068364138,578997,0 +24,1724704937739358115,1029328,0 +25,1724704939552856952,1029328,0 +26,1724704941407432156,0,0 +27,1724704943010450214,1222327,0 +28,1724704944915416954,964995,0 +29,1724704946889445958,450283,0 +30,1724704948527609560,836017,0 +31,1724704950272750645,1093253,0 +32,1724704951984462268,643090,0 +33,1724704953724233355,578781,0 +34,1724704955374402204,900326,0 +35,1724704957064974898,1157658,0 +36,1724704958981474451,450307,0 +37,1724704960637623768,707663,0 +38,1724704962415130230,771996,0 +39,1724704964192359496,900494,0 +40,1724704965914941004,385854,0 +41,1724704967549885426,900326,0 +42,1724704969392377601,1028944,0 +43,1724704971084212961,514472,0 +44,1724704972850674645,643090,0 +45,1724704974533840300,836017,0 +46,1724704976251630295,836185,0 +47,1724704977962415136,514664,0 +48,1724704979713855789,836329,0 +49,1724704981486039156,1029328,0 +50,1724704983208827123,450331,0 +51,1724704984775563932,900662,0 +52,1724704986530738096,578997,0 +53,1724704988290550649,964779,0 +54,1724704990030449603,514472,0 +55,1724704991683979602,836017,0 +56,1724704993314944383,385854,0 +57,1724704994953393731,1157898,0 +58,1724704996710743372,643330,0 diff --git a/2024-08-26-23-07-43-3807062-block-times.csv b/2024-08-26-23-07-43-3807062-block-times.csv new file mode 100644 index 0000000000..847aefeeed --- /dev/null +++ b/2024-08-26-23-07-43-3807062-block-times.csv @@ -0,0 +1,88 @@ +height,block time,block size,last commit round +1,1724706096464823000,0,0 +2,1724706128528025938,0,0 +3,1724706130061465997,0,0 +4,1724706131777187372,0,0 +5,1724706133283712946,0,0 +6,1724706134956037200,0,0 +7,1724706136821176396,0,0 +8,1724706138565670408,0,0 +9,1724706140416159168,0,0 +10,1724706142128938435,0,0 +11,1724706143815618571,0,0 +12,1724706145558321388,0,0 +13,1724706147151876390,0,0 +14,1724706148842580588,0,0 +15,1724706150570209835,0,0 +16,1724706152159755521,0,0 +17,1724706153920814038,6292,0 +18,1724706155538463181,0,0 +19,1724706157203137101,0,0 +20,1724706158826400199,6292,0 +21,1724706160431908445,1293872,0 +22,1724706162183624987,1293872,0 +23,1724706164009931933,321803,0 +24,1724706165648267212,2639125,0 +25,1724706167716422152,4505242,0 +26,1724706169777288045,2446126,0 +27,1724706171725559391,3796153,0 +28,1724706173897660744,4374644,0 +29,1724706175810127130,2058608,0 +30,1724706177690139988,3216434,0 +31,1724706179640492146,4567115,0 +32,1724706181579042717,2251415,0 +33,1724706183437797108,2701314,0 +34,1724706185288891925,4694557,0 +35,1724706187332070521,2379433,0 +36,1724706189235753531,2765359,0 +37,1724706191061466911,4116256,0 +38,1724706192947802424,3344572,0 +39,1724706194852199175,1929438,0 +40,1724706196610336513,3795167,0 +41,1724706198472920463,4438281,0 +42,1724706200426924905,1608229,0 +43,1724706202171367952,3215666,0 +44,1724706204188516291,4887484,0 +45,1724706206261243835,2186578,0 +46,1724706208213991767,2765503,0 +47,1724706210084041078,4759442,0 +48,1724706212071198254,2572696,0 +49,1724706214058086073,2830412,0 +50,1724706216000093231,4310311,0 +51,1724706218010100969,2894937,0 +52,1724706220068397310,2894817,0 +53,1724706221944195323,4374116,0 +54,1724706223926045912,3087552,0 +55,1724706226039631759,2508459,0 +56,1724706227907457301,4437873,0 +57,1724706229801093162,3280287,0 +58,1724706231777898784,2122557,0 +59,1724706233778633487,4374092,0 +60,1724706235801251742,3473406,0 +61,1724706237811683762,2058440,0 +62,1724706239655199745,3987686,0 +63,1724706241646355120,4180733,0 +64,1724706243684711216,1800748,0 +65,1724706245461569519,3280527,0 +66,1724706247398194185,5017254,0 +67,1724706249436572360,1543920,0 +68,1724706251151227456,3151597,0 +69,1724706253161195402,5145488,0 +70,1724706255216699630,1929486,0 +71,1724706257118773252,2830484,0 +72,1724706259051316275,5339639,0 +73,1724706261192618523,2122893,0 +74,1724706263009350066,2444534,0 +75,1724706264905152768,4502638,0 +76,1724706267001315926,3087504,0 +77,1724706268946885191,2444006,0 +78,1724706270853085185,4180085,0 +79,1724706272827386622,3601304,0 +80,1724706274731515111,2186506,0 +81,1724706276674574306,4373012,0 +82,1724706278659816316,3408425,0 +83,1724706280525741006,1607797,0 +84,1724706282282222101,3794687,0 +85,1724706284461513839,4888396,0 +86,1724706286424541020,1350585,0 +87,1724706288188335065,3731266,0 diff --git a/go.mod b/go.mod index 6de1df64d0..2f10b5f955 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826201154-9ff3319bfc72 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240828164400-5b25a7ccc7ab ) diff --git a/go.sum b/go.sum index 7a00ec7fad..0bd3e2a064 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.20240826201154-9ff3319bfc72 h1:IO+6Cm+sIzf25/PSrNg3N+EqbUsDHuN15zNpkB4b45g= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240826201154-9ff3319bfc72/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240828164400-5b25a7ccc7ab h1:kDoAFroLNvbqshbIZ9Ox4nBy+mGVfh9f4oMJ1VObBt8= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240828164400-5b25a7ccc7ab/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 7342d4dcdb..11b12daf50 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -21,7 +21,7 @@ import ( ) const ( - compactBlocksVersion = "079ea56" //"a28b9e7" + compactBlocksVersion = "3807062" //"a28b9e7" ) func main() { @@ -32,7 +32,7 @@ func main() { func Run() error { const ( - nodes = 12 + nodes = 8 timeoutCommit = time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion @@ -75,7 +75,7 @@ func Run() error { "64000-64000", 1, testnet.DefaultResources, - gRPCEndpoints[:5], + gRPCEndpoints[:4], ) if err != nil { return err @@ -88,8 +88,8 @@ func Run() error { testnet.WithMempool("v2"), func(cfg *config.Config) { // create a partially connected network by only dialing 5 peers - cfg.P2P.MaxNumOutboundPeers = 4 - cfg.P2P.MaxNumInboundPeers = 7 + cfg.P2P.MaxNumOutboundPeers = 3 + cfg.P2P.MaxNumInboundPeers = 4 cfg.Mempool.TTLNumBlocks = 100 cfg.Mempool.TTLDuration = 10 * time.Minute cfg.Mempool.MaxTxsBytes *= 5 @@ -213,6 +213,7 @@ func saveBlockTimes(testnet *testnet.Testnet) (float64, error) { } index := 0 for height := status.SyncInfo.EarliestBlockHeight; height <= status.SyncInfo.LatestBlockHeight; height++ { + log.Printf("Getting block %d", height) resp, err := clients[index].Block(context.Background(), &height) if err != nil { log.Printf("Error getting header for height %d: %v", height, err) diff --git a/test/e2e/testnet/node.go b/test/e2e/testnet/node.go index addbc98066..409bbbce7b 100644 --- a/test/e2e/testnet/node.go +++ b/test/e2e/testnet/node.go @@ -147,7 +147,7 @@ func NewNode( if err != nil { return nil, err } - args := []string{"start", fmt.Sprintf("--home=%s", remoteRootDir), "--rpc.laddr=tcp://0.0.0.0:26657"} + args := []string{"start", fmt.Sprintf("--home=%s", remoteRootDir), "--rpc.laddr=tcp://0.0.0.0:26657", "--force-no-bbr"} if upgradeHeight != 0 { args = append(args, fmt.Sprintf("--v2-upgrade-height=%d", upgradeHeight)) } From 8a062d27540beb25893b03aedf368a419ea11071 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 30 Aug 2024 13:47:02 +0200 Subject: [PATCH 39/56] checkpoint --- 2024-08-28-19-07-47-4021c9f-block-times.csv | 67 +++++++++ 2024-08-29-14-17-59-4021c9f-block-times.csv | 0 test/e2e/experiment/compact_blocks/main.go | 157 +++++--------------- test/e2e/testnet/testnet.go | 6 +- test/txsim/blob.go | 5 + 5 files changed, 115 insertions(+), 120 deletions(-) create mode 100644 2024-08-28-19-07-47-4021c9f-block-times.csv create mode 100644 2024-08-29-14-17-59-4021c9f-block-times.csv diff --git a/2024-08-28-19-07-47-4021c9f-block-times.csv b/2024-08-28-19-07-47-4021c9f-block-times.csv new file mode 100644 index 0000000000..05b6ac706b --- /dev/null +++ b/2024-08-28-19-07-47-4021c9f-block-times.csv @@ -0,0 +1,67 @@ +height,block time,block size,last commit round +1,1724864500551138000,0,0 +2,1724864537648455436,0,1 +3,1724864539556286784,0,0 +4,1724864541517547304,0,0 +5,1724864543282750036,0,0 +6,1724864545204118562,0,0 +7,1724864546959576099,0,0 +8,1724864548623916075,0,0 +9,1724864550308004360,0,0 +10,1724864551970337369,0,0 +11,1724864553722932000,0,0 +12,1724864555350267493,0,0 +13,1724864556952283168,6292,0 +14,1724864558748443823,0,0 +15,1724864560384946558,6292,0 +16,1724864561994489323,0,0 +17,1724864563536474576,515032,0 +18,1724864565176902286,1293872,0 +19,1724864566974727580,2452464,0 +20,1724864568945547303,1351867,0 +21,1724864570631809850,1351453,0 +22,1724864572297160758,3217432,0 +23,1724864574403483115,4311737,0 +24,1724864576396038466,2445666,0 +25,1724864578312657797,3538315,0 +26,1724864580311599068,3859860,0 +27,1724864582282685825,2573128,0 +28,1724864584164608809,3473190,0 +29,1724864586087412528,3923497,0 +30,1724864588108844204,2379985,0 +31,1724864590075633953,3279855,0 +32,1724864591940309298,4244514,0 +33,1724864593863467557,2379577,0 +34,1724864595776318708,3280287,0 +35,1724864597758235613,3987926,0 +36,1724864599647342416,2637077,0 +37,1724864601552087311,2508363,0 +38,1724864603441088314,4373612,0 +39,1724864605423586007,3023075,0 +40,1724864607317411746,2637053,0 +41,1724864609191948316,3472758,0 +42,1724864611109281655,3472806,0 +43,1724864612991274369,2701242,0 +44,1724864614897979143,3537763,0 +45,1724864616868881139,3666429,0 +46,1724864618779542247,2251103,0 +47,1724864620724827142,3409601,0 +48,1724864622573189547,4181477,0 +49,1724864624583877326,2251535,0 +50,1724864626521766802,3537691,0 +51,1724864628545633654,4116544,0 +52,1724864630443710424,2444342,0 +53,1724864632336071512,2830244,0 +54,1724864634237341132,4245210,0 +55,1724864636186996955,2765719,0 +56,1724864638031415669,2636981,0 +57,1724864639905499401,3730594,0 +58,1724864641802203164,3344668,0 +59,1724864643655373042,2444462,0 +60,1724864645549784438,3795047,0 +61,1724864647433931486,3409001,0 +62,1724864649385612881,2186626,0 +63,1724864651264010613,3408953,0 +64,1724864653165488968,4245138,0 +65,1724864655049810235,2251487,0 +66,1724864656968604728,3216146,0 diff --git a/2024-08-29-14-17-59-4021c9f-block-times.csv b/2024-08-29-14-17-59-4021c9f-block-times.csv new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 11b12daf50..1a006eb52a 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -2,10 +2,8 @@ package main import ( "context" - "encoding/csv" "fmt" "log" - "os" "time" "github.com/celestiaorg/celestia-app/v3/app" @@ -15,13 +13,12 @@ import ( blobtypes "github.com/celestiaorg/celestia-app/v3/x/blob/types" "github.com/tendermint/tendermint/config" - // "github.com/tendermint/tendermint/pkg/trace" - // "github.com/tendermint/tendermint/pkg/trace/schema" - "github.com/tendermint/tendermint/rpc/client/http" + "github.com/tendermint/tendermint/pkg/trace" + "github.com/tendermint/tendermint/pkg/trace/schema" ) const ( - compactBlocksVersion = "3807062" //"a28b9e7" + compactBlocksVersion = "4021c9f" //"a28b9e7" ) func main() { @@ -32,8 +29,8 @@ func main() { func Run() error { const ( - nodes = 8 - timeoutCommit = time.Second + nodes = 10 + timeoutCommit = 2 * time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion ) @@ -43,7 +40,7 @@ func Run() error { blobParams.GovMaxSquareSize = 128 ecfg := encoding.MakeConfig(app.ModuleBasics) - network, err := testnet.New("compact-blocks", 864, nil, "test", genesis.SetBlobParams(ecfg.Codec, blobParams)) + network, err := testnet.New("compact-blocks", 864, nil, "", genesis.SetBlobParams(ecfg.Codec, blobParams)) if err != nil { return err } @@ -71,11 +68,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 40, - "64000-64000", + 30, + "128000-128000", 1, testnet.DefaultResources, - gRPCEndpoints[:4], + gRPCEndpoints[2:6], ) if err != nil { return err @@ -90,37 +87,35 @@ func Run() error { // create a partially connected network by only dialing 5 peers cfg.P2P.MaxNumOutboundPeers = 3 cfg.P2P.MaxNumInboundPeers = 4 - cfg.Mempool.TTLNumBlocks = 100 - cfg.Mempool.TTLDuration = 10 * time.Minute - cfg.Mempool.MaxTxsBytes *= 5 + cfg.Instrumentation.TraceType = "local" }, ) if err != nil { return err } - // pushConfig, err := trace.GetPushConfigFromEnv() - // if err != nil { - // return err - // } - // log.Print("Setting up trace push config") - // for _, node := range network.Nodes() { - // if err = node.Instance.SetEnvironmentVariable(trace.PushBucketName, pushConfig.BucketName); err != nil { - // return fmt.Errorf("failed to set TRACE_PUSH_BUCKET_NAME: %v", err) - // } - // if err = node.Instance.SetEnvironmentVariable(trace.PushRegion, pushConfig.Region); err != nil { - // return fmt.Errorf("failed to set TRACE_PUSH_REGION: %v", err) - // } - // if err = node.Instance.SetEnvironmentVariable(trace.PushAccessKey, pushConfig.AccessKey); err != nil { - // return fmt.Errorf("failed to set TRACE_PUSH_ACCESS_KEY: %v", err) - // } - // if err = node.Instance.SetEnvironmentVariable(trace.PushKey, pushConfig.SecretKey); err != nil { - // return fmt.Errorf("failed to set TRACE_PUSH_SECRET_KEY: %v", err) - // } - // if err = node.Instance.SetEnvironmentVariable(trace.PushDelay, fmt.Sprintf("%d", pushConfig.PushDelay)); err != nil { - // return fmt.Errorf("failed to set TRACE_PUSH_DELAY: %v", err) - // } - // } + pushConfig, err := trace.GetPushConfigFromEnv() + if err != nil { + return err + } + log.Print("Setting up trace push config") + for _, node := range network.Nodes() { + if err = node.Instance.SetEnvironmentVariable(trace.PushBucketName, pushConfig.BucketName); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_BUCKET_NAME: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushRegion, pushConfig.Region); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_REGION: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushAccessKey, pushConfig.AccessKey); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_ACCESS_KEY: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushKey, pushConfig.SecretKey); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_SECRET_KEY: %v", err) + } + if err = node.Instance.SetEnvironmentVariable(trace.PushDelay, fmt.Sprintf("%d", pushConfig.PushDelay)); err != nil { + return fmt.Errorf("failed to set TRACE_PUSH_DELAY: %v", err) + } + } log.Printf("Starting network\n") err = network.StartNodes() @@ -129,7 +124,7 @@ func Run() error { } for _, node := range network.Nodes() { - if err = node.Instance.SetLatencyAndJitter(30, 10); err != nil { + if err = node.Instance.SetLatencyAndJitter(40, 10); err != nil { return fmt.Errorf("failed to set latency and jitter: %v", err) } } @@ -160,91 +155,15 @@ func Run() error { log.Printf("Height: %v", status.SyncInfo.LatestBlockHeight) case <-timeout.C: - if err := network.StopTxClients(); err != nil { - log.Printf("Error stopping tx clients: %v", err) - } + network.StopTxClients() log.Println("--- COLLECTING DATA") - throughput, err := saveBlockTimes(network) - if err != nil { - log.Printf("Error saving block times: %v", err) + file := "/Users/callum/Developer/go/src/github.com/celestiaorg/big-blocks-research/traces" + if err := trace.S3Download(file, network.ChainID(), pushConfig, schema.RoundStateTable, schema.BlockTable, schema.ProposalTable, schema.CompactBlockTable, schema.MempoolRecoveryTable); err != nil { + return fmt.Errorf("failed to download traces from S3: %w", err) } - log.Printf("Throughput: %v", throughput) - // err = trace.S3Download("./traces/", "compact-blocks", - // pushConfig, schema.RoundStateTable, schema.BlockTable, schema.ProposalTable, schema.CompactBlockTable) - // if err != nil { - // return fmt.Errorf("failed to download traces from S3: %w", err) - // } + log.Println("--- FINISHED ✅: Compact Blocks") return nil } } } - -func saveBlockTimes(testnet *testnet.Testnet) (float64, error) { - file, err := os.Create(fmt.Sprintf("%s-%s-block-times.csv", time.Now().Format("2006-01-02-15-04-05"), testnet.Node(0).Version)) - if err != nil { - return 0, err - } - defer file.Close() - - writer := csv.NewWriter(file) - defer writer.Flush() - - err = writer.Write([]string{"height", "block time", "block size", "last commit round"}) - if err != nil { - return 0, err - } - - nodes := testnet.Nodes() - clients := make([]*http.HTTP, len(nodes)) - for i, node := range nodes { - clients[i], err = node.Client() - if err != nil { - return 0, err - } - } - - totalBlockSize := 0 - startTime := int64(0) - endTime := int64(0) - status, err := clients[0].Status(context.Background()) - if err != nil { - return 0, err - } - index := 0 - for height := status.SyncInfo.EarliestBlockHeight; height <= status.SyncInfo.LatestBlockHeight; height++ { - log.Printf("Getting block %d", height) - resp, err := clients[index].Block(context.Background(), &height) - if err != nil { - log.Printf("Error getting header for height %d: %v", height, err) - index++ - if index == len(nodes) { - return 0, fmt.Errorf("all nodes failed to get header for height %d", height) - } - // retry the height - height-- - continue - } - blockSize := 0 - for _, tx := range resp.Block.Txs { - blockSize += len(tx) - } - if blockSize > 0 { - totalBlockSize += blockSize - if startTime == 0 { - startTime = resp.Block.Time.UnixNano() - } - endTime = resp.Block.Time.UnixNano() - } - if resp.Block.LastCommit.Round > 0 { - log.Printf("Block %d has a last commit round of %d", resp.Block.LastCommit.Height, resp.Block.LastCommit.Round) - } - err = writer.Write([]string{fmt.Sprintf("%d", height), fmt.Sprintf("%d", resp.Block.Time.UnixNano()), fmt.Sprintf("%d", blockSize), fmt.Sprintf("%d", resp.Block.LastCommit.Round)}) - if err != nil { - return 0, err - } - } - - duration := (endTime - startTime) / 1e9 - return float64(totalBlockSize) / float64(duration), nil -} diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index f47066c366..300777b74b 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -39,12 +39,16 @@ 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...), + genesis: genesis.NewDefaultGenesis().WithChainID(identifier).WithModifiers(genesisModifiers...), keygen: newKeyGenerator(seed), grafana: grafana, }, nil } +func (t *Testnet) ChainID() string { + return t.genesis.ChainID +} + func (t *Testnet) SetConsensusParams(params *tmproto.ConsensusParams) { t.genesis.WithConsensusParams(params) } diff --git a/test/txsim/blob.go b/test/txsim/blob.go index 3fcef2fa33..1a5478a174 100644 --- a/test/txsim/blob.go +++ b/test/txsim/blob.go @@ -28,6 +28,7 @@ type BlobSequence struct { account types.AccAddress useFeegrant bool + gasPrice float64 } func NewBlobSequence(sizes, blobsPerPFB Range) *BlobSequence { @@ -35,6 +36,7 @@ func NewBlobSequence(sizes, blobsPerPFB Range) *BlobSequence { sizes: sizes, blobsPerPFB: blobsPerPFB, shareVersions: []uint8{share.ShareVersionZero, share.ShareVersionOne}, + gasPrice: appconsts.DefaultMinGasPrice, } } @@ -111,10 +113,13 @@ func (s *BlobSequence) Next(_ context.Context, _ grpc.ClientConn, rand *rand.Ran if err != nil { return Operation{}, err } + // increment the gas price by 0.0001 + defer func() { s.gasPrice += 0.0001 }() return Operation{ Msgs: []types.Msg{msg}, Blobs: blobs, GasLimit: estimateGas(sizes, s.useFeegrant), + GasPrice: s.gasPrice, }, nil } From 754d16cd4959ed62c6c86950d47a1a4aa96b6010 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 30 Aug 2024 15:48:19 +0200 Subject: [PATCH 40/56] checkpoint --- go.mod | 3 +-- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 77dc26fd3d..eb6f1d0136 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,6 @@ require ( github.com/cosmos/iavl v0.19.6 // indirect github.com/cosmos/ledger-cosmos-go v0.13.2 // indirect github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deckarep/golang-set/v2 v2.6.0 // indirect @@ -254,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240828164400-5b25a7ccc7ab + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830134440-cf354c5176b3 ) diff --git a/go.sum b/go.sum index d89960d8b2..ac71583805 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.20240828164400-5b25a7ccc7ab h1:kDoAFroLNvbqshbIZ9Ox4nBy+mGVfh9f4oMJ1VObBt8= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240828164400-5b25a7ccc7ab/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830134440-cf354c5176b3 h1:uQpyfmqWO06uHv0x31z9kLZx/xhyqTfQ1lziY60vmYw= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830134440-cf354c5176b3/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 1a006eb52a..77e3e5870a 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -68,7 +68,7 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 30, + 40, "128000-128000", 1, testnet.DefaultResources, From beed88a80fecb58e3f50740947e1325306c43933 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 30 Aug 2024 16:10:06 +0200 Subject: [PATCH 41/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index eb6f1d0136..d442ea729b 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830134440-cf354c5176b3 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830140809-dddd61e91665 ) diff --git a/go.sum b/go.sum index ac71583805..3d7c4c567f 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.20240830134440-cf354c5176b3 h1:uQpyfmqWO06uHv0x31z9kLZx/xhyqTfQ1lziY60vmYw= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830134440-cf354c5176b3/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830140809-dddd61e91665 h1:VGNNKqJttVDL8hwVAxp8bZllyVIIDWWVx82tj4RTNWQ= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830140809-dddd61e91665/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 77e3e5870a..2a98272201 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "4021c9f" //"a28b9e7" + compactBlocksVersion = "986c330" //"a28b9e7" ) func main() { @@ -72,7 +72,7 @@ func Run() error { "128000-128000", 1, testnet.DefaultResources, - gRPCEndpoints[2:6], + gRPCEndpoints[2:7], ) if err != nil { return err From 116d63ddf928ed6448ece531bd9a9141c71ea760 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 30 Aug 2024 16:29:42 +0200 Subject: [PATCH 42/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d442ea729b..34d98f80ae 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830140809-dddd61e91665 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830141613-0a5adc0ea0be ) diff --git a/go.sum b/go.sum index 3d7c4c567f..54044a9ab5 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.20240830140809-dddd61e91665 h1:VGNNKqJttVDL8hwVAxp8bZllyVIIDWWVx82tj4RTNWQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830140809-dddd61e91665/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830141613-0a5adc0ea0be h1:K2BZucwCOdvXZSAm1uCuQgf+LpawDtuzgKE7xUqQIrU= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830141613-0a5adc0ea0be/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 a84eaf986d26e87171609470bdb69febe891cad3 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 30 Aug 2024 16:30:02 +0200 Subject: [PATCH 43/56] introduce option to allow txsim to ignore submission errors --- test/cmd/txsim/cli.go | 7 ++++++- test/txsim/account.go | 34 ++++++++++++++++++++-------------- test/txsim/run.go | 19 ++++++++++++++++++- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/test/cmd/txsim/cli.go b/test/cmd/txsim/cli.go index 62988c3eae..de08c224a8 100644 --- a/test/cmd/txsim/cli.go +++ b/test/cmd/txsim/cli.go @@ -39,7 +39,7 @@ var ( pollTime time.Duration send, sendIterations, sendAmount int stake, stakeValue, blob int - useFeegrant, suppressLogs bool + useFeegrant, suppressLogs, ignoreFailures bool ) func main() { @@ -161,6 +161,10 @@ well funded account that can act as the master account. The command runs until a opts.SuppressLogs() } + if ignoreFailures { + opts.IgnoreFailures() + } + encCfg := encoding.MakeConfig(app.ModuleEncodingRegisters...) err = txsim.Run( cmd.Context(), @@ -199,6 +203,7 @@ func flags() *flag.FlagSet { flags.StringVar(&blobAmounts, "blob-amounts", "1", "range of blobs per PFB specified as a single value or a min-max range (e.g., 10 or 5-10). A single value indicates the exact number of blobs to be created.") flags.BoolVar(&useFeegrant, "feegrant", false, "use the feegrant module to pay for fees") flags.BoolVar(&suppressLogs, "suppressLogs", false, "disable logging") + flags.BoolVar(&ignoreFailures, "ignoreFailures", false, "ignore failures") return flags } diff --git a/test/txsim/account.go b/test/txsim/account.go index 9796f60b04..8205206fe7 100644 --- a/test/txsim/account.go +++ b/test/txsim/account.go @@ -26,12 +26,13 @@ import ( const defaultFee = DefaultGasLimit * appconsts.DefaultMinGasPrice type AccountManager struct { - keys keyring.Keyring - conn *grpc.ClientConn - pending []*account - encCfg encoding.Config - pollTime time.Duration - useFeegrant bool + keys keyring.Keyring + conn *grpc.ClientConn + pending []*account + encCfg encoding.Config + pollTime time.Duration + useFeegrant bool + ignoreFailures bool // to protect from concurrent writes to the map mtx sync.Mutex @@ -51,6 +52,7 @@ func NewAccountManager( conn *grpc.ClientConn, pollTime time.Duration, useFeegrant bool, + ignoreFailures bool, ) (*AccountManager, error) { records, err := keys.List() if err != nil { @@ -62,14 +64,15 @@ func NewAccountManager( } am := &AccountManager{ - keys: keys, - encCfg: encCfg, - pending: make([]*account, 0), - conn: conn, - pollTime: pollTime, - useFeegrant: useFeegrant, - addressMap: make(map[string]string), - accountIndex: len(records), + keys: keys, + encCfg: encCfg, + pending: make([]*account, 0), + conn: conn, + pollTime: pollTime, + useFeegrant: useFeegrant, + ignoreFailures: ignoreFailures, + addressMap: make(map[string]string), + accountIndex: len(records), } if masterAccName == "" { @@ -268,6 +271,9 @@ func (am *AccountManager) Submit(ctx context.Context, op Operation) error { } } if err != nil { + if am.ignoreFailures { + return nil + } return err } diff --git a/test/txsim/run.go b/test/txsim/run.go index a8d57c6a0e..1bc6ee9529 100644 --- a/test/txsim/run.go +++ b/test/txsim/run.go @@ -58,7 +58,16 @@ func Run( } // Create the account manager to handle account transactions. - manager, err := NewAccountManager(ctx, keys, encCfg, opts.masterAcc, conn, opts.pollTime, opts.useFeeGrant) + manager, err := NewAccountManager( + ctx, + keys, + encCfg, + opts.masterAcc, + conn, + opts.pollTime, + opts.useFeeGrant, + opts.ignoreFailures, + ) if err != nil { return err } @@ -129,6 +138,9 @@ type Options struct { pollTime time.Duration useFeeGrant bool suppressLogger bool + // If set to true, if a sequence fails to submit a transction + // it will not halt. + ignoreFailures bool } func (o *Options) Fill() { @@ -156,6 +168,11 @@ func (o *Options) UseFeeGrant() *Options { return o } +func (o *Options) IgnoreFailures() *Options { + o.ignoreFailures = true + return o +} + func (o *Options) SpecifyMasterAccount(name string) *Options { o.masterAcc = name return o From 9d4cb4aa902cdef9b9e5250b7401578eea593e0e Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 2 Sep 2024 14:25:32 +0200 Subject: [PATCH 44/56] update txsim --- docker/txsim.sh | 5 +++-- test/e2e/experiment/compact_blocks/main.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/txsim.sh b/docker/txsim.sh index c27cedb3ea..cefe6b57ce 100644 --- a/docker/txsim.sh +++ b/docker/txsim.sh @@ -15,7 +15,7 @@ SEND_ITERATIONS=1000 STAKE=0 STAKE_VALUE=1000 -while getopts "k:p:r:g:t:b:a:s:m:d:e:i:v:u:w:" opt; do +while getopts "k:p:f:g:t:b:a:s:m:d:e:i:v:u:w:" opt; do case ${opt} in k ) CREATE_KEY=$OPTARG @@ -90,4 +90,5 @@ txsim --key-path $KEY_PATH \ --send-amount $SEND_AMOUNT \ --send-iterations $SEND_ITERATIONS \ --stake $STAKE \ - --stake-value $STAKE_VALUE + --stake-value $STAKE_VALUE \ + --ignore-failures diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 2a98272201..0d097be5b5 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "986c330" //"a28b9e7" + compactBlocksVersion = "6635b1d" //"a28b9e7" ) func main() { From ba55c125c3812b07d5a6a17ea123cf6322704f80 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 2 Sep 2024 14:43:15 +0200 Subject: [PATCH 45/56] fix txsim cli --- test/cmd/txsim/cli.go | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cmd/txsim/cli.go b/test/cmd/txsim/cli.go index de08c224a8..13d73003b2 100644 --- a/test/cmd/txsim/cli.go +++ b/test/cmd/txsim/cli.go @@ -202,8 +202,8 @@ func flags() *flag.FlagSet { flags.StringVar(&blobSizes, "blob-sizes", "100-1000", "range of blob sizes to send") flags.StringVar(&blobAmounts, "blob-amounts", "1", "range of blobs per PFB specified as a single value or a min-max range (e.g., 10 or 5-10). A single value indicates the exact number of blobs to be created.") flags.BoolVar(&useFeegrant, "feegrant", false, "use the feegrant module to pay for fees") - flags.BoolVar(&suppressLogs, "suppressLogs", false, "disable logging") - flags.BoolVar(&ignoreFailures, "ignoreFailures", false, "ignore failures") + flags.BoolVar(&suppressLogs, "suppress-logs", false, "disable logging") + flags.BoolVar(&ignoreFailures, "ignore-failures", false, "ignore failures") return flags } diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 0d097be5b5..01119087d5 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "6635b1d" //"a28b9e7" + compactBlocksVersion = "c928a18" //"a28b9e7" ) func main() { @@ -29,7 +29,7 @@ func main() { func Run() error { const ( - nodes = 10 + nodes = 8 timeoutCommit = 2 * time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion @@ -72,7 +72,7 @@ func Run() error { "128000-128000", 1, testnet.DefaultResources, - gRPCEndpoints[2:7], + gRPCEndpoints[2:5], ) if err != nil { return err From 791afc3153019924fa58b40b6cfeeaa4415d05cb Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 3 Sep 2024 10:04:16 +0200 Subject: [PATCH 46/56] checkpoint --- test/e2e/experiment/compact_blocks/main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 01119087d5..766e63eb4b 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "c928a18" //"a28b9e7" + compactBlocksVersion = "7d9ad6f" //"a28b9e7" ) func main() { @@ -68,11 +68,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 40, - "128000-128000", + 60, + "128000-256000", 1, testnet.DefaultResources, - gRPCEndpoints[2:5], + gRPCEndpoints[1:6], ) if err != nil { return err @@ -162,7 +162,7 @@ func Run() error { return fmt.Errorf("failed to download traces from S3: %w", err) } - log.Println("--- FINISHED ✅: Compact Blocks") + log.Println("--- FINISHED ✅: ChainID: ", network.ChainID()) return nil } } From 6a6ea1f0363fbeb49ac3221225389f3cbd9dcbe9 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Tue, 3 Sep 2024 15:16:21 +0200 Subject: [PATCH 47/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 34d98f80ae..eeb308f415 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830141613-0a5adc0ea0be + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240903131353-7218a79fc4cb ) diff --git a/go.sum b/go.sum index 54044a9ab5..d72136839d 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.20240830141613-0a5adc0ea0be h1:K2BZucwCOdvXZSAm1uCuQgf+LpawDtuzgKE7xUqQIrU= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240830141613-0a5adc0ea0be/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240903131353-7218a79fc4cb h1:ZPweIIZcxW7lVv4XSpND46tC3LHnbV6HIIiu3W8OWVI= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240903131353-7218a79fc4cb/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 4858de1f840b7511b006d000caee46ab4e2d51a2 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 5 Sep 2024 14:45:59 +0200 Subject: [PATCH 48/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index eeb308f415..b7b87f3967 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240903131353-7218a79fc4cb + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905124231-bc85fc24160c ) diff --git a/go.sum b/go.sum index d72136839d..024d717bb4 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.20240903131353-7218a79fc4cb h1:ZPweIIZcxW7lVv4XSpND46tC3LHnbV6HIIiu3W8OWVI= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240903131353-7218a79fc4cb/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905124231-bc85fc24160c h1:A9qplx3wtCpP0RJo7H2g5Jslj85AvgyFLxBHvnAKjus= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905124231-bc85fc24160c/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 766e63eb4b..4e8c7c36b0 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "7d9ad6f" //"a28b9e7" + compactBlocksVersion = "30ea923" //"a28b9e7" ) func main() { From d8ade3cc652c2a8a2e448ecad012499a2d7e66a2 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Thu, 5 Sep 2024 17:15:40 +0200 Subject: [PATCH 49/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index ebf8c06b8c..f18004aa79 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905124231-bc85fc24160c + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905150909-79947c6cbea9 ) diff --git a/go.sum b/go.sum index d87c3315e6..f581c64606 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.20240905124231-bc85fc24160c h1:A9qplx3wtCpP0RJo7H2g5Jslj85AvgyFLxBHvnAKjus= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905124231-bc85fc24160c/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905150909-79947c6cbea9 h1:T1r+b1eRF8s4eNaD/3svG3+zctAKod5eBp1iO269WNk= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905150909-79947c6cbea9/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 4e8c7c36b0..9dfe859004 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "30ea923" //"a28b9e7" + compactBlocksVersion = "00a8940" //"a28b9e7" ) func main() { @@ -72,7 +72,7 @@ func Run() error { "128000-256000", 1, testnet.DefaultResources, - gRPCEndpoints[1:6], + gRPCEndpoints[:1], ) if err != nil { return err From f359e100f73b2d5752718545451bf285a7348f26 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 6 Sep 2024 11:49:24 +0200 Subject: [PATCH 50/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 6 +++--- test/txsim/blob.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index f18004aa79..853174f6a3 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905150909-79947c6cbea9 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906094803-a801fa3ea6e3 ) diff --git a/go.sum b/go.sum index f581c64606..53101872b0 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.20240905150909-79947c6cbea9 h1:T1r+b1eRF8s4eNaD/3svG3+zctAKod5eBp1iO269WNk= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240905150909-79947c6cbea9/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906094803-a801fa3ea6e3 h1:IPJ1yBP41yQ0kAIZWOU3WnEDdaWGbTRMOXmfDS5DD1M= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906094803-a801fa3ea6e3/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 9dfe859004..061c89b515 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -18,7 +18,7 @@ import ( ) const ( - compactBlocksVersion = "00a8940" //"a28b9e7" + compactBlocksVersion = "8f557bb" //"a28b9e7" ) func main() { @@ -30,7 +30,7 @@ func main() { func Run() error { const ( nodes = 8 - timeoutCommit = 2 * time.Second + timeoutCommit = 3 * time.Second timeoutPropose = 4 * time.Second version = compactBlocksVersion ) @@ -72,7 +72,7 @@ func Run() error { "128000-256000", 1, testnet.DefaultResources, - gRPCEndpoints[:1], + gRPCEndpoints[:4], ) if err != nil { return err diff --git a/test/txsim/blob.go b/test/txsim/blob.go index 1a5478a174..c68d29b947 100644 --- a/test/txsim/blob.go +++ b/test/txsim/blob.go @@ -36,7 +36,7 @@ func NewBlobSequence(sizes, blobsPerPFB Range) *BlobSequence { sizes: sizes, blobsPerPFB: blobsPerPFB, shareVersions: []uint8{share.ShareVersionZero, share.ShareVersionOne}, - gasPrice: appconsts.DefaultMinGasPrice, + gasPrice: appconsts.DefaultMinGasPrice * 10, } } From 7c52cbc1b0641cdfeec0199d76cd5cddc6b5b68b Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 6 Sep 2024 12:13:15 +0200 Subject: [PATCH 51/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 853174f6a3..529fce5c2a 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906094803-a801fa3ea6e3 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906101100-9f48af64e6a2 ) diff --git a/go.sum b/go.sum index 53101872b0..781e54d7e3 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.20240906094803-a801fa3ea6e3 h1:IPJ1yBP41yQ0kAIZWOU3WnEDdaWGbTRMOXmfDS5DD1M= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906094803-a801fa3ea6e3/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906101100-9f48af64e6a2 h1:Z+Pk2HoUNdxIWgl9ZFvtJ5MNm3AGTRcTn07fchMfOsQ= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906101100-9f48af64e6a2/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 061c89b515..2ad2f49ec7 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + "strings" "time" "github.com/celestiaorg/celestia-app/v3/app" @@ -18,7 +19,7 @@ import ( ) const ( - compactBlocksVersion = "8f557bb" //"a28b9e7" + compactBlocksVersion = "c1a4ccf" //"a28b9e7" ) func main() { @@ -68,11 +69,11 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 60, + 1, "128000-256000", 1, testnet.DefaultResources, - gRPCEndpoints[:4], + gRPCEndpoints[:3], ) if err != nil { return err @@ -88,6 +89,14 @@ func Run() error { cfg.P2P.MaxNumOutboundPeers = 3 cfg.P2P.MaxNumInboundPeers = 4 cfg.Instrumentation.TraceType = "local" + cfg.Instrumentation.TracingTables = strings.Join([]string{ + schema.RoundStateTable, + schema.BlockTable, + schema.ProposalTable, + schema.CompactBlockTable, + schema.MempoolRecoveryTable, + }, ",") + cfg.LogLevel = "debug" }, ) if err != nil { From 66c2208c1bdd954db493a132b4107eaa54d04e13 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 6 Sep 2024 14:19:22 +0200 Subject: [PATCH 52/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/experiment/compact_blocks/main.go | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 529fce5c2a..c3667ca1e1 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906101100-9f48af64e6a2 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906121728-594e30311652 ) diff --git a/go.sum b/go.sum index 781e54d7e3..3590483308 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.20240906101100-9f48af64e6a2 h1:Z+Pk2HoUNdxIWgl9ZFvtJ5MNm3AGTRcTn07fchMfOsQ= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906101100-9f48af64e6a2/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906121728-594e30311652 h1:e88zI8bdHJ1tMD5QuorzYeNZP8gdfbVowt1q1jNsUKI= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906121728-594e30311652/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= diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 2ad2f49ec7..3e626f52b3 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -19,7 +19,7 @@ import ( ) const ( - compactBlocksVersion = "c1a4ccf" //"a28b9e7" + compactBlocksVersion = "5da3d52" //"a28b9e7" ) func main() { @@ -69,7 +69,7 @@ func Run() error { err = network.CreateTxClients( compactBlocksVersion, - 1, + 40, "128000-256000", 1, testnet.DefaultResources, @@ -96,7 +96,6 @@ func Run() error { schema.CompactBlockTable, schema.MempoolRecoveryTable, }, ",") - cfg.LogLevel = "debug" }, ) if err != nil { @@ -132,16 +131,16 @@ func Run() error { return err } + if err := network.WaitToSync(); err != nil { + return err + } + for _, node := range network.Nodes() { if err = node.Instance.SetLatencyAndJitter(40, 10); err != nil { return fmt.Errorf("failed to set latency and jitter: %v", err) } } - if err := network.WaitToSync(); err != nil { - return err - } - if err := network.StartTxClients(); err != nil { return err } From 2f05007a6f8940f82a188894bdcf576e574fe020 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 6 Sep 2024 16:55:47 +0200 Subject: [PATCH 53/56] checkpoint --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c3667ca1e1..cebbf5aef7 100644 --- a/go.mod +++ b/go.mod @@ -253,5 +253,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906121728-594e30311652 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906145303-caeb9ef8a5fb ) diff --git a/go.sum b/go.sum index 3590483308..e918a925e2 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.20240906121728-594e30311652 h1:e88zI8bdHJ1tMD5QuorzYeNZP8gdfbVowt1q1jNsUKI= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906121728-594e30311652/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906145303-caeb9ef8a5fb h1:F5Ik6wMAFcVTsoX32fiAQVHr8eonlq1PfsSSaSoBo0Q= +github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906145303-caeb9ef8a5fb/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 43ecd7e87c8285e437c4d359b5759ed992f28425 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 9 Sep 2024 10:53:15 +0200 Subject: [PATCH 54/56] checkpoint --- test/e2e/experiment/compact_blocks/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 3e626f52b3..cb106b714b 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -19,7 +19,7 @@ import ( ) const ( - compactBlocksVersion = "5da3d52" //"a28b9e7" + compactBlocksVersion = "70e7354" //"a28b9e7" ) func main() { @@ -73,7 +73,7 @@ func Run() error { "128000-256000", 1, testnet.DefaultResources, - gRPCEndpoints[:3], + gRPCEndpoints[:2], ) if err != nil { return err @@ -88,6 +88,7 @@ func Run() error { // create a partially connected network by only dialing 5 peers cfg.P2P.MaxNumOutboundPeers = 3 cfg.P2P.MaxNumInboundPeers = 4 + cfg.Mempool.MaxTxsBytes = 100 * 1024 * 1024 cfg.Instrumentation.TraceType = "local" cfg.Instrumentation.TracingTables = strings.Join([]string{ schema.RoundStateTable, From d937bd8c533fc68b6aadf12fc54269427dbfc40d Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 28 Oct 2024 12:24:18 +0100 Subject: [PATCH 55/56] update --- go.mod | 59 +++++++++++++------------ go.sum | 133 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 97 insertions(+), 95 deletions(-) diff --git a/go.mod b/go.mod index cebbf5aef7..dae6cbfdc0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/celestiaorg/celestia-app/v3 -go 1.22.6 +go 1.23.1 + +toolchain go1.23.2 require ( cosmossdk.io/errors v1.0.1 @@ -8,7 +10,7 @@ require ( github.com/celestiaorg/blobstream-contracts/v3 v3.1.0 github.com/celestiaorg/go-square/v2 v2.0.0-rc2 github.com/celestiaorg/knuu v0.14.0 - github.com/celestiaorg/nmt v0.22.1 + github.com/celestiaorg/nmt v0.22.2 github.com/celestiaorg/rsmt2d v0.14.0 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/cosmos-sdk v0.46.16 @@ -24,12 +26,12 @@ require ( github.com/rakyll/statik v0.1.7 github.com/rs/zerolog v1.33.0 github.com/spf13/cast v1.6.0 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 github.com/tendermint/tendermint v0.34.29 github.com/tendermint/tm-db v0.6.7 - golang.org/x/exp v0.0.0-20240213143201-ec583247a57a + golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 google.golang.org/grpc v1.66.0 google.golang.org/protobuf v1.34.2 @@ -54,7 +56,8 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/bits-and-blooms/bitset v1.10.0 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect + github.com/bufbuild/protocompile v0.14.1 // indirect github.com/celestiaorg/bittwister v0.0.0-20231213180407-65cdbaf5b8c7 // indirect github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect @@ -96,7 +99,7 @@ require ( 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 - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect @@ -119,10 +122,10 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/gorilla/handlers v1.5.2 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go v1.1.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect + github.com/grafana/pyroscope-go v1.1.2 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect @@ -149,7 +152,7 @@ require ( 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/lib/pq v1.10.9 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -158,7 +161,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect - github.com/minio/highwayhash v1.0.2 // indirect + github.com/minio/highwayhash v1.0.3 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/minio-go/v7 v7.0.74 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -174,14 +177,14 @@ require ( github.com/onsi/ginkgo v1.16.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect - github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.53.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/client_golang v1.20.3 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect @@ -209,26 +212,26 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect - go.opentelemetry.io/otel v1.26.0 // indirect + go.opentelemetry.io/otel v1.30.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 // indirect - go.opentelemetry.io/otel/metric v1.26.0 // indirect - go.opentelemetry.io/otel/sdk v1.26.0 // indirect - go.opentelemetry.io/otel/trace v1.26.0 // indirect + go.opentelemetry.io/otel/metric v1.30.0 // indirect + go.opentelemetry.io/otel/sdk v1.30.0 // indirect + go.opentelemetry.io/otel/trace v1.30.0 // indirect 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.24.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.7.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/sync v0.8.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.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 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -253,5 +256,5 @@ replace ( 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 //v1.39.0-tm-v0.34.29 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906145303-caeb9ef8a5fb + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.43.0-tm-v0.34.35.0.20241028112242-a31a8fe76311 ) diff --git a/go.sum b/go.sum index e918a925e2..8bfade833c 100644 --- a/go.sum +++ b/go.sum @@ -290,8 +290,8 @@ github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= -github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= +github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ= github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= @@ -309,8 +309,8 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.5.1 h1:mixz5lJX4Hiz4FpqFREJHIXLfaLBntfaJv1h+/jS+Qg= -github.com/bufbuild/protocompile v0.5.1/go.mod h1:G5iLmavmF4NsYtpZFvE3B/zFch2GIY8+wjsYLR/lc40= +github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw= +github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= @@ -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.20240906145303-caeb9ef8a5fb h1:F5Ik6wMAFcVTsoX32fiAQVHr8eonlq1PfsSSaSoBo0Q= -github.com/celestiaorg/celestia-core v1.38.0-tm-v0.34.29.0.20240906145303-caeb9ef8a5fb/go.mod h1:gr8NlCcouMlH2bPBHySRXRXlTEZWLw8UpFyY0seMpR0= +github.com/celestiaorg/celestia-core v1.43.0-tm-v0.34.35.0.20241028112242-a31a8fe76311 h1:h5DHE1WwvQnbP9u6REwZN6TAEWtQTomEnqy4Yl90DLw= +github.com/celestiaorg/celestia-core v1.43.0-tm-v0.34.35.0.20241028112242-a31a8fe76311/go.mod h1:bFr0lAGwaJ0mOHSBmib5/ca5pbBf1yKWGPs93Td0HPw= 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= @@ -328,8 +328,8 @@ github.com/celestiaorg/knuu v0.14.0 h1:96uaDHTzlTfhDLrAiygq9Ewow7UzOzGAbUvMwws1S github.com/celestiaorg/knuu v0.14.0/go.mod h1:5x/+tlLebBSfLmmSBm2ps6aLjnKLn5bOaZpUfI5FpsA= github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc= github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4/go.mod h1:fzuHnhzj1pUygGz+1ZkB3uQbEUL4htqCGJ4Qs2LwMZA= -github.com/celestiaorg/nmt v0.22.1 h1:t7fqoP5MJ8mBns5DB2XjfcPxQpS3CKMkY+v+BEkDxYc= -github.com/celestiaorg/nmt v0.22.1/go.mod h1:ia/EpCk0enD5yO5frcxoNoFToz2Ghtk2i+blmCRjIY8= +github.com/celestiaorg/nmt v0.22.2 h1:JmOMtZL9zWAed1hiwb9DDs+ELcKp/ZQZ3rPverge/V8= +github.com/celestiaorg/nmt v0.22.2/go.mod h1:/7huDiSRL/d2EGhoiKctgSzmLOJoWG8yEfbFtY1+Mow= github.com/celestiaorg/rsmt2d v0.14.0 h1:L7XJ3tRJDY8sQcvCjzHq0L7JmsmaSD+VItymIYFLqYc= github.com/celestiaorg/rsmt2d v0.14.0/go.mod h1:4kxqiTdFev49sGiKXTDjohbWYOG5GlcIfftTgaBJnpc= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= @@ -434,8 +434,8 @@ github.com/cosmos/ledger-cosmos-go v0.12.4/go.mod h1:fjfVWRf++Xkygt9wzCsjEBdjcf7 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I= github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI= @@ -583,8 +583,8 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -777,14 +777,14 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ= -github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88= -github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo= -github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go v1.1.2 h1:7vCfdORYQMCxIzI3NlYAs3FcBP760+gWuYWOyiVyYx8= +github.com/grafana/pyroscope-go v1.1.2/go.mod h1:HSSmHo2KRn6FasBA4vK7BMiQqyQq8KSuBKvrhkXxYPU= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= @@ -927,7 +927,6 @@ 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.3/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= @@ -959,8 +958,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= -github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= @@ -1007,8 +1006,8 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= -github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= +github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q= +github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ= 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.74 h1:fTo/XlPBTSpo3BAMshlwKL5RspXRv9us5UeHEGYCFe0= @@ -1090,8 +1089,8 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1117,8 +1116,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= @@ -1145,16 +1144,16 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= +github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= -github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -1163,16 +1162,16 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= -github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= @@ -1191,8 +1190,8 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= @@ -1240,8 +1239,8 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1293,8 +1292,8 @@ github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= -github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= +github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= @@ -1376,8 +1375,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= -go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= +go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= +go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 h1:1wp/gyxsuYtuE/JFxsQRtcCDtMrO2qMvlfXALU5wkzI= @@ -1385,14 +1384,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0/go.mod h go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 h1:hSWWvDjXHVLq9DkmB+77fl8v7+t+yYiS+eNkiplDK54= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0/go.mod h1:zG7KQql1WjZCaUJd+L/ReSYx4bjbYJxg5ws9ws+mYes= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= -go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= -go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= +go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= +go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= -go.opentelemetry.io/otel/sdk v1.26.0 h1:Y7bumHf5tAiDlRYFmGqetNcLaVUZmh4iYfmGxtmz7F8= -go.opentelemetry.io/otel/sdk v1.26.0/go.mod h1:0p8MXpqLeJ0pzcszQQN4F0S5FVjBLgypeGSngLsmirs= +go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfOrYE= +go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= -go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= -go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= +go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= @@ -1435,8 +1434,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.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= 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= @@ -1451,8 +1450,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= -golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1544,8 +1543,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.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= 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= @@ -1587,8 +1586,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1598,7 +1597,6 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1701,14 +1699,15 @@ 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.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.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.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= 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 +1718,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.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= 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 +1792,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.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/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= 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= @@ -1982,8 +1981,8 @@ google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUE google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU= google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From 0e61251af6a21d7e502ade4079593972ea385dfc Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 1 Nov 2024 17:08:11 +0100 Subject: [PATCH 56/56] converge a little closer to main --- 2024-08-12-18-44-27-pr-3713-block-times.csv | 122 -------------- 2024-08-13-12-29-07-pr-3713-block-times.csv | 156 ------------------ 2024-08-13-13-31-29-pr-3713-block-times.csv | 122 -------------- 2024-08-13-14-10-58-e43786b-block-times.csv | 25 --- 2024-08-13-14-19-07-pr-3713-block-times.csv | 40 ----- 2024-08-14-14-18-22-pr-3713-block-times.csv | 45 ----- 2024-08-14-15-41-10-pr-3713-block-times.csv | 46 ------ 2024-08-15-10-58-51-dec69e4-block-times.csv | 41 ----- 2024-08-15-16-05-17-1d1ed35-block-times.csv | 90 ---------- 2024-08-16-17-53-01-bc218e8-block-times.csv | 85 ---------- 2024-08-21-10-41-43-db3d1a9-block-times.csv | 174 -------------------- 2024-08-26-22-47-06-3807062-block-times.csv | 59 ------- 2024-08-26-23-07-43-3807062-block-times.csv | 88 ---------- 2024-08-28-19-07-47-4021c9f-block-times.csv | 67 -------- 2024-08-29-14-17-59-4021c9f-block-times.csv | 0 pkg/user/tx_client.go | 10 +- test/e2e/experiment/compact_blocks/main.go | 1 + test/e2e/simple.go | 1 - test/e2e/testnet/testnet.go | 5 +- 19 files changed, 9 insertions(+), 1168 deletions(-) delete mode 100644 2024-08-12-18-44-27-pr-3713-block-times.csv delete mode 100644 2024-08-13-12-29-07-pr-3713-block-times.csv delete mode 100644 2024-08-13-13-31-29-pr-3713-block-times.csv delete mode 100644 2024-08-13-14-10-58-e43786b-block-times.csv delete mode 100644 2024-08-13-14-19-07-pr-3713-block-times.csv delete mode 100644 2024-08-14-14-18-22-pr-3713-block-times.csv delete mode 100644 2024-08-14-15-41-10-pr-3713-block-times.csv delete mode 100644 2024-08-15-10-58-51-dec69e4-block-times.csv delete mode 100644 2024-08-15-16-05-17-1d1ed35-block-times.csv delete mode 100644 2024-08-16-17-53-01-bc218e8-block-times.csv delete mode 100644 2024-08-21-10-41-43-db3d1a9-block-times.csv delete mode 100644 2024-08-26-22-47-06-3807062-block-times.csv delete mode 100644 2024-08-26-23-07-43-3807062-block-times.csv delete mode 100644 2024-08-28-19-07-47-4021c9f-block-times.csv delete mode 100644 2024-08-29-14-17-59-4021c9f-block-times.csv diff --git a/2024-08-12-18-44-27-pr-3713-block-times.csv b/2024-08-12-18-44-27-pr-3713-block-times.csv deleted file mode 100644 index 684a1def27..0000000000 --- a/2024-08-12-18-44-27-pr-3713-block-times.csv +++ /dev/null @@ -1,122 +0,0 @@ -height,block time,block size,last commit round -1,1723480682796092000,0,0 -2,1723480726296242817,0,1 -3,1723480727910064827,0,0 -4,1723480729563668080,0,0 -5,1723480731626020418,0,0 -6,1723480733684032548,0,0 -7,1723480735809029984,0,0 -8,1723480737848180377,0,0 -9,1723480739669391662,0,0 -10,1723480741675991307,0,0 -11,1723480743558916583,0,0 -12,1723480745292916979,0,0 -13,1723480747089720686,0,0 -14,1723480748804615255,0,0 -15,1723480750817484989,18534,0 -16,1723480752671262882,0,0 -17,1723480754370405758,0,0 -18,1723480756396727360,0,0 -19,1723480758133401066,132160,0 -20,1723480759914538347,297360,0 -21,1723480761806073159,330400,0 -22,1723480763621888795,297360,0 -23,1723480765400668652,231280,0 -24,1723480767311774264,297360,0 -25,1723480769203851753,297360,0 -26,1723480770927712883,231280,0 -27,1723480772719707042,231280,0 -28,1723480774426964689,198240,0 -29,1723480776304381444,330400,0 -30,1723480778181194740,264320,0 -31,1723480779929931597,297360,0 -32,1723480781912327824,264320,0 -33,1723480783648752568,397552,0 -34,1723480785439221708,504595,0 -35,1723480787320060733,0,0 -36,1723480789125942692,0,0 -37,1723480790984876662,495600,0 -38,1723480793007163529,892080,0 -39,1723480795196713913,0,0 -40,1723480798132929996,0,0 -41,1723480804641460545,1907925,0 -42,1723480810049973428,1916320,0 -43,1723480832122231615,1916320,2 -44,1723480834754256530,1916320,0 -45,1723480839952089625,1915312,0 -46,1723480846286135591,1925688,0 -47,1723480857030852571,1936385,1 -48,1723480867287822758,0,1 -49,1723480869125729856,0,0 -50,1723480870919494394,173415,0 -51,1723480872832154019,381513,0 -52,1723480874678552694,381513,0 -53,1723480876502429571,770673,0 -54,1723480878385245529,466488,0 -55,1723480880164201527,1913562,0 -56,1723480888746607777,0,1 -57,1723480890511144081,0,0 -58,1723480892229576487,104049,0 -59,1723480894013956923,242781,0 -60,1723480895795438000,1068619,0 -61,1723480897853773718,313534,0 -62,1723480899715508602,296856,0 -63,1723480901574805288,1930457,0 -64,1723480910083544631,1940750,1 -65,1723480912072274020,0,0 -66,1723480913756373795,34683,0 -67,1723480915745424328,69366,0 -68,1723480917457185391,520245,0 -69,1723480919431110544,381513,0 -70,1723480921271435765,554928,0 -71,1723480923229009362,1906758,0 -72,1723480931801024418,1187424,1 -73,1723480933875896571,42408,0 -74,1723480935818678210,615209,0 -75,1723480937764957636,576321,0 -76,1723480939656652085,529094,0 -77,1723480941609608369,697259,0 -78,1723480943474879689,532614,0 -79,1723480945296394323,1892432,0 -80,1723480953852691639,150020,1 -81,1723480955671673299,0,0 -82,1723480957398273161,150020,0 -83,1723480959218479933,0,0 -84,1723480960954317967,112515,0 -85,1723480962725615214,1934200,0 -86,1723480964656843521,0,0 -87,1723480966518227664,1910070,0 -88,1723480975172485331,0,1 -89,1723480977032405052,0,0 -90,1723480978822391106,34683,0 -91,1723480980575364767,1731003,0 -92,1723480982581028608,212040,0 -93,1723480984463505132,0,0 -94,1723480986281713786,575106,0 -95,1723480988243852370,1919047,0 -96,1723480996826309263,0,1 -97,1723480998712441394,0,0 -98,1723481000417397044,675090,0 -99,1723481002413710882,487565,0 -100,1723481004350964106,1939440,0 -101,1723481006457629840,0,0 -102,1723481008290175329,0,0 -103,1723481009965537260,1939872,0 -104,1723481018587088603,0,1 -105,1723481020446537364,0,0 -106,1723481022223647517,242781,0 -107,1723481023943862184,520245,0 -108,1723481025907236612,1187265,0 -109,1723481028027000584,212040,0 -110,1723481029884268603,593712,0 -111,1723481031814912993,1913410,0 -112,1723481040358962885,0,1 -113,1723481042214063336,0,0 -114,1723481044061063020,0,0 -115,1723481045754469948,1535833,0 -116,1723481047743983414,416327,0 -117,1723481049644935411,0,0 -118,1723481051399070650,154923,0 -119,1723481053247432990,1923804,0 -120,1723481061864303657,0,1 -121,1723481063696889512,0,0 diff --git a/2024-08-13-12-29-07-pr-3713-block-times.csv b/2024-08-13-12-29-07-pr-3713-block-times.csv deleted file mode 100644 index 6b6e2e19d8..0000000000 --- a/2024-08-13-12-29-07-pr-3713-block-times.csv +++ /dev/null @@ -1,156 +0,0 @@ -height,block time,block size,last commit round -1,1723544569271928000,0,0 -2,1723544603404269710,0,0 -3,1723544606051301996,0,0 -4,1723544610845656498,0,0 -5,1723544612488253695,0,0 -6,1723544614374477808,0,0 -7,1723544616398158916,0,0 -8,1723544618645543243,0,0 -9,1723544620654078111,0,0 -10,1723544622667814130,0,0 -11,1723544624685195780,0,0 -12,1723544626695733295,0,0 -13,1723544628712615508,0,0 -14,1723544630610030114,0,0 -15,1723544632468181391,0,0 -16,1723544634198625621,18534,0 -17,1723544636027636641,0,0 -18,1723544637896106627,0,0 -19,1723544639634742405,0,0 -20,1723544641409325307,198240,0 -21,1723544643270181466,264320,0 -22,1723544645101370419,264320,0 -23,1723544646940649664,165200,0 -24,1723544648856820003,363440,0 -25,1723544650655203642,297360,0 -26,1723544652405480624,198240,0 -27,1723544654176208345,297360,0 -28,1723544656155729102,264320,0 -29,1723544657949519391,264320,0 -30,1723544659694080286,264320,0 -31,1723544661487275900,264320,0 -32,1723544663195703439,264320,0 -33,1723544665105081075,297360,0 -34,1723544666975544645,231280,0 -35,1723544668727526293,548647,0 -36,1723544670741474611,659855,0 -37,1723544672703718283,0,0 -38,1723544674505773555,99120,0 -39,1723544676445551379,660800,0 -40,1723544678622497744,958160,0 -41,1723544681314367853,0,0 -42,1723544692297170028,312147,1 -43,1723544697639718322,1914497,0 -44,1723544701206405894,1916320,0 -45,1723544718153043884,1916320,1 -46,1723544722888680522,1916320,0 -47,1723544733579402026,1916320,1 -48,1723544737031243631,1934048,0 -49,1723544741757267981,508896,0 -50,1723544746320609550,0,0 -51,1723544751790654384,784464,0 -52,1723544753825556897,130744,0 -53,1723544755660427257,0,0 -54,1723544757449416101,450060,0 -55,1723544759523613144,1919790,0 -56,1723544761577978355,0,0 -57,1723544763236568269,0,0 -58,1723544764934521730,208098,0 -59,1723544766762394754,312147,0 -60,1723544768546951465,312147,0 -61,1723544770316268336,346830,0 -62,1723544772073823546,466488,0 -63,1723544773918468469,381672,0 -64,1723544775698897211,508896,0 -65,1723544777636578746,313618,0 -66,1723544779298417600,294174,0 -67,1723544781108963295,294174,0 -68,1723544782920795277,369184,0 -69,1723544784742367519,375050,0 -70,1723544786587104254,300040,0 -71,1723544788365377590,1922410,0 -72,1723544790343752029,0,0 -73,1723544792035596640,0,0 -74,1723544793764388902,242781,0 -75,1723544795603674818,277464,0 -76,1723544797371875855,381513,0 -77,1723544799118347431,389238,0 -78,1723544800922625197,424080,0 -79,1723544802791198295,339264,0 -80,1723544804585119132,678528,0 -81,1723544806460360796,336582,0 -82,1723544808203150860,228802,0 -83,1723544809975322656,359546,0 -84,1723544811785126780,406689,0 -85,1723544813645922679,337545,0 -86,1723544815378225219,337545,0 -87,1723544817208462538,1921100,0 -88,1723544819361764817,0,0 -89,1723544821012826561,0,0 -90,1723544822724261763,485562,0 -91,1723544824655102122,346830,0 -92,1723544826539162272,381513,0 -93,1723544828344076639,212040,0 -94,1723544830113150277,636120,0 -95,1723544831931283864,551304,0 -96,1723544833785499950,84816,0 -97,1723544835575109492,588348,0 -98,1723544837434570659,326860,0 -99,1723544839321543065,228802,0 -100,1723544841130275287,337545,0 -101,1723544842909136692,450060,0 -102,1723544844612540007,1922410,0 -103,1723544846613210584,0,0 -104,1723544848411195835,0,0 -105,1723544850147200879,277464,0 -106,1723544852006235777,1902684,0 -107,1723544854045246150,0,0 -108,1723544855801658211,0,0 -109,1723544857546523071,208098,0 -110,1723544859427578059,1896534,0 -111,1723544861507392561,254448,0 -112,1723544863346593614,169632,0 -113,1723544865164955748,766864,0 -114,1723544867102180623,1094562,0 -115,1723544869133139676,196116,0 -116,1723544870988490684,499928,0 -117,1723544873005454890,1133741,0 -118,1723544874945229384,468289,0 -119,1723544876756724410,375050,0 -120,1723544878498835550,337545,0 -121,1723544880318740541,112515,0 -122,1723544882119814378,1938130,0 -123,1723544884123618554,0,0 -124,1723544885925737764,0,0 -125,1723544887580841811,658977,0 -126,1723544889419539216,867075,0 -127,1723544891343027363,138732,0 -128,1723544893213966095,296856,0 -129,1723544895053074450,1145016,0 -130,1723544897044373764,593712,0 -131,1723544898884504385,0,0 -132,1723544900694339282,784464,0 -133,1723544902530175677,751778,0 -134,1723544904451143781,32686,0 -135,1723544906212464548,562575,0 -136,1723544908149635773,1087645,0 -137,1723544910140603644,1935510,0 -138,1723544912172368330,0,0 -139,1723544913883191342,0,0 -140,1723544915584709892,416196,0 -141,1723544917425969331,971124,0 -142,1723544919399967434,208098,0 -143,1723544921329364544,169632,0 -144,1723544923156287276,1272240,0 -145,1723544925125349846,466488,0 -146,1723544926899542151,42408,0 -147,1723544928697160410,588348,0 -148,1723544930532806850,882522,0 -149,1723544932405064220,0,0 -150,1723544934086773435,295221,0 -151,1723544935925148397,1125150,0 -152,1723544937919287256,300040,0 -153,1723544939769478195,1920833,0 -154,1723544941792059912,1922564,0 -155,1723544943780859612,1922564,0 diff --git a/2024-08-13-13-31-29-pr-3713-block-times.csv b/2024-08-13-13-31-29-pr-3713-block-times.csv deleted file mode 100644 index fa6818ce4e..0000000000 --- a/2024-08-13-13-31-29-pr-3713-block-times.csv +++ /dev/null @@ -1,122 +0,0 @@ -height,block time,block size,last commit round -1,1723548309833182000,0,0 -2,1723548339027299756,0,0 -3,1723548340655265556,0,0 -4,1723548342546088117,0,0 -5,1723548344155923217,0,0 -6,1723548345873958178,0,0 -7,1723548348276747783,0,0 -8,1723548350181236587,0,0 -9,1723548352110272844,0,0 -10,1723548354133354563,0,0 -11,1723548356125666351,0,0 -12,1723548358122644445,0,0 -13,1723548360130267029,0,0 -14,1723548362179073253,0,0 -15,1723548363953651898,0,0 -16,1723548365823154509,0,0 -17,1723548367560825996,0,0 -18,1723548369268070219,18534,0 -19,1723548371098108095,0,0 -20,1723548372738432012,0,0 -21,1723548374343994446,0,0 -22,1723548376157178381,32378,0 -23,1723548377893360238,259024,0 -24,1723548379726141928,259024,0 -25,1723548381636896937,323780,0 -26,1723548383543462315,226646,0 -27,1723548385416594095,291402,0 -28,1723548387221470748,259024,0 -29,1723548389044358982,259024,0 -30,1723548390857226206,259024,0 -31,1723548392598843480,259024,0 -32,1723548394285338745,259024,0 -33,1723548396202800752,291402,0 -34,1723548397993670026,226646,0 -35,1723548399800572244,259024,0 -36,1723548401538800341,259024,0 -37,1723548403239321924,323430,0 -38,1723548405023724984,516928,0 -39,1723548406960766919,549236,0 -40,1723548408811162822,516928,0 -41,1723548410704985008,613852,0 -42,1723548412696204930,516928,0 -43,1723548414607311687,516928,0 -44,1723548416535435649,549236,0 -45,1723548418412051213,549236,0 -46,1723548420342708326,516928,0 -47,1723548422227657224,516928,0 -48,1723548424152160652,581544,0 -49,1723548426058972226,613852,0 -50,1723548427914995078,484620,0 -51,1723548429805437758,549236,0 -52,1723548431797442385,516928,0 -53,1723548433557841979,516928,0 -54,1723548435551906639,549236,0 -55,1723548437346791137,549236,0 -56,1723548439266536863,549236,0 -57,1723548441162033135,581544,0 -58,1723548443094321681,484620,0 -59,1723548444967652475,516928,0 -60,1723548446795523578,549236,0 -61,1723548448599273944,549236,0 -62,1723548450543669562,516928,0 -63,1723548452487265266,581544,0 -64,1723548454403586626,549236,0 -65,1723548456311753519,581544,0 -66,1723548458607423273,613852,0 -67,1723548461073524806,807700,0 -68,1723548464847026745,904624,0 -69,1723548468826733796,549236,0 -70,1723548472356000996,1647708,0 -71,1723548474757592715,1098472,0 -72,1723548483271749464,1324628,1 -73,1723548487263299603,3133876,0 -74,1723548506726910807,646160,2 -75,1723548517136659329,1712324,1 -76,1723548520008271695,355388,0 -77,1723548522148944192,1163088,0 -78,1723548524247216766,161540,0 -79,1723548526190648662,3036952,0 -80,1723548534613434389,549236,1 -81,1723548536705231843,290772,0 -82,1723548538581926384,32308,0 -83,1723548540571756389,2616948,0 -84,1723548549315881938,710776,1 -85,1723548551904883782,3166184,0 -86,1723548564075129126,258464,0 -87,1723548565992919822,1970788,0 -88,1723548574091807417,646160,1 -89,1723548576030084807,613852,0 -90,1723548578155850373,549236,0 -91,1723548580104680970,2100020,0 -92,1723548587948372521,678468,1 -93,1723548589976202792,516928,0 -94,1723548591934724873,581544,0 -95,1723548593956609500,2100020,0 -96,1723548601760966153,678468,1 -97,1723548603825992362,613852,0 -98,1723548605884617426,516928,0 -99,1723548607910035031,2164636,0 -100,1723548615765343879,646160,1 -101,1723548617772216581,581544,0 -102,1723548619739676833,549236,0 -103,1723548621699718021,2132328,0 -104,1723548629534974216,646160,1 -105,1723548631460392073,581544,0 -106,1723548633468561000,516928,0 -107,1723548635412817067,2100020,0 -108,1723548643312116557,678468,1 -109,1723548645323832553,516928,0 -110,1723548647289861905,581544,0 -111,1723548649332555931,2196944,0 -112,1723548657157323959,581544,1 -113,1723548658951375921,581544,0 -114,1723548660918750282,484620,0 -115,1723548662831904905,2132328,0 -116,1723548670624653818,678468,1 -117,1723548672618922240,516928,0 -118,1723548674652577939,581544,0 -119,1723548676601727568,2132328,0 -120,1723548684336983408,646160,1 -121,1723548686358287519,581544,0 diff --git a/2024-08-13-14-10-58-e43786b-block-times.csv b/2024-08-13-14-10-58-e43786b-block-times.csv deleted file mode 100644 index 05bcd88b96..0000000000 --- a/2024-08-13-14-10-58-e43786b-block-times.csv +++ /dev/null @@ -1,25 +0,0 @@ -height,block time,block size,last commit round -1,1723550681515519000,0,0 -2,1723550717464653629,0,1 -3,1723550719078327075,0,0 -4,1723550720820475989,0,0 -5,1723550722351062364,0,0 -6,1723550724216787159,0,0 -7,1723550726172110413,0,0 -8,1723550728334423032,0,0 -9,1723550730540060444,0,0 -10,1723550732418584714,0,0 -11,1723550734261849285,0,0 -12,1723550736363577973,0,0 -13,1723550738493991394,0,0 -14,1723550740795870449,0,0 -15,1723550742839063713,18534,0 -16,1723550744893354428,0,0 -17,1723550746871531711,259024,0 -18,1723550749376203804,309936,0 -19,1723550751700243612,388536,0 -20,1723550753919759281,342314,0 -21,1723550756133191823,587494,0 -22,1723550758507238604,841828,0 -23,1723550762304888188,7705964,0 -24,1723550935902171404,7705090,6 diff --git a/2024-08-13-14-19-07-pr-3713-block-times.csv b/2024-08-13-14-19-07-pr-3713-block-times.csv deleted file mode 100644 index df941b141a..0000000000 --- a/2024-08-13-14-19-07-pr-3713-block-times.csv +++ /dev/null @@ -1,40 +0,0 @@ -height,block time,block size,last commit round -1,1723551177693292000,0,0 -2,1723551213529064666,0,0 -3,1723551215152025564,0,0 -4,1723551217265613072,0,0 -5,1723551220110378657,0,0 -6,1723551222269330096,0,0 -7,1723551224380669514,0,0 -8,1723551226349516608,0,0 -9,1723551228584983837,0,0 -10,1723551230748120616,0,0 -11,1723551232707176707,0,0 -12,1723551234805371603,0,0 -13,1723551236813058741,18534,0 -14,1723551238816627236,0,0 -15,1723551240804498299,18534,0 -16,1723551242822209601,0,0 -17,1723551244987855633,97134,0 -18,1723551247053207084,259024,0 -19,1723551248967314837,388536,0 -20,1723551251131452012,777072,0 -21,1723551253545428568,647560,0 -22,1723551255805696576,582804,0 -23,1723551258224833841,777072,0 -24,1723551260539347882,809450,0 -25,1723551264000641121,906584,0 -26,1723551266318548055,0,0 -27,1723551268212533741,1165608,0 -28,1723551271029131025,809450,0 -29,1723551273243650235,808470,0 -30,1723551275394642403,969660,0 -31,1723551278167752039,1712324,0 -32,1723551282689904412,7712598,0 -33,1723551320792315086,96924,4 -34,1723551325885131260,7699594,0 -35,1723551420755915730,7697564,8 -36,1723551423739473971,4303614,0 -37,1723551425996034801,2100020,0 -38,1723551428300700559,2649256,0 -39,1723551431615553183,3327724,0 diff --git a/2024-08-14-14-18-22-pr-3713-block-times.csv b/2024-08-14-14-18-22-pr-3713-block-times.csv deleted file mode 100644 index 48ee508149..0000000000 --- a/2024-08-14-14-18-22-pr-3713-block-times.csv +++ /dev/null @@ -1,45 +0,0 @@ -height,block time,block size,last commit round -1,1723637515803241000,0,0 -2,1723637555169881851,0,0 -3,1723637556991064306,0,0 -4,1723637558598341777,0,0 -5,1723637560105127626,0,0 -6,1723637561830069536,0,0 -7,1723637563352403596,0,0 -8,1723637564868159777,0,0 -9,1723637566395991335,0,0 -10,1723637567910947891,0,0 -11,1723637569447296689,0,0 -12,1723637571082926696,0,0 -13,1723637572763292852,0,0 -14,1723637574290113283,0,0 -15,1723637575813918560,0,0 -16,1723637577327335176,0,0 -17,1723637578728745616,0,0 -18,1723637580054721613,0,0 -19,1723637581548503218,15473,0 -20,1723637583203887781,0,0 -21,1723637584726056358,0,0 -22,1723637586131434896,0,0 -23,1723637587553142879,15473,0 -24,1723637589031248514,2961434,0 -25,1723637591015587885,3476466,0 -26,1723637592888207045,0,0 -27,1723637594317635520,5358930,0 -28,1723637596551951998,1109916,0 -29,1723637598174271479,0,0 -30,1723637599477938490,980038,0 -31,1723637601251622672,7655151,0 -32,1723637603194274900,7661101,0 -33,1723637605636777515,5020442,0 -34,1723637607536794282,7656831,0 -35,1723637609835579706,7654661,0 -36,1723637612145546889,7652771,0 -37,1723637614320430168,3536995,0 -38,1723637616219786438,3086832,0 -39,1723637618280166336,7652771,0 -40,1723637620250314063,7652771,0 -41,1723637635137644235,7652771,2 -42,1723637643098336052,7652771,1 -43,1723637645511643135,4437321,0 -44,1723637647827831365,4437321,0 diff --git a/2024-08-14-15-41-10-pr-3713-block-times.csv b/2024-08-14-15-41-10-pr-3713-block-times.csv deleted file mode 100644 index 0f393cf6f4..0000000000 --- a/2024-08-14-15-41-10-pr-3713-block-times.csv +++ /dev/null @@ -1,46 +0,0 @@ -height,block time,block size,last commit round -1,1723642499097052000,0,0 -2,1723642533346564988,0,0 -3,1723642535059180205,0,0 -4,1723642536871626460,0,0 -5,1723642538896515298,0,0 -6,1723642540506412124,0,0 -7,1723642542124044939,0,0 -8,1723642543811640750,0,0 -9,1723642545437087177,0,0 -10,1723642546968569079,0,0 -11,1723642548452401324,0,0 -12,1723642549959572948,0,0 -13,1723642551527103846,0,0 -14,1723642553117739702,0,0 -15,1723642554631093655,0,0 -16,1723642556139278013,0,0 -17,1723642557704452973,12413,0 -18,1723642559182224192,0,0 -19,1723642560587419260,0,0 -20,1723642561972318845,0,0 -21,1723642563339252858,2136920,0 -22,1723642565279881585,3025813,0 -23,1723642567261016975,0,0 -24,1723642568654748867,12413,0 -25,1723642570115004301,3617637,0 -26,1723642572085936982,1545096,0 -27,1723642573733637308,0,0 -28,1723642575128527678,1673644,0 -29,1723642576775610736,4130289,0 -30,1723642578690393568,4182885,0 -31,1723642580647844201,4183305,0 -32,1723642583065657457,4181485,0 -33,1723642584969341176,4181485,0 -34,1723642586882689883,4184285,0 -35,1723642588888056024,4180085,0 -36,1723642590859468438,4180085,0 -37,1723642592778694002,4180085,0 -38,1723642600010371076,4180085,1 -39,1723642601916790080,4180085,0 -40,1723642604126467384,4180085,0 -41,1723642606192167458,4180085,0 -42,1723642608045710438,3472686,0 -43,1723642610130548027,4180085,0 -44,1723642617696968630,4180085,1 -45,1723642656290130201,4128119,3 diff --git a/2024-08-15-10-58-51-dec69e4-block-times.csv b/2024-08-15-10-58-51-dec69e4-block-times.csv deleted file mode 100644 index 001f5cce4e..0000000000 --- a/2024-08-15-10-58-51-dec69e4-block-times.csv +++ /dev/null @@ -1,41 +0,0 @@ -height,block time,block size,last commit round -1,1723711951383617000,0,0 -2,1723711991781201065,0,1 -3,1723711993651619606,0,0 -4,1723711995213604781,0,0 -5,1723711996981083329,0,0 -6,1723711998565821314,0,0 -7,1723712000067829211,0,0 -8,1723712001577090829,0,0 -9,1723712003201428039,0,0 -10,1723712004766992316,0,0 -11,1723712006232758701,0,0 -12,1723712007759046698,0,0 -13,1723712009293229211,0,0 -14,1723712010828560384,0,0 -15,1723712012346145619,0,0 -16,1723712013851748523,12413,0 -17,1723712015281854461,0,0 -18,1723712016690073036,321895,0 -19,1723712018230558876,1995749,0 -20,1723712020854541089,2832676,0 -21,1723712023516272602,1556405,0 -22,1723712025469561788,2573320,0 -23,1723712027648439820,3487683,0 -24,1723712030414566632,4130921,0 -25,1723712034210859976,4183117,0 -26,1723712117309893736,4182969,3 -27,1723712240112219519,4183289,4 -28,1723712281880188315,4184285,3 -29,1723712287704878701,4181619,0 -30,1723712291946723880,4180997,0 -31,1723712295722453113,4181731,0 -32,1723712300018669991,4181261,0 -33,1723712302731152401,4181189,0 -34,1723712305888971907,4181309,0 -35,1723712308972714682,4181141,0 -36,1723712312171788834,4180901,0 -37,1723712315477966418,4181501,0 -38,1723712319219642733,4181381,0 -39,1723712323284335926,4181069,0 -40,1723712326730901038,4180613,0 diff --git a/2024-08-15-16-05-17-1d1ed35-block-times.csv b/2024-08-15-16-05-17-1d1ed35-block-times.csv deleted file mode 100644 index 4c8244aed8..0000000000 --- a/2024-08-15-16-05-17-1d1ed35-block-times.csv +++ /dev/null @@ -1,90 +0,0 @@ -height,block time,block size,last commit round -1,1723730327388612000,0,0 -2,1723730365267572608,0,0 -3,1723730366878622609,0,0 -4,1723730368540337632,0,0 -5,1723730370167155625,0,0 -6,1723730371804696949,0,0 -7,1723730373429194583,0,0 -8,1723730380452549474,0,1 -9,1723730381952463639,0,0 -10,1723730383445813431,0,0 -11,1723730385021374643,0,0 -12,1723730386623409644,0,0 -13,1723730388234195675,0,0 -14,1723730389699840065,0,0 -15,1723730391331378433,0,0 -16,1723730392908893426,0,0 -17,1723730394340232307,0,0 -18,1723730395936853607,0,0 -19,1723730397472639671,0,0 -20,1723730398996561459,0,0 -21,1723730400513700867,0,0 -22,1723730402024609634,0,0 -23,1723730403433760365,12413,0 -24,1723730405056916592,0,0 -25,1723730406457884082,0,0 -26,1723730407982711558,0,0 -27,1723730409464618260,1493130,0 -28,1723730411211670526,3669603,0 -29,1723730413364832342,643330,0 -30,1723730415033891073,1106856,0 -31,1723730416642357338,4131749,0 -32,1723730418791409670,4182519,0 -33,1723730420818943071,1157994,0 -34,1723730422606794698,4182473,0 -35,1723730424711925200,4183255,0 -36,1723730426573472237,4183807,0 -37,1723730428627669465,4184221,0 -38,1723730430746383709,4181589,0 -39,1723730432757037028,4181309,0 -40,1723730434913759885,4181477,0 -41,1723730442346205678,4181117,1 -42,1723730444492327318,4180757,0 -43,1723730446557180602,4180277,0 -44,1723730448477219817,4180685,0 -45,1723730450406786874,4180757,0 -46,1723730452671027251,4180877,0 -47,1723730454619905573,4180517,0 -48,1723730456672102728,4180493,0 -49,1723730464278581439,4180973,1 -50,1723730466248376159,4181285,0 -51,1723730468424375235,4180925,0 -52,1723730475894524034,4180949,1 -53,1723730477846434272,4180541,0 -54,1723730480146521769,4180469,0 -55,1723730482270813132,4180277,0 -56,1723730484432286197,4180997,0 -57,1723730627795114490,4181093,12 -58,1723730629627518306,4180421,0 -59,1723730631577394444,4180229,0 -60,1723730638715725065,4180757,1 -61,1723730640650380286,4180829,0 -62,1723730642997060161,4180373,0 -63,1723730644994973560,4180445,0 -64,1723730647072003939,4181261,0 -65,1723730648931678621,4180613,0 -66,1723730650897583234,4180685,0 -67,1723730652828626926,4180661,0 -68,1723730660091845329,4181357,1 -69,1723730661880939364,4181429,0 -70,1723730664047936072,4180925,0 -71,1723730665927297705,4180973,0 -72,1723730668111448793,4181189,0 -73,1723730669889038901,4180829,0 -74,1723730671912352895,4180517,0 -75,1723730673752947994,4181021,0 -76,1723730681008773239,4180709,1 -77,1723730682844699830,4180853,0 -78,1723730685347275174,4180829,0 -79,1723730687642015491,4181021,0 -80,1723730690209223088,4181237,0 -81,1723730692181389432,4180541,0 -82,1723730694040707826,4181021,0 -83,1723730696027819217,4180661,0 -84,1723730703344426302,4180637,1 -85,1723730705327681608,4180853,0 -86,1723730707552547147,4180949,0 -87,1723730709492581360,4181141,0 -88,1723730711723366201,4181189,0 -89,1723730714065656591,4181333,0 diff --git a/2024-08-16-17-53-01-bc218e8-block-times.csv b/2024-08-16-17-53-01-bc218e8-block-times.csv deleted file mode 100644 index ac5a5c5595..0000000000 --- a/2024-08-16-17-53-01-bc218e8-block-times.csv +++ /dev/null @@ -1,85 +0,0 @@ -height,block time,block size,last commit round -1,1723823201559211000,0,0 -2,1723823243648591828,0,1 -3,1723823245319385732,0,0 -4,1723823247449687544,0,0 -5,1723823249611401812,0,0 -6,1723823251795599827,0,0 -7,1723823254062193255,0,0 -8,1723823256132145996,0,0 -9,1723823258502408514,0,0 -10,1723823260377283818,0,0 -11,1723823262800886637,0,0 -12,1723823264666375879,0,0 -13,1723823266419417141,0,0 -14,1723823268390574421,6292,0 -15,1723823270168332087,0,0 -16,1723823271989869009,0,0 -17,1723823273940217644,521324,0 -18,1723823275820235045,901306,0 -19,1723823277804785397,643790,0 -20,1723823279917820519,1035988,0 -21,1723823281945315606,1557128,0 -22,1723823284026928013,1544498,0 -23,1723823286166805102,2703090,0 -24,1723823288689710501,3732648,0 -25,1723823292986849376,4118244,0 -26,1723823295742938563,965153,0 -27,1723823298627364356,2637839,0 -28,1723823301481839831,2380625,0 -29,1723823304061553167,3280451,0 -30,1723823312766335523,579089,1 -31,1723823314742929812,579043,0 -32,1723823316900327131,2122747,0 -33,1723823319211840725,1351013,0 -34,1723823321275697351,1157918,0 -35,1723823323293858530,7655195,0 -36,1723823340228953458,4953617,2 -37,1723823343731347837,3151645,0 -38,1723823346975496234,7654283,0 -39,1723823358621222183,2958934,1 -40,1723823361339366715,2572792,0 -41,1723823364722135842,5917244,0 -42,1723823374427100044,3537211,1 -43,1723823377844762984,3408977,0 -44,1723823381178872587,4180565,0 -45,1723823383788595623,257332,0 -46,1723823385686059416,192951,0 -47,1723823387672227126,7653779,0 -48,1723823397832645950,4695469,1 -49,1723823401434600470,3987806,0 -50,1723823404836203551,5788818,0 -51,1723823414591766178,128618,1 -52,1723823417341143917,3472998,0 -53,1723823420487688230,4052043,0 -54,1723823424085246636,7653995,0 -55,1723823433590103818,2894553,1 -56,1723823436331543730,2186890,0 -57,1723823439841159353,4888684,0 -58,1723823443952691390,2251199,0 -59,1723823446619129084,6368031,0 -60,1723823459378920946,4824183,1 -61,1723823462937850980,4695181,0 -62,1723823466543437072,5274154,0 -63,1723823469691522456,2701434,0 -64,1723823472918773287,2508483,0 -65,1723823476016885588,7654163,0 -66,1723823492921713573,7654643,2 -67,1723823501971661894,5145920,1 -68,1723823504499543160,2379865,0 -69,1723823507588198216,6946644,0 -70,1723823511021343617,4437993,0 -71,1723823514050989691,3730594,0 -72,1723823517056273525,7653875,0 -73,1723823527798312972,5145680,1 -74,1723823530688472720,3215834,0 -75,1723823533929774281,4309423,0 -76,1723823537378577673,2122821,0 -77,1723823540688663947,5017038,0 -78,1723823545472064869,7654043,0 -79,1723823554425925541,707495,1 -80,1723823556489554862,643186,0 -81,1723823558752600781,4116232,0 -82,1723823562044721569,1672250,0 -83,1723823564676487354,3215906,0 -84,1723823567888421446,3923401,0 diff --git a/2024-08-21-10-41-43-db3d1a9-block-times.csv b/2024-08-21-10-41-43-db3d1a9-block-times.csv deleted file mode 100644 index 93b965cb75..0000000000 --- a/2024-08-21-10-41-43-db3d1a9-block-times.csv +++ /dev/null @@ -1,174 +0,0 @@ -height,block time,block size,last commit round -1,1724229316337713000,0,0 -2,1724229370327470785,0,2 -3,1724229372064794764,0,0 -4,1724229373590103653,0,0 -5,1724229375201242440,0,0 -6,1724229376823948823,0,0 -7,1724229378476948319,0,0 -8,1724229380005854046,0,0 -9,1724229381541519928,0,0 -10,1724229383156575556,0,0 -11,1724229384679935775,0,0 -12,1724229386077712404,0,0 -13,1724229387483807063,0,0 -14,1724229389104331692,0,0 -15,1724229390626197715,6292,0 -16,1724229392139614847,0,0 -17,1724229393675089671,6292,0 -18,1724229395154786290,0,0 -19,1724229396618647936,2446402,0 -20,1724229398963487082,128758,0 -21,1724229400534767195,2388315,0 -22,1724229402467227029,1878379,0 -23,1724229404308944070,900662,0 -24,1724229405926156391,450331,0 -25,1724229407428648716,5213135,0 -26,1724229409542458183,7658961,0 -27,1724229411790590030,0,0 -28,1724229413231773762,4760642,0 -29,1724229415307629001,7654691,0 -30,1724229417399222466,450163,0 -31,1724229418978575976,4759826,0 -32,1724229421246223651,7654715,0 -33,1724229423802623218,450163,0 -34,1724229425360361299,5209029,0 -35,1724229427257811096,7589542,0 -36,1724229429314465308,0,0 -37,1724229430670839693,1736415,0 -38,1724229432267328321,6303002,0 -39,1724229434519568501,4951817,0 -40,1724229436418804853,1157922,0 -41,1724229438120940632,5789346,0 -42,1724229440038267781,6431884,0 -43,1724229442123112823,0,0 -44,1724229443560269391,4694557,0 -45,1724229445704868049,7653899,0 -46,1724229447892080526,321641,0 -47,1724229449398965399,3794855,0 -48,1724229451266915585,7653731,0 -49,1724229453365486850,1222327,0 -50,1724229455035730541,3602648,0 -51,1724229457031364172,7654691,0 -52,1724229459151396225,1415062,0 -53,1724229460810718653,1479443,0 -54,1724229462395913166,5339231,0 -55,1724229464466041335,6883223,0 -56,1724229466513987521,450163,0 -57,1724229467952669285,4437729,0 -58,1724229469929969194,7653179,0 -59,1724229472019948388,578949,0 -60,1724229473584860367,3151909,0 -61,1724229475473094757,7655411,0 -62,1724229477679287472,1865297,0 -63,1724229479387091328,1929582,0 -64,1724229481321690652,7652891,0 -65,1724229483517388120,3087384,0 -66,1724229485366629097,1929606,0 -67,1724229487363752586,7655603,0 -68,1724229489454936474,3023099,0 -69,1724229491350899538,2122605,0 -70,1724229493137942527,7653827,0 -71,1724229495212093120,3087840,0 -72,1724229497069614176,1608325,0 -73,1724229498731617306,5017518,0 -74,1724229500815080199,7589902,0 -75,1724229502966689679,0,0 -76,1724229504415576716,2959270,0 -77,1724229506534433532,7653731,0 -78,1724229508522182322,1993579,0 -79,1724229510314065351,2829596,0 -80,1724229512275833991,7652795,0 -81,1724229514598409855,2122197,0 -82,1724229516473158294,2958262,0 -83,1724229518226006142,7654235,0 -84,1724229520302770925,2058272,0 -85,1724229522249446984,2443742,0 -86,1724229524109449579,7654499,0 -87,1724229526395160973,2444606,0 -88,1724229528235449595,2251655,0 -89,1724229530210145852,7654307,0 -90,1724229532328730170,2637125,0 -91,1724229534312842719,2830652,0 -92,1724229536226858360,7653731,0 -93,1724229538486281750,2057888,0 -94,1724229540346004324,2829596,0 -95,1724229542144492044,7652771,0 -96,1724229544275990160,2057888,0 -97,1724229546216891259,1800652,0 -98,1724229547958402550,7652771,0 -99,1724229550132835390,3086832,0 -100,1724229551946164270,578781,0 -101,1724229553523750745,7652795,0 -102,1724229555609284861,4565987,0 -103,1724229557711964429,257236,0 -104,1724229559202829671,4180397,0 -105,1724229561319993296,7654235,0 -106,1724229563397785232,643090,0 -107,1724229564954441900,3536995,0 -108,1724229566946074633,7653515,0 -109,1724229569081851642,1286564,0 -110,1724229570677226628,2122989,0 -111,1724229572648190347,7655075,0 -112,1724229574754680428,2701482,0 -113,1724229576864914514,3537259,0 -114,1724229578852239199,7654907,0 -115,1724229581006099146,1286612,0 -116,1724229582725344178,2122989,0 -117,1724229584801956342,7654211,0 -118,1724229586921256844,2701626,0 -119,1724229588822684481,2508987,0 -120,1724229590777726064,7655027,0 -121,1724229593314683111,2315460,0 -122,1724229595262164749,4373012,0 -123,1724229597469535713,7074854,0 -124,1724229599541236272,964803,0 -125,1724229601294217908,4309927,0 -126,1724229603487117572,7653299,0 -127,1724229605629593997,450163,0 -128,1724229607103499646,3665613,0 -129,1724229609246458414,7652771,0 -130,1724229611229370799,1093253,0 -131,1724229612889656268,2572360,0 -132,1724229614899897721,7652795,0 -133,1724229617078829699,2186554,0 -134,1724229619060652217,3665925,0 -135,1724229621190866119,7654115,0 -136,1724229623242911315,964827,0 -137,1724229624820188363,1800652,0 -138,1724229626584919844,7654547,0 -139,1724229628754327062,3216602,0 -140,1724229630825929028,1479635,0 -141,1724229632491730948,7654259,0 -142,1724229634603766886,3216242,0 -143,1724229636795257894,1479659,0 -144,1724229638394653806,7655219,0 -145,1724229640589335256,3858972,0 -146,1724229642612808344,771732,0 -147,1724229644302008209,7461572,0 -148,1724229646343329420,4438929,0 -149,1724229648476116376,385974,0 -150,1724229649989091765,5016918,0 -151,1724229652116398166,7140243,0 -152,1724229654243551380,64333,0 -153,1724229655678483371,2766319,0 -154,1724229657551336070,7654547,0 -155,1724229659666174631,1800724,0 -156,1724229661343035224,1286420,0 -157,1724229662863043691,7654835,0 -158,1724229665099737703,4052691,0 -159,1724229667136278646,128642,0 -160,1724229668601169035,7654283,0 -161,1724229671062648631,4502806,0 -162,1724229672978433875,257332,0 -163,1724229674565783592,7396399,0 -164,1724229676790276508,4694845,0 -165,1724229678911310333,64333,0 -166,1724229680297031792,4631112,0 -167,1724229682345833922,0,0 -168,1724229685673158261,7653419,0 -169,1724229688112114051,3864906,0 -170,1724229690450013439,2444510,0 -171,1724229692559450007,7140843,0 -172,1724229694939931999,192999,0 -173,1724229696502793265,2508195,0 diff --git a/2024-08-26-22-47-06-3807062-block-times.csv b/2024-08-26-22-47-06-3807062-block-times.csv deleted file mode 100644 index a3da5b9902..0000000000 --- a/2024-08-26-22-47-06-3807062-block-times.csv +++ /dev/null @@ -1,59 +0,0 @@ -height,block time,block size,last commit round -1,1724704866135564000,0,0 -2,1724704899660797574,0,0 -3,1724704901474999436,0,0 -4,1724704903191950467,0,0 -5,1724704905296188342,0,0 -6,1724704907082793885,0,0 -7,1724704908807144937,0,0 -8,1724704910505575978,0,0 -9,1724704912243846744,0,0 -10,1724704914043144645,0,0 -11,1724704915700156434,0,0 -12,1724704917320438199,0,0 -13,1724704919203961617,0,0 -14,1724704920837699098,0,0 -15,1724704922533956289,0,0 -16,1724704924087413465,0,0 -17,1724704925719698588,6292,0 -18,1724704927325925412,0,0 -19,1724704928943628393,0,0 -20,1724704930672307714,901306,0 -21,1724704932524613707,1416338,0 -22,1724704934357723727,257516,0 -23,1724704936068364138,578997,0 -24,1724704937739358115,1029328,0 -25,1724704939552856952,1029328,0 -26,1724704941407432156,0,0 -27,1724704943010450214,1222327,0 -28,1724704944915416954,964995,0 -29,1724704946889445958,450283,0 -30,1724704948527609560,836017,0 -31,1724704950272750645,1093253,0 -32,1724704951984462268,643090,0 -33,1724704953724233355,578781,0 -34,1724704955374402204,900326,0 -35,1724704957064974898,1157658,0 -36,1724704958981474451,450307,0 -37,1724704960637623768,707663,0 -38,1724704962415130230,771996,0 -39,1724704964192359496,900494,0 -40,1724704965914941004,385854,0 -41,1724704967549885426,900326,0 -42,1724704969392377601,1028944,0 -43,1724704971084212961,514472,0 -44,1724704972850674645,643090,0 -45,1724704974533840300,836017,0 -46,1724704976251630295,836185,0 -47,1724704977962415136,514664,0 -48,1724704979713855789,836329,0 -49,1724704981486039156,1029328,0 -50,1724704983208827123,450331,0 -51,1724704984775563932,900662,0 -52,1724704986530738096,578997,0 -53,1724704988290550649,964779,0 -54,1724704990030449603,514472,0 -55,1724704991683979602,836017,0 -56,1724704993314944383,385854,0 -57,1724704994953393731,1157898,0 -58,1724704996710743372,643330,0 diff --git a/2024-08-26-23-07-43-3807062-block-times.csv b/2024-08-26-23-07-43-3807062-block-times.csv deleted file mode 100644 index 847aefeeed..0000000000 --- a/2024-08-26-23-07-43-3807062-block-times.csv +++ /dev/null @@ -1,88 +0,0 @@ -height,block time,block size,last commit round -1,1724706096464823000,0,0 -2,1724706128528025938,0,0 -3,1724706130061465997,0,0 -4,1724706131777187372,0,0 -5,1724706133283712946,0,0 -6,1724706134956037200,0,0 -7,1724706136821176396,0,0 -8,1724706138565670408,0,0 -9,1724706140416159168,0,0 -10,1724706142128938435,0,0 -11,1724706143815618571,0,0 -12,1724706145558321388,0,0 -13,1724706147151876390,0,0 -14,1724706148842580588,0,0 -15,1724706150570209835,0,0 -16,1724706152159755521,0,0 -17,1724706153920814038,6292,0 -18,1724706155538463181,0,0 -19,1724706157203137101,0,0 -20,1724706158826400199,6292,0 -21,1724706160431908445,1293872,0 -22,1724706162183624987,1293872,0 -23,1724706164009931933,321803,0 -24,1724706165648267212,2639125,0 -25,1724706167716422152,4505242,0 -26,1724706169777288045,2446126,0 -27,1724706171725559391,3796153,0 -28,1724706173897660744,4374644,0 -29,1724706175810127130,2058608,0 -30,1724706177690139988,3216434,0 -31,1724706179640492146,4567115,0 -32,1724706181579042717,2251415,0 -33,1724706183437797108,2701314,0 -34,1724706185288891925,4694557,0 -35,1724706187332070521,2379433,0 -36,1724706189235753531,2765359,0 -37,1724706191061466911,4116256,0 -38,1724706192947802424,3344572,0 -39,1724706194852199175,1929438,0 -40,1724706196610336513,3795167,0 -41,1724706198472920463,4438281,0 -42,1724706200426924905,1608229,0 -43,1724706202171367952,3215666,0 -44,1724706204188516291,4887484,0 -45,1724706206261243835,2186578,0 -46,1724706208213991767,2765503,0 -47,1724706210084041078,4759442,0 -48,1724706212071198254,2572696,0 -49,1724706214058086073,2830412,0 -50,1724706216000093231,4310311,0 -51,1724706218010100969,2894937,0 -52,1724706220068397310,2894817,0 -53,1724706221944195323,4374116,0 -54,1724706223926045912,3087552,0 -55,1724706226039631759,2508459,0 -56,1724706227907457301,4437873,0 -57,1724706229801093162,3280287,0 -58,1724706231777898784,2122557,0 -59,1724706233778633487,4374092,0 -60,1724706235801251742,3473406,0 -61,1724706237811683762,2058440,0 -62,1724706239655199745,3987686,0 -63,1724706241646355120,4180733,0 -64,1724706243684711216,1800748,0 -65,1724706245461569519,3280527,0 -66,1724706247398194185,5017254,0 -67,1724706249436572360,1543920,0 -68,1724706251151227456,3151597,0 -69,1724706253161195402,5145488,0 -70,1724706255216699630,1929486,0 -71,1724706257118773252,2830484,0 -72,1724706259051316275,5339639,0 -73,1724706261192618523,2122893,0 -74,1724706263009350066,2444534,0 -75,1724706264905152768,4502638,0 -76,1724706267001315926,3087504,0 -77,1724706268946885191,2444006,0 -78,1724706270853085185,4180085,0 -79,1724706272827386622,3601304,0 -80,1724706274731515111,2186506,0 -81,1724706276674574306,4373012,0 -82,1724706278659816316,3408425,0 -83,1724706280525741006,1607797,0 -84,1724706282282222101,3794687,0 -85,1724706284461513839,4888396,0 -86,1724706286424541020,1350585,0 -87,1724706288188335065,3731266,0 diff --git a/2024-08-28-19-07-47-4021c9f-block-times.csv b/2024-08-28-19-07-47-4021c9f-block-times.csv deleted file mode 100644 index 05b6ac706b..0000000000 --- a/2024-08-28-19-07-47-4021c9f-block-times.csv +++ /dev/null @@ -1,67 +0,0 @@ -height,block time,block size,last commit round -1,1724864500551138000,0,0 -2,1724864537648455436,0,1 -3,1724864539556286784,0,0 -4,1724864541517547304,0,0 -5,1724864543282750036,0,0 -6,1724864545204118562,0,0 -7,1724864546959576099,0,0 -8,1724864548623916075,0,0 -9,1724864550308004360,0,0 -10,1724864551970337369,0,0 -11,1724864553722932000,0,0 -12,1724864555350267493,0,0 -13,1724864556952283168,6292,0 -14,1724864558748443823,0,0 -15,1724864560384946558,6292,0 -16,1724864561994489323,0,0 -17,1724864563536474576,515032,0 -18,1724864565176902286,1293872,0 -19,1724864566974727580,2452464,0 -20,1724864568945547303,1351867,0 -21,1724864570631809850,1351453,0 -22,1724864572297160758,3217432,0 -23,1724864574403483115,4311737,0 -24,1724864576396038466,2445666,0 -25,1724864578312657797,3538315,0 -26,1724864580311599068,3859860,0 -27,1724864582282685825,2573128,0 -28,1724864584164608809,3473190,0 -29,1724864586087412528,3923497,0 -30,1724864588108844204,2379985,0 -31,1724864590075633953,3279855,0 -32,1724864591940309298,4244514,0 -33,1724864593863467557,2379577,0 -34,1724864595776318708,3280287,0 -35,1724864597758235613,3987926,0 -36,1724864599647342416,2637077,0 -37,1724864601552087311,2508363,0 -38,1724864603441088314,4373612,0 -39,1724864605423586007,3023075,0 -40,1724864607317411746,2637053,0 -41,1724864609191948316,3472758,0 -42,1724864611109281655,3472806,0 -43,1724864612991274369,2701242,0 -44,1724864614897979143,3537763,0 -45,1724864616868881139,3666429,0 -46,1724864618779542247,2251103,0 -47,1724864620724827142,3409601,0 -48,1724864622573189547,4181477,0 -49,1724864624583877326,2251535,0 -50,1724864626521766802,3537691,0 -51,1724864628545633654,4116544,0 -52,1724864630443710424,2444342,0 -53,1724864632336071512,2830244,0 -54,1724864634237341132,4245210,0 -55,1724864636186996955,2765719,0 -56,1724864638031415669,2636981,0 -57,1724864639905499401,3730594,0 -58,1724864641802203164,3344668,0 -59,1724864643655373042,2444462,0 -60,1724864645549784438,3795047,0 -61,1724864647433931486,3409001,0 -62,1724864649385612881,2186626,0 -63,1724864651264010613,3408953,0 -64,1724864653165488968,4245138,0 -65,1724864655049810235,2251487,0 -66,1724864656968604728,3216146,0 diff --git a/2024-08-29-14-17-59-4021c9f-block-times.csv b/2024-08-29-14-17-59-4021c9f-block-times.csv deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/user/tx_client.go b/pkg/user/tx_client.go index e8fa1cd408..6deed1c342 100644 --- a/pkg/user/tx_client.go +++ b/pkg/user/tx_client.go @@ -21,6 +21,7 @@ import ( sdktx "github.com/cosmos/cosmos-sdk/types/tx" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/rpc/core" "google.golang.org/grpc" "github.com/celestiaorg/celestia-app/v3/app" @@ -434,7 +435,7 @@ func (client *TxClient) ConfirmTx(ctx context.Context, txHash string) (*TxRespon if resp != nil { switch resp.Status { - case "PENDING": + case core.TxStatusPending: // Continue polling if the transaction is still pending select { case <-ctx.Done(): @@ -442,7 +443,7 @@ func (client *TxClient) ConfirmTx(ctx context.Context, txHash string) (*TxRespon case <-pollTicker.C: continue } - case "COMMITTED": + case core.TxStatusCommitted: txResponse := &TxResponse{ Height: resp.Height, TxHash: txHash, @@ -454,15 +455,16 @@ func (client *TxClient) ConfirmTx(ctx context.Context, txHash string) (*TxRespon Code: resp.ExecutionCode, ErrorLog: resp.Error, } + client.deleteFromTxTracker(txHash) return nil, executionErr } client.deleteFromTxTracker(txHash) return txResponse, nil - case "EVICTED": + case core.TxStatusEvicted: return nil, client.handleEvictions(txHash) default: client.deleteFromTxTracker(txHash) - return nil, fmt.Errorf("unknown tx: %s", txHash) + return nil, fmt.Errorf("transaction with hash %s not found; it was likely rejected", txHash) } } } diff --git a/test/e2e/experiment/compact_blocks/main.go b/test/e2e/experiment/compact_blocks/main.go index 0e6825c2ae..511666315d 100644 --- a/test/e2e/experiment/compact_blocks/main.go +++ b/test/e2e/experiment/compact_blocks/main.go @@ -153,6 +153,7 @@ func Run() error { if err != nil { return err } + log.Println("--- RUNNING TESTNET") for { select { case <-heightTicker.C: diff --git a/test/e2e/simple.go b/test/e2e/simple.go index 1a9bad1eb5..8dab0278eb 100644 --- a/test/e2e/simple.go +++ b/test/e2e/simple.go @@ -57,7 +57,6 @@ func E2ESimple(logger *log.Logger) error { testnet.NoError("failed to start testnets", testNet.Start(ctx)) logger.Println("Waiting for 30 seconds to produce blocks") - // wait for 30 seconds time.Sleep(30 * time.Second) logger.Println("Reading blockchain headers") diff --git a/test/e2e/testnet/testnet.go b/test/e2e/testnet/testnet.go index 8cdba539b0..7cc74fb011 100644 --- a/test/e2e/testnet/testnet.go +++ b/test/e2e/testnet/testnet.go @@ -393,11 +393,10 @@ func (t *Testnet) WaitToSync(ctx context.Context) error { break } } else { - log.Info().Err(err).Str("name", node.Name).Msg( - "getting status") + err = errors.New("error getting status") } if i == 9 { - return fmt.Errorf("failed to start node %s", node.Name) + return fmt.Errorf("failed to start node %s: %w", node.Name, err) } log.Info().Str("name", node.Name).Int("attempt", i).Msg( "node is not synced yet, waiting...")