fix: consensus 2nd tx should not finish before 1st tx

.env.example

@@ -60,6 +60,7 @@ BACKEND_BUILD_TARGET    = 'debug'     # change to 'prod' or remove to run in pro
 HARDHAT_URL = 'http://hardhat'
 HARDHAT_PORT = '8545'
 HARDHAT_PRIVATE_KEY = '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
+
 # LLM Providers Configuration
 # If you want to use OpenAI LLMs, add your key here
 OPENAIKEY               = '<add_your_openai_api_key_here>'

backend/database_handler/chain_snapshot.py

@@ -18,7 +18,9 @@ def __init__(self, session: Session):
         self.all_validators = self.validators_registry.get_all_validators()
         self.pending_transactions = self._load_pending_transactions()
         self.num_validators = len(self.all_validators)
-        self.accepted_transactions = self._load_accepted_transactions()
+        self.accepted_undetermined_transactions = (
+            self._load_accepted_undetermined_transactions()
+        )
 
     def _load_pending_transactions(self) -> List[dict]:
         """Load and return the list of pending transactions from the database."""
@@ -41,19 +43,23 @@ def get_all_validators(self):
         """Return the list of all validators."""
         return self.all_validators
 
-    def _load_accepted_transactions(self) -> List[dict]:
-        """Load and return the list of accepted transactions from the database."""
+    def _load_accepted_undetermined_transactions(self) -> List[dict]:
+        """Load and return the list of accepted and undetermined transactions from the database."""
 
         accepted_transactions = (
             self.session.query(Transactions)
-            .filter(Transactions.status == TransactionStatus.ACCEPTED)
+            .filter(
+                (Transactions.status == TransactionStatus.ACCEPTED)
+                | (Transactions.status == TransactionStatus.UNDETERMINED)
+            )
+            .order_by(Transactions.timestamp_awaiting_finalization)
             .all()
         )
         return [
             TransactionsProcessor._parse_transaction_data(transaction)
             for transaction in accepted_transactions
         ]
 
-    def get_accepted_transactions(self):
-        """Return the list of accepted transactions."""
-        return self.accepted_transactions
+    def get_accepted_undetermined_transactions(self):
+        """Return the list of accepted and undetermined transactions."""
+        return self.accepted_undetermined_transactions

backend/database_handler/migration/versions/2a4ac5eb9455_appeal_failed.py

@@ -0,0 +1,35 @@
+"""appeal_failed
+
+Revision ID: 2a4ac5eb9455
+Revises: b9421e9f12aa
+Create Date: 2024-11-22 09:48:50.048787
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = "2a4ac5eb9455"
+down_revision: Union[str, None] = "b9421e9f12aa"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "transactions", sa.Column("appeal_failed", sa.Integer(), nullable=True)
+    )
+    # Set all existing 'appeal_failed' values to 0
+    op.execute("UPDATE transactions SET appeal_failed = 0 WHERE appeal_failed IS NULL")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("transactions", "appeal_failed")
+    # ### end Alembic commands ###

backend/database_handler/migration/versions/a4a32d27dde2_appeal_undetermined.py

@@ -0,0 +1,55 @@
+"""appeal_undetermined
+
+Revision ID: a4a32d27dde2
+Revises: 2a4ac5eb9455
+Create Date: 2024-11-25 14:49:46.916279
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = "a4a32d27dde2"
+down_revision: Union[str, None] = "2a4ac5eb9455"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "transactions", sa.Column("appeal_undetermined", sa.Boolean(), nullable=True)
+    )
+    op.execute(
+        "UPDATE transactions SET appeal_undetermined = FALSE WHERE appeal_undetermined IS NULL"
+    )
+    op.alter_column("transactions", "appeal_undetermined", nullable=False)
+    op.add_column(
+        "transactions",
+        sa.Column("timestamp_awaiting_finalization", sa.BigInteger(), nullable=True),
+    )
+    op.execute(
+        "UPDATE transactions SET timestamp_awaiting_finalization = 0 WHERE timestamp_awaiting_finalization IS NULL"
+    )
+    op.drop_column("transactions", "timestamp_accepted")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "transactions",
+        sa.Column(
+            "timestamp_accepted", sa.BIGINT(), autoincrement=False, nullable=True
+        ),
+    )
+    op.execute(
+        "UPDATE transactions SET timestamp_accepted = 0 WHERE timestamp_accepted IS NULL"
+    )
+    op.drop_column("transactions", "timestamp_awaiting_finalization")
+    op.drop_column("transactions", "appeal_undetermined")
+    # ### end Alembic commands ###

backend/database_handler/models.py

@@ -95,6 +95,7 @@ class Transactions(Base):
     s: Mapped[Optional[int]] = mapped_column(Integer)
     v: Mapped[Optional[int]] = mapped_column(Integer)
     ghost_contract_address: Mapped[Optional[str]] = mapped_column(String(255))
+    appeal_failed: Mapped[Optional[int]] = mapped_column(Integer)
 
     # Relationship for triggered transactions
     triggered_by_hash: Mapped[Optional[str]] = mapped_column(
@@ -115,7 +116,10 @@ class Transactions(Base):
         init=False,
     )
     appealed: Mapped[bool] = mapped_column(Boolean, default=False)
-    timestamp_accepted: Mapped[Optional[int]] = mapped_column(BigInteger, default=None)
+    appeal_undetermined: Mapped[bool] = mapped_column(Boolean, default=False)
+    timestamp_awaiting_finalization: Mapped[Optional[int]] = mapped_column(
+        BigInteger, default=None
+    )
 
 
 class Validators(Base):

backend/database_handler/transactions_processor.py

@@ -61,7 +61,9 @@ def _parse_transaction_data(transaction_data: Transactions) -> dict:
             ],
             "ghost_contract_address": transaction_data.ghost_contract_address,
             "appealed": transaction_data.appealed,
-            "timestamp_accepted": transaction_data.timestamp_accepted,
+            "timestamp_awaiting_finalization": transaction_data.timestamp_awaiting_finalization,
+            "appeal_failed": transaction_data.appeal_failed,
+            "appeal_undetermined": transaction_data.appeal_undetermined,
         }
 
     @staticmethod
@@ -224,7 +226,9 @@ def insert_transaction(
             ),
             ghost_contract_address=ghost_contract_address,
             appealed=False,
-            timestamp_accepted=None,
+            timestamp_awaiting_finalization=None,
+            appeal_failed=0,
+            appeal_undetermined=False,
         )
 
         self.session.add(new_transaction)
@@ -346,13 +350,31 @@ def set_transaction_appeal(self, transaction_hash: str, appeal: bool):
         )
         transaction.appealed = appeal
 
-    def set_transaction_timestamp_accepted(
-        self, transaction_hash: str, timestamp_accepted: int = None
+    def set_transaction_timestamp_awaiting_finalization(
+        self, transaction_hash: str, timestamp_awaiting_finalization: int = None
     ):
         transaction = (
             self.session.query(Transactions).filter_by(hash=transaction_hash).one()
         )
-        if timestamp_accepted:
-            transaction.timestamp_accepted = timestamp_accepted
+        if timestamp_awaiting_finalization:
+            transaction.timestamp_awaiting_finalization = (
+                timestamp_awaiting_finalization
+            )
         else:
-            transaction.timestamp_accepted = int(time.time())
+            transaction.timestamp_awaiting_finalization = int(time.time())
+
+    def set_transaction_appeal_failed(self, transaction_hash: str, appeal_failed: int):
+        if appeal_failed < 0:
+            raise ValueError("appeal_failed must be a non-negative integer")
+        transaction = (
+            self.session.query(Transactions).filter_by(hash=transaction_hash).one()
+        )
+        transaction.appeal_failed = appeal_failed
+
+    def set_transaction_appeal_undetermined(
+        self, transaction_hash: str, appeal_undetermined: bool
+    ):
+        transaction = (
+            self.session.query(Transactions).filter_by(hash=transaction_hash).one()
+        )
+        transaction.appeal_undetermined = appeal_undetermined

backend/domain/types.py

@@ -83,7 +83,9 @@ class Transaction:
     created_at: str | None = None
     ghost_contract_address: str | None = None
     appealed: bool = False
-    timestamp_accepted: int | None = None
+    timestamp_awaiting_finalization: int | None = None
+    appeal_failed: int = 0
+    appeal_undetermined: bool = False
 
     def to_dict(self):
         return {
@@ -105,7 +107,9 @@ def to_dict(self):
             "created_at": self.created_at,
             "ghost_contract_address": self.ghost_contract_address,
             "appealed": self.appealed,
-            "timestamp_accepted": self.timestamp_accepted,
+            "timestamp_awaiting_finalization": self.timestamp_awaiting_finalization,
+            "appeal_failed": self.appeal_failed,
+            "appeal_undetermined": self.appeal_undetermined,
         }
 
     @classmethod
@@ -129,5 +133,9 @@ def from_dict(cls, input: dict) -> "Transaction":
             created_at=input.get("created_at"),
             ghost_contract_address=input.get("ghost_contract_address"),
             appealed=input.get("appealed"),
-            timestamp_accepted=input.get("timestamp_accepted"),
+            timestamp_awaiting_finalization=input.get(
+                "timestamp_awaiting_finalization"
+            ),
+            appeal_failed=input.get("appeal_failed", 0),
+            appeal_undetermined=input.get("appeal_undetermined", False),
         )

backend/node/types.py

@@ -182,11 +182,11 @@ def from_dict(cls, input: dict) -> Optional["Receipt"]:
                 mode=ExecutionMode.from_string(input.get("mode")),
                 contract_state=input.get("contract_state"),
                 node_config=input.get("node_config"),
-                eq_outputs=input.get("eq_outputs"),
-                pending_transactions=tuple(
+                eq_outputs={int(k): v for k, v in input.get("eq_outputs", {}).items()},
+                pending_transactions=[
                     PendingTransaction.from_dict(pending_transaction)
                     for pending_transaction in input.get("pending_transactions", [])
-                ),
+                ],
             )
         else:
             return None

frontend/src/components/Simulator/TransactionItem.vue

@@ -18,6 +18,7 @@ const transactionsStore = useTransactionsStore();
 
 const props = defineProps<{
   transaction: TransactionItem;
+  finalityWindow: number;
 }>();
 
 const isDetailsModalOpen = ref(false);
@@ -55,7 +56,7 @@ const handleSetTransactionAppeal = () => {
 watch(
   () => props.transaction.status,
   (newStatus) => {
-    if (newStatus !== 'ACCEPTED') {
+    if (newStatus !== 'ACCEPTED' && newStatus !== 'UNDETERMINED') {
       isAppealed.value = false;
     }
   },
@@ -156,7 +157,11 @@ function prettifyTxData(x: any): any {
         as="button"
         @click.stop="handleSetTransactionAppeal"
         :class="{ '!bg-green-500': isAppealed }"
-        v-if="transaction.status == 'ACCEPTED'"
+        v-if="
+          (transaction.data.leader_only == false) &&
+          (transaction.status == 'ACCEPTED' || transaction.status == 'UNDETERMINED') &&
+          ((Date.now() / 1000) - transaction.data.timestamp_awaiting_finalization <= finalityWindow)
+        "
         v-tooltip="'Appeal transaction'"
       >
         <div class="flex items-center gap-1">
@@ -226,6 +231,22 @@ function prettifyTxData(x: any): any {
             >
               {{ transaction.status }}
             </TransactionStatusBadge>
+            <!-- <TransactionStatusBadge
+              as="button"
+              @click.stop="handleSetTransactionAppeal"
+              :class="{ '!bg-green-500': isAppealed }"
+              v-if="
+                (transaction.data.leader_only == false) &&
+                (transaction.status == 'ACCEPTED' || transaction.status == 'UNDETERMINED') &&
+                ((Date.now() / 1000) - transaction.data.timestamp_awaiting_finalization <= finalityWindow)
+              "
+              v-tooltip="'Appeal transaction'"
+            >
+              <div class="flex items-center gap-1">
+                APPEAL
+                <GavelIcon class="h-3 w-3" />
+              </div>
+            </TransactionStatusBadge> -->
           </p>
         </div>
 

frontend/src/components/Simulator/TransactionsList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed } from 'vue';
+import { ref, computed, defineProps } from 'vue';
 import { useContractsStore, useTransactionsStore } from '@/stores';
 import { TrashIcon } from '@heroicons/vue/24/solid';
 import TransactionItem from './TransactionItem.vue';
@@ -9,6 +9,10 @@ import EmptyListPlaceholder from '@/components/Simulator/EmptyListPlaceholder.vu
 const contractsStore = useContractsStore();
 const transactionsStore = useTransactionsStore();
 
+const props = defineProps({
+  finalityWindow: Number,
+});
+
 const transactions = computed(() => {
   const contractTransactions = transactionsStore.transactions.filter(
     (t) => t.localContractId === contractsStore.currentContractId,
@@ -54,6 +58,7 @@ const handleClearTransactions = () => {
         v-for="transaction in transactions"
         :key="transaction.hash"
         :transaction="transaction"
+        :finalityWindow="props.finalityWindow ?? 0"
       />
     </div>
 

frontend/src/services/JsonRpcService.ts

@@ -196,7 +196,6 @@ export class JsonRpcService implements IJsonRpcService {
   }
 
   async setFinalityWindowTime(time: number): Promise<any> {
-    console.log('Setting finality window time:', time, 'Type:', typeof time);
     return this.callRpcMethod<any>(
       'sim_setFinalityWindowTime',
       [time],

frontend/src/views/Simulator/RunDebugView.vue

@@ -102,7 +102,10 @@ const isFinalityWindowValid = computed(() => {
           id="tutorial-write-methods"
           :leaderOnly="leaderOnly"
         />
-        <TransactionsList id="tutorial-tx-response" />
+        <TransactionsList
+          id="tutorial-tx-response"
+          :finalityWindow="finalityWindow"
+        />
       </template>
     </template>