relay token register and lock events

.maintain/config/ropsten_pangolin.sample.yml

@@ -30,6 +30,11 @@ ethereum:
       topics:
         # set authorities topic
         - 0x91d6d149c7e5354d1c671fe15a5a3332c47a38e15e8ac0339b24af3c1090690f
+    backing:
+      address: "0xd5FC8F2eB94fE6AAdeE91c561818e1fF4ea2C041"
+      topics:
+        - "0x0c403c4583ff520bad94bf49975b3547a573f7157070022cf8c9a023498d4d11"
+        - "0xf70fbddcb43e433da621898f5f2628b0a644a77a4389ac2580c5b1de06382fe2"
   # (optional) the person who will relay darwinia data to ethereum
   # Disable by removing or commenting
   relayer:

darwinia/src/darwinia.rs

@@ -9,7 +9,7 @@ use substrate_subxt::{
 
 use primitives::{
 	//todo move to e2d
-	frame::ethereum::backing::VerifiedProofStoreExt,
+	frame::ethereum::{backing::VerifiedProofStoreExt, issuing::VerifiedIssuingProofStoreExt},
 	runtime::DarwiniaRuntime,
 };
 
@@ -274,4 +274,17 @@ impl Darwinia {
 			.await?
 			.unwrap_or(false))
 	}
+
+	/// Check if should issuing sync
+	pub async fn verified_issuing(
+		&self,
+		block_hash: web3::types::H256,
+		tx_index: u64,
+	) -> Result<bool> {
+		Ok(self
+			.subxt
+			.verified_issuing_proof((block_hash.to_fixed_bytes(), tx_index), None)
+			.await?
+			.unwrap_or(false))
+	}
 }

darwinia/src/from_ethereum/api.rs

@@ -16,6 +16,7 @@ use primitives::{
 		ethereum::{
 			backing::{Redeem, RedeemCallExt},
 			game::{AffirmationsStoreExt, EthereumRelayerGame},
+			issuing::{RedeemErc20, RedeemErc20CallExt, RegisterErc20, RegisterErc20CallExt},
 			relay::{
 				Affirm, AffirmCallExt, ConfirmedBlockNumbersStoreExt, EthereumRelay,
 				PendingRelayHeaderParcelsStoreExt, SetConfirmedParcel,
@@ -309,4 +310,70 @@ impl Ethereum2Darwinia {
 			Some(real) => voting_state.contains(real),
 		}
 	}
+
+	/// register erc20
+	pub async fn register_erc20(
+		&self,
+		account: &Account,
+		proof: EthereumReceiptProofThing,
+	) -> Result<H256> {
+		match &account.0.real {
+			Some(real) => {
+				let call = RegisterErc20 {
+					_runtime: PhantomData::default(),
+					proof,
+				};
+
+				let ex = self.darwinia.subxt.encode(call).unwrap();
+				Ok(self
+					.darwinia
+					.subxt
+					.proxy(
+						&account.0.signer,
+						real.clone(),
+						Some(ProxyType::EthereumBridge),
+						&ex,
+					)
+					.await?)
+			}
+			None => Ok(self
+				.darwinia
+				.subxt
+				.register_erc20(&account.0.signer, proof)
+				.await?),
+		}
+	}
+
+	/// redeem erc20
+	pub async fn redeem_erc20(
+		&self,
+		account: &Account,
+		proof: EthereumReceiptProofThing,
+	) -> Result<H256> {
+		match &account.0.real {
+			Some(real) => {
+				let call = RedeemErc20 {
+					_runtime: PhantomData::default(),
+					proof,
+				};
+
+				let ex = self.darwinia.subxt.encode(call).unwrap();
+				Ok(self
+					.darwinia
+					.subxt
+					.proxy(
+						&account.0.signer,
+						real.clone(),
+						Some(ProxyType::EthereumBridge),
+						&ex,
+					)
+					.await?)
+			}
+			None => Ok(self
+				.darwinia
+				.subxt
+				.redeem_erc20(&account.0.signer, proof)
+				.await?),
+		}
+	}
 }

primitives/src/byte.rs

@@ -16,9 +16,9 @@ macro_rules! hex {
 		let mut s = String::new();
 		for i in $bytes {
 			s.push_str(&format!("{:02x}", i));
-		}
-		s
-	}};
+			}
+			s
+		}};
 }
 
 /// Convert hex string to `Vec<u8>` or `[u8; n]`
@@ -29,21 +29,21 @@ macro_rules! bytes {
 		let mut h = $hex;
 		if h.starts_with("0x") {
 			h = &h[2..];
-		}
+			}
 
 		(0..h.len())
 			.step_by(2)
 			.map(|i| u8::from_str_radix(&h[i..i + 2], 16))
 			.collect::<Result<Vec<u8>, _>>()
 			.unwrap_or_default()
-	}};
+		}};
 
 	// Convert hex to [u8; $bits]
 	($hex:expr, $bits:expr) => {{
 		let mut hash = [0_u8; $bits];
 		hash.copy_from_slice(&bytes!($hex));
 		hash
-	}};
+		}};
 }
 
 /// Implement serde for big array

primitives/src/chain/ethereum/receipt.rs

@@ -19,6 +19,10 @@ pub enum RedeemFor {
 	Deposit,
 	/// Redeem for set authorities
 	SetAuthorities,
+	/// Redeem for register erc20 token
+	RegisterErc20Token,
+	/// Redeem for erc20 token
+	RedeemErc20Token,
 }
 
 impl Default for RedeemFor {

primitives/src/frame/ethereum/backing.rs

@@ -2,9 +2,9 @@
 use crate::chain::ethereum::{EthereumReceiptProofThing, RedeemFor};
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
-use substrate_subxt_proc_macro::{module, Call, Event, Store};
-use substrate_subxt::system::System;
 use substrate_subxt::balances::Balances;
+use substrate_subxt::system::System;
+use substrate_subxt_proc_macro::{module, Call, Event, Store};
 
 /// Ethereum Relay Pallet
 #[module]

primitives/src/frame/ethereum/issuing.rs

@@ -0,0 +1,43 @@
+//! Darwinia Ethereum Issuing
+use crate::chain::ethereum::EthereumReceiptProofThing;
+use codec::{Decode, Encode};
+use core::marker::PhantomData;
+use substrate_subxt::{balances::Balances, system::System};
+use substrate_subxt_proc_macro::{module, Call, Store};
+
+/// Ethereum Issuing Pallet
+#[module]
+pub trait EthereumIssuing: System + Balances {
+	/// Ethereum transaction index
+	type EthereumTransactionIndex: 'static + Encode + Decode + Send + Default + Clone + Sync;
+}
+
+// Call
+
+/// Submit register erc20 token
+#[derive(Clone, Debug, PartialEq, Call, Encode)]
+pub struct RegisterErc20<T: EthereumIssuing> {
+	/// Runtime marker
+	pub _runtime: PhantomData<T>,
+	/// Ethereum Receipt Proof
+	pub proof: EthereumReceiptProofThing,
+}
+
+/// Submit redeem erc20 token
+#[derive(Clone, Debug, PartialEq, Call, Encode)]
+pub struct RedeemErc20<T: EthereumIssuing> {
+	/// Runtime marker
+	pub _runtime: PhantomData<T>,
+	/// Ethereum Receipt Proof
+	pub proof: EthereumReceiptProofThing,
+}
+
+/// verified proof Storage
+#[derive(Clone, Debug, Eq, PartialEq, Store, Decode, Encode)]
+pub struct VerifiedIssuingProof<T: EthereumIssuing> {
+	#[store(returns = Option<bool>)]
+	/// Receipt tx hash
+	pub map: ([u8; 32], u64),
+	/// Runtime marker
+	pub _runtime: PhantomData<T>,
+}

primitives/src/frame/ethereum/mod.rs

@@ -3,4 +3,5 @@
 
 pub mod backing;
 pub mod game;
+pub mod issuing;
 pub mod relay;

primitives/src/frame/proxy.rs

@@ -1,10 +1,7 @@
 //! Frame Proxy
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
-use substrate_subxt::{
-	system::System,
-	Encoded,
-};
+use substrate_subxt::{system::System, Encoded};
 use substrate_subxt_proc_macro::{module, Call};
 
 /// The subset of the `frame_proxy::Trait` that a client must implement.

primitives/src/frame/sudo.rs

@@ -2,10 +2,7 @@
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
 use frame_support::weights::Weight;
-use substrate_subxt::{
-	system::System,
-	Encoded,
-};
+use substrate_subxt::{system::System, Encoded};
 use substrate_subxt_proc_macro::{module, Call, Store};
 
 /// The subset of the `frame_sudo::Trait` that a client must implement.

primitives/src/frame/technical_committee.rs

@@ -2,10 +2,7 @@
 
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
-use substrate_subxt::{
-	system::System,
-	Encoded,
-};
+use substrate_subxt::{system::System, Encoded};
 use substrate_subxt_proc_macro::{module, Call, Store};
 
 /// The subset of the `frame_council::Trait` that a client must implement.

primitives/src/lib.rs

@@ -48,9 +48,7 @@ pub mod runtime;
 #[cfg(test)]
 mod tests {
 	use super::runtime::DarwiniaRuntime;
-	use substrate_subxt::{
-		ClientBuilder,
-	};
+	use substrate_subxt::ClientBuilder;
 	// use super::frame::ethereum::relay::PendingRelayHeaderParcelsStoreExt;
 	use super::frame::technical_committee::MembersStoreExt;
 
@@ -60,7 +58,8 @@ mod tests {
 			.set_url("ws://100.64.200.3:10000")
 			.skip_type_sizes_check()
 			.build()
-			.await.unwrap();
+			.await
+			.unwrap();
 
 		println!("-----------");
 		let block_number = 1;
@@ -78,7 +77,8 @@ mod tests {
 			.set_url("ws://100.64.200.3:10000")
 			.skip_type_sizes_check()
 			.build()
-			.await.unwrap();
+			.await
+			.unwrap();
 
 		let members = client.members(None).await.unwrap();
 		for member in members {
@@ -92,7 +92,8 @@ mod tests {
 			.set_url("wss://pangolin-rpc.darwinia.network")
 			.skip_type_sizes_check()
 			.build()
-			.await.unwrap();
+			.await
+			.unwrap();
 
 		let members = client.members(None).await.unwrap();
 		for member in members {

primitives/src/runtime.rs

@@ -8,7 +8,10 @@ use crate::{
 	},
 	frame::{
 		bridge::relay_authorities::EthereumRelayAuthorities,
-		ethereum::{backing::EthereumBacking, game::EthereumRelayerGame, relay::EthereumRelay},
+		ethereum::{
+			backing::EthereumBacking, game::EthereumRelayerGame, issuing::EthereumIssuing,
+			relay::EthereumRelay,
+		},
 		proxy::Proxy,
 		sudo::Sudo,
 		technical_committee::TechnicalCommittee,
@@ -144,6 +147,10 @@ impl EthereumBacking for DarwiniaRuntime {
 	type EthereumTransactionIndex = u64;
 }
 
+impl EthereumIssuing for DarwiniaRuntime {
+	type EthereumTransactionIndex = u64;
+}
+
 impl Proxy for DarwiniaRuntime {
 	type ProxyType = ProxyType;
 }

src/cmd/info_d2e.rs

@@ -49,7 +49,13 @@ impl fmt::Display for TxProofWithMMRProof {
 }
 
 /// Get Darwinia to Ethereum Info
-pub async fn exec(network: String, txblock: u64, mmrblock: u64, signblock: u64) -> Result<()> {
+pub async fn exec(
+	network: String,
+	txblock: u64,
+	mmrblock: u64,
+	signblock: u64,
+	istoken: bool,
+) -> Result<()> {
 	std::env::set_var("RUST_LOG", "info,darwinia_bridger");
 	env_logger::init();
 
@@ -72,9 +78,11 @@ pub async fn exec(network: String, txblock: u64, mmrblock: u64, signblock: u64)
 		.await?;
 	let event_proof = darwinia
 		.get_event_proof(
-			array_bytes::hex2bytes(
-				"f8860dda3d08046cf2706b92bf7202eaae7a79191c90e76297e0895605b8b457",
-			)
+			array_bytes::hex2bytes(if istoken {
+				"e66f3de22eed97c730152f373193b5a0485b407d88f37d5fd6a2c59e5a696691"
+			} else {
+				"f8860dda3d08046cf2706b92bf7202eaae7a79191c90e76297e0895605b8b457"
+			})
 			.unwrap(),
 			header.hash(),
 		)

src/cmd/mod.rs

@@ -103,6 +103,9 @@ enum Opt {
 		/// sign block number
 		#[structopt(short, long)]
 		signblock: u64,
+		/// is token or ring/kton
+		#[structopt(short, long)]
+		istoken: bool,
 	},
 	/// Sign MMR root
 	SignMMRRoot {
@@ -157,7 +160,8 @@ pub async fn exec() -> Result<()> {
 			txblock,
 			mmrblock,
 			signblock,
-		} => info_d2e::exec(network, txblock, mmrblock, signblock).await?,
+			istoken,
+		} => info_d2e::exec(network, txblock, mmrblock, signblock, istoken).await?,
 		Opt::SignMMRRoot { network, mmrblock } => sign_mmr_root::exec(network, mmrblock).await?,
 		Opt::AffirmForce { block } => {
 			affirm_force::exec(block).await?;