Don't create Escrow contract without beneficiary specification

skale/contracts/allocator/escrow.py

@@ -27,7 +27,7 @@
 def beneficiary_escrow(transaction):
     @functools.wraps(transaction)
     def wrapper(self, *args, beneficiary_address, **kwargs):
-        self.contract = self.init_beneficiary_contract(beneficiary_address)
+        self.contract = self.skale.instance.get_contract('Escrow', beneficiary_address)
         return transaction(self, *args, **kwargs)
     return wrapper
 
@@ -38,10 +38,8 @@ class Escrow(BaseContract):
     def allocator(self):
         return self.skale.allocator
 
-    def init_beneficiary_contract(self, beneficiary_address: str):
-        beneficiary_escrow_address = self.allocator.get_escrow_address(beneficiary_address)
-        return Escrow(self.skale, f'escrow_{beneficiary_address}', beneficiary_escrow_address,
-                      self.contract.abi).contract
+    def init_contract(self, skale, address, abi) -> None:
+        self.contract = None
 
     @beneficiary_escrow
     @transaction_method

skale/contracts/base_contract.py

@@ -121,7 +121,10 @@ def __init__(self, skale, name, address, abi):
         self.skale = skale
         self.name = name
         self.address = Web3.to_checksum_address(address)
-        self.contract = skale.web3.eth.contract(address=self.address, abi=abi)
+        self.init_contract(skale, address, abi)
+
+    def init_contract(self, skale, address, abi) -> None:
+        self.contract = skale.web3.eth.contract(address=address, abi=abi)
 
     def __getattr__(self, attr):
         """Fallback for contract calls"""

skale/skale_allocator.py

@@ -16,8 +16,11 @@
 #
 #   You should have received a copy of the GNU Affero General Public License
 #   along with SKALE.py.  If not, see <https://www.gnu.org/licenses/>.
+from __future__ import annotations
 
 import logging
+from typing import TYPE_CHECKING
+from web3.constants import ADDRESS_ZERO
 
 from skale.skale_base import SkaleBase
 import skale.contracts.allocator as contracts
@@ -26,6 +29,9 @@
 from skale.utils.contract_types import ContractTypes
 from skale.utils.helper import get_contracts_info
 
+if TYPE_CHECKING:
+    from eth_typing import ChecksumAddress
+
 
 logger = logging.getLogger(__name__)
 
@@ -50,5 +56,10 @@ class SkaleAllocator(SkaleBase):
     def project_name(self) -> str:
         return 'skale-allocator'
 
+    def get_contract_address(self, name) -> ChecksumAddress:
+        if name == 'Escrow':
+            return ADDRESS_ZERO
+        return super().get_contract_address(name)
+
     def set_contracts_info(self):
         self._SkaleBase__contracts_info = get_contracts_info(CONTRACTS_INFO)

tests/allocator/skale_allocator_test.py

@@ -16,7 +16,7 @@ def test_init_allocator():
         wallet,
         provider_timeout=20
     )
-    assert len(skale_allocator._SkaleBase__contracts) == 1
+    assert len(skale_allocator._SkaleBase__contracts) == 0
     assert skale_allocator.allocator
     assert skale_allocator.escrow
-    assert len(skale_allocator._SkaleBase__contracts) == 3
+    assert len(skale_allocator._SkaleBase__contracts) == 2