From 67fc5bea6f104f749b5ae14519a16a50d410cb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lo=C3=AFs?= <c@elo.tf>
Date: Thu, 18 Jul 2024 15:12:32 +0200
Subject: [PATCH] fix: calldata need hex bytecode

---
 pallets/moonbeam-foreign-assets/build.rs   | 29 ----------------------
 pallets/moonbeam-foreign-assets/src/evm.rs | 19 ++++++++++++--
 2 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 pallets/moonbeam-foreign-assets/build.rs

diff --git a/pallets/moonbeam-foreign-assets/build.rs b/pallets/moonbeam-foreign-assets/build.rs
deleted file mode 100644
index e916918e96..0000000000
--- a/pallets/moonbeam-foreign-assets/build.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::fs::File;
-use std::io::prelude::*;
-
-// Length of encoded constructor parameters
-const PARAMS_LEN: usize = 256;
-
-fn main() {
-	let hex_str = include_str!("resources/foreign_erc20_initcode.hex");
-	let prefix_0x = hex_str.chars().nth(1) == Some('x');
-	let bytecode = if prefix_0x {
-		hex::decode(&hex_str[2..])
-	} else {
-		hex::decode(hex_str)
-	}
-	.expect("fail to decode hexadecimal string in file foreign_erc20_initcode.hex");
-
-	// The encoded parameters at the end of the initializer bytecode should be removed,
-	// (the runtime will append the constructor parameters dynamically).
-	let bytecode_end = if bytecode.len() > PARAMS_LEN {
-		bytecode.len() - PARAMS_LEN
-	} else {
-		0
-	};
-
-	let mut file = File::create("resources/foreign_erc20_initcode.bin")
-		.expect("Fail to create file resources/foreign_erc20_initcode.bin");
-	file.write_all(&bytecode[..bytecode_end])
-		.expect("fail to write bytecode in /foreign_erc20_initcode.bin");
-}
diff --git a/pallets/moonbeam-foreign-assets/src/evm.rs b/pallets/moonbeam-foreign-assets/src/evm.rs
index d40881979e..296a71a2f3 100644
--- a/pallets/moonbeam-foreign-assets/src/evm.rs
+++ b/pallets/moonbeam-foreign-assets/src/evm.rs
@@ -89,6 +89,10 @@ struct ForeignErc20ConstructorArgs {
 
 pub(crate) struct EvmCaller<T: crate::Config>(core::marker::PhantomData<T>);
 
+
+// Length of encoded constructor parameters
+const PARAMS_LEN: usize = 256;
+
 impl<T: crate::Config> EvmCaller<T> {
 	/// Deploy foreign asset erc20 contract
 	pub(crate) fn erc20_create(
@@ -97,9 +101,20 @@ impl<T: crate::Config> EvmCaller<T> {
 		ticker: &str,
 		token_name: &str,
 	) -> Result<(), Error<T>> {
+		// Get contract initializer code
+		let init_code_str = include_str!("../resources/foreign_erc20_initcode.hex");
+
+		// The encoded parameters at the end of the initializer bytecode should be removed,
+		// (the runtime will append the constructor parameters dynamically).
+		let init_code_end = if init_code_str.len() > PARAMS_LEN {
+			init_code_str.len() - PARAMS_LEN
+		} else {
+			0
+		};
+
 		// Get init code
 		let mut init = Vec::with_capacity(ERC20_CREATE_MAX_CALLDATA_SIZE);
-		init.extend_from_slice(include_bytes!("../resources/foreign_erc20_initcode.bin"));
+		init.extend_from_slice(init_code_str[..init_code_end].as_bytes());
 
 		// Add constructor parameters
 		let args = ForeignErc20ConstructorArgs {
@@ -122,7 +137,7 @@ impl<T: crate::Config> EvmCaller<T> {
 			None,
 			None,
 			Default::default(),
-			true,
+			false,
 			false,
 			None,
 			None,