Merge pull request #42 from loning/dev

Dev

AElf.Kernel/Chain.cs

@@ -10,21 +10,8 @@ public class Chain : IChain
         /// <value>The blocks.</value>
         public List<Block> Blocks { get; set; } = new List<Block>();
 
-        public long CurrentBlockHeight
-        {
-            get
-            {
-                return Blocks.Count;
-            }
-        }
-
-        public IHash<IBlock> CurrentBlockHash
-        {
-            get
-            {
-                return new Hash<IBlock>(Blocks[Blocks.Count - 1].GetHeader().GetTransactionMerkleTreeRoot().Value);
-            }
-        }
+        public long CurrentBlockHeight => Blocks.Count;
 
+        public IHash<IBlock> CurrentBlockHash => new Hash<IBlock>(Blocks[Blocks.Count - 1].GetHeader().GetTransactionMerkleTreeRoot().Value);
     }
 }

AElf.Kernel/ChainManager.cs

@@ -16,7 +16,7 @@ public class ChainManager : IChainManager
         public Task AddBlockAsync(IChain chain, IBlock block)
         {
             return new Task(() =>(chain as Chain).Blocks.Add(block as Block));
-
-        }
+        }                                
+
     }
 }

AElf.Kernel/IAccount.cs

@@ -12,7 +12,5 @@ public interface IAccount
         /// </summary>
         /// <returns></returns>
         IHash<IAccount> GetAddress();
-
-        ISmartContractInvoker CreateInvoker(string methodName, params object[] values);
     }
 }

AElf.Kernel/IAccountDataContext.cs

@@ -0,0 +1,7 @@
+namespace AElf.Kernel
+{
+    public interface IAccountDataContext
+    {
+        ulong IncreasementId { get; set; }
+    }
+}

AElf.Kernel/IAccountDataProvider.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace AElf.Kernel
 {
@@ -7,29 +8,11 @@ namespace AElf.Kernel
     /// </summary>
     public interface IAccountDataProvider
     {
-        /// <summary>
-        /// Gets the data merkle tree root.
-        /// </summary>
-        /// <returns></returns>
-        Task<IHash<IMerkleTree<ISerializable>>> GetDataMerkleTreeRootAsync();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task<ISerializable> GetAsync(IHash key);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        Task SetAsync(IHash key,ISerializable obj);
+
+        IAccountDataContext Context { get; set; }
 
         IHash<IAccount> GetAccountAddress();
 
-        Task<IAccountDataProvider> GetMapAsync(string name);
+        IDataProvider GetDataProvider();
     }
 }

AElf.Kernel/IDataProvider.cs

@@ -0,0 +1,32 @@
+using System.Threading.Tasks;
+
+namespace AElf.Kernel
+{
+    public interface IDataProvider
+    {
+        IDataProvider GetDataProvider(string name);
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        Task<ISerializable> GetAsync(IHash key);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        Task SetAsync(IHash key,ISerializable obj);
+
+        /// <summary>
+        /// Gets the data merkle tree root.
+        /// </summary>
+        /// <returns></returns>
+        Task<IHash<IMerkleTree<ISerializable>>> GetDataMerkleTreeRootAsync();
+
+    }
+}

AElf.Kernel/ISmartContract.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace AElf.Kernel
+{
+
+    public interface ISmartContract
+    {
+        Task InititalizeAsync(IAccountDataProvider dataProvider);
+        Task InvokeAsync(IHash<IAccount> caller, 
+            string methodname, params object[] objs);
+    }    
+
+}

AElf.Kernel/ISmartContractManager.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace AElf.Kernel
+{
+    public interface ISmartContractManager
+    {
+        Task<ISmartContract> GetAsync(IAccount account);
+    }
+}

AElf.Kernel/ITransaction.cs

@@ -42,4 +42,5 @@ public interface ITransaction
 
         ulong IncrementId { get; set; }
     }
+
 }

AElf.Kernel/KernelAccount/AccountZero.cs

@@ -15,10 +15,5 @@ public IHash<IAccount> GetAddress()
         {
             return Hash<IAccount>.Zero;
         }
-
-        public ISmartContractInvoker CreateInvoker(string methodName, params object[] values)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

AElf.Kernel/KernelAccount/SmartContractZero.cs

@@ -1,16 +1,18 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace AElf.Kernel.KernelAccount
 {
-    public class SmartContractZero
+    public class SmartContractZero: ISmartContract
     {
         private const string SMART_CONTRACT_MAP_KEY = "SmartContractMap";
 
         private IAccountDataProvider _accountDataProvider;
 
-        public async void InititalizeAsync(IAccountDataProvider dataProvider)
+        public async Task InititalizeAsync(IAccountDataProvider dataProvider)
         {
             _accountDataProvider = dataProvider;
+            await Task.CompletedTask;
         }
 
         public async Task InvokeAsync(IHash<IAccount> caller, string methodname, params object[] objs)
@@ -24,7 +26,7 @@ public async Task InvokeAsync(IHash<IAccount> caller, string methodname, params
         // Hard coded method in the kernel
         public async Task RegisterSmartContract(SmartContractRegistration reg)
         {
-            var smartContractMap = (IAccountDataProvider) await _accountDataProvider.GetMapAsync(SMART_CONTRACT_MAP_KEY);
+            var smartContractMap = _accountDataProvider.GetDataProvider().GetDataProvider(SMART_CONTRACT_MAP_KEY);
             await smartContractMap.SetAsync(reg.Hash, reg);
         }
     }

AElf.Kernel/SmartContractRegistration.cs

@@ -1,21 +1,18 @@
 namespace AElf.Kernel
 {
-
-
     public class SmartContractRegistration : ISerializable
     {
-
         /// <summary>
         /// 0: Smart Contract Zero
         /// 1: C# bytes
         /// 2: Javascript
         /// </summary>
         public int Category { get; set; }
-        
+
         public IHash Hash { get; set; }
-        
+
         public byte[] Bytes { get; set; }
-        
+
         public byte[] Serialize()
         {
             throw new System.NotImplementedException();

AElf.Kernel/TransactionExecutingManager.cs

@@ -28,6 +28,7 @@ public Task ExecuteAsync(ITransaction tx)
             var task = Task.Factory.StartNew(() =>
             {
                 var a = 1 + 1;
+                a += 1;
             });
             return task;
         }