update sui and fix tests (#21867)

* update sui and fix tests

* update tests

* re-arrange tests

* fix tests

* update

* update

* update

* update

* upgrade sui

* fix

* update

Author: FelixFan1992

.github/integration-in-memory-tests.yml

@@ -511,7 +511,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260407162454-407b2a207dcc // indirect
 	github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260217175957-8f1af02c5075 // indirect
-	github.com/smartcontractkit/chainlink-sui v0.0.0-20260403160819-db38ee3fbcde // indirect
+	github.com/smartcontractkit/chainlink-sui v0.0.0-20260408023220-974ac248027c // indirect
 	github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260304150206-c64e48eb0cb0 // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake v0.10.0 // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2 // indirect

core/scripts/go.mod

@@ -13,11 +13,10 @@ import (
 	"github.com/block-vision/sui-go-sdk/models"
 	"github.com/block-vision/sui-go-sdk/sui"
 
-	module_offramp "github.com/smartcontractkit/chainlink-aptos/bindings/ccip_offramp/offramp"
-	"github.com/smartcontractkit/chainlink-aptos/relayer/codec"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
 	sui_module_offramp "github.com/smartcontractkit/chainlink-sui/bindings/generated/ccip/ccip_offramp/offramp"
 	sui_ccip_offramp "github.com/smartcontractkit/chainlink-sui/bindings/packages/offramp"
+	"github.com/smartcontractkit/chainlink-sui/relayer/codec"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
@@ -32,6 +31,13 @@ type SuiAdapter struct {
 	cldf_sui.Chain
 }
 
+// offRampOriginalPkgID returns the original (V1) package ID, which must be used
+// for event queries. In Sui, struct types (including events) always carry the
+// original defining package's ID regardless of which upgraded version emitted them.
+func (a *SuiAdapter) offRampOriginalPkgID() string {
+	return a.state.OffRampAddress
+}
+
 func NewSuiAdapter(chain cldf.BlockChain, env deployment.Environment) Adapter {
 	c, ok := chain.(cldf_sui.Chain)
 	if !ok {
@@ -76,7 +82,7 @@ func (a *SuiAdapter) ValidateCommit(t *testing.T, sourceSelector uint64, startBl
 		t,
 		sourceSelector,
 		a.Chain,
-		a.state.OffRampAddress,
+		a.offRampOriginalPkgID(),
 		startBlock,
 		seqNumRange,
 		true,
@@ -89,7 +95,7 @@ func (a *SuiAdapter) ValidateExec(t *testing.T, sourceSelector uint64, startBloc
 		t,
 		sourceSelector,
 		a.Chain,
-		a.state.OffRampAddress,
+		a.offRampOriginalPkgID(),
 		startBlock,
 		seqNrs,
 	)
@@ -113,8 +119,7 @@ func SuiEventEmitter[T any](
 		Version string
 	}, 200)
 	errChan := make(chan error)
-	limit := uint64(50)                 // Use uint64 directly to avoid conversion
-	seenEvents := make(map[string]bool) // Track all seen event IDs to prevent duplicates
+	limit := uint64(50)
 
 	go func() {
 		defer close(ch)
@@ -123,9 +128,11 @@ func SuiEventEmitter[T any](
 		ticker := time.NewTicker(time.Second * 2)
 		defer ticker.Stop()
 
+		var cursor interface{}
+
 		for {
+			// Drain all available pages from the current cursor position before waiting.
 			for {
-				// As this can take a few iterations if there are many events, check for done before each request
 				select {
 				case <-done:
 					t.Logf("[DEBUG] SuiEventEmitter: Stopping due to done signal")
@@ -139,6 +146,7 @@ func SuiEventEmitter[T any](
 
 				events, err := client.SuiXQueryEvents(t.Context(), models.SuiXQueryEventsRequest{
 					SuiEventFilter:  eventFilter,
+					Cursor:          cursor,
 					Limit:           limit,
 					DescendingOrder: false,
 				})
@@ -153,37 +161,21 @@ func SuiEventEmitter[T any](
 				}
 
 				if len(events.Data) == 0 {
-					// No new events found
 					t.Logf("[DEBUG] SuiEventEmitter: No new events found")
 					break
 				}
 
 				t.Logf("[DEBUG] SuiEventEmitter: Processing %d events", len(events.Data))
-				newEventsCount := 0
 
 				for _, ev := range events.Data {
-					// Create unique event ID combining transaction digest and event sequence
 					eventID := fmt.Sprintf("%s:%s", ev.Id.TxDigest, ev.Id.EventSeq)
 
-					if seenEvents[eventID] {
-						t.Logf("[DEBUG] SuiEventEmitter: Skipping duplicate event %s with type %s and transaction module %s at timestamp %s", eventID, ev.Type, ev.TransactionModule, ev.TimestampMs)
-						continue // skip duplicates
-					}
-					seenEvents[eventID] = true
-
 					var out T
-					// TODO: Use proper SUI JSON decoder instead of Aptos decoder
-					if err := codec.DecodeAptosJsonValue(ev.ParsedJson, &out); err != nil {
-						t.Logf("[DEBUG] SuiEventEmitter: Decode error for event %s with type %s and transaction module %s at timestamp %s: %v", eventID, ev.Type, ev.TransactionModule, ev.TimestampMs, err)
-						select {
-						case errChan <- fmt.Errorf("failed to decode event %s with type %s and transaction module %s at timestamp %s: %w", eventID, ev.Type, ev.TransactionModule, ev.TimestampMs, err):
-						case <-done:
-							return
-						}
+					if err := codec.DecodeSuiJsonValue(ev.ParsedJson, &out); err != nil {
+						t.Logf("[DEBUG] SuiEventEmitter: Decode error for event %s: %v (skipping)", eventID, err)
 						continue
 					}
 
-					newEventsCount++
 					eventData := struct {
 						Event   T
 						Version string
@@ -192,26 +184,21 @@ func SuiEventEmitter[T any](
 						Version: ev.Id.EventSeq,
 					}
 
-					// Non-blocking send to prevent goroutine deadlock
 					select {
 					case ch <- eventData:
-						t.Logf("[DEBUG] SuiEventEmitter: Sent event %s with type %s and transaction module %s at timestamp %s", eventID, ev.Type, ev.TransactionModule, ev.TimestampMs)
+						t.Logf("[DEBUG] SuiEventEmitter: Sent event %s with type %s at timestamp %s", eventID, ev.Type, ev.TimestampMs)
 					case <-done:
 						t.Logf("[DEBUG] SuiEventEmitter: Stopping due to done signal during send")
 						return
 					default:
-						t.Logf("[WARNING] SuiEventEmitter: Channel full, dropping event %s with type %s and transaction module %s at timestamp %s", eventID, ev.Type, ev.TransactionModule, ev.TimestampMs)
-						// Channel is full, log warning but continue processing
-						// This prevents blocking the entire event loop
+						t.Logf("[WARNING] SuiEventEmitter: Channel full, dropping event %s", eventID)
 					}
 				}
 
-				t.Logf("[DEBUG] SuiEventEmitter: Processed %d new events out of %d total", newEventsCount, len(events.Data))
+				// Advance the cursor so the next query picks up where we left off.
+				cursor = events.NextCursor
 
-				// For now, break after processing to avoid infinite loops
-				// TODO: Implement proper cursor-based pagination when SUI SDK supports it
-				if uint64(len(events.Data)) < limit {
-					// Received fewer events than limit, likely no more events available
+				if !events.HasNextPage {
 					break
 				}
 			}
@@ -220,7 +207,6 @@ func SuiEventEmitter[T any](
 				t.Logf("[DEBUG] SuiEventEmitter: Stopping due to done signal in ticker loop")
 				return
 			case <-ticker.C:
-				t.Logf("[DEBUG] SuiEventEmitter: Ticker fired, checking for new events")
 				continue
 			}
 		}
@@ -318,7 +304,7 @@ func confirmExecWithExpectedSeqNrsSui(
 	defer close(done)
 
 	t.Log("[DEBUG] Subscribing to Sui events...", offRampAddress)
-	sink, errChan := SuiEventEmitter[module_offramp.ExecutionStateChanged](t, dest.Client, offRampAddress, "offramp", "ExecutionStateChanged", done)
+	sink, errChan := SuiEventEmitter[sui_module_offramp.ExecutionStateChanged](t, dest.Client, offRampAddress, "offramp", "ExecutionStateChanged", done)
 
 	t.Log("[DEBUG] Event subscription established")
 

core/scripts/go.sum

@@ -56,7 +56,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0
 	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260407162454-407b2a207dcc
 	github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260217175957-8f1af02c5075
-	github.com/smartcontractkit/chainlink-sui v0.0.0-20260403160819-db38ee3fbcde
+	github.com/smartcontractkit/chainlink-sui v0.0.0-20260408023220-974ac248027c
 	github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260304150206-c64e48eb0cb0
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.3
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.5

deployment/ccip/changeset/testhelpers/test_adapter_sui.go

@@ -105,7 +105,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0
 	github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997
 	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260407162454-407b2a207dcc
-	github.com/smartcontractkit/chainlink-sui v0.0.0-20260403160819-db38ee3fbcde
+	github.com/smartcontractkit/chainlink-sui v0.0.0-20260408023220-974ac248027c
 	github.com/smartcontractkit/chainlink-ton v0.0.0-20260331005855-7b5a4b3384f8
 	github.com/smartcontractkit/cre-sdk-go v1.5.0
 	github.com/smartcontractkit/cre-sdk-go/capabilities/networking/http v1.3.0

deployment/go.mod

@@ -44,8 +44,8 @@ require (
 	github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260330133421-5151ea0c3b05
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
-	github.com/smartcontractkit/chainlink-sui v0.0.0-20260403160819-db38ee3fbcde
-	github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260403160819-db38ee3fbcde
+	github.com/smartcontractkit/chainlink-sui v0.0.0-20260408023220-974ac248027c
+	github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260408023220-974ac248027c
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.7
 	github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2
 	github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2