@aptos-labs/ts-sdk 1.38.0 → 2.0.0-zeta.0

package/src/api/transactionSubmission/build.ts

@@ -1,19 +1,12 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-import { AccountAddress, AccountAddressInput } from "../../core";
+import { AccountAddressInput } from "../../core";
 import { generateTransaction } from "../../internal/transactionSubmission";
-import {
-  InputGenerateTransactionPayloadData,
-  InputGenerateTransactionOptions,
-  AptosScriptComposer,
-  TransactionPayloadScript,
-  generateRawTransaction,
-} from "../../transactions";
+import { InputGenerateTransactionPayloadData, InputGenerateTransactionOptions } from "../../transactions";
 import { MultiAgentTransaction } from "../../transactions/instances/multiAgentTransaction";
 import { SimpleTransaction } from "../../transactions/instances/simpleTransaction";
 import { AptosConfig } from "../aptosConfig";
-import { Deserializer } from "../../bcs";
 
 /**
  * A class to handle all `Build` transaction operations.
@@ -103,82 +96,6 @@ export class Build {
     return generateTransaction({ aptosConfig: this.config, ...args });
   }
 
-  /**
-   * Build a transaction from a series of Move calls.
-   *
-   * This function allows you to create a transaction with a list of Move calls.
-   *
-   * Right now we only tested this logic with single signer and we will add support
-   * for mutli agent transactions if needed.
-   *
-   * @param args.sender - The sender account address.
-   * @param args.builder - The closure to construct the list of calls.
-   * @param args.options - Optional transaction configurations.
-   * @param args.withFeePayer - Whether there is a fee payer for the transaction.
-   *
-   * @returns SimpleTransaction
-   *
-   * @example
-   * ```typescript
-   * import { Aptos, AptosConfig, Network } from "@aptos-labs/ts-sdk";
-   *
-   * const config = new AptosConfig({ network: Network.TESTNET });
-   * const aptos = new Aptos(config);
-   *
-   * async function runExample() {
-   *   // Build a transaction from a chained series of Move calls.
-   *   const transaction = await aptos.transaction.build.scriptComposer({
-   *     sender: "0x1", // replace with a real sender account address
-   *     builder: builder: async (builder) => {
-   *       const coin = await builder.addBatchedCalls({
-   *          function: "0x1::coin::withdraw",
-   *          functionArguments: [CallArgument.new_signer(0), 1],
-   *          typeArguments: ["0x1::aptos_coin::AptosCoin"],
-   *        });
-   *
-   *        // Pass the returned value from the first function call to the second call
-   *        const fungibleAsset = await builder.addBatchedCalls({
-   *          function: "0x1::coin::coin_to_fungible_asset",
-   *          functionArguments: [coin[0]],
-   *          typeArguments: ["0x1::aptos_coin::AptosCoin"],
-   *        });
-   *
-   *        await builder.addBatchedCalls({
-   *          function: "0x1::primary_fungible_store::deposit",
-   *          functionArguments: [singleSignerED25519SenderAccount.accountAddress, fungibleAsset[0]],
-   *          typeArguments: [],
-   *        });
-   *        return builder;
-   *     },
-   *     options: {
-   *       gasUnitPrice: 100, // specify your own gas unit price if needed
-   *       maxGasAmount: 1000, // specify your own max gas amount if needed
-   *     },
-   *   });
-   *
-   *   console.log(transaction);
-   * }
-   * runExample().catch(console.error);
-   * ```
-   */
-  async scriptComposer(args: {
-    sender: AccountAddressInput;
-    builder: (builder: AptosScriptComposer) => Promise<AptosScriptComposer>;
-    options?: InputGenerateTransactionOptions;
-    withFeePayer?: boolean;
-  }): Promise<SimpleTransaction> {
-    const composer = new AptosScriptComposer(this.config);
-    await composer.init();
-    const builder = await args.builder(composer);
-    const bytes = builder.build();
-    const rawTxn = await generateRawTransaction({
-      aptosConfig: this.config,
-      payload: TransactionPayloadScript.load(new Deserializer(bytes)),
-      ...args,
-    });
-    return new SimpleTransaction(rawTxn, args.withFeePayer === true ? AccountAddress.ZERO : undefined);
-  }
-
   /**
    * Build a multi-agent transaction that allows multiple signers to authorize a transaction.
    *

package/src/core/crypto/ed25519.ts

@@ -383,7 +383,7 @@ export class Ed25519PrivateKey extends Serializable implements PrivateKey {
    * @category Serialization
    */
   toString(): string {
-    return this.toHexString();
+    return this.toAIP80String();
   }
 
   /**

package/src/core/crypto/index.ts

@@ -15,3 +15,4 @@ export * from "./publicKey";
 export * from "./secp256k1";
 export * from "./signature";
 export * from "./singleKey";
+export * from "./types";

package/src/core/crypto/multiEd25519.ts

@@ -92,6 +92,10 @@ export class MultiEd25519PublicKey extends AbstractMultiKey {
     this.threshold = threshold;
   }
 
+  getSignaturesRequired(): number {
+    return this.threshold;
+  }
+
   // region AccountPublicKey
 
   /**
@@ -217,6 +221,28 @@ export class MultiEd25519PublicKey extends AbstractMultiKey {
     return new MultiEd25519PublicKey({ publicKeys: keys, threshold });
   }
 
+  /**
+   * Deserializes a MultiEd25519Signature from the provided deserializer.
+   * This function helps in reconstructing a MultiEd25519Signature object from its serialized byte representation.
+   *
+   * @param deserializer - The deserializer instance used to read the serialized data.
+   * @group Implementation
+   * @category Serialization
+   */
+  static deserializeWithoutLength(deserializer: Deserializer): MultiEd25519PublicKey {
+    const length = deserializer.remaining();
+    const bytes = deserializer.deserializeFixedBytes(length);
+    const threshold = bytes[bytes.length - 1];
+
+    const keys: Ed25519PublicKey[] = [];
+
+    for (let i = 0; i < bytes.length - 1; i += Ed25519PublicKey.LENGTH) {
+      const begin = i;
+      keys.push(new Ed25519PublicKey(bytes.subarray(begin, begin + Ed25519PublicKey.LENGTH)));
+    }
+    return new MultiEd25519PublicKey({ publicKeys: keys, threshold });
+  }
+
   // endregion
 
   /**

package/src/core/crypto/multiKey.ts

@@ -95,6 +95,8 @@ export abstract class AbstractMultiKey extends AccountPublicKey {
     }
     throw new Error(`Public key ${publicKey} not found in multi key set ${this.publicKeys}`);
   }
+
+  abstract getSignaturesRequired(): number;
 }
 
 /**
@@ -162,6 +164,10 @@ export class MultiKey extends AbstractMultiKey {
     this.signaturesRequired = signaturesRequired;
   }
 
+  getSignaturesRequired(): number {
+    return this.signaturesRequired;
+  }
+
   // endregion
 
   // region AccountPublicKey

package/src/core/crypto/secp256k1.ts

@@ -324,7 +324,7 @@ export class Secp256k1PrivateKey extends Serializable implements PrivateKey {
    * @category Serialization
    */
   toString(): string {
-    return this.toHexString();
+    return this.toAIP80String();
   }
 
   /**

package/src/core/crypto/singleKey.ts

@@ -149,7 +149,7 @@ export class AnyPublicKey extends AccountPublicKey {
    * @group Implementation
    * @category Serialization
    */
-  toUint8Array() {
+  toUint8Array(): Uint8Array {
     return this.bcsToBytes();
   }
 
@@ -289,7 +289,7 @@ export class AnySignature extends Signature {
 
   // region AccountSignature
 
-  toUint8Array() {
+  toUint8Array(): Uint8Array {
     // TODO: keep this warning around for a bit, and eventually change this to return `this.signature.toUint8Array()`.
     // eslint-disable-next-line no-console
     console.warn(

package/src/core/crypto/types.ts

@@ -0,0 +1,9 @@
+import { AnyPublicKey } from "./singleKey";
+import { Ed25519PublicKey } from "./ed25519";
+import { MultiKey } from "./multiKey";
+import { MultiEd25519PublicKey } from "./multiEd25519";
+
+// This type is used to represent the base from of an account's public key.
+// These are the types of public keys that can be used to derive an account's address by appending
+// the signing scheme to the public key as bytes and hashing it.
+export type BaseAccountPublicKey = Ed25519PublicKey | AnyPublicKey | MultiKey | MultiEd25519PublicKey;