change names

Author: d4mr

src/server/routes/backend-wallet/create.ts

@@ -8,17 +8,17 @@ import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import {
   CreateAwsKmsWalletError,
-  createAndStoreAwsKmsWallet,
+  createAwsKmsWalletDetails,
 } from "../../utils/wallets/createAwsKmsWallet";
 import {
   CreateGcpKmsWalletError,
-  createAndStoreGcpKmsWallet,
+  createGcpKmsWalletDetails,
 } from "../../utils/wallets/createGcpKmsWallet";
 import { createAndStoreLocalWallet } from "../../utils/wallets/createLocalWallet";
 import {
-  createAndStoreSmartAwsWallet,
-  createAndStoreSmartGcpWallet,
-  createAndStoreSmartLocalWallet,
+  createSmartAwsWalletDetails,
+  createSmartGcpWalletDetails,
+  createSmartLocalWalletDetails,
 } from "../../utils/wallets/createSmartWallet";
 
 const requestBodySchema = Type.Object({
@@ -81,7 +81,7 @@ export const createBackendWallet = async (fastify: FastifyInstance) => {
           break;
         case WalletType.awsKms:
           try {
-            walletAddress = await createAndStoreAwsKmsWallet({ label });
+            walletAddress = await createAwsKmsWalletDetails({ label });
           } catch (e) {
             if (e instanceof CreateAwsKmsWalletError) {
               throw createCustomError(
@@ -95,7 +95,7 @@ export const createBackendWallet = async (fastify: FastifyInstance) => {
           break;
         case WalletType.gcpKms:
           try {
-            walletAddress = await createAndStoreGcpKmsWallet({ label });
+            walletAddress = await createGcpKmsWalletDetails({ label });
           } catch (e) {
             if (e instanceof CreateGcpKmsWalletError) {
               throw createCustomError(
@@ -109,7 +109,7 @@ export const createBackendWallet = async (fastify: FastifyInstance) => {
           break;
         case WalletType.smartAwsKms:
           try {
-            const smartAwsWallet = await createAndStoreSmartAwsWallet({
+            const smartAwsWallet = await createSmartAwsWalletDetails({
               label,
             });
 
@@ -127,7 +127,7 @@ export const createBackendWallet = async (fastify: FastifyInstance) => {
           break;
         case WalletType.smartGcpKms:
           try {
-            const smartGcpWallet = await createAndStoreSmartGcpWallet({
+            const smartGcpWallet = await createSmartGcpWalletDetails({
               label,
             });
             walletAddress = smartGcpWallet.address;
@@ -144,7 +144,7 @@ export const createBackendWallet = async (fastify: FastifyInstance) => {
           break;
         case WalletType.smartLocal:
           walletAddress = (
-            await createAndStoreSmartLocalWallet({
+            await createSmartLocalWalletDetails({
               label,
             })
           ).address;

src/server/utils/wallets/createAwsKmsWallet.ts

@@ -18,11 +18,11 @@ export class CreateAwsKmsWalletError extends Error {}
  * If any required parameter cannot be resolved from either the configuration or the overrides, an error is thrown.
  * Credentials (awsAccessKeyId and awsSecretAccessKey) are explicitly stored separately from the global configuration
  */
-export const createAndStoreAwsKmsWallet = async ({
+export const createAwsKmsWalletDetails = async ({
   label,
   ...overrides
 }: CreateAwsKmsWalletParams): Promise<string> => {
-  const { awsKmsArn, params } = await createAwsKmsWallet(overrides);
+  const { awsKmsArn, params } = await createAwsKmsKey(overrides);
 
   return importAwsKmsWallet({
     awsKmsArn,
@@ -39,9 +39,7 @@ export const createAndStoreAwsKmsWallet = async ({
  * All optional parameters are overrides for the configuration in the database
  * If any required parameter cannot be resolved from either the configuration or the overrides, an error is thrown.
  */
-export const createAwsKmsWallet = async (
-  params: Partial<AwsKmsWalletParams>,
-) => {
+export const createAwsKmsKey = async (params: Partial<AwsKmsWalletParams>) => {
   let kmsWalletParams: AwsKmsWalletParams;
   try {
     kmsWalletParams = await fetchAwsKmsWalletParams(params);

src/server/utils/wallets/createGcpKmsWallet.ts

@@ -22,12 +22,12 @@ export class CreateGcpKmsWalletError extends Error {}
  * If any required parameter cannot be resolved from either the configuration or the overrides, an error is thrown.
  * Credentials (gcpApplicationCredentialEmail and gcpApplicationCredentialPrivateKey) are stored separately from the global configuration
  */
-export const createAndStoreGcpKmsWallet = async ({
+export const createGcpKmsWalletDetails = async ({
   label,
   ...overrides
 }: CreateGcpKmsWalletParams): Promise<string> => {
   const { walletAddress, resourcePath, params } =
-    await createGcpKmsWallet(overrides);
+    await createGcpKmsKey(overrides);
 
   await createWalletDetails({
     type: WalletType.gcpKms,
@@ -48,7 +48,7 @@ export const createAndStoreGcpKmsWallet = async ({
  * All optional parameters are overrides for the configuration in the database
  * If any required parameter cannot be resolved from either the configuration or the overrides, an error is thrown.
  */
-export const createGcpKmsWallet = async (
+export const createGcpKmsKey = async (
   partialParams: Partial<GcpKmsWalletParams>,
 ) => {
   let params: GcpKmsWalletParams;

src/server/utils/wallets/createSmartWallet.ts

@@ -5,18 +5,18 @@ import { WalletType } from "../../../schema/wallet";
 import { thirdwebClient } from "../../../utils/sdk";
 import { splitAwsKmsArn } from "./awsKmsArn";
 import {
-  createAwsKmsWallet,
+  createAwsKmsKey,
   type CreateAwsKmsWalletParams,
 } from "./createAwsKmsWallet";
 import {
-  createGcpKmsWallet,
+  createGcpKmsKey,
   type CreateGcpKmsWalletParams,
 } from "./createGcpKmsWallet";
 import { createLocalWallet } from "./createLocalWallet";
 import { getAwsKmsAccount } from "./getAwsKmsAccount";
 import { getGcpKmsAccount } from "./getGcpKmsAccount";
 
-const createSmartWallet = async ({
+const getSmartWalletAddresses = async ({
   adminAccount,
   accountFactoryAddress,
 }: {
@@ -44,12 +44,12 @@ export type CreateSmartAwsWalletParams = CreateAwsKmsWalletParams & {
   accountFactoryAddress?: Address;
 };
 
-export const createAndStoreSmartAwsWallet = async ({
+export const createSmartAwsWalletDetails = async ({
   label,
   accountFactoryAddress,
   ...awsKmsWalletParams
 }: CreateSmartAwsWalletParams) => {
-  const awsKmsWallet = await createAwsKmsWallet(awsKmsWalletParams);
+  const awsKmsWallet = await createAwsKmsKey(awsKmsWalletParams);
 
   const { keyId } = splitAwsKmsArn(awsKmsWallet.awsKmsArn);
 
@@ -65,7 +65,7 @@ export const createAndStoreSmartAwsWallet = async ({
     },
   });
 
-  const smartAccountAddress = await createSmartWallet({
+  const smartAccountAddress = await getSmartWalletAddresses({
     adminAccount,
     accountFactoryAddress,
   });
@@ -88,12 +88,12 @@ export type CreateSmartGcpWalletParams = CreateGcpKmsWalletParams & {
   accountFactoryAddress?: Address;
 };
 
-export const createAndStoreSmartGcpWallet = async ({
+export const createSmartGcpWalletDetails = async ({
   label,
   accountFactoryAddress,
   ...gcpKmsWalletParams
 }: CreateSmartGcpWalletParams) => {
-  const gcpKmsWallet = await createGcpKmsWallet(gcpKmsWalletParams);
+  const gcpKmsWallet = await createGcpKmsKey(gcpKmsWalletParams);
 
   const adminAccount = await getGcpKmsAccount({
     client: thirdwebClient,
@@ -106,7 +106,7 @@ export const createAndStoreSmartGcpWallet = async ({
     },
   });
 
-  const smartAccountAddress = await createSmartWallet({
+  const smartAccountAddress = await getSmartWalletAddresses({
     adminAccount,
     accountFactoryAddress,
   });
@@ -130,13 +130,13 @@ export type CreateSmartLocalWalletParams = {
   accountFactoryAddress?: Address;
 };
 
-export const createAndStoreSmartLocalWallet = async ({
+export const createSmartLocalWalletDetails = async ({
   label,
   accountFactoryAddress,
 }: CreateSmartLocalWalletParams) => {
   const { account, encryptedJson } = await createLocalWallet();
 
-  const smartAccountAddress = await createSmartWallet({
+  const smartAccountAddress = await getSmartWalletAddresses({
     adminAccount: account,
     accountFactoryAddress,
   });

src/server/utils/wallets/legacyLocalCrypto.ts

@@ -56,8 +56,6 @@ export async function toEncryptedJson({
   const computedMac = keccak256(concatArray).substring(2);
 
   const address = privateKeyToAddress(ensureHexPrefix(privateKey));
-  console.log(address);
-
   const keystore: EncryptedKeystore = {
     address: address.slice(2),
     crypto: {
@@ -90,7 +88,6 @@ export async function decryptJsonWallet({
   privateKey: string;
   address: string;
 }> {
-  console.log(encryptedJson);
   const keystore: EncryptedKeystore = JSON.parse(encryptedJson);
 
   const salt = keystore.crypto.kdfparams.salt;