fix relayer remote consumers list update

kernel/hack.go

@@ -3,6 +3,6 @@ package kernel
 const (
 	mainnetConsensusOperationElectionForkAt = uint64(1701388800000000000)
 	mainnetConsensusNodeRemovalTimeForkAt   = uint64(1706400000000000000)
-	mainnetMintDayGapSkipForkBatch          = uint64(1800)
+	mainnetMintDayGapSkipForkBatch          = uint64(1810)
 	mainnetNodeRemovalHackSnapshotHash      = "b5a9ab66e3b5d24328f8f87bc38e90f0c426dc38413200bb8ecf7f5b8607a5f9"
 )

kernel/node.go

@@ -414,12 +414,12 @@ func (node *Node) BuildAuthenticationMessage(relayerId crypto.Hash) []byte {
 	return data
 }
 
-func (node *Node) AuthenticateAs(recipientId crypto.Hash, msg []byte) (*network.AuthToken, error) {
+func (node *Node) AuthenticateAs(recipientId crypto.Hash, msg []byte, timeoutSec int64) (*network.AuthToken, error) {
 	if len(msg) != 137 {
 		return nil, fmt.Errorf("peer authentication message malformatted %d", len(msg))
 	}
 	ts := binary.BigEndian.Uint64(msg[:8])
-	if math.Abs(float64(clock.Now().Unix())-float64(ts)) > 5 {
+	if timeoutSec > 0 && math.Abs(float64(clock.Now().Unix())-float64(ts)) > float64(timeoutSec) {
 		return nil, fmt.Errorf("peer authentication message timeout %d %d", ts, clock.Now().Unix())
 	}
 

network/handle.go

@@ -64,7 +64,7 @@ type AuthToken struct {
 type SyncHandle interface {
 	GetCacheStore() *ristretto.Cache
 	BuildAuthenticationMessage(relayerId crypto.Hash) []byte
-	AuthenticateAs(recipientId crypto.Hash, msg []byte) (*AuthToken, error)
+	AuthenticateAs(recipientId crypto.Hash, msg []byte, timeoutSec int64) (*AuthToken, error)
 	BuildGraph() []*SyncPoint
 	UpdateSyncPoint(peerId crypto.Hash, points []*SyncPoint)
 	ReadAllNodesWithoutState() []crypto.Hash
@@ -410,7 +410,7 @@ func (me *Peer) loopHandlePeerMessage(peerId crypto.Hash, receive chan *PeerMess
 }
 
 func (me *Peer) relayOrHandlePeerMessage(relayerId crypto.Hash, msg *PeerMessage) error {
-	logger.Printf("me.relayOrHandlePeerMessage(%s, %s) => %s %v", me.Address, me.IdForNetwork, relayerId, msg)
+	logger.Printf("me.relayOrHandlePeerMessage(%s, %s) => %s %v", me.Address, me.IdForNetwork, relayerId, msg.Data)
 	if len(msg.Data) < 64 {
 		return nil
 	}
@@ -443,6 +443,7 @@ func (me *Peer) relayOrHandlePeerMessage(relayerId crypto.Hash, msg *PeerMessage
 		if !success {
 			return fmt.Errorf("peer send high timeout")
 		}
+		return nil
 	}
 	peer = me.remoteRelayers.Get(to)
 	if peer == nil || peer.IdForNetwork == relayerId {
@@ -470,7 +471,7 @@ func (me *Peer) updateRemoteRelayerConsumers(relayerId crypto.Hash, data []byte)
 	for c := len(data) / pl; c > 0; c-- {
 		var id crypto.Hash
 		copy(id[:], data[:32])
-		token, err := me.handle.AuthenticateAs(relayerId, data[32:pl])
+		token, err := me.handle.AuthenticateAs(relayerId, data[32:pl], 0)
 		if err != nil {
 			return nil
 		}

network/peer.go

@@ -192,7 +192,7 @@ func (me *Peer) ListenConsumers() error {
 
 		for !me.closing {
 			me.gossipRound.Clear()
-			neighbors := me.consumers.Slice()
+			neighbors := me.Neighbors()
 			for i := range neighbors {
 				j := int(time.Now().UnixNano() % int64(i+1))
 				neighbors[i], neighbors[j] = neighbors[j], neighbors[i]
@@ -204,6 +204,7 @@ func (me *Peer) ListenConsumers() error {
 				me.gossipRound.Put(p.IdForNetwork, p)
 			}
 
+			neighbors = me.Neighbors()
 			msg := me.buildConsumersMessage()
 			for _, p := range neighbors {
 				if !p.isRemoteRelayer {
@@ -366,7 +367,7 @@ func (me *Peer) authenticateNeighbor(client Client) (*Peer, error) {
 		}
 		me.receivedMetric.handle(PeerMessageTypeAuthentication)
 
-		token, err := me.handle.AuthenticateAs(me.IdForNetwork, msg.Data)
+		token, err := me.handle.AuthenticateAs(me.IdForNetwork, msg.Data, 5)
 		if err != nil {
 			auth <- err
 			return

rpc/consensus_test.go

@@ -31,8 +31,8 @@ var (
 )
 
 func TestConsensus(t *testing.T) {
-	testConsensus(t, false)
 	testConsensus(t, true)
+	testConsensus(t, false)
 }
 
 func testConsensus(t *testing.T, withRelayers bool) {
@@ -796,15 +796,18 @@ func setupTestNet(root string, withRelayers bool) ([]common.Address, []common.Ad
 		id := s.Hash().ForNetwork(gns.NetworkId())
 		peers[i] = fmt.Sprintf("%[email protected]:170%02d", id.String(), i+1)
 	}
-	peersList := `"` + strings.Join(peers[:len(peers)/3], `","`) + `"`
+	peersListHead := `"` + strings.Join(peers[:len(peers)/3], `","`) + `"`
+	peersListTail := `"` + strings.Join(peers[len(peers)/2:], `","`) + `"`
 
 	if withRelayers {
 		peers := make([]string, len(relayers))
 		for i, s := range relayers {
 			id := s.Hash().ForNetwork(gns.NetworkId())
 			peers[i] = fmt.Sprintf("%[email protected]:160%02d", id.String(), i+1)
 		}
-		peersList = `"` + strings.Join(peers[:len(peers)/3], `","`) + `"`
+		peersListHead = `"` + strings.Join(peers[:len(peers)/3], `","`) + `"`
+		peersListTail = `"` + strings.Join(peers[len(peers)/2:], `","`) + `"`
+		peersList := `"` + strings.Join(peers[:len(peers)/3], `","`) + `"`
 		for i, a := range relayers {
 			dir := fmt.Sprintf("%s/mixin-160%02d", root, i+1)
 			err := os.MkdirAll(dir, 0755)
@@ -836,7 +839,15 @@ func setupTestNet(root string, withRelayers bool) ([]common.Address, []common.Ad
 			panic(err)
 		}
 
-		isRelayer := !withRelayers && strings.Contains(peersList, fmt.Sprintf("170%02d", i+1))
+		peersList := peersListHead
+		if i > len(signers)/2 {
+			peersList = peersListTail
+		}
+		p2p := fmt.Sprintf("170%02d", i+1)
+		isRelayer := !withRelayers && (strings.Contains(peersListHead, p2p) || strings.Contains(peersListTail, p2p))
+		if isRelayer {
+			peersList = peersListHead
+		}
 		configData := []byte(fmt.Sprintf(configDataTmpl, a.PrivateSpendKey.String(), isRelayer, peersList))
 		err = os.WriteFile(dir+"/config.toml", configData, 0644)
 		if err != nil {
@@ -847,7 +858,7 @@ func setupTestNet(root string, withRelayers bool) ([]common.Address, []common.Ad
 			panic(err)
 		}
 	}
-	return signers, payees, genesisData, peersList
+	return signers, payees, genesisData, peersListHead
 }
 
 func testSignTransaction(node string, account common.Address, rawStr string) (*common.SignedTransaction, error) {