@thalalabs/surf 0.0.16 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @thalalabs/surf
 
+## 1.0.0
+
+### Major Changes
+
+- da2d29f: Use Aptos ts-sdk v2
+
 ## 0.0.16
 
 ### Patch Changes

package/README.md

@@ -33,19 +33,17 @@
 ## Overview
 
 ```TypeScript
-const client = createClient({
-    nodeUrl: 'https://fullnode.testnet.aptoslabs.com/v1',
-});
+const client = createSurfClient(new Aptos());
 
-await client.useABI(COIN_ABI).entry.transfer({
-    arguments: ['0x1', 1],
-    type_arguments: ['0x1::aptos_coin::AptosCoin'],
-    account,
+const result = await client.useABI(COIN_ABI).entry.transfer({
+  functionArguments: ['0x1', 1],
+  typeArguments: ['0x1::aptos_coin::AptosCoin'],
+  account: Account.fromPrivateKey(...),
 });
 
 const [balance] = await client.useABI(COIN_ABI).view.balance({
-    arguments: ['0x1'],
-    type_arguments: ['0x1::aptos_coin::AptosCoin'],
+  functionArguments: ['0x1'],
+  typeArguments: ['0x1::aptos_coin::AptosCoin'],
 });
 ```
 
@@ -58,21 +56,22 @@ When you input `client.useABI(COIN_ABI).view.` into your IDE, the auto-completio
 ### Installation
 
 ```shell
-npm i @thalalabs/surf aptos
+npm i @thalalabs/surf @aptos-labs/ts-sdk
 ```
 
-If you want to use the React Hooks, install the `@aptos-labs/wallet-adapter-react` additionally. Those React Hooks will be moved to a separate package in near future.
+If you want to use the React Hooks, install the `@aptos-labs/wallet-adapter-react@^2.0.0` additionally. Those React Hooks will be moved to a separate package in near future.
 
 ### Start
 
 Create the client:
 
 ```TypeScript
-import { createClient } from '@thalalabs/surf';
+import { createSurfClient } from '@thalalabs/surf';
+import { Aptos, Network, AptosConfig } from '@aptos-labs/ts-sdk';
 
-const client = createClient({
-    nodeUrl: 'https://fullnode.testnet.aptoslabs.com/v1',
-});
+const client = createSurfClient(new Aptos(
+  new AptosConfig({ network: Network.TESTNET })
+));
 ```
 
 Surf infers types from ABI to give you the end-to-end type-safety from your Move contract to your frontend. So firstly, you need to prepare the ABI json object of your contract in TypeScript (You can get ABI from Aptos Explorer, for example: [0x1::coin](https://explorer.aptoslabs.com/account/0x1/modules/code/coin?network=testnet)):
@@ -90,22 +89,22 @@ There are two ways to call a view function with the client:
 ```typescript
 // Option 1. Use the `useABI` interface
 const [balance] = await client.useABI(COIN_ABI).view.balance({
-  arguments: ['0x1'],
-  type_arguments: ['0x1::aptos_coin::AptosCoin'],
-  ledger_version: '562606728', // ledger_version is optional
+  functionArguments: ['0x1'],
+  typeArguments: ['0x1::aptos_coin::AptosCoin'],
+  ledgerVersion: '562606728', // ledger_version is optional
 });
 
 // Option 2. Create payload and use the `view` interface
 import { createViewPayload } from '@thalalabs/surf';
-const viewPayload = createViewPayload(COIN_ABI, {
+const payload = createViewPayload(COIN_ABI, {
   function: 'balance',
-  arguments: ['0x1'],
-  type_arguments: ['0x1::aptos_coin::AptosCoin'],
+  functionArguments: ['0x1'],
+  typeArguments: ['0x1::aptos_coin::AptosCoin'],
+});
+const [balance] = await client.view({
+  payload,
+  options: { ledgerVersion: '562606728' }, // ledger_version is optional
 });
-const [balance] = await client.view(
-  viewPayload,
-  { ledger_version: '562606728' }, // ledger_version is optional
-);
 ```
 
 Both of the interfaces can provide type safety.
@@ -122,23 +121,22 @@ const account = /* your AptosAccount */;
 
 // Option 1. Use the `useABI` interface
 const { hash } = await client.useABI(COIN_ABI).entry.transfer({
-    arguments: ['0x1', 1],
-    type_arguments: ['0x1::aptos_coin::AptosCoin'],
+    functionArguments: ['0x1', 1],
+    typeArguments: ['0x1::aptos_coin::AptosCoin'],
     account,
 });
 
 // Option 2. Create payload and use the `submitTransaction` interface
 import { createEntryPayload } from "@thalalabs/surf";
-const entryPayload = createEntryPayload(COIN_ABI, {
-    function: 'transfer',
-    arguments: ['0x1', 1],
-    type_arguments: ['0x1::aptos_coin::AptosCoin'],
+const payload = createEntryPayload(COIN_ABI, {
+  function: 'transfer',
+  functionArguments: ['0x1', 1],
+  typeArguments: ['0x1::aptos_coin::AptosCoin'],
+});
+const result = await client.submitTransaction({
+  payload,
+  signer: account,
 });
-
-const { hash } = await client.submitTransaction(
-    entryPayload,
-    { account },
-);
 ```
 
 You can also simulate a transaction:
@@ -163,10 +161,11 @@ const entryPayload = createEntryPayload(COIN_ABI, {
     type_arguments: ['0x1::aptos_coin::AptosCoin'],
 });
 
-const { hash } = await client.simulateTransaction(
-    entryPayload,
-    { account }
-);
+const { hash } = await client.simulateTransaction({
+  payload,
+  sender: account.accountAddress,
+  publicKey: account.publicKey,
+});
 ```
 
 ### Get account resource
@@ -175,9 +174,8 @@ To get account resource with type safety:
 
 ```typescript
 const { data } = await client.useABI(COIN_ABI).resource.CoinStore({
-  type_arguments: ['0x1::aptos_coin::AptosCoin'],
+  typeArguments: ['0x1::aptos_coin::AptosCoin'],
   account: '0x1',
-  ledger_version: '562606728', // ledger_version is optional
 });
 
 // Get property in the struct with type safety
@@ -192,13 +190,14 @@ Some fields of a stuct may reference external modules.To inference the type of a
 
 ```TypeScript
 import { DefaultABITable } from "@thalalabs/surf";
+import { createSurfClient } from '@thalalabs/surf';
+import { Aptos } from '@aptos-labs/ts-sdk';
+
 type ABITAble = DefaultABITable & {
     '0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9::fixed_point64': typeof FIXED_POINT64_ABI,
 };
 
-const client = createClient<ABITAble>({
-nodeUrl: 'https://fullnode.mainnet.aptoslabs.com/v1',
-});
+const client = createSurfClient<ABITAble>(new Aptos());
 ```
 
 With this customized `ABITAble`, Surf can inference the struct from `0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9::fixed_point64`.

package/build/cjs/core/Client.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Client = exports.createClient = void 0;
-const aptos_1 = require("aptos");
+exports.Client = exports.createSurfClient = void 0;
 const createViewPayload_js_1 = require("./createViewPayload.js");
 const createEntryPayload_js_1 = require("./createEntryPayload.js");
-function createClient(options) {
-    return new Client(new aptos_1.AptosClient(options.nodeUrl));
+function createSurfClient(aptosClient) {
+    return new Client(aptosClient);
 }
-exports.createClient = createClient;
+exports.createSurfClient = createSurfClient;
 class Client {
     constructor(client) {
         Object.defineProperty(this, "client", {
@@ -18,27 +17,32 @@ class Client {
         });
         this.client = client;
     }
-    async view(payload, options) {
-        const result = await this.client.view(payload.viewRequest, options?.ledger_version);
-        return result.map((value, i) => payload.decoders[i] ? payload.decoders[i](value) : value);
+    async view(args) {
+        return await this.client.view(args);
     }
-    async submitTransaction(payload, options) {
-        const rawTxn = await this.generateRawTxn(payload, options);
-        const bcsTxn = aptos_1.AptosClient.generateBCSTransaction(options.account, rawTxn);
-        const transactionRes = await this.client.submitSignedBCSTransaction(bcsTxn);
-        await this.client.waitForTransaction(transactionRes.hash, {
-            timeoutSecs: 120,
-            checkSuccess: true,
+    async submitTransaction(args) {
+        const transaction = await this.client.build.transaction({
+            sender: args.signer.accountAddress.toString(),
+            data: args.payload,
+        });
+        const transactionRes = await this.client.signAndSubmitTransaction({
+            signer: args.signer,
+            transaction,
+        });
+        return await this.client.waitForTransaction({
+            transactionHash: transactionRes.hash,
+            options: args.options ?? {},
         });
-        return transactionRes;
     }
-    async simulateTransaction(payload, options) {
-        const rawTxn = await this.generateRawTxn(payload, options);
-        const transactionRes = (await this.client.simulateTransaction(options.account, rawTxn))[0];
-        if (!transactionRes) {
-            throw new Error('Failed to simulate transaction');
-        }
-        return transactionRes;
+    async simulateTransaction(args) {
+        const transaction = await this.client.build.transaction({
+            sender: args.sender,
+            data: args.payload,
+        });
+        return (await this.client.simulate.transaction({
+            signerPublicKey: args.publicKey,
+            transaction,
+        }))[0];
     }
     useABI(abi) {
         return {
@@ -48,11 +52,14 @@ class Client {
                     return (...args) => {
                         const payload = (0, createViewPayload_js_1.createViewPayload)(abi, {
                             function: functionName,
-                            type_arguments: args[0].type_arguments,
-                            arguments: args[0].arguments,
+                            typeArguments: args[0].typeArguments,
+                            functionArguments: args[0].functionArguments,
                         });
-                        return this.view(payload, {
-                            ledger_version: args[0].ledger_version,
+                        return this.view({
+                            payload,
+                            options: {
+                                ledgerVersion: args[0].ledgerVersion,
+                            }
                         });
                     };
                 },
@@ -63,12 +70,20 @@ class Client {
                     return (...args) => {
                         const payload = (0, createEntryPayload_js_1.createEntryPayload)(abi, {
                             function: functionName,
-                            type_arguments: args[0].type_arguments,
-                            arguments: args[0].arguments,
+                            typeArguments: args[0].typeArguments,
+                            functionArguments: args[0].functionArguments,
                         });
+                        const account = args[0].account;
                         return args[0].isSimulation
-                            ? this.simulateTransaction(payload, { account: args[0].account })
-                            : this.submitTransaction(payload, { account: args[0].account });
+                            ? this.simulateTransaction({
+                                publicKey: account.publicKey,
+                                sender: account.accountAddress.toString(),
+                                payload,
+                            })
+                            : this.submitTransaction({
+                                signer: args[0].account,
+                                payload,
+                            });
                     };
                 },
             }),
@@ -76,23 +91,22 @@ class Client {
                 get: (_, prop) => {
                     let structName = prop.toString();
                     return (...args) => {
-                        if (args[0].type_arguments.length !== 0) {
-                            structName += `<${args[0].type_arguments.join(',')}>`;
+                        if (args[0].typeArguments.length !== 0) {
+                            structName += `<${args[0].typeArguments.join(',')}>`;
                         }
-                        return this.client.getAccountResource(args[0].account, `${abi.address}::${abi.name}::${structName}`, {
-                            ledgerVersion: args[0].ledger_version,
+                        const account = args[0].account;
+                        return this.client.getAccountResource({
+                            accountAddress: account,
+                            resourceType: `${abi.address}::${abi.name}::${structName}`,
+                            options: {
+                                ledgerVersion: args[0].ledgerVersion,
+                            }
                         });
                     };
                 },
             }),
         };
     }
-    async generateRawTxn(payload, options) {
-        const { account } = options;
-        const entryFunctionPayload = new aptos_1.TxnBuilderTypes.TransactionPayloadEntryFunction(payload.entryRequest);
-        const rawTxn = await this.client.generateRawTransaction(account.address(), entryFunctionPayload);
-        return rawTxn;
-    }
 }
 exports.Client = Client;
 //# sourceMappingURL=Client.js.map

package/build/cjs/core/Client.js.map

@@ -1 +1 @@
-{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../src/core/Client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../src/core/Client.ts"],"names":[],"mappings":"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"}

package/build/cjs/core/WalletClient.js

@@ -1,46 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WalletClient = void 0;
-const aptos_1 = require("aptos");
 const createEntryPayload_js_1 = require("./createEntryPayload.js");
 class WalletClient {
-    constructor({ wallet, nodeUrl }) {
+    constructor({ wallet }) {
         Object.defineProperty(this, "wallet", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "client", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.wallet = wallet;
-        this.client = new aptos_1.AptosClient(nodeUrl);
     }
-    async submitTransaction(payload, _ = undefined) {
-        const request = payload.rawPayload;
-        const { hash } = await this.wallet.signAndSubmitTransaction({
-            type: 'entry_function_payload',
-            ...request,
-            arguments: request.arguments.map((arg) => {
-                if (Array.isArray(arg)) {
-                    return arg.map((item) => item.toString());
-                }
-                else if (typeof arg === 'object') {
-                    throw new Error(`a value of struct type: ${arg} is not supported`);
-                }
-                else {
-                    return arg.toString();
-                }
-            }),
+    async submitTransaction(payload) {
+        return await this.wallet.signAndSubmitTransaction({
+            sender: this.wallet.account?.address ?? "",
+            data: {
+                ...payload,
+                functionArguments: payload.functionArguments.map((arg) => {
+                    if (Array.isArray(arg)) {
+                        return arg.map((item) => item.toString());
+                    }
+                    else if (typeof arg === 'object') {
+                        throw new Error(`a value of struct type: ${arg} is not supported`);
+                    }
+                    else {
+                        return arg.toString();
+                    }
+                }),
+            }
         });
-        const result = (await this.client.waitForTransactionWithResult(hash, {
-            checkSuccess: true,
-        }));
-        return result;
     }
     useABI(abi) {
         return new Proxy({}, {
@@ -49,8 +38,8 @@ class WalletClient {
                 return (...args) => {
                     const payload = (0, createEntryPayload_js_1.createEntryPayload)(abi, {
                         function: functionName,
-                        type_arguments: args[0].type_arguments,
-                        arguments: args[0].arguments,
+                        typeArguments: args[0].type_arguments,
+                        functionArguments: args[0].arguments,
                     });
                     return this.submitTransaction(payload);
                 };

package/build/cjs/core/WalletClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"WalletClient.js","sourceRoot":"","sources":["../../../src/core/WalletClient.ts"],"names":[],"mappings":";;;AACA,iCAA2C;AAC3C,mEAA6D;AAW7D,MAAa,YAAY;IAIvB,YAAY,EAAE,MAAM,EAAE,OAAO,EAAuC;QAH5D;;;;;WAAe;QACf;;;;;WAAoB;QAG1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,mBAAW,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,OAAqB,EACrB,IAA8B,SAAS;QAEvC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;QAGnC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAC1D,IAAI,EAAE,wBAAwB;YAC9B,GAAG,OAAO;YACV,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBAEtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;iBAChD;qBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,mBAAmB,CAAC,CAAC;iBACpE;qBAAM;oBACL,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;iBACvB;YACH,CAAC,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,IAAI,EAAE;YACnE,YAAY,EAAE,IAAI;SACnB,CAAC,CAAsC,CAAC;QAEzC,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAoB,GAAM;QACrC,OAAO,IAAI,KAAK,CAAC,EAAwB,EAAE;YACzC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;gBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;oBACjB,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAAC,GAAG,EAAE;wBACtC,QAAQ,EAAE,YAAY;wBACtB,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;wBACtC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;qBAC7B,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF;AArDD,oCAqDC"}
+{"version":3,"file":"WalletClient.js","sourceRoot":"","sources":["../../../src/core/WalletClient.ts"],"names":[],"mappings":";;;AACA,mEAA6D;AAS7D,MAAa,YAAY;IAGvB,YAAY,EAAE,MAAM,EAAuB;QAFnC;;;;;WAAe;QAGrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,OAAqB;QAIrB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAChD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE;YAC1C,IAAI,EAAE;gBACJ,GAAG,OAAO;gBAEV,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;oBAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBAEtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;qBAChD;yBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,mBAAmB,CAAC,CAAC;qBACpE;yBAAM;wBACL,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;qBACvB;gBACH,CAAC,CAAC;aACH;SACF,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAoB,GAAM;QACrC,OAAO,IAAI,KAAK,CAAC,EAAwB,EAAE;YACzC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;gBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;oBACjB,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAAC,GAAG,EAAE;wBACtC,QAAQ,EAAE,YAAY;wBACtB,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;wBACrC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;qBACrC,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF;AA9CD,oCA8CC"}

package/build/cjs/core/createEntryPayload.js

@@ -1,108 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEntryPayload = void 0;
-const aptos_1 = require("aptos");
-const ensureTypes_js_1 = require("../ensureTypes.js");
 function createEntryPayload(abi, payload) {
     const fnAbi = abi.exposed_functions.filter((f) => f.name === payload.function)[0];
-    const typeArguments = payload.type_arguments;
-    const valArguments = payload.arguments;
+    if (fnAbi === undefined)
+        throw new Error(`Function ${payload.function} not found in ABI`);
+    const typeArguments = payload.typeArguments;
+    const valArguments = payload.functionArguments;
     const abiArgs = fnAbi.params[0] === '&signer'
         ? fnAbi.params.slice(1)
         : fnAbi.params;
     if (fnAbi === undefined)
         throw new Error(`Function ${payload.function} not found in ABI`);
     if (abiArgs.length !== valArguments.length)
-        throw new Error(`Function ${payload.function} expects ${fnAbi.params.length} arguments, but ${payload.arguments.length} were provided`);
+        throw new Error(`Function ${payload.function} expects ${fnAbi.params.length} arguments, but ${payload.functionArguments.length} were provided`);
     if (fnAbi.generic_type_params.length !== typeArguments.length)
-        throw new Error(`Function ${payload.function} expects ${fnAbi.generic_type_params.length} type arguments, but ${payload.type_arguments.length} were provided`);
+        throw new Error(`Function ${payload.function} expects ${fnAbi.generic_type_params.length} type arguments, but ${payload.typeArguments.length} were provided`);
     return {
-        rawPayload: {
-            ...payload,
-            function: `${abi.address}::${abi.name}::${payload.function}`,
-        },
-        entryRequest: aptos_1.TxnBuilderTypes.EntryFunction.natural(`${abi.address}::${abi.name}`, payload.function, typeArguments
-            .map((arg) => {
-            const typeTagStruct = new aptos_1.TypeTagParser(arg).parseTypeTag();
-            return new aptos_1.TxnBuilderTypes.TypeTagStruct(new aptos_1.TxnBuilderTypes.StructTag(typeTagStruct.value.address, typeTagStruct.value.module_name, typeTagStruct.value.name, typeTagStruct.value.type_args));
-        }), valArguments.map((arg, i) => {
-            const type = abiArgs[i];
-            const serializer = new aptos_1.BCS.Serializer();
-            argToBCS(type, arg, serializer);
-            return serializer.getBytes();
-        })),
+        typeArguments: payload.typeArguments,
+        functionArguments: payload.functionArguments,
+        function: `${abi.address}::${abi.name}::${payload.function}`,
     };
 }
 exports.createEntryPayload = createEntryPayload;
-function argToBCS(type, arg, serializer) {
-    const vectorRegex = /vector<([^]+)>/;
-    const vectorMatch = type.match(vectorRegex);
-    if (vectorMatch) {
-        const innerType = vectorMatch[1];
-        if (innerType === 'u8') {
-            if (arg instanceof Uint8Array) {
-                serializer.serializeBytes(arg);
-                return;
-            }
-            if (typeof arg === 'string') {
-                serializer.serializeStr(arg);
-                return;
-            }
-        }
-        if (!Array.isArray(arg)) {
-            throw new Error('Invalid vector args.');
-        }
-        serializer.serializeU32AsUleb128(arg.length);
-        arg.forEach((arg) => argToBCS(innerType, arg, serializer));
-        return;
-    }
-    const objectRegex = /0x1::object::Object<([^]+)>/;
-    const objectMatch = type.match(objectRegex);
-    if (objectMatch) {
-        aptos_1.TxnBuilderTypes.AccountAddress.fromHex(arg).serialize(serializer);
-        return;
-    }
-    const optionRegex = /0x1::option::Option<([^]+)>/;
-    const optionMatch = type.match(optionRegex);
-    if (optionMatch) {
-        const innerType = optionMatch[1];
-        serializer.serializeU32AsUleb128(arg.length);
-        if (!(arg instanceof Array) || arg.length > 1) {
-            throw new Error('Invalid input value for 0x1::option::Option.');
-        }
-        arg.forEach((arg) => argToBCS(innerType, arg, serializer));
-        return;
-    }
-    switch (type) {
-        case 'bool':
-            serializer.serializeBool((0, ensureTypes_js_1.ensureBoolean)(arg));
-            break;
-        case 'address':
-            aptos_1.TxnBuilderTypes.AccountAddress.fromHex(arg).serialize(serializer);
-            break;
-        case 'u8':
-            serializer.serializeU8((0, ensureTypes_js_1.ensureNumber)(arg));
-            break;
-        case 'u16':
-            serializer.serializeU16((0, ensureTypes_js_1.ensureNumber)(arg));
-            break;
-        case 'u32':
-            serializer.serializeU32((0, ensureTypes_js_1.ensureNumber)(arg));
-            break;
-        case 'u64':
-            serializer.serializeU64((0, ensureTypes_js_1.ensureBigInt)(arg));
-            break;
-        case 'u128':
-            serializer.serializeU128((0, ensureTypes_js_1.ensureBigInt)(arg));
-            break;
-        case 'u256':
-            serializer.serializeU256((0, ensureTypes_js_1.ensureBigInt)(arg));
-            break;
-        case '0x1::string::String':
-            serializer.serializeStr(arg);
-            break;
-        default:
-            throw new Error(`type "${type}" not supported`);
-    }
-}
 //# sourceMappingURL=createEntryPayload.js.map

package/build/cjs/core/createEntryPayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"createEntryPayload.js","sourceRoot":"","sources":["../../../src/core/createEntryPayload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createEntryPayload.js","sourceRoot":"","sources":["../../../src/core/createEntryPayload.ts"],"names":[],"mappings":";;;AA2BA,SAAgB,kBAAkB,CAGhC,GAAM,EAAE,OAA0C;IAClD,MAAM,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,CACnC,CAAC,CAAC,CAAC,CAAC;IAEL,IAAI,KAAK,KAAK,SAAS;QACrB,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,QAAQ,mBAAmB,CAAC,CAAC;IAGnE,MAAM,aAAa,GAAa,OAAO,CAAC,aAAsB,CAAC;IAG/D,MAAM,YAAY,GAAU,OAAO,CAAC,iBAA0B,CAAC;IAC/D,MAAM,OAAO,GACX,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS;QAC3B,CAAC,CAAE,KAAK,CAAC,MAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrC,CAAC,CAAE,KAAK,CAAC,MAAmB,CAAC;IAGjC,IAAI,KAAK,KAAK,SAAS;QACrB,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,QAAQ,mBAAmB,CAAC,CAAC;IACnE,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM;QACxC,MAAM,IAAI,KAAK,CACb,YAAY,OAAO,CAAC,QAAQ,YAAY,KAAK,CAAC,MAAM,CAAC,MAAM,mBAAmB,OAAO,CAAC,iBAAiB,CAAC,MAAM,gBAAgB,CAC/H,CAAC;IACJ,IAAI,KAAK,CAAC,mBAAmB,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM;QAC3D,MAAM,IAAI,KAAK,CACb,YAAY,OAAO,CAAC,QAAQ,YAAY,KAAK,CAAC,mBAAmB,CAAC,MAAM,wBAAwB,OAAO,CAAC,aAAa,CAAC,MAAM,gBAAgB,CAC7I,CAAC;IAEJ,OAAO;QACL,aAAa,EAAE,OAAO,CAAC,aAAa;QAEpC,iBAAiB,EAAE,OAAO,CAAC,iBAAwB;QACnD,QAAQ,EAAE,GAAG,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE;KAC7D,CAAC;AACJ,CAAC;AAvCD,gDAuCC"}