@aptos-labs/ts-sdk 0.0.4 → 0.0.5

package/dist/esm/version.d.ts

@@ -0,0 +1,8 @@
+/**
+ * The current version of the SDK
+ *
+ * hardcoded for now, we would want to have it injected dynamically
+ */
+declare const VERSION = "0.0.4";
+
+export { VERSION };

package/dist/esm/version.mjs

@@ -0,0 +1,2 @@
+import{a}from"./chunk-FYIFBLHU.mjs";import"./chunk-XNFEUXDS.mjs";export{a as VERSION};
+//# sourceMappingURL=version.mjs.map

package/dist/esm/version.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/package.json

@@ -10,14 +10,21 @@
     "url": "https://github.com/aptos-labs/aptos-ts-sdk/issues/new/choose"
   },
   "homepage": "https://aptos-labs.github.io/aptos-ts-sdk/",
-  "main": "dist/cjs/index.js",
+  "main": "dist/common/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
     ".": {
-      "import": "./dist/esm/index.mjs",
-      "require": "./dist/cjs/index.js",
-      "types": "./dist/types/index.d.ts"
-    }
+      "source": "./src/index.ts",
+      "require": {
+        "types": "./dist/common/index.d.ts",
+        "default": "./dist/common/index.js"
+      },
+      "import": {
+        "types": "./dist/esm/index.d.mts",
+        "default": "./dist/esm/index.mjs"
+      }
+    },
+    "./package.json": "./package.json"
   },
   "files": [
     "dist",
@@ -25,11 +32,7 @@
   ],
   "scripts": {
     "build:clean": "rm -rf dist",
-    "build": "pnpm build:clean && pnpm run _build:types && pnpm _build:esm && pnpm _build:cjs && pnpm _build:browser",
-    "_build:browser": "tsup src/index.ts --platform browser --format iife --global-name aptosSDK --minify --out-dir dist/browser",
-    "_build:esm": "tsup src/index.ts --platform node --format esm --dts --out-dir dist/esm",
-    "_build:cjs": "tsup src/index.ts --platform node --format cjs --dts --out-dir dist/cjs",
-    "_build:types": "tsup src/types/index.ts --dts --out-dir dist/types",
+    "build": "pnpm build:clean && tsup",
     "_fmt": "prettier 'src/**/*.ts' 'tests/**/*.ts' 'examples/**/*.js' 'examples/**/*.ts' '.eslintrc.js'",
     "fmt": "pnpm _fmt --write",
     "lint": "eslint 'src/**/*.ts' 'tests/**/*.ts' 'examples/**/*.ts'",
@@ -72,9 +75,9 @@
     "ts-jest": "28.0.8",
     "ts-loader": "9.3.1",
     "ts-node": "10.9.1",
-    "tsup": "6.2.3",
+    "tsup": "7.2.0",
     "typedoc": "^0.23.20",
     "typescript": "4.8.2"
   },
-  "version": "0.0.4"
+  "version": "0.0.5"
 }

package/src/api/transactionSubmission.ts

@@ -95,6 +95,7 @@ export class TransactionSubmission {
    *
    * @param args.signer The signer account to sign the transaction
    * @param args.transaction An instance of a RawTransaction, plus optional secondary/fee payer addresses
+   * @param args.asFeePayer optional. If the signer is also the fee payer
    * ```
    * {
    *  rawTransaction: RawTransaction,
@@ -106,8 +107,19 @@ export class TransactionSubmission {
    * @return The signer AccountAuthenticator
    */
   /* eslint-disable class-methods-use-this */
-  signTransaction(args: { signer: Account; transaction: AnyRawTransaction }): AccountAuthenticator {
-    return signTransaction({ ...args });
+  signTransaction(args: {
+    signer: Account;
+    transaction: AnyRawTransaction;
+    asFeePayer?: boolean;
+  }): AccountAuthenticator {
+    const { signer, transaction, asFeePayer } = args;
+    if (asFeePayer) {
+      transaction.feePayerAddress = signer.accountAddress;
+    }
+    return signTransaction({
+      signer,
+      transaction,
+    });
   }
 
   /**

package/src/bcs/serializable/moveStructs.ts

@@ -68,9 +68,11 @@ export class MoveVector<T extends Serializable & EntryFunctionArgument>
    */
   serializeForScriptFunction(serializer: Serializer): void {
     // runtime check to ensure that you can't serialize anything other than vector<u8>
-    // TODO: consider adding support for MoveString later?
     const isU8 = this.values[0] instanceof U8;
-    if (!isU8) {
+    // if the inner array is length 0, we can't check the type because it has no instance, so we assume it's a u8
+    // it may not be, but we don't care because regardless of a vector's type,
+    // a zero-length vector is serialized to a single byte value: 0
+    if (!isU8 && this.values[0] !== undefined) {
       throw new Error("Script function arguments only accept u8 vectors");
     }
     serializer.serializeU32AsUleb128(ScriptTransactionArgumentVariants.U8Vector);
@@ -238,8 +240,10 @@ export class MoveString extends Serializable implements TransactionArgument {
   }
 
   serializeForScriptFunction(serializer: Serializer): void {
-    // serialize the string, load it into a vector<u8> and serialize it as a script vector<u8> argument
-    const vectorU8 = MoveVector.U8(this.bcsToBytes());
+    // Serialize the string as a fixed byte string, i.e., without the length prefix
+    const fixedStringBytes = this.bcsToBytes().slice(1);
+    // Put those bytes into a vector<u8> and serialize it as a script function argument
+    const vectorU8 = MoveVector.U8(fixedStringBytes);
     vectorU8.serializeForScriptFunction(serializer);
   }
 

package/src/client/core.ts

@@ -32,8 +32,11 @@ export async function request<Req, Res>(options: ClientRequest<Req>, client: Cli
     "content-type": contentType ?? MimeType.JSON,
   };
 
-  if (overrides?.TOKEN) {
-    headers.Authorization = `Bearer ${overrides?.TOKEN}`;
+  // TODO - auth token is being used only for faucet, it breaks full node requests.
+  // Find a more sophisticated way than that but without the need to add the
+  // auth_token on every `aptos.fundAccount()` call
+  if (overrides?.AUTH_TOKEN && url.includes("faucet")) {
+    headers.Authorization = `Bearer ${overrides?.AUTH_TOKEN}`;
   }
 
   /*
@@ -98,8 +101,7 @@ export async function aptosRequest<Req, Res>(
 
   // If it is the shape of an AptosApiError, convert it properly
   if ("message" in response.data && "error_code" in response.data) {
-    const data = response.data as { message: string; error_code: string; vm_error_code?: string };
-    errorMessage = JSON.stringify(data);
+    errorMessage = JSON.stringify(response.data);
   } else if (result.status in errors) {
     // If it's not an API type, it must come form infra, these are prehandled
     errorMessage = errors[result.status];

package/src/core/account.ts

@@ -25,11 +25,14 @@ import { AnyPublicKey } from "./crypto/anyPublicKey";
  * `SingleSender` supports `ED25519` and `Secp256k1`, and `MultiSender` supports
  * `MultiED25519`.
  *
- * In TypeScript SDK, we support all of these options
- * @generate default to generate Unified keys, with an optional `legacy` boolean argument
- * that lets you generate new keys conforming to the Legacy authentication.
+ * In TypeScript SDK, we support all of these options:
+ *
+ * @generate default to generate Legacy Ed25519 keys, with an optional `legacy` boolean argument
+ * that lets you generate new keys conforming to the Unified authentication.
+ *
  * @fromPrivateKey derives an account by a provided private key and address, with an optional
- * `legacy` boolean argument that lets you generate new keys conforming to the Legacy authentication.
+ * `legacy` boolean argument that lets you generate new keys conforming to the Unified authentication.
+ *
  * @fromDerivationPath derives an account with bip44 path and mnemonics,
  *
  */

package/src/internal/ans.ts

@@ -64,11 +64,9 @@ export function isValidANSName(name: string): { domainName: string; subdomainNam
 }
 
 export const LOCAL_ANS_ACCOUNT_PK =
-  (process.env.ANS_TEST_ACCOUNT_PRIVATE_KEY as string) ||
-  "0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
+  process.env.ANS_TEST_ACCOUNT_PRIVATE_KEY ?? "0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
 export const LOCAL_ANS_ACCOUNT_ADDRESS =
-  (process.env.ANS_TEST_ACCOUNT_ADDRESS as string) ||
-  "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
+  process.env.ANS_TEST_ACCOUNT_ADDRESS ?? "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
 
 const NetworkToAnsContract: Record<Network, string | null> = {
   [Network.TESTNET]: "0x5f8fd2347449685cf41d4db97926ec3a096eaf381332be4f1318ad4d16a8497c",

package/src/internal/event.ts

@@ -46,7 +46,7 @@ export async function getAccountEventsByEventType(args: {
 
   const whereCondition: EventsBoolExp = {
     account_address: { _eq: address },
-    type: { _eq: eventType },
+    indexed_type: { _eq: eventType },
   };
 
   const customOptions = {

package/src/internal/queries/getEvents.graphql

@@ -8,5 +8,6 @@ query getEvents($where_condition: events_bool_exp, $offset: Int, $limit: Int, $o
     transaction_block_height
     transaction_version
     type
+    indexed_type
   }
 }

package/src/internal/transactionSubmission.ts

@@ -75,7 +75,13 @@ import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput
 export async function generateTransaction(
   args: { aptosConfig: AptosConfig } & InputGenerateTransactionData,
 ): Promise<AnyRawTransaction> {
-  const { aptosConfig, sender, data, options, secondarySignerAddresses, feePayerAddress } = args;
+  const { aptosConfig, sender, data, options, secondarySignerAddresses, hasFeePayer } = args;
+
+  // Upate feePayerAddress if it has sponsor
+  let feePayerAddress;
+  if (hasFeePayer === true) {
+    feePayerAddress = AccountAddress.ZERO.toString();
+  }
 
   // Merge in aptosConfig for remote ABI on non-script payloads
   let generateTransactionPayloadData: InputGenerateTransactionPayloadDataWithRemoteABI;

package/src/transactions/transactionBuilder/remoteAbi.ts

@@ -74,7 +74,7 @@ export async function fetchEntryFunctionAbi(
 
   // Remove the signer arguments
   const first = findFirstNonSignerArg(functionAbi);
-  const params = [];
+  const params: TypeTag[] = [];
   for (let i = first; i < functionAbi.params.length; i += 1) {
     params.push(parseTypeTag(functionAbi.params[i], { allowGenerics: true }));
   }

package/src/transactions/transactionBuilder/transactionBuilder.ts

@@ -136,10 +136,6 @@ export function generateTransactionPayloadWithABI(
   args: InputMultiSigData,
   functionAbi: EntryFunctionABI,
 ): TransactionPayloadMultisig;
-export function generateTransactionPayloadWithABI(
-  args: InputGenerateTransactionPayloadData,
-  functionAbi: EntryFunctionABI,
-): AnyTransactionPayloadInstance;
 export function generateTransactionPayloadWithABI(
   args: InputGenerateTransactionPayloadData,
   functionAbi: EntryFunctionABI,

package/src/transactions/types.ts

@@ -106,7 +106,7 @@ export type InputGenerateTransactionPayloadDataWithRemoteABI =
  */
 export type InputEntryFunctionData = {
   function: MoveStructType;
-  typeArguments?: Array<TypeTag>;
+  typeArguments?: Array<TypeTag | string>;
   functionArguments: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>;
 };
 
@@ -267,7 +267,7 @@ export type InputSimulateTransactionOptions = {
  */
 export interface InputGenerateSingleSignerRawTransactionData {
   sender: AccountAddressInput;
-  feePayerAddress?: undefined;
+  hasFeePayer?: undefined;
   secondarySignerAddresses?: undefined;
   options?: InputGenerateTransactionOptions;
   data: InputGenerateTransactionPayloadData;
@@ -278,7 +278,7 @@ export interface InputGenerateSingleSignerRawTransactionData {
  */
 export interface InputGenerateFeePayerRawTransactionData {
   sender: AccountAddressInput;
-  feePayerAddress: AccountAddressInput;
+  hasFeePayer: true;
   secondarySignerAddresses?: AccountAddressInput[];
   options?: InputGenerateTransactionOptions;
   data: InputGenerateTransactionPayloadData;
@@ -290,7 +290,7 @@ export interface InputGenerateFeePayerRawTransactionData {
 export interface InputGenerateMultiAgentRawTransactionData {
   sender: AccountAddressInput;
   secondarySignerAddresses: AccountAddressInput[];
-  feePayerAddress?: undefined;
+  hasFeePayer?: undefined;
   options?: InputGenerateTransactionOptions;
   data: InputGenerateTransactionPayloadData;
 }

package/src/types/generated/operations.ts

@@ -1,5 +1,23 @@
 import * as Types from "./types";
 
+export type TokenActivitiesFieldsFragment = {
+  after_value?: string | null;
+  before_value?: string | null;
+  entry_function_id_str?: string | null;
+  event_account_address: string;
+  event_index: any;
+  from_address?: string | null;
+  is_fungible_v2?: boolean | null;
+  property_version_v1: any;
+  to_address?: string | null;
+  token_amount: any;
+  token_data_id: string;
+  token_standard: string;
+  transaction_timestamp: any;
+  transaction_version: any;
+  type: string;
+};
+
 export type CurrentTokenOwnershipFieldsFragment = {
   token_standard: string;
   token_properties_mutated_v1?: any | null;
@@ -46,24 +64,6 @@ export type CurrentTokenOwnershipFieldsFragment = {
   } | null;
 };
 
-export type TokenActivitiesFieldsFragment = {
-  after_value?: string | null;
-  before_value?: string | null;
-  entry_function_id_str?: string | null;
-  event_account_address: string;
-  event_index: any;
-  from_address?: string | null;
-  is_fungible_v2?: boolean | null;
-  property_version_v1: any;
-  to_address?: string | null;
-  token_amount: any;
-  token_data_id: string;
-  token_standard: string;
-  transaction_timestamp: any;
-  transaction_version: any;
-  type: string;
-};
-
 export type GetAccountCoinsCountQueryVariables = Types.Exact<{
   address?: Types.InputMaybe<Types.Scalars["String"]>;
 }>;
@@ -431,6 +431,7 @@ export type GetEventsQuery = {
     transaction_block_height: any;
     transaction_version: any;
     type: string;
+    indexed_type: string;
   }>;
 };
 

package/src/types/generated/queries.ts

@@ -2,6 +2,25 @@ import * as Types from "./operations";
 
 import { GraphQLClient } from "graphql-request";
 import * as Dom from "graphql-request/dist/types.dom";
+export const TokenActivitiesFieldsFragmentDoc = `
+    fragment TokenActivitiesFields on token_activities_v2 {
+  after_value
+  before_value
+  entry_function_id_str
+  event_account_address
+  event_index
+  from_address
+  is_fungible_v2
+  property_version_v1
+  to_address
+  token_amount
+  token_data_id
+  token_standard
+  transaction_timestamp
+  transaction_version
+  type
+}
+    `;
 export const CurrentTokenOwnershipFieldsFragmentDoc = `
     fragment CurrentTokenOwnershipFields on current_token_ownerships_v2 {
   token_standard
@@ -49,25 +68,6 @@ export const CurrentTokenOwnershipFieldsFragmentDoc = `
   }
 }
     `;
-export const TokenActivitiesFieldsFragmentDoc = `
-    fragment TokenActivitiesFields on token_activities_v2 {
-  after_value
-  before_value
-  entry_function_id_str
-  event_account_address
-  event_index
-  from_address
-  is_fungible_v2
-  property_version_v1
-  to_address
-  token_amount
-  token_data_id
-  token_standard
-  transaction_timestamp
-  transaction_version
-  type
-}
-    `;
 export const GetAccountCoinsCount = `
     query getAccountCoinsCount($address: String) {
   current_fungible_asset_balances_aggregate(
@@ -300,6 +300,7 @@ export const GetEvents = `
     transaction_block_height
     transaction_version
     type
+    indexed_type
   }
 }
     `;

package/src/types/generated/types.ts

@@ -4628,6 +4628,7 @@ export type Events = {
   creation_number: Scalars["bigint"];
   data: Scalars["jsonb"];
   event_index: Scalars["bigint"];
+  indexed_type: Scalars["String"];
   sequence_number: Scalars["bigint"];
   transaction_block_height: Scalars["bigint"];
   transaction_version: Scalars["bigint"];
@@ -4648,6 +4649,7 @@ export type EventsBoolExp = {
   creation_number?: InputMaybe<BigintComparisonExp>;
   data?: InputMaybe<JsonbComparisonExp>;
   event_index?: InputMaybe<BigintComparisonExp>;
+  indexed_type?: InputMaybe<StringComparisonExp>;
   sequence_number?: InputMaybe<BigintComparisonExp>;
   transaction_block_height?: InputMaybe<BigintComparisonExp>;
   transaction_version?: InputMaybe<BigintComparisonExp>;
@@ -4660,6 +4662,7 @@ export type EventsOrderBy = {
   creation_number?: InputMaybe<OrderBy>;
   data?: InputMaybe<OrderBy>;
   event_index?: InputMaybe<OrderBy>;
+  indexed_type?: InputMaybe<OrderBy>;
   sequence_number?: InputMaybe<OrderBy>;
   transaction_block_height?: InputMaybe<OrderBy>;
   transaction_version?: InputMaybe<OrderBy>;
@@ -4677,6 +4680,8 @@ export enum EventsSelectColumn {
   /** column name */
   EventIndex = "event_index",
   /** column name */
+  IndexedType = "indexed_type",
+  /** column name */
   SequenceNumber = "sequence_number",
   /** column name */
   TransactionBlockHeight = "transaction_block_height",
@@ -4700,6 +4705,7 @@ export type EventsStreamCursorValueInput = {
   creation_number?: InputMaybe<Scalars["bigint"]>;
   data?: InputMaybe<Scalars["jsonb"]>;
   event_index?: InputMaybe<Scalars["bigint"]>;
+  indexed_type?: InputMaybe<Scalars["String"]>;
   sequence_number?: InputMaybe<Scalars["bigint"]>;
   transaction_block_height?: InputMaybe<Scalars["bigint"]>;
   transaction_version?: InputMaybe<Scalars["bigint"]>;

package/src/types/index.ts

@@ -161,12 +161,14 @@ export interface PaginationArgs {
 /**
  * A configuration object we can pass with the request to the server.
  *
- * @param TOKEN - an auth token to send with the request
+ * @param AUTH_TOKEN - an auth token to send with a faucet request
+ * @param API_KEY - api key generated from developer portal {@link https://developers.aptoslabs.com/manage/api-keys}}
  * @param HEADERS - extra headers we want to send with the request
  * @param WITH_CREDENTIALS - whether to carry cookies. By default, it is set to true and cookies will be sent
  */
 export type ClientConfig = {
-  TOKEN?: string;
+  AUTH_TOKEN?: string;
+  API_KEY?: string;
   HEADERS?: Record<string, string | number | boolean>;
   WITH_CREDENTIALS?: boolean;
 };