Refactor batch payer

.gitignore

@@ -16,6 +16,7 @@ fee.ini*
 .python-version
 lock
 .coverage
+.DS_Store
 
 # State diagram outputs for sphinx documentation
 config_cycle_state_diagram.png

pymnt/cfg/tz1iZ9LkpAhN8X1L6RpBtfy3wxpEWzFrXz8j.yaml

@@ -0,0 +1,17 @@
+baking_address: tz1iZ9LkpAhN8X1L6RpBtfy3wxpEWzFrXz8j
+delegator_pays_ra_fee: true
+delegator_pays_xfer_fee: true
+founders_map: {}
+min_delegation_amt: 0.0
+owners_map: {}
+pay_denunciation_rewards: true
+payment_address: tz1eSZusm331X4GdvGsnaFjuiBpq8yHprdrf
+plugins:
+    enabled: null
+reactivate_zeroed: true
+rewards_type: ideal
+rules_map:
+    mindelegation: TOB
+service_fee: 99
+specials_map: {}
+supporters_set: !!set {}

src/Constants.py

@@ -53,7 +53,7 @@
 
 # TzKT
 TZKT_PUBLIC_API_URL = {
-    "MAINNET": "https://api.tzkt.io/v1",
+    "MAINNET": "https://api.{}.tzkt.io/v1".format(CURRENT_TESTNET.lower()),
     CURRENT_TESTNET: "https://api.{}.tzkt.io/v1".format(CURRENT_TESTNET.lower()),
 }
 
@@ -118,9 +118,74 @@
 GIGA_BYTE = 1e9
 DISK_LIMIT_SIZE = 5 * GIGA_BYTE
 
+PKH_LENGTH = 36
+
 BUF_SIZE = 50
 
 
+# General transaction parameters:
+#
+# This fee limit is set to allow payouts to ovens
+# Other KT accounts with higher fee requirements will be skipped
+# TODO: define set of known contract formats and make this fee for unknown contracts configurable
+KT1_FEE_SAFETY_CHECK = False
+FEE_LIMIT_CONTRACTS = 100000
+ZERO_THRESHOLD = 1  # too less to payout in mutez
+MAX_TX_PER_BLOCK_TZ = 550
+MAX_TX_PER_BLOCK_KT = 25
+
+# For simulation
+# https://rpc.tzkt.io/mainnet/chains/main/blocks/head/context/constants
+HARD_GAS_LIMIT_PER_OPERATION = 1040000
+HARD_STORAGE_LIMIT_PER_OPERATION = 60000
+COST_PER_BYTE = 250
+MINIMUM_FEE_MUTEZ = 100
+MUTEZ_PER_GAS_UNIT = 0.1
+MUTEZ_PER_BYTE = 1
+
+PKH_LENGTH = 36
+SIGNATURE_BYTES_SIZE = 64
+MAX_NUM_TRIALS_PER_BLOCK = 2
+MAX_BLOCKS_TO_CHECK_AFTER_INJECTION = 5
+MAX_BATCH_PAYMENT_ATTEMPTS = 3
+
+COMM_DELEGATE_BALANCE = "/chains/main/blocks/{}/context/contracts/{}/balance"
+COMM_PAYMENT_HEAD = "/chains/main/blocks/head~10"
+COMM_HEAD = "/chains/main/blocks/head"
+COMM_COUNTER = "/chains/main/blocks/head/context/contracts/{}/counter"
+CONTENT = '{"kind":"transaction","source":"%SOURCE%","destination":"%DESTINATION%","fee":"%fee%","counter":"%COUNTER%","gas_limit":"%gas_limit%","storage_limit":"%storage_limit%","amount":"%AMOUNT%"}'
+FORGE_JSON = '{"branch": "%BRANCH%","contents":[%CONTENT%]}'
+RUNOPS_JSON = '{"branch": "%BRANCH%","contents":[%CONTENT%], "signature":"edsigtXomBKi5CTRf5cjATJWSyaRvhfYNHqSUGrn4SdbYRcGwQrUGjzEfQDTuqHhuA8b2d8NarZjz8TRf65WkpQmo423BtomS8Q"}'
+PREAPPLY_JSON = '[{"protocol":"%PROTOCOL%","branch":"%BRANCH%","contents":[%CONTENT%],"signature":"%SIGNATURE%"}]'
+JSON_WRAP = '{"operation": %JSON%,"chain_id":"%chain_id%"}'
+
+COMM_RUNOPS = "/chains/main/blocks/head/helpers/scripts/run_operation"
+COMM_FORGE = "/chains/main/blocks/head/helpers/forge/operations"
+COMM_PREAPPLY = "/chains/main/blocks/head/helpers/preapply/operations"
+COMM_INJECT = "/injection/operation"
+COMM_WAIT = "/chains/main/blocks/%BLOCK_HASH%/operation_hashes"
+
+# These values may change with protocol upgrades
+TX_FEES = {
+    "TZ1_TO_ALLOCATED_TZ1": {
+        "FEE": 298,
+        "GAS_LIMIT": 1451,
+        "STORAGE_LIMIT": 0,  # 65 mutez before
+    },
+    "TZ1_TO_NON_ALLOCATED_TZ1": {
+        "FEE": 397,
+        "GAS_LIMIT": 1421,
+        "STORAGE_LIMIT": 277,
+        "BURN_FEE": None,  # 0.257 tez before
+    },
+    "TZ1_REVEAL": {
+        "FEE": 357,
+        "GAS_LIMIT": 1000,
+        "STORAGE_LIMIT": 0,
+    },
+}
+
+
 class DryRun(str, Enum):
     SIGNER = "SIGNER"
     NO_SIGNER = "NO_SIGNER"

src/config/yaml_baking_conf_parser.py

@@ -240,16 +240,23 @@ def validate_baking_address(self, conf_obj):
                     "Baking address must be a valid tz address."
                 )
             else:
-                if not self.block_api.get_revelation(baking_address):
-                    raise ConfigurationException(
-                        "Baking address {} did not reveal key.".format(baking_address)
-                    )
+                try:
+                    if not self.block_api.get_revelation(baking_address):
+                        raise ConfigurationException(
+                            "Baking address {} did not reveal key.".format(
+                                baking_address
+                            )
+                        )
 
-                if not self.block_api.get_delegatable(baking_address):
-                    raise ConfigurationException(
-                        "Baking address {} is not enabled for delegation".format(
-                            baking_address
+                    if not self.block_api.get_delegatable(baking_address):
+                        raise ConfigurationException(
+                            "Baking address {} is not enabled for delegation".format(
+                                baking_address
+                            )
                         )
+                except KeyError:
+                    raise ConfigurationException(
+                        "unable to use signer, do you have it running?"
                     )
         else:
             raise ConfigurationException(

src/configure.py

@@ -247,6 +247,7 @@ def onexclude(input):
 
     try:
         address_target = input.split(",")
+
         address = address_target[0].strip()
         target = address_target[1].strip()
         AddressValidator("excluded address").validate(address)