Add license header, remove unused file, remove duplicate code, fix casing

LICENSE

@@ -1,6 +1,3 @@
-Copyright © Aptos Foundation
-SPDX-License-Identifier: Apache-2.0
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -195,6 +192,8 @@ SPDX-License-Identifier: Apache-2.0
 
        http://www.apache.org/licenses/LICENSE-2.0
 
+   Copyright 2023 Aptos Foundation
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/api/account.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig } from "./aptos_config";
 import {
   AccountData,

src/api/aptos.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { Account } from "./account";
 import { AptosConfig } from "./aptos_config";
 import { General } from "./general";

src/api/aptos_config.ts

@@ -1,5 +1,8 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosSettings, ClientConfig } from "../types";
-import { NetworkToNodeAPI, NetworkToFaucetAPI, NetworkToIndexerAPI, Network } from "../utils/api-endpoints";
+import { NetworkToNodeAPI, NetworkToFaucetAPI, NetworkToIndexerAPI, Network } from "../utils/apiEndpoints";
 import { AptosApiType, DEFAULT_NETWORK } from "../utils/const";
 
 /**
@@ -50,18 +53,15 @@ export class AptosConfig {
     switch (apiType) {
       case AptosApiType.FULLNODE:
         if (this.fullnode !== undefined) return this.fullnode;
-        if (this.network === Network.CUSTOM && this.fullnode === undefined)
-          throw new Error("Please provide a custom full node url");
+        if (this.network === Network.CUSTOM) throw new Error("Please provide a custom full node url");
         return NetworkToNodeAPI[this.network];
       case AptosApiType.FAUCET:
         if (this.faucet !== undefined) return this.faucet;
-        if (this.network === Network.CUSTOM && this.faucet === undefined)
-          throw new Error("Please provide a custom faucet url");
+        if (this.network === Network.CUSTOM) throw new Error("Please provide a custom faucet url");
         return NetworkToFaucetAPI[this.network];
       case AptosApiType.INDEXER:
         if (this.indexer !== undefined) return this.indexer;
-        if (this.network === Network.CUSTOM && this.indexer === undefined)
-          throw new Error("Please provide a custom indexer url");
+        if (this.network === Network.CUSTOM) throw new Error("Please provide a custom indexer url");
         return NetworkToIndexerAPI[this.network];
       default:
         throw Error(`apiType ${apiType} is not supported`);

src/api/faucet.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { fundAccount } from "../internal/faucet";
 import { HexInput } from "../types";
 import { AptosConfig } from "./aptos_config";

src/api/general.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import {
   getBlockByHeight,
   getBlockByVersion,

src/api/index.ts

@@ -1,2 +1,5 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 export * from "./aptos";
 export * from "./aptos_config";

src/api/transaction.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import {
   getGasPriceEstimation,
   getTransactionByHash,

src/api/transaction_submission.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig } from "./aptos_config";
 import { Account } from "../core/account";
 import { AccountAuthenticator } from "../transactions/authenticator/account";

src/client/core.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import aptosClient from "@aptos-labs/aptos-client";
 import { AptosApiError, AptosResponse, MimeType } from "./types";
 import { VERSION } from "../version";

src/client/get.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosResponse, MimeType } from "./types";
 import { aptosRequest } from "./core";
 import { AnyNumber, ClientConfig } from "../types";

src/client/index.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 export * from "./core";
 export * from "./get";
 export * from "./post";

src/client/post.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig } from "../api/aptos_config";
 import { AnyNumber, ClientConfig } from "../types";
 import { aptosRequest } from "./core";

src/client/types.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosRequest } from "../types";
 
 /**

src/core/account.ts

@@ -7,7 +7,7 @@ import { AccountAddress } from "./account_address";
 import { Hex } from "./hex";
 import { HexInput, SigningScheme } from "../types";
 import { PrivateKey, PublicKey, Signature } from "../crypto/asymmetric_crypto";
-import { derivePath } from "../utils/hd-key";
+import { derivePath } from "../utils/hdKey";
 import { AuthenticationKey } from "../crypto/authentication_key";
 import { Ed25519PrivateKey, Ed25519PublicKey } from "../crypto/ed25519";
 import { Secp256k1PrivateKey, Secp256k1PublicKey } from "../crypto/secp256k1";

src/index.ts

@@ -3,5 +3,5 @@
 
 export * from "./api";
 export * from "./client";
-export * from "./utils/api-endpoints";
+export * from "./utils/apiEndpoints";
 export * from "./bcs";

src/internal/account.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * This file contains the underlying implementations for exposed API surface in
  * the {@link api/account}. By moving the methods out into a separate file,

src/internal/faucet.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * This file contains the underlying implementations for exposed API surface in
  * the {@link api/faucet}. By moving the methods out into a separate file,

src/internal/general.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * This file contains the underlying implementations for exposed API surface in
  * the {@link api/general}. By moving the methods out into a separate file,

src/internal/transaction.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * This file contains the underlying implementations for exposed API surface in
  * the {@link api/transaction}. By moving the methods out into a separate file,

src/transactions/authenticator/account.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { Serializer, Deserializer, Serializable } from "../../bcs";

src/transactions/authenticator/transaction.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { Deserializer, Serializer } from "../../bcs";

src/transactions/instances/chainId.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { Serializer, Deserializer } from "../../bcs";
 
 /**

src/transactions/instances/identifier.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { Serializer, Deserializer, Serializable } from "../../bcs";
 
 /**

src/transactions/instances/index.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 export * from "./chainId";
 export * from "./rawTransaction";
 export * from "./scriptTransactionArguments";

src/transactions/instances/moduleId.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { Serializer, Deserializer } from "../../bcs";
 import { AccountAddress } from "../../core";
 import { Identifier } from "./identifier";

src/transactions/instances/rawTransaction.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { Deserializer, Serializer, Serializable } from "../../bcs";

src/transactions/instances/scriptTransactionArguments.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { Serializer, Deserializer, Serializable } from "../../bcs";
 import { AccountAddress } from "../../core";
 import { ScriptTransactionArgumentVariants } from "../../types";

src/transactions/instances/signedTransaction.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { Serializer, Deserializer, Serializable } from "../../bcs";

src/transactions/instances/transactionPayload.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { Serializer, Deserializer, Serializable } from "../../bcs";

src/transactions/transaction_builder/transaction_builder.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * This file handles the transaction creation lifecycle.
  * It holds different operations to generate a transaction payload, a raw transaciotn,
@@ -15,7 +18,7 @@ import { getInfo } from "../../internal/account";
 import { getLedgerInfo } from "../../internal/general";
 import { getGasPriceEstimation } from "../../internal/transaction";
 import { HexInput, SigningScheme } from "../../types";
-import { NetworkToChainId } from "../../utils/api-endpoints";
+import { NetworkToChainId } from "../../utils/apiEndpoints";
 import { DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW } from "../../utils/const";
 import {
   AccountAuthenticator,

src/transactions/types.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig } from "../api/aptos_config";
 import { Serializable } from "../bcs";
 import { AccountAddress } from "../core";

src/types/index.ts

@@ -1,4 +1,7 @@
-import { Network } from "../utils/api-endpoints";
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+import { Network } from "../utils/apiEndpoints";
 
 export * from "./indexer";
 

src/types/indexer.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * GENERATED QUERY TYPES FROM GRAPHQL SCHEMA
  *

src/utils/api-endpoints.ts → src/utils/apiEndpoints.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 export const NetworkToIndexerAPI: Record<string, string> = {
   mainnet: "https://indexer.mainnet.aptoslabs.com/v1/graphql",
   testnet: "https://indexer-testnet.staging.gcp.aptosdev.com/v1/graphql",

src/utils/const.ts

@@ -1,4 +1,7 @@
-import { Network } from "./api-endpoints";
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+import { Network } from "./apiEndpoints";
 
 export const DEFAULT_NETWORK = Network.DEVNET;
 export const DEFAULT_TXN_TIMEOUT_SEC = 20;

src/utils/hd-key.ts → src/utils/hdKey.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import nacl from "tweetnacl";
 import { hmac } from "@noble/hashes/hmac";
 import { sha512 } from "@noble/hashes/sha512";

src/utils/helpers.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 export async function sleep(timeMs: number): Promise<null> {
   return new Promise((resolve) => {
     setTimeout(resolve, timeMs);

src/utils/memoize.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 /**
  * The global cache Map
  */

src/version.ts

@@ -1,2 +1,5 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 // hardcoded for now, we would want to have it injected dynamically
 export const VERSION = "2.0.0";

tests/e2e/api/account.test.ts

@@ -1,5 +1,8 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { Aptos, AptosConfig } from "../../../src";
-import { Network } from "../../../src/utils/api-endpoints";
+import { Network } from "../../../src/utils/apiEndpoints";
 
 // TODO
 // add account getTransactions tests once sdk v2 supports faucet (which needs transaction operation support)

tests/e2e/api/general.test.ts

@@ -1,6 +1,9 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig, Aptos } from "../../../src";
 import { GraphqlQuery, ViewRequest } from "../../../src/types";
-import { Network } from "../../../src/utils/api-endpoints";
+import { Network } from "../../../src/utils/apiEndpoints";
 
 describe("general api", () => {
   test("it fetches ledger info", async () => {

tests/e2e/api/transaction.test.ts

@@ -1,5 +1,8 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig, Aptos } from "../../../src";
-import { Network } from "../../../src/utils/api-endpoints";
+import { Network } from "../../../src/utils/apiEndpoints";
 
 describe("transaction api", () => {
   test("it queries for the network estimated gas price", async () => {

tests/e2e/api/transaction_submission.test.ts

@@ -1,3 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
 import { AptosConfig, Network, Aptos, Deserializer } from "../../../src";
 import { U64 } from "../../../src/bcs/serializable/move-primitives";
 import { MoveObject } from "../../../src/bcs/serializable/move-structs";