From 3cd8a4e1a2fded4733fd39753385fd54b995335f Mon Sep 17 00:00:00 2001 From: Martin Lees Date: Thu, 1 May 2025 17:25:04 +0900 Subject: [PATCH 1/6] added pair_id to recurrent transfers --- .../operations/virtual/failed_recurrent_transfer_operation.py | 2 ++ .../operations/virtual/fill_recurrent_transfer_operation.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/schemas/operations/virtual/failed_recurrent_transfer_operation.py b/schemas/operations/virtual/failed_recurrent_transfer_operation.py index 3798bf35..1060aef6 100644 --- a/schemas/operations/virtual/failed_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/failed_recurrent_transfer_operation.py @@ -16,6 +16,7 @@ from schemas.virtual_operation import VirtualOperation DEFAULT_CONSECUTIVE_FAILURES: Final[Uint8t] = Uint8t(0) DEFAULT_REMAINING_EXECUTIONS: Final[Uint16t] = Uint16t(0) DEFAULT_DELETED: Final[bool] = False +DEFAULT_PAIR_ID: Final[Uint8t] = Uint8t(0) class _FailedRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[AssetHiveT, AssetHbdT]): @@ -29,6 +30,7 @@ class _FailedRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[ consecutive_failures: Uint8t = DEFAULT_CONSECUTIVE_FAILURES remaining_executions: Uint16t = DEFAULT_REMAINING_EXECUTIONS deleted: bool = DEFAULT_DELETED + pair_id: Uint8t = DEFAULT_PAIR_ID class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): diff --git a/schemas/operations/virtual/fill_recurrent_transfer_operation.py b/schemas/operations/virtual/fill_recurrent_transfer_operation.py index cb9e507c..3f59485f 100644 --- a/schemas/operations/virtual/fill_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/fill_recurrent_transfer_operation.py @@ -14,7 +14,7 @@ from schemas.fields.integers import Uint16t from schemas.virtual_operation import VirtualOperation DEFAULT_REMAINING_EXECUTIONS: Final[Uint16t] = Uint16t(0) - +DEFAULT_PAIR_ID: Final[Uint8t] = Uint8t(0) class _FillRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[AssetHiveT, AssetHbdT]): __operation_name__ = "fill_recurrent_transfer" @@ -25,7 +25,7 @@ class _FillRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[As amount: AssetHiveT | AssetHbdT memo: str remaining_executions: Uint16t = DEFAULT_REMAINING_EXECUTIONS - + pair_id: Uint8t = DEFAULT_PAIR_ID class FillRecurrentTransferOperation(_FillRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... -- GitLab From db47abf16f19103df808603ed878145ce59e4c2b Mon Sep 17 00:00:00 2001 From: Martin Lees Date: Thu, 1 May 2025 17:26:00 +0900 Subject: [PATCH 2/6] fix import --- schemas/operations/virtual/fill_recurrent_transfer_operation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/operations/virtual/fill_recurrent_transfer_operation.py b/schemas/operations/virtual/fill_recurrent_transfer_operation.py index 3f59485f..1c26f795 100644 --- a/schemas/operations/virtual/fill_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/fill_recurrent_transfer_operation.py @@ -10,7 +10,7 @@ from schemas.fields.assets.hive import AssetHiveHF26, AssetHiveLegacy, AssetHive from schemas.fields.basic import ( AccountName, ) -from schemas.fields.integers import Uint16t +from schemas.fields.integers import Uint8t, Uint16t from schemas.virtual_operation import VirtualOperation DEFAULT_REMAINING_EXECUTIONS: Final[Uint16t] = Uint16t(0) -- GitLab From 29c69909b13a703234d72d60c9ae848c3327b843 Mon Sep 17 00:00:00 2001 From: Martin Lees Date: Thu, 1 May 2025 17:35:43 +0900 Subject: [PATCH 3/6] black format --- .../virtual/failed_recurrent_transfer_operation.py | 6 ++---- .../virtual/fill_recurrent_transfer_operation.py | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/schemas/operations/virtual/failed_recurrent_transfer_operation.py b/schemas/operations/virtual/failed_recurrent_transfer_operation.py index 1060aef6..381f46bd 100644 --- a/schemas/operations/virtual/failed_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/failed_recurrent_transfer_operation.py @@ -33,9 +33,7 @@ class _FailedRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[ pair_id: Uint8t = DEFAULT_PAIR_ID -class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): - ... +class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... -class FailedRecurrentTransferOperationLegacy(_FailedRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): - ... +class FailedRecurrentTransferOperationLegacy(_FailedRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): ... diff --git a/schemas/operations/virtual/fill_recurrent_transfer_operation.py b/schemas/operations/virtual/fill_recurrent_transfer_operation.py index 1c26f795..0353ba17 100644 --- a/schemas/operations/virtual/fill_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/fill_recurrent_transfer_operation.py @@ -16,6 +16,7 @@ from schemas.virtual_operation import VirtualOperation DEFAULT_REMAINING_EXECUTIONS: Final[Uint16t] = Uint16t(0) DEFAULT_PAIR_ID: Final[Uint8t] = Uint8t(0) + class _FillRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[AssetHiveT, AssetHbdT]): __operation_name__ = "fill_recurrent_transfer" __offset__ = 33 @@ -27,9 +28,8 @@ class _FillRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[As remaining_executions: Uint16t = DEFAULT_REMAINING_EXECUTIONS pair_id: Uint8t = DEFAULT_PAIR_ID -class FillRecurrentTransferOperation(_FillRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): - ... + +class FillRecurrentTransferOperation(_FillRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... -class FillRecurrentTransferOperationLegacy(_FillRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): - ... +class FillRecurrentTransferOperationLegacy(_FillRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): ... -- GitLab From 46192e7eb900687f54775e85d7566c2136d7f1dd Mon Sep 17 00:00:00 2001 From: Martin Lees Date: Thu, 1 May 2025 17:37:51 +0900 Subject: [PATCH 4/6] test --- .../virtual/failed_recurrent_transfer_operation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/schemas/operations/virtual/failed_recurrent_transfer_operation.py b/schemas/operations/virtual/failed_recurrent_transfer_operation.py index 381f46bd..b58eb2c0 100644 --- a/schemas/operations/virtual/failed_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/failed_recurrent_transfer_operation.py @@ -33,7 +33,8 @@ class _FailedRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[ pair_id: Uint8t = DEFAULT_PAIR_ID -class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... +class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): + ... - -class FailedRecurrentTransferOperationLegacy(_FailedRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): ... +class FailedRecurrentTransferOperationLegacy(_FailedRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): + ... \ No newline at end of file -- GitLab From 115a99186f4cebb9d4572f07c11b47b71a7cd5e3 Mon Sep 17 00:00:00 2001 From: Martin Lees Date: Thu, 1 May 2025 17:38:42 +0900 Subject: [PATCH 5/6] somehow my black is not the ci black --- .../virtual/failed_recurrent_transfer_operation.py | 2 +- .../virtual/fill_recurrent_transfer_operation.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/schemas/operations/virtual/failed_recurrent_transfer_operation.py b/schemas/operations/virtual/failed_recurrent_transfer_operation.py index b58eb2c0..354ded4c 100644 --- a/schemas/operations/virtual/failed_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/failed_recurrent_transfer_operation.py @@ -37,4 +37,4 @@ class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHi ... class FailedRecurrentTransferOperationLegacy(_FailedRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): - ... \ No newline at end of file + ... diff --git a/schemas/operations/virtual/fill_recurrent_transfer_operation.py b/schemas/operations/virtual/fill_recurrent_transfer_operation.py index 0353ba17..8ff334e9 100644 --- a/schemas/operations/virtual/fill_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/fill_recurrent_transfer_operation.py @@ -29,7 +29,8 @@ class _FillRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[As pair_id: Uint8t = DEFAULT_PAIR_ID -class FillRecurrentTransferOperation(_FillRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... +class FillRecurrentTransferOperation(_FillRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): + ... - -class FillRecurrentTransferOperationLegacy(_FillRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): ... +class FillRecurrentTransferOperationLegacy(_FillRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): + ... -- GitLab From 8af0f6e3f8a45cd4007bf611afcbeede312e1457 Mon Sep 17 00:00:00 2001 From: Martin Lees Date: Thu, 1 May 2025 17:40:11 +0900 Subject: [PATCH 6/6] done --- .../operations/virtual/failed_recurrent_transfer_operation.py | 1 + schemas/operations/virtual/fill_recurrent_transfer_operation.py | 1 + 2 files changed, 2 insertions(+) diff --git a/schemas/operations/virtual/failed_recurrent_transfer_operation.py b/schemas/operations/virtual/failed_recurrent_transfer_operation.py index 354ded4c..1060aef6 100644 --- a/schemas/operations/virtual/failed_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/failed_recurrent_transfer_operation.py @@ -36,5 +36,6 @@ class _FailedRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[ class FailedRecurrentTransferOperation(_FailedRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... + class FailedRecurrentTransferOperationLegacy(_FailedRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): ... diff --git a/schemas/operations/virtual/fill_recurrent_transfer_operation.py b/schemas/operations/virtual/fill_recurrent_transfer_operation.py index 8ff334e9..4ecc0bb5 100644 --- a/schemas/operations/virtual/fill_recurrent_transfer_operation.py +++ b/schemas/operations/virtual/fill_recurrent_transfer_operation.py @@ -32,5 +32,6 @@ class _FillRecurrentTransferOperation(VirtualOperation, GenericModel, Generic[As class FillRecurrentTransferOperation(_FillRecurrentTransferOperation[AssetHiveHF26, AssetHbdHF26]): ... + class FillRecurrentTransferOperationLegacy(_FillRecurrentTransferOperation[AssetHiveLegacy, AssetHbdLegacy]): ... -- GitLab