fix(relayer): fix forking logic (#21220)

Author: MatusKysel

packages/relayer/processor/process_message.go

@@ -443,12 +443,15 @@ func (p *Processor) signalServiceForBlock(
 	ctx context.Context,
 	blockNumber uint64,
 ) (relayer.SignalService, common.Address, error) {
-	if p.shastaForkTimestamp == 0 ||
-		p.shastaOldForkSignalService == nil ||
+	if p.shastaOldForkSignalService == nil ||
 		p.shastaNewForkSignalService == nil {
 		return p.srcSignalService, p.srcSignalServiceAddress, nil
 	}
 
+	if p.shastaForkTimestamp == 0 {
+		return p.shastaNewForkSignalService, p.srcSignalServiceAddress, nil
+	}
+
 	callCtx, cancel := context.WithTimeout(ctx, p.ethClientTimeout)
 
 	defer cancel()
@@ -459,10 +462,10 @@ func (p *Processor) signalServiceForBlock(
 	}
 
 	if header.Time < p.shastaForkTimestamp {
-		return p.shastaOldForkSignalService, p.shastaOldForkAddress, nil
+		return p.shastaOldForkSignalService, p.srcSignalServiceAddress, nil
 	}
 
-	return p.shastaNewForkSignalService, p.shastaNewForkAddress, nil
+	return p.shastaNewForkSignalService, p.srcSignalServiceAddress, nil
 }
 
 // sendProcessMessageCall calls `bridge.processMessage` with latest nonce

packages/relayer/processor/processor.go

@@ -415,7 +415,7 @@ func InitFromConfig(ctx context.Context, p *Processor, cfg *Config) error {
 
 	p.srcSignalServiceAddress = cfg.SrcSignalServiceAddress
 	if cfg.SrcSignalServiceForkRouterAddress != relayer.ZeroAddress {
-		p.srcSignalServiceAddress = p.shastaOldForkAddress
+		p.srcSignalServiceAddress = cfg.SrcSignalServiceForkRouterAddress
 	}
 
 	p.msgCh = make(chan queue.Message)