Update payload to adapt new aptos transaction payload interface

Author: robbinh

typescript/package.json

@@ -26,7 +26,7 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "aptos": "^1.3.7",
+    "aptos": "^1.3.10",
     "big-integer": "^1.6.51",
     "elliptic": "^6.5.4",
     "json-stable-stringify": "^1.0.1",

typescript/src/builtinFuncs.ts

@@ -5,6 +5,7 @@ import { HexString } from "aptos";
 import stringify from "json-stable-stringify";
 import { StructInfoType } from "./parserRepo";
 import { ActualStringClass } from "./nativeFuncs";
+import { AccountAddress } from "aptos/dist/transaction_builder/aptos_types";
 
 export function abortCode(code: any) {
   if (code instanceof U64) {
@@ -256,15 +257,24 @@ export function payloadArg(val: any) {
       return val.value.toString();
     }
     else {
-      throw new Error("Only expect U8, U64, or U128 for integer types");
+      throw new Error("Only expect U8, U64, or U128 for UnsignedInt types");
     }
   }
+  else if (Array.isArray(val) && val.every(v => v instanceof U8)) {
+    // For U8[]
+    return u8ArrayArg(val);
+  }
   else if (val instanceof HexString) {
     return val.toShortString();
   }
-  else if (typeof val === 'boolean') {
+  else if (['boolean', 'string', 'number', 'bigint'].includes(typeof val)) {
+    // 1. return as it is for js primitive types
+    // 2. to make sure function payloadArg is idempotent when called more than once
     return val
   }
+  else if (val instanceof AccountAddress) {
+    return val;
+  }
   else if(val.typeTag instanceof StructTag) {
     const tag = val.typeTag as StructTag;
     if (tag.address.toShortString() === '0x1' && tag.module === 'string' && tag.name === 'String') {
@@ -277,7 +287,7 @@ export function payloadArg(val: any) {
     }
   }
   else {
-    throw new Error(`Unexpected value type: ${typeof val}`);
+    throw new Error(`Unexpected value ${val}`);
   }
 }
 

typescript/src/txSender.ts

@@ -1,11 +1,9 @@
 import { AptosClient, AptosAccount, Types, TxnBuilderTypes, HexString, BCS } from "aptos";
-import { TypeTagParser } from "aptos/dist/transaction_builder/builder_utils";
-import { UserTransaction, WriteSetChange_WriteResource } from "aptos/dist/generated";
-import { AccountAddress, Identifier, ModuleId, EntryFunction } from "aptos/dist/transaction_builder/aptos_types";
+import { TransactionPayload_EntryFunctionPayload, UserTransaction, WriteSetChange_WriteResource } from "aptos/dist/generated";
 import { AptosParserRepo } from "./parserRepo";
-import { AtomicTypeTag, StructTag, TypeTag } from "./typeTag";
+import { StructTag } from "./typeTag";
 import { U128, U64, U8 } from "./builtinTypes";
-import { ActualStringClass, serializeMoveValue, serializeMoveValueWithoutTag, serializeVector } from ".";
+import { ActualStringClass, payloadArg } from ".";
 
 type AcceptedScriptFuncArgType = any[] | U8 | U64 | U128 | HexString | boolean | ActualStringClass;
 
@@ -15,22 +13,17 @@ export function buildPayload(
   funcName: string,
   typeArguments: string[],
   args: AcceptedScriptFuncArgType[],
-): TxnBuilderTypes.TransactionPayloadEntryFunction {
+): TransactionPayload_EntryFunctionPayload {
 
-  const bytes = args.map(arg => {
-    const serializer = new BCS.Serializer();
-    serializeMoveValueWithoutTag(serializer, arg);
-    return serializer.getBytes();
-  });
+  const _function = `${moduleAddress.toString()}::${moduleName}::${funcName}`;
+  const _arguments = args.map(a => payloadArg(a));
 
-  
-  const scriptFunction = new EntryFunction(
-    new ModuleId(new AccountAddress(moduleAddress.toUint8Array()), new Identifier(moduleName)),
-    new Identifier(funcName),
-    typeArguments.map(str => new TypeTagParser(str).parseTypeTag()),
-    bytes,
-  );
-  return new TxnBuilderTypes.TransactionPayloadEntryFunction(scriptFunction);
+  return {
+    type: "entry_function_payload",
+    function: _function,
+    type_arguments: typeArguments,
+    arguments: _arguments,
+  };
 }
 
 export async function sendPayloadTx(