Merge branch 'main' into CRE-39

smartcontractkit · Jan 10, 2025 · 6808496 · 6808496
2 parents c647c48 + 0f838d5
commit 6808496
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/types/llo/types.go b/pkg/types/llo/types.go
@@ -45,6 +45,9 @@ const (
 	// ReportFormatRetirement is a special "capstone" report format to indicate
 	// a retired OCR instance, and handover crucial information to a new one
 	ReportFormatRetirement ReportFormat = 3
+	// ReportFormatEVMAbiEncodeUnpacked supports encoding reports with a fixed
+	// schema followed by an arbitrary ABI-encoded payload
+	ReportFormatEVMAbiEncodeUnpacked = 4
 
 	_ ReportFormat = math.MaxUint32 // reserved
 )

diff --git a/pkg/workflows/wasm/host/wasip1.go b/pkg/workflows/wasm/host/wasip1.go
@@ -138,7 +138,7 @@ func pollOneoff(caller *wasmtime.Caller, subscriptionptr int32, eventsptr int32,
 			// - 8-16: timeout
 			// - 16-24: precision
 			// - 24-32: flag
-			newTimeout := binary.LittleEndian.Uint16(argBuf[8:16])
+			newTimeout := binary.LittleEndian.Uint64(argBuf[8:16])
 			flag := binary.LittleEndian.Uint16(argBuf[24:32])
 
 			var errno Errno