diff --git a/nucypher/characters/lawful.py b/nucypher/characters/lawful.py index 1cb0a4cbc..83395841a 100644 --- a/nucypher/characters/lawful.py +++ b/nucypher/characters/lawful.py @@ -1012,7 +1012,7 @@ class Ursula(Teacher, Character, Operator): decentralized_identity_evidence = None else: decentralized_identity_evidence = self.decentralized_identity_evidence - payload = NodeMetadataPayload(canonical_address=self.canonical_address, + payload = NodeMetadataPayload(staker_address=self.canonical_address, domain=self.domain, timestamp_epoch=timestamp.epoch, decentralized_identity_evidence=decentralized_identity_evidence, diff --git a/nucypher/characters/unlawful.py b/nucypher/characters/unlawful.py index 6100e3b5a..5f4a76f67 100644 --- a/nucypher/characters/unlawful.py +++ b/nucypher/characters/unlawful.py @@ -95,7 +95,7 @@ class Vladimir(Ursula): # so it should work regardless of the binary format. # Our basic replacement. We want to impersonate the target Ursula. - metadata_bytes = metadata_bytes.replace(metadata.payload.canonical_address, + metadata_bytes = metadata_bytes.replace(metadata.payload.staker_address, vladimir.canonical_address) # Use our own verifying key diff --git a/nucypher/network/nodes.py b/nucypher/network/nodes.py index 5e3a01081..fe7f1b62d 100644 --- a/nucypher/network/nodes.py +++ b/nucypher/network/nodes.py @@ -120,7 +120,7 @@ class NodeSprout: @property def canonical_address(self): - return self._metadata_payload.canonical_address + return self._metadata_payload.staker_address @property def nickname(self): diff --git a/nucypher/policy/revocation.py b/nucypher/policy/revocation.py index be070cb9e..45621afec 100644 --- a/nucypher/policy/revocation.py +++ b/nucypher/policy/revocation.py @@ -29,7 +29,7 @@ class RevocationKit: self.revocations = dict() for ursula_address, encrypted_kfrag in treasure_map.destinations.items(): self.revocations[ursula_address] = RevocationOrder(signer=signer.as_umbral_signer(), - ursula_address=ursula_address, + staker_address=ursula_address, encrypted_kfrag=encrypted_kfrag) def __iter__(self): diff --git a/tests/unit/test_external_ip_utilities.py b/tests/unit/test_external_ip_utilities.py index 7378162d4..88cbccc28 100644 --- a/tests/unit/test_external_ip_utilities.py +++ b/tests/unit/test_external_ip_utilities.py @@ -68,7 +68,7 @@ class Dummy: # Teacher def metadata(self): signer = Signer(SecretKey.random()) - payload = NodeMetadataPayload(canonical_address=self.canonical_address, + payload = NodeMetadataPayload(staker_address=self.canonical_address, domain=':dummy:', timestamp_epoch=0, decentralized_identity_evidence=b'\x00' * LENGTH_ECDSA_SIGNATURE_WITH_RECOVERY,