Skip to content

feat: add AuthContext to the implicit aliases list #8922

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

Draft
Parent: feat(aa): TEMP PR in preparation for beta
wants to merge 1 commit into
base: vm-lang/aa-auth/8116-feature-branch
Choose a base branch
from
Draft

feat: add AuthContext to the implicit aliases list #8922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions crates/iota-adapter-transactional-tests/tests/iota/move_call_args_auth_context.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

module Test::M;

use iota::auth_context::AuthContext;

public fun authenticate(_: &AuthContext, _: &TxContext) {}

public fun authenticate_with_mut_auth_context(_: &mut AuthContext, _: &TxContext) {}
Expand Down
12 changes: 6 additions & 6 deletions crates/iota-adapter-transactional-tests/tests/iota/move_call_args_auth_context.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ source: external-crates/move/crates/move-transactional-test-runner/src/framework
---
processed 7 tasks

task 1, lines 6-22:
task 1, lines 6-20:
//# publish
created: object(1,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 5920400, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, lines 23-25:
task 2, lines 21-23:
//# run Test::M::authenticate
Error: Transaction Effects Status: MOVE VM INVARIANT VIOLATION.
Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: VMInvariantViolation, source: Some("`iota::auth_context::AuthContext` can't be used as a parameter in this execution mode"), command: Some(0) } }

task 3, lines 26-28:
task 3, lines 24-26:
//# run Test::M::authenticate_with_mut_auth_context
Error: Transaction Effects Status: Arity mismatch for Move function. The number of arguments does not match the number of parameters
Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: ArityMismatch, source: Some("Expected 2 arguments calling function 'authenticate_with_mut_auth_context', but found 1"), command: Some(0) } }

task 4, lines 29-31:
task 4, lines 27-29:
//# run Test::M::authenticate_with_auth_context_value
Error: Transaction Effects Status: Arity mismatch for Move function. The number of arguments does not match the number of parameters
Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: ArityMismatch, source: Some("Expected 2 arguments calling function 'authenticate_with_auth_context_value', but found 1"), command: Some(0) } }

task 5, lines 32-34:
task 5, lines 30-32:
//# run Test::M::authenticate_with_miss_placed_auth_context
Error: Transaction Effects Status: Arity mismatch for Move function. The number of arguments does not match the number of parameters
Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: ArityMismatch, source: Some("Expected 3 arguments calling function 'authenticate_with_miss_placed_auth_context', but found 1"), command: Some(0) } }

task 6, line 35:
task 6, line 33:
//# run Test::M::authenticate_with_only_auth_context
Error: Transaction Effects Status: Arity mismatch for Move function. The number of arguments does not match the number of parameters
Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: ArityMismatch, source: Some("Expected 1 argument calling function 'authenticate_with_only_auth_context', but found 0"), command: Some(0) } }
2 changes: 0 additions & 2 deletions crates/iota-adapter-transactional-tests/tests/iota/move_call_args_auth_context_disabled.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

module Test::M;

use iota::auth_context::AuthContext;

public fun authenticate(_: &AuthContext, _: &TxContext) {}

// using `iota::auth_context::AuthContext` is not allowed by the protocol config
Expand Down
4 changes: 2 additions & 2 deletions crates/iota-adapter-transactional-tests/tests/iota/move_call_args_auth_context_disabled.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ source: external-crates/move/crates/move-transactional-test-runner/src/framework
---
processed 3 tasks

task 1, lines 6-14:
task 1, lines 6-12:
//# publish
created: object(1,0)
mutated: object(0,0)
gas summary: computation_cost: 1000000, computation_cost_burned: 1000000, storage_cost: 4202800, storage_rebate: 0, non_refundable_storage_fee: 0

task 2, line 15:
task 2, line 13:
//# run Test::M::authenticate
Error: Transaction Effects Status: MOVE VM INVARIANT VIOLATION.
Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: VMInvariantViolation, source: Some("`iota::auth_context::AuthContext` can't be used as a parameter if the `move_auth` feature is disabled"), command: Some(0) } }
1 change: 0 additions & 1 deletion crates/iota-e2e-tests/tests/abstract_account/abstract_account/sources/basic_keyed_aa.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module abstract_account::basic_keyed_aa;

use abstract_account::abstract_account::{Self, AbstractAccount, ensure_tx_sender_is_account};
use iota::account::AuthenticatorInfoV1;
use iota::auth_context::AuthContext;
use iota::ecdsa_k1;
use iota::ecdsa_r1;
use iota::ed25519;
Expand Down
14 changes: 2 additions & 12 deletions crates/iota-e2e-tests/tests/abstract_account/authenticate/sources/object.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,14 @@

module authenticate::object;

use iota::auth_context::AuthContext;

// Object

public struct Object has key, store {
id: iota::object::UID,
}

// PASS
public fun immutable_ref(
_object: &Object,
_auth_ctx: &AuthContext,
_ctx: &TxContext,
) {}
public fun immutable_ref(_object: &Object, _auth_ctx: &AuthContext, _ctx: &TxContext) {}

// FAIL
#[allow(lint(share_owned))]
Expand All @@ -25,8 +19,4 @@ public fun by_value(object: Object, _auth_ctx: &AuthContext, _ctx: &TxContext) {
}

// FAIL
public fun by_mutable_ref(
_object: &mut Object,
_auth_ctx: &AuthContext,
_ctx: &TxContext,
) {}
public fun by_mutable_ref(_object: &mut Object, _auth_ctx: &AuthContext, _ctx: &TxContext) {}
2 changes: 0 additions & 2 deletions crates/iota-e2e-tests/tests/abstract_account/authenticate/sources/option.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

module authenticate::option;

use iota::auth_context::AuthContext;

public struct Object has key, store {
id: iota::object::UID,
}
Expand Down
2 changes: 0 additions & 2 deletions crates/iota-e2e-tests/tests/abstract_account/authenticate/sources/signature.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

module authenticate::signature;

use iota::auth_context::AuthContext;

// PASS
public fun minimally_viable_auth_function(_auth_ctx: &AuthContext, _ctx: &TxContext) {}

Expand Down
26 changes: 4 additions & 22 deletions crates/iota-e2e-tests/tests/abstract_account/authenticate/sources/template.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

module authenticate::template;

use iota::auth_context::AuthContext;

public struct Object has key, store {
id: iota::object::UID,
}
Expand All @@ -17,11 +15,7 @@ public struct NonObjectTemplated<T: copy + drop + store> has copy, drop, store {
}

// PASS
public fun primitive<T: copy + drop + store>(
_arg: T,
_auth_ctx: &AuthContext,
_ctx: &TxContext,
) {}
public fun primitive<T: copy + drop + store>(_arg: T, _auth_ctx: &AuthContext, _ctx: &TxContext) {}

// PASS
public fun templated_non_object_immutable_ref<T: copy + drop + store>(
Expand All @@ -47,27 +41,15 @@ public fun templated_non_object_by_value<T: copy + drop + store>(
// Template and object

// PASS
public fun object_immutable_ref<T: key>(
_object: &T,
_auth_ctx: &AuthContext,
_ctx: &TxContext,
) {}
public fun object_immutable_ref<T: key>(_object: &T, _auth_ctx: &AuthContext, _ctx: &TxContext) {}

// FAIL
public fun object_by_value<T: key + store>(
object: T,
_auth_ctx: &AuthContext,
_ctx: &TxContext,
) {
public fun object_by_value<T: key + store>(object: T, _auth_ctx: &AuthContext, _ctx: &TxContext) {
transfer::public_share_object(object);
}

// FAIL
public fun object_mutable_ref<T: key>(
_object: &mut T,
_auth_ctx: &AuthContext,
_ctx: &TxContext,
) {}
public fun object_mutable_ref<T: key>(_object: &mut T, _auth_ctx: &AuthContext, _ctx: &TxContext) {}

#[allow(unused_field)]
public struct ObjectTemplated<T: key + store> has copy, drop, store {
Expand Down
2 changes: 0 additions & 2 deletions crates/iota-e2e-tests/tests/abstract_account/authenticate/sources/vector.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

module authenticate::vector;

use iota::auth_context::AuthContext;

public struct Object has key, store {
id: iota::object::UID,
}
Expand Down
1 change: 0 additions & 1 deletion examples/move/dynamic_multisig_account/sources/dynamic_multisig_account.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module dynamic_multisig_account::dynamic_multisig_account;
use dynamic_multisig_account::members::{Self, Members};
use dynamic_multisig_account::transactions::{Self, Transactions};
use iota::account::{Self, AuthenticatorInfoV1};
use iota::auth_context::AuthContext;
use iota::dynamic_field;

// --------------------------------------- Errors ---------------------------------------
Expand Down
1 change: 0 additions & 1 deletion examples/move/dynamic_multisig_account/tests/dynamic_multisig_account_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use dynamic_multisig_account::dynamic_multisig_account::{Self, DynamicMultisigAc
use dynamic_multisig_account::members;
use dynamic_multisig_account::transactions;
use iota::account::{Self, AuthenticatorInfoV1};
use iota::auth_context::{Self, AuthContext};
use iota::test_scenario::{Self, Scenario};
use iota::test_utils::{assert_eq, assert_ref_eq};
use std::ascii;
Expand Down
1 change: 0 additions & 1 deletion examples/move/iotaccount/sources/keyed_iotaccount.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
module iotaccount::keyed_iotaccount;

use iota::account::AuthenticatorInfoV1;
use iota::auth_context::AuthContext;
use iota::ecdsa_k1;
use iota::ecdsa_r1;
use iota::ed25519;
Expand Down
1 change: 0 additions & 1 deletion examples/move/iotaccount/tests/keyed_iotaccount_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
module iotaccount::keyed_iotaccount_tests;

use iota::account;
use iota::auth_context::{Self, AuthContext};
use iota::ecdsa_k1;
use iota::hex;
use iota::test_scenario::{Self, Scenario};
Expand Down
1 change: 0 additions & 1 deletion examples/move/time_locked/sources/account.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module time_locked::account;

use generic_keyed_authentication::owner_public_key;
use iota::account::{Self, AuthenticatorInfoV1};
use iota::auth_context::AuthContext;
use iota::clock::Clock;
use iotaccount::iotaccount;
use time_locked::unlock_time;
Expand Down
1 change: 0 additions & 1 deletion examples/move/time_locked/tests/account_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module time_locked::account_tests;

use generic_keyed_authentication::owner_public_key;
use iota::account::AuthenticatorInfoV1;
use iota::auth_context::{Self, AuthContext};
use iota::clock;
use iota::hex;
use iota::test_scenario::{Self, Scenario};
Expand Down
7 changes: 7 additions & 0 deletions external-crates/move/crates/move-compiler/src/expansion/name_validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ pub const IMPLICIT_STD_MEMBERS: &[(Symbol, Symbol, ModuleMemberKind)] = &[(
// use iota::object::{Self, ID, UID};
// use iota::transfer;
// use iota::tx_context::{Self, TxContext};
// use iota::auth_context::{Self, AuthContext};
pub const IMPLICIT_IOTA_MODULES: &[Symbol] = &[
symbol!("object"),
symbol!("transfer"),
symbol!("tx_context"),
symbol!("auth_context"),
];
pub const IMPLICIT_IOTA_MEMBERS: &[(Symbol, Symbol, ModuleMemberKind)] = &[
(symbol!("object"), symbol!("ID"), ModuleMemberKind::Struct),
Expand All @@ -41,6 +43,11 @@ pub const IMPLICIT_IOTA_MEMBERS: &[(Symbol, Symbol, ModuleMemberKind)] = &[
symbol!("TxContext"),
ModuleMemberKind::Struct,
),
(
symbol!("auth_context"),
symbol!("AuthContext"),
ModuleMemberKind::Struct,
),
];

#[derive(Copy, Clone, Debug)]
Expand Down
4 changes: 4 additions & 0 deletions ...e/crates/move-compiler/tests/iota_mode/move_2024/expansion/unnecessary_alias_default.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ module iota::transfer {}
module iota::tx_context {
public struct TxContext()
}
module iota::auth_context {
public struct AuthContext()
}

module a::m {
use iota::object::{Self, ID, UID};
use iota::transfer;
use iota::tx_context::{Self, TxContext};
use iota::auth_context::{Self, AuthContext};
}
Loading
Loading