fix bug;

tanZiWen · Oct 27, 2016 · 98f9588 · 98f9588
1 parent 3f0e2b0
commit 98f9588
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/AntShares/Core/RegisterTransaction.cs b/src/AntShares/Core/RegisterTransaction.cs
@@ -84,7 +84,7 @@ protected override void DeserializeExclusiveData(BinaryReader reader)
             if (Precision > 8) throw new FormatException();
             if (AssetType == AssetType.Share && Precision != 0)
                 throw new FormatException();
-            if (Amount.GetData() % (long)Math.Pow(10, 8 - Precision) != 0)
+            if (Amount != -Fixed8.Satoshi && Amount.GetData() % (long)Math.Pow(10, 8 - Precision) != 0)
                 throw new FormatException();
             Issuer = ECPoint.DeserializeFrom(reader, ECCurve.Secp256r1);
             Admin = reader.ReadSerializable<UInt160>();

diff --git a/src/AntShares/Implementations/Blockchains/LevelDB/LevelDBBlockchain.cs b/src/AntShares/Implementations/Blockchains/LevelDB/LevelDBBlockchain.cs
@@ -622,10 +622,10 @@ private void Persist(Block block)
             {
                 batch.Put(SliceBuilder.Begin(DataEntryPrefix.ST_QuantityIssued).Add(quantity.Key), (GetQuantityIssued(quantity.Key) + quantity.Value).GetData());
             }
-            current_block_hash = block.Hash;
-            current_block_height = block.Hash == GenesisBlock.Hash ? 0 : current_block_height + 1;
-            batch.Put(SliceBuilder.Begin(DataEntryPrefix.SYS_CurrentBlock), SliceBuilder.Begin().Add(block.Hash).Add(current_block_height));
+            batch.Put(SliceBuilder.Begin(DataEntryPrefix.SYS_CurrentBlock), SliceBuilder.Begin().Add(block.Hash).Add(block.Height));
             db.Write(WriteOptions.Default, batch);
+            current_block_hash = block.Hash;
+            current_block_height = block.Height;
         }
 
         private void PersistBlocks()

diff --git a/src/AntShares/Wallets/Wallet.cs b/src/AntShares/Wallets/Wallet.cs
@@ -117,7 +117,7 @@ public static Fixed8 CalculateClaimAmount(IEnumerable<TransactionInput> inputs)
             {
                 Dictionary<ushort, Claimable> claimable = Blockchain.Default.GetUnclaimed(group.Key);
                 if (claimable == null || claimable.Count == 0)
-                    throw new ArgumentException();
+                    continue;
                 foreach (TransactionInput claim in group)
                 {
                     if (!claimable.ContainsKey(claim.PrevIndex))

diff --git a/src/AntShares/project.json b/src/AntShares/project.json
@@ -2,7 +2,7 @@
   "authors": [ "The Antshares team" ],
   "copyright": "2015-2016 The Antshares team",
   "title": "AntShares",
-  "version": "1.1.0.4",
+  "version": "1.1.1.1",
   "buildOptions": {
     "allowUnsafe": true,
     "copyToOutput": {