Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract relay from evm #11537

Merged
merged 19 commits into from
Dec 14, 2023
Merged

Extract relay from evm #11537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
703d45b
Extract relay from evm
DylanTinianov Dec 11, 2023
3cf4f22
Merge branch 'develop' of https://github.com/smartcontractkit/chainli…
DylanTinianov Dec 11, 2023
c9c8230
Branch was auto-updated.
github-actions[bot] Dec 11, 2023
dbfb822
Replace type with string
DylanTinianov Dec 11, 2023
a04a5f5
Branch was auto-updated.
github-actions[bot] Dec 11, 2023
eeace29
Branch was auto-updated.
github-actions[bot] Dec 12, 2023
bf22f95
Merge branch 'develop' into BCI-2454-extract-core-services-relay
DylanTinianov Dec 12, 2023
ea817f3
Branch was auto-updated.
github-actions[bot] Dec 12, 2023
eca7cd0
Branch was auto-updated.
github-actions[bot] Dec 12, 2023
cf49c08
Branch was auto-updated.
github-actions[bot] Dec 12, 2023
a72c91a
Merge branch 'develop' of https://github.com/smartcontractkit/chainli…
DylanTinianov Dec 13, 2023
0d066cd
Update helpers_test.go
DylanTinianov Dec 13, 2023
2d97bb7
Branch was auto-updated.
github-actions[bot] Dec 13, 2023
afefbeb
Branch was auto-updated.
github-actions[bot] Dec 13, 2023
8f2d024
ci
DylanTinianov Dec 13, 2023
f44a49b
Merge branch 'develop' into BCI-2454-extract-core-services-relay
DylanTinianov Dec 13, 2023
91823e9
Merge branch 'develop' into BCI-2454-extract-core-services-relay
DylanTinianov Dec 14, 2023
1111d69
Merge branch 'develop' into BCI-2454-extract-core-services-relay
DylanTinianov Dec 14, 2023
4058807
Merge branch 'develop' into BCI-2454-extract-core-services-relay
DylanTinianov Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions core/chains/evm/config/toml/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
"github.com/smartcontractkit/chainlink/v2/core/services/relay"
"github.com/smartcontractkit/chainlink/v2/core/store/models"
configutils "github.com/smartcontractkit/chainlink/v2/core/utils/config"
)
Expand Down Expand Up @@ -107,7 +106,7 @@ func (cs EVMConfigs) totalChains() int {
}
return total
}
func (cs EVMConfigs) Chains(ids ...relay.ChainID) (r []commontypes.ChainStatus, total int, err error) {
func (cs EVMConfigs) Chains(ids ...string) (r []commontypes.ChainStatus, total int, err error) {
total = cs.totalChains()
for _, ch := range cs {
if ch == nil {
Expand Down Expand Up @@ -154,7 +153,7 @@ func (cs EVMConfigs) NodeStatus(name string) (commontypes.NodeStatus, error) {
for i := range cs {
for _, n := range cs[i].Nodes {
if n.Name != nil && *n.Name == name {
return nodeStatus(n, relay.ChainID(cs[i].ChainID.String()))
return nodeStatus(n, cs[i].ChainID.String())
}
}
}
Expand All @@ -179,7 +178,7 @@ func legacyNode(n *Node, chainID *big.Big) (v2 types.Node) {
return
}

func nodeStatus(n *Node, chainID relay.ChainID) (commontypes.NodeStatus, error) {
func nodeStatus(n *Node, chainID string) (commontypes.NodeStatus, error) {
var s commontypes.NodeStatus
s.ChainID = chainID
s.Name = *n.Name
Expand All @@ -191,7 +190,7 @@ func nodeStatus(n *Node, chainID relay.ChainID) (commontypes.NodeStatus, error)
return s, nil
}

func (cs EVMConfigs) nodes(id relay.ChainID) (ns EVMNodes) {
func (cs EVMConfigs) nodes(id string) (ns EVMNodes) {
for _, c := range cs {
if c.ChainID.String() == id {
return c.Nodes
Expand All @@ -200,7 +199,7 @@ func (cs EVMConfigs) nodes(id relay.ChainID) (ns EVMNodes) {
return nil
}

func (cs EVMConfigs) Nodes(chainID relay.ChainID) (ns []types.Node, err error) {
func (cs EVMConfigs) Nodes(chainID string) (ns []types.Node, err error) {
evmID, err := ChainIDInt64(chainID)
if err != nil {
return nil, fmt.Errorf("invalid evm chain id %q : %w", chainID, err)
Expand All @@ -220,14 +219,14 @@ func (cs EVMConfigs) Nodes(chainID relay.ChainID) (ns []types.Node, err error) {
return
}

func (cs EVMConfigs) NodeStatuses(chainIDs ...relay.ChainID) (ns []commontypes.NodeStatus, err error) {
func (cs EVMConfigs) NodeStatuses(chainIDs ...string) (ns []commontypes.NodeStatus, err error) {
if len(chainIDs) == 0 {
for i := range cs {
for _, n := range cs[i].Nodes {
if n == nil {
continue
}
n2, err := nodeStatus(n, relay.ChainID(cs[i].ChainID.String()))
n2, err := nodeStatus(n, cs[i].ChainID.String())
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -816,6 +815,6 @@ func (n *Node) SetFrom(f *Node) {
}
}

func ChainIDInt64(cid relay.ChainID) (int64, error) {
func ChainIDInt64(cid string) (int64, error) {
return strconv.ParseInt(cid, 10, 64)
}
9 changes: 7 additions & 2 deletions core/chains/evm/log/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
"github.com/smartcontractkit/chainlink/v2/core/config"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/flux_aggregator_wrapper"
Expand All @@ -42,7 +43,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/services/job"
"github.com/smartcontractkit/chainlink/v2/core/services/pg"
"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
)

type broadcasterHelper struct {
Expand Down Expand Up @@ -105,7 +105,12 @@ func newBroadcasterHelperWithEthClient(t *testing.T, ethClient evmclient.Client,
LogBroadcaster: &log.NullBroadcaster{},
MailMon: mailMon,
})
legacyChains := evmrelay.NewLegacyChainsFromRelayerExtenders(cc)
DylanTinianov marked this conversation as resolved.
Show resolved Hide resolved

m := make(map[string]legacyevm.Chain)
for _, r := range cc.Slice() {
m[r.Chain().ID().String()] = r.Chain()
}
legacyChains := legacyevm.NewLegacyChains(m, cc.AppConfig().EVMConfigs())
pipelineHelper := cltest.NewJobPipelineV2(t, config.WebServer(), config.JobPipeline(), config.Database(), legacyChains, db, kst, nil, nil)

return &broadcasterHelper{
Expand Down
5 changes: 2 additions & 3 deletions core/chains/evm/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ import (

"github.com/smartcontractkit/chainlink-common/pkg/types"
ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
"github.com/smartcontractkit/chainlink/v2/core/services/relay"
"github.com/smartcontractkit/chainlink/v2/core/utils"
)

type Configs interface {
Chains(ids ...relay.ChainID) ([]types.ChainStatus, int, error)
Chains(ids ...string) ([]types.ChainStatus, int, error)
Node(name string) (Node, error)
Nodes(chainID relay.ChainID) (nodes []Node, err error)
Nodes(chainID string) (nodes []Node, err error)
NodeStatus(name string) (types.NodeStatus, error)
}

Expand Down
Loading