From b6babd24252332c25036ce136322db928728530d Mon Sep 17 00:00:00 2001
From: Greg Zaitsev <greg.zaitsev@gmail.com>
Date: Mon, 27 Jul 2020 11:41:00 +0000
Subject: [PATCH] Merge branch 'master' of github.com:usetech-llc/nft_parachain


---
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -115,7 +115,7 @@
             balances: endowed_accounts
                 .iter()
                 .cloned()
-                .map(|k| (k, 1 << 60))
+                .map(|k| (k, 1 << 100))
                 .collect(),
         }),
         aura: Some(AuraConfig {
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -108,7 +108,7 @@
         AccountId = <T as system::Trait>::AccountId,
     {
         Created(u64, AccountId),
-        ItemCreated(u64),
+        ItemCreated(u64, u64),
         ItemDestroyed(u64, u64),
     }
 );
@@ -352,7 +352,7 @@
             <ItemList<T>>::insert((collection_id, current_index), new_item);
 
             // call event
-            Self::deposit_event(RawEvent::ItemCreated(collection_id));
+            Self::deposit_event(RawEvent::ItemCreated(collection_id, current_index));
 
             Ok(())
         }
--- a/smart_contract/ink-types-node-runtime/.gitignore
+++ b/smart_contract/ink-types-node-runtime/.gitignore
@@ -1,6 +1,6 @@
 # Ignore build artifacts
 /target/
-/**/target/
+/examples/**/target/
 
 # Ignore backup files creates by cargo fmt.
 **/*.rs.bk
@@ -13,4 +13,4 @@
 **/.vscode/**
 
 # Ignore history files.
-**/.history/**
+**/.history/**
\ No newline at end of file
--- a/smart_contract/ink-types-node-runtime/calls/lib.rs
+++ b/smart_contract/ink-types-node-runtime/calls/lib.rs
@@ -106,11 +106,6 @@
         }
 
         #[ink(message)]
-        fn get_test(&self) -> bool {
-            true
-        }
-
-        #[ink(message)]
         fn transfer_from(&self, collection_id: u64, item_id: u64, new_owner: AccountId) {
             env::println(&format!(
                 "transfer_from invoke_runtime params {:?}, {:?}, {:?} ",

-- 
gitstuff