@sentio/sdk 1.27.1 → 1.27.3

package/src/aptos-codegen/codegen.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import prettier from 'prettier'
 import { MoveFunction, MoveModule, MoveModuleBytecode, MoveStruct } from 'aptos-sdk/src/generated'
 import { AccountModulesImportInfo, AccountRegister, generateType, parseMoveType } from './typegen'
-import { isFrameworkAccount, moduleQname, SPLITTER } from '../aptos/utils'
+import { getMeaningfulFunctionParams, isFrameworkAccount, moduleQname, SPLITTER } from '../aptos/utils'
 import chalk from 'chalk'
 import { AptosNetwork, getChainName, getRpcClient } from '../aptos/network'
 
@@ -292,18 +292,18 @@ function generateStructs(module: MoveModule, struct: MoveStruct, events: Set<str
   `
 }
 
-// function generateFunctionTypeParameters(func: MoveFunction) {
-//   let genericString = ''
-//   if (func.generic_type_params && func.generic_type_params.length > 0) {
-//     const params = func.generic_type_params
-//       .map((v, idx) => {
-//         return 'T' + idx
-//       })
-//       .join(',')
-//     genericString = `<${params}>`
-//   }
-//   return genericString
-// }
+function generateFunctionTypeParameters(func: MoveFunction) {
+  let genericString = ''
+  if (func.generic_type_params && func.generic_type_params.length > 0) {
+    const params = func.generic_type_params
+      .map((v, idx) => {
+        return `T${idx}=any`
+      })
+      .join(',')
+    genericString = `<${params}>`
+  }
+  return genericString
+}
 
 function generateStructTypeParameters(struct: MoveStruct, useAny = false) {
   let genericString = ''
@@ -324,22 +324,15 @@ function generateCallArgsStructs(module: MoveModule, func: MoveFunction) {
     return
   }
 
-  // the first param is always signer so ignore
-  // TODO check if there is any edge case
-  let params = func.params
-  if (func.params[0] === '&signer') {
-    params = params.slice(1)
-  }
-
-  const fields = params.map((param) => {
+  const fields = getMeaningfulFunctionParams(func).map((param) => {
     return `${generateType(param)}`
   })
 
   const camelFuncName = capitalizeFirstChar(camelize(func.name))
 
-  // const genericString = generateFunctionTypeParameters(func)
+  const genericString = generateFunctionTypeParameters(func)
   return `
-  export interface ${camelFuncName}Payload
+  export interface ${camelFuncName}Payload${genericString}
       extends aptos.TypedEntryFunctionPayload<[${fields.join(',')}]> {
     arguments_typed: [${fields.join(',')}],
     type_arguments: [${func.generic_type_params.map((_) => 'string').join(', ')}]

package/src/builtin/aptos/0x1.ts

@@ -281,25 +281,25 @@ export namespace coin {
     type_arguments: [];
   }
 
-  export interface FreezeCoinStorePayload
+  export interface FreezeCoinStorePayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[Address, Address]> {
     arguments_typed: [Address, Address];
     type_arguments: [string];
   }
 
-  export interface TransferPayload
+  export interface TransferPayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[Address, bigint]> {
     arguments_typed: [Address, bigint];
     type_arguments: [string];
   }
 
-  export interface UnfreezeCoinStorePayload
+  export interface UnfreezeCoinStorePayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[Address, Address]> {
     arguments_typed: [Address, Address];
     type_arguments: [string];
   }
 
-  export interface UpgradeSupplyPayload
+  export interface UpgradeSupplyPayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[]> {
     arguments_typed: [];
     type_arguments: [string];
@@ -2767,25 +2767,26 @@ export namespace managed_coin {
     mint_cap: coin.MintCapability<T0>;
   }
 
-  export interface BurnPayload
+  export interface BurnPayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[bigint]> {
     arguments_typed: [bigint];
     type_arguments: [string];
   }
 
-  export interface InitializePayload
+  export interface InitializePayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[string, string, number, Boolean]> {
     arguments_typed: [string, string, number, Boolean];
     type_arguments: [string];
   }
 
-  export interface MintPayload
+  export interface MintPayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<[Address, bigint]> {
     arguments_typed: [Address, bigint];
     type_arguments: [string];
   }
 
-  export interface RegisterPayload extends aptos.TypedEntryFunctionPayload<[]> {
+  export interface RegisterPayload<T0 = any>
+    extends aptos.TypedEntryFunctionPayload<[]> {
     arguments_typed: [];
     type_arguments: [string];
   }

package/src/builtin/aptos/0x3.ts

@@ -666,7 +666,7 @@ export namespace token_coin_swap {
     type_arguments: [];
   }
 
-  export interface ListTokenForSwapPayload
+  export interface ListTokenForSwapPayload<T0 = any>
     extends aptos.TypedEntryFunctionPayload<
       [Address, string, string, bigint, bigint, bigint, bigint]
     > {

package/src/cli/upload.ts

@@ -53,6 +53,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
   hash.update(content)
   const digest = hash.digest('hex')
 
+  let triedCount = 0
   const upload = async () => {
     const data = new FormData()
     data.append('attachment', fs.createReadStream(PROCESSOR_FILE))
@@ -71,7 +72,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     } catch (e) {
       // skip errors
     }
-    console.log(chalk.blue('Uploading'))
+    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))
     const res = await fetch(url, {
       method: 'POST',
       headers: {
@@ -125,5 +126,19 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     }
   }
 
-  await upload()
+  const tryUploading = async () => {
+    if (triedCount++ >= 5) {
+      return
+    }
+    try {
+      await upload()
+    } catch (e) {
+      console.log(e)
+      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {
+        await tryUploading()
+      }
+    }
+  }
+
+  await tryUploading()
 }