@tari-project/tarijs-builders 0.8.0 → 0.9.0

package/dist/helpers/submitTransaction.d.ts

@@ -1,7 +1,9 @@
 import { TariUniverseSigner } from "@tari-project/tari-universe-signer";
 import { TariSigner } from "@tari-project/tari-signer";
-import { Transaction, TransactionResult, DownSubstates, UpSubstates, SubmitTxResult, ReqSubstate, SubmitTransactionRequest } from "@tari-project/tarijs-types";
-export declare function buildTransactionRequest(transaction: Transaction, accountId: number, requiredSubstates: ReqSubstate[], inputRefs?: never[], isDryRun?: boolean, network?: number, isSealSignerAuthorized?: boolean, detectInputsUseUnversioned?: boolean): SubmitTransactionRequest;
+import { TransactionResult, UnsignedTransactionV1 } from "@tari-project/typescript-bindings";
+import { DownSubstates, UpSubstates, SubmitTransactionRequest } from "@tari-project/tarijs-types";
+import { SubmitTxResult } from "@tari-project/tarijs-types/dist/TransactionResult";
+export declare function buildTransactionRequest(transaction: UnsignedTransactionV1, accountId: number, detectInputsUseUnversioned?: boolean): SubmitTransactionRequest;
 export declare function submitAndWaitForTransaction(signer: TariSigner, req: SubmitTransactionRequest): Promise<SubmitTxResult>;
 export declare function waitForTransactionResult(signer: TariSigner | TariUniverseSigner, transactionId: string): Promise<TransactionResult>;
 export declare function getAcceptResultSubstates(txResult: TransactionResult): {

package/dist/helpers/submitTransaction.js

@@ -1,18 +1,9 @@
-import { TransactionStatus, } from "@tari-project/tarijs-types";
-import { getSubstateValueFromUpSubstates, substateIdToString, txResultCheck } from "@tari-project/tarijs-types";
-export function buildTransactionRequest(transaction, accountId, requiredSubstates, inputRefs = [], isDryRun = false, network = 0, isSealSignerAuthorized = true, detectInputsUseUnversioned = true) {
+import { substateIdToString, } from "@tari-project/typescript-bindings";
+import { getSubstateValueFromUpSubstates, TransactionStatus, } from "@tari-project/tarijs-types";
+export function buildTransactionRequest(transaction, accountId, detectInputsUseUnversioned = true) {
     return {
-        network,
+        transaction,
         account_id: accountId,
-        instructions: transaction.instructions,
-        fee_instructions: transaction.feeInstructions,
-        inputs: transaction.inputs,
-        input_refs: inputRefs,
-        required_substates: requiredSubstates,
-        is_dry_run: isDryRun,
-        min_epoch: transaction.minEpoch ?? null,
-        max_epoch: transaction.maxEpoch ?? null,
-        is_seal_signer_authorized: isSealSignerAuthorized,
         detect_inputs_use_unversioned: detectInputsUseUnversioned,
     };
 }
@@ -62,21 +53,26 @@ export async function waitForTransactionResult(signer, transactionId) {
             throw new Error(`Transaction rejected: ${JSON.stringify(resp.result)}`);
         }
         if (FINALIZED_STATUSES.includes(resp.status)) {
-            return resp;
+            return resp.result?.result;
         }
         await new Promise((resolve) => setTimeout(resolve, 1000));
     }
 }
 export function getAcceptResultSubstates(txResult) {
-    const result = txResult.result?.result;
-    if (result && txResultCheck.isAcceptFeeRejectRest(result)) {
+    if ("Accept" in txResult) {
         return {
-            upSubstates: result.AcceptFeeRejectRest[0].up_substates,
-            downSubstates: result.AcceptFeeRejectRest[0].down_substates,
+            upSubstates: txResult.Accept.up_substates,
+            downSubstates: txResult.Accept.down_substates,
         };
     }
-    if (result && txResultCheck.isAccept(result)) {
-        return { upSubstates: result.Accept.up_substates, downSubstates: result.Accept.down_substates };
+    if ("Reject" in txResult) {
+        throw new Error(`Transaction rejected: ${txResult.Reject}`);
     }
-    return { upSubstates: [], downSubstates: [] };
+    if ("AcceptFeeRejectRest" in txResult) {
+        return {
+            upSubstates: txResult.AcceptFeeRejectRest[0].up_substates,
+            downSubstates: txResult.AcceptFeeRejectRest[0].down_substates,
+        };
+    }
+    throw new Error(`Unexpected transaction result: ${JSON.stringify(txResult)}`);
 }

package/dist/transaction/TransactionRequest.d.ts

@@ -9,8 +9,6 @@ export declare class TransactionRequest implements Transaction {
     getInstructions(): Instruction[];
     getSignatures(): TransactionSignature[];
     getInputs(): SubstateRequirement[];
-    getFilledInputs(): VersionedSubstateId[];
-    getFilledInputsMut(): VersionedSubstateId[];
     getMinEpoch(): Epoch | null;
     getMaxEpoch(): Epoch | null;
     setId(id: string): void;

package/dist/transaction/TransactionRequest.js

@@ -15,10 +15,8 @@ export class TransactionRequest {
                 signature: {
                     public_nonce: "",
                     signature: "",
-                }
+                },
             },
-            // Inputs filled by some authority. These are not part of the transaction hash nor the signature
-            filled_inputs: []
         };
     }
     withFilledInputs(filled_inputs) {
@@ -39,12 +37,6 @@ export class TransactionRequest {
     getInputs() {
         return this.V1.body.transaction.inputs;
     }
-    getFilledInputs() {
-        return this.V1.filled_inputs;
-    }
-    getFilledInputsMut() {
-        return this.V1.filled_inputs;
-    }
     getMinEpoch() {
         return this.V1.body.transaction.min_epoch;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs-builders",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -10,10 +10,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@tari-project/typescript-bindings": ">=1.9.0",
-    "@tari-project/tari-signer": "^0.8.0",
-    "@tari-project/tari-universe-signer": "^0.8.0",
-    "@tari-project/tarijs-types": "^0.8.0"
+    "@tari-project/typescript-bindings": ">=1.9.1",
+    "@tari-project/tari-universe-signer": "^0.9.0",
+    "@tari-project/tarijs-types": "^0.9.0",
+    "@tari-project/tari-signer": "^0.9.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.1",