refactor(contracts)!: StreamManager upgrades

scripts/deploy.py

@@ -127,8 +127,8 @@ def manager(
             project.StreamManager,
             owner or account,
             min_stream_life,
-            list(validators),
             token_addresses,
+            list(validators),
             publish=publish,
         )
 
@@ -138,3 +138,10 @@ def manager(
 @account_option()
 def token(cli_ctx, account):
     account.deploy(project.TestToken)
+
+
+@cli.command(cls=ConnectedProviderCommand, short_help="Deploy a Mock validator")
+@ape_cli_context()
+@account_option()
+def validator(cli_ctx, account):
+    account.deploy(project.TestValidator)

sdk/py/apepay/manager.py

@@ -1,8 +1,10 @@
 from collections.abc import Iterator
 from datetime import timedelta
+from difflib import Differ
 from functools import partial, wraps
 from typing import TYPE_CHECKING, Any, Callable, Union, cast
 
+import click
 from ape.api import ReceiptAPI
 from ape.contracts.base import ContractEvent, ContractInstance, ContractTransactionHandler
 from ape.exceptions import ContractLogicError, DecodingError
@@ -89,21 +91,32 @@ def _parse_validator(self) -> Callable[[_ValidatorItem], Validator]:
     def set_validators(self) -> ContractTransactionHandler:
 
         @wraps(self.contract.set_validators)
-        def order_validators(*validators: _ValidatorItem, **txn_kwargs) -> ReceiptAPI:
+        def set_validators(*validators: _ValidatorItem, **txn_kwargs) -> ReceiptAPI:
             # NOTE: Always keep sets sorted, ensure no duplicates
-            return self.contract.set_validators(
-                sorted(v.address for v in set(map(self._parse_validator, validators))),
-                **txn_kwargs,
-            )
+            new_validators = sorted(v.address for v in set(map(self._parse_validator, validators)))
+            # NOTE: Okay to use Click here, intended primarily to support interactive features
+            click.echo("Validators update:")
+            for line in Differ().compare(tuple(v.address for v in self.validators), new_validators):
+                click.echo(line)
+            return self.contract.set_validators(new_validators, **txn_kwargs)
 
-        return cast(ContractTransactionHandler, order_validators)
+        return cast(ContractTransactionHandler, set_validators)
 
     def add_validators(self, *new_validators: _ValidatorItem, **txn_kwargs) -> ReceiptAPI:
         return self.set_validators(
             *(set(self.validators) | set(map(self._parse_validator, new_validators))),
             **txn_kwargs,
         )
 
+    def replace_validator(self, old_validator, new_validator, **txn_kwargs) -> ReceiptAPI:
+        return self.set_validators(
+            *(
+                (set(self.validators) - set([self._parse_validator(old_validator)]))
+                | set([self._parse_validator(new_validator)])
+            ),
+            **txn_kwargs,
+        )
+
     def remove_validators(self, *old_validators: _ValidatorItem, **txn_kwargs) -> ReceiptAPI:
         return self.set_validators(
             *(set(self.validators) - set(map(self._parse_validator, old_validators))),

sdk/py/apepay/validators.py

@@ -25,6 +25,9 @@ def __init__(self, address: str | AddressType, /, *args, **kwargs):
         kwargs["address"] = address
         super().__init__(*args, **kwargs)
 
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self.address})"
+
     @field_validator("address", mode="before")
     def normalize_address(cls, value: Any) -> AddressType:
         if isinstance(value, Validator):