deployment: Changes for keystone

deployment/environment/clo/offchain_client_impl.go

@@ -2,6 +2,7 @@ package clo
 
 import (
 	"context"
+	"fmt"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -61,7 +62,7 @@ func (j JobClient) GetNode(ctx context.Context, in *nodev1.GetNodeRequest, opts
 
 func (j JobClient) ListNodes(ctx context.Context, in *nodev1.ListNodesRequest, opts ...grpc.CallOption) (*nodev1.ListNodesResponse, error) {
 	//TODO CCIP-3108
-	var fiterIds map[string]struct{}
+	fiterIds := make(map[string]any)
 	include := func(id string) bool {
 		if in.Filter == nil || len(in.Filter.Ids) == 0 {
 			return true
@@ -82,7 +83,7 @@ func (j JobClient) ListNodes(ctx context.Context, in *nodev1.ListNodesRequest, o
 				nodes = append(nodes, &nodev1.Node{
 					Id:          n.ID,
 					Name:        n.Name,
-					PublicKey:   *n.PublicKey, // is this the correct val?
+					PublicKey:   *n.PublicKey,
 					IsEnabled:   n.Enabled,
 					IsConnected: n.Connected,
 				})
@@ -184,10 +185,24 @@ func cloNodeToChainConfigs(n *models.Node) []*nodev1.ChainConfig {
 }
 
 func cloChainCfgToJDChainCfg(ccfg *models.NodeChainConfig) *nodev1.ChainConfig {
+	var ctype nodev1.ChainType
+	switch ccfg.Network.ChainType {
+	case models.ChainTypeEvm:
+		ctype = nodev1.ChainType_CHAIN_TYPE_EVM
+	case models.ChainTypeSolana:
+		ctype = nodev1.ChainType_CHAIN_TYPE_SOLANA
+	case models.ChainTypeStarknet:
+		ctype = nodev1.ChainType_CHAIN_TYPE_STARKNET
+	case models.ChainTypeAptos:
+		ctype = nodev1.ChainType_CHAIN_TYPE_APTOS
+	default:
+		panic(fmt.Sprintf("Unsupported chain family %v", ccfg.Network.ChainType))
+	}
+
 	return &nodev1.ChainConfig{
 		Chain: &nodev1.Chain{
 			Id:   ccfg.Network.ChainID,
-			Type: nodev1.ChainType_CHAIN_TYPE_EVM, // TODO: write conversion func from clo to jd tyes
+			Type: ctype,
 		},
 		AccountAddress: ccfg.AccountAddress,
 		AdminAddress:   ccfg.AdminAddress,

deployment/environment/devenv/don.go

@@ -34,6 +34,7 @@ type NodeInfo struct {
 	Name        string                   // name of the node, used to identify the node, helpful in logs
 	AdminAddr   string                   // admin address to send payments to, applicable only for non-bootstrap nodes
 	MultiAddr   string                   // multi address denoting node's FQN (needed for deriving P2PBootstrappers in OCR), applicable only for bootstrap nodes
+	Labels      map[string]string        // labels to use when registering the node with job distributor
 }
 
 type DON struct {
@@ -104,6 +105,12 @@ func NewRegisteredDON(ctx context.Context, nodeInfo []NodeInfo, jd JobDistributo
 			return nil, fmt.Errorf("failed to create node %d: %w", i, err)
 		}
 		// node Labels so that it's easier to query them
+		for key, value := range info.Labels {
+			node.labels = append(node.labels, &ptypes.Label{
+				Key:   key,
+				Value: pointer.ToString(value),
+			})
+		}
 		if info.IsBootstrap {
 			// create multi address for OCR2, applicable only for bootstrap nodes
 			if info.MultiAddr == "" {
@@ -181,17 +188,35 @@ type JDChainConfigInput struct {
 func (n *Node) CreateCCIPOCRSupportedChains(ctx context.Context, chains []JDChainConfigInput, jd JobDistributor) error {
 	for i, chain := range chains {
 		chainId := strconv.FormatUint(chain.ChainID, 10)
-		accountAddr, err := n.gqlClient.FetchAccountAddress(ctx, chainId)
-		if err != nil {
-			return fmt.Errorf("failed to fetch account address for node %s: %w", n.Name, err)
-		}
-		if accountAddr == nil {
-			return fmt.Errorf("no account address found for node %s", n.Name)
-		}
-		if n.AccountAddr == nil {
-			n.AccountAddr = make(map[uint64]string)
+		var account string
+		switch chain.ChainType {
+		case "EVM":
+			accountAddr, err := n.gqlClient.FetchAccountAddress(ctx, chainId)
+			if err != nil {
+				return fmt.Errorf("failed to fetch account address for node %s: %w", n.Name, err)
+			}
+			if accountAddr == nil {
+				return fmt.Errorf("no account address found for node %s", n.Name)
+			}
+			if n.AccountAddr == nil {
+				n.AccountAddr = make(map[uint64]string)
+			}
+			n.AccountAddr[chain.ChainID] = *accountAddr
+			account = *accountAddr
+		case "APTOS", "SOLANA":
+			accounts, err := n.gqlClient.FetchKeys(ctx, chain.ChainType)
+			if err != nil {
+				return fmt.Errorf("failed to fetch account address for node %s: %w", n.Name, err)
+			}
+			if len(accounts) == 0 {
+				return fmt.Errorf("no account address found for node %s", n.Name)
+			}
+
+			account = accounts[0]
+		default:
+			return fmt.Errorf("unsupported chainType %v", chain.ChainType)
 		}
-		n.AccountAddr[chain.ChainID] = *accountAddr
+
 		peerID, err := n.gqlClient.FetchP2PPeerID(ctx)
 		if err != nil {
 			return fmt.Errorf("failed to fetch peer id for node %s: %w", n.Name, err)
@@ -221,7 +246,7 @@ func (n *Node) CreateCCIPOCRSupportedChains(ctx context.Context, chains []JDChai
 			JobDistributorID: n.JDId,
 			ChainID:          chainId,
 			ChainType:        chain.ChainType,
-			AccountAddr:      pointer.GetString(accountAddr),
+			AccountAddr:      account,
 			AdminAddr:        n.adminAddr,
 			Ocr2Enabled:      true,
 			Ocr2IsBootstrap:  isBootstrap,

deployment/environment/memory/chain.go

@@ -85,7 +85,7 @@ func GenerateChainsWithIds(t *testing.T, chainIDs []uint64) map[uint64]EVMChain
 		owner, err := bind.NewKeyedTransactorWithChainID(key, big.NewInt(1337))
 		require.NoError(t, err)
 		backend := backends.NewSimulatedBackend(core.GenesisAlloc{
-			owner.From: {Balance: big.NewInt(0).Mul(big.NewInt(100), big.NewInt(params.Ether))}}, 10000000)
+			owner.From: {Balance: big.NewInt(0).Mul(big.NewInt(700000), big.NewInt(params.Ether))}}, 50000000)
 		tweakChainTimestamp(t, backend, time.Hour*8)
 		chains[chainID] = EVMChain{
 			Backend:     backend,

deployment/environment/memory/environment.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/stretchr/testify/require"
@@ -29,6 +29,18 @@ type MemoryEnvironmentConfig struct {
 	RegistryConfig deployment.CapabilityRegistryConfig
 }
 
+// For placeholders like aptos
+func NewMemoryChain(t *testing.T, selector uint64) deployment.Chain {
+	return deployment.Chain{
+		Selector:    selector,
+		Client:      nil,
+		DeployerKey: &bind.TransactOpts{},
+		Confirm: func(tx *types.Transaction) (uint64, error) {
+			return 0, nil
+		},
+	}
+}
+
 // Needed for environment variables on the node which point to prexisitng addresses.
 // i.e. CapReg.
 func NewMemoryChains(t *testing.T, numChains int) map[uint64]deployment.Chain {
@@ -78,30 +90,19 @@ func generateMemoryChain(t *testing.T, inputs map[uint64]EVMChain) map[uint64]de
 }
 
 func NewNodes(t *testing.T, logLevel zapcore.Level, chains map[uint64]deployment.Chain, numNodes, numBootstraps int, registryConfig deployment.CapabilityRegistryConfig) map[string]Node {
-	mchains := make(map[uint64]EVMChain)
-	for _, chain := range chains {
-		evmChainID, err := chainsel.ChainIdFromSelector(chain.Selector)
-		if err != nil {
-			t.Fatal(err)
-		}
-		mchains[evmChainID] = EVMChain{
-			Backend:     chain.Client.(*backends.SimulatedBackend),
-			DeployerKey: chain.DeployerKey,
-		}
-	}
 	nodesByPeerID := make(map[string]Node)
 	ports := freeport.GetN(t, numBootstraps+numNodes)
 	// bootstrap nodes must be separate nodes from plugin nodes,
 	// since we won't run a bootstrapper and a plugin oracle on the same
 	// chainlink node in production.
 	for i := 0; i < numBootstraps; i++ {
-		node := NewNode(t, ports[i], mchains, logLevel, true /* bootstrap */, registryConfig)
+		node := NewNode(t, ports[i], chains, logLevel, true /* bootstrap */, registryConfig)
 		nodesByPeerID[node.Keys.PeerID.String()] = *node
 		// Note in real env, this ID is allocated by JD.
 	}
 	for i := 0; i < numNodes; i++ {
 		// grab port offset by numBootstraps, since above loop also takes some ports.
-		node := NewNode(t, ports[numBootstraps+i], mchains, logLevel, false /* bootstrap */, registryConfig)
+		node := NewNode(t, ports[numBootstraps+i], chains, logLevel, false /* bootstrap */, registryConfig)
 		nodesByPeerID[node.Keys.PeerID.String()] = *node
 		// Note in real env, this ID is allocated by JD.
 	}