Merge branch 'master' into feat/municipal-inflation

fetchai · Aug 9, 2023 · 2e685d8 · 2e685d8
2 parents 3c03695 + e5fe425
commit 2e685d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cmd/fetchd/cmd/root.go b/cmd/fetchd/cmd/root.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"bufio"
 	"errors"
+	"github.com/cosmos/cosmos-sdk/client/pruning"
 	"io"
 	"math/big"
 	"os"
@@ -145,6 +146,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		queryCommand(),
 		txCommand(),
 		keys.Commands(app.DefaultNodeHome),
+		pruning.PruningCmd(a.newApp),
 	)
 }
 

diff --git a/go.mod b/go.mod
@@ -133,7 +133,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.5-0.20230630122135-0c003dfabb6f
+replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.5-0.20230809110550-a93921cf1837
 
 replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
 

diff --git a/go.sum b/go.sum
@@ -230,8 +230,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fetchai/cosmos-sdk v0.18.5-0.20230630122135-0c003dfabb6f h1:m9PSj1gMyGeolZoa+eW+DSQbJGfaa48yp+ohKnPj9kw=
-github.com/fetchai/cosmos-sdk v0.18.5-0.20230630122135-0c003dfabb6f/go.mod h1:Izf5d8rmo/AO2YFWH6O8jZmK3dCHZcCOLggS7HtjB8c=
+github.com/fetchai/cosmos-sdk v0.18.5-0.20230809110550-a93921cf1837 h1:U8dAdetsb2bJPavS1H1UDty9WNlcDeUSXxPgVWB7JEM=
+github.com/fetchai/cosmos-sdk v0.18.5-0.20230809110550-a93921cf1837/go.mod h1:Izf5d8rmo/AO2YFWH6O8jZmK3dCHZcCOLggS7HtjB8c=
 github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=