Merge branch 'fix/outbox-message-index'

bridge_indexer/handlers/etherlink/on_withdraw.py

@@ -45,6 +45,6 @@ async def on_withdraw(
         kernel_withdrawal_id=event.payload.withdrawal_id,
     )
 
-    ctx.logger.info(f'Etherlink Withdraw Event registered: {withdrawal.id}')
+    ctx.logger.info(f'Etherlink FA Token Withdraw Event registered: {withdrawal.id}')
 
     BridgeMatcherLocks.set_pending_etherlink_withdrawals()

bridge_indexer/handlers/etherlink/on_xtz_withdraw.py

@@ -35,6 +35,6 @@ async def on_xtz_withdraw(
         kernel_withdrawal_id=event.payload.withdrawal_id,
     )
 
-    ctx.logger.info(f'Etherlink Native Withdraw Event registered: {withdrawal.id}')
+    ctx.logger.info(f'Etherlink Native Token Withdraw Event registered: {withdrawal.id}')
 
     BridgeMatcherLocks.set_pending_etherlink_withdrawals()

bridge_indexer/handlers/tezos/on_rollup_execute.py

@@ -23,16 +23,16 @@ async def on_rollup_execute(
                 continue
             if int(operation['counter']) != execute.data.counter:
                 continue
-            message_hex = operation['output_proof']
+            output_proof_hex = operation['output_proof']
             break
 
     try:
-        assert message_hex
+        assert output_proof_hex
     except AssertionError:
         ctx.logger.error('Outbox Message execution not found in block operations.')
         return
 
-    decoder = OutputProofData(bytes.fromhex(message_hex))
+    decoder = OutputProofData(bytes.fromhex(output_proof_hex))
     output_proof, _ = decoder.unpack()
 
     try:

bridge_indexer/hasura/00_untracked_foreign_key_relationships.json

@@ -281,6 +281,26 @@
                 },
                 "source": "default"
             }
+        },
+        {
+            "type": "pg_create_array_relationship",
+            "args": {
+                "name": "l1_withdrawals",
+                "table": {
+                    "name": "rollup_outbox_message",
+                    "schema": "public"
+                },
+                "using": {
+                    "foreign_key_constraint_on": {
+                        "table": {
+                            "name": "l1_withdrawal",
+                            "schema": "public"
+                        },
+                        "column": "outbox_message_id"
+                    }
+                },
+                "source": "default"
+            }
         }
     ]
 }

bridge_indexer/hasura/01_untracked_bridge_operation_relationships.json

@@ -48,4 +48,3 @@
         }
     ]
 }
-

bridge_indexer/models/__init__.py

@@ -179,6 +179,7 @@ class Meta:
         source_field='outbox_message_id',
         to_field='id',
         index=True,
+        unique=True,
     )
 
     bridge_withdrawals: fields.ReverseRelation['BridgeWithdrawOperation']

bridge_indexer/types/output_proof/micheline_expression.py

@@ -129,10 +129,22 @@ def unpack(self):
         return int(bits_array, 2), self._size
 
 
+class Nat(BaseBinarySchema):
+    def unpack(self):
+        r, i = 0, 0
+        for i, e in enumerate(self._packed):
+            s = ((e & 0x7f) << (i * 7))
+            if s == 0:
+                break
+            r += s
+        self._size = i + 1
+        return r, self._size
+
+
 class OutputProofOutput(BaseBinarySchema):
     _schema = [
         ('outbox_level', 4, 'int32'),
-        ('message_index', None, 'Zarith'),
+        ('message_index', 1, 'uint8'),
         ('message', None, 'Message'),
     ]