From c909f722f917f9d602146b8bdd5fe48026e098e0 Mon Sep 17 00:00:00 2001 From: swelf Date: Fri, 8 Nov 2024 13:47:09 +0300 Subject: [PATCH 1/3] really removes tmp dir after cli run --- cmd/neutrond/root.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 10ef9d36c..883178e3b 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -51,6 +51,9 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { // create a temporary application for use in constructing query + tx commands initAppOptions := viper.New() tempDir := tempDir() + // cleanup temp dir after we are done with the tempApp, so we don't leave behind a + // new temporary directory for every invocation. See https://github.com/CosmWasm/wasmd/issues/2017 + defer os.RemoveAll(tempDir) initAppOptions.Set(flags.FlagHome, tempDir) tempApplication := app.New( log.NewNopLogger(), @@ -139,7 +142,6 @@ func tempDir() string { if err != nil { dir = app.DefaultNodeHome } - defer os.RemoveAll(dir) return dir } From 67679ca1c29fd19c77bb5c5fd0df843941acc72b Mon Sep 17 00:00:00 2001 From: swelf Date: Mon, 11 Nov 2024 11:12:13 +0300 Subject: [PATCH 2/3] cometbft updated --- go.mod | 1 + go.sum | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index bca0493ce..842e2d40a 100644 --- a/go.mod +++ b/go.mod @@ -220,6 +220,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron + github.com/cometbft/cometbft => github.com/neutron-org/cometbft v0.0.0-20241107091756-6a4bf72dc8c2 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53 // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version diff --git a/go.sum b/go.sum index fd664db6f..659a531ed 100644 --- a/go.sum +++ b/go.sum @@ -346,8 +346,6 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v0.38.11 h1:6bNDUB8/xq4uYonYwIfGc9OqK1ZH4NkdaMmR1LZIJqk= -github.com/cometbft/cometbft v0.38.11/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= github.com/cometbft/cometbft-db v0.12.0 h1:v77/z0VyfSU7k682IzZeZPFZrQAKiQwkqGN0QzAjMi0= github.com/cometbft/cometbft-db v0.12.0/go.mod h1:aX2NbCrjNVd2ZajYxt1BsiFf/Z+TQ2MN0VxdicheYuw= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= @@ -847,6 +845,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8GaZ4ol8Hdk8I= github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= +github.com/neutron-org/cometbft v0.0.0-20241107091756-6a4bf72dc8c2 h1:+UlgTyVhhNXi1fl+5HwSuvM+1BoFyiVtk1klysB3qlg= +github.com/neutron-org/cometbft v0.0.0-20241107091756-6a4bf72dc8c2/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53 h1:7FJOHOt9F0oea0b5jrn090u/zn7+LdBmT6ZDmrJtTqs= github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53/go.mod h1:TMH6wpoYBcg7Cp5BEg8fneLr+8XloNQkf2MRNF9V6JE= github.com/neutron-org/wasmd v0.53.0-neutron h1:Dv1VP1+QjYeb6RMo03sxw0Pe42JU0MPxefwNaG22KVs= From 564e011a81af4bb412effabca36d02e542a06cde Mon Sep 17 00:00:00 2001 From: swelf Date: Mon, 11 Nov 2024 14:05:09 +0300 Subject: [PATCH 3/3] new cometbft --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 842e2d40a..24c48db9f 100644 --- a/go.mod +++ b/go.mod @@ -220,7 +220,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron - github.com/cometbft/cometbft => github.com/neutron-org/cometbft v0.0.0-20241107091756-6a4bf72dc8c2 + github.com/cometbft/cometbft => github.com/neutron-org/cometbft v0.0.0-20241111105801-a7fe160b0b62 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53 // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version diff --git a/go.sum b/go.sum index 659a531ed..3ad97338a 100644 --- a/go.sum +++ b/go.sum @@ -845,8 +845,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8GaZ4ol8Hdk8I= github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= -github.com/neutron-org/cometbft v0.0.0-20241107091756-6a4bf72dc8c2 h1:+UlgTyVhhNXi1fl+5HwSuvM+1BoFyiVtk1klysB3qlg= -github.com/neutron-org/cometbft v0.0.0-20241107091756-6a4bf72dc8c2/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= +github.com/neutron-org/cometbft v0.0.0-20241111105801-a7fe160b0b62 h1:erXDgRxrEtWScO9i8ZYjr0cnjxTJ0BT+WrUsRMbMVSU= +github.com/neutron-org/cometbft v0.0.0-20241111105801-a7fe160b0b62/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53 h1:7FJOHOt9F0oea0b5jrn090u/zn7+LdBmT6ZDmrJtTqs= github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53/go.mod h1:TMH6wpoYBcg7Cp5BEg8fneLr+8XloNQkf2MRNF9V6JE= github.com/neutron-org/wasmd v0.53.0-neutron h1:Dv1VP1+QjYeb6RMo03sxw0Pe42JU0MPxefwNaG22KVs=