Merge pull request #177 from shawakash/go2

chore: change the txn table attributes to hold Txn Type present in @paybox/mote

Author: shawakash

apps/web/app/txn/components/columns.tsx

@@ -49,7 +49,7 @@ export const columns: ColumnDef<TxnType>[] = [
       // make the cluster dynamic
       <Link
         target="_blank"
-        href={getTransactionUrl(row.original.network, row.original.signature[0], row.original.cluster)}
+        href={getTransactionUrl(row.original.network, row.original.hash, row.original.cluster)}
       >
         <div className="w-[80px]">
           Txn-{(row.getValue("id") as string).split("-")[1]}
@@ -154,9 +154,7 @@ export const columns: ColumnDef<TxnType>[] = [
       <DataTableColumnHeader column={column} title="Block Date" />
     ),
     cell: ({ row }) => {
-      const blockTimeMilliseconds = row.original.blockTime * 1000;
-
-      const blockDate = new Date(blockTimeMilliseconds);
+      const blockDate = new Date(row.original.time);
       const formattedDate = format(blockDate, "do MMM yy");
       return (
         <div className="flex items-center space-x-2">
@@ -175,7 +173,7 @@ export const columns: ColumnDef<TxnType>[] = [
       <DataTableColumnHeader column={column} title="Block Time" />
     ),
     cell: ({ row }) => {
-      const blockTimeMilliseconds = row.original.blockTime * 1000;
+      const blockTimeMilliseconds = row.original.time * 1000;
 
       const blockDate = new Date(blockTimeMilliseconds);
       const formattedTime = format(blockDate, "h:mm a");

backend/api/src/db/transaction.ts

@@ -34,19 +34,16 @@ const chain = Chain(HASURA_URL, {
  */
 export const insertTxn = async ({
   clientId,
-  blockTime,
+  time,
   amount,
   fee,
   from,
   to,
-  postBalances,
-  preBalances,
-  recentBlockhash,
-  signature,
+  blockHash,
+  hash,
   network,
   slot,
   cluster,
-  nonce,
   chainId,
 }: InsertTxnType): Promise<{
   status: dbResStatus;
@@ -58,19 +55,15 @@ export const insertTxn = async ({
         {
           object: {
             clientId,
-            signature,
             network,
+            hash,
             slot,
             amount,
-            blockTime,
             fee,
             from,
             to,
-            preBalances,
-            postBalances,
-            recentBlockhash,
+            blockHash,
             cluster,
-            nonce,
             chainId,
           },
         },
@@ -120,22 +113,18 @@ export const getTxns = async ({
         },
         {
           id: true,
-          //@ts-ignore
-          signature: true,
+          hash: true,
           amount: true,
-          blockTime: true,
+          time: true,
           clientId: true,
           fee: true,
-          time: true,
           from: true,
           network: true,
-          //@ts-ignore
-          postBalances: true,
-          //@ts-ignore
-          preBalances: true,
-          recentBlockhash: true,
+          blockHash: true,
           slot: true,
           to: true,
+          cluster: true,
+          status: true
         },
       ],
     },
@@ -160,7 +149,7 @@ export const getTxns = async ({
  */
 export const getTxnByHash = async ({
   network,
-  sign,
+  hash,
   clientId,
 }: TxnQuerySignType): Promise<{
   status: dbResStatus;
@@ -172,29 +161,25 @@ export const getTxnByHash = async ({
       transactions: [
         {
           where: {
-            signature: { _contains: sign },
+            hash: { _eq: hash },
             clientId: { _eq: clientId },
             network: { _eq: network },
           },
         },
         {
           id: true,
-          //@ts-ignore
-          signature: true,
           amount: true,
-          blockTime: true,
+          time: true,
           clientId: true,
           fee: true,
-          time: true,
           from: true,
           network: true,
-          //@ts-ignore
-          postBalances: true,
-          //@ts-ignore
-          preBalances: true,
-          recentBlockhash: true,
+          blockHash: true,
           slot: true,
           to: true,
+          hash: true,
+          cluster: true,
+          status: true
         },
       ],
     },
@@ -236,23 +221,18 @@ export const getAllTxn = async ({
         },
         {
           id: true,
-          //@ts-ignore
-          signature: true,
+          hash: true,
           amount: true,
-          blockTime: true,
+          time: true,
           clientId: true,
           fee: true,
-          time: true,
           from: true,
           network: true,
-          //@ts-ignore
-          postBalances: true,
-          //@ts-ignore
-          preBalances: true,
-          recentBlockhash: true,
+          blockHash: true,
           slot: true,
           to: true,
           cluster: true,
+          status: true
         },
       ],
     },

backend/api/src/routes/transaction.ts

@@ -128,16 +128,16 @@ txnRouter.get("/get", async (req, res) => {
     //@ts-ignore
     const id = req.id as string;
     if (id) {
-      let { network, sign } = TxnQeuryByHash.parse(req.query);
+      let { network, hash } = TxnQeuryByHash.parse(req.query);
       /**
        * Cache
        */
-      const isTxn = await cache.txn.cacheGetTxnBySign(sign);
+      const isTxn = await cache.txn.cacheGetTxnBySign(hash);
       if (isTxn) {
         return res.status(302).json({ txn: isTxn, status: responseStatus.Ok });
       }
       //Db query
-      const txn = await getTxnByHash({ network, sign, clientId: id });
+      const txn = await getTxnByHash({ network, hash, clientId: id });
       if (txn.status == dbResStatus.Error) {
         return res
           .status(503)

backend/hasura/hasura/migrations/default/1709811647893_alter_table_public_transactions_drop_column_blockTime/down.sql

@@ -0,0 +1,4 @@
+comment on column "public"."transactions"."blockTime" is E'transactions table ';
+alter table "public"."transactions" add constraint "transactions_block_time_key" unique (blockTime);
+alter table "public"."transactions" alter column "blockTime" drop not null;
+alter table "public"."transactions" add column "blockTime" int8;

backend/hasura/hasura/migrations/default/1709811647893_alter_table_public_transactions_drop_column_blockTime/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop column "blockTime" cascade;

backend/hasura/hasura/migrations/default/1709811674183_alter_table_public_transactions_drop_column_preBalances/down.sql

@@ -0,0 +1,3 @@
+comment on column "public"."transactions"."preBalances" is E'transactions table ';
+alter table "public"."transactions" alter column "preBalances" drop not null;
+alter table "public"."transactions" add column "preBalances" jsonb;

backend/hasura/hasura/migrations/default/1709811674183_alter_table_public_transactions_drop_column_preBalances/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop column "preBalances" cascade;

backend/hasura/hasura/migrations/default/1709811686850_alter_table_public_transactions_drop_column_postBalances/down.sql

@@ -0,0 +1,3 @@
+comment on column "public"."transactions"."postBalances" is E'transactions table ';
+alter table "public"."transactions" alter column "postBalances" drop not null;
+alter table "public"."transactions" add column "postBalances" jsonb;

backend/hasura/hasura/migrations/default/1709811686850_alter_table_public_transactions_drop_column_postBalances/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop column "postBalances" cascade;

backend/hasura/hasura/migrations/default/1709811704205_alter_table_public_transactions_alter_column_recentBlockhash/down.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" rename column "blockHash" to "recentBlockhash";

backend/hasura/hasura/migrations/default/1709811704205_alter_table_public_transactions_alter_column_recentBlockhash/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" rename column "recentBlockhash" to "blockHash";

backend/hasura/hasura/migrations/default/1709811712397_alter_table_public_transactions_drop_column_signature/down.sql

@@ -0,0 +1,3 @@
+comment on column "public"."transactions"."signature" is E'transactions table ';
+alter table "public"."transactions" alter column "signature" drop not null;
+alter table "public"."transactions" add column "signature" jsonb;

backend/hasura/hasura/migrations/default/1709811712397_alter_table_public_transactions_drop_column_signature/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop column "signature" cascade;

backend/hasura/hasura/migrations/default/1709811745810_alter_table_public_transactions_alter_column_hash/down.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" alter column "hash" drop not null;

backend/hasura/hasura/migrations/default/1709811745810_alter_table_public_transactions_alter_column_hash/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" alter column "hash" set not null;

backend/hasura/hasura/migrations/default/1709811810826_set_fk_public_transactions_clientId/down.sql

@@ -0,0 +1,5 @@
+alter table "public"."transactions" drop constraint "transactions_clientId_fkey",
+  add constraint "transactions_client_id_fkey"
+  foreign key ("clientId")
+  references "public"."client"
+  ("id") on update restrict on delete restrict;

backend/hasura/hasura/migrations/default/1709811810826_set_fk_public_transactions_clientId/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."transactions" drop constraint "transactions_client_id_fkey",
+  add constraint "transactions_clientId_fkey"
+  foreign key ("clientId")
+  references "public"."client"
+  ("id") on update restrict on delete restrict;

backend/hasura/hasura/migrations/default/1709811839113_alter_table_public_transactions_alter_column_hash/down.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop constraint "transactions_hash_key";

backend/hasura/hasura/migrations/default/1709811839113_alter_table_public_transactions_alter_column_hash/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" add constraint "transactions_hash_key" unique ("hash");

backend/hasura/hasura/migrations/default/1709811998056_alter_table_public_transactions_drop_column_nonce/down.sql

@@ -0,0 +1,3 @@
+comment on column "public"."transactions"."nonce" is E'transactions table ';
+alter table "public"."transactions" alter column "nonce" drop not null;
+alter table "public"."transactions" add column "nonce" int4;

backend/hasura/hasura/migrations/default/1709811998056_alter_table_public_transactions_drop_column_nonce/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop column "nonce" cascade;

backend/hasura/hasura/migrations/default/1709814059944_alter_table_public_transactions_add_column_nonce/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."transactions" add column "nonce" bigint
+--  null;

backend/hasura/hasura/migrations/default/1709814059944_alter_table_public_transactions_add_column_nonce/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."transactions" add column "nonce" bigint
+ null;

backend/hasura/hasura/migrations/default/1709814947154_alter_table_public_transactions_drop_column_nonce/down.sql

@@ -0,0 +1,3 @@
+comment on column "public"."transactions"."nonce" is E'transactions table ';
+alter table "public"."transactions" alter column "nonce" drop not null;
+alter table "public"."transactions" add column "nonce" int8;

backend/hasura/hasura/migrations/default/1709814947154_alter_table_public_transactions_drop_column_nonce/up.sql

@@ -0,0 +1 @@
+alter table "public"."transactions" drop column "nonce" cascade;

backend/hasura/hasura/migrations/default/1709815035598_alter_table_public_transactions_add_column_nonce/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."transactions" add column "nonce" bigint
+--  null;

backend/hasura/hasura/migrations/default/1709815035598_alter_table_public_transactions_add_column_nonce/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."transactions" add column "nonce" bigint
+ null;