@sentio/sdk 1.14.4 → 1.15.1

package/src/builtin/internal/erc20_processor.ts

@@ -171,7 +171,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     owner: PromiseOrValue<string>,
     spender: PromiseOrValue<string>,
     overrides?: CallOverrides
-  ) {
+  ): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.allowance(owner, spender, overrides);
@@ -183,7 +183,10 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async balanceOf(account: PromiseOrValue<string>, overrides?: CallOverrides) {
+  async balanceOf(
+    account: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.balanceOf(account, overrides);
@@ -195,7 +198,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async decimals(overrides?: CallOverrides) {
+  async decimals(overrides?: CallOverrides): Promise<number> {
     try {
       if (overrides) {
         return await this.contract.decimals(overrides);
@@ -207,7 +210,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async locker(overrides?: CallOverrides) {
+  async locker(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.locker(overrides);
@@ -219,7 +222,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async name(overrides?: CallOverrides) {
+  async name(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.name(overrides);
@@ -231,7 +234,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async owner(overrides?: CallOverrides) {
+  async owner(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.owner(overrides);
@@ -243,7 +246,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async symbol(overrides?: CallOverrides) {
+  async symbol(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.symbol(overrides);
@@ -255,7 +258,7 @@ export class ERC20ContractView extends ContractView<ERC20> {
     }
   }
 
-  async totalSupply(overrides?: CallOverrides) {
+  async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.totalSupply(overrides);
@@ -280,7 +283,7 @@ export class ERC20BoundContractView extends BoundContractView<
     owner: PromiseOrValue<string>,
     spender: PromiseOrValue<string>,
     overrides?: CallOverrides
-  ) {
+  ): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -297,7 +300,10 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async balanceOf(account: PromiseOrValue<string>, overrides?: CallOverrides) {
+  async balanceOf(
+    account: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -314,7 +320,7 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async decimals(overrides?: CallOverrides) {
+  async decimals(overrides?: CallOverrides): Promise<number> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -331,7 +337,7 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async locker(overrides?: CallOverrides) {
+  async locker(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -348,7 +354,7 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async name(overrides?: CallOverrides) {
+  async name(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -365,7 +371,7 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async owner(overrides?: CallOverrides) {
+  async owner(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -382,7 +388,7 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async symbol(overrides?: CallOverrides) {
+  async symbol(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -399,7 +405,7 @@ export class ERC20BoundContractView extends BoundContractView<
     }
   }
 
-  async totalSupply(overrides?: CallOverrides) {
+  async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {

package/src/builtin/internal/erc20bytes_processor.ts

@@ -99,7 +99,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     super(contract);
   }
 
-  async name(overrides?: CallOverrides) {
+  async name(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.name(overrides);
@@ -111,7 +111,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     }
   }
 
-  async totalSupply(overrides?: CallOverrides) {
+  async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.totalSupply(overrides);
@@ -123,7 +123,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     }
   }
 
-  async decimals(overrides?: CallOverrides) {
+  async decimals(overrides?: CallOverrides): Promise<number> {
     try {
       if (overrides) {
         return await this.contract.decimals(overrides);
@@ -135,7 +135,10 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     }
   }
 
-  async balanceOf(who: PromiseOrValue<string>, overrides?: CallOverrides) {
+  async balanceOf(
+    who: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.balanceOf(who, overrides);
@@ -147,7 +150,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     }
   }
 
-  async symbol(overrides?: CallOverrides) {
+  async symbol(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.symbol(overrides);
@@ -163,7 +166,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     owner: PromiseOrValue<string>,
     spender: PromiseOrValue<string>,
     overrides?: CallOverrides
-  ) {
+  ): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.allowance(owner, spender, overrides);
@@ -184,7 +187,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
   //   super(contract);
   // }
 
-  async name(overrides?: CallOverrides) {
+  async name(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -201,7 +204,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     }
   }
 
-  async totalSupply(overrides?: CallOverrides) {
+  async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -218,7 +221,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     }
   }
 
-  async decimals(overrides?: CallOverrides) {
+  async decimals(overrides?: CallOverrides): Promise<number> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -235,7 +238,10 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     }
   }
 
-  async balanceOf(who: PromiseOrValue<string>, overrides?: CallOverrides) {
+  async balanceOf(
+    who: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -252,7 +258,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     }
   }
 
-  async symbol(overrides?: CallOverrides) {
+  async symbol(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -273,7 +279,7 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     owner: PromiseOrValue<string>,
     spender: PromiseOrValue<string>,
     overrides?: CallOverrides
-  ) {
+  ): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {

package/src/builtin/internal/weth9_processor.ts

@@ -108,7 +108,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
     super(contract);
   }
 
-  async name(overrides?: CallOverrides) {
+  async name(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.name(overrides);
@@ -120,7 +120,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
     }
   }
 
-  async totalSupply(overrides?: CallOverrides) {
+  async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.totalSupply(overrides);
@@ -132,7 +132,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
     }
   }
 
-  async decimals(overrides?: CallOverrides) {
+  async decimals(overrides?: CallOverrides): Promise<number> {
     try {
       if (overrides) {
         return await this.contract.decimals(overrides);
@@ -144,7 +144,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
     }
   }
 
-  async balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides) {
+  async balanceOf(
+    arg0: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.balanceOf(arg0, overrides);
@@ -156,7 +159,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
     }
   }
 
-  async symbol(overrides?: CallOverrides) {
+  async symbol(overrides?: CallOverrides): Promise<string> {
     try {
       if (overrides) {
         return await this.contract.symbol(overrides);
@@ -172,7 +175,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
     arg0: PromiseOrValue<string>,
     arg1: PromiseOrValue<string>,
     overrides?: CallOverrides
-  ) {
+  ): Promise<BigNumber> {
     try {
       if (overrides) {
         return await this.contract.allowance(arg0, arg1, overrides);
@@ -193,7 +196,7 @@ export class WETH9BoundContractView extends BoundContractView<
   //   super(contract);
   // }
 
-  async name(overrides?: CallOverrides) {
+  async name(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -210,7 +213,7 @@ export class WETH9BoundContractView extends BoundContractView<
     }
   }
 
-  async totalSupply(overrides?: CallOverrides) {
+  async totalSupply(overrides?: CallOverrides): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -227,7 +230,7 @@ export class WETH9BoundContractView extends BoundContractView<
     }
   }
 
-  async decimals(overrides?: CallOverrides) {
+  async decimals(overrides?: CallOverrides): Promise<number> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -244,7 +247,10 @@ export class WETH9BoundContractView extends BoundContractView<
     }
   }
 
-  async balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides) {
+  async balanceOf(
+    arg0: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -261,7 +267,7 @@ export class WETH9BoundContractView extends BoundContractView<
     }
   }
 
-  async symbol(overrides?: CallOverrides) {
+  async symbol(overrides?: CallOverrides): Promise<string> {
     try {
       if (!overrides && this.context) {
         overrides = {
@@ -282,7 +288,7 @@ export class WETH9BoundContractView extends BoundContractView<
     arg0: PromiseOrValue<string>,
     arg1: PromiseOrValue<string>,
     overrides?: CallOverrides
-  ) {
+  ): Promise<BigNumber> {
     try {
       if (!overrides && this.context) {
         overrides = {

package/src/cli/upload.ts

@@ -2,6 +2,7 @@ import { execSync } from 'child_process'
 import { createHash } from 'crypto'
 import FormData from 'form-data'
 import fs from 'fs'
+import readline from 'readline'
 import { SentioProjectConfig } from './config'
 import { ReadKey } from './key'
 import path from 'path'
@@ -10,16 +11,27 @@ import { buildProcessor } from './build'
 import fetch from 'node-fetch'
 import { getCliVersion } from './utils'
 
+async function createProject(options: SentioProjectConfig, apiKey: string) {
+  const url = new URL('/api/v1/projects', options.host)
+  return fetch(url, {
+    method: 'POST',
+    headers: {
+      'api-key': apiKey,
+    },
+    body: JSON.stringify({ slug: options.project, visibility: 'PRIVATE' }),
+  })
+}
+
 export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {
   if (options.build) {
     await buildProcessor(false, options.targets)
   }
 
-  console.log(chalk.blue('Uploading'))
+  console.log(chalk.blue('Prepare to upload'))
 
   const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')
 
-  const url = new URL(options.host)
+  const url = new URL('/api/v1/processors', options.host)
   const apiKey = apiKeyOverride || ReadKey(options.host)
 
   const isProd = options.host === 'https://app.sentio.xyz'
@@ -41,46 +53,72 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
   hash.update(content)
   const digest = hash.digest('hex')
 
-  const data = new FormData()
-  data.append('attachment', fs.createReadStream(PROCESSOR_FILE))
-  data.append('sha256', digest)
+  const upload = async () => {
+    const data = new FormData()
+    data.append('attachment', fs.createReadStream(PROCESSOR_FILE))
+    data.append('sha256', digest)
 
-  let commitSha
-  try {
-    commitSha = execSync('git rev-parse HEAD').toString().trim()
-    data.append('commitSha', commitSha)
-  } catch (e) {
-    chalk.yellow(e)
-  }
-  try {
-    const gitUrl = execSync('git remote get-url origin').toString().trim()
-    data.append('gitUrl', gitUrl)
-  } catch (e) {
-    // skip errors
-  }
+    let commitSha = ''
+    try {
+      commitSha = execSync('git rev-parse HEAD').toString().trim()
+      data.append('commitSha', commitSha)
+    } catch (e) {
+      chalk.yellow(e)
+    }
+    try {
+      const gitUrl = execSync('git remote get-url origin').toString().trim()
+      data.append('gitUrl', gitUrl)
+    } catch (e) {
+      // skip errors
+    }
+    console.log(chalk.blue('Uploading'))
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: {
+        'api-key': apiKey,
+        project: options.project,
+        version: getCliVersion(),
+      },
+      body: data,
+    })
 
-  url.pathname = '/api/v1/processors'
+    if (res.ok) {
+      console.log(chalk.green('Upload success: '))
+      console.log('\t', chalk.blue('sha256:'), digest)
+      if (commitSha) {
+        console.log('\t', chalk.blue('Git commit SHA:'), commitSha)
+      }
+      const { ProjectSlug } = await res.json()
+      console.log('\t', chalk.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`)
+    } else {
+      console.error(chalk.red('Upload Failed'))
+      console.error(chalk.red(await res.text()))
 
-  const res = await fetch(url, {
-    method: 'POST',
-    headers: {
-      'api-key': apiKey,
-      project: options.project,
-      version: getCliVersion(),
-    },
-    body: data,
-  })
+      if (res.status === 404) {
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout,
+        })
 
-  if (res.ok) {
-    console.log(chalk.green('Upload success: '))
-    console.log('\t', chalk.blue('sha256:'), digest)
-    if (commitSha) {
-      console.log('\t', chalk.blue('Git commit SHA:'), commitSha)
+        const prompt = async () => {
+          const answer: string = await new Promise((resolve) =>
+            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)
+          )
+          if (['y', 'yes'].includes(answer.toLowerCase())) {
+            rl.close()
+            await createProject(options, apiKey)
+            console.log(chalk.green('Project created'))
+            await upload()
+          } else if (['n', 'no'].includes(answer.toLowerCase())) {
+            rl.close()
+          } else {
+            await prompt()
+          }
+        }
+        await prompt()
+      }
     }
-    const { ProjectSlug } = await res.json()
-    console.log('\t', chalk.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`)
-  } else {
-    console.error(chalk.red('Upload Failed'))
-    console.error(chalk.red(await res.text()))
   }
+
+  await upload()
 }

package/src/gen/processor/protos/processor.ts

@@ -194,6 +194,7 @@ export interface ProcessTracesResponse {
 }
 
 export interface ProcessTransactionsRequest {
+  chainId: string;
   transactions: RawTransaction[];
 }
 
@@ -236,9 +237,9 @@ export interface RawTrace {
 }
 
 export interface RawTransaction {
-  txHash: string;
   raw: Uint8Array;
-  programAccountId: string;
+  programAccountId?: string | undefined;
+  slot?: Long | undefined;
 }
 
 export interface Instruction {
@@ -1627,7 +1628,7 @@ export const ProcessTracesResponse = {
 };
 
 function createBaseProcessTransactionsRequest(): ProcessTransactionsRequest {
-  return { transactions: [] };
+  return { chainId: "", transactions: [] };
 }
 
 export const ProcessTransactionsRequest = {
@@ -1635,8 +1636,11 @@ export const ProcessTransactionsRequest = {
     message: ProcessTransactionsRequest,
     writer: _m0.Writer = _m0.Writer.create()
   ): _m0.Writer {
+    if (message.chainId !== "") {
+      writer.uint32(10).string(message.chainId);
+    }
     for (const v of message.transactions) {
-      RawTransaction.encode(v!, writer.uint32(10).fork()).ldelim();
+      RawTransaction.encode(v!, writer.uint32(18).fork()).ldelim();
     }
     return writer;
   },
@@ -1652,6 +1656,9 @@ export const ProcessTransactionsRequest = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
+          message.chainId = reader.string();
+          break;
+        case 2:
           message.transactions.push(
             RawTransaction.decode(reader, reader.uint32())
           );
@@ -1666,6 +1673,7 @@ export const ProcessTransactionsRequest = {
 
   fromJSON(object: any): ProcessTransactionsRequest {
     return {
+      chainId: isSet(object.chainId) ? String(object.chainId) : "",
       transactions: Array.isArray(object?.transactions)
         ? object.transactions.map((e: any) => RawTransaction.fromJSON(e))
         : [],
@@ -1674,6 +1682,7 @@ export const ProcessTransactionsRequest = {
 
   toJSON(message: ProcessTransactionsRequest): unknown {
     const obj: any = {};
+    message.chainId !== undefined && (obj.chainId = message.chainId);
     if (message.transactions) {
       obj.transactions = message.transactions.map((e) =>
         e ? RawTransaction.toJSON(e) : undefined
@@ -1688,6 +1697,7 @@ export const ProcessTransactionsRequest = {
     object: DeepPartial<ProcessTransactionsRequest>
   ): ProcessTransactionsRequest {
     const message = createBaseProcessTransactionsRequest();
+    message.chainId = object.chainId ?? "";
     message.transactions =
       object.transactions?.map((e) => RawTransaction.fromPartial(e)) || [];
     return message;
@@ -2266,7 +2276,11 @@ export const RawTrace = {
 };
 
 function createBaseRawTransaction(): RawTransaction {
-  return { txHash: "", raw: new Uint8Array(), programAccountId: "" };
+  return {
+    raw: new Uint8Array(),
+    programAccountId: undefined,
+    slot: undefined,
+  };
 }
 
 export const RawTransaction = {
@@ -2274,14 +2288,14 @@ export const RawTransaction = {
     message: RawTransaction,
     writer: _m0.Writer = _m0.Writer.create()
   ): _m0.Writer {
-    if (message.txHash !== "") {
-      writer.uint32(10).string(message.txHash);
-    }
     if (message.raw.length !== 0) {
-      writer.uint32(18).bytes(message.raw);
+      writer.uint32(10).bytes(message.raw);
     }
-    if (message.programAccountId !== "") {
-      writer.uint32(26).string(message.programAccountId);
+    if (message.programAccountId !== undefined) {
+      writer.uint32(18).string(message.programAccountId);
+    }
+    if (message.slot !== undefined) {
+      writer.uint32(24).uint64(message.slot);
     }
     return writer;
   },
@@ -2294,13 +2308,13 @@ export const RawTransaction = {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          message.txHash = reader.string();
+          message.raw = reader.bytes();
           break;
         case 2:
-          message.raw = reader.bytes();
+          message.programAccountId = reader.string();
           break;
         case 3:
-          message.programAccountId = reader.string();
+          message.slot = reader.uint64() as Long;
           break;
         default:
           reader.skipType(tag & 7);
@@ -2312,31 +2326,35 @@ export const RawTransaction = {
 
   fromJSON(object: any): RawTransaction {
     return {
-      txHash: isSet(object.txHash) ? String(object.txHash) : "",
       raw: isSet(object.raw) ? bytesFromBase64(object.raw) : new Uint8Array(),
       programAccountId: isSet(object.programAccountId)
         ? String(object.programAccountId)
-        : "",
+        : undefined,
+      slot: isSet(object.slot) ? Long.fromValue(object.slot) : undefined,
     };
   },
 
   toJSON(message: RawTransaction): unknown {
     const obj: any = {};
-    message.txHash !== undefined && (obj.txHash = message.txHash);
     message.raw !== undefined &&
       (obj.raw = base64FromBytes(
         message.raw !== undefined ? message.raw : new Uint8Array()
       ));
     message.programAccountId !== undefined &&
       (obj.programAccountId = message.programAccountId);
+    message.slot !== undefined &&
+      (obj.slot = (message.slot || undefined).toString());
     return obj;
   },
 
   fromPartial(object: DeepPartial<RawTransaction>): RawTransaction {
     const message = createBaseRawTransaction();
-    message.txHash = object.txHash ?? "";
     message.raw = object.raw ?? new Uint8Array();
-    message.programAccountId = object.programAccountId ?? "";
+    message.programAccountId = object.programAccountId ?? undefined;
+    message.slot =
+      object.slot !== undefined && object.slot !== null
+        ? Long.fromValue(object.slot)
+        : undefined;
     return message;
   },
 };