Update versions for v1.10.18 (#2548)

network/p2p/network_test.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/ids"

network/peer/peer.go

@@ -1102,8 +1102,8 @@ func (p *peer) handleHandshake(msg *p2p.Handshake) {
 
 	peerIPs := p.Network.Peers(p.id, knownPeers, salt)
 
-	// We bypass throttling here to ensure that the peerlist message is
-	// acknowledged timely.
+	// We bypass throttling here to ensure that the handshake message is
+	// acknowledged correctly.
 	peerListMsg, err := p.Config.MessageCreator.PeerList(peerIPs, true /*=bypassThrottling*/)
 	if err != nil {
 		p.Log.Error("failed to create peer list handshake message",

utils/sorting_test.go

@@ -14,14 +14,7 @@ var _ Sortable[sortable] = sortable(0)
 type sortable int
 
 func (s sortable) Compare(other sortable) int {
-	switch {
-	case s < other:
-		return -1
-	case s > other:
-		return 1
-	default:
-		return 0
-	}
+	return Compare(s, other)
 }
 
 func TestSortSliceSortable(t *testing.T) {

version/compatibility.json

@@ -1,4 +1,7 @@
 {
+  "31": [
+    "v1.10.18"
+  ],
   "30": [
     "v1.10.15",
     "v1.10.16",

version/constants.go

@@ -15,17 +15,18 @@ import (
 
 const (
 	Client = "avalanchego"
-	// RPCChainVMProtocol should be bumped anytime changes are made which require
-	// the plugin vm to upgrade to latest avalanchego release to be compatible.
-	RPCChainVMProtocol uint = 30
+	// RPCChainVMProtocol should be bumped anytime changes are made which
+	// require the plugin vm to upgrade to latest avalanchego release to be
+	// compatible.
+	RPCChainVMProtocol uint = 31
 )
 
 // These are globals that describe network upgrades and node versions
 var (
 	Current = &Semantic{
 		Major: 1,
 		Minor: 10,
-		Patch: 17,
+		Patch: 18,
 	}
 	CurrentApp = &Application{
 		Name:  Client,

vms/avm/network/network.go

@@ -204,8 +204,7 @@ func (n *Network) AppGossip(ctx context.Context, nodeID ids.NodeID, msgBytes []b
 		return nil
 	}
 
-	err = n.mempool.Add(tx)
-	if err == nil {
+	if err := n.mempool.Add(tx); err == nil {
 		txID := tx.ID()
 		n.txPushGossiper.Add(tx)
 		if err := n.txPushGossiper.Gossip(ctx); err != nil {

vms/platformvm/block/executor/verifier.go

@@ -51,7 +51,8 @@ func (v *verifier) BanffCommitBlock(b *block.BanffCommitBlock) error {
 }
 
 func (v *verifier) BanffProposalBlock(b *block.BanffProposalBlock) error {
-	if !v.txExecutorBackend.Config.IsDurangoActivated(b.Timestamp()) && len(b.Transactions) != 0 {
+	nextChainTime := b.Timestamp()
+	if !v.txExecutorBackend.Config.IsDurangoActivated(nextChainTime) && len(b.Transactions) != 0 {
 		return errBanffProposalBlockWithMultipleTransactions
 	}
 
@@ -66,7 +67,6 @@ func (v *verifier) BanffProposalBlock(b *block.BanffProposalBlock) error {
 	}
 
 	// Apply the changes, if any, from advancing the chain time.
-	nextChainTime := b.Timestamp()
 	changes, err := executor.AdvanceTimeTo(
 		v.txExecutorBackend,
 		onDecisionState,
@@ -219,7 +219,7 @@ func (v *verifier) ApricotAtomicBlock(b *block.ApricotAtomicBlock) error {
 
 	atomicExecutor.OnAccept.AddTx(b.Tx, status.Committed)
 
-	if err := v.verifyUniqueInputs(b.Parent(), atomicExecutor.Inputs); err != nil {
+	if err := v.verifyUniqueInputs(parentID, atomicExecutor.Inputs); err != nil {
 		return err
 	}
 

vms/platformvm/vm.go

@@ -302,6 +302,9 @@ func (vm *VM) pruneMempool() error {
 	vm.ctx.Lock.Lock()
 	defer vm.ctx.Lock.Unlock()
 
+	// Packing all of the transactions in order performs additional checks that
+	// the MempoolTxVerifier doesn't include. So, evicting transactions from
+	// here is expected to happen occasionally.
 	blockTxs, err := vm.Builder.PackBlockTxs(math.MaxInt)
 	if err != nil {
 		return err