Resolve conflicts, converge codebase between PRs

Author: swift1337

zetaclient/chains/evm/signer/outbound_data.go

@@ -157,6 +157,8 @@ func NewOutboundData(
 		return nil, true, errors.Wrap(err, "unable to setup gas")
 	}
 
+	nonce := cctx.GetCurrentOutboundParam().TssNonce
+
 	// Get sendHash
 	logger.Info().
 		Msgf("chain %d minting %d to %s, nonce %d, finalized zeta bn %d", toChain.ID(), cctx.InboundParams.Amount, txData.to.Hex(), nonce, cctx.InboundParams.FinalizedZetaHeight)

zetaclient/chains/evm/signer/signer.go

@@ -362,6 +362,12 @@ func (signer *Signer) TryProcessOutbound(
 	zetacoreClient interfaces.ZetacoreClient,
 	height uint64,
 ) {
+	app, err := zctx.FromContext(ctx)
+	if err != nil {
+		signer.Logger().Std.Error().Err(err).Msg("error getting app context")
+		return
+	}
+
 	// end outbound process on panic
 	defer func() {
 		outboundProc.EndTryProcess(outboundID)
@@ -410,8 +416,6 @@ func (signer *Signer) TryProcessOutbound(
 		return
 	}
 
-	// Get cross-chain flags
-	crossChainflags := app.GetCrossChainFlags()
 	// https://github.com/zeta-chain/node/issues/2050
 	var tx *ethtypes.Transaction
 	// compliance check goes first

zetaclient/chains/solana/observer/outbound.go

@@ -47,7 +47,7 @@ func (ob *Observer) WatchOutbound(ctx context.Context) error {
 	for {
 		select {
 		case <-ticker.C():
-			if !app.IsOutboundObservationEnabled(ob.GetChainParams()) {
+			if !app.IsOutboundObservationEnabled() {
 				sampledLogger.Info().Msgf("WatchOutbound: outbound observation is disabled for chain %d", chainID)
 				continue
 			}

zetaclient/orchestrator/bootstrap.go

@@ -144,69 +144,46 @@ func syncSignerMap(
 				continue
 			}
 
+			addSigner(chainID, signer)
+		case chain.IsSolana():
+			cfg, found := app.Config().GetSolanaConfig()
+			if !found {
+				logger.Std.Warn().Msgf("Unable to find SOL config for chain %d", chainID)
+				continue
+			}
+
+			// create Solana client
+			rpcClient := solrpc.New(cfg.Endpoint)
+			if rpcClient == nil {
+				// should never happen
+				logger.Std.Error().Msgf("Unable to create SOL client from endpoint %s", cfg.Endpoint)
+				continue
+			}
+
+			// load the Solana private key
+			solanaKey, err := app.Config().LoadSolanaPrivateKey()
+			if err != nil {
+				logger.Std.Error().Err(err).Msg("Unable to get Solana private key")
+			}
+
+			var (
+				chainRaw  = chain.RawChain()
+				paramsRaw = chain.Params()
+			)
+
+			// create Solana signer
+			signer, err := solanasigner.NewSigner(*chainRaw, *paramsRaw, rpcClient, tss, solanaKey, ts, logger)
+			if err != nil {
+				logger.Std.Error().Err(err).Msgf("Unable to construct signer for SOL chain %d", chainID)
+				continue
+			}
+
 			addSigner(chainID, signer)
 		default:
 			logger.Std.Warn().
 				Int64("signer.chain_id", chain.ID()).
 				Str("signer.chain_name", chain.RawChain().Name).
 				Msgf("Unable to create a signer")
-
-			/*
-			TODO FIX AFTER MERGE
-
-				// Solana signer
-				// Emulate same loop semantics as for EVM chains
-				for i := 0; i < 1; i++ {
-					solChain, solChainParams, solChainParamsFound := app.GetSolanaChainParams()
-					switch {
-					case !solChainParamsFound:
-						logger.Std.Warn().Msgf("Unable to find chain params for Solana chain")
-						continue
-					case !solChainParams.IsSupported:
-						logger.Std.Warn().Msgf("Solana chain is not supported")
-						continue
-					}
-
-					chainID := solChainParams.ChainId
-					presentChainIDs = append(presentChainIDs, chainID)
-
-					// noop
-					if mapHas(signers, chainID) {
-						continue
-					}
-
-					// get Solana config
-					cfg, found := app.Config().GetSolanaConfig()
-					if !found {
-						logger.Std.Error().Msgf("Unable to find Solana config for chain %d", chainID)
-						continue
-					}
-
-					// create Solana client
-					rpcClient := solrpc.New(cfg.Endpoint)
-					if rpcClient == nil {
-						// should never happen
-						logger.Std.Error().Msgf("Unable to create Solana client from endpoint %s", cfg.Endpoint)
-						continue
-					}
-
-					// load the Solana private key
-					solanaKey, err := app.Config().LoadSolanaPrivateKey()
-					if err != nil {
-						logger.Std.Error().Err(err).Msg("Unable to get Solana private key")
-					}
-
-					// create Solana signer
-					signer, err := solanasigner.NewSigner(solChain, *solChainParams, rpcClient, tss, solanaKey, ts, logger)
-					if err != nil {
-						logger.Std.Error().Err(err).Msgf("Unable to construct signer for Solana chain %d", chainID)
-						continue
-					}
-
-					addSigner(chainID, signer)
-				}
-
-			*/
 		}
 	}
 

zetaclient/orchestrator/orchestrator.go

@@ -158,29 +158,38 @@ func (oc *Orchestrator) resolveSigner(app *zctx.AppContext, chainID int64) (inte
 	switch {
 	case err != nil:
 		return nil, err
-	case !chain.IsEVM():
-		// noop for non-EVM chains
-		return signer, nil
 	case chain.IsZeta():
 		// should not happen
 		return nil, fmt.Errorf("unable to resolve signer for zeta chain %d", chainID)
-	}
+	case chain.IsEVM():
+		params := chain.Params()
 
-	// update zeta connector and ERC20 custody addresses
-	zetaConnectorAddress := ethcommon.HexToAddress(chain.Params().GetConnectorContractAddress())
-	if zetaConnectorAddress != signer.GetZetaConnectorAddress() {
-		signer.SetZetaConnectorAddress(zetaConnectorAddress)
-		oc.logger.Info().
-			Str("signer.connector_address", zetaConnectorAddress.String()).
-			Msgf("updated zeta connector address for chain %d", chainID)
-	}
+		// update zeta connector and ERC20 custody addresses
+		zetaConnectorAddress := ethcommon.HexToAddress(params.GetConnectorContractAddress())
+		if zetaConnectorAddress != signer.GetZetaConnectorAddress() {
+			signer.SetZetaConnectorAddress(zetaConnectorAddress)
+			oc.logger.Info().
+				Str("signer.connector_address", zetaConnectorAddress.String()).
+				Msgf("updated zeta connector address for chain %d", chainID)
+		}
 
-	erc20CustodyAddress := ethcommon.HexToAddress(chain.Params().GetErc20CustodyContractAddress())
-	if erc20CustodyAddress != signer.GetERC20CustodyAddress() {
-		signer.SetERC20CustodyAddress(erc20CustodyAddress)
-		oc.logger.Info().
-			Str("signer.erc20_custody", erc20CustodyAddress.String()).
-			Msgf("updated zeta connector address for chain %d", chainID)
+		erc20CustodyAddress := ethcommon.HexToAddress(params.GetErc20CustodyContractAddress())
+		if erc20CustodyAddress != signer.GetERC20CustodyAddress() {
+			signer.SetERC20CustodyAddress(erc20CustodyAddress)
+			oc.logger.Info().
+				Str("signer.erc20_custody", erc20CustodyAddress.String()).
+				Msgf("updated zeta connector address for chain %d", chainID)
+		}
+	case chain.IsSolana():
+		params := chain.Params()
+
+		// update solana gateway address
+		if params.GatewayAddress != signer.GetGatewayAddress() {
+			signer.SetGatewayAddress(params.GatewayAddress)
+			oc.logger.Info().
+				Str("signer.gateway_address", params.GatewayAddress).
+				Msgf("updated gateway address for chain %d", chainID)
+		}
 	}
 
 	return signer, nil
@@ -401,6 +410,8 @@ func (oc *Orchestrator) runScheduler(ctx context.Context) error {
 							oc.ScheduleCctxEVM(ctx, zetaHeight, chainID, cctxList, ob, signer)
 						case chain.IsUTXO():
 							oc.ScheduleCctxBTC(ctx, zetaHeight, chainID, cctxList, ob, signer)
+						case chain.IsSolana():
+							oc.ScheduleCctxSolana(ctx, zetaHeight, chainID, cctxList, ob, signer)
 						default:
 							oc.logger.Error().Msgf("runScheduler: no scheduler found chain %d", chainID)
 							continue