@tari-project/tarijs-builders 0.4.0 → 0.5.1

package/dist/helpers/submitTransaction.d.ts

@@ -1,9 +1,9 @@
-import { TariUniverseProvider } from "@tari-project/tari-universe-provider";
-import { TariProvider, SubmitTransactionRequest, SubstateRequirement } from "@tari-project/tari-provider";
-import { Transaction, TransactionResult, DownSubstates, UpSubstates, SubmitTxResult } from "@tari-project/tarijs-types";
-export declare function buildTransactionRequest(transaction: Transaction, accountId: number, requiredSubstates: SubstateRequirement[], inputRefs?: never[], isDryRun?: boolean, network?: number, isSealSignerAuthorized?: boolean, detectInputsUseUnversioned?: boolean): SubmitTransactionRequest;
-export declare function submitAndWaitForTransaction(provider: TariProvider, req: SubmitTransactionRequest): Promise<SubmitTxResult>;
-export declare function waitForTransactionResult(provider: TariProvider | TariUniverseProvider, transactionId: string): Promise<TransactionResult>;
+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;
+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): {
     upSubstates: UpSubstates;
     downSubstates: DownSubstates;

package/dist/helpers/submitTransaction.js

@@ -1,8 +1,6 @@
-import { TransactionStatus } from "@tari-project/tarijs-types";
+import { TransactionStatus, } from "@tari-project/tarijs-types";
 export function buildTransactionRequest(transaction, accountId, requiredSubstates, inputRefs = [], isDryRun = false, network = 0, isSealSignerAuthorized = true, detectInputsUseUnversioned = true) {
     return {
-        //TODO refactor SubTxReq type to not use 'object[]' and types match
-        // https://github.com/tari-project/tari.js/issues/25
         network,
         account_id: accountId,
         instructions: transaction.instructions,
@@ -17,10 +15,10 @@ export function buildTransactionRequest(transaction, accountId, requiredSubstate
         detect_inputs_use_unversioned: detectInputsUseUnversioned,
     };
 }
-export async function submitAndWaitForTransaction(provider, req) {
+export async function submitAndWaitForTransaction(signer, req) {
     try {
-        const response = await provider.submitTransaction(req);
-        const result = await waitForTransactionResult(provider, response.transaction_id);
+        const response = await signer.submitTransaction(req);
+        const result = await waitForTransactionResult(signer, response.transaction_id);
         return {
             response,
             result,
@@ -30,10 +28,10 @@ export async function submitAndWaitForTransaction(provider, req) {
         throw new Error(`Transaction failed: ${e}`);
     }
 }
-export async function waitForTransactionResult(provider, transactionId) {
+export async function waitForTransactionResult(signer, transactionId) {
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        const resp = await provider.getTransactionResult(transactionId);
+        const resp = await signer.getTransactionResult(transactionId);
         const FINALIZED_STATUSES = [
             TransactionStatus.Accepted,
             TransactionStatus.Rejected,
@@ -45,7 +43,7 @@ export async function waitForTransactionResult(provider, transactionId) {
             throw new Error(`Transaction rejected: ${JSON.stringify(resp.result)}`);
         }
         if (FINALIZED_STATUSES.includes(resp.status)) {
-            return resp; //TODO fix: type mismatch (https://github.com/tari-project/tari.js/issues/29)
+            return resp;
         }
         await new Promise((resolve) => setTimeout(resolve, 1000));
     }

package/dist/transaction/TransactionBuilder.d.ts

@@ -1,15 +1,15 @@
-import { ComponentAddress, ConfidentialClaim, ConfidentialWithdrawProof, Instruction, ResourceAddress, SubstateRequirement, Transaction, TransactionSignature, UnsignedTransaction, TemplateAddress, Arg } from "@tari-project/tarijs-types";
+import { ComponentAddress, ConfidentialClaim, ConfidentialWithdrawProof, Instruction, ResourceAddress, SubstateRequirement, Transaction, TransactionSignature, UnsignedTransaction, PublishedTemplateAddress, TransactionArg } from "@tari-project/tarijs-types";
 export interface TransactionConstructor {
     new (unsignedTransaction: UnsignedTransaction, signatures: TransactionSignature[]): Transaction;
 }
 export interface TariFunctionDefinition {
     functionName: string;
-    args?: Arg[];
-    templateAddress: TemplateAddress;
+    args?: TransactionArg[];
+    templateAddress: PublishedTemplateAddress;
 }
 export interface TariMethodDefinition {
     methodName: string;
-    args?: Arg[];
+    args?: TransactionArg[];
     componentAddress: ComponentAddress;
 }
 export interface TariCreateAccountDefinition {

package/dist/transaction/TransactionRequest.d.ts

@@ -1,6 +1,6 @@
-import { Epoch, Instruction, SubstateRequirement, Transaction, TransactionId, TransactionSignature, UnsignedTransaction, VersionedSubstateId } from "@tari-project/tarijs-types";
+import { Epoch, Instruction, SubstateRequirement, Transaction, TransactionSignature, UnsignedTransaction, VersionedSubstateId } from "@tari-project/tarijs-types";
 export declare class TransactionRequest implements Transaction {
-    id: TransactionId;
+    id: string;
     feeInstructions: Array<Instruction>;
     instructions: Array<Instruction>;
     inputs: Array<SubstateRequirement>;
@@ -10,18 +10,16 @@ export declare class TransactionRequest implements Transaction {
     maxEpoch?: Epoch;
     filledInputs: VersionedSubstateId[];
     constructor(unsignedTransaction: UnsignedTransaction, signatures: TransactionSignature[]);
-    private calculateHash;
     withFilledInputs(filled_inputs: Array<VersionedSubstateId>): this;
-    getId(): TransactionId;
-    checkId(): boolean;
     getUnsignedTransaction(): UnsignedTransaction;
     getFeeInstructions(): Instruction[];
     getInstructions(): Instruction[];
     getSignatures(): TransactionSignature[];
-    getHash(): string;
     getInputs(): SubstateRequirement[];
     getFilledInputs(): VersionedSubstateId[];
     getFilledInputsMut(): VersionedSubstateId[];
     getMinEpoch(): Epoch | undefined;
     getMaxEpoch(): Epoch | undefined;
+    setId(id: string): void;
+    getId(): string;
 }

package/dist/transaction/TransactionRequest.js

@@ -11,7 +11,7 @@ export class TransactionRequest {
     maxEpoch;
     filledInputs;
     constructor(unsignedTransaction, signatures) {
-        this.id = this.calculateHash();
+        this.id = "";
         this.feeInstructions = unsignedTransaction.feeInstructions;
         this.instructions = unsignedTransaction.instructions;
         this.inputs = unsignedTransaction.inputs;
@@ -21,19 +21,9 @@ export class TransactionRequest {
         // Inputs filled by some authority. These are not part of the transaction hash nor the signature
         this.filledInputs = [];
     }
-    calculateHash() {
-        return "";
-    }
     withFilledInputs(filled_inputs) {
         return { ...this, filled_inputs };
     }
-    getId() {
-        return this.id;
-    }
-    checkId() {
-        const id = this.calculateHash();
-        return id === this.id;
-    }
     getUnsignedTransaction() {
         return this.unsignedTransaction;
     }
@@ -46,9 +36,6 @@ export class TransactionRequest {
     getSignatures() {
         return this.signatures;
     }
-    getHash() {
-        return this.id;
-    }
     getInputs() {
         return this.inputs;
     }
@@ -64,4 +51,10 @@ export class TransactionRequest {
     getMaxEpoch() {
         return this.maxEpoch;
     }
+    setId(id) {
+        this.id = id;
+    }
+    getId() {
+        return this.id;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs-builders",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -10,10 +10,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@tari-project/typescript-bindings": "^1.4.0",
-    "@tari-project/tari-universe-provider": "^0.4.0",
-    "@tari-project/tari-provider": "^0.4.0",
-    "@tari-project/tarijs-types": "^0.4.0"
+    "@tari-project/tari-signer": "^0.5.1",
+    "@tari-project/tari-universe-signer": "^0.5.1",
+    "@tari-project/tarijs-types": "^0.5.1"
   },
   "devDependencies": {
     "@types/node": "^22.13.1",