Merge pull request #76 from vikramrajkumar/btsx

Merge upstream
bitshares · Oct 2, 2014 · ab40d8d · ab40d8d
2 parents e96d22b + f0af03e
commit ab40d8d
Show file tree

Hide file tree

Showing 22 changed files with 453 additions and 443 deletions.
diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp
@@ -2818,13 +2818,12 @@ namespace bts { namespace net { namespace detail {
 
         dlog( "client validated the block, advertising it to other peers" );
 
+        item_id block_message_item_id(bts::client::message_type_enum::block_message_type, message_hash);
+        uint32_t block_number = _delegate->get_block_number(block_message_to_process.block_id);;
+        fc::time_point_sec block_time = _delegate->get_block_time(block_message_to_process.block_id);
+
         for (const peer_connection_ptr& peer : _active_connections)
         {
-          item_id block_message_item_id(bts::client::message_type_enum::block_message_type, message_hash);
-
-          uint32_t block_number = _delegate->get_block_number(block_message_to_process.block_id);;
-          fc::time_point_sec block_time = _delegate->get_block_time(block_message_to_process.block_id);
-
           auto iter = peer->inventory_peer_advertised_to_us.find(block_message_item_id);
           if (iter != peer->inventory_peer_advertised_to_us.end())
           {

diff --git a/programs/web_wallet b/programs/web_wallet
diff --git a/tests/regression_tests/blockchain_get_account/blockchain_get_account.log b/tests/regression_tests/blockchain_get_account/blockchain_get_account.log
@@ -20,7 +20,7 @@ Active Key History:
 
 ID    NAME (* next in line)           APPROVAL       PRODUCED MISSED   RELIABILITY   PAY RATE PAY BALANCE         LAST BLOCK  VERSION     
 ==========================================================================================================================================
-1     delegate0                       0.00000000 %   0        0        N/A           100 %    0.00000 XTS         NONE                    
+1     delegate0                       0.00000000 %   0        0        N/A           0.00100 XTS0.00000 XTS         NONE                    
 
 (wallet closed) >>> blockchain_get_account delegate1
 Name: delegate1
@@ -32,7 +32,7 @@ Active Key History:
 
 ID    NAME (* next in line)           APPROVAL       PRODUCED MISSED   RELIABILITY   PAY RATE PAY BALANCE         LAST BLOCK  VERSION     
 ==========================================================================================================================================
-2     delegate1                       0.00000000 %   0        0        N/A           100 %    0.00000 XTS         NONE                    
+2     delegate1                       0.00000000 %   0        0        N/A           0.00100 XTS0.00000 XTS         NONE                    
 
 (wallet closed) >>> blockchain_get_account deleg
 No account found.

diff --git a/.../regression_tests/blockchain_get_block_transactions/blockchain_get_block_transactions.log b/.../regression_tests/blockchain_get_block_transactions/blockchain_get_block_transactions.log
@@ -22,7 +22,7 @@ Returns:
   blockchain_transaction_record_map
 default (unlocked) >>> blockchain_get_block_transactions 2
 [[
-    "890f9c50aff9c204fc44652c2707d149bd23facb",{
+    "93259386719fcbba91543f7d141b666e87f74328",{
       "trx": {
         "expiration": "20140620T154750",
         "delegate_slate_id": null,
@@ -53,7 +53,7 @@ default (unlocked) >>> blockchain_get_block_transactions 2
           }
         ],
         "signatures": [
-          "1f2c364618493f85455491b476687b015918324bb75417411b3c3909281a3cca6c54274e96517fb33b1e2824e6b0d7cb0a2747b20dbea9390495f70f2e46959177"
+          "1f2c364618493f85455491b476687b015918324bb75417411b3c3909281a3cca6c27b70509bf063ad1eee9cae56a8f72db63134f76859be659693632728a3060ac"
         ]
       },
       "signed_keys": [
@@ -87,6 +87,18 @@ default (unlocked) >>> blockchain_get_block_transactions 2
         ]
       ],
       "yield": [],
+      "deltas": [[
+          0,{
+            "amount": -10050000,
+            "asset_id": 0
+          }
+        ],[
+          1,{
+            "amount": 10000000,
+            "asset_id": 0
+          }
+        ]
+      ],
       "required_fees": {
         "amount": 0,
         "asset_id": 0

diff --git a/tests/regression_tests/blockchain_get_feeds_for_asset/blockchain_get_feeds_for_asset.log b/tests/regression_tests/blockchain_get_feeds_for_asset/blockchain_get_feeds_for_asset.log
@@ -1,7 +1,7 @@
 default (unlocked) >>> wallet_asset_create XMO DIGITAL_DEVICE1 delegate0 "CREATING AN ASSET" null 500 100
 TIMESTAMP           BLOCK     FROM                TO                  AMOUNT                  MEMO                                        FEE                 ID      
 ======================================================================================================================================================================
-[redacted]          PENDING   delegate0           delegate0           0.00000 XTS             create XMO (DIGITAL_DEVICE1)                0.50000 XTS         [redacted]
+[redacted]          PENDING   delegate0           delegate0           0.00000 XTS             create XMO (DIGITAL_DEVICE1)                1.70960 XTS         [redacted]
 default (unlocked) >>> debug_advance_time 1 blocks
 OK
 default (unlocked) >>> debug_wait 2

diff --git a/tests/regression_tests/blockchain_get_info/blockchain_get_info.log b/tests/regression_tests/blockchain_get_info/blockchain_get_info.log
@@ -12,7 +12,7 @@ Returns:
 aliases: getconfig, get_config, config, blockchain_get_config
 (wallet closed) >>> blockchain_get_info
 {
-  "blockchain_id": "3622ad3cbd09f839b921bace52bf4432b91f636d625f53401bbf6b6cb01f754c",
+  "blockchain_id": "8ea6170509689e518d19db28026aafe428987edebddf59d360ecca736126ed7f",
   "symbol": "XTS",
   "name": "BitShares XTS",
   "version": 109,
@@ -25,13 +25,12 @@ aliases: getconfig, get_config, config, blockchain_get_config
   "inactivity_fee_apr": "0.00010 XTS",
   "relay_fee": "0.10000 XTS",
   "delegate_num": 101,
-  "delegate_reg_fee": "0.00000 XTS",
   "name_size_max": 63,
   "memo_size_max": 19,
   "data_size_max": 65536,
   "symbol_size_max": 5,
   "symbol_size_min": 3,
-  "asset_reg_fee": "0.00000 XTS",
+  "asset_reg_fee": "1.20960 XTS",
   "asset_shares_max": 1000000000000000,
   "max_pending_queue_size": 10,
   "max_trx_per_second": 1,