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

Parallelize ccip crib deployer #16451

Merged
merged 4 commits into from
Feb 19, 2025
+125 −98
Merged

Parallelize ccip crib deployer #16451

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31b5e6f
Parallelize connecting lanes in ccip deployer
asoliman92 Feb 17, 2025
9f7aeca
Parallelize token pools deployment
asoliman92 Feb 17, 2025
7aaa4ea
lint
asoliman92 Feb 18, 2025
6bea252
shadow variable
asoliman92 Feb 19, 2025
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
22 changes: 15 additions & 7 deletions deployment/ccip/changeset/cs_deploy_token_pools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"golang.org/x/sync/errgroup"

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
Expand Down Expand Up @@ -158,14 +159,21 @@ func DeployTokenPoolContractsChangeset(env deployment.Environment, c DeployToken
return deployment.ChangesetOutput{}, fmt.Errorf("failed to load onchain state: %w", err)
}

for chainSelector, poolConfig := range c.NewPools {
chain := env.Chains[chainSelector]
chainState := state.Chains[chainSelector]
deployGrp := errgroup.Group{}

_, err := deployTokenPool(env.Logger, chain, chainState, newAddresses, poolConfig, c.IsTestRouter)
if err != nil {
return deployment.ChangesetOutput{}, fmt.Errorf("failed to deploy %s token pool on %s: %w", c.TokenSymbol, chain.String(), err)
}
for chainSelector, poolConfig := range c.NewPools {
Comment on lines +162 to +164
Copy link
Contributor

Choose a reason for hiding this comment

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

@AnieeG @kylesmartin is this supposed to be idempotent? It wasn't before, so I think this is effectively a no-op, but just wanted to flag in-case.

chainSelector, poolConfig := chainSelector, poolConfig
deployGrp.Go(func() error {
chain := env.Chains[chainSelector]
chainState := state.Chains[chainSelector]
_, err := deployTokenPool(env.Logger, chain, chainState, newAddresses, poolConfig, c.IsTestRouter)
return err
})
}

if err := deployGrp.Wait(); err != nil {
return deployment.ChangesetOutput{}, fmt.Errorf("failed to deploy %s token pool on %w",
c.TokenSymbol, err)
}

return deployment.ChangesetOutput{
Expand Down
200 changes: 109 additions & 91 deletions deployment/environment/crib/ccip_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"errors"
"fmt"
"math/big"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/v1_5_1/token_pool"
"golang.org/x/sync/errgroup"
"math/big"
"sync"

"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/globals"

Expand Down Expand Up @@ -401,106 +402,123 @@ func setupLinkPools(e *deployment.Environment) (deployment.Environment, error) {
}

func setupLanes(e *deployment.Environment, state changeset.CCIPOnChainState) (deployment.Environment, error) {
onRampUpdatesByChain := make(map[uint64]map[uint64]changeset.OnRampDestinationUpdate)
pricesByChain := make(map[uint64]changeset.FeeQuoterPriceUpdatePerSource)
feeQuoterDestsUpdatesByChain := make(map[uint64]map[uint64]fee_quoter.FeeQuoterDestChainConfig)
updateOffRampSources := make(map[uint64]map[uint64]changeset.OffRampSourceUpdate)
updateRouterChanges := make(map[uint64]changeset.RouterUpdates)
eg := errgroup.Group{}
poolUpdates := make(map[uint64]changeset.TokenPoolConfig)
rateLimitPerChain := make(changeset.RateLimiterPerChain)
mu := sync.Mutex{}
for src := range e.Chains {
onRampUpdatesByChain[src] = make(map[uint64]changeset.OnRampDestinationUpdate)
pricesByChain[src] = changeset.FeeQuoterPriceUpdatePerSource{
TokenPrices: map[common.Address]*big.Int{
state.Chains[src].LinkToken.Address(): testhelpers.DefaultLinkPrice,
state.Chains[src].Weth9.Address(): testhelpers.DefaultWethPrice,
},
GasPrices: make(map[uint64]*big.Int),
}
feeQuoterDestsUpdatesByChain[src] = make(map[uint64]fee_quoter.FeeQuoterDestChainConfig)
updateOffRampSources[src] = make(map[uint64]changeset.OffRampSourceUpdate)
updateRouterChanges[src] = changeset.RouterUpdates{
OffRampUpdates: make(map[uint64]bool),
OnRampUpdates: make(map[uint64]bool),
}
rateLimitPerChain := make(changeset.RateLimiterPerChain)
eg.Go(func() error {
Copy link
Contributor

Choose a reason for hiding this comment

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

we need to shadow src variable here

onRampUpdatesByChain := make(map[uint64]map[uint64]changeset.OnRampDestinationUpdate)
pricesByChain := make(map[uint64]changeset.FeeQuoterPriceUpdatePerSource)
feeQuoterDestsUpdatesByChain := make(map[uint64]map[uint64]fee_quoter.FeeQuoterDestChainConfig)
updateOffRampSources := make(map[uint64]map[uint64]changeset.OffRampSourceUpdate)
updateRouterChanges := make(map[uint64]changeset.RouterUpdates)
onRampUpdatesByChain[src] = make(map[uint64]changeset.OnRampDestinationUpdate)
pricesByChain[src] = changeset.FeeQuoterPriceUpdatePerSource{
TokenPrices: map[common.Address]*big.Int{
state.Chains[src].LinkToken.Address(): testhelpers.DefaultLinkPrice,
state.Chains[src].Weth9.Address(): testhelpers.DefaultWethPrice,
},
GasPrices: make(map[uint64]*big.Int),
}
feeQuoterDestsUpdatesByChain[src] = make(map[uint64]fee_quoter.FeeQuoterDestChainConfig)
updateOffRampSources[src] = make(map[uint64]changeset.OffRampSourceUpdate)
updateRouterChanges[src] = changeset.RouterUpdates{
OffRampUpdates: make(map[uint64]bool),
OnRampUpdates: make(map[uint64]bool),
}

for dst := range e.Chains {
if src != dst {
onRampUpdatesByChain[src][dst] = changeset.OnRampDestinationUpdate{
IsEnabled: true,
AllowListEnabled: false,
for dst := range e.Chains {
if src != dst {
onRampUpdatesByChain[src][dst] = changeset.OnRampDestinationUpdate{
IsEnabled: true,
AllowListEnabled: false,
}
pricesByChain[src].GasPrices[dst] = testhelpers.DefaultGasPrice
feeQuoterDestsUpdatesByChain[src][dst] = changeset.DefaultFeeQuoterDestChainConfig(true)

updateOffRampSources[src][dst] = changeset.OffRampSourceUpdate{
IsEnabled: true,
IsRMNVerificationDisabled: true,
}

updateRouterChanges[src].OffRampUpdates[dst] = true
updateRouterChanges[src].OnRampUpdates[dst] = true
mu.Lock()
rateLimitPerChain[dst] = changeset.RateLimiterConfig{
Inbound: token_pool.RateLimiterConfig{
IsEnabled: false,
Capacity: big.NewInt(0),
Rate: big.NewInt(0),
},
Outbound: token_pool.RateLimiterConfig{
IsEnabled: false,
Capacity: big.NewInt(0),
Rate: big.NewInt(0),
},
}
mu.Unlock()
}
pricesByChain[src].GasPrices[dst] = testhelpers.DefaultGasPrice
feeQuoterDestsUpdatesByChain[src][dst] = changeset.DefaultFeeQuoterDestChainConfig(true)
}

updateOffRampSources[src][dst] = changeset.OffRampSourceUpdate{
IsEnabled: true,
IsRMNVerificationDisabled: true,
}
mu.Lock()
poolUpdates[src] = changeset.TokenPoolConfig{
Type: changeset.BurnMintTokenPool,
Version: deployment.Version1_5_1,
ChainUpdates: rateLimitPerChain,
}
mu.Unlock()

updateRouterChanges[src].OffRampUpdates[dst] = true
updateRouterChanges[src].OnRampUpdates[dst] = true
rateLimitPerChain[dst] = changeset.RateLimiterConfig{
Inbound: token_pool.RateLimiterConfig{
IsEnabled: false,
Capacity: big.NewInt(0),
Rate: big.NewInt(0),
_, err := commonchangeset.Apply(nil, *e, nil,
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateOnRampsDestsChangeset),
changeset.UpdateOnRampDestsConfig{
UpdatesByChain: onRampUpdatesByChain,
},
Outbound: token_pool.RateLimiterConfig{
IsEnabled: false,
Capacity: big.NewInt(0),
Rate: big.NewInt(0),
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateFeeQuoterPricesChangeset),
changeset.UpdateFeeQuoterPricesConfig{
PricesByChain: pricesByChain,
},
}
}
}
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateFeeQuoterDestsChangeset),
changeset.UpdateFeeQuoterDestsConfig{
UpdatesByChain: feeQuoterDestsUpdatesByChain,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateOffRampSourcesChangeset),
changeset.UpdateOffRampSourcesConfig{
UpdatesByChain: updateOffRampSources,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateRouterRampsChangeset),
changeset.UpdateRouterRampsConfig{
UpdatesByChain: updateRouterChanges,
},
),
)
return err
})
}

poolUpdates[src] = changeset.TokenPoolConfig{
Type: changeset.BurnMintTokenPool,
Version: deployment.Version1_5_1,
ChainUpdates: rateLimitPerChain,
}
err := eg.Wait()
if err != nil {
return *e, err
}

return commonchangeset.Apply(nil, *e, nil,
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.ConfigureTokenPoolContractsChangeset),
changeset.ConfigureTokenPoolContractsConfig{
TokenSymbol: changeset.LinkSymbol,
PoolUpdates: poolUpdates,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateOnRampsDestsChangeset),
changeset.UpdateOnRampDestsConfig{
UpdatesByChain: onRampUpdatesByChain,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateFeeQuoterPricesChangeset),
changeset.UpdateFeeQuoterPricesConfig{
PricesByChain: pricesByChain,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateFeeQuoterDestsChangeset),
changeset.UpdateFeeQuoterDestsConfig{
UpdatesByChain: feeQuoterDestsUpdatesByChain,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateOffRampSourcesChangeset),
changeset.UpdateOffRampSourcesConfig{
UpdatesByChain: updateOffRampSources,
},
),
commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.UpdateRouterRampsChangeset),
changeset.UpdateRouterRampsConfig{
UpdatesByChain: updateRouterChanges,
},
),
)
_, err = commonchangeset.Apply(nil, *e, nil, commonchangeset.Configure(
deployment.CreateLegacyChangeSet(changeset.ConfigureTokenPoolContractsChangeset),
changeset.ConfigureTokenPoolContractsConfig{
TokenSymbol: changeset.LinkSymbol,
PoolUpdates: poolUpdates,
},
))

return *e, err
}

func setupOCR(e *deployment.Environment, homeChainSel uint64, feedChainSel uint64) (deployment.Environment, error) {
Expand Down
Loading