[pallet-revive] refactor uapi with better types (#5555)

start using better type for address, code_hash, and salt in runtime and
the uapi crate

fix #5575

Author: pgherveou

prdoc/pr_5555.prdoc

@@ -0,0 +1,15 @@
+title: Make salt optional
+
+doc:
+  - audience: Runtime Dev
+    description: |
+     Remove address_len and salt_len from uapi as both are now fixed size
+
+crates:
+  - name: pallet-revive
+    bump: patch
+  - name: pallet-revive-uapi
+    bump: patch
+  - name: pallet-revive-fixtures
+    bump: patch
+

substrate/frame/revive/fixtures/build.rs

@@ -159,6 +159,7 @@ mod build {
 	fn post_process(input_path: &Path, output_path: &Path) -> Result<()> {
 		let mut config = polkavm_linker::Config::default();
 		config.set_strip(true);
+		config.set_optimize(false);
 		let orig =
 			fs::read(input_path).with_context(|| format!("Failed to read {:?}", input_path))?;
 		let linked = polkavm_linker::program_from_elf(config, orig.as_ref())

substrate/frame/revive/fixtures/contracts/call.rs

@@ -31,7 +31,7 @@ pub extern "C" fn deploy() {}
 pub extern "C" fn call() {
 	input!(
 		callee_input: [u8; 4],
-		callee_addr: [u8; 20],
+		callee_addr: &[u8; 20],
 	);
 
 	// Call the callee

substrate/frame/revive/fixtures/contracts/call_return_code.rs

@@ -33,7 +33,7 @@ pub extern "C" fn deploy() {}
 pub extern "C" fn call() {
 	input!(
 		100,
-		callee_addr: [u8; 20],
+		callee_addr: &[u8; 20],
 		input: [u8],
 	);
 

substrate/frame/revive/fixtures/contracts/call_runtime_and_call.rs

@@ -31,7 +31,7 @@ pub extern "C" fn call() {
 	input!(
 		512,
 		callee_input: [u8; 4],
-		callee_addr: [u8; 20],
+		callee_addr: &[u8; 20],
 		call: [u8],
 	);
 

substrate/frame/revive/fixtures/contracts/call_with_flags_and_value.rs

@@ -31,7 +31,7 @@ pub extern "C" fn deploy() {}
 pub extern "C" fn call() {
 	input!(
 		256,
-		callee_addr: [u8; 20],
+		callee_addr: &[u8; 20],
 		flags: u32,
 		value: u64,
 		forwarded_input: [u8],

substrate/frame/revive/fixtures/contracts/call_with_limit.rs

@@ -32,7 +32,7 @@ pub extern "C" fn deploy() {}
 pub extern "C" fn call() {
 	input!(
 		256,
-		callee_addr: [u8; 20],
+		callee_addr: &[u8; 20],
 		ref_time: u64,
 		proof_size: u64,
 		forwarded_input: [u8],

substrate/frame/revive/fixtures/contracts/caller_contract.rs

@@ -28,7 +28,7 @@ pub extern "C" fn deploy() {}
 #[no_mangle]
 #[polkavm_derive::polkavm_export]
 pub extern "C" fn call() {
-	input!(code_hash: [u8; 32],);
+	input!(code_hash: &[u8; 32],);
 
 	// The value to transfer on instantiation and calls. Chosen to be greater than existential
 	// deposit.
@@ -73,7 +73,6 @@ pub extern "C" fn call() {
 
 	// Deploy the contract successfully.
 	let mut callee = [0u8; 20];
-	let callee = &mut &mut callee[..];
 
 	api::instantiate(
 		code_hash,
@@ -82,17 +81,16 @@ pub extern "C" fn call() {
 		None, // No deposit limit.
 		&value,
 		&input,
-		Some(callee),
+		Some(&mut callee),
 		None,
 		&salt,
 	)
 	.unwrap();
-	assert_eq!(callee.len(), 20);
 
 	// Call the new contract and expect it to return failing exit code.
 	let res = api::call(
 		uapi::CallFlags::empty(),
-		callee,
+		&callee,
 		0u64, // How much ref_time weight to devote for the execution. 0 = all.
 		0u64, // How much proof_size weight to devote for the execution. 0 = all.
 		None, // No deposit limit.
@@ -105,7 +103,7 @@ pub extern "C" fn call() {
 	// Fail to call the contract due to insufficient ref_time weight.
 	let res = api::call(
 		uapi::CallFlags::empty(),
-		callee,
+		&callee,
 		1u64, // Too little ref_time weight.
 		0u64, // How much proof_size weight to devote for the execution. 0 = all.
 		None, // No deposit limit.
@@ -118,7 +116,7 @@ pub extern "C" fn call() {
 	// Fail to call the contract due to insufficient proof_size weight.
 	let res = api::call(
 		uapi::CallFlags::empty(),
-		callee,
+		&callee,
 		0u64, // How much ref_time weight to devote for the execution. 0 = all.
 		1u64, // too little proof_size weight
 		None, // No deposit limit.
@@ -132,7 +130,7 @@ pub extern "C" fn call() {
 	let mut output = [0u8; 4];
 	api::call(
 		uapi::CallFlags::empty(),
-		callee,
+		&callee,
 		0u64, // How much ref_time weight to devote for the execution. 0 = all.
 		0u64, // How much proof_size weight to devote for the execution. 0 = all.
 		None, // No deposit limit.

substrate/frame/revive/fixtures/contracts/chain_extension_temp_storage.rs

@@ -20,7 +20,7 @@
 #![no_std]
 #![no_main]
 
-use common::{input, output};
+use common::input;
 use uapi::{HostFn, HostFnImpl as api};
 
 #[no_mangle]
@@ -47,12 +47,13 @@ pub extern "C" fn call() {
 		input[8] = 1u8;
 
 		// Read the contract address.
-		output!(addr, [0u8; 32], api::address,);
+		let mut addr = [0u8; 20];
+		api::address(&mut addr);
 
 		// call self
 		api::call(
 			uapi::CallFlags::ALLOW_REENTRY,
-			addr,
+			&addr,
 			0u64,                // How much ref_time to devote for the execution. 0 = all.
 			0u64,                // How much proof_size to devote for the execution. 0 = all.
 			None,                // No deposit limit.

substrate/frame/revive/fixtures/contracts/common/src/lib.rs

@@ -100,11 +100,23 @@ macro_rules! input {
 		input!(@inner $input, $cursor + $n, $($rest)*);
 	};
 
+	// Match an array reference of the given size.
+	// e.g input!(var1: &[u8; 32], );
+	(@inner $input:expr, $cursor:expr, $var:ident: &[u8; $n:expr], $($rest:tt)*) => {
+		let $var: &[u8; $n] = &$input[$cursor..$cursor+$n].try_into().unwrap();
+		input!(@inner $input, $cursor + $n, $($rest)*);
+	};
+
 	// Size of a u8 slice.
 	(@size $size:expr, $var:ident: [u8; $n:expr], $($rest:tt)*) => {
 		input!(@size $size + $n, $($rest)*)
 	};
 
+	// Size of an array reference.
+	(@size $size:expr, $var:ident: &[u8; $n:expr], $($rest:tt)*) => {
+		input!(@size $size + $n, $($rest)*)
+	};
+
 	// Entry point, with the buffer and it's size specified first.
 	// e.g input!(buffer, 512, var1: u32, var2: [u8], );
 	($buffer:ident, $size:expr, $($rest:tt)*) => {