Release/0.11.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/ctl",
-  "version": "0.11.0",
+  "version": "0.11.6",
   "description": "A tool for publishing values in a secure and reliable way.",
   "main": "./build/index.js",
   "type": "commonjs",
@@ -36,7 +36,7 @@
     "@iarna/toml": "^2.2.5",
     "@super-protocol/distributed-secrets": "1.1.7",
     "@super-protocol/dto-js": "1.1.2",
-    "@super-protocol/sdk-js": "3.11.0",
+    "@super-protocol/sdk-js": "3.11.4",
     "@super-protocol/sp-files-addon": "^0.11.0",
     "@types/tar-stream": "^3.1.3",
     "axios": "1.6.2",

src/commands/offerAddVersion.ts

@@ -0,0 +1,33 @@
+import { Config as BlockchainConfig } from '@super-protocol/sdk-js';
+import addValueOfferVersion from '../services/addValueOfferVersion';
+import Printer from '../printer';
+import readOfferVersionInfo from '../services/readOfferVersionInfo';
+import initBlockchainConnector from '../services/initBlockchainConnector';
+
+export type OfferAddVersionParams = {
+  actionAccountKey: string;
+  blockchainConfig: BlockchainConfig;
+  id: string;
+  ver: number;
+  path: string;
+};
+
+export default async (params: OfferAddVersionParams): Promise<void> => {
+  try {
+    Printer.print('Connecting to the blockchain');
+    await initBlockchainConnector({
+      blockchainConfig: params.blockchainConfig,
+      actionAccountKey: params.actionAccountKey,
+    });
+    const versionInfo = await readOfferVersionInfo({ path: params.path });
+    const newVersion = await addValueOfferVersion({
+      action: params.actionAccountKey,
+      version: params.ver,
+      versionInfo,
+      offerId: params.id,
+    });
+    Printer.print(`Version ${newVersion} added successfully`);
+  } catch (error: any) {
+    Printer.print('Version add failed with error: ' + error?.message);
+  }
+};

src/commands/offerDisableVersion.ts

@@ -0,0 +1,25 @@
+import { Offer, Config as BlockchainConfig } from '@super-protocol/sdk-js';
+import Printer from '../printer';
+import initBlockchainConnector from '../services/initBlockchainConnector';
+
+export type OffersDisableVersionParams = {
+  blockchainConfig: BlockchainConfig;
+  actionAccountKey: string;
+  id: string;
+  ver: number;
+};
+
+export default async (params: OffersDisableVersionParams): Promise<void> => {
+  try {
+    Printer.print('Connecting to the blockchain');
+    const actionAddress = await initBlockchainConnector({
+      blockchainConfig: params.blockchainConfig,
+      actionAccountKey: params.actionAccountKey,
+    });
+    const offer = new Offer(params.id);
+    await offer.deleteVersion(params.ver, { from: actionAddress });
+    Printer.print(`Version ${params.ver} for offer ${params.id} successfully removed`);
+  } catch (error: any) {
+    Printer.print('Remove offer version failed with error: ' + error?.message);
+  }
+};

src/commands/workflowsReplenishDeposit.ts

@@ -0,0 +1,73 @@
+import { Config as BlockchainConfig, Orders, OrderStatus } from '@super-protocol/sdk-js';
+import inquirer, { QuestionCollection } from 'inquirer';
+import Printer from '../printer';
+import initBlockchainConnectorService from '../services/initBlockchainConnector';
+import checkOrderService from '../services/checkOrder';
+import { etherToWei, weiToEther } from '../utils';
+
+export type WorkflowReplenishDepositParams = {
+  blockchainConfig: BlockchainConfig;
+  actionAccountKey: string;
+  minutes: number;
+  sppi: string;
+  orderId: string;
+  yes: boolean;
+};
+
+const isActionConfirmed = async (question: string): Promise<boolean> => {
+  Printer.print(question);
+
+  const questions: QuestionCollection = [
+    {
+      type: 'confirm',
+      name: 'confirmation',
+      message: `Confirm?`,
+      default: true,
+    },
+  ];
+  const answers = await inquirer.prompt(questions);
+
+  return answers.confirmation;
+};
+
+export default async (params: WorkflowReplenishDepositParams): Promise<void> => {
+  Printer.print('Connecting to the blockchain');
+  await initBlockchainConnectorService({
+    blockchainConfig: params.blockchainConfig,
+    actionAccountKey: params.actionAccountKey,
+  });
+
+  try {
+    Printer.print(`Checking order ${params.orderId}`);
+    await checkOrderService({
+      id: params.orderId,
+      statuses: [OrderStatus.Blocked, OrderStatus.Processing, OrderStatus.New],
+    });
+    const amountPerHour = await Orders.calculateWorkflowPerHourPrice(params.orderId);
+    let tokenAmount: bigint;
+    let minutes: number;
+
+    if (params.minutes) {
+      tokenAmount = (BigInt(amountPerHour) * BigInt(params.minutes)) / 60n;
+      minutes = params.minutes;
+    } else if (params.sppi) {
+      tokenAmount = etherToWei(params.sppi).toBigInt();
+      minutes = Number((tokenAmount * 60n) / BigInt(amountPerHour));
+    } else {
+      throw new Error('To complete command please define one of arguments --sppi or --minutes');
+    }
+
+    const confirmed =
+      params.yes ||
+      (await isActionConfirmed(
+        `Deposit will be replenished by ${weiToEther(tokenAmount)} SPPI. Order time is extended by ${minutes} minutes.`,
+      ));
+    if (confirmed) {
+      await Orders.replenishWorkflowDeposit(params.orderId, tokenAmount.toString());
+
+      Printer.print('Deposit replenished successfully');
+    }
+  } catch (error: any) {
+    Printer.print(`Order ${params.orderId} was not replenished: ${error?.message}`);
+  }
+};

src/index.ts

@@ -22,8 +22,17 @@ import ordersCancel from './commands/ordersCancel';
 import ordersComplete, { OrderCompleteParams } from './commands/ordersComplete';
 import ordersReplenishDeposit from './commands/ordersReplenishDeposit';
 import workflowsCreate, { WorkflowCreateCommandParams } from './commands/workflowsCreate';
+import workflowsReplenishDeposit, {
+  WorkflowReplenishDepositParams,
+} from './commands/workflowsReplenishDeposit';
 import Printer from './printer';
-import { collectOptions, commaSeparatedList, processSubCommands, validateFields } from './utils';
+import {
+  collectOptions,
+  commaSeparatedList,
+  parseNumber,
+  processSubCommands,
+  validateFields,
+} from './utils';
 import generateSolutionKey from './commands/solutionsGenerateKey';
 import prepareSolution from './commands/solutionsPrepare';
 import ordersDownloadResult, { FilesDownloadParams } from './commands/ordersDownloadResult';
@@ -50,6 +59,8 @@ import offersUpdateOption from './commands/offersUpdateOption';
 import offersDeleteOption from './commands/offersDeleteOption';
 import offersGetSlot from './commands/offersGetSlot';
 import offersGetOption from './commands/offersGetOption';
+import offerAddVersion from './commands/offerAddVersion';
+import offerDisableVersion from './commands/offerDisableVersion';
 import { checkForUpdates } from './services/checkReleaseVersion';
 import setup from './commands/setup';
 import { workflowGenerateKey } from './commands/workflowsGenerateKey';
@@ -99,6 +110,8 @@ async function main(): Promise<void> {
   const offersCommand = program.command('offers');
   const offersListCommand = offersCommand.command('list');
   const offersGetCommand = offersCommand.command('get');
+  const offerCommand = program.command('offer');
+  const offerVersionCommand = offerCommand.command('version');
   const quotesCommand = program.command('quotes');
 
   program.addCommand(secretsCommand);
@@ -463,6 +476,41 @@ async function main(): Promise<void> {
       await workflowsCreate(requestParams);
     });
 
+  workflowsCommand
+    .command('replenish-deposit')
+    .argument('<orderId>', 'Order Id')
+    .option('--sppi <SPPI>', 'SPPI to add to the order')
+    .addOption(
+      new Option(
+        '--minutes <minutes>',
+        'Time to extend order (automatically calculates tokens)',
+      ).argParser((val) => parseInt(val) || 0),
+    )
+    .option('--yes', 'Silent question mode. All answers will be yes', false)
+    .action(
+      async (
+        orderId: string,
+        options: { config: string; sppi: string; minutes: number; yes: boolean },
+      ) => {
+        const configLoader = new ConfigLoader(options.config);
+        const actionAccountKey = configLoader.loadSection('blockchain').accountPrivateKey;
+        const blockchain = configLoader.loadSection('blockchain');
+        const blockchainConfig = {
+          contractAddress: blockchain.smartContractAddress,
+          blockchainUrl: blockchain.rpcUrl,
+        };
+        const requestParams: WorkflowReplenishDepositParams = {
+          blockchainConfig,
+          actionAccountKey,
+          orderId,
+          minutes: options.minutes,
+          sppi: options.sppi,
+          yes: options.yes,
+        };
+        await workflowsReplenishDeposit(requestParams);
+      },
+    );
+
   const ordersListFields = [
       'id',
       'offer_name',
@@ -1387,6 +1435,48 @@ async function main(): Promise<void> {
       });
     });
 
+  offerVersionCommand
+    .command('add')
+    .description('Add new version of offer')
+    .requiredOption('--offer <id>', 'Offer id')
+    .requiredOption('--path <path>', 'Path to offer version info file')
+    .option('--ver <version>', 'Version number to add', parseNumber)
+    .action(async (options: { offer: string; path: string; ver: number; config: string }) => {
+      const configLoader = new ConfigLoader(options.config);
+      const blockchain = configLoader.loadSection('blockchain');
+      const blockchainConfig = {
+        contractAddress: blockchain.smartContractAddress,
+        blockchainUrl: blockchain.rpcUrl,
+      };
+      await offerAddVersion({
+        actionAccountKey: blockchain.accountPrivateKey,
+        blockchainConfig,
+        id: options.offer,
+        ver: options.ver,
+        path: options.path,
+      });
+    });
+
+  offerVersionCommand
+    .command('disable')
+    .description('Disable offer version')
+    .requiredOption('--offer <id>', 'Offer id')
+    .requiredOption('--ver <version>', 'Version number to delete', parseNumber)
+    .action(async (options: { offer: string; ver: number; config: string }) => {
+      const configLoader = new ConfigLoader(options.config);
+      const blockchain = configLoader.loadSection('blockchain');
+      const blockchainConfig = {
+        contractAddress: blockchain.smartContractAddress,
+        blockchainUrl: blockchain.rpcUrl,
+      };
+      await offerDisableVersion({
+        blockchainConfig,
+        id: options.offer,
+        ver: options.ver,
+        actionAccountKey: blockchain.accountPrivateKey,
+      });
+    });
+
   filesCommand
     .command('upload')
     .description('Upload a file specified by the <localPath> argument to the remote storage')

src/services/createOrder.ts

@@ -1,4 +1,4 @@
-import { OrderInfo, Orders, OrderSlots } from '@super-protocol/sdk-js';
+import { BlockchainConnector, OrderInfo, Orders, OrderSlots } from '@super-protocol/sdk-js';
 import doWithRetries from './doWithRetries';
 
 export type CreateOrderParams = {
@@ -9,11 +9,17 @@ export type CreateOrderParams = {
 };
 
 export default async (params: CreateOrderParams): Promise<string> => {
+  const workflowCreationBLock = await BlockchainConnector.getInstance().getLastBlockInfo();
+
   const orderLoaderFn = async (): Promise<string> => {
-    const event = await Orders.getByExternalId({
-      externalId: params.orderInfo.externalId,
-      consumer: params.consumerAddress,
-    });
+    const event = await Orders.getByExternalId(
+      {
+        externalId: params.orderInfo.externalId,
+        consumer: params.consumerAddress,
+      },
+      workflowCreationBLock.index,
+      'latest',
+    );
 
     if (event && event?.orderId !== '-1') {
       return event.orderId;

src/services/readOfferVersionInfo.ts

@@ -0,0 +1,23 @@
+import { OfferVersionInfo } from '@super-protocol/sdk-js';
+import readJsonFile from './readJsonFile';
+import { HashValidator } from '../services/readResourceFile';
+import { z } from 'zod';
+
+export type ReadFileParams = {
+  path: string;
+};
+
+const OfferVersionInfoSchema = z.object({
+  metadata: z.object({}).catchall(z.unknown()).optional(),
+  signatureKeyHash: HashValidator.optional(),
+  hash: HashValidator.optional(),
+});
+
+export default async (params: ReadFileParams): Promise<OfferVersionInfo> => {
+  const offerOption = await readJsonFile({
+    path: params.path,
+    validator: OfferVersionInfoSchema,
+  });
+
+  return offerOption;
+};