refactor(TS): general abi usage (#214)

* base, working for wasi exec

* working TS impl + build-service fuel set fix

* cleanup

* nit

Author: reecepbcups

README.md

@@ -177,10 +177,11 @@ WASI_BUILD_DIR=components/evm-price-oracle make wasi-build
 How to test the component locally for business logic validation before on-chain deployment. An ID of 1 for the oracle component is Bitcoin.
 
 ```bash
-# Rust components
+# Rust & Typescript components
 INPUT_DATA="1" COMPONENT_FILENAME=evm_price_oracle.wasm make wasi-exec
+INPUT_DATA="1" COMPONENT_FILENAME=js_evm_price_oracle.wasm make wasi-exec
 
-# Golang / Typescript
+# Golang
 INPUT_DATA="1" COMPONENT_FILENAME=golang_evm_price_oracle.wasm make wasi-exec-fixed
 ```
 
@@ -277,11 +278,10 @@ bash ./script/deploy-script.sh
 Anyone can now call the [trigger contract](./src/contracts/WavsTrigger.sol) which emits the trigger event WAVS is watching for from the previous step. WAVS then calls the service and saves the result on-chain.
 
 ```bash
-# Request BTC from CMC
-# rust:
+# Rust & Typescript - request BTC from CMC
 export INPUT_DATA=`cast abi-encode "addTrigger(string)" "1"`
 
-# Golang & Typescript uses the raw value
+# Golang uses the raw value
 # export INPUT_DATA="1"
 
 # Get the trigger address from previous Deploy forge script

components/js-evm-price-oracle/README.md

@@ -39,7 +39,7 @@ WASI_BUILD_DIR=js-evm-price-oracle make wasi-build
 Run the component with the `wasi-exec` command in the root of the repo
 
 ```bash docci-output-contains="LTC"
-COMPONENT_FILENAME=js_evm_price_oracle.wasm INPUT_DATA=2 make wasi-exec-fixed
+COMPONENT_FILENAME=js_evm_price_oracle.wasm INPUT_DATA=2 make wasi-exec
 ```
 
 ---

components/js-evm-price-oracle/index.ts

@@ -1,13 +1,14 @@
-import { TriggerAction, WasmResponse } from "./out/wavs:worker@0.4.0";
+import { TriggerAction, WasmResponse,  } from "./out/wavs:worker@0.4.0";
+import { TriggerSource, TriggerSourceManual } from "./out/interfaces/wavs-worker-layer-types";
 import { decodeTriggerEvent, encodeOutput, Destination } from "./trigger";
+import { AbiCoder } from "ethers";
 
 async function run(triggerAction: TriggerAction): Promise<WasmResponse> {
   let event = decodeTriggerEvent(triggerAction.data);
   let triggerId = event[0].triggerId;
 
-  let result = await compute(event[0].data);
-
-
+  let num = processInput(event[0].data, triggerAction.config.triggerSource);
+  let result = await compute(num);
 
   switch (event[1]) {
     case Destination.Cli:
@@ -29,15 +30,56 @@ async function run(triggerAction: TriggerAction): Promise<WasmResponse> {
   );
 }
 
-async function compute(input: Uint8Array): Promise<Uint8Array> {
-  const num = new TextDecoder().decode(input);
-
-  const priceFeed = await fetchCryptoPrice(parseInt(num));
+async function compute(num: number): Promise<Uint8Array> {
+  const priceFeed = await fetchCryptoPrice(num);
   const priceJson = priceFeedToJson(priceFeed);
 
   return new TextEncoder().encode(priceJson);
 }
 
+function processInput(input: Uint8Array, triggerSource: { tag: string }): number {
+  // Prepare the input data based on trigger type
+  const processedInput = prepareInputData(input, triggerSource.tag);
+
+  // Single ABI decoding step
+  const abiCoder = new AbiCoder();
+  const res = abiCoder.decode(["string"], processedInput);
+  const decodedString = res[0] as string;
+
+  console.log("Decoded input:", decodedString, "triggerSource.tag:", triggerSource.tag);
+
+  // Validate the decoded string is a valid number
+  const num = decodedString.trim();
+  if (isNaN(parseInt(num))) {
+    throw new Error(`Input is not a valid number: ${num}`);
+  }
+
+  return parseInt(num); // Return the validated number
+}
+
+
+function prepareInputData(input: Uint8Array, triggerTag: string): Uint8Array {
+  if (triggerTag === "manual") {
+    return input; // Use input directly for manual triggers
+  }
+
+  // For evm-contract-event: handle potential hex string conversion
+  try {
+    const inputStr = new TextDecoder().decode(input);
+    if (!inputStr.startsWith("0x")) {
+      throw new Error("Input is not a valid hex string: " + inputStr);
+    }
+
+    // Convert hex string to bytes
+    const hexString = inputStr.slice(2); // Remove "0x" prefix
+    return new Uint8Array(
+      hexString.match(/.{1,2}/g)!.map(byte => parseInt(byte, 16))
+    );
+  } catch {
+    return input; // If UTF-8 decode fails, assume it's already binary
+  }
+}
+
 // ======================== CMC ========================
 
 // Define the types for the CMC API response

script/build-service.sh

@@ -73,6 +73,7 @@ eval "$BASE_CMD workflow component --id ${WORKFLOW_ID} permissions --http-hosts
 eval "$BASE_CMD workflow component --id ${WORKFLOW_ID} time-limit --seconds 30" > /dev/null
 eval "$BASE_CMD workflow component --id ${WORKFLOW_ID} env --values WAVS_ENV_SOME_SECRET" > /dev/null
 eval "$BASE_CMD workflow component --id ${WORKFLOW_ID} config --values 'key=value,key2=value2'" > /dev/null
+eval "$BASE_CMD workflow component --id ${WORKFLOW_ID} fuel-limit --fuel ${FUEL_LIMIT}" > /dev/null
 
 eval "$BASE_CMD manager set-evm --chain-name ${SUBMIT_CHAIN} --address `cast --to-checksum ${WAVS_SERVICE_MANAGER_ADDRESS}`" > /dev/null
 eval "$BASE_CMD validate" > /dev/null

script/deploy-script.sh

@@ -12,6 +12,13 @@ if git status --porcelain | grep -q "^.* components/"; then
 fi
 
 ### === Deploy Eigenlayer ===
+# if RPC_URL is not set, use default by calling command
+if [ -z "$RPC_URL" ]; then
+    export RPC_URL=$(bash ./script/get-rpc-url.sh)
+fi
+if [ -z "$AGGREGATOR_URL" ]; then
+    export AGGREGATOR_URL=http://127.0.0.1:8001
+fi
 
 # local: create deployer & auto fund. testnet: create & iterate check balance
 bash ./script/create-deployer.sh

src/contracts/WavsTrigger.sol

@@ -10,7 +10,8 @@ contract SimpleTrigger is ISimpleTrigger {
     /// @inheritdoc ISimpleTrigger
     mapping(TriggerId _triggerId => Trigger _trigger) public triggersById;
     /// @notice See ISimpleTrigger.triggerIdsByCreator
-    mapping(address _creator => TriggerId[] _triggerIds) internal _triggerIdsByCreator;
+    mapping(address _creator => TriggerId[] _triggerIds)
+        internal _triggerIdsByCreator;
 
     /// @inheritdoc ISimpleTrigger
     function addTrigger(string memory _data) external {
@@ -19,26 +20,40 @@ contract SimpleTrigger is ISimpleTrigger {
         TriggerId _triggerId = nextTriggerId;
 
         // Create the trigger
-        Trigger memory _trigger = Trigger({creator: msg.sender, data: bytes(_data)});
+        Trigger memory _trigger = Trigger({
+            creator: msg.sender,
+            data: bytes(_data)
+        });
 
         // Update storages
         triggersById[_triggerId] = _trigger;
         _triggerIdsByCreator[msg.sender].push(_triggerId);
 
-        TriggerInfo memory _triggerInfo =
-            TriggerInfo({triggerId: _triggerId, creator: _trigger.creator, data: _trigger.data});
+        TriggerInfo memory _triggerInfo = TriggerInfo({
+            triggerId: _triggerId,
+            creator: _trigger.creator,
+            data: _trigger.data
+        });
 
         emit NewTrigger(abi.encode(_triggerInfo));
     }
 
     /// @inheritdoc ISimpleTrigger
-    function getTrigger(TriggerId triggerId) external view override returns (TriggerInfo memory _triggerInfo) {
+    function getTrigger(
+        TriggerId triggerId
+    ) external view override returns (TriggerInfo memory _triggerInfo) {
         Trigger storage _trigger = triggersById[triggerId];
-        _triggerInfo = TriggerInfo({triggerId: triggerId, creator: _trigger.creator, data: _trigger.data});
+        _triggerInfo = TriggerInfo({
+            triggerId: triggerId,
+            creator: _trigger.creator,
+            data: _trigger.data
+        });
     }
 
     /// @inheritdoc ISimpleTrigger
-    function triggerIdsByCreator(address _creator) external view returns (TriggerId[] memory _triggerIds) {
+    function triggerIdsByCreator(
+        address _creator
+    ) external view returns (TriggerId[] memory _triggerIds) {
         _triggerIds = _triggerIdsByCreator[_creator];
     }
 }