Merge pull request #2813 from CounterpartyXCP/fixes

v10.7.4
CounterpartyXCP · Dec 9, 2024 · 43333e6 · 43333e6
2 parents 24a0aad + 8048f66
commit 43333e6
Show file tree

Hide file tree

Showing 26 changed files with 11,018 additions and 10,976 deletions.
diff --git a/apiary.apib b/apiary.apib
diff --git a/counterparty-core/counterpartycore/lib/config.py b/counterparty-core/counterpartycore/lib/config.py
@@ -5,7 +5,7 @@
 
 
 # Semantic Version
-__version__ = "10.7.3"  # for hatch
+__version__ = "10.7.4"  # for hatch
 VERSION_STRING = __version__
 version = VERSION_STRING.split("-")[0].split(".")
 VERSION_MAJOR = int(version[0])

diff --git a/counterparty-core/counterpartycore/lib/messages/versions/enhanced_send.py b/counterparty-core/counterpartycore/lib/messages/versions/enhanced_send.py
@@ -215,6 +215,7 @@ def parse(db, tx, message):
         "quantity": quantity,
         "status": status,
         "memo": memo_bytes,
+        "msg_index": ledger.get_send_msg_index(db, tx["tx_hash"]),
     }
     if "integer overflow" not in status and "quantity must be in satoshis" not in status:
         ledger.insert_record(db, "sends", bindings, "ENHANCED_SEND")

diff --git a/counterparty-core/counterpartycore/lib/messages/versions/mpma.py b/counterparty-core/counterpartycore/lib/messages/versions/mpma.py
@@ -225,7 +225,7 @@ def parse(db, tx, message):
 
         # Enumeration of the plain sends needs to be deterministic, so we sort them by asset and then by address
         plain_sends = sorted(plain_sends, key=lambda x: "".join([x[0], x[1]]))
-        for i, op in enumerate(plain_sends):
+        for op in plain_sends:
             if len(op) > 3:
                 memo_bytes = op[3]
             else:
@@ -241,7 +241,7 @@ def parse(db, tx, message):
                 "quantity": op[2],
                 "status": status,
                 "memo": memo_bytes,
-                "msg_index": i,
+                "msg_index": ledger.get_send_msg_index(db, tx["tx_hash"]),
             }
 
             ledger.insert_record(db, "sends", bindings, "MPMA_SEND")

diff --git a/counterparty-core/counterpartycore/lib/messages/versions/send1.py b/counterparty-core/counterpartycore/lib/messages/versions/send1.py
@@ -171,6 +171,7 @@ def parse(db, tx, message):
         "asset": asset,
         "quantity": quantity,
         "status": status,
+        "msg_index": ledger.get_send_msg_index(db, tx["tx_hash"]),
     }
     if "integer overflow" not in status and "quantity must be in satoshis" not in status:
         ledger.insert_record(db, "sends", bindings, "SEND")

diff --git a/counterparty-core/counterpartycore/test/fixtures/api_v2_fixtures.json b/counterparty-core/counterpartycore/test/fixtures/api_v2_fixtures.json
@@ -9,7 +9,7 @@
                 "difficulty": null,
                 "ledger_hash": "94a62752f851c8ec439fbbd46fbd0bd0d75987fb22416187a48a70e6e9af308a",
                 "txlist_hash": "75ba50d1c638cfdfbbf050abe6646376e9a65e13bd56dce814de9959d6ba3ac1",
-                "messages_hash": "d712fc779e33fdbe64e45df1ee3e30620f0c87570ea8d10bab7d82a8cea15a91",
+                "messages_hash": "123e9f97e5e6a126ca155b96af461923964732c8c35433dbaedc5ab21e07ba6c",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -21,7 +21,7 @@
                 "difficulty": null,
                 "ledger_hash": "572bb86d600d33ec82edac9b1077ec7700d526cb25a69bc2bf2e10953f403e01",
                 "txlist_hash": "0ffd42fa9627a38e66bde8b0dc265ec25a6b44db75dbd5f05cb20d93fbbcb67f",
-                "messages_hash": "9b7ba670baddd6022984465ba5bb70aba8c3d0c126c11ee7a0b2d9341ca6d4cf",
+                "messages_hash": "8c2eb533ea3d236da9166624a02f0c554a6a8e590657c02c189d9be26b023244",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -33,7 +33,7 @@
                 "difficulty": null,
                 "ledger_hash": "8bc0f9cfc1b75cdfd6e59f1d41c6b67b790a25a98b6240f7ff5df617f256cb00",
                 "txlist_hash": "c66db074cb4446477ac875d007c8a2145f4a95430cc144a305ee3e71fcdbd107",
-                "messages_hash": "534806223a151454cc198c72db7951d661c75e3d70af2036249020a8d63d5cdd",
+                "messages_hash": "fb6814082e549565fd89ddb9f75131e919d8e98c590b846c9e3bc7ca9e062c05",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -45,7 +45,7 @@
                 "difficulty": null,
                 "ledger_hash": "439c74d2a465996838179517ff57b2cc558d66848b857580be65319363846033",
                 "txlist_hash": "64d3d4ce91107031774de492adb7afb6b3d1e9e55fbc587c205a3fa0a36b6be6",
-                "messages_hash": "1b9a60c987a5c62f6927a84312b0437e006e444bc52c31641863262e7a24099b",
+                "messages_hash": "0212186911ad4ea7fbefc4c515852074821504e7a29ea3bb7afe23f39b2ebc01",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -57,7 +57,7 @@
                 "difficulty": null,
                 "ledger_hash": "5d0fa0f5c261642712f86c72055a7f19afe078a6c34e5538d77d85bb1b799a94",
                 "txlist_hash": "699935da2beafe8a13d0b6bafb2b7a9a57ca7a47c4cd352af9231b9c1313ff6b",
-                "messages_hash": "3c125a3308bdc284d8e16b92dc79ce247f8e2f14ce424e7ccea56c8fdea8097b",
+                "messages_hash": "bc88de98b0e951bebadedcacaafe35e734892fbfeb8d5b66e3e0169fce3875b3",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -69,7 +69,7 @@
                 "difficulty": null,
                 "ledger_hash": "f4f83f7b347792bb4c1336c694a08b2642717ebca900d9a0489bce1a2d994418",
                 "txlist_hash": "4512e4d49797db1713dd41784b0a38ef95c0a37386b2f1dfddffd16652ab1f13",
-                "messages_hash": "19e1b1f4f6a807bf5976cbc627fbcb942cf564e1d84002742b9c939bfa55ab17",
+                "messages_hash": "cc4baefa20d58d453994e4c6bd1a0a43311b0f9b4d1c2cbb2d7df9036337b508",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -81,7 +81,7 @@
                 "difficulty": null,
                 "ledger_hash": "995f4b278c55bf41f128a3dcc39a0389d4856e4aafab042c915eaaae536e40e2",
                 "txlist_hash": "88060fae502e50aee9fea21032e5655a6e77e65d289ba32302c70652400024c7",
-                "messages_hash": "bd4332e8de2aa3a9a000515a2082bc8a5ea37676994ad00d3906e33eab0de6d3",
+                "messages_hash": "51c471840c413a11a067faeb1b50c59b8573619ddb00a292ef78f19d65d91f17",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -93,7 +93,7 @@
                 "difficulty": null,
                 "ledger_hash": "d0a47afe3a6d2d2bf01e56643798c4a653d827046991571026345f44b34bac6f",
                 "txlist_hash": "1510f38f77e3400993a985c5b0e348cb9068c0ded5eeb2c4dc9ff0b6b5e50376",
-                "messages_hash": "21fd4f3bf938cc67aa00820968872fec60223ba4bc0ee6a78f90d25b618e534d",
+                "messages_hash": "e8ad25b4555337e928db7ec628a1ad2e21da8aab2f2690094511ed62c19bae2c",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -105,7 +105,7 @@
                 "difficulty": null,
                 "ledger_hash": "819360045a5f9ee7b2696a8b1cd2579371b25a43076e1f4731d948dcb7b14202",
                 "txlist_hash": "cc4e8152565916228bebeb034d239a8d7a921420a20403b98b8c9cfbae646beb",
-                "messages_hash": "81f2371b41bacbccbabdbe211d86766eb1487de6064eda2d778be2cbbe9da821",
+                "messages_hash": "e4a2f9290dc6991c343e5043db7bb994ea2a435f38da572b2b9f9d28fb621981",
                 "transaction_count": 0,
                 "confirmed": true
             },
@@ -117,7 +117,7 @@
                 "difficulty": null,
                 "ledger_hash": "5b2559a37945f4174c2f651c9315ca9b9c274b40baf87a0e0890615459f7f437",
                 "txlist_hash": "cc78db8ff880deb043ca80285a482d558c829579b198fbb4ec33d35499c89f10",
-                "messages_hash": "4ee525c1063f5d9fcca329941c1d05712e0304cb315f79e3c4d36023e3105f17",
+                "messages_hash": "5d919183614aad26e054c6383c0ff5a07798a961aa6626aae4757fc7c6bd3de3",
                 "transaction_count": 0,
                 "confirmed": true
             }
@@ -134,7 +134,7 @@
             "difficulty": null,
             "ledger_hash": "94a62752f851c8ec439fbbd46fbd0bd0d75987fb22416187a48a70e6e9af308a",
             "txlist_hash": "75ba50d1c638cfdfbbf050abe6646376e9a65e13bd56dce814de9959d6ba3ac1",
-            "messages_hash": "d712fc779e33fdbe64e45df1ee3e30620f0c87570ea8d10bab7d82a8cea15a91",
+            "messages_hash": "123e9f97e5e6a126ca155b96af461923964732c8c35433dbaedc5ab21e07ba6c",
             "transaction_count": 0,
             "confirmed": true
         }
@@ -148,7 +148,7 @@
             "difficulty": null,
             "ledger_hash": "3114d8091cfcaa9944c6fab49d51950535c4ef269877d58c372ed80b2b472ec6",
             "txlist_hash": "f065728a3544adc085fae976759c0d040a34ca0a8ddd39260b55f0262cd5baa8",
-            "messages_hash": "b36a13ee6d0e5c14dc24a84358530a52e6ea450824a194612b6eb65d9320188c",
+            "messages_hash": "82f0725d5c8f293bde79404f8d6321ae5cb18f454366bb0df8c79e8e6c9d942d",
             "transaction_count": 1,
             "confirmed": true
         }
@@ -162,7 +162,7 @@
             "difficulty": null,
             "ledger_hash": "6c240f1f3a985ff91e6a280c4448b8d739a06caa6fa383c4b9a7b90d27bdb17b",
             "txlist_hash": "d21ed1a33a3ff157708a8e8c5a11062e0b33a7682896f695cd174ee93dce7767",
-            "messages_hash": "7e390aad9c33545e3d9724aa7e07454bafc8bbaf5d92c76cf2329762d7e4df9b",
+            "messages_hash": "dae6d72781d6d86a1634656c8791642d13a91c9a77b062d5c4a45f2e8952b869",
             "transaction_count": 1,
             "confirmed": true
         }
@@ -227,7 +227,7 @@
                 "params": {
                     "block_index": 310491,
                     "ledger_hash": "3114d8091cfcaa9944c6fab49d51950535c4ef269877d58c372ed80b2b472ec6",
-                    "messages_hash": "b36a13ee6d0e5c14dc24a84358530a52e6ea450824a194612b6eb65d9320188c",
+                    "messages_hash": "82f0725d5c8f293bde79404f8d6321ae5cb18f454366bb0df8c79e8e6c9d942d",
                     "transaction_count": 1,
                     "txlist_hash": "f065728a3544adc085fae976759c0d040a34ca0a8ddd39260b55f0262cd5baa8",
                     "block_time": 310491000
@@ -6630,7 +6630,7 @@
                 "params": {
                     "block_index": 310703,
                     "ledger_hash": "94a62752f851c8ec439fbbd46fbd0bd0d75987fb22416187a48a70e6e9af308a",
-                    "messages_hash": "d712fc779e33fdbe64e45df1ee3e30620f0c87570ea8d10bab7d82a8cea15a91",
+                    "messages_hash": "123e9f97e5e6a126ca155b96af461923964732c8c35433dbaedc5ab21e07ba6c",
                     "transaction_count": 0,
                     "txlist_hash": "75ba50d1c638cfdfbbf050abe6646376e9a65e13bd56dce814de9959d6ba3ac1",
                     "block_time": 310703000
@@ -6661,7 +6661,7 @@
                 "params": {
                     "block_index": 310702,
                     "ledger_hash": "572bb86d600d33ec82edac9b1077ec7700d526cb25a69bc2bf2e10953f403e01",
-                    "messages_hash": "9b7ba670baddd6022984465ba5bb70aba8c3d0c126c11ee7a0b2d9341ca6d4cf",
+                    "messages_hash": "8c2eb533ea3d236da9166624a02f0c554a6a8e590657c02c189d9be26b023244",
                     "transaction_count": 0,
                     "txlist_hash": "0ffd42fa9627a38e66bde8b0dc265ec25a6b44db75dbd5f05cb20d93fbbcb67f",
                     "block_time": 310702000
@@ -6692,7 +6692,7 @@
                 "params": {
                     "block_index": 310701,
                     "ledger_hash": "8bc0f9cfc1b75cdfd6e59f1d41c6b67b790a25a98b6240f7ff5df617f256cb00",
-                    "messages_hash": "534806223a151454cc198c72db7951d661c75e3d70af2036249020a8d63d5cdd",
+                    "messages_hash": "fb6814082e549565fd89ddb9f75131e919d8e98c590b846c9e3bc7ca9e062c05",
                     "transaction_count": 0,
                     "txlist_hash": "c66db074cb4446477ac875d007c8a2145f4a95430cc144a305ee3e71fcdbd107",
                     "block_time": 310701000

diff --git a/counterparty-core/counterpartycore/test/fixtures/contract_vectors/ledger.py b/counterparty-core/counterpartycore/test/fixtures/contract_vectors/ledger.py
@@ -59,11 +59,11 @@
                     "block_index": 310703,
                     "command": "parse",
                     "category": "blocks",
-                    "bindings": '{"block_index":310703,"ledger_hash":"94a62752f851c8ec439fbbd46fbd0bd0d75987fb22416187a48a70e6e9af308a","messages_hash":"d712fc779e33fdbe64e45df1ee3e30620f0c87570ea8d10bab7d82a8cea15a91","transaction_count":0,"txlist_hash":"75ba50d1c638cfdfbbf050abe6646376e9a65e13bd56dce814de9959d6ba3ac1"}',
+                    "bindings": '{"block_index":310703,"ledger_hash":"94a62752f851c8ec439fbbd46fbd0bd0d75987fb22416187a48a70e6e9af308a","messages_hash":"123e9f97e5e6a126ca155b96af461923964732c8c35433dbaedc5ab21e07ba6c","transaction_count":0,"txlist_hash":"75ba50d1c638cfdfbbf050abe6646376e9a65e13bd56dce814de9959d6ba3ac1"}',
                     "timestamp": 0,
                     "event": "BLOCK_PARSED",
                     "tx_hash": None,
-                    "event_hash": "38eaff081f0b16eb0e7ad73e38cffef30049fe2b3db16ee317451153ca5d82f7",
+                    "event_hash": "65dbf95b0ba2fc533130889fff9c2222b85f8a4baa5bb22339de22b2cfdc539e",
                 },
             }
         ],