Skip to content

fix: swapped delegatee/delegator mapping when saving proxy entries #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bitloi wants to merge 4 commits into from
+2 −2
Closed

fix: swapped delegatee/delegator mapping when saving proxy entries #917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d673ba
Fix proxy receipt parsing and address-book mapping
bitloi Apr 8, 2026
cdf27fd
Simplify proxy address-book write parameters
bitloi Apr 9, 2026
48d2a56
chore: rerun ci
bitloi Apr 9, 2026
c7f6756
Narrow proxy PR scope to mapping fix
bitloi Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bittensor_cli/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2088,8 +2088,8 @@ def config_get_proxies(self) -> None:
"""
table = Table(
Column("[bold white]Name", style=f"{COLORS.G.ARG}"),
Column("Address/Delegator", style="gold1"),
Column("Spawner/Delegatee", style="medium_purple"),
Column("Address/Delegatee", style="gold1"),
Column("Spawner/Delegator", style="medium_purple"),
Column("Proxy Type", style="medium_purple"),
Column("Delay", style="dim"),
Column("Note", style="dim"),
Expand Down Expand Up @@ -2174,8 +2174,8 @@ def config_update_proxy(
)
table = Table(
Column("[bold white]Name", style=f"{COLORS.G.ARG}"),
Column("Address/Delegator", style="gold1"),
Column("Spawner/Delegatee", style="medium_purple"),
Column("Address/Delegatee", style="gold1"),
Column("Spawner/Delegator", style="medium_purple"),
Column("Proxy Type", style="medium_purple"),
Column("Delay", style="dim"),
Column("Note", style="dim"),
Expand All @@ -2202,7 +2202,7 @@ def config_update_proxy(
break
console.print(table)
console.print(
"\n\n[1] Address/Delegator"
"\n\n[1] Address/Delegatee"
"\n[2] Spawner/Delegator"
"\n[3] Proxy Type"
"\n[4] Delay"
Expand Down Expand Up @@ -10127,7 +10127,7 @@ def proxy_execute_announced(
console.print(
f"Name: {p_name}\n"
f"Delay: {delay_}\n"
f"Spawner/Delegatee: {spawner}\n"
f"Spawner/Delegator: {spawner}\n"
f"Proxy Type: {proxy_type}\n"
f"Note: {note}\n"
)
Expand Down
232 changes: 203 additions & 29 deletions bittensor_cli/src/commands/proxy.py
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@thewhaleking thewhaleking Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The spawner is the delagatee though, not the delegator. I'll have @chideraao rework the table naming/wording.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import TYPE_CHECKING, Optional
from typing import TYPE_CHECKING, Any, Optional
import sys

from async_substrate_interface.errors import StateDiscardedError
Expand Down Expand Up @@ -55,6 +55,71 @@ class ProxyType(StrEnum):
RootClaim = "RootClaim"


async def extract_event_attributes_from_receipt(
receipt: Any, event_name: str
) -> Optional[dict[str, Any]]:
"""Extracts event attributes from a receipt, supporting nested and top-level event shapes."""

for event in await receipt.triggered_events:
if not isinstance(event, dict):
continue
event_data = event.get("event", event)
if not isinstance(event_data, dict):
continue
if event_data.get("event_id") == event_name:
attributes = event_data.get("attributes")
if isinstance(attributes, dict):
return attributes
return None
return None


def write_proxy_address_book_entry(
conn: Any,
cursor: Any,
*,
name: str,
delay: int,
proxy_type: str,
note: str,
pure: Optional[str] = None,
spawner: Optional[str] = None,
delegatee: Optional[str] = None,
delegator: Optional[str] = None,
) -> None:
"""Writes a normalized proxy address-book entry for pure and non-pure proxies."""

if pure is not None or spawner is not None:
if pure is None or spawner is None:
raise ValueError(
"Both `pure` and `spawner` must be supplied for a pure proxy."
)
ss58_address = pure
spawner_address = spawner
elif delegatee is not None or delegator is not None:
if delegatee is None or delegator is None:
raise ValueError(
"Both `delegatee` and `delegator` must be supplied for a regular proxy."
)
ss58_address = delegatee
spawner_address = delegator
else:
raise ValueError(
"Supply either (`pure`, `spawner`) or (`delegatee`, `delegator`)."
)

ProxyAddressBook.add_entry(
conn,
cursor,
name=name,
ss58_address=ss58_address,
delay=delay,
proxy_type=proxy_type,
note=note,
spawner=spawner_address,
)


# TODO add announce with also --reject and --remove


Expand Down Expand Up @@ -170,15 +235,70 @@ async def create_proxy(
),
)
if success:
created_pure = None
created_spawner = None
created_proxy_type = None
for event in await receipt.triggered_events:
if event["event_id"] == "PureCreated":
attrs = event["attributes"]
created_pure = attrs["pure"]
created_spawner = attrs["who"]
created_proxy_type = getattr(ProxyType, attrs["proxy_type"])
attrs = await extract_event_attributes_from_receipt(receipt, "PureCreated")
if attrs is None:
msg = "Created pure proxy, but could not parse the `PureCreated` event from the receipt."
if json_output:
json_console.print_json(
data={
"success": success,
"message": msg,
"data": None,
"extrinsic_identifier": await receipt.get_extrinsic_identifier(),
}
)
else:
await print_extrinsic_id(receipt)
console.print(msg)
return None

created_pure = attrs.get("pure")
created_spawner = attrs.get("who")
created_proxy_type_name = attrs.get("proxy_type")
if not (
isinstance(created_pure, str)
and isinstance(created_spawner, str)
and isinstance(created_proxy_type_name, str)
):
msg = (
"Created pure proxy, but received malformed `PureCreated` event attributes "
"from the receipt."
)
if json_output:
json_console.print_json(
data={
"success": success,
"message": msg,
"data": None,
"extrinsic_identifier": await receipt.get_extrinsic_identifier(),
}
)
else:
await print_extrinsic_id(receipt)
console.print(msg)
return None

try:
created_proxy_type = ProxyType(created_proxy_type_name)
except ValueError:
msg = (
"Created pure proxy, but received an unknown proxy type in the receipt: "
f"{created_proxy_type_name}."
)
if json_output:
json_console.print_json(
data={
"success": success,
"message": msg,
"data": None,
"extrinsic_identifier": await receipt.get_extrinsic_identifier(),
}
)
else:
await print_extrinsic_id(receipt)
console.print(msg)
return None

msg = (
f"Created pure '{created_pure}' "
f"from spawner '{created_spawner}' "
Expand Down Expand Up @@ -222,14 +342,14 @@ async def create_proxy(
"[Optional] Add a note for this proxy", default=""
)
with ProxyAddressBook.get_db() as (conn, cursor):
ProxyAddressBook.add_entry(
conn,
cursor,
write_proxy_address_book_entry(
conn=conn,
cursor=cursor,
name=proxy_name,
ss58_address=created_pure,
delay=delay,
proxy_type=created_proxy_type.value,
note=note,
pure=created_pure,
spawner=created_spawner,
)
console.print(
Expand Down Expand Up @@ -398,16 +518,70 @@ async def add_proxy(
era={"period": period},
)
if success:
delegatee = None
delegator = None
created_proxy_type = None
for event in await receipt.triggered_events:
if event["event_id"] == "ProxyAdded":
attrs = event["attributes"]
delegatee = attrs["delegatee"]
delegator = attrs["delegator"]
created_proxy_type = getattr(ProxyType, attrs["proxy_type"])
break
attrs = await extract_event_attributes_from_receipt(receipt, "ProxyAdded")
if attrs is None:
msg = "Added proxy, but could not parse the `ProxyAdded` event from the receipt."
if json_output:
json_console.print_json(
data={
"success": success,
"message": msg,
"data": None,
"extrinsic_identifier": await receipt.get_extrinsic_identifier(),
}
)
else:
await print_extrinsic_id(receipt)
console.print(msg)
return None

delegatee = attrs.get("delegatee")
delegator = attrs.get("delegator")
created_proxy_type_name = attrs.get("proxy_type")
if not (
isinstance(delegatee, str)
and isinstance(delegator, str)
and isinstance(created_proxy_type_name, str)
):
msg = (
"Added proxy, but received malformed `ProxyAdded` event attributes "
"from the receipt."
)
if json_output:
json_console.print_json(
data={
"success": success,
"message": msg,
"data": None,
"extrinsic_identifier": await receipt.get_extrinsic_identifier(),
}
)
else:
await print_extrinsic_id(receipt)
console.print(msg)
return None

try:
created_proxy_type = ProxyType(created_proxy_type_name)
except ValueError:
msg = (
"Added proxy, but received an unknown proxy type in the receipt: "
f"{created_proxy_type_name}."
)
if json_output:
json_console.print_json(
data={
"success": success,
"message": msg,
"data": None,
"extrinsic_identifier": await receipt.get_extrinsic_identifier(),
}
)
else:
await print_extrinsic_id(receipt)
console.print(msg)
return None

msg = (
f"Added proxy delegatee '{delegatee}' "
f"from delegator '{delegator}' "
Expand Down Expand Up @@ -451,15 +625,15 @@ async def add_proxy(
"[Optional] Add a note for this proxy", default=""
)
with ProxyAddressBook.get_db() as (conn, cursor):
ProxyAddressBook.add_entry(
conn,
cursor,
write_proxy_address_book_entry(
conn=conn,
cursor=cursor,
name=proxy_name,
ss58_address=delegator,
delay=delay,
proxy_type=created_proxy_type.value,
note=note,
spawner=delegatee,
delegatee=delegatee,
delegator=delegator,
)
console.print(
f"Added to Proxy Address Book.\n"
Expand Down
Loading