Extend transaction timeout & dynamically create nonce (#134)

* Fix wallet nonce bugs

* Create new nonce entry when nonce is requested

* Fix examples

* update

Author: adam-maj

core/sdk/sdk.ts

@@ -112,7 +112,6 @@ const getCachedWallet = async (
     walletData = await getWalletDetails({
       pgtx,
       address: walletAddress,
-      chainId,
     });
     console.log("Received wallet data:", walletData);
     if (walletData) {

docs/UserGuide.md

@@ -51,7 +51,7 @@ Backend wallets are used by the web3-api to execute transactions, you should thi
 
 1.POST /create/wallet
 `{
-"walletType": "aws_kms | gcp_kms | local"
+"walletType": "aws-kms | gcp-kms | local"
 }`
 
 #### AWS KMS Wallet

server/api/wallet/addWallet.ts

@@ -15,7 +15,7 @@ const requestBodySchema = Type.Object({
   walletType: Type.String({
     description: "Wallet Type",
     // TODO: Support local wallet
-    examples: ["aws_kms", "gcp_kms", "ppk"],
+    examples: ["aws-kms", "gcp-kms", "ppk"],
   }),
   privateKey: Type.Optional(
     Type.String({
@@ -52,14 +52,14 @@ const requestBodySchema = Type.Object({
 
 requestBodySchema.examples = [
   {
-    walletType: "aws_kms",
+    walletType: "aws-kms",
     awsKMS: {
       keyId: "12345678-1234-1234-1234-123456789012",
       arn: "arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012",
     },
   },
   {
-    walletType: "gcp_kms",
+    walletType: "gcp-kms",
     gcpKMS: {
       keyId: "12345678-1234-1234-1234-123456789012",
       versionId: "1",

server/api/wallet/createEOAWallet.ts

@@ -18,16 +18,16 @@ import { WalletConfigType } from "../../schemas/wallet";
 const requestBodySchema = Type.Object({
   walletType: Type.String({
     description: "Wallet Type",
-    examples: ["aws_kms", "gcp_kms", "local"],
+    examples: ["aws-kms", "gcp-kms", "local"],
   }),
 });
 
 requestBodySchema.examples = [
   {
-    walletType: "aws_kms",
+    walletType: "aws-kms",
   },
   {
-    walletType: "gcp_kms",
+    walletType: "gcp-kms",
   },
 ];
 

src/db/wallets/createWalletDetails.ts

@@ -28,7 +28,7 @@ export const createWalletDetails = async ({
     },
   });
 
-  if (!wallet) {
+  if (wallet) {
     throw new Error(
       `Wallet with address ${walletDetails.address} has already been added!`,
     );

src/db/wallets/createWalletNonce.ts

@@ -24,6 +24,7 @@ export const createWalletNonce = async ({
   const nonce = BigNumber.from(
     (await getWalletNonce(address.toLowerCase(), sdk.getProvider())) ?? 0,
   ).toNumber();
+  console.log(nonce);
 
   return prisma.walletNonce.create({
     data: {

src/db/wallets/getWalletDetails.ts

@@ -1,58 +1,20 @@
 import { PrismaTransaction } from "../../schema/prisma";
 import { getPrismaWithPostgresTx } from "../client";
-import { WalletWithNonceAndDetails, cleanWallet } from "./cleanWallet";
-import { createWalletNonce } from "./createWalletNonce";
 
 interface GetWalletDetailsParams {
   pgtx?: PrismaTransaction;
   address: string;
-  chainId: number;
-  isRecursive?: boolean;
 }
 
 export const getWalletDetails = async ({
   pgtx,
   address,
-  chainId,
-  isRecursive,
-}: GetWalletDetailsParams): Promise<WalletWithNonceAndDetails | null> => {
+}: GetWalletDetailsParams) => {
   const prisma = getPrismaWithPostgresTx(pgtx);
 
-  const wallet = await prisma.walletNonce.findUnique({
+  return prisma.walletDetails.findUnique({
     where: {
-      address_chainId: {
-        address: address.toLowerCase(),
-        chainId,
-      },
-    },
-    include: {
-      walletDetails: true,
+      address: address.toLowerCase(),
     },
   });
-
-  if (!wallet) {
-    if (!isRecursive) {
-      // TODO: Change this!
-      const walletDetails = await prisma.walletDetails.findUnique({
-        where: {
-          address: address.toLowerCase(),
-        },
-      });
-
-      // If we have wallet details, but not a wallet nonce for the chain, create one
-      if (walletDetails) {
-        await createWalletNonce({
-          pgtx,
-          address,
-          chainId,
-        });
-
-        return getWalletDetails({ pgtx, address, chainId, isRecursive: true });
-      }
-    }
-
-    return wallet;
-  }
-
-  return cleanWallet(wallet);
 };

src/db/wallets/getWalletNonce.ts

@@ -9,7 +9,6 @@ interface GetWalletNonceParams {
   chainId: number;
 }
 
-// TODO: Consolidate or evaluate if getWalletDetails is necessary
 export const getWalletNonce = async ({
   pgtx,
   address,

worker/controller/blockchainReader.ts

@@ -40,7 +40,7 @@ export const checkForMinedTransactionsOnBlockchain = async (
         txReceiptData.effectiveGasPrice != BigNumber.from(-1) &&
         txReceiptData.timestamp != -1
       ) {
-        server.log.debug(
+        server.log.info(
           `Got receipt for tx: ${txReceiptData.txHash}, queueId: ${txReceiptData.queueId}, effectiveGasPrice: ${txReceiptData.effectiveGasPrice}`,
         );
 

worker/controller/processTransaction.ts

@@ -51,7 +51,6 @@ export const processTransaction = async (
             address: tx.fromAddress!,
             chainId: tx.chainId!,
           });
-          server.log.error(`>>> [Nonce] ${walletNonce?.nonce}`);
 
           const sdk = await getSDK(
             tx.chainId!.toString(),
@@ -146,7 +145,7 @@ export const processTransaction = async (
         }
       },
       {
-        timeout: 30000,
+        timeout: 5 * 60000,
       },
     );
 

worker/controller/retryTransaction.ts

@@ -169,7 +169,7 @@ export const retryTransactions = async (server: FastifyInstance) => {
         return;
       },
       {
-        timeout: 30000,
+        timeout: 5 * 60000,
       },
     );