Skip to content

Commit 35dc7d8

Browse files
committed
Merge branch 'feat/identity-rebased' into feat/on-chain-identity-controller-delegation
2 parents 8b31788 + f5b52f0 commit 35dc7d8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

identity_iota_core/packages/iota_identity/sources/multicontroller.move

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module iota_identity::multicontroller {
5151
/// and using `controllers` to set controllers: i.e. each `(recipient, voting power)`
5252
/// in `controllers` results in `recipient` obtaining a `ControllerCap` with the
5353
/// specified voting power.
54-
/// Controllers that should be able to delegate their access, should be passed through
54+
/// Controllers that are able to delegate their access, should be passed through
5555
/// `controllers_that_can_delegate` parameter.
5656
public fun new_with_controllers<V>(
5757
controlled_value: V,

identity_iota_core/src/rebased/migration/alias.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,24 @@ impl UnmigratedAlias {
8585
unreachable!("alias was wrapped by us")
8686
};
8787
// Get the ID of the `AliasOutput` that owns this `Alias`.
88-
let alias_output_id = client
88+
let dynamic_field_wrapper = client
8989
.read_api()
9090
.get_object_with_options(*alias.id.object_id(), IotaObjectDataOptions::new().with_owner())
9191
.await
9292
.map_err(|e| Error::RpcError(e.to_string()))?
9393
.owner()
9494
.expect("owner was requested")
9595
.get_owner_address()
96+
.expect("alias is a dynamic field")
97+
.into();
98+
let alias_output_id = client
99+
.read_api()
100+
.get_object_with_options(dynamic_field_wrapper, IotaObjectDataOptions::new().with_owner())
101+
.await
102+
.map_err(|e| Error::RpcError(e.to_string()))?
103+
.owner()
104+
.expect("owner was requested")
105+
.get_owner_address()
96106
.expect("alias is owned by an alias_output")
97107
.into();
98108
// Get alias_output's ref.

0 commit comments

Comments
 (0)