Skip to content

Chore/misc cleanup #425

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

Merged
faisal-chainlink merged 4 commits into from
Jun 29, 2026
Merged

Chore/misc cleanup #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d5c031
cleanup debug logs
faisal-chainlink Jun 27, 2026
244930c
lint fix
faisal-chainlink Jun 27, 2026
a2c8bc1
regen bindings function info file
faisal-chainlink Jun 29, 2026
c977fc5
Merge branch 'develop' into chore/misc-cleanup
faisal-chainlink Jun 29, 2026
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
2 changes: 1 addition & 1 deletion deployment/changesets/cs_mcms_configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
type ConfigureMCMSConfig struct {
mcmsops.ConfigureMCMSSeqInput
TimelockConfig *utils.TimelockConfig // If nil, configuration will be executed directly
IsFastCurse bool `yaml:"isFastCurse,omitempty"` // If true, the fastcurse MCMS instance is configured
IsFastCurse bool `yaml:"isFastCurse,omitempty"` // If true, the fastcurse MCMS instance is configured
}

var _ cldf.ChangeSetV2[ConfigureMCMSConfig] = ConfigureMCMS{}
Expand Down
8 changes: 4 additions & 4 deletions deployment/lanes/connect_chains_layer2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ func TestConfigureLaneLegAsDest_Flags(t *testing.T) {
chains := testSuiChains()

tests := []struct {
name string
isDisabled bool
rmnEnabled bool
wantEnabled bool
name string
isDisabled bool
rmnEnabled bool
wantEnabled bool
wantRMNDisabled bool
}{
{name: "enabled with RMN verification", isDisabled: false, rmnEnabled: true, wantEnabled: true, wantRMNDisabled: false},
Expand Down
8 changes: 4 additions & 4 deletions deployment/lanes/connect_chains_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/smartcontractkit/chainlink-deployments-framework/chain"
"github.com/smartcontractkit/chainlink-deployments-framework/chain/sui"
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"
cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"

"github.com/smartcontractkit/chainlink-sui/deployment/lanes"
"github.com/smartcontractkit/chainlink-sui/deployment/ops/mcmstest"
Expand Down Expand Up @@ -257,9 +257,9 @@ func TestConfigureLaneLegAsSource_MCMSBatchOp_WithLatestPackageIDs(t *testing.T)
registry string
latest string
}{
{ccipPkg, latestCCIP}, // FeeQuoter apply_token_transfer_fee_config_updates
{ccipPkg, latestCCIP}, // FeeQuoter apply_dest_chain_config_updates
{ccipPkg, latestCCIP}, // FeeQuoter apply_premium_multiplier_wei_per_eth_updates
{ccipPkg, latestCCIP}, // FeeQuoter apply_token_transfer_fee_config_updates
{ccipPkg, latestCCIP}, // FeeQuoter apply_dest_chain_config_updates
{ccipPkg, latestCCIP}, // FeeQuoter apply_premium_multiplier_wei_per_eth_updates
{onRampPkg, latestOnRamp}, // OnRamp apply_dest_chain_config_updates
{routerPkg, latestRouter}, // Router set_on_ramps
}
Expand Down
8 changes: 4 additions & 4 deletions deployment/ops/mcms/seq_deploy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ func TestDeployFastMCMSSeq_SkipOwnershipTransfer(t *testing.T) {
}

report, err := cld_ops.ExecuteSequence(bundle, DeployMCMSSequence, deps, DeployMCMSSeqInput{
ChainSelector: cselectors.SUI_TESTNET.Selector,
FastMCMS: true,
SkipOwnershipTransfer: true,
Proposer: proposerConfig,
ChainSelector: cselectors.SUI_TESTNET.Selector,
FastMCMS: true,
SkipOwnershipTransfer: true,
Proposer: proposerConfig,
})
require.NoError(t, err)

Expand Down
31 changes: 1 addition & 30 deletions relayer/chainreader/reader/chainreader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const (
ccipPointerKey = "state_object::CCIPObjectRefPointer"
)

// #region agent log
// ctxErrStr returns the context error string (e.g. deadline exceeded) for session 39639b debugging.
func ctxErrStr(ctx context.Context) string {
if ctx == nil {
Expand All @@ -55,8 +54,6 @@ func ctxErrStr(ctx context.Context) string {
return ""
}

// #endregion

type suiChainReader struct {
pkgtypes.UnimplementedContractReader

Expand Down Expand Up @@ -551,7 +548,6 @@ func (s *suiChainReader) QueryKeyWithMetadata(ctx context.Context, contract pkgt
func (s *suiChainReader) BatchGetLatestValues(ctx context.Context, request pkgtypes.BatchGetLatestValuesRequest) (pkgtypes.BatchGetLatestValuesResult, error) {
result := make(pkgtypes.BatchGetLatestValuesResult)

// #region agent log
// Confirms the batch shape (contracts iterated sequentially, reads per contract concurrent) and
// whether the overall batch trips the caller's 30s deadline (the merkle-root-blocking failure).
batchStart := time.Now()
Expand All @@ -574,7 +570,6 @@ func (s *suiChainReader) BatchGetLatestValues(ctx context.Context, request pkgty
"ctxErr": ctxErrStr(ctx),
})
}()
// #endregion

for contract, batch := range request {
batchResults := make(pkgtypes.ContractBatchResults, len(batch))
Expand Down Expand Up @@ -1027,13 +1022,7 @@ func (s *suiChainReader) executeFunction(ctx context.Context, parsed *readIdenti

// Override the package ID with the latest package ID of the module being called.
// This ensure we are always using the latestPkgID in case of upgrades.
// #region agent log
execFnStart := time.Now()
// #endregion
latestPackageId, err := s.client.GetLatestPackageId(ctx, parsed.address, common.GetModuleForContract(parsed.contractName))
// #region agent log
pkgIDDur := time.Since(execFnStart)
// #endregion
if err != nil {
return []any{}, err
}
Expand Down Expand Up @@ -1073,26 +1062,8 @@ func (s *suiChainReader) executeFunction(ctx context.Context, parsed *readIdenti
return response, nil
}

// #region agent log
readFnStart := time.Now()
// #endregion
values, err := s.client.ReadFunction(ctx, parsed.address, parsed.contractName, parsed.readName, args, argTypes, typeArgs)
// #region agent log
// H1/H2/H4: per-read breakdown of where time goes (package-id resolution vs the simulate read).
readFnDur := time.Since(readFnStart)
totalDur := time.Since(execFnStart)
if totalDur > 2*time.Second {
common.DebugLog("chainreader.go:executeFunction", "slow read", map[string]any{
"hypothesisId": "H1H2H4",
"contract": parsed.contractName,
"method": parsed.readName,
"getPkgIdSec": pkgIDDur.Seconds(),
"readFunctionSec": readFnDur.Seconds(),
"totalSec": totalDur.Seconds(),
"ctxErr": ctxErrStr(ctx),
})
}
// #endregion

if err != nil {
s.logger.Errorw("ReadFunction failed",
"error", err,
Expand Down
Loading
Loading