@sentio/cli 1.0.0-development → 1.0.0-rc.1

package/lib/build.js

@@ -38,9 +38,7 @@ async function buildProcessorForTarget(onlyGen) {
 async function installDeps() {
     await execStep('yarn install --ignore-scripts', 'Yarn Install');
 }
-async function codeGenEthersProcessor(abisDir, 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-ETHERS_TARGET = path_1.default.dirname(require.resolve('@sentio/sdk/lib/target-ethers-sentio')), outDir = 'src/types/internal') {
+async function codeGenEthersProcessor(abisDir, ETHERS_TARGET = path_1.default.dirname(require.resolve('@sentio/sdk/lib/target-ethers-sentio')), outDir = 'src/types/internal') {
     if (!fs_1.default.existsSync(abisDir)) {
         return;
     }

package/lib/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk'\nimport path from 'path'\nimport fs from 'fs'\nimport { exec } from 'child_process'\n\nexport async function buildProcessor(onlyGen: boolean) {\n  if (!onlyGen) {\n    await installDeps()\n  }\n\n  // targets.forEach(async (target) => await buildProcessorForTarget(onlyGen, target))\n  // for (const target) {\n  await buildProcessorForTarget(onlyGen)\n  // }\n\n  if (!onlyGen) {\n    const WEBPACK_CONFIG = path.join(__dirname, 'webpack.config.js')\n    await execStep('yarn tsc -p .', 'Compile')\n    await execStep('yarn webpack --config=' + WEBPACK_CONFIG, 'Packaging')\n  }\n}\n\nasync function buildProcessorForTarget(onlyGen: boolean) {\n  await codeGenEthersProcessor(path.join('abis', 'evm'))\n\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const solanaModule = require('@sentio/sdk/lib/solana-codegen/codegen')\n  solanaModule.codeGenSolanaProcessor(path.join('abis', 'solana'))\n\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const aptosModuole = require('@sentio/sdk/lib/aptos-codegen/codegen')\n  aptosModuole.codeGenAptosProcessor(path.join('abis', 'aptos'))\n\n  if (onlyGen) {\n    return\n  }\n}\n\nasync function installDeps() {\n  await execStep('yarn install --ignore-scripts', 'Yarn Install')\n}\n\nexport async function codeGenEthersProcessor(\n  abisDir: string,\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  ETHERS_TARGET = path.dirname(require.resolve('@sentio/sdk/lib/target-ethers-sentio')),\n  outDir = 'src/types/internal'\n) {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n\n  let haveJson = false\n  const files = fs.readdirSync(abisDir)\n  for (const file of files) {\n    if (file.toLowerCase().endsWith('.json')) {\n      haveJson = true\n      break\n    }\n  }\n  if (!haveJson) {\n    return\n  }\n\n  console.log(chalk.green('Generated Types for EVM'))\n\n  // TODO this will fail during postinstall, need to locate real typechain path\n  await execStep(\n    'yarn typechain --target ' + ETHERS_TARGET + ` --out-dir ${outDir} ${path.join(abisDir, '*.json')}`,\n    'Type definitions gen'\n  )\n}\n\nasync function execStep(cmd: string, stepName: string) {\n  const child = exec(cmd)\n  console.log(chalk.blue(stepName + ' begin'))\n\n  if (!child.stdout || !child.stderr) {\n    console.error(chalk.red(stepName + ' failed'))\n    process.exit(1)\n  }\n\n  child.stdout.pipe(process.stdout)\n  child.stderr.pipe(process.stderr)\n\n  await new Promise((resolve) => {\n    child.on('close', resolve)\n  })\n\n  if (child.exitCode) {\n    console.error(chalk.red(stepName + ' failed'))\n    process.exit(child.exitCode)\n  }\n  console.log(chalk.blue(stepName + ' success'))\n  console.log()\n}\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk'\nimport path from 'path'\nimport fs from 'fs'\nimport { exec } from 'child_process'\n\nexport async function buildProcessor(onlyGen: boolean) {\n  if (!onlyGen) {\n    await installDeps()\n  }\n\n  // targets.forEach(async (target) => await buildProcessorForTarget(onlyGen, target))\n  // for (const target) {\n  await buildProcessorForTarget(onlyGen)\n  // }\n\n  if (!onlyGen) {\n    const WEBPACK_CONFIG = path.join(__dirname, 'webpack.config.js')\n    await execStep('yarn tsc -p .', 'Compile')\n    await execStep('yarn webpack --config=' + WEBPACK_CONFIG, 'Packaging')\n  }\n}\n\nasync function buildProcessorForTarget(onlyGen: boolean) {\n  await codeGenEthersProcessor(path.join('abis', 'evm'))\n\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const solanaModule = require('@sentio/sdk/lib/solana-codegen/codegen')\n  solanaModule.codeGenSolanaProcessor(path.join('abis', 'solana'))\n\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const aptosModuole = require('@sentio/sdk/lib/aptos-codegen/codegen')\n  aptosModuole.codeGenAptosProcessor(path.join('abis', 'aptos'))\n\n  if (onlyGen) {\n    return\n  }\n}\n\nasync function installDeps() {\n  await execStep('yarn install --ignore-scripts', 'Yarn Install')\n}\n\nexport async function codeGenEthersProcessor(\n  abisDir: string,\n  ETHERS_TARGET = path.dirname(require.resolve('@sentio/sdk/lib/target-ethers-sentio')),\n  outDir = 'src/types/internal'\n) {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n\n  let haveJson = false\n  const files = fs.readdirSync(abisDir)\n  for (const file of files) {\n    if (file.toLowerCase().endsWith('.json')) {\n      haveJson = true\n      break\n    }\n  }\n  if (!haveJson) {\n    return\n  }\n\n  console.log(chalk.green('Generated Types for EVM'))\n\n  // TODO this will fail during postinstall, need to locate real typechain path\n  await execStep(\n    'yarn typechain --target ' + ETHERS_TARGET + ` --out-dir ${outDir} ${path.join(abisDir, '*.json')}`,\n    'Type definitions gen'\n  )\n}\n\nasync function execStep(cmd: string, stepName: string) {\n  const child = exec(cmd)\n  console.log(chalk.blue(stepName + ' begin'))\n\n  if (!child.stdout || !child.stderr) {\n    console.error(chalk.red(stepName + ' failed'))\n    process.exit(1)\n  }\n\n  child.stdout.pipe(process.stdout)\n  child.stderr.pipe(process.stderr)\n\n  await new Promise((resolve) => {\n    child.on('close', resolve)\n  })\n\n  if (child.exitCode) {\n    console.error(chalk.red(stepName + ' failed'))\n    process.exit(child.exitCode)\n  }\n  console.log(chalk.blue(stepName + ' success'))\n  console.log()\n}\n"]}

package/lib/commands/run-create.d.ts

@@ -1 +1 @@
-export declare function runCreate(argv: string[]): void;
+export declare function runCreate(argv: string[]): Promise<void>;

package/lib/commands/run-create.js

@@ -10,7 +10,8 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("../utils");
-function runCreate(argv) {
+const latest_version_1 = __importDefault(require("latest-version"));
+async function runCreate(argv) {
     const optionDefinitions = [
         {
             name: 'help',
@@ -34,7 +35,7 @@ function runCreate(argv) {
         {
             name: 'chain-type',
             alias: 'c',
-            description: 'The type of project you want to create, can be evm, aptos, raw (if you want to start from scratch and support multiple types of chains)',
+            description: 'The type of project you want to create, can be evm, aptos, solana, raw (if you want to start from scratch and support multiple types of chains)',
             type: String,
             defaultValue: 'evm',
         },
@@ -62,6 +63,8 @@ function runCreate(argv) {
                 break;
             case 'raw':
                 break;
+            case 'solana':
+                break;
             default:
                 console.error(chalk_1.default.red('non supported chain-type for template creation, use --help for more information.'));
                 console.log(usage);
@@ -98,7 +101,7 @@ function runCreate(argv) {
             if (!cliVersion.startsWith('^')) {
                 cliVersion = '^' + cliVersion;
             }
-            packageJson.dependencies['@sentio/sdk'] = cliVersion;
+            packageJson.dependencies['@sentio/sdk'] = '^' + (await (0, latest_version_1.default)('@sentio/sdk'));
             packageJson.dependencies['@sentio/cli'] = cliVersion;
             packageJson.name = projectName;
             // Don't add directly to avoid deps issue

package/lib/commands/run-create.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-create.js","sourceRoot":"","sources":["../../src/commands/run-create.ts"],"names":[],"mappings":"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","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport path from 'path'\nimport fs from 'fs-extra'\nimport chalk from 'chalk'\nimport { getCliVersion } from '../utils'\n\nexport function runCreate(argv: string[]) {\n  const optionDefinitions = [\n    {\n      name: 'help',\n      alias: 'h',\n      type: Boolean,\n      description: 'Display this usage guide.',\n    },\n    {\n      name: 'name',\n      alias: 'n',\n      defaultOption: true,\n      type: String,\n      description: 'Project name',\n    },\n    {\n      name: 'directory',\n      alias: 'd',\n      description: '(Optional) The root direct new project will be created, default current working dir',\n      type: String,\n    },\n    {\n      name: 'chain-type',\n      alias: 'c',\n      description:\n        'The type of project you want to create, can be evm, aptos, raw (if you want to start from scratch and support multiple types of chains)',\n      type: String,\n      defaultValue: 'evm',\n    },\n  ]\n\n  const options = commandLineArgs(optionDefinitions, { argv })\n  const usage = commandLineUsage([\n    {\n      header: 'Create a template project',\n      content: 'sentio create <name>',\n    },\n    {\n      header: 'Options',\n      optionList: optionDefinitions,\n    },\n  ])\n\n  if (options.help || !options.name) {\n    console.log(usage)\n  } else {\n    const chainType: string = options['chain-type'].toLowerCase()\n    switch (chainType) {\n      case 'evm':\n        break\n      case 'aptos':\n        break\n      case 'raw':\n        break\n      default:\n        console.error(chalk.red('non supported chain-type for template creation, use --help for more information.'))\n        console.log(usage)\n        process.exit(1)\n    }\n    const templateFolder = path.resolve(__dirname, '../../templates', chainType)\n    const projectName = options.name || 'default'\n\n    const rootDir = options.directory || process.cwd()\n    const dstFolder = path.resolve(rootDir, projectName)\n    if (fs.existsSync(dstFolder)) {\n      console.error(chalk.red(\"can't create project '\" + projectName + \"', directory already existed\"))\n      process.exit(1)\n    }\n\n    fs.copySync(templateFolder, dstFolder, {\n      filter: (src, _) => {\n        // TODO read from .gitignore to be more reliable\n        if (\n          src.endsWith('types') ||\n          src.endsWith('dist') ||\n          src.endsWith('node_modules') ||\n          src.endsWith('.lock') ||\n          src.endsWith('dist')\n        ) {\n          return false\n        }\n        return true\n      },\n      overwrite: false,\n    })\n    if (options.name) {\n      const sentioYamlPath = path.resolve(dstFolder, 'sentio.yaml')\n      fs.writeFileSync(sentioYamlPath, 'project: ' + projectName + '\\n', { flag: 'w+' })\n\n      const packageJsonPath = path.resolve(dstFolder, 'package.json')\n      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))\n\n      let cliVersion = getCliVersion()\n      if (!cliVersion.startsWith('^')) {\n        cliVersion = '^' + cliVersion\n      }\n\n      packageJson.dependencies['@sentio/sdk'] = cliVersion\n      packageJson.dependencies['@sentio/cli'] = cliVersion\n      packageJson.name = projectName\n\n      // Don't add directly to avoid deps issue\n      packageJson.scripts.postinstall = 'sentio gen'\n\n      fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))\n    }\n    console.log(chalk.green(\"successfully create project '\" + projectName + \"'\"))\n  }\n}\n"]}
+{"version":3,"file":"run-create.js","sourceRoot":"","sources":["../../src/commands/run-create.ts"],"names":[],"mappings":"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","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport path from 'path'\nimport fs from 'fs-extra'\nimport chalk from 'chalk'\nimport { getCliVersion } from '../utils'\nimport latestVersion from 'latest-version'\n\nexport async function runCreate(argv: string[]) {\n  const optionDefinitions = [\n    {\n      name: 'help',\n      alias: 'h',\n      type: Boolean,\n      description: 'Display this usage guide.',\n    },\n    {\n      name: 'name',\n      alias: 'n',\n      defaultOption: true,\n      type: String,\n      description: 'Project name',\n    },\n    {\n      name: 'directory',\n      alias: 'd',\n      description: '(Optional) The root direct new project will be created, default current working dir',\n      type: String,\n    },\n    {\n      name: 'chain-type',\n      alias: 'c',\n      description:\n        'The type of project you want to create, can be evm, aptos, solana, raw (if you want to start from scratch and support multiple types of chains)',\n      type: String,\n      defaultValue: 'evm',\n    },\n  ]\n\n  const options = commandLineArgs(optionDefinitions, { argv })\n  const usage = commandLineUsage([\n    {\n      header: 'Create a template project',\n      content: 'sentio create <name>',\n    },\n    {\n      header: 'Options',\n      optionList: optionDefinitions,\n    },\n  ])\n\n  if (options.help || !options.name) {\n    console.log(usage)\n  } else {\n    const chainType: string = options['chain-type'].toLowerCase()\n    switch (chainType) {\n      case 'evm':\n        break\n      case 'aptos':\n        break\n      case 'raw':\n        break\n      case 'solana':\n        break\n      default:\n        console.error(chalk.red('non supported chain-type for template creation, use --help for more information.'))\n        console.log(usage)\n        process.exit(1)\n    }\n    const templateFolder = path.resolve(__dirname, '../../templates', chainType)\n    const projectName = options.name || 'default'\n\n    const rootDir = options.directory || process.cwd()\n    const dstFolder = path.resolve(rootDir, projectName)\n    if (fs.existsSync(dstFolder)) {\n      console.error(chalk.red(\"can't create project '\" + projectName + \"', directory already existed\"))\n      process.exit(1)\n    }\n\n    fs.copySync(templateFolder, dstFolder, {\n      filter: (src, _) => {\n        // TODO read from .gitignore to be more reliable\n        if (\n          src.endsWith('types') ||\n          src.endsWith('dist') ||\n          src.endsWith('node_modules') ||\n          src.endsWith('.lock') ||\n          src.endsWith('dist')\n        ) {\n          return false\n        }\n        return true\n      },\n      overwrite: false,\n    })\n    if (options.name) {\n      const sentioYamlPath = path.resolve(dstFolder, 'sentio.yaml')\n      fs.writeFileSync(sentioYamlPath, 'project: ' + projectName + '\\n', { flag: 'w+' })\n\n      const packageJsonPath = path.resolve(dstFolder, 'package.json')\n      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))\n\n      let cliVersion = getCliVersion()\n      if (!cliVersion.startsWith('^')) {\n        cliVersion = '^' + cliVersion\n      }\n\n      packageJson.dependencies['@sentio/sdk'] = '^' + (await latestVersion('@sentio/sdk'))\n      packageJson.dependencies['@sentio/cli'] = cliVersion\n      packageJson.name = projectName\n\n      // Don't add directly to avoid deps issue\n      packageJson.scripts.postinstall = 'sentio gen'\n\n      fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))\n    }\n    console.log(chalk.green(\"successfully create project '\" + projectName + \"'\"))\n  }\n}\n"]}

package/lib/commands/run-version.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,6 +30,7 @@ exports.runVersion = void 0;
 const command_line_args_1 = __importDefault(require("command-line-args"));
 const command_line_usage_1 = __importDefault(require("command-line-usage"));
 const utils_1 = require("../utils");
+const console = __importStar(require("console"));
 function runVersion(argv) {
     const optionDefinitions = [
         {
@@ -32,7 +56,13 @@ function runVersion(argv) {
     }
     else {
         console.log('CLI Version: ', (0, utils_1.getCliVersion)());
-        // TODO show SDK version for current package
+        const sdkVersion = (0, utils_1.getSdkVersion)();
+        if (sdkVersion) {
+            console.log('SDK Version: ', sdkVersion);
+        }
+        else {
+            console.log('SDK Not installed for this project');
+        }
     }
 }
 exports.runVersion = runVersion;

package/lib/commands/run-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-version.js","sourceRoot":"","sources":["../../src/commands/run-version.ts"],"names":[],"mappings":";;;;;;AAAA,0EAA+C;AAC/C,4EAAiD;AACjD,oCAAwC;AAExC,SAAgB,UAAU,CAAC,IAAc;IACvC,MAAM,iBAAiB,GAAG;QACxB;YACE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,2BAA2B;SACzC;KACF,CAAA;IACD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAE5D,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,MAAM,KAAK,GAAG,IAAA,4BAAgB,EAAC;YAC7B;gBACE,MAAM,EAAE,sBAAsB;gBAC9B,OAAO,EAAE,gBAAgB;aAC1B;YACD;gBACE,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,iBAAiB;aAC9B;SACF,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACnB;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAA,qBAAa,GAAE,CAAC,CAAA;QAC7C,4CAA4C;KAC7C;AACH,CAAC;AA3BD,gCA2BC","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport { getCliVersion } from '../utils'\n\nexport function runVersion(argv: string[]) {\n  const optionDefinitions = [\n    {\n      name: 'help',\n      alias: 'h',\n      type: Boolean,\n      description: 'Display this usage guide.',\n    },\n  ]\n  const options = commandLineArgs(optionDefinitions, { argv })\n\n  if (options.help) {\n    const usage = commandLineUsage([\n      {\n        header: 'Show current version',\n        content: 'sentio version',\n      },\n      {\n        header: 'Options',\n        optionList: optionDefinitions,\n      },\n    ])\n    console.log(usage)\n  } else {\n    console.log('CLI Version: ', getCliVersion())\n    // TODO show SDK version for current package\n  }\n}\n"]}
+{"version":3,"file":"run-version.js","sourceRoot":"","sources":["../../src/commands/run-version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA+C;AAC/C,4EAAiD;AACjD,oCAAuD;AACvD,iDAAkC;AAElC,SAAgB,UAAU,CAAC,IAAc;IACvC,MAAM,iBAAiB,GAAG;QACxB;YACE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,2BAA2B;SACzC;KACF,CAAA;IACD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAE5D,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,MAAM,KAAK,GAAG,IAAA,4BAAgB,EAAC;YAC7B;gBACE,MAAM,EAAE,sBAAsB;gBAC9B,OAAO,EAAE,gBAAgB;aAC1B;YACD;gBACE,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,iBAAiB;aAC9B;SACF,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACnB;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAA,qBAAa,GAAE,CAAC,CAAA;QAC7C,MAAM,UAAU,GAAG,IAAA,qBAAa,GAAE,CAAA;QAClC,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;SACzC;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;SAClD;KACF;AACH,CAAC;AAhCD,gCAgCC","sourcesContent":["import commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport { getCliVersion, getSdkVersion } from '../utils'\nimport * as console from 'console'\n\nexport function runVersion(argv: string[]) {\n  const optionDefinitions = [\n    {\n      name: 'help',\n      alias: 'h',\n      type: Boolean,\n      description: 'Display this usage guide.',\n    },\n  ]\n  const options = commandLineArgs(optionDefinitions, { argv })\n\n  if (options.help) {\n    const usage = commandLineUsage([\n      {\n        header: 'Show current version',\n        content: 'sentio version',\n      },\n      {\n        header: 'Options',\n        optionList: optionDefinitions,\n      },\n    ])\n    console.log(usage)\n  } else {\n    console.log('CLI Version: ', getCliVersion())\n    const sdkVersion = getSdkVersion()\n    if (sdkVersion) {\n      console.log('SDK Version: ', sdkVersion)\n    } else {\n      console.log('SDK Not installed for this project')\n    }\n  }\n}\n"]}

package/lib/upload.js

@@ -68,7 +68,7 @@ async function uploadFile(options, apiKeyOverride) {
         }
         console.log(chalk_1.default.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'));
         // get gcs upload url
-        const initUploadResRaw = await initUpload(options.host, apiKey, options.project, (0, utils_1.getCliVersion)());
+        const initUploadResRaw = await initUpload(options.host, apiKey, options.project, (0, utils_1.getSdkVersion)());
         if (!initUploadResRaw.ok) {
             console.error(chalk_1.default.red('Failed to get upload url'));
             console.error(chalk_1.default.red((await initUploadResRaw.json()).message));
@@ -119,7 +119,7 @@ async function uploadFile(options, apiKeyOverride) {
             return;
         }
         // finish uploading
-        const finishUploadResRaw = await finishUpload(options.host, apiKey, options.project, (0, utils_1.getCliVersion)(), sha256, commitSha, gitUrl, options.debug);
+        const finishUploadResRaw = await finishUpload(options.host, apiKey, options.project, (0, utils_1.getSdkVersion)(), sha256, commitSha, gitUrl, options.debug);
         if (!finishUploadResRaw.ok) {
             console.error(chalk_1.default.red('Failed to finish uploading'));
             console.error(chalk_1.default.red(await finishUploadResRaw.text()));

package/lib/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport fs from 'fs'\nimport readline from 'readline'\nimport { SentioProjectConfig } from './config'\nimport { ReadKey } from './key'\nimport path from 'path'\nimport chalk from 'chalk'\nimport { buildProcessor } from './build'\nimport fetch from 'node-fetch'\nimport { getCliVersion } from './utils'\nimport { URL } from 'url'\n\nasync function createProject(options: SentioProjectConfig, apiKey: string) {\n  const url = new URL('/api/v1/projects', options.host)\n  const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project]\n  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug, ownerName, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false)\n  }\n\n  console.log(chalk.blue('Prepare to upload'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const apiKey = apiKeyOverride || ReadKey(options.host)\n\n  const isProd = options.host === 'https://app.sentio.xyz'\n  if (!apiKey) {\n    const cmd = isProd ? 'sentio login' : 'sentio login --host=' + options.host\n    console.error(chalk.red('No Credential found for', options.host, '. Please run `' + cmd + '`.'))\n    process.exit(1)\n  }\n\n  if (!fs.existsSync(PROCESSOR_FILE)) {\n    console.error(chalk.red('File not existed ', PROCESSOR_FILE, \"don't use --nobuild\"))\n    process.exit(1)\n  }\n\n  const stat = fs.statSync(PROCESSOR_FILE)\n  console.log('Packed processor file size', Math.floor(stat.size / 1024) + 'K, last modified', stat.mtime)\n  const content = fs.readFileSync(PROCESSOR_FILE)\n  const hash = createHash('sha256')\n  hash.update(content)\n  const digest = hash.digest('hex')\n\n  let triedCount = 0\n  const upload = async () => {\n    let commitSha = ''\n    let gitUrl = ''\n    const sha256 = digest\n    try {\n      commitSha = execSync('git rev-parse HEAD').toString().trim()\n    } catch (e) {\n      chalk.yellow(e)\n    }\n    try {\n      gitUrl = execSync('git remote get-url origin').toString().trim()\n    } catch (e) {\n      // skip errors\n    }\n    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))\n\n    // get gcs upload url\n    const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getCliVersion())\n    if (!initUploadResRaw.ok) {\n      console.error(chalk.red('Failed to get upload url'))\n      console.error(chalk.red((await initUploadResRaw.json()).message))\n\n      if (initUploadResRaw.status === 404) {\n        // create project if not exist\n        const rl = readline.createInterface({\n          input: process.stdin,\n          output: process.stdout,\n        })\n        const prompt = async () => {\n          const answer: string = await new Promise((resolve) =>\n            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)\n          )\n          if (['y', 'yes'].includes(answer.toLowerCase())) {\n            rl.close()\n            const res = await createProject(options, apiKey)\n            if (!res.ok) {\n              console.error(chalk.red('Create Project Failed'))\n              console.error(chalk.red((await res.json()).message))\n              return\n            }\n            console.log(chalk.green('Project created'))\n            await upload()\n          } else if (['n', 'no'].includes(answer.toLowerCase())) {\n            rl.close()\n          } else {\n            await prompt()\n          }\n        }\n        await prompt()\n      }\n      return\n    }\n    const initUploadRes = await initUploadResRaw.json()\n    const uploadUrl = initUploadRes['url'] as string\n\n    // do actual uploading\n    const file = fs.createReadStream(PROCESSOR_FILE)\n    const uploadResRaw = await fetch(uploadUrl, {\n      method: 'PUT',\n      headers: {\n        'Content-Type': 'application/octet-stream',\n      },\n      body: file,\n    })\n    if (!uploadResRaw.ok) {\n      console.error(chalk.red('Failed to upload'))\n      console.error(chalk.red(await uploadResRaw.text()))\n      return\n    }\n\n    // finish uploading\n    const finishUploadResRaw = await finishUpload(\n      options.host,\n      apiKey,\n      options.project,\n      getCliVersion(),\n      sha256,\n      commitSha,\n      gitUrl,\n      options.debug\n    )\n    if (!finishUploadResRaw.ok) {\n      console.error(chalk.red('Failed to finish uploading'))\n      console.error(chalk.red(await finishUploadResRaw.text()))\n      return\n    }\n\n    console.log(chalk.green('Upload success: '))\n    console.log('\\t', chalk.blue('sha256:'), digest)\n    if (commitSha) {\n      console.log('\\t', chalk.blue('Git commit SHA:'), commitSha)\n    }\n    const { projectFullSlug } = await finishUploadResRaw.json()\n    console.log('\\t', chalk.blue('Check status:'), `${options.host}/${projectFullSlug}/datasource`)\n  }\n\n  let error: Error\n  const tryUploading = async () => {\n    if (triedCount++ >= 5) {\n      console.error(error)\n      return\n    }\n    try {\n      await upload()\n    } catch (e) {\n      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {\n        error = e\n        await new Promise((resolve) => setTimeout(resolve, 1000))\n        await tryUploading()\n      } else {\n        console.error(e)\n      }\n    }\n  }\n\n  await tryUploading()\n}\n\nasync function initUpload(host: string, apiKey: string, projectSlug: string, sdkVersion: string) {\n  const initUploadUrl = new URL(`/api/v1/processors/init_upload`, host)\n  return fetch(initUploadUrl, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({\n      project_slug: projectSlug,\n      sdk_version: sdkVersion,\n    }),\n  })\n}\n\nasync function finishUpload(\n  host: string,\n  apiKey: string,\n  projectSlug: string,\n  sdkVersion: string,\n  sha256: string,\n  commitSha: string,\n  gitUrl: string,\n  debug: boolean\n) {\n  const finishUploadUrl = new URL(`/api/v1/processors/finish_upload`, host)\n  return fetch(finishUploadUrl, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({\n      project_slug: projectSlug,\n      sdk_version: sdkVersion,\n      sha256: sha256,\n      commit_sha: commitSha,\n      git_url: gitUrl,\n      debug: debug,\n    }),\n  })\n}\n"]}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport fs from 'fs'\nimport readline from 'readline'\nimport { SentioProjectConfig } from './config'\nimport { ReadKey } from './key'\nimport path from 'path'\nimport chalk from 'chalk'\nimport { buildProcessor } from './build'\nimport fetch from 'node-fetch'\nimport { getSdkVersion } from './utils'\nimport { URL } from 'url'\n\nasync function createProject(options: SentioProjectConfig, apiKey: string) {\n  const url = new URL('/api/v1/projects', options.host)\n  const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project]\n  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug, ownerName, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false)\n  }\n\n  console.log(chalk.blue('Prepare to upload'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const apiKey = apiKeyOverride || ReadKey(options.host)\n\n  const isProd = options.host === 'https://app.sentio.xyz'\n  if (!apiKey) {\n    const cmd = isProd ? 'sentio login' : 'sentio login --host=' + options.host\n    console.error(chalk.red('No Credential found for', options.host, '. Please run `' + cmd + '`.'))\n    process.exit(1)\n  }\n\n  if (!fs.existsSync(PROCESSOR_FILE)) {\n    console.error(chalk.red('File not existed ', PROCESSOR_FILE, \"don't use --nobuild\"))\n    process.exit(1)\n  }\n\n  const stat = fs.statSync(PROCESSOR_FILE)\n  console.log('Packed processor file size', Math.floor(stat.size / 1024) + 'K, last modified', stat.mtime)\n  const content = fs.readFileSync(PROCESSOR_FILE)\n  const hash = createHash('sha256')\n  hash.update(content)\n  const digest = hash.digest('hex')\n\n  let triedCount = 0\n  const upload = async () => {\n    let commitSha = ''\n    let gitUrl = ''\n    const sha256 = digest\n    try {\n      commitSha = execSync('git rev-parse HEAD').toString().trim()\n    } catch (e) {\n      chalk.yellow(e)\n    }\n    try {\n      gitUrl = execSync('git remote get-url origin').toString().trim()\n    } catch (e) {\n      // skip errors\n    }\n    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))\n\n    // get gcs upload url\n    const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getSdkVersion())\n    if (!initUploadResRaw.ok) {\n      console.error(chalk.red('Failed to get upload url'))\n      console.error(chalk.red((await initUploadResRaw.json()).message))\n\n      if (initUploadResRaw.status === 404) {\n        // create project if not exist\n        const rl = readline.createInterface({\n          input: process.stdin,\n          output: process.stdout,\n        })\n        const prompt = async () => {\n          const answer: string = await new Promise((resolve) =>\n            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)\n          )\n          if (['y', 'yes'].includes(answer.toLowerCase())) {\n            rl.close()\n            const res = await createProject(options, apiKey)\n            if (!res.ok) {\n              console.error(chalk.red('Create Project Failed'))\n              console.error(chalk.red((await res.json()).message))\n              return\n            }\n            console.log(chalk.green('Project created'))\n            await upload()\n          } else if (['n', 'no'].includes(answer.toLowerCase())) {\n            rl.close()\n          } else {\n            await prompt()\n          }\n        }\n        await prompt()\n      }\n      return\n    }\n    const initUploadRes = await initUploadResRaw.json()\n    const uploadUrl = initUploadRes['url'] as string\n\n    // do actual uploading\n    const file = fs.createReadStream(PROCESSOR_FILE)\n    const uploadResRaw = await fetch(uploadUrl, {\n      method: 'PUT',\n      headers: {\n        'Content-Type': 'application/octet-stream',\n      },\n      body: file,\n    })\n    if (!uploadResRaw.ok) {\n      console.error(chalk.red('Failed to upload'))\n      console.error(chalk.red(await uploadResRaw.text()))\n      return\n    }\n\n    // finish uploading\n    const finishUploadResRaw = await finishUpload(\n      options.host,\n      apiKey,\n      options.project,\n      getSdkVersion(),\n      sha256,\n      commitSha,\n      gitUrl,\n      options.debug\n    )\n    if (!finishUploadResRaw.ok) {\n      console.error(chalk.red('Failed to finish uploading'))\n      console.error(chalk.red(await finishUploadResRaw.text()))\n      return\n    }\n\n    console.log(chalk.green('Upload success: '))\n    console.log('\\t', chalk.blue('sha256:'), digest)\n    if (commitSha) {\n      console.log('\\t', chalk.blue('Git commit SHA:'), commitSha)\n    }\n    const { projectFullSlug } = await finishUploadResRaw.json()\n    console.log('\\t', chalk.blue('Check status:'), `${options.host}/${projectFullSlug}/datasource`)\n  }\n\n  let error: Error\n  const tryUploading = async () => {\n    if (triedCount++ >= 5) {\n      console.error(error)\n      return\n    }\n    try {\n      await upload()\n    } catch (e) {\n      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {\n        error = e\n        await new Promise((resolve) => setTimeout(resolve, 1000))\n        await tryUploading()\n      } else {\n        console.error(e)\n      }\n    }\n  }\n\n  await tryUploading()\n}\n\nasync function initUpload(host: string, apiKey: string, projectSlug: string, sdkVersion: string) {\n  const initUploadUrl = new URL(`/api/v1/processors/init_upload`, host)\n  return fetch(initUploadUrl, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({\n      project_slug: projectSlug,\n      sdk_version: sdkVersion,\n    }),\n  })\n}\n\nasync function finishUpload(\n  host: string,\n  apiKey: string,\n  projectSlug: string,\n  sdkVersion: string,\n  sha256: string,\n  commitSha: string,\n  gitUrl: string,\n  debug: boolean\n) {\n  const finishUploadUrl = new URL(`/api/v1/processors/finish_upload`, host)\n  return fetch(finishUploadUrl, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({\n      project_slug: projectSlug,\n      sdk_version: sdkVersion,\n      sha256: sha256,\n      commit_sha: commitSha,\n      git_url: gitUrl,\n      debug: debug,\n    }),\n  })\n}\n"]}

package/lib/utils.d.ts

@@ -1 +1,2 @@
 export declare function getCliVersion(): any;
+export declare function getSdkVersion(): any;

package/lib/utils.js

@@ -3,14 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCliVersion = void 0;
+exports.getSdkVersion = exports.getCliVersion = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 function getCliVersion() {
-    const packageJsonPath = path_1.default.resolve(__dirname, '../../package.json');
+    const packageJsonPath = path_1.default.resolve(__dirname, '../package.json');
     const packageJsonContent = fs_extra_1.default.readFileSync(packageJsonPath, 'utf-8');
     const packageJson = JSON.parse(packageJsonContent);
     return packageJson.version;
 }
 exports.getCliVersion = getCliVersion;
+function getSdkVersion() {
+    try {
+        const packageJsonPath = require.resolve('@sentio/sdk/package.json');
+        const packageJsonContent = fs_extra_1.default.readFileSync(packageJsonPath, 'utf-8');
+        const packageJson = JSON.parse(packageJsonContent);
+        return packageJson.version;
+    }
+    catch (e) {
+        return undefined;
+    }
+}
+exports.getSdkVersion = getSdkVersion;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAyB;AACzB,gDAAuB;AAEvB,SAAgB,aAAa;IAC3B,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;IACrE,MAAM,kBAAkB,GAAG,kBAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAElD,OAAO,WAAW,CAAC,OAAO,CAAA;AAC5B,CAAC;AAND,sCAMC","sourcesContent":["import fs from 'fs-extra'\nimport path from 'path'\n\nexport function getCliVersion() {\n  const packageJsonPath = path.resolve(__dirname, '../../package.json')\n  const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n  const packageJson = JSON.parse(packageJsonContent)\n\n  return packageJson.version\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAyB;AACzB,gDAAuB;AAEvB,SAAgB,aAAa;IAC3B,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAClE,MAAM,kBAAkB,GAAG,kBAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAElD,OAAO,WAAW,CAAC,OAAO,CAAA;AAC5B,CAAC;AAND,sCAMC;AAED,SAAgB,aAAa;IAC3B,IAAI;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACnE,MAAM,kBAAkB,GAAG,kBAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAClD,OAAO,WAAW,CAAC,OAAO,CAAA;KAC3B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;AACH,CAAC;AATD,sCASC","sourcesContent":["import fs from 'fs-extra'\nimport path from 'path'\n\nexport function getCliVersion() {\n  const packageJsonPath = path.resolve(__dirname, '../package.json')\n  const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n  const packageJson = JSON.parse(packageJsonContent)\n\n  return packageJson.version\n}\n\nexport function getSdkVersion() {\n  try {\n    const packageJsonPath = require.resolve('@sentio/sdk/package.json')\n    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n    const packageJson = JSON.parse(packageJsonContent)\n    return packageJson.version\n  } catch (e) {\n    return undefined\n  }\n}\n"]}

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@sentio/cli",
   "license": "Apache-2.0",
-  "version": "1.0.0-development",
+  "version": "1.0.0-rc.1",
   "scripts": {
     "compile": "tsc -p . && cp src/webpack.config.js lib/",
     "build": "yarn compile",
+    "postbuild": "../../scripts/link-bin.sh",
     "cli": "ts-node src/cli.ts",
-    "test": "jest"
+    "test": "jest",
+    "pub": "yarn build && yarn publish --no-git-tag-version"
   },
   "dependencies": {
     "command-line-args": "^5.2.1",
@@ -15,6 +17,7 @@
     "form-data": "^4.0.0",
     "fs-extra": "^11.0.0",
     "js-yaml": "^4.1.0",
+    "latest-version": "^5.1.0",
     "node-fetch": "2",
     "open": "^8.4.0",
     "ts-loader": "^9.3.0",
@@ -28,23 +31,13 @@
     "@types/expect": "^24.3.0",
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^9.0.13",
-    "@types/google-protobuf": "^3.15.6",
     "@types/js-yaml": "^4.0.5",
-    "@types/mkdirp": "^1.0.2",
     "@types/node": "^18.0.4",
     "@types/node-fetch": "^2.6.2",
     "chai": "^4.3.6",
-    "clean-publish": "^4.0.1",
-    "conventional-changelog-conventionalcommits": "^5.0.0",
-    "eslint": "^8.27.0",
-    "eslint-import-resolver-typescript": "^3.5.2",
-    "eslint-plugin-import": "^2.26.0",
     "jest": "^29.0.3",
-    "semantic-release": "^19.0.5",
     "ts-jest": "^29.0.3",
-    "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.0.0",
-    "typescript": "^4.8.0"
+    "ts-node": "^10.9.1"
   },
   "bin": {
     "sentio": "./lib/cli.js"

package/src/build.ts

@@ -42,7 +42,6 @@ async function installDeps() {
 
 export async function codeGenEthersProcessor(
   abisDir: string,
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
   ETHERS_TARGET = path.dirname(require.resolve('@sentio/sdk/lib/target-ethers-sentio')),
   outDir = 'src/types/internal'
 ) {

package/src/commands/run-create.ts

@@ -4,8 +4,9 @@ import path from 'path'
 import fs from 'fs-extra'
 import chalk from 'chalk'
 import { getCliVersion } from '../utils'
+import latestVersion from 'latest-version'
 
-export function runCreate(argv: string[]) {
+export async function runCreate(argv: string[]) {
   const optionDefinitions = [
     {
       name: 'help',
@@ -30,7 +31,7 @@ export function runCreate(argv: string[]) {
       name: 'chain-type',
       alias: 'c',
       description:
-        'The type of project you want to create, can be evm, aptos, raw (if you want to start from scratch and support multiple types of chains)',
+        'The type of project you want to create, can be evm, aptos, solana, raw (if you want to start from scratch and support multiple types of chains)',
       type: String,
       defaultValue: 'evm',
     },
@@ -59,6 +60,8 @@ export function runCreate(argv: string[]) {
         break
       case 'raw':
         break
+      case 'solana':
+        break
       default:
         console.error(chalk.red('non supported chain-type for template creation, use --help for more information.'))
         console.log(usage)
@@ -102,7 +105,7 @@ export function runCreate(argv: string[]) {
         cliVersion = '^' + cliVersion
       }
 
-      packageJson.dependencies['@sentio/sdk'] = cliVersion
+      packageJson.dependencies['@sentio/sdk'] = '^' + (await latestVersion('@sentio/sdk'))
       packageJson.dependencies['@sentio/cli'] = cliVersion
       packageJson.name = projectName
 

package/src/commands/run-version.ts

@@ -1,6 +1,7 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { getCliVersion } from '../utils'
+import { getCliVersion, getSdkVersion } from '../utils'
+import * as console from 'console'
 
 export function runVersion(argv: string[]) {
   const optionDefinitions = [
@@ -27,6 +28,11 @@ export function runVersion(argv: string[]) {
     console.log(usage)
   } else {
     console.log('CLI Version: ', getCliVersion())
-    // TODO show SDK version for current package
+    const sdkVersion = getSdkVersion()
+    if (sdkVersion) {
+      console.log('SDK Version: ', sdkVersion)
+    } else {
+      console.log('SDK Not installed for this project')
+    }
   }
 }

package/src/upload.ts

@@ -8,7 +8,7 @@ import path from 'path'
 import chalk from 'chalk'
 import { buildProcessor } from './build'
 import fetch from 'node-fetch'
-import { getCliVersion } from './utils'
+import { getSdkVersion } from './utils'
 import { URL } from 'url'
 
 async function createProject(options: SentioProjectConfig, apiKey: string) {
@@ -71,7 +71,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))
 
     // get gcs upload url
-    const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getCliVersion())
+    const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getSdkVersion())
     if (!initUploadResRaw.ok) {
       console.error(chalk.red('Failed to get upload url'))
       console.error(chalk.red((await initUploadResRaw.json()).message))
@@ -129,7 +129,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
       options.host,
       apiKey,
       options.project,
-      getCliVersion(),
+      getSdkVersion(),
       sha256,
       commitSha,
       gitUrl,

package/src/utils.ts

@@ -2,9 +2,20 @@ import fs from 'fs-extra'
 import path from 'path'
 
 export function getCliVersion() {
-  const packageJsonPath = path.resolve(__dirname, '../../package.json')
+  const packageJsonPath = path.resolve(__dirname, '../package.json')
   const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')
   const packageJson = JSON.parse(packageJsonContent)
 
   return packageJson.version
 }
+
+export function getSdkVersion() {
+  try {
+    const packageJsonPath = require.resolve('@sentio/sdk/package.json')
+    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')
+    const packageJson = JSON.parse(packageJsonContent)
+    return packageJson.version
+  } catch (e) {
+    return undefined
+  }
+}

package/templates/solana/jest.config.js

@@ -0,0 +1,7 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  modulePathIgnorePatterns: ["<rootDir>/dist/"]
+};

package/templates/solana/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "template-solana",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "test": "jest",
+    "gen": "sentio gen",
+    "build": "sentio build",
+    "upload": "sentio upload"
+  },
+  "dependencies": {
+    "@sentio/sdk": "^1.0.0-development"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.0.0",
+    "jest": "^29.0.0",
+    "ts-jest": "^29.0.0",
+    "typescript": "^4.7.2"
+  }
+}

package/templates/solana/sentio.yaml

@@ -0,0 +1,3 @@
+# Project name could be $org_or_user/$project_name or $project_name
+# If latter, will be treated the owner as api key's owner
+project: default

package/templates/solana/src/processor.ts

@@ -0,0 +1,16 @@
+import { SPLTokenProcessor } from '@sentio/sdk/lib/builtin/solana'
+
+SPLTokenProcessor.bind({
+  address: 'wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb',
+  processInnerInstruction: true,
+})
+  .onMintTo((data, ctx) => {
+    if (data.mint === '7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs') {
+      ctx.meter.Counter('totalWeth_supply').add(data.amount as number)
+    }
+  })
+  .onBurn((data, ctx) => {
+    if (data.mint === '7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs') {
+      ctx.meter.Counter('totalWeth_supply').sub(data.amount as number)
+    }
+  })

package/templates/solana/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "alwaysStrict": true,
+    "sourceMap": true,
+    "target": "esnext",
+    "esModuleInterop": true,
+    "noImplicitReturns": true,
+    "noImplicitAny": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "strictNullChecks": true,
+    "stripInternal": true,
+    "noFallthroughCasesInSwitch": true,
+    "noEmitOnError": true,
+    "outDir": "dist",
+    "rootDir": "./src",
+    "skipLibCheck": true
+  },
+  "exclude": ["dist"]
+}