From 1d5c031113a0e3347df1a53d98e7963b109bd38b Mon Sep 17 00:00:00 2001 From: faisal-link Date: Sat, 27 Jun 2026 19:41:38 +0400 Subject: [PATCH 1/3] cleanup debug logs --- relayer/chainreader/reader/chainreader.go | 31 +---- relayer/client/grpc_client.go | 144 +++------------------- relayer/common/debuglog.go | 3 - relayer/testutils/contract.go | 6 - 4 files changed, 15 insertions(+), 169 deletions(-) diff --git a/relayer/chainreader/reader/chainreader.go b/relayer/chainreader/reader/chainreader.go index edf92ffa0..b752eb2d5 100644 --- a/relayer/chainreader/reader/chainreader.go +++ b/relayer/chainreader/reader/chainreader.go @@ -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 { @@ -55,8 +54,6 @@ func ctxErrStr(ctx context.Context) string { return "" } -// #endregion - type suiChainReader struct { pkgtypes.UnimplementedContractReader @@ -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() @@ -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)) @@ -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 } @@ -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, diff --git a/relayer/client/grpc_client.go b/relayer/client/grpc_client.go index 2e56032ca..17948f23b 100644 --- a/relayer/client/grpc_client.go +++ b/relayer/client/grpc_client.go @@ -9,7 +9,6 @@ import ( "math/big" "slices" "strings" - "sync/atomic" // #region agent log // #endregion "testing" "time" @@ -195,28 +194,14 @@ func (c *PTBClient) WithRateLimit(ctx context.Context, methodName string, f func if err := c.rateLimiter.Acquire(workCtx, weight); err != nil { duration := time.Since(timer) c.log.Debugw("WithRateLimit failed to acquire rate limit", "methodName", methodName, "duration", duration) - // #region agent log - common.DebugLog("grpc_client.go:WithRateLimit", "acquire failed", map[string]any{ - "hypothesisId": "H3", "methodName": methodName, - "acquireWaitSec": time.Since(timer).Seconds(), - "inUse": atomic.LoadInt64(&debugSemInUse), - }) - // #endregion return fmt.Errorf("failed to acquire rate limit for %s: %w", methodName, err) } - - // #region agent log acquireWait := time.Since(timer) - atomic.AddInt64(&debugSemInUse, weight) execStart := time.Now() - // #endregion // ensure cleanup on exit defer func() { c.rateLimiter.Release(weight) - // #region agent log - atomic.AddInt64(&debugSemInUse, -weight) - // #endregion }() // run the user function with the timeout context @@ -224,36 +209,21 @@ func (c *PTBClient) WithRateLimit(ctx context.Context, methodName string, f func err := f(workCtx) duration := time.Since(timer) c.log.Debugw("WithRateLimit completed", "methodName", methodName, "duration", duration) - // #region agent log - // H3: distinguish time spent waiting on the semaphore vs running the RPC. + + // distinguish time spent waiting on the semaphore vs running the RPC. if duration > 2*time.Second || acquireWait > 500*time.Millisecond { - common.DebugLog("grpc_client.go:WithRateLimit", "slow rate-limited call", map[string]any{ - "hypothesisId": "H3", - "methodName": methodName, - "acquireWaitSec": acquireWait.Seconds(), - "execSec": time.Since(execStart).Seconds(), - "totalSec": duration.Seconds(), - "semInUse": atomic.LoadInt64(&debugSemInUse), - "ctxErr": ctxErrString(ctx), - }) + c.log.Debugw( + "WithRateLimit slow rate-limited call", + "methodName", methodName, + "acquireWaitSec", acquireWait.Seconds(), + "execSec", time.Since(execStart).Seconds(), + "totalSec", duration.Seconds(), + "ctxErr", ctxErrString(ctx), + ) } - // #endregion return err } -// #region agent log -// debugSemInUse tracks the approximate number of weighted units currently held by WithRateLimit -// (i.e. concurrent in-flight rate-limited operations). Session 39639b instrumentation only. -var debugSemInUse int64 - -// debugSimInflight tracks the number of SimulateTransaction RPCs currently in flight to the -// single shared gRPC connection / local Sui node. Session 39639b instrumentation only. -var debugSimInflight int64 - -// debugReadInflight tracks the number of readFunctionInternal chains currently in flight (covers the -// whole transform+build+simulate pipeline, not just the simulate RPC). Session 39639b instrumentation. -var debugReadInflight int64 - func ctxErrString(ctx context.Context) string { if ctx == nil { return "" @@ -264,8 +234,6 @@ func ctxErrString(ctx context.Context) string { return "" } -// #endregion - // MoveCall is a method that's used primarily in tests for adhoc contract calls. // It simply builds the transaction bytes and returns them. func (c *PTBClient) MoveCall(ctx context.Context, req MoveCallRequest) (TxnMetaData, error) { @@ -407,13 +375,9 @@ func (c *PTBClient) readObjectMetadataInternal(ctx context.Context, objectId str // fetchObjectMetadata performs the actual GetObject RPC for an object's reference metadata. func (c *PTBClient) fetchObjectMetadata(ctx context.Context, objectId string) (*suirpcv2.Object, error) { - // #region agent log metaStart := time.Now() - // #endregion ledgerService, err := c.getLedgerService(ctx) - // #region agent log svcDur := time.Since(metaStart) - // #endregion if err != nil { return nil, fmt.Errorf("failed to get ledger service: %w", err) } @@ -430,11 +394,8 @@ func (c *PTBClient) fetchObjectMetadata(ctx context.Context, objectId string) (* }, } - // #region agent log rpcStart := time.Now() - // #endregion response, err := ledgerService.GetObject(ctx, &objectReq) - // #region agent log rpcDur := time.Since(rpcStart) if time.Since(metaStart) > 2*time.Second { objType := "" @@ -451,7 +412,6 @@ func (c *PTBClient) fetchObjectMetadata(ctx context.Context, objectId string) (* "err": err != nil, }) } - // #endregion if err != nil || response.Object == nil { return nil, fmt.Errorf("failed to read object metadata: %w", err) } @@ -639,22 +599,13 @@ func (c *PTBClient) readFunctionInternal(ctx context.Context, packageId string, } defer cancel() - // #region agent log - // RUN2: break down where readFunctionInternal spends time (transform vs build vs simulate) and - // track the TRUE aggregate number of read RPC chains in flight per process (covers slow reads that - // never reach simulatePTBInternal, e.g. blocked in arg/object-ref transform). - readInflight := atomic.AddInt64(&debugReadInflight, 1) - defer atomic.AddInt64(&debugReadInflight, -1) rfStart := time.Now() var svcDur, typeArgDur, transformDur, buildDur, simDur time.Duration - // #endregion txExecService, err := c.getTransactionExecutionService(readCtx) if err != nil { return nil, fmt.Errorf("failed to get transaction execution service: %w", err) } - // #region agent log svcDur = time.Since(rfStart) - // #endregion var results []any txn := transaction.NewTransaction() @@ -663,9 +614,7 @@ func (c *PTBClient) readFunctionInternal(ctx context.Context, packageId string, var txnTypeArgs []transaction.TypeTag // Process type arguments - // #region agent log typeArgStart := time.Now() - // #endregion for _, typeArg := range typeArgs { typeTag, typeTagErr := c.CreateTypeTag(typeArg) if typeTagErr != nil { @@ -673,10 +622,8 @@ func (c *PTBClient) readFunctionInternal(ctx context.Context, packageId string, } txnTypeArgs = append(txnTypeArgs, typeTag) } - // #region agent log typeArgDur = time.Since(typeArgStart) transformStart := time.Now() - // #endregion for i, arg := range args { argType, ok := common.ValueAt(argTypes, i) @@ -690,9 +637,7 @@ func (c *PTBClient) readFunctionInternal(ctx context.Context, packageId string, } txnArgs = append(txnArgs, *txArg) } - // #region agent log transformDur = time.Since(transformStart) - // #endregion // set a read-only (no funds) signer for read (simulate) calls txn.SetSigner(c.devInspectSigner) @@ -703,42 +648,20 @@ func (c *PTBClient) readFunctionInternal(ctx context.Context, packageId string, txn.MoveCall(models.SuiAddress(packageId), module, function, txnTypeArgs, txnArgs) // Get transaction bytes - // #region agent log buildStart := time.Now() - // #endregion bcsBytes, err := txn.BuildBCSBytes(readCtx) if err != nil { return nil, fmt.Errorf("failed to build bcs bytes: %w", err) } - // #region agent log buildDur = time.Since(buildStart) simStart := time.Now() - // #endregion results, err = c.simulatePTBInternal(readCtx, txExecService, bcsBytes) - // #region agent log simDur = time.Since(simStart) totalDur := time.Since(rfStart) if totalDur > 3*time.Second { - common.DebugLog("grpc_client.go:readFunctionInternal", "slow read breakdown", map[string]any{ - "hypothesisId": "RUN2", - "module": module, - "function": function, - "numArgs": len(args), - "numTypeArgs": len(typeArgs), - "getSvcSec": svcDur.Seconds(), - "typeArgSec": typeArgDur.Seconds(), - "transformSec": transformDur.Seconds(), - "buildSec": buildDur.Seconds(), - "simulateSec": simDur.Seconds(), - "totalSec": totalDur.Seconds(), - "readInflight": atomic.LoadInt64(&debugReadInflight), - "simInflight": atomic.LoadInt64(&debugSimInflight), - "readPeak": readInflight, - "ctxErr": ctxErrString(readCtx), - }) + c.log.Debugw("ReadFunction slow read breakdown", "module", module, "function", function, "numArgs", len(args), "numTypeArgs", len(typeArgs), "getSvcSec", svcDur.Seconds(), "typeArgSec", typeArgDur.Seconds(), "transformSec", transformDur.Seconds(), "buildSec", buildDur.Seconds(), "simulateSec", simDur.Seconds(), "totalSec", totalDur.Seconds(), "ctxErr", ctxErrString(readCtx)) } - // #endregion if err != nil { return nil, err } @@ -767,28 +690,17 @@ func (c *PTBClient) SimulatePTB(ctx context.Context, bcsBytes []byte) ([]any, er func (c *PTBClient) simulatePTBInternal(ctx context.Context, txExecService suirpcv2.TransactionExecutionServiceClient, bcsBytes []byte) ([]any, error) { doGasSelection := false - // #region agent log - // H1: measure the raw SimulateTransaction RPC latency and the number of simulate calls + // measure the raw SimulateTransaction RPC latency and the number of simulate calls // concurrently hitting the single gRPC connection / local Sui node. - inflight := atomic.AddInt64(&debugSimInflight, 1) simStart := time.Now() - defer atomic.AddInt64(&debugSimInflight, -1) - // #endregion response, err := txExecService.SimulateTransaction(ctx, &suirpcv2.SimulateTransactionRequest{ Transaction: &suirpcv2.Transaction{Bcs: &suirpcv2.Bcs{Value: bcsBytes}}, DoGasSelection: &doGasSelection, }) - // #region agent log simDur := time.Since(simStart) if simDur > time.Second { - common.DebugLog("grpc_client.go:simulatePTBInternal", "slow SimulateTransaction RPC", map[string]any{ - "hypothesisId": "H1", - "simSec": simDur.Seconds(), - "simInflightPeak": inflight, - "simErr": err != nil, - }) + c.log.Debugw("SimulateTransaction slow SimulateTransaction RPC", "simSec", simDur.Seconds(), "simErr", err != nil) } - // #endregion if err != nil { return nil, fmt.Errorf("failed to simulate transaction: %w", err) } @@ -1495,20 +1407,11 @@ func (c *PTBClient) GetLatestPackageId(ctx context.Context, packageId string, mo cacheKey := "latest_pkg_id_fetch:" + packageId + ":" + module if cachedID, found := c.cache.Get(cacheKey); found { if id, ok := cachedID.(string); ok { - // #region agent log - // H2: count cache hits to gauge thundering-herd severity vs misses below. - atomic.AddInt64(&debugPkgIDCacheHits, 1) - // #endregion return id, nil } } - // #region agent log - // H2: a cache miss triggers GetFunction+GetPackage+ListOwnedObjects (~3-4 RPC). When many reads - // miss simultaneously (10s TTL expiry) this multiplies the RPC load in bursts. missStart := time.Now() - missCount := atomic.AddInt64(&debugPkgIDCacheMisses, 1) - // #endregion var result string err := c.WithRateLimit(ctx, "GetLatestPackageId", func(ctx context.Context) error { var err error @@ -1520,29 +1423,10 @@ func (c *PTBClient) GetLatestPackageId(ctx context.Context, packageId string, mo return err }) - // #region agent log - common.DebugLog("grpc_client.go:GetLatestPackageId", "package id cache MISS", map[string]any{ - "hypothesisId": "H2", - "module": module, - "missSec": time.Since(missStart).Seconds(), - "totalMisses": missCount, - "totalHits": atomic.LoadInt64(&debugPkgIDCacheHits), - "simInflight": atomic.LoadInt64(&debugSimInflight), - "err": err != nil, - }) - // #endregion + c.log.Debugw("GetLatestPackageId package id cache MISS", "module", module, "missSec", time.Since(missStart).Seconds(), "err", err != nil) return result, err } -// #region agent log -// Session 39639b: GetLatestPackageId cache hit/miss counters (H2 thundering-herd measurement). -var ( - debugPkgIDCacheHits int64 - debugPkgIDCacheMisses int64 -) - -// #endregion - // getLatestPackageIdInternal is the internal implementation without rate limiting func (c *PTBClient) getLatestPackageIdInternal(ctx context.Context, packageId string, module string) (string, error) { // Use internal method to avoid nested semaphore acquisition diff --git a/relayer/common/debuglog.go b/relayer/common/debuglog.go index f7b245d59..a5eb22aff 100644 --- a/relayer/common/debuglog.go +++ b/relayer/common/debuglog.go @@ -1,6 +1,5 @@ package common -// #region agent log // TEMPORARY debug instrumentation for session 39639b (Sui CCIP merkle-root read-path investigation). // Writes NDJSON lines to a fixed log file. Remove this file once debugging is complete. @@ -45,5 +44,3 @@ func DebugLog(location, message string, data map[string]any) { _, _ = f.Write(append(line, '\n')) } - -// #endregion diff --git a/relayer/testutils/contract.go b/relayer/testutils/contract.go index 45d9a0c04..8a8e697f8 100644 --- a/relayer/testutils/contract.go +++ b/relayer/testutils/contract.go @@ -280,13 +280,11 @@ func PublishContract(t *testing.T, packageName string, contractPath string, acco patchMoveTomlEnvironment(filepath.Join(dir, "Move.toml"), envName, chainID) } - // #region agent log logFile, _ := os.OpenFile("/Users/felix/dev/chainlink/.cursor/debug-7c7360.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if logFile != nil { fmt.Fprintf(logFile, "{\"sessionId\":\"7c7360\",\"hypothesisId\":\"A\",\"location\":\"contract.go:PublishContract\",\"message\":\"pre-publish state\",\"data\":{\"chainID\":%q,\"envName\":%q,\"contractPath\":%q,\"dirsToClean\":%q},\"timestamp\":%d}\n", chainID, envName, contractPath, dirsToClean, time.Now().UnixMilli()) logFile.Close() } - // #endregion publishCmd := exec.Command("sui", "client", "publish", "--gas-budget", gasBudgetArg, @@ -298,7 +296,6 @@ func PublishContract(t *testing.T, packageName string, contractPath string, acco publishOutput, err := publishCmd.CombinedOutput() - // #region agent log logFile2, _ := os.OpenFile("/Users/felix/dev/chainlink/.cursor/debug-7c7360.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if logFile2 != nil { outSnippet := string(publishOutput) @@ -308,7 +305,6 @@ func PublishContract(t *testing.T, packageName string, contractPath string, acco fmt.Fprintf(logFile2, "{\"sessionId\":\"7c7360\",\"hypothesisId\":\"A\",\"location\":\"contract.go:PublishContract:post\",\"message\":\"publish result\",\"data\":{\"err\":%q,\"outputSnippet\":%q},\"timestamp\":%d}\n", fmt.Sprint(err), outSnippet, time.Now().UnixMilli()) logFile2.Close() } - // #endregion require.NoError(t, err, "Failed to publish contract: %s", string(publishOutput)) @@ -603,13 +599,11 @@ func ensureCLIEnvForChainID(chainID string) string { switchCmd := exec.Command("sui", "client", "switch", "--env", envName) switchCmd.CombinedOutput() //nolint:errcheck - // #region agent log logFile, _ := os.OpenFile("/Users/felix/dev/chainlink/.cursor/debug-7c7360.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if logFile != nil { fmt.Fprintf(logFile, "{\"sessionId\":\"7c7360\",\"hypothesisId\":\"B\",\"location\":\"contract.go:ensureCLIEnvForChainID\",\"message\":\"CLI env created\",\"data\":{\"envName\":%q,\"chainID\":%q},\"timestamp\":%d}\n", envName, chainID, time.Now().UnixMilli()) logFile.Close() } - // #endregion return envName } From 244930cd79c4c01184f031ae431d99b593e7db62 Mon Sep 17 00:00:00 2001 From: faisal-link Date: Sat, 27 Jun 2026 19:43:03 +0400 Subject: [PATCH 2/3] lint fix --- bindings/generated/function_info.go | 122 +++++++++--------- deployment/changesets/cs_mcms_configure.go | 2 +- .../lanes/connect_chains_layer2_test.go | 8 +- deployment/lanes/connect_chains_test.go | 8 +- deployment/ops/mcms/seq_deploy_test.go | 8 +- 5 files changed, 74 insertions(+), 74 deletions(-) diff --git a/bindings/generated/function_info.go b/bindings/generated/function_info.go index c8c395f0e..c1f3561b5 100644 --- a/bindings/generated/function_info.go +++ b/bindings/generated/function_info.go @@ -3,67 +3,67 @@ package generated import ( - module_fee_quoter "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/fee_quoter" - module_nonce_manager "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/nonce_manager" - module_offramp_state_helper "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/offramp_state_helper" - module_receiver_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/receiver_registry" - module_rmn_remote "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/rmn_remote" - module_state_object "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/state_object" - module_token_admin_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/token_admin_registry" - module_upgrade_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/upgrade_registry" - module_ccip_burn_mint_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_burn_mint_token/ccip_burn_mint_token" - module_dummy_receiver "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_dummy_receiver/ccip_dummy_receiver" - module_offramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_offramp/offramp" - module_onramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/onramp" - module_ownable "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/ownable" - module_router "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_router" - module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool" - module_lock_release_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/lock_release_token_pool" - module_managed_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/managed_token_pool" - module_managed_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token/managed_token" - module_faucet "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token_faucet/managed_token_faucet" - module_mock_eth_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_eth_token/mock_eth_token" - module_mock_link_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_link_token/mock_link_token" - module_link "github.com/smartcontractkit/chainlink-sui/bindings/generated/link/link" - module_mcms "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms" - module_mcms_account "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_account" - module_mcms_deployer "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_deployer" - module_mcms_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_registry" - module_mcms_user "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_user" - module_complex "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/complex" - module_counter "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/counter" - module_generics "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/generics" + module_fee_quoter "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/fee_quoter" + module_nonce_manager "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/nonce_manager" + module_offramp_state_helper "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/offramp_state_helper" + module_receiver_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/receiver_registry" + module_rmn_remote "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/rmn_remote" + module_state_object "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/state_object" + module_token_admin_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/token_admin_registry" + module_upgrade_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/upgrade_registry" + module_ccip_burn_mint_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_burn_mint_token/ccip_burn_mint_token" + module_dummy_receiver "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_dummy_receiver/ccip_dummy_receiver" + module_offramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_offramp/offramp" + module_onramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/onramp" + module_ownable "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/ownable" + module_router "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_router" + module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool" + module_lock_release_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/lock_release_token_pool" + module_managed_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/managed_token_pool" + module_managed_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token/managed_token" + module_faucet "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token_faucet/managed_token_faucet" + module_mock_eth_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_eth_token/mock_eth_token" + module_mock_link_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_link_token/mock_link_token" + module_link "github.com/smartcontractkit/chainlink-sui/bindings/generated/link/link" + module_mcms "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms" + module_mcms_account "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_account" + module_mcms_deployer "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_deployer" + module_mcms_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_registry" + module_mcms_user "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_user" + module_complex "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/complex" + module_counter "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/counter" + module_generics "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/generics" ) var FunctionInfoByModule = map[string]string{ - "fee_quoter": module_fee_quoter.FunctionInfo, - "nonce_manager": module_nonce_manager.FunctionInfo, - "offramp_state_helper": module_offramp_state_helper.FunctionInfo, - "receiver_registry": module_receiver_registry.FunctionInfo, - "rmn_remote": module_rmn_remote.FunctionInfo, - "state_object": module_state_object.FunctionInfo, - "token_admin_registry": module_token_admin_registry.FunctionInfo, - "upgrade_registry": module_upgrade_registry.FunctionInfo, - "ccip_burn_mint_token": module_ccip_burn_mint_token.FunctionInfo, - "dummy_receiver": module_dummy_receiver.FunctionInfo, - "offramp": module_offramp.FunctionInfo, - "onramp": module_onramp.FunctionInfo, - "ownable": module_ownable.FunctionInfo, - "router": module_router.FunctionInfo, - "burn_mint_token_pool": module_burn_mint_token_pool.FunctionInfo, - "lock_release_token_pool": module_lock_release_token_pool.FunctionInfo, - "managed_token_pool": module_managed_token_pool.FunctionInfo, - "managed_token": module_managed_token.FunctionInfo, - "faucet": module_faucet.FunctionInfo, - "mock_eth_token": module_mock_eth_token.FunctionInfo, - "mock_link_token": module_mock_link_token.FunctionInfo, - "link": module_link.FunctionInfo, - "mcms": module_mcms.FunctionInfo, - "mcms_account": module_mcms_account.FunctionInfo, - "mcms_deployer": module_mcms_deployer.FunctionInfo, - "mcms_registry": module_mcms_registry.FunctionInfo, - "mcms_user": module_mcms_user.FunctionInfo, - "complex": module_complex.FunctionInfo, - "counter": module_counter.FunctionInfo, - "generics": module_generics.FunctionInfo, -} \ No newline at end of file + "fee_quoter": module_fee_quoter.FunctionInfo, + "nonce_manager": module_nonce_manager.FunctionInfo, + "offramp_state_helper": module_offramp_state_helper.FunctionInfo, + "receiver_registry": module_receiver_registry.FunctionInfo, + "rmn_remote": module_rmn_remote.FunctionInfo, + "state_object": module_state_object.FunctionInfo, + "token_admin_registry": module_token_admin_registry.FunctionInfo, + "upgrade_registry": module_upgrade_registry.FunctionInfo, + "ccip_burn_mint_token": module_ccip_burn_mint_token.FunctionInfo, + "dummy_receiver": module_dummy_receiver.FunctionInfo, + "offramp": module_offramp.FunctionInfo, + "onramp": module_onramp.FunctionInfo, + "ownable": module_ownable.FunctionInfo, + "router": module_router.FunctionInfo, + "burn_mint_token_pool": module_burn_mint_token_pool.FunctionInfo, + "lock_release_token_pool": module_lock_release_token_pool.FunctionInfo, + "managed_token_pool": module_managed_token_pool.FunctionInfo, + "managed_token": module_managed_token.FunctionInfo, + "faucet": module_faucet.FunctionInfo, + "mock_eth_token": module_mock_eth_token.FunctionInfo, + "mock_link_token": module_mock_link_token.FunctionInfo, + "link": module_link.FunctionInfo, + "mcms": module_mcms.FunctionInfo, + "mcms_account": module_mcms_account.FunctionInfo, + "mcms_deployer": module_mcms_deployer.FunctionInfo, + "mcms_registry": module_mcms_registry.FunctionInfo, + "mcms_user": module_mcms_user.FunctionInfo, + "complex": module_complex.FunctionInfo, + "counter": module_counter.FunctionInfo, + "generics": module_generics.FunctionInfo, +} diff --git a/deployment/changesets/cs_mcms_configure.go b/deployment/changesets/cs_mcms_configure.go index 2cadfa823..8596d2d98 100644 --- a/deployment/changesets/cs_mcms_configure.go +++ b/deployment/changesets/cs_mcms_configure.go @@ -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{} diff --git a/deployment/lanes/connect_chains_layer2_test.go b/deployment/lanes/connect_chains_layer2_test.go index 3b66caa00..762817cff 100644 --- a/deployment/lanes/connect_chains_layer2_test.go +++ b/deployment/lanes/connect_chains_layer2_test.go @@ -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}, diff --git a/deployment/lanes/connect_chains_test.go b/deployment/lanes/connect_chains_test.go index 530d6e8f4..9657a7fd8 100644 --- a/deployment/lanes/connect_chains_test.go +++ b/deployment/lanes/connect_chains_test.go @@ -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" @@ -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 } diff --git a/deployment/ops/mcms/seq_deploy_test.go b/deployment/ops/mcms/seq_deploy_test.go index da4963225..64f30ab0d 100644 --- a/deployment/ops/mcms/seq_deploy_test.go +++ b/deployment/ops/mcms/seq_deploy_test.go @@ -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) From a2c8bc1a5b481200c06ee09dd13042302fe36bb2 Mon Sep 17 00:00:00 2001 From: faisal-link Date: Mon, 29 Jun 2026 14:58:30 +0400 Subject: [PATCH 3/3] regen bindings function info file --- bindings/generated/function_info.go | 122 ++++++++++++++-------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/bindings/generated/function_info.go b/bindings/generated/function_info.go index c1f3561b5..c8c395f0e 100644 --- a/bindings/generated/function_info.go +++ b/bindings/generated/function_info.go @@ -3,67 +3,67 @@ package generated import ( - module_fee_quoter "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/fee_quoter" - module_nonce_manager "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/nonce_manager" - module_offramp_state_helper "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/offramp_state_helper" - module_receiver_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/receiver_registry" - module_rmn_remote "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/rmn_remote" - module_state_object "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/state_object" - module_token_admin_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/token_admin_registry" - module_upgrade_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/upgrade_registry" - module_ccip_burn_mint_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_burn_mint_token/ccip_burn_mint_token" - module_dummy_receiver "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_dummy_receiver/ccip_dummy_receiver" - module_offramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_offramp/offramp" - module_onramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/onramp" - module_ownable "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/ownable" - module_router "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_router" - module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool" - module_lock_release_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/lock_release_token_pool" - module_managed_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/managed_token_pool" - module_managed_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token/managed_token" - module_faucet "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token_faucet/managed_token_faucet" - module_mock_eth_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_eth_token/mock_eth_token" - module_mock_link_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_link_token/mock_link_token" - module_link "github.com/smartcontractkit/chainlink-sui/bindings/generated/link/link" - module_mcms "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms" - module_mcms_account "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_account" - module_mcms_deployer "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_deployer" - module_mcms_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_registry" - module_mcms_user "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_user" - module_complex "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/complex" - module_counter "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/counter" - module_generics "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/generics" + module_fee_quoter "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/fee_quoter" + module_nonce_manager "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/nonce_manager" + module_offramp_state_helper "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/offramp_state_helper" + module_receiver_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/receiver_registry" + module_rmn_remote "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/rmn_remote" + module_state_object "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/state_object" + module_token_admin_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/token_admin_registry" + module_upgrade_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip/upgrade_registry" + module_ccip_burn_mint_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_burn_mint_token/ccip_burn_mint_token" + module_dummy_receiver "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_dummy_receiver/ccip_dummy_receiver" + module_offramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_offramp/offramp" + module_onramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/onramp" + module_ownable "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_onramp/ownable" + module_router "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_router" + module_burn_mint_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/burn_mint_token_pool" + module_lock_release_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/lock_release_token_pool" + module_managed_token_pool "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_token_pools/managed_token_pool" + module_managed_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token/managed_token" + module_faucet "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/managed_token_faucet/managed_token_faucet" + module_mock_eth_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_eth_token/mock_eth_token" + module_mock_link_token "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/mock_link_token/mock_link_token" + module_link "github.com/smartcontractkit/chainlink-sui/bindings/generated/link/link" + module_mcms "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms" + module_mcms_account "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_account" + module_mcms_deployer "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_deployer" + module_mcms_registry "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_registry" + module_mcms_user "github.com/smartcontractkit/chainlink-sui/bindings/generated/mcms/mcms_user" + module_complex "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/complex" + module_counter "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/counter" + module_generics "github.com/smartcontractkit/chainlink-sui/bindings/generated/test/generics" ) var FunctionInfoByModule = map[string]string{ - "fee_quoter": module_fee_quoter.FunctionInfo, - "nonce_manager": module_nonce_manager.FunctionInfo, - "offramp_state_helper": module_offramp_state_helper.FunctionInfo, - "receiver_registry": module_receiver_registry.FunctionInfo, - "rmn_remote": module_rmn_remote.FunctionInfo, - "state_object": module_state_object.FunctionInfo, - "token_admin_registry": module_token_admin_registry.FunctionInfo, - "upgrade_registry": module_upgrade_registry.FunctionInfo, - "ccip_burn_mint_token": module_ccip_burn_mint_token.FunctionInfo, - "dummy_receiver": module_dummy_receiver.FunctionInfo, - "offramp": module_offramp.FunctionInfo, - "onramp": module_onramp.FunctionInfo, - "ownable": module_ownable.FunctionInfo, - "router": module_router.FunctionInfo, - "burn_mint_token_pool": module_burn_mint_token_pool.FunctionInfo, - "lock_release_token_pool": module_lock_release_token_pool.FunctionInfo, - "managed_token_pool": module_managed_token_pool.FunctionInfo, - "managed_token": module_managed_token.FunctionInfo, - "faucet": module_faucet.FunctionInfo, - "mock_eth_token": module_mock_eth_token.FunctionInfo, - "mock_link_token": module_mock_link_token.FunctionInfo, - "link": module_link.FunctionInfo, - "mcms": module_mcms.FunctionInfo, - "mcms_account": module_mcms_account.FunctionInfo, - "mcms_deployer": module_mcms_deployer.FunctionInfo, - "mcms_registry": module_mcms_registry.FunctionInfo, - "mcms_user": module_mcms_user.FunctionInfo, - "complex": module_complex.FunctionInfo, - "counter": module_counter.FunctionInfo, - "generics": module_generics.FunctionInfo, -} + "fee_quoter": module_fee_quoter.FunctionInfo, + "nonce_manager": module_nonce_manager.FunctionInfo, + "offramp_state_helper": module_offramp_state_helper.FunctionInfo, + "receiver_registry": module_receiver_registry.FunctionInfo, + "rmn_remote": module_rmn_remote.FunctionInfo, + "state_object": module_state_object.FunctionInfo, + "token_admin_registry": module_token_admin_registry.FunctionInfo, + "upgrade_registry": module_upgrade_registry.FunctionInfo, + "ccip_burn_mint_token": module_ccip_burn_mint_token.FunctionInfo, + "dummy_receiver": module_dummy_receiver.FunctionInfo, + "offramp": module_offramp.FunctionInfo, + "onramp": module_onramp.FunctionInfo, + "ownable": module_ownable.FunctionInfo, + "router": module_router.FunctionInfo, + "burn_mint_token_pool": module_burn_mint_token_pool.FunctionInfo, + "lock_release_token_pool": module_lock_release_token_pool.FunctionInfo, + "managed_token_pool": module_managed_token_pool.FunctionInfo, + "managed_token": module_managed_token.FunctionInfo, + "faucet": module_faucet.FunctionInfo, + "mock_eth_token": module_mock_eth_token.FunctionInfo, + "mock_link_token": module_mock_link_token.FunctionInfo, + "link": module_link.FunctionInfo, + "mcms": module_mcms.FunctionInfo, + "mcms_account": module_mcms_account.FunctionInfo, + "mcms_deployer": module_mcms_deployer.FunctionInfo, + "mcms_registry": module_mcms_registry.FunctionInfo, + "mcms_user": module_mcms_user.FunctionInfo, + "complex": module_complex.FunctionInfo, + "counter": module_counter.FunctionInfo, + "generics": module_generics.FunctionInfo, +} \ No newline at end of file