@noosphere/contracts 0.1.0-alpha.4 → 0.2.0-alpha.1

package/dist/index.js

@@ -325,18 +325,54 @@ var _abi = [
       },
       {
         name: "input",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "output",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "proof",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "commitmentData",
@@ -652,6 +688,60 @@ var _abi = [
         type: "uint16",
         indexed: false,
         internalType: "uint16"
+      },
+      {
+        name: "input",
+        type: "tuple",
+        indexed: false,
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
+      },
+      {
+        name: "output",
+        type: "tuple",
+        indexed: false,
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
+      },
+      {
+        name: "proof",
+        type: "tuple",
+        indexed: false,
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       }
     ],
     anonymous: false
@@ -1328,18 +1418,54 @@ var _abi2 = [
     inputs: [
       {
         name: "input",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "output",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "proof",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "numRedundantDeliveries",
@@ -3915,7 +4041,7 @@ var WalletFactoryAbi__factory = class {
 WalletFactoryAbi__factory.abi = _abi5;
 
 // src/Router.ts
-import { Contract as Contract6 } from "ethers";
+import { Contract as Contract6, ethers } from "ethers";
 
 // src/abis/Router.abi.json
 var Router_abi_default = [
@@ -4298,18 +4424,54 @@ var Router_abi_default = [
     inputs: [
       {
         name: "input",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "output",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "proof",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "numRedundantDeliveries",
@@ -5785,12 +5947,19 @@ var RouterContract = class {
   //////////////////////////////////////////////////////////////////////////*/
   /**
    * Accept fulfillment results and attempt on-chain settlement
+   * @param input - PayloadData containing contentHash and uri for input
+   * @param output - PayloadData containing contentHash and uri for output
+   * @param proof - PayloadData containing contentHash and uri for proof
+   * @param numRedundantDeliveries - Number of redundant deliveries
+   * @param nodeWallet - Address of the node's payment wallet
+   * @param payments - Array of payment instructions
+   * @param commitment - The commitment data
    */
   async fulfill(input, output, proof, numRedundantDeliveries, nodeWallet, payments, commitment) {
     const result = await this.contract.fulfill(
-      input,
-      output,
-      proof,
+      this.encodePayloadData(input),
+      this.encodePayloadData(output),
+      this.encodePayloadData(proof),
       numRedundantDeliveries,
       nodeWallet,
       payments,
@@ -5798,6 +5967,17 @@ var RouterContract = class {
     );
     return result;
   }
+  /**
+   * Encode PayloadData for contract call
+   * @param payload - PayloadData to encode
+   * @returns Tuple format expected by contract
+   */
+  encodePayloadData(payload) {
+    return [
+      payload.contentHash,
+      ethers.toUtf8Bytes(payload.uri)
+    ];
+  }
   /**
    * Execute coordinator-driven payouts
    */
@@ -5982,7 +6162,7 @@ var RouterContract = class {
 };
 
 // src/Coordinator.ts
-import { Contract as Contract7 } from "ethers";
+import { Contract as Contract7, ethers as ethers2 } from "ethers";
 
 // src/abis/Coordinator.abi.json
 var Coordinator_abi_default = [
@@ -6294,18 +6474,54 @@ var Coordinator_abi_default = [
       },
       {
         name: "input",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "output",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "proof",
-        type: "bytes",
-        internalType: "bytes"
+        type: "tuple",
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       },
       {
         name: "commitmentData",
@@ -6621,6 +6837,60 @@ var Coordinator_abi_default = [
         type: "uint16",
         indexed: false,
         internalType: "uint16"
+      },
+      {
+        name: "input",
+        type: "tuple",
+        indexed: false,
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
+      },
+      {
+        name: "output",
+        type: "tuple",
+        indexed: false,
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
+      },
+      {
+        name: "proof",
+        type: "tuple",
+        indexed: false,
+        internalType: "struct PayloadData",
+        components: [
+          {
+            name: "contentHash",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
+          {
+            name: "uri",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
       }
     ],
     anonymous: false
@@ -6943,17 +7213,45 @@ var CoordinatorContract = class {
   //////////////////////////////////////////////////////////////////////////*/
   /**
    * Report compute result for an interval
+   * @param deliveryInterval - The interval number for this delivery
+   * @param input - PayloadData containing contentHash and uri for input
+   * @param output - PayloadData containing contentHash and uri for output
+   * @param proof - PayloadData containing contentHash and uri for proof
+   * @param commitmentData - ABI-encoded commitment data
+   * @param nodeWallet - Address of the node's payment wallet
    */
   async reportComputeResult(deliveryInterval, input, output, proof, commitmentData, nodeWallet) {
     return this.contract.reportComputeResult(
       deliveryInterval,
-      input,
-      output,
-      proof,
+      this.encodePayloadData(input),
+      this.encodePayloadData(output),
+      this.encodePayloadData(proof),
       commitmentData,
       nodeWallet
     );
   }
+  /**
+   * Encode PayloadData for contract call
+   * @param payload - PayloadData to encode
+   * @returns Tuple format expected by contract
+   */
+  encodePayloadData(payload) {
+    return [
+      payload.contentHash,
+      ethers2.toUtf8Bytes(payload.uri)
+    ];
+  }
+  /**
+   * Parse PayloadData from contract response
+   * @param data - Raw tuple from contract
+   * @returns Parsed PayloadData
+   */
+  parsePayloadData(data) {
+    return {
+      contentHash: data.contentHash || data[0],
+      uri: ethers2.toUtf8String(data.uri || data[1])
+    };
+  }
   /*//////////////////////////////////////////////////////////////////////////
                             VERIFICATION
   //////////////////////////////////////////////////////////////////////////*/
@@ -7277,6 +7575,12 @@ var SubscriptionBatchReaderContract = class {
 };
 
 // src/types/index.ts
+var InputType = /* @__PURE__ */ ((InputType2) => {
+  InputType2[InputType2["RAW_DATA"] = 0] = "RAW_DATA";
+  InputType2[InputType2["URI_STRING"] = 1] = "URI_STRING";
+  InputType2[InputType2["PAYLOAD_DATA"] = 2] = "PAYLOAD_DATA";
+  return InputType2;
+})(InputType || {});
 var FulfillResult = /* @__PURE__ */ ((FulfillResult2) => {
   FulfillResult2[FulfillResult2["FULFILLED"] = 0] = "FULFILLED";
   FulfillResult2[FulfillResult2["INVALID_REQUEST_ID"] = 1] = "INVALID_REQUEST_ID";
@@ -8251,6 +8555,7 @@ export {
   CoordinatorAbi__factory,
   CoordinatorContract,
   FulfillResult,
+  InputType,
   RouterAbi__factory,
   RouterContract,
   SubscriptionBatchReaderAbi__factory,