Merge branch 'main' into issue-54-agreementid-stop

src/commands.ts

@@ -576,13 +576,23 @@ export class Commands {
 	}
 
 	public async getJobStatus(args: string[]) {
+		// args[1] - did (for checking if data asset exists, legacy)
+		// args[2] - jobId
+		// args[3] - agreementId
+		const hasAgreementId = args.length === 4;
+
 		const dataDdo = await this.aquarius.waitForAqua(args[1]);
 		if (!dataDdo) {
 			console.error(
 				"Error fetching DDO " + args[1] + ".  Does this asset exists?"
 			);
 			return;
 		}
+		const jobId = args[2]
+		let agreementId = null;
+		if(hasAgreementId) {
+			agreementId = args[3];
+		}
 		const providerURI =
 			this.macOsProviderUrl && dataDdo.chainId === 8996
 				? this.macOsProviderUrl
@@ -591,8 +601,8 @@ export class Commands {
 		const jobStatus = (await ProviderInstance.computeStatus(
 			providerURI,
 			await this.signer.getAddress(),
-			args[2],
-			args[1]
+			jobId,
+			agreementId
 		)) as ComputeJob;
 		console.log(util.inspect(jobStatus, false, null, true));
 	}