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

Jump to bottom

Add commit offchain config in OracleCreator #14423

Merged
merged 15 commits into from
Sep 16, 2024
Merged

Add commit offchain config in OracleCreator #14423

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b15f192
Use commitOffChainConfig to initialize FeedReaderConfig
asoliman92 Sep 13, 2024
7b8288d
Add TODOs for commit off chain config in homechain deployment
asoliman92 Sep 13, 2024
d3445e7
Refactor oracelcreator/plugin
asoliman92 Sep 13, 2024
2240a98
Use functions instead of methods
asoliman92 Sep 16, 2024
dfd5fba
Remove token feed chain bindings - going to bind in chainlink-ccip
asoliman92 Sep 16, 2024
5d74f7b
Use commitOffChainConfig to initialize FeedReaderConfig
asoliman92 Sep 13, 2024
d4b131a
Add TODOs for commit off chain config in homechain deployment
asoliman92 Sep 13, 2024
881a989
Refactor oracelcreator/plugin
asoliman92 Sep 13, 2024
5cdaf18
Merge branch 'develop' into token-price-integration
asoliman92 Sep 16, 2024
ce66215
Fix go mods
asoliman92 Sep 16, 2024
d8920d5
Add changeset
asoliman92 Sep 16, 2024
c3b3f80
Merge branch 'develop' into token-price-integration
asoliman92 Sep 16, 2024
1820dc6
Remove missing things from fixing merge conflicts
asoliman92 Sep 16, 2024
0d84c74
pnpm changeset
asoliman92 Sep 16, 2024
c5a4168
Merge branch 'develop' into token-price-integration
asoliman92 Sep 16, 2024
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
103 changes: 68 additions & 35 deletions core/capabilities/ccip/configs/evm/contract_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"

"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/nonce_manager"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"

evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/nonce_manager"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/aggregator_v3_interface"
kcr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
)
Expand All @@ -22,8 +23,9 @@ var (
onrampABI = evmtypes.MustGetABI(onramp.OnRampABI)
capabilitiesRegsitryABI = evmtypes.MustGetABI(kcr.CapabilitiesRegistryABI)
ccipConfigABI = evmtypes.MustGetABI(ccip_config.CCIPConfigABI)
priceRegistryABI = evmtypes.MustGetABI(fee_quoter.FeeQuoterABI)
feeQuoterABI = evmtypes.MustGetABI(fee_quoter.FeeQuoterABI)
nonceManagerABI = evmtypes.MustGetABI(nonce_manager.NonceManagerABI)
priceFeedABI = evmtypes.MustGetABI(aggregator_v3_interface.AggregatorV3InterfaceABI)
)

// MustSourceReaderConfig returns a ChainReaderConfig that can be used to read from the onramp.
Expand All @@ -50,6 +52,17 @@ func MustDestReaderConfig() []byte {
return encoded
}

func MergeReaderConfigs(configs ...evmrelaytypes.ChainReaderConfig) evmrelaytypes.ChainReaderConfig {
allContracts := make(map[string]evmrelaytypes.ChainContractReader)
for _, c := range configs {
for contractName, contractReader := range c.Contracts {
allContracts[contractName] = contractReader
}
}

return evmrelaytypes.ChainReaderConfig{Contracts: allContracts}
}

// DestReaderConfig returns a ChainReaderConfig that can be used to read from the offramp.
var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
Contracts: map[string]evmrelaytypes.ChainContractReader{
Expand Down Expand Up @@ -109,6 +122,47 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
},
},
},
consts.ContractNameFeeQuoter: {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moving FeeQuoter from SourceChainConfig to DestChainConfig

ContractABI: fee_quoter.FeeQuoterABI,
Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
consts.MethodNameFeeQuoterGetStaticConfig: {
ChainSpecificName: mustGetMethodName("getStaticConfig", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameFeeQuoterGetTokenPrices: {
ChainSpecificName: mustGetMethodName("getTokenPrices", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetDestChainConfig: {
ChainSpecificName: mustGetMethodName("getDestChainConfig", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetPremiumMultiplierWeiPerEth: {
ChainSpecificName: mustGetMethodName("getPremiumMultiplierWeiPerEth", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetTokenTransferFeeConfig: {
ChainSpecificName: mustGetMethodName("getTokenTransferFeeConfig", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameProcessMessageArgs: {
ChainSpecificName: mustGetMethodName("processMessageArgs", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameProcessPoolReturnData: {
ChainSpecificName: mustGetMethodName("processPoolReturnData", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetValidatedTokenPrice: {
ChainSpecificName: mustGetMethodName("getValidatedTokenPrice", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetFeeTokens: {
ChainSpecificName: mustGetMethodName("getFeeTokens", feeQuoterABI),
ReadType: evmrelaytypes.Method,
},
},
},
},
}

Expand Down Expand Up @@ -148,40 +202,19 @@ var SourceReaderConfig = evmrelaytypes.ChainReaderConfig{
},
},
},
consts.ContractNamePriceRegistry: {
ContractABI: fee_quoter.FeeQuoterABI,
},
}

var FeedReaderConfig = evmrelaytypes.ChainReaderConfig{
Contracts: map[string]evmrelaytypes.ChainContractReader{
consts.ContractNamePriceAggregator: {
ContractABI: aggregator_v3_interface.AggregatorV3InterfaceABI,
Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
consts.MethodNamePriceRegistryGetStaticConfig: {
ChainSpecificName: mustGetMethodName("getStaticConfig", priceRegistryABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetDestChainConfig: {
ChainSpecificName: mustGetMethodName("getDestChainConfig", priceRegistryABI),
ReadType: evmrelaytypes.Method,
consts.MethodNameGetLatestRoundData: {
ChainSpecificName: mustGetMethodName(consts.MethodNameGetLatestRoundData, priceFeedABI),
},
consts.MethodNameGetPremiumMultiplierWeiPerEth: {
ChainSpecificName: mustGetMethodName("getPremiumMultiplierWeiPerEth", priceRegistryABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetTokenTransferFeeConfig: {
ChainSpecificName: mustGetMethodName("getTokenTransferFeeConfig", priceRegistryABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameProcessMessageArgs: {
ChainSpecificName: mustGetMethodName("processMessageArgs", priceRegistryABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameProcessPoolReturnData: {
ChainSpecificName: mustGetMethodName("processPoolReturnData", priceRegistryABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetValidatedTokenPrice: {
ChainSpecificName: mustGetMethodName("getValidatedTokenPrice", priceRegistryABI),
ReadType: evmrelaytypes.Method,
},
consts.MethodNameGetFeeTokens: {
ChainSpecificName: mustGetMethodName("getFeeTokens", priceRegistryABI),
ReadType: evmrelaytypes.Method,
consts.MethodNameGetDecimals: {
ChainSpecificName: mustGetMethodName(consts.MethodNameGetDecimals, priceFeedABI),
},
},
},
Expand Down
Loading
Loading