fix(unmerged): contract caller as a chain extension origin

Cargo.toml

@@ -15,7 +15,12 @@ license = "Unlicense"
 repository = "https://github.com/r0gue-io/pop-node/"
 
 [workspace]
-exclude = [ "extension/contract", "pop-api", "tests/contracts" ]
+exclude = [
+	"extension/contract",
+	"pop-api",
+	"pop-sandbox",
+	"tests/contracts",
+]
 members = [
 	"integration-tests",
 	"node",

extension/src/environment.rs

@@ -1,7 +1,10 @@
 use core::fmt::Debug;
 
 use frame_support::pallet_prelude::Weight;
-use pallet_contracts::chain_extension::{BufInBufOutState, ChargedAmount, Result, State};
+use pallet_contracts::{
+	chain_extension::{BufInBufOutState, ChargedAmount, Result, State},
+	Origin,
+};
 use sp_std::vec::Vec;
 
 use crate::AccountIdOf;
@@ -168,14 +171,14 @@
 	type AccountId;
 
 	/// Returns a reference to the account id of the current contract.
-	fn address(&self) -> &Self::AccountId;
+	fn address(&self) -> Self::AccountId;
 }
 
 impl Ext for () {
 	type AccountId = ();
 
-	fn address(&self) -> &Self::AccountId {
-		&()
+	fn address(&self) -> Self::AccountId {
+		()
 	}
 }
 
@@ -185,12 +188,16 @@
 impl<'a, E: pallet_contracts::chain_extension::Ext> Ext for ExternalEnvironment<'a, E> {
 	type AccountId = AccountIdOf<E::T>;
 
-	fn address(&self) -> &Self::AccountId {
-		self.0.address()
+	fn address(&self) -> Self::AccountId {
+		// TODO: Need to decide which address to return.
+		match self.0.caller() {
+			Origin::Root => self.0.address().clone(),
+			Origin::Signed(caller) => caller,
+		}
 	}
 }
 
 #[test]
 fn default_ext_works() {
-	assert_eq!(().address(), &())
+	assert_eq!(().address(), ())
 }

extension/src/functions.rs

@@ -53,7 +53,7 @@
 		let charged = env.charge_weight(dispatch_info.weight)?;
 		log::debug!(target: Logger::LOG_TARGET, "pre-dispatch weight charged: charged={charged:?}");
 		// Contract is the origin by default.
-		let origin = RawOrigin::Signed(env.ext().address().clone());
+		let origin = RawOrigin::Signed(env.ext().address());
 		log::debug!(target: Logger::LOG_TARGET, "contract origin: origin={origin:?}");
 		let mut origin: Config::RuntimeOrigin = origin.into();
 		// Ensure call allowed.
@@ -80,7 +80,7 @@
 
 /// A function for reading runtime state.
 pub struct ReadState<M, C, R, D, F, RC = DefaultConverter<<R as Readable>::Result>, E = (), L = ()>(
 	PhantomData<(M, C, R, D, F, RC, E, L)>,
 );
 impl<
 		Matcher: Matches,

extension/src/mock.rs

@@ -350,8 +350,8 @@ pub(crate) struct MockExt {
 impl environment::Ext for MockExt {
 	type AccountId = AccountIdOf<Test>;
 
-	fn address(&self) -> &Self::AccountId {
-		&self.address
+	fn address(&self) -> Self::AccountId {
+		self.address
 	}
 }
 

pop-api/examples/fungibles/Cargo.toml

@@ -1,12 +1,31 @@
 [package]
 authors = [ "[your_name] <[your_email]>" ]
 edition = "2021"
-name = "fungibles"
+name = "api_example_fungibles"
 version = "0.1.0"
 
 [dependencies]
-ink = { version = "5.0.0", default-features = false }
-pop-api = { path = "../../../pop-api", default-features = false, features = [ "fungibles" ] }
+ink = { version = "=5.0.0", default-features = false, features = [ "ink-debug" ] }
+pop-api = { path = "../../../pop-api", default-features = false, features = [
+	"fungibles",
+] }
+scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
+	"derive",
+] }
+scale-info = { version = "2.6", default-features = false, features = [
+	"derive",
+], optional = true }
+
+[dev-dependencies]
+env_logger = { version = "0.11.3" }
+serde_json = "1.0.114"
+
+# Local
+drink = { path = "../../../../pop-drink/drink" }
+pop-sandbox = { path = "../../../pop-sandbox", default-features = false }
+
+# Substrate
+frame-support = { version = "36.0.0", default-features = false }
 
 [lib]
 path = "lib.rs"
@@ -18,4 +37,7 @@ ink-as-dependency = [  ]
 std = [
 	"ink/std",
 	"pop-api/std",
+	"pop-sandbox/std",
+	"scale-info/std",
+	"scale/std",
 ]