feat(DAPP-7412): update write report receiver (#113)

jeffrifwaldsmartcontract · web-flow · commit 065fe27a226e · 2025-10-03T09:12:14.000+02:00
diff --git a/packages/cre-sdk-examples/src/workflows/on-chain-write/index.ts b/packages/cre-sdk-examples/src/workflows/on-chain-write/index.ts
@@ -11,6 +11,7 @@ import {
 	Runner,
 	type Runtime,
 	text,
+	TxStatus,
 } from '@chainlink/cre-sdk'
 import { type Address, decodeFunctionResult, encodeFunctionData, toHex, zeroAddress } from 'viem'
 import { z } from 'zod'
@@ -168,12 +169,14 @@ const onCronTrigger = (runtime: Runtime<Config>) => {
 		})
 		.result()
 
-	const txHash = resp.txHash
+	const txStatus = resp.txStatus
 
-	if (!txHash) {
-		throw new Error('Failed to write report')
+	if (txStatus !== TxStatus.SUCCESS) {
+		throw new Error(`Failed to write report: ${resp.errorMessage || txStatus}`)
 	}
 
+	const txHash = resp.txHash || new Uint8Array(32)
+
 	return {
 		OffchainValue: offchainBigInt,
 		OnchainValue: onchainValue,
diff --git a/packages/cre-sdk-examples/src/workflows/proof-of-reserve/index.ts b/packages/cre-sdk-examples/src/workflows/proof-of-reserve/index.ts
@@ -13,6 +13,7 @@ import {
 	median,
 	Runner,
 	type Runtime,
+	TxStatus,
 } from '@chainlink/cre-sdk'
 import { type Address, decodeFunctionResult, encodeFunctionData, zeroAddress } from 'viem'
 import { z } from 'zod'
@@ -220,13 +221,16 @@ const updateReserves = (
 		})
 		.result()
 
-	const txHash = resp.txHash
+	const txStatus = resp.txStatus
 
-	if (!txHash) {
-		throw new Error(`Failed to write report: ${resp.errorMessage}`)
+	if (txStatus !== TxStatus.SUCCESS) {
+		throw new Error(`Failed to write report: ${resp.errorMessage || txStatus}`)
 	}
 
+	const txHash = resp.txHash || new Uint8Array(32)
+
 	runtime.log(`Write report transaction succeeded at txHash: ${bytesToHex(txHash)}`)
+
 	return txHash.toString()
 }
 
diff --git a/packages/cre-sdk-javy-plugin/dist/javy_chainlink_sdk.wasm b/packages/cre-sdk-javy-plugin/dist/javy_chainlink_sdk.wasm
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/blockchain/evm/v1alpha/client_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/blockchain/evm/v1alpha/client_sdk_gen.ts
@@ -63,6 +63,7 @@ import {
 } from '@cre/generated/sdk/v1alpha/sdk_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 import { type Trigger } from '@cre/sdk/utils/triggers/trigger-interface'
 
 export type WriteCreReportRequest = {
@@ -93,7 +94,7 @@ export function createWriteCreReportRequest(
 	input: WriteCreReportRequestJson,
 ): WriteCreReportRequest {
 	return {
-		receiver: new Uint8Array(Buffer.from(input.receiver, 'base64')),
+		receiver: hexToBytes(input.receiver),
 		report: input.report,
 		gasConfig:
 			input.gasConfig !== undefined ? fromJson(GasConfigSchema, input.gasConfig) : undefined,
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/internal/actionandtrigger/v1/basic_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/internal/actionandtrigger/v1/basic_sdk_gen.ts
@@ -14,6 +14,7 @@ import {
 } from '@cre/generated/capabilities/internal/actionandtrigger/v1/action_and_trigger_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 import { type Trigger } from '@cre/sdk/utils/triggers/trigger-interface'
 
 /**
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/internal/basicaction/v1/basicaction_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/internal/basicaction/v1/basicaction_sdk_gen.ts
@@ -8,6 +8,7 @@ import {
 } from '@cre/generated/capabilities/internal/basicaction/v1/basic_action_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 
 /**
  * BasicAction Capability
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/internal/basictrigger/v1/basic_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/internal/basictrigger/v1/basic_sdk_gen.ts
@@ -9,6 +9,7 @@ import {
 } from '@cre/generated/capabilities/internal/basictrigger/v1/basic_trigger_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 import { type Trigger } from '@cre/sdk/utils/triggers/trigger-interface'
 
 /**
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/internal/consensus/v1alpha/consensus_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/internal/consensus/v1alpha/consensus_sdk_gen.ts
@@ -12,6 +12,7 @@ import {
 import { type Value, ValueSchema } from '@cre/generated/values/v1/values_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 
 /**
  * Consensus Capability
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/networking/http/v1alpha/http_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/networking/http/v1alpha/http_sdk_gen.ts
@@ -9,6 +9,7 @@ import {
 } from '@cre/generated/capabilities/networking/http/v1alpha/trigger_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 import { type Trigger } from '@cre/sdk/utils/triggers/trigger-interface'
 
 /**
diff --git a/packages/cre-sdk/src/generated-sdk/capabilities/scheduler/cron/v1/cron_sdk_gen.ts b/packages/cre-sdk/src/generated-sdk/capabilities/scheduler/cron/v1/cron_sdk_gen.ts
@@ -11,6 +11,7 @@ import {
 } from '@cre/generated/capabilities/scheduler/cron/v1/trigger_pb'
 import { type Runtime } from '@cre/sdk'
 import { Report } from '@cre/sdk/report'
+import { hexToBytes } from '@cre/sdk/utils/hex-utils'
 import { type Trigger } from '@cre/sdk/utils/triggers/trigger-interface'
 
 /**
diff --git a/packages/cre-sdk/src/generated/capabilities/networking/http/v1alpha/trigger_pb.ts b/packages/cre-sdk/src/generated/capabilities/networking/http/v1alpha/trigger_pb.ts
@@ -2,9 +2,11 @@
 // @generated from file capabilities/networking/http/v1alpha/trigger.proto (package capabilities.networking.http.v1alpha, syntax proto3)
 /* eslint-disable */
 
-import type { Message } from '@bufbuild/protobuf'
+import type { JsonObject, Message } from '@bufbuild/protobuf'
 import type { GenEnum, GenFile, GenMessage, GenService } from '@bufbuild/protobuf/codegenv2'
 import { enumDesc, fileDesc, messageDesc, serviceDesc } from '@bufbuild/protobuf/codegenv2'
+import type { StructJson } from '@bufbuild/protobuf/wkt'
+import { file_google_protobuf_struct } from '@bufbuild/protobuf/wkt'
 import { file_tools_generator_v1alpha_cre_metadata } from '../../../../tools/generator/v1alpha/cre_metadata_pb'
 
 /**
@@ -13,8 +15,8 @@ import { file_tools_generator_v1alpha_cre_metadata } from '../../../../tools/gen
 export const file_capabilities_networking_http_v1alpha_trigger: GenFile =
 	/*@__PURE__*/
 	fileDesc(
-		'CjJjYXBhYmlsaXRpZXMvbmV0d29ya2luZy9odHRwL3YxYWxwaGEvdHJpZ2dlci5wcm90bxIkY2FwYWJpbGl0aWVzLm5ldHdvcmtpbmcuaHR0cC52MWFscGhhIlYKBkNvbmZpZxJMCg9hdXRob3JpemVkX2tleXMYASADKAsyMy5jYXBhYmlsaXRpZXMubmV0d29ya2luZy5odHRwLnYxYWxwaGEuQXV0aG9yaXplZEtleSJaCgdQYXlsb2FkEg0KBWlucHV0GAEgASgMEkAKA2tleRgCIAEoCzIzLmNhcGFiaWxpdGllcy5uZXR3b3JraW5nLmh0dHAudjFhbHBoYS5BdXRob3JpemVkS2V5ImAKDUF1dGhvcml6ZWRLZXkSOwoEdHlwZRgBIAEoDjItLmNhcGFiaWxpdGllcy5uZXR3b3JraW5nLmh0dHAudjFhbHBoYS5LZXlUeXBlEhIKCnB1YmxpY19rZXkYAiABKAkqOwoHS2V5VHlwZRIYChRLRVlfVFlQRV9VTlNQRUNJRklFRBAAEhYKEktFWV9UWVBFX0VDRFNBX0VWTRABMpIBCgRIVFRQEmgKB1RyaWdnZXISLC5jYXBhYmlsaXRpZXMubmV0d29ya2luZy5odHRwLnYxYWxwaGEuQ29uZmlnGi0uY2FwYWJpbGl0aWVzLm5ldHdvcmtpbmcuaHR0cC52MWFscGhhLlBheWxvYWQwARoggrUYHAgBEhhodHRwLXRyaWdnZXJAMS4wLjAtYWxwaGFC6wEKKGNvbS5jYXBhYmlsaXRpZXMubmV0d29ya2luZy5odHRwLnYxYWxwaGFCDFRyaWdnZXJQcm90b1ABogIDQ05IqgIkQ2FwYWJpbGl0aWVzLk5ldHdvcmtpbmcuSHR0cC5WMWFscGhhygIkQ2FwYWJpbGl0aWVzXE5ldHdvcmtpbmdcSHR0cFxWMWFscGhh4gIwQ2FwYWJpbGl0aWVzXE5ldHdvcmtpbmdcSHR0cFxWMWFscGhhXEdQQk1ldGFkYXRh6gInQ2FwYWJpbGl0aWVzOjpOZXR3b3JraW5nOjpIdHRwOjpWMWFscGhhYgZwcm90bzM',
-		[file_tools_generator_v1alpha_cre_metadata],
+		'CjJjYXBhYmlsaXRpZXMvbmV0d29ya2luZy9odHRwL3YxYWxwaGEvdHJpZ2dlci5wcm90bxIkY2FwYWJpbGl0aWVzLm5ldHdvcmtpbmcuaHR0cC52MWFscGhhIlYKBkNvbmZpZxJMCg9hdXRob3JpemVkX2tleXMYASADKAsyMy5jYXBhYmlsaXRpZXMubmV0d29ya2luZy5odHRwLnYxYWxwaGEuQXV0aG9yaXplZEtleSJzCgdQYXlsb2FkEiYKBWlucHV0GAEgASgLMhcuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdBJACgNrZXkYAiABKAsyMy5jYXBhYmlsaXRpZXMubmV0d29ya2luZy5odHRwLnYxYWxwaGEuQXV0aG9yaXplZEtleSJgCg1BdXRob3JpemVkS2V5EjsKBHR5cGUYASABKA4yLS5jYXBhYmlsaXRpZXMubmV0d29ya2luZy5odHRwLnYxYWxwaGEuS2V5VHlwZRISCgpwdWJsaWNfa2V5GAIgASgJKjsKB0tleVR5cGUSGAoUS0VZX1RZUEVfVU5TUEVDSUZJRUQQABIWChJLRVlfVFlQRV9FQ0RTQV9FVk0QATKSAQoESFRUUBJoCgdUcmlnZ2VyEiwuY2FwYWJpbGl0aWVzLm5ldHdvcmtpbmcuaHR0cC52MWFscGhhLkNvbmZpZxotLmNhcGFiaWxpdGllcy5uZXR3b3JraW5nLmh0dHAudjFhbHBoYS5QYXlsb2FkMAEaIIK1GBwIARIYaHR0cC10cmlnZ2VyQDEuMC4wLWFscGhhQusBCihjb20uY2FwYWJpbGl0aWVzLm5ldHdvcmtpbmcuaHR0cC52MWFscGhhQgxUcmlnZ2VyUHJvdG9QAaICA0NOSKoCJENhcGFiaWxpdGllcy5OZXR3b3JraW5nLkh0dHAuVjFhbHBoYcoCJENhcGFiaWxpdGllc1xOZXR3b3JraW5nXEh0dHBcVjFhbHBoYeICMENhcGFiaWxpdGllc1xOZXR3b3JraW5nXEh0dHBcVjFhbHBoYVxHUEJNZXRhZGF0YeoCJ0NhcGFiaWxpdGllczo6TmV0d29ya2luZzo6SHR0cDo6VjFhbHBoYWIGcHJvdG8z',
+		[file_google_protobuf_struct, file_tools_generator_v1alpha_cre_metadata],
 	)
 
 /**
@@ -54,11 +56,11 @@ export const ConfigSchema: GenMessage<Config, { jsonType: ConfigJson }> =
  */
 export type Payload = Message<'capabilities.networking.http.v1alpha.Payload'> & {
 	/**
-	 * JSON input in the HTTP trigger request (as bytes)
+	 * JSON input in the HTTP trigger request
 	 *
-	 * @generated from field: bytes input = 1;
+	 * @generated from field: google.protobuf.Struct input = 1;
 	 */
-	input: Uint8Array
+	input?: JsonObject
 
 	/**
 	 * Key used to sign the HTTP trigger request
@@ -73,11 +75,11 @@ export type Payload = Message<'capabilities.networking.http.v1alpha.Payload'> &
  */
 export type PayloadJson = {
 	/**
-	 * JSON input in the HTTP trigger request (as bytes)
+	 * JSON input in the HTTP trigger request
 	 *
-	 * @generated from field: bytes input = 1;
+	 * @generated from field: google.protobuf.Struct input = 1;
 	 */
-	input?: string
+	input?: StructJson
 
 	/**
 	 * Key used to sign the HTTP trigger request
diff --git a/packages/cre-sdk/src/generator/generate-report-wrapper.ts b/packages/cre-sdk/src/generator/generate-report-wrapper.ts
@@ -177,7 +177,7 @@ export function generateReportWrapper(tpe: DescMessage): [string, Map<string, Se
 
 					if (field.fieldKind === 'scalar' && field.scalar === 12) {
 						// Handle bytes field conversion from string to Uint8Array
-						return `${field.localName}: new Uint8Array(Buffer.from(input.${field.localName}, 'base64'))`
+						return `${field.localName}: hexToBytes(input.${field.localName})`
 					}
 
 					return `${field.localName}: input.${field.localName}`
diff --git a/packages/cre-sdk/src/generator/generate-sdk.ts b/packages/cre-sdk/src/generator/generate-sdk.ts
@@ -8,7 +8,7 @@ import {
 	capability,
 	method as methodOption,
 } from '@cre/generated/tools/generator/v1alpha/cre_metadata_pb'
-import { generateReportWrapper } from './generate_report_wrapper'
+import { generateReportWrapper } from './generate-report-wrapper'
 import { generateActionMethod } from './generate-action'
 import { generateActionSugarClass } from './generate-sugar'
 import { generateTriggerClass, generateTriggerMethod } from './generate-trigger'
@@ -113,6 +113,7 @@ export function generateSdk(file: GenFile, outputDir: string) {
 			} else {
 				imports.add(`import { type Runtime } from "@cre/sdk"`)
 				imports.add(`import { Report } from "@cre/sdk/report"`)
+				imports.add(`import { hexToBytes } from "@cre/sdk/utils/hex-utils";`)
 			}
 		}
 
diff --git a/packages/cre-sdk/src/sdk/cre/index.ts b/packages/cre-sdk/src/sdk/cre/index.ts
@@ -12,7 +12,7 @@ import { CronCapability } from '@cre/generated-sdk/capabilities/scheduler/cron/v
 import { prepareRuntime } from '@cre/sdk/utils/prepare-runtime'
 import { handler } from '@cre/sdk/workflow'
 
-export type { Log as EVMLog } from '@cre/generated/capabilities/blockchain/evm/v1alpha/client_pb'
+export  { type Log as EVMLog, TxStatus } from '@cre/generated/capabilities/blockchain/evm/v1alpha/client_pb'
 export type { Payload as HTTPPayload } from '@cre/generated/capabilities/networking/http/v1alpha/trigger_pb'
 export type { Payload as CronPayload } from '@cre/generated/capabilities/scheduler/cron/v1/trigger_pb'
 export type { NodeRuntime, Runtime } from '@cre/sdk/runtime'
