transition to static fee

vsys-host · Feb 6, 2024 · 4d60047 · 4d60047
1 parent 71f0b12
commit 4d60047
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/app/config.py b/app/config.py
@@ -22,7 +22,10 @@
     'MIN_TRANSFER_THRESHOLD': Decimal(os.environ.get('MIN_TRANSFER_THRESHOLD', '0.1')),
     'UPDATE_BALANCES_EVERY_SECONDS': os.environ.get('UPDATE_BALANCES_EVERY_SECONDS', '3600'),
     'LAST_BLOCK_LOCKED': os.environ.get('LAST_BLOCK_LOCKED', "False"),
-    'NETWORK_FEE': os.environ.get('NETWORK_FEE', "0.0005"), #in XRP
+    'NETWORK_FEE': os.environ.get('NETWORK_FEE', "0.00005"), # in XRP
+    'ACCOUNT_RESERVED_AMOUNT': os.environ.get('ACCOUNT_RESERVED_AMOUNT', "10"), # in XRP
+    'DELETE_ACCOUNT_FEE': os.environ.get('DELETE_ACCOUNT_FEE', "2"), # in XRP
+    'LEDGERS_TO_WAIT': os.environ.get('LEDGERS_TO_WAIT', "100"), # used to calc last_ledger_sequence for payments
     'XADDRESS_MODE': os.environ.get('XADDRESS_MODE', "disabled"), # uses one address and destination tag, DO NOT enable if not sure!
     'XRP_NETWORK': os.environ.get('XRP_NETWORK', 'main'),  # main, testnet
 

diff --git a/app/wallet.py b/app/wallet.py
@@ -411,19 +411,22 @@ def make_multipayout(self, payout_list):
         should_pay  = decimal.Decimal(0)
         for payout in payout_list:
             should_pay = should_pay + decimal.Decimal(payout['amount'])
-        should_pay = should_pay + len(payout_list) * decimal.Decimal(config['NETWORK_FEE']) + 10
+        should_pay = should_pay + len(payout_list) * decimal.Decimal(config['NETWORK_FEE']) + config['ACCOUNT_RESERVED_AMOUNT']
         have_crypto = self.get_fee_deposit_account_balance()
         if have_crypto < should_pay:
             raise Exception(f"Have not enough crypto on fee account, need {should_pay} have {have_crypto}")
         else:
             sending_wallet = xrpl.wallet.Wallet.from_seed(self.get_seed_from_address(self.get_fee_deposit_account()))
+            current_index = self.get_last_block_number()
+            last_ledger_seq = int(current_index) + int(config['LEDGERS_TO_WAIT'])
             for payout in payout_list:
                 payment = xrpl.models.transactions.Payment(
                         account=self.get_fee_deposit_account(),
                         amount=xrpl.utils.xrp_to_drops(payout['amount']),
                         destination=payout['dest'],
-                        destination_tag=payout['dest_tag'])
-
+                        destination_tag=payout['dest_tag'],
+                        fee=xrpl.utils.xrp_to_drops(config['NETWORK_FEE']),
+                        last_ledger_sequence=last_ledger_seq)                 				
                 try:    
                     response = xrpl.transaction.submit_and_wait(payment, self.client, sending_wallet)    
                 except xrpl.transaction.XRPLReliableSubmissionException as e:   
@@ -433,7 +436,7 @@ def make_multipayout(self, payout_list):
                     "dest": payout['dest'],
                     "amount": float(payout['amount']),
                     "status": "success",
-                    "txids": [response.result['hash']],
+                    "txids": [response.result['hash']], 
                 })
 
 
@@ -466,12 +469,17 @@ def drain_account(self, account_address, destination):
         if account_address == self.get_fee_deposit_account():
             logger.warning("Draining fee-deposit account")
             account_balance = self.get_balance(account_address)
-            amount = account_balance - decimal.Decimal('0.00002') - decimal.Decimal('10')
+            amount = account_balance - decimal.Decimal(config['NETWORK_FEE']) - decimal.Decimal(config['ACCOUNT_RESERVED_AMOUNT'])
+            current_index = self.get_last_block_number()
+            last_ledger_seq = int(current_index) + int(config['LEDGERS_TO_WAIT'])
             payment = xrpl.models.transactions.Payment(
                 account=sending_wallet.address,
                 amount=xrpl.utils.xrp_to_drops(int(amount)),
                 destination=destination,
+                fee=xrpl.utils.xrp_to_drops(config['NETWORK_FEE']),
+                last_ledger_sequence=last_ledger_seq 
             )
+
             logger.warning(xrpl.account.get_latest_transaction(account_address, self.client).result)
         else:    
             logger.warning("Draining regular one time account, calling delete account")
@@ -482,10 +490,15 @@ def drain_account(self, account_address, destination):
                    return False
             if int(self.get_last_block_number()) - int(self.get_sequence_number(account_address)) > 256:
                 logger.warning(f"Account {account_address} can be deleted")
+
+                current_index = self.get_last_block_number()
+                last_ledger_seq = int(current_index) + int(config['LEDGERS_TO_WAIT'])
 
                 payment = xrpl.models.transactions.AccountDelete(
                     account=sending_wallet.address,
                     destination=destination,
+                    fee=xrpl.utils.xrp_to_drops(config['DELETE_ACCOUNT_FEE']),
+                    last_ledger_sequence=last_ledger_seq 
                 )                
             else:
                 logger.warning("To soon to delete account, need wait some time: https://xrpl.org/accountdelete.html#error-cases")