Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions soroban-sdk/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,22 @@ impl Env {
}

/// Get the Address object corresponding to the current executing contract.
///
/// See also: [`me()`](#method.me), which is an alias for this function.
pub fn current_contract_address(&self) -> Address {
let address = internal::Env::get_current_contract_address(self).unwrap_infallible();
unsafe { Address::unchecked_new(self.clone(), address) }
}

/// Get the Address object corresponding to the current executing contract.
///
/// This is an alias for [`current_contract_address()`](#method.current_contract_address),
/// provided as a convenience for shorter, more readable code.
#[inline(always)]
pub fn me(&self) -> Address {
self.current_contract_address()
}

#[doc(hidden)]
pub(crate) fn require_auth_for_args(&self, address: &Address, args: Vec<Val>) {
internal::Env::require_auth_for_args(self, address.to_object(), args.to_object())
Expand Down
14 changes: 14 additions & 0 deletions soroban-sdk/src/tests/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,17 @@ fn test_try_as_contract_panic() {
)))
);
}

#[test]
fn test_me_alias() {
let env = Env::default();

let addr = Address::generate(&env);
env.register_at(&addr, Contract, ());

env.as_contract(&addr, || {
let current_addr = env.current_contract_address();
let me_addr = env.me();
assert_eq!(current_addr, me_addr);
});
}
61 changes: 61 additions & 0 deletions soroban-sdk/test_snapshots/tests/env/test_me_alias.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"generators": {
"address": 1,
"nonce": 0,
"mux_id": 0
},
"auth": [
[],
[]
],
"ledger": {
"protocol_version": 25,
"sequence_number": 0,
"timestamp": 0,
"network_id": "0000000000000000000000000000000000000000000000000000000000000000",
"base_reserve": 0,
"min_persistent_entry_ttl": 4096,
"min_temp_entry_ttl": 16,
"max_entry_ttl": 6312000,
"ledger_entries": [
{
"entry": {
"last_modified_ledger_seq": 0,
"data": {
"contract_data": {
"ext": "v0",
"contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"key": "ledger_key_contract_instance",
"durability": "persistent",
"val": {
"contract_instance": {
"executable": {
"wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
},
"storage": null
}
}
}
},
"ext": "v0"
},
"live_until": 4095
},
{
"entry": {
"last_modified_ledger_seq": 0,
"data": {
"contract_code": {
"ext": "v0",
"hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"code": ""
}
},
"ext": "v0"
},
"live_until": 4095
}
]
},
"events": []
}
Loading