Add Chain ID onto the Dymint block and use it instead of the namespac… (

#167) * Add Chain ID onto the Dymint block and use it instead of the namespace-id * add chain-id to toProto method * update dymension version
dymensionxyz · Dec 22, 2022 · 8ec3b08 · 8ec3b08
1 parent ee6ae99
commit 8ec3b08
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 58 deletions.
diff --git a/conv/abci/block.go b/conv/abci/block.go
@@ -1,8 +1,6 @@
 package abci
 
 import (
-	"encoding/hex"
-	"strings"
 	"time"
 
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
@@ -20,9 +18,8 @@ func ToABCIHeaderPB(header *types.Header) tmproto.Header {
 			Block: header.Version.Block,
 			App:   header.Version.App,
 		},
-		ChainID: strings.ToUpper(hex.EncodeToString(header.NamespaceID[:])),
-		Height:  int64(header.Height),
-		Time:    time.Unix(0, int64(header.Time)),
+		Height: int64(header.Height),
+		Time:   time.Unix(0, int64(header.Time)),
 		LastBlockId: tmproto.BlockID{
 			Hash: header.LastHeaderHash[:],
 			PartSetHeader: tmproto.PartSetHeader{
@@ -39,6 +36,7 @@ func ToABCIHeaderPB(header *types.Header) tmproto.Header {
 		LastResultsHash:    header.LastResultsHash[:],
 		EvidenceHash:       new(tmtypes.EvidenceData).Hash(),
 		ProposerAddress:    header.ProposerAddress,
+		ChainID:            header.ChainID,
 	}
 }
 
@@ -50,9 +48,8 @@ func ToABCIHeader(header *types.Header) tmtypes.Header {
 			Block: header.Version.Block,
 			App:   header.Version.App,
 		},
-		Height:  int64(header.Height),
-		Time:    time.Unix(0, int64(header.Time)),
-		ChainID: strings.ToUpper(hex.EncodeToString(header.NamespaceID[:])),
+		Height: int64(header.Height),
+		Time:   time.Unix(0, int64(header.Time)),
 		LastBlockID: tmtypes.BlockID{
 			Hash: header.LastHeaderHash[:],
 			PartSetHeader: tmtypes.PartSetHeader{
@@ -69,6 +66,7 @@ func ToABCIHeader(header *types.Header) tmtypes.Header {
 		LastResultsHash:    header.LastResultsHash[:],
 		EvidenceHash:       new(tmtypes.EvidenceData).Hash(),
 		ProposerAddress:    header.ProposerAddress,
+		ChainID:            header.ChainID,
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -77,7 +77,7 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
-	github.com/dymensionxyz/dymension v0.1.0-alpha.0.20221219141547-b43279e94b18
+	github.com/dymensionxyz/dymension v0.1.0-alpha.0.20221222094743-771d37d941db
 	github.com/elastic/gosigar v0.14.2 // indirect
 	github.com/flynn/noise v1.0.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect

diff --git a/go.sum b/go.sum
@@ -277,8 +277,8 @@ github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQx
 github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/dymensionxyz/cosmosclient v0.2.0-alpha h1:x8UCXtWyZc7TXw99VH83ld2YD21d5m4fJx5k8zbdFj4=
 github.com/dymensionxyz/cosmosclient v0.2.0-alpha/go.mod h1:Fxwqa+T2fG+Q1cK5niy+WE9L1ul1nf1fF6gi3nwCqVE=
-github.com/dymensionxyz/dymension v0.1.0-alpha.0.20221219141547-b43279e94b18 h1:y7H8mQuHziM67cX0hvo+s6AGpnzL4Q6QgClY7XwIxvo=
-github.com/dymensionxyz/dymension v0.1.0-alpha.0.20221219141547-b43279e94b18/go.mod h1:hYBEfiA8fOOkQ5H1cmJYfBIH3cVoFmGFqshayV8OQ54=
+github.com/dymensionxyz/dymension v0.1.0-alpha.0.20221222094743-771d37d941db h1:xuLQHpXwBI0sZKmYiZM1ZBWHKOsDHSJd2SvEgNJHOuU=
+github.com/dymensionxyz/dymension v0.1.0-alpha.0.20221222094743-771d37d941db/go.mod h1:3ufLzwMgEhOeQN8O/lSXOjHft/06FofFAEVJoRW9QIE=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=

diff --git a/proto/types/dymint/dymint.proto b/proto/types/dymint/dymint.proto
@@ -51,9 +51,11 @@ message Header {
 	// pubkey can't be recovered by the signature (e.g. ed25519).
 	bytes proposer_address = 11;
 
-
 	// Hash of block aggregator set, at a time of block creation
 	bytes aggregators_hash = 12;
+
+	// Chain ID the block belongs to
+	string chain_id = 13;
 }
 
 message Commit {

diff --git a/state/executor.go b/state/executor.go
@@ -96,6 +96,7 @@ func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, las
 				Block: state.Version.Consensus.Block,
 				App:   state.Version.Consensus.App,
 			},
+			ChainID:         e.chainID,
 			NamespaceID:     e.namespaceID,
 			Height:          height,
 			Time:            uint64(time.Now().UTC().UnixNano()),

diff --git a/types/block.go b/types/block.go
@@ -38,6 +38,9 @@ type Header struct {
 
 	// Hash of block aggregator set, at a time of block creation
 	AggregatorsHash [32]byte
+
+	// The Chain ID
+	ChainID string
 }
 
 var _ encoding.BinaryMarshaler = &Header{}

diff --git a/types/hashing.go b/types/hashing.go
@@ -1,8 +1,6 @@
 package types
 
 import (
-	"encoding/hex"
-	"strings"
 	"time"
 
 	tmversion "github.com/tendermint/tendermint/proto/tendermint/version"
@@ -16,9 +14,8 @@ func (h *Header) Hash() [32]byte {
 			Block: h.Version.Block,
 			App:   h.Version.App,
 		},
-		Height:  int64(h.Height),
-		Time:    time.Unix(0, int64(h.Time)),
-		ChainID: strings.ToUpper(hex.EncodeToString(h.NamespaceID[:])),
+		Height: int64(h.Height),
+		Time:   time.Unix(0, int64(h.Time)),
 		LastBlockID: tmtypes.BlockID{
 			Hash: h.LastHeaderHash[:],
 			PartSetHeader: tmtypes.PartSetHeader{
@@ -35,6 +32,7 @@ func (h *Header) Hash() [32]byte {
 		LastResultsHash:    h.LastResultsHash[:],
 		EvidenceHash:       new(tmtypes.EvidenceData).Hash(),
 		ProposerAddress:    h.ProposerAddress,
+		ChainID:            h.ChainID,
 	}
 	var hash [32]byte
 	copy(hash[:], abciHeader.Hash())

diff --git a/types/pb/dymint/dymint.pb.go b/types/pb/dymint/dymint.pb.go
diff --git a/types/serialization.go b/types/serialization.go
@@ -88,6 +88,7 @@ func (h *Header) ToProto() *pb.Header {
 		NamespaceId:     h.NamespaceID[:],
 		Height:          h.Height,
 		Time:            h.Time,
+		ChainId:         h.ChainID,
 		LastHeaderHash:  h.LastHeaderHash[:],
 		LastCommitHash:  h.LastCommitHash[:],
 		DataHash:        h.DataHash[:],
@@ -103,6 +104,7 @@ func (h *Header) ToProto() *pb.Header {
 func (h *Header) FromProto(other *pb.Header) error {
 	h.Version.Block = other.Version.Block
 	h.Version.App = other.Version.App
+	h.ChainID = other.ChainId
 	if !safeCopy(h.NamespaceID[:], other.NamespaceId) {
 		return errors.New("invalid length of 'NamespaceId'")
 	}