Merge pull request #1 from mangata-finance/feature/bridge

Feature/bridge

README.md

@@ -30,6 +30,14 @@ Find manual setup instructions at the
 
 ### Local target
 
+Recommended rustc version for the build is `nightly-2020-10-01`
+
+Environment variables for ethereum apps should be set up before the build:
+```bash
+ETH_APP_ID=0xdd514baa317bf095ddba2c0a847765feb389c6a0
+ENV ERC20_APP_ID=0x00e392c04743359e39f00cd268a5390d27ef6b44
+```
+build node:
 ```bash
 cargo build --release
 ```

devops/dockerfiles/node-and-runtime/Dockerfile

@@ -3,7 +3,12 @@ LABEL description="Compiles all workspace artifacts"
 WORKDIR /mangata
 COPY . /mangata
 
-RUN WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 cargo build --release
+ENV ETH_APP_ID=0xdd514baa317bf095ddba2c0a847765feb389c6a0
+ENV ERC20_APP_ID=0x00e392c04743359e39f00cd268a5390d27ef6b44
+
+RUN rustup toolchain install nightly-2020-10-01
+RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-01
+RUN WASM_BUILD_TOOLCHAIN=nightly-2020-10-01 cargo build --release
 
 FROM debian:stretch
 LABEL description="mangata node"

devops/dockerfiles/rust-builder/Dockerfile

@@ -1,4 +1,4 @@
-FROM liuchong/rustup:1.46.0 AS builder
+FROM liuchong/rustup:1.45.2 AS builder
 LABEL description="Rust and WASM build environment for mangata and substrate"
 
 WORKDIR /setup

node/src/chain_spec.rs

@@ -1,7 +1,7 @@
 use sp_core::{Pair, Public, sr25519};
 use mangata_runtime::{
 	AccountId, BabeConfig, BalancesConfig, GenesisConfig, GrandpaConfig, SessionConfig,
-	SudoConfig, SystemConfig, WASM_BINARY, Signature, StakerStatus, StakingConfig, SessionKeys
+	SudoConfig, SystemConfig, WASM_BINARY, Signature, StakerStatus, StakingConfig, SessionKeys, VerifierConfig
 };
 use sp_consensus_babe::{AuthorityId as BabeId};
 use sp_finality_grandpa::AuthorityId as GrandpaId;
@@ -63,6 +63,8 @@ pub fn development_config() -> Result<ChainSpec, String> {
 			vec![
 				authority_keys_from_seed("Alice"),
 			],
+			// Initial relay account
+			get_account_id_from_seed::<sr25519::Public>("Relay"),
 			// Sudo account
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			// Pre-funded accounts
@@ -71,6 +73,7 @@ pub fn development_config() -> Result<ChainSpec, String> {
 				get_account_id_from_seed::<sr25519::Public>("Bob"),
 				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
 				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Relay"),
 			],
 			true,
 		),
@@ -103,6 +106,8 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 				authority_keys_from_seed("Alice"),
 				authority_keys_from_seed("Bob"),
 			],
+			// Initial relay account
+			get_account_id_from_seed::<sr25519::Public>("Relay"),
 			// Sudo account
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
 			// Pre-funded accounts
@@ -139,6 +144,7 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
 fn testnet_genesis(
 	wasm_binary: &[u8],
 	initial_authorities: Vec<(BabeId, GrandpaId, AccountId)>,
+	relay_key: AccountId,
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	_enable_println: bool,
@@ -181,5 +187,8 @@ fn testnet_genesis(
 			// Assign network admin rights.
 			key: root_key,
 		}),
+		verifier: Some(VerifierConfig {
+			key: relay_key,
+		}),
 	}
 }

pallets/assets/src/lib.rs

@@ -292,14 +292,27 @@ impl<T: Trait> Module<T> {
 		Ok(())
 	}
 
+	pub fn assets_issue(origin: &T::AccountId, total: &T::Balance) -> T::AssetId {
+		let id = Self::next_asset_id();
+		<NextAssetId<T>>::mutate(|id| *id += One::one());
+
+		<Balances<T>>::insert((id, &origin), total);
+		<TotalSupply<T>>::insert(id, total);
+
+		// Self::deposit_event(RawEvent::Issued(id, origin, total));
+		id
+	}
+
 	pub fn assets_mint(id: &T::AssetId, to: &T::AccountId, amount: &T::Balance) -> T::Balance {
 		<Balances<T>>::mutate((id, to), |balance| *balance += *amount);
+		<TotalSupply<T>>::mutate((id), |total| *total += *amount);
 		<Balances<T>>::get((id, to))
 	}
 
 	pub fn assets_burn(id: &T::AssetId, to: &T::AccountId, amount: &T::Balance) -> T::Balance {
 		//TODO ensure amount
 		<Balances<T>>::mutate((id, to), |balance| *balance -= *amount);
+		<TotalSupply<T>>::mutate((id), |total| *total -= *amount);
 		<Balances<T>>::get((id, to))
 	}
 }