only allow new snapshot with common encoding version

MixinNetwork · Oct 3, 2022 · 2358988 · 2358988
1 parent 38dc676
commit 2358988
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/kernel/cosi.go b/kernel/cosi.go
@@ -164,7 +164,7 @@ func (chain *Chain) checkActionSanity(m *CosiAction) error {
 	if s == nil {
 		return fmt.Errorf("no snapshot in cosi")
 	}
-	if s.Version != common.SnapshotVersionMsgpackEncoding && s.Version != common.SnapshotVersionCommonEncoding {
+	if s.Version != common.SnapshotVersionCommonEncoding {
 		return fmt.Errorf("invalid snapshot version %d", s.Version)
 	}
 	if s.NodeId != chain.ChainId {

diff --git a/kernel/election.go b/kernel/election.go
@@ -201,7 +201,7 @@ func (node *Node) tryToSendRemoveTransaction() error {
 	}
 	chain := node.getOrCreateChain(node.IdForNetwork)
 	s := &common.Snapshot{
-		Version: chain.node.SnapshotVersion(),
+		Version: common.SnapshotVersionCommonEncoding,
 		NodeId:  node.IdForNetwork,
 	}
 	s.AddSoleTransaction(tx.PayloadHash())
@@ -327,7 +327,7 @@ func (chain *Chain) tryToSendAcceptTransaction() error {
 		return err
 	}
 	s := &common.Snapshot{
-		Version: chain.node.SnapshotVersion(),
+		Version: common.SnapshotVersionCommonEncoding,
 		NodeId:  chain.ChainId,
 	}
 	s.AddSoleTransaction(ver.PayloadHash())

diff --git a/kernel/mint.go b/kernel/mint.go
@@ -241,7 +241,7 @@ func (node *Node) tryToMintKernelNode() error {
 		return err
 	}
 	s := &common.Snapshot{
-		Version: node.SnapshotVersion(),
+		Version: common.SnapshotVersionCommonEncoding,
 		NodeId:  node.IdForNetwork,
 	}
 	s.AddSoleTransaction(signed.PayloadHash())

diff --git a/kernel/node.go b/kernel/node.go
@@ -320,7 +320,6 @@ func (node *Node) LoadConsensusNodes() error {
 	return nil
 }
 
-// FIXME remove this after all nodes upgraded
 func (node *Node) SnapshotVersion() uint8 {
 	if node.networkId.String() != config.MainnetId {
 		return common.SnapshotVersionCommonEncoding
@@ -332,6 +331,7 @@ func (node *Node) SnapshotVersion() uint8 {
 	return common.SnapshotVersionMsgpackEncoding
 }
 
+// this is needed to handle mainnet transaction version upgrading fork
 func (node *Node) NewTransaction(assetId crypto.Hash) *common.Transaction {
 	if node.SnapshotVersion() < common.SnapshotVersionCommonEncoding {
 		return common.NewTransactionV2(assetId)

diff --git a/kernel/queue.go b/kernel/queue.go
@@ -37,7 +37,7 @@ func (node *Node) QueueTransaction(tx *common.VersionedTransaction) (string, err
 		return "", err
 	}
 	s := &common.Snapshot{
-		Version: node.SnapshotVersion(),
+		Version: common.SnapshotVersionCommonEncoding,
 		NodeId:  node.IdForNetwork,
 	}
 	s.AddSoleTransaction(tx.PayloadHash())
@@ -84,7 +84,7 @@ func (node *Node) LoopCacheQueue() error {
 			nbor := neighbors[int(clock.Now().UnixNano())%len(neighbors)]
 			node.SendTransactionToPeer(nbor.IdForNetwork, hash)
 			s := &common.Snapshot{
-				Version: node.SnapshotVersion(),
+				Version: common.SnapshotVersionCommonEncoding,
 				NodeId:  node.IdForNetwork,
 			}
 			s.AddSoleTransaction(tx.PayloadHash())
@@ -129,7 +129,7 @@ func (chain *Chain) clearAndQueueSnapshotOrPanic(s *common.Snapshot) error {
 		panic("should never be here")
 	}
 	ns := &common.Snapshot{
-		Version: chain.node.SnapshotVersion(),
+		Version: common.SnapshotVersionCommonEncoding,
 		NodeId:  s.NodeId,
 	}
 	ns.AddSoleTransaction(s.SoleTransaction())