Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-24 06:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

added support for v2.0 transaction to DB writing/reading

Browse Source 
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2023-01-16 09:58:08 +01:00
parent 2f09eec368
commit 77c12d0b0e
No known key found for this signature in database
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
planetmint/backend/models/dbtransaction.py
View File

@ -39,7 +39,7 @@ class DbTransaction:
operation=transaction[1], operation=transaction[1],
version=transaction[2], version=transaction[2],
metadata=MetaData.from_dict(transaction[3]), metadata=MetaData.from_dict(transaction[3]),
assets=Asset.from_list_dict(transaction[4]), assets=Asset.from_list_dict(transaction[4]) if transaction[2] != "2.0" else Asset.from_dict(transaction[4][0]),
inputs=Input.from_list_dict(transaction[5]), inputs=Input.from_list_dict(transaction[5]),
script=Script.from_dict(transaction[6]), script=Script.from_dict(transaction[6]),
) )
@ -66,7 +66,7 @@ class DbTransaction:
"outputs": Output.list_to_dict(self.outputs), "outputs": Output.list_to_dict(self.outputs),
"operation": self.operation, "operation": self.operation,
"metadata": self.metadata.to_dict() if self.metadata is not None else None, "metadata": self.metadata.to_dict() if self.metadata is not None else None,
"assets": Asset.list_to_dict(self.assets), "assets": Asset.list_to_dict(self.assets) if self.version!="2.0" else Asset.to_dict(self.assets),
"version": self.version, "version": self.version,
"id": self.id, "id": self.id,
"script": self.script.to_dict() if self.script is not None else None, "script": self.script.to_dict() if self.script is not None else None,

6
planetmint/backend/tarantool/query.py
View File

@ -129,12 +129,16 @@ def store_transaction(connection, transaction, table = TARANT_TABLE_TRANSACTION)
if TARANT_TABLE_SCRIPT in transaction: if TARANT_TABLE_SCRIPT in transaction:
scripts = transaction[TARANT_TABLE_SCRIPT] scripts = transaction[TARANT_TABLE_SCRIPT]
asset_obj = Transaction.get_assets_tag(transaction["version"]) asset_obj = Transaction.get_assets_tag(transaction["version"])
if( transaction["version"] == "2.0"):
asset_array = [ transaction[asset_obj] ]
else:
asset_array = transaction[asset_obj]
tx = ( tx = (
transaction["id"], transaction["id"],
transaction["operation"], transaction["operation"],
transaction["version"], transaction["version"],
transaction["metadata"], transaction["metadata"],
transaction[asset_obj], asset_array,
transaction["inputs"], transaction["inputs"],
scripts, scripts,
) )