fix: removed empty status

Author: Faizan Dastgir

docs/entities/transactions/transaction-status.schema.json

@@ -3,5 +3,5 @@
   "title": "TransactionStatus",
   "description": "Status of the transaction",
   "type": "string",
-  "enum": ["success", "pending", "abort_by_response", "abort_by_post_condition", ""]
+  "enum": ["success", "pending", "abort_by_response", "abort_by_post_condition"]
 }

docs/index.d.ts

@@ -2056,7 +2056,7 @@ export interface CoinbaseTransaction {
 /**
  * Status of the transaction
  */
-export type TransactionStatus = "success" | "pending" | "abort_by_response" | "abort_by_post_condition" | "";
+export type TransactionStatus = "success" | "pending" | "abort_by_response" | "abort_by_post_condition";
 
 /**
  * String literal of all Stacks 2.0 transaction types

rosetta-cli-config/rosetta-config-native.json

@@ -23,12 +23,8 @@
     "block_broadcast_limit": 0,
     "rebroadcast_all": false,
     "constructor_dsl_file": "stacks.ros",
-    "prefunded_accounts": [
-      {"privkey": "cb3df38053d132895220b9ce471f6b676db5b9bf0b4adefb55f2118ece2478df",
-       "account_identifier": {"address": "STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6"},
-       "curve_type": "secp256k1",
-       "currency": {"symbol": "STX", "decimals": 6}},
-      {"privkey": "21d43d2ae0da1d9d04cfcaac7d397a33733881081f0b2cd038062cf0ccbb7526",
+    "prefunded_accounts": [ 
+     {"privkey": "21d43d2ae0da1d9d04cfcaac7d397a33733881081f0b2cd038062cf0ccbb7526",
        "account_identifier": {"address": "ST11NJTTKGVT6D1HY4NJRVQWMQM7TVAR091EJ8P2Y"},
        "curve_type": "secp256k1",
        "currency": {"symbol": "STX", "decimals": 6}},

rosetta-cli-config/stacks.ros

@@ -77,7 +77,6 @@ transfer(10){
          {
         "operation_identifier":{"index":0},
         "type":"fee",
-        "status" : "pending",
         "account":{{sender.account_identifier}},
         "amount":{
           "value":"-180",
@@ -87,7 +86,6 @@ transfer(10){
       {
         "operation_identifier":{"index":1},
         "type":"token_transfer",
-        "status" : "pending",
         "account":{{sender.account_identifier}},
         "amount":{
           "value":{{sender_amount}},
@@ -97,7 +95,6 @@ transfer(10){
       {
         "operation_identifier":{"index":2},
         "type":"token_transfer",
-        "status" : "pending",
         "account":{{recipient.account_identifier}},
         "amount":{
           "value":{{recipient_amount}},

src/api/controllers/db-controller.ts

@@ -46,7 +46,6 @@ import {
 import { readClarityValueArray, readTransactionPostConditions } from '../../p2p/tx';
 import { BufferReader } from '../../binary-reader';
 import { serializePostCondition, serializePostConditionMode } from '../serializers/post-conditions';
-import { DbSmartContractEvent, DbFtEvent, DbNftEvent } from '../../datastore/common';
 import { getOperations } from '../../rosetta-helpers';
 
 export function parseTxTypeStrings(values: string[]): TransactionType[] {
@@ -98,7 +97,7 @@ export function getTxTypeId(typeString: Transaction['tx_type']): DbTxTypeId {
   }
 }
 
-export function getTxStatusString(txStatus: DbTxStatus): Transaction['tx_status'] {
+export function getTxStatusString(txStatus: DbTxStatus | string): Transaction['tx_status'] {
   switch (txStatus) {
     case DbTxStatus.Pending:
       return 'pending';
@@ -108,13 +107,22 @@ export function getTxStatusString(txStatus: DbTxStatus): Transaction['tx_status'
       return 'abort_by_response';
     case DbTxStatus.AbortByPostCondition:
       return 'abort_by_post_condition';
-    case DbTxStatus.Empty:
-      return '';
+      case DbTxStatus.AbortByPostCondition:
+        return 'abort_by_post_condition';
     default:
       throw new Error(`Unexpected DbTxStatus: ${txStatus}`);
   }
 }
 
+export function getTxStatus(txStatus: DbTxStatus | string): string {
+  if(txStatus == ''){
+    return ''
+  }else{
+    return getTxStatusString(txStatus)
+  }
+  
+}
+
 type HasEventTransaction = SmartContractTransaction | ContractCallTransaction;
 
 function getEventTypeString(

src/api/routes/rosetta/construction.ts

@@ -334,19 +334,26 @@ export function createRosettaConstructionRouter(db: DataStore): RouterWithAsync
       res.status(400).json(RosettaErrors.invalidParams);
       return;
     }
-    const operations = getOperations(rawTxToBaseTx(inputTx));
-    let response;
-    if (signed) {
-      response = {
-        operations: operations,
-        account_identifier_signers: getSigners(transaction),
-      };
-    } else {
-      response = {
-        operations: operations,
-      };
+    try {
+      const operations = getOperations(rawTxToBaseTx(inputTx));
+      let response;
+      if (signed) {
+        response = {
+          operations: operations,
+          account_identifier_signers: getSigners(transaction),
+        };
+      } else {
+        response = {
+          operations: operations,
+        };
+      }
+      res.json(response);
+    } catch(error) {
+      console.error(error)
     }
-    res.json(response);
+   
+
+
   });
 
   //construction/submit endpoint
@@ -530,8 +537,6 @@ export function createRosettaConstructionRouter(db: DataStore): RouterWithAsync
       if (!hash.startsWith('01') && hash.slice(128) == '01') {
         hash = signatures[0].hex_bytes.slice(128) + signatures[0].hex_bytes.slice(0, -2);
       }
-      // const rotated = signatures[0].hex_bytes.slice(128) + signatures[0].hex_bytes.slice(0, -2);
-
       newSignature = createMessageSignature(hash);
     } catch (error) {
       res.status(400).json(RosettaErrors.invalidSignature);

src/datastore/common.ts

@@ -40,8 +40,7 @@ export enum DbTxStatus {
   Pending = 0,
   Success = 1,
   AbortByResponse = -1,
-  AbortByPostCondition = -2,
-  Empty = -3,
+  AbortByPostCondition = -2
 }
 
 export interface BaseTx {
@@ -57,7 +56,7 @@ export interface BaseTx {
   token_transfer_amount?: bigint;
   /** Hex encoded arbitrary message, up to 34 bytes length (should try decoding to an ASCII string). */
   token_transfer_memo?: Buffer;
-  status: DbTxStatus;
+  status: DbTxStatus | string;
   type_id: DbTxTypeId;
   /** Only valid for `contract_call` tx types */
   contract_call_contract_id?: string;

src/rosetta-helpers.ts

@@ -30,7 +30,7 @@ import { ec as EC } from 'elliptic';
 import { txidFromData } from '@blockstack/stacks-transactions/lib/utils';
 import * as btc from 'bitcoinjs-lib';
 import * as c32check from 'c32check';
-import { getTxStatusString, getTxTypeString } from './api/controllers/db-controller';
+import { getTxTypeString,getTxStatus } from './api/controllers/db-controller';
 import { RosettaConstants, RosettaNetworks } from './api/rosetta-constants';
 import { BaseTx, DbTxStatus, DbTxTypeId } from './datastore/common';
 import { getTxSenderAddress, getTxSponsorAddress } from './event-stream/reader';
@@ -81,7 +81,7 @@ function makeFeeOperation(tx: BaseTx): RosettaOperation {
   const fee: RosettaOperation = {
     operation_identifier: { index: 0 },
     type: 'fee',
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: { address: tx.sender_address },
     amount: {
       value: (BigInt(0) - tx.fee_rate).toString(10),
@@ -96,7 +96,7 @@ function makeSenderOperation(tx: BaseTx, index: number): RosettaOperation {
   const sender: RosettaOperation = {
     operation_identifier: { index: index },
     type: getTxTypeString(tx.type_id),
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: {
       address: unwrapOptional(tx.sender_address, () => 'Unexpected nullish sender_address'),
     },
@@ -123,7 +123,7 @@ function makeReceiverOperation(tx: BaseTx, index: number): RosettaOperation {
     operation_identifier: { index: index },
     related_operations: [{ index: 0, operation_identifier: { index: 1 } }],
     type: getTxTypeString(tx.type_id),
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: {
       address: unwrapOptional(
         tx.token_transfer_recipient_address,
@@ -150,7 +150,7 @@ function makeDeployContractOperation(tx: BaseTx, index: number): RosettaOperatio
   const deployer: RosettaOperation = {
     operation_identifier: { index: index },
     type: getTxTypeString(tx.type_id),
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: {
       address: unwrapOptional(tx.sender_address, () => 'Unexpected nullish sender_address'),
     },
@@ -163,7 +163,7 @@ function makeCallContractOperation(tx: BaseTx, index: number): RosettaOperation
   const caller: RosettaOperation = {
     operation_identifier: { index: index },
     type: getTxTypeString(tx.type_id),
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: {
       address: unwrapOptional(tx.sender_address, () => 'Unexpected nullish sender_address'),
       sub_account: {
@@ -186,7 +186,7 @@ function makeCoinbaseOperation(tx: BaseTx, index: number): RosettaOperation {
   const sender: RosettaOperation = {
     operation_identifier: { index: index },
     type: getTxTypeString(tx.type_id),
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: {
       address: unwrapOptional(tx.sender_address, () => 'Unexpected nullish sender_address'),
     },
@@ -200,7 +200,7 @@ function makePoisonMicroblockOperation(tx: BaseTx, index: number): RosettaOperat
   const sender: RosettaOperation = {
     operation_identifier: { index: index },
     type: getTxTypeString(tx.type_id),
-    status: getTxStatusString(tx.status),
+    status: getTxStatus(tx.status),
     account: {
       address: unwrapOptional(tx.sender_address, () => 'Unexpected nullish sender_address'),
     },
@@ -359,7 +359,7 @@ export function rawTxToBaseTx(raw_tx: string): BaseTx {
     token_transfer_recipient_address: recipientAddr,
     tx_id: txId,
     type_id: transactionType,
-    status: DbTxStatus.Empty,
+    status: '',
     fee_rate: fee,
     sender_address: txSender,
     token_transfer_amount: amount,