Skip to content

Commit

Permalink
blockscout
Browse files Browse the repository at this point in the history
  • Loading branch information
AnieeG committed Oct 19, 2023
1 parent b2bf181 commit 43052b3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func (e *CCIPContractsDeployer) DeployOnRamp(
) {
if len(tokensAndPools) > 2 {
net := e.evmClient.GetNetworkConfig()
net.DefaultGasLimit = 10_000_000
net.DefaultGasLimit = 8_000_000
log.Info().
Str("Network Name", net.Name).
Uint64("Gaslimit", e.evmClient.GetNetworkConfig().DefaultGasLimit).
Expand Down
29 changes: 20 additions & 9 deletions integration-tests/ccip-tests/testsetups/ccip.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
chainselectors "github.com/smartcontractkit/chain-selectors"
"github.com/smartcontractkit/chainlink-env/client"
"github.com/smartcontractkit/chainlink-env/environment"
"github.com/smartcontractkit/chainlink-env/pkg/cdk8s/blockscout"
"github.com/smartcontractkit/chainlink-env/pkg/helm/chainlink"
"github.com/smartcontractkit/chainlink-env/pkg/helm/reorg"
"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
Expand Down Expand Up @@ -114,6 +115,7 @@ type CCIPTestConfig struct {
ExistingDeployment bool
ExistingEnv string
ReuseContracts bool
Blockscout bool
SequentialLaneAddition bool
NodeFunding *big.Float
Load *CCIPLoadInput
Expand Down Expand Up @@ -541,6 +543,16 @@ func NewCCIPTestConfig(t *testing.T, lggr zerolog.Logger, tType string) *CCIPTes
}
}

blckscout, _ := utils.GetEnv("CCIP_DEPLOY_BLOCKSCOUT")
if blckscout != "" {
e, err := strconv.ParseBool(blckscout)
if err != nil {
allError = multierr.Append(allError, err)
} else {
p.Blockscout = e
}
}

alive, _ := utils.GetEnv("CCIP_KEEP_ENV_ALIVE")
if alive != "" {
e, err := strconv.ParseBool(alive)
Expand Down Expand Up @@ -1016,7 +1028,7 @@ func CCIPDefaultTestSetUp(
TTL: inputs.EnvTTL,
NamespacePrefix: envName,
Test: t,
}, clProps, inputs.GethResourceProfile, inputs.SelectedNetworks)
}, clProps, inputs.GethResourceProfile, inputs.SelectedNetworks, inputs.Blockscout)
ccipEnv = &actions.CCIPTestEnv{K8Env: k8Env}
}

Expand Down Expand Up @@ -1266,6 +1278,7 @@ func DeployEnvironments(
clProps map[string]interface{},
gethResource map[string]interface{},
networks []blockchain.EVMNetwork,
useBlockscout bool,
) *environment.Environment {
testEnvironment := environment.New(envconfig)
numOfTxNodes := 1
Expand Down Expand Up @@ -1324,15 +1337,13 @@ func DeployEnvironments(
for i := range networks {
nets = append(nets, networks[i])
nets[i].URLs, nets[i].HTTPURLs = urlFinder(networks[i])
// skip adding blockscout for simplified deployments
// uncomment the following to debug on-chain transactions
/*
if useBlockscout {
testEnvironment.AddChart(blockscout.New(&blockscout.Props{
Name: fmt.Sprintf("%s-blockscout", networks[i].Name),
WsURL: networks[i].URLs[0],
HttpURL: networks[i].HTTPURLs[0],
}))
*/
Name: fmt.Sprintf("%s-blockscout", networks[i].Name),
WsURL: networks[i].URLs[0],
HttpURL: networks[i].HTTPURLs[0],
}))
}
}

tomlCfg, err := node.NewConfigFromToml(
Expand Down

0 comments on commit 43052b3

Please sign in to comment.