Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chainlink",
"version": "2.39.0",
"version": "2.39.2",
"description": "node of the decentralized oracle network, bridging on and off-chain computation",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugins.private.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ plugins:
installPath: "."
confidential-http:
- moduleURI: "github.com/smartcontractkit/confidential-compute/enclave/apps/confidential-http/capability"
gitRef: "c35ae2937dcb63196d87c3dea27ebd0ef5701c29"
gitRef: "187018af88ce265ca70b86222f8587e3fcb7ff32"
installPath: "./cmd/confidential-http"
20 changes: 15 additions & 5 deletions system-tests/tests/smoke/cre/v2_evm_capability_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,11 +311,17 @@ func connectTriggerDB(t *testing.T, nodeSets []*cre.NodeSet, chainID string) *sq
return db
}

var _ = connectTriggerDB

type tableStats struct {
inserts int64
deletes int64
}

var _ tableStats

var _ = snapshotTriggerStats

// snapshotTriggerStats returns the current cumulative insert/delete counts for
// the trigger_pending_events table from pg_stat_user_tables.
func snapshotTriggerStats(ctx context.Context, db *sql.DB) (tableStats, error) {
Expand Down Expand Up @@ -357,11 +363,12 @@ func ExecuteEVMLogTriggerTest(t *testing.T, testEnv *ttypes.TestEnvironment) {

successfulLogTriggerChains := make([]string, 0, len(chainsToTest))
for chainID, bcOutput := range chainsToTest {
triggerDB := connectTriggerDB(t, testEnv.Config.NodeSets, chainID)
// TODO: (CRE-2314) Re-enable trigger event ACKS
// triggerDB := connectTriggerDB(t, testEnv.Config.NodeSets, chainID)

baselineStats, err := snapshotTriggerStats(t.Context(), triggerDB)
require.NoError(t, err, "failed to snapshot trigger_pending_events stats for chain %s", chainID)
t.Logf("baseline trigger_pending_events stats for chain %s: inserts=%d deletes=%d", chainID, baselineStats.inserts, baselineStats.deletes)
// baselineStats, err := snapshotTriggerStats(t.Context(), triggerDB)
// require.NoError(t, err, "failed to snapshot trigger_pending_events stats for chain %s", chainID)
// lggr.Info().Msgf("baseline trigger_pending_events stats for chain %s: inserts=%d deletes=%d", chainID, baselineStats.inserts, baselineStats.deletes)

lggr.Info().Msgf("Creating EVM LogTrigger workflow configuration for chain %s", chainID)
workflowConfig, msgEmitter := configureEVMLogTriggerWorkflow(t, lggr, bcOutput)
Expand Down Expand Up @@ -399,7 +406,8 @@ func ExecuteEVMLogTriggerTest(t *testing.T, testEnv *ttypes.TestEnvironment) {
t_helpers.WatchWorkflowLogs(t, lggr, userLogsCh, baseMessageCh, t_helpers.WorkflowEngineInitErrorLog, expectedUserLog, 4*time.Minute)
emitCancelFn()

verifyTriggerEventACKs(t, triggerDB, baselineStats)
// TODO: (CRE-2314) Re-enable trigger event ACKS
// verifyTriggerEventACKs(t, triggerDB, baselineStats)

lggr.Info().Msgf("🎉 LogTrigger Workflow %s executed successfully on chain %s", workflowName, chainID)
successfulLogTriggerChains = append(successfulLogTriggerChains, chainID)
Expand Down Expand Up @@ -429,3 +437,5 @@ func verifyTriggerEventACKs(t *testing.T, triggerDB *sql.DB, baselineStats table
return newInserts > 0 && newDeletes > 0
}, 2*time.Minute, time.Second, "trigger events were never inserted and/or ACKed in the database")
}

var _ = verifyTriggerEventACKs
Loading