Merge branch 'master' into ty/3729-tx_block

cosmos · Feb 22, 2022 · 25e1c3e · 25e1c3e
2 parents be95f40 + e66b8ef
commit 25e1c3e
Show file tree

Hide file tree

Showing 67 changed files with 3,793 additions and 106 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (gov) [\#11036](https://github.com/cosmos/cosmos-sdk/pull/11036) Add in-place migrations for 0.43->0.46. Add a `migrate v0.46` CLI command for v0.43->0.46 JSON genesis migration.
 * [\#11006](https://github.com/cosmos/cosmos-sdk/pull/11006) Add `debug pubkey-raw` command to allow inspecting of pubkeys in legacy bech32 format
 * (x/authz) [\#10714](https://github.com/cosmos/cosmos-sdk/pull/10714) Add support for pruning expired authorizations
+* [\#10015](https://github.com/cosmos/cosmos-sdk/pull/10015) ADR-040: ICS-23 proofs for SMT store
 
 ### API Breaking Changes
 
@@ -221,6 +222,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [\#11011](https://github.com/cosmos/cosmos-sdk/pull/11011) Remove burning of deposits when qourum is not reached on a governance proposal and when the deposit is not fully met. 
 * [\#11019](https://github.com/cosmos/cosmos-sdk/pull/11019) Add `MsgCreatePermanentLockedAccount` and CLI method for creating permanent locked account
 * (x/feegrant) [\#10830](https://github.com/cosmos/cosmos-sdk/pull/10830) Expired allowances will be pruned from state.
+* (x/authz,x/feegrant) [\#11214](https://github.com/cosmos/cosmos-sdk/pull/11214) Fix Amino JSON encoding of authz and feegrant Msgs to be consistent with other modules.
 
 ### Deprecated
 

diff --git a/codec/legacy/codec.go b/codec/legacy/codec.go
@@ -10,10 +10,9 @@ import (
 // has all Tendermint crypto and evidence types registered.
 //
 // TODO: Deprecated - remove this global.
-var Cdc *codec.LegacyAmino
+var Cdc = codec.NewLegacyAmino()
 
 func init() {
-	Cdc = codec.NewLegacyAmino()
 	cryptocodec.RegisterCrypto(Cdc)
 	codec.RegisterEvidences(Cdc)
 }

diff --git a/docs/core/encoding.md b/docs/core/encoding.md
@@ -67,6 +67,24 @@ Note, there are length-prefixed variants of the above functionality and this is
 typically used for when the data needs to be streamed or grouped together
 (e.g. `ResponseDeliverTx.Data`)
 
+#### Authz authorizations
+
+Since the `MsgExec` message type can contain different messages instances, it is important that developers
+add the following code inside the `init` method of their module's `codec.go` file:
+
+```go
+import "github.com/cosmos/cosmos-sdk/codec/legacy"
+
+init() {
+    // Register all Amino interfaces and concrete types on the global Amino codec so that this can later be
+    // used to properly serialize x/authz MsgExec instances
+    RegisterLegacyAminoCodec(legacy.Cdc)	
+}
+```
+
+This will allow the `x/authz` module to properly serialize and de-serializes `MsgExec` instances using Amino, 
+which is required when signing this kind of messages using a Ledger. 
+
 ### Gogoproto
 
 Modules are encouraged to utilize Protobuf encoding for their respective types. In the Cosmos SDK, we use the [Gogoproto](https://github.com/gogo/protobuf) specific implementation of the Protobuf spec that offers speed and DX improvements compared to the official [Google protobuf implementation](https://github.com/protocolbuffers/protobuf).

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/btcsuite/btcd v0.22.0-beta
 	github.com/cockroachdb/apd/v2 v2.0.2
 	github.com/coinbase/rosetta-sdk-go v0.7.2
-	github.com/confio/ics23/go v0.6.6
+	github.com/confio/ics23/go v0.7.0-rc
 	github.com/cosmos/btcutil v1.0.4
 	github.com/cosmos/cosmos-proto v1.0.0-alpha7
 	github.com/cosmos/cosmos-sdk/api v0.1.0-alpha4
@@ -18,6 +18,7 @@ require (
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/iavl v0.17.3
 	github.com/cosmos/ledger-cosmos-go v0.11.1
+	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/gogo/gateway v1.1.0
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/mock v1.6.0
@@ -72,7 +73,6 @@ require (
 	github.com/cosmos/ledger-go v0.9.2 // indirect
 	github.com/danieljoos/wincred v1.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
 	github.com/dgraph-io/ristretto v0.1.0 // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect

diff --git a/go.sum b/go.sum
@@ -259,8 +259,9 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/coinbase/rosetta-sdk-go v0.7.2 h1:uCNrASIyt7rV9bA3gzPG3JDlxVP5v/zLgi01GWngncM=
 github.com/coinbase/rosetta-sdk-go v0.7.2/go.mod h1:wk9dvjZFSZiWSNkFuj3dMleTA1adLFotg5y71PhqKB4=
-github.com/confio/ics23/go v0.6.6 h1:pkOy18YxxJ/r0XFDCnrl4Bjv6h4LkBSpLS6F38mrKL8=
 github.com/confio/ics23/go v0.6.6/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
+github.com/confio/ics23/go v0.7.0-rc h1:cH2I3xkPE6oD4tP5pmZDAfYq8V7VeXCr98X1MpARTaI=
+github.com/confio/ics23/go v0.7.0-rc/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg=
 github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
 github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
 github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ=

diff --git a/store/internal/proofs/create.go b/store/internal/proofs/create.go
@@ -15,25 +15,8 @@ var (
 	ErrEmptyKeyInData = errors.New("data contains empty key")
 )
 
-// TendermintSpec constrains the format from ics23-tendermint (crypto/merkle SimpleProof)
-var TendermintSpec = &ics23.ProofSpec{
-	LeafSpec: &ics23.LeafOp{
-		Prefix:       []byte{0},
-		Hash:         ics23.HashOp_SHA256,
-		PrehashValue: ics23.HashOp_SHA256,
-		Length:       ics23.LengthOp_VAR_PROTO,
-	},
-	InnerSpec: &ics23.InnerSpec{
-		ChildOrder:      []int32{0, 1},
-		MinPrefixLength: 1,
-		MaxPrefixLength: 1,  // fixed prefix + one child
-		ChildSize:       32, // (no length byte)
-		Hash:            ics23.HashOp_SHA256,
-	},
-}
-
 /*
-CreateMembershipProof will produce a CommitmentProof that the given key (and queries value) exists in the iavl tree.
+CreateMembershipProof will produce a CommitmentProof that the given key (and queries value) exists in the map.
 If the key doesn't exist in the tree, this will return an error.
 */
 func CreateMembershipProof(data map[string][]byte, key []byte) (*ics23.CommitmentProof, error) {
@@ -53,7 +36,7 @@ func CreateMembershipProof(data map[string][]byte, key []byte) (*ics23.Commitmen
 }
 
 /*
-CreateNonMembershipProof will produce a CommitmentProof that the given key doesn't exist in the iavl tree.
+CreateNonMembershipProof will produce a CommitmentProof that the given key doesn't exist in the map.
 If the key exists in the tree, this will return an error.
 */
 func CreateNonMembershipProof(data map[string][]byte, key []byte) (*ics23.CommitmentProof, error) {
@@ -111,8 +94,8 @@ func createExistenceProof(data map[string][]byte, key []byte) (*ics23.ExistenceP
 		return nil, fmt.Errorf("cannot make existence proof if key is not in map")
 	}
 
-	_, ics23, _ := sdkmaps.ProofsFromMap(data)
-	proof := ics23[string(key)]
+	_, proofs, _ := sdkmaps.ProofsFromMap(data)
+	proof := proofs[string(key)]
 	if proof == nil {
 		return nil, fmt.Errorf("returned no proof for key")
 	}

diff --git a/store/internal/proofs/create_test.go b/store/internal/proofs/create_test.go
@@ -36,12 +36,12 @@ func TestCreateMembership(t *testing.T) {
 			}
 
 			root := CalcRoot(data)
-			err = proof.GetExist().Verify(TendermintSpec, root, []byte(key), val)
+			err = proof.GetExist().Verify(ics23.TendermintSpec, root, []byte(key), val)
 			if err != nil {
 				t.Fatalf("Verifying Proof: %+v", err)
 			}
 
-			valid := ics23.VerifyMembership(TendermintSpec, root, proof, []byte(key), val)
+			valid := ics23.VerifyMembership(ics23.TendermintSpec, root, proof, []byte(key), val)
 			if !valid {
 				t.Fatalf("Membership Proof Invalid")
 			}
@@ -77,12 +77,12 @@ func TestCreateNonMembership(t *testing.T) {
 			}
 
 			root := CalcRoot(data)
-			err = proof.GetNonexist().Verify(TendermintSpec, root, []byte(key))
+			err = proof.GetNonexist().Verify(ics23.TendermintSpec, root, []byte(key))
 			if err != nil {
 				t.Fatalf("Verifying Proof: %+v", err)
 			}
 
-			valid := ics23.VerifyNonMembership(TendermintSpec, root, proof, []byte(key))
+			valid := ics23.VerifyNonMembership(ics23.TendermintSpec, root, proof, []byte(key))
 			if !valid {
 				t.Fatalf("Non Membership Proof Invalid")
 			}

diff --git a/store/rootmulti/proof.go b/store/rootmulti/proof.go
@@ -4,7 +4,6 @@ import (
 	"github.com/tendermint/tendermint/crypto/merkle"
 
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
-	"github.com/cosmos/cosmos-sdk/store/v2/smt"
 )
 
 // RequireProof returns whether proof is required for the subpath.
@@ -26,10 +25,3 @@ func DefaultProofRuntime() (prt *merkle.ProofRuntime) {
 	prt.RegisterOpDecoder(storetypes.ProofOpSimpleMerkleCommitment, storetypes.CommitmentOpDecoder)
 	return
 }
-
-// SMTProofRuntime returns a ProofRuntime for sparse merkle trees.
-func SMTProofRuntime() (prt *merkle.ProofRuntime) {
-	prt = merkle.NewProofRuntime()
-	prt.RegisterOpDecoder(smt.ProofType, smt.ProofDecoder)
-	return prt
-}
diff --git a/store/tools/ics23/Makefile b/store/tools/ics23/Makefile
@@ -0,0 +1,44 @@
+GO_RUN= go run -mod=readonly
+GENDIR ?= ./testdata
+
+.PHONY: testgen testgen-iavl testgen-smt testgen-simple
+
+# make sure we turn on go modules
+export GO111MODULE := on
+
+# Usage: GENDIR=/path/to/ics23/testdata/iavl make testgen-iavl
+
+testgen: testgen-iavl testgen-smt testgen-simple
+
+testgen-iavl:
+	@mkdir -p "$(GENDIR)"
+	$(GO_RUN) ./iavl/cmd/testgen-iavl exist left 987 > "$(GENDIR)"/exist_left.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl exist middle 812 > "$(GENDIR)"/exist_middle.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl exist right 1261 > "$(GENDIR)"/exist_right.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl nonexist left 813 > "$(GENDIR)"/nonexist_left.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl nonexist middle 691 > "$(GENDIR)"/nonexist_middle.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl nonexist right 1535 > "$(GENDIR)"/nonexist_right.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl batch 1801 20 0 > "$(GENDIR)"/batch_exist.json
+	$(GO_RUN) ./iavl/cmd/testgen-iavl batch 1807 0 20 > "$(GENDIR)"/batch_nonexist.json
+
+testgen-smt:
+	@mkdir -p "$(GENDIR)"
+	$(GO_RUN) ./smt/cmd/testgen-smt exist left 987 > "$(GENDIR)"/exist_left.json
+	$(GO_RUN) ./smt/cmd/testgen-smt exist middle 812 > "$(GENDIR)"/exist_middle.json
+	$(GO_RUN) ./smt/cmd/testgen-smt exist right 1261 > "$(GENDIR)"/exist_right.json
+	$(GO_RUN) ./smt/cmd/testgen-smt nonexist left 813 > "$(GENDIR)"/nonexist_left.json
+	$(GO_RUN) ./smt/cmd/testgen-smt nonexist middle 691 > "$(GENDIR)"/nonexist_middle.json
+	$(GO_RUN) ./smt/cmd/testgen-smt nonexist right 1535 > "$(GENDIR)"/nonexist_right.json
+	$(GO_RUN) ./smt/cmd/testgen-smt batch 1801 20 0 > "$(GENDIR)"/batch_exist.json
+	$(GO_RUN) ./smt/cmd/testgen-smt batch 1807 0 20 > "$(GENDIR)"/batch_nonexist.json
+
+testgen-simple:
+	@mkdir -p "$(GENDIR)"
+	$(GO_RUN) ./tendermint/cmd/testgen-simple exist left 987 > "$(GENDIR)"/exist_left.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple exist middle 812 > "$(GENDIR)"/exist_middle.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple exist right 1261 > "$(GENDIR)"/exist_right.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple nonexist left 813 > "$(GENDIR)"/nonexist_left.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple nonexist middle 691 > "$(GENDIR)"/nonexist_middle.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple nonexist right 1535 > "$(GENDIR)"/nonexist_right.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple batch 1801 20 0 > "$(GENDIR)"/batch_exist.json
+	$(GO_RUN) ./tendermint/cmd/testgen-simple batch 1807 0 20 > "$(GENDIR)"/batch_nonexist.json
diff --git a/store/tools/ics23/go.mod b/store/tools/ics23/go.mod
@@ -0,0 +1,44 @@
+module github.com/cosmos/cosmos-sdk/store/tools/ics23
+
+go 1.17
+
+require (
+	github.com/confio/ics23/go v0.6.7-0.20220201201850-606d5105384e
+	github.com/cosmos/cosmos-sdk v0.45.0
+	github.com/cosmos/iavl v0.17.3
+	github.com/lazyledger/smt v0.2.1-0.20210709230900-03ea40719554
+	github.com/tendermint/tendermint v0.34.14
+	github.com/tendermint/tm-db v0.6.4
+)
+
+require (
+	github.com/DataDog/zstd v1.4.5 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
+	github.com/dgraph-io/ristretto v0.0.3 // indirect
+	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/gogo/protobuf v1.3.3 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
+	github.com/google/btree v1.0.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/jmhodges/levigo v1.0.0 // indirect
+	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect
+	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
+	go.etcd.io/bbolt v1.3.5 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
+	golang.org/x/sys v0.0.0-20210903071746-97244b99971b // indirect
+	golang.org/x/text v0.3.6 // indirect
+	google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
+	google.golang.org/grpc v1.42.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+)
+
+replace github.com/cosmos/cosmos-sdk/store/tools/ics23 => ./
+
+replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1