Skip to content

Remove key from OwnableState #152

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

Merged
merged 7 commits into from
Oct 27, 2025
Merged

Remove key from OwnableState #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
976e180
Remove key from OwnableState
JohnChangUK Oct 21, 2025
be70105
Merge branch 'develop' into ownable-state
JohnChangUK Oct 23, 2025
c5e4434
Merge branch 'develop' into ownable-state
JohnChangUK Oct 25, 2025
c43b305
Merge branch 'develop' into ownable-state
FelixFan1992 Oct 27, 2025
970847f
Merge branch 'develop' into ownable-state
JohnChangUK Oct 27, 2025
c8334ac
Regen bindings
JohnChangUK Oct 27, 2025
407652a
Merge branch 'develop' into ownable-state
JohnChangUK Oct 27, 2025
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
146 changes: 70 additions & 76 deletions bindings/generated/ccip/ccip_onramp/ownable/ownable.go
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions contracts/ccip/ccip/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -24,7 +23,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -75,18 +73,16 @@ public fun new_with_key<K: copy + drop + store>(
new_internal(owner_cap, ctx)
}

fun new_internal(owner_cap: OwnerCap, ctx: &mut TxContext): (OwnableState, OwnerCap) {
fun new_internal(owner_cap: OwnerCap, ctx: &TxContext): (OwnableState, OwnerCap) {
let owner = ctx.sender();

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -246,7 +242,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -256,6 +251,5 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}
3 changes: 1 addition & 2 deletions contracts/ccip/ccip/tests/state_object_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,10 @@ public fun test_add_package_id_with_invalid_owner_cap() {
// Cleanup
let TestObject { id } = obj;
object::delete(id);
transfer::public_transfer(ownable_state, @0x0);
transfer::public_transfer(fake_owner_cap, @0x0);

// Cleanup the original scenario objects
test_scenario::return_to_sender(&scenario, owner_cap);
ownable::destroy(ownable_state, owner_cap, ctx);
test_scenario::return_shared(ref);
test_scenario::end(scenario);
}
Expand Down
10 changes: 2 additions & 8 deletions contracts/ccip/ccip_offramp/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -24,7 +23,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -75,18 +73,16 @@ public fun new_with_key<K: copy + drop + store>(
new_internal(owner_cap, ctx)
}

fun new_internal(owner_cap: OwnerCap, ctx: &mut TxContext): (OwnableState, OwnerCap) {
fun new_internal(owner_cap: OwnerCap, ctx: &TxContext): (OwnableState, OwnerCap) {
let owner = ctx.sender();

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -246,7 +242,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -256,6 +251,5 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}
10 changes: 2 additions & 8 deletions contracts/ccip/ccip_onramp/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -24,7 +23,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -75,18 +73,16 @@ public fun new_with_key<K: copy + drop + store>(
new_internal(owner_cap, ctx)
}

fun new_internal(owner_cap: OwnerCap, ctx: &mut TxContext): (OwnableState, OwnerCap) {
fun new_internal(owner_cap: OwnerCap, ctx: &TxContext): (OwnableState, OwnerCap) {
let owner = ctx.sender();

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -246,7 +242,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -256,6 +251,5 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}
10 changes: 2 additions & 8 deletions contracts/ccip/ccip_router/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -26,7 +25,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -77,18 +75,16 @@ public fun new_with_key<K: copy + drop + store>(
new_internal(owner_cap, ctx)
}

fun new_internal(owner_cap: OwnerCap, ctx: &mut TxContext): (OwnableState, OwnerCap) {
fun new_internal(owner_cap: OwnerCap, ctx: &TxContext): (OwnableState, OwnerCap) {
let owner = ctx.sender();

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -248,7 +244,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -258,6 +253,5 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}
8 changes: 1 addition & 7 deletions contracts/ccip/ccip_token_pools/burn_mint_token_pool/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -23,7 +22,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -62,14 +60,12 @@ public(package) fun new(ctx: &mut TxContext): (OwnableState, OwnerCap) {
};

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -225,7 +221,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -235,7 +230,6 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}

Expand Down
8 changes: 1 addition & 7 deletions contracts/ccip/ccip_token_pools/lock_release_token_pool/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -23,7 +22,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -62,14 +60,12 @@ public(package) fun new(ctx: &mut TxContext): (OwnableState, OwnerCap) {
};

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -225,7 +221,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -235,7 +230,6 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}

Expand Down
8 changes: 1 addition & 7 deletions contracts/ccip/ccip_token_pools/managed_token_pool/sources/ownable.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ public struct OwnerCap has key, store {
id: UID,
}

public struct OwnableState has key, store {
id: UID,
public struct OwnableState has store {
owner: address,
pending_transfer: Option<PendingTransfer>,
owner_cap_id: ID,
Expand All @@ -23,7 +22,6 @@ public struct PendingTransfer has drop, store {
// =================== Events =================== //

public struct NewOwnableStateEvent has copy, drop, store {
ownable_state_id: ID,
owner_cap_id: ID,
owner: address,
}
Expand Down Expand Up @@ -62,14 +60,12 @@ public(package) fun new(ctx: &mut TxContext): (OwnableState, OwnerCap) {
};

let state = OwnableState {
id: object::new(ctx),
owner,
pending_transfer: option::none(),
owner_cap_id: object::id(&owner_cap),
};

event::emit(NewOwnableStateEvent {
ownable_state_id: object::id(&state),
owner_cap_id: object::id(&owner_cap),
owner,
});
Expand Down Expand Up @@ -225,7 +221,6 @@ public fun execute_ownership_transfer_to_mcms<T: drop>(

public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContext) {
let OwnableState {
id: state_id,
owner: _,
pending_transfer: _,
owner_cap_id: state_owner_cap_id,
Expand All @@ -235,7 +230,6 @@ public fun destroy(state: OwnableState, owner_cap: OwnerCap, _ctx: &mut TxContex

assert!(owner_cap_id.uid_to_inner() == state_owner_cap_id, EInvalidOwnerCap);

object::delete(state_id);
object::delete(owner_cap_id);
}

Expand Down
Loading
Loading