Added annotated_signed_block #936 #945

maslenitsa93 · 2018-08-28T02:26:00Z

Checklists

Use testnet.

Check refactored cli_wallet's `get_block` (based on database_api's get_block):

Run following cli-wallet script (note: run it after block 4 applied):

./cli_wallet --server-rpc-endpoint=ws://127.0.0.1:8091
set_password qwer
unlock qwer
import_key 5JVFFWRLwz6JoP9kguuRFfytToGU6cLgBVTL9t6NB3D3BQLbUBS
get_block 4

Result:

{
  ...
  "timestamp": ...,
  ...
  "transactions": [{
      ...
      "expiration": ...,
      "operations": [[
          "pow2", ...
        ]
      ],
      "extensions": [],
      "signatures": [
        ...
      ]
    }
  ],
  "block_id": "0000000000000000000000000000000000000000",
  "signing_key": "GLS1111111111111111111111111111111114T1Anm",
  "transaction_ids": []
}

Check new method `get_block_with_virtual_ops`

Run this HTML script in browser before block 80 applied (note: this is a block applying after all hardforks):

<script src="node_modules/golos-js/dist/golos.min.js"></script>
Hello world
<script>
golos.config.set('websocket', 'ws://127.0.0.1:8091');
golos.api.send("operation_history", {"method": "get_block_with_virtual_ops", "params":[80]},
    function (err, result) {
document.body.innerHTML += '<pre>' + JSON.stringify(result, null, 2) + "</pre>";
});
</script>

Result:

{
  "previous": "0000000000000000000000000000000000000000",
  "timestamp": "1970-01-01T00:00:00",
  "witness": "",
  "transaction_merkle_root": "0000000000000000000000000000000000000000",
  "extensions": [],
  "witness_signature": "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
  "transactions": [],
  "block_id": "0000000000000000000000000000000000000000",
  "signing_key": "GLS1111111111111111111111111111111114T1Anm",
  "transaction_ids": []
}

Now wait for this block and run again. Result:

{
  ...
  "timestamp": "2018-08-28T03:35:57",
  ...
  "_virtual_operations": [
    {
      "trx_in_block": 65535,
      "op_in_trx": 0,
      "virtual_op": 1,
      "op": [
        "producer_reward",
        ...
      ]
    }
  ]
}

Check refactored `set_block_applied_callback`

After all hardforks applied, run:

<script src="node_modules/golos-js/dist/golos.min.js"></script>
Hello world
<script>
golos.config.set('websocket', 'ws://127.0.0.1:8091');
golos.api.send("database_api", {"method": "set_block_applied_callback", "params":["full"]},
    function (err, result) {
document.body.innerHTML += '<pre>' + JSON.stringify(result, null, 2) + "</pre>";
});
</script>

Result:

{
  ...
  "timestamp": ...,
  ...
  "transaction_ids": [],
  "_virtual_operations": [
    {
      "trx_in_block": 65535,
      "op_in_trx": 0,
      "virtual_op": 1,
      "op": [
        "producer_reward",
        ...
      ]
    }
  ]
}

afalaleev · 2018-08-28T04:30:53Z

libraries/api/block_objects.cpp

+    }
+}
+
+annotated_signed_block::annotated_signed_block(const signed_block& block, block_operations& ops)


(..., const block_operations& ops)

afalaleev · 2018-08-28T04:31:47Z

libraries/api/include/golos/api/block_objects.hpp

+
+    annotated_signed_block(const signed_block& block);
+
+    annotated_signed_block(const signed_block& block, block_operations& ops);


(..., const block_operations& ops)

afalaleev · 2018-08-28T04:37:26Z

plugins/operation_history/plugin.cpp

+            auto sb = database.fetch_block_by_number(block_num);
+            if (!sb.valid()) {
+                return result;
+            } else {


For what else ?

afalaleev · 2018-08-28T04:40:49Z

plugins/operation_history/plugin.cpp

+
+            const auto& idx = database.get_index<operation_index>().indices().get<by_location>();
+            auto itr = idx.lower_bound(block_num);
+            block_operations ops;


result._virtual_operations = block_operations();

afalaleev · 2018-08-28T04:41:11Z

plugins/operation_history/plugin.cpp

+                    op.op_in_trx = itr->op_in_trx;
+                    op.virtual_op = itr->virtual_op;
+                    op.op = fc::raw::unpack<protocol::operation>(itr->serialized_op);
+                    ops.push_back(op);


result._virtual_operations.push_back(op);

afalaleev · 2018-08-28T04:41:19Z

plugins/operation_history/plugin.cpp

+                    ops.push_back(op);
+                }
+            }
+            result._virtual_operations = ops;


Remove line.

maslenitsa93 · 2018-08-28T05:07:37Z

Fixing problem. 5 min.

maslenitsa93 · 2018-08-28T05:15:59Z

Fixed. Review, please.

afalaleev · 2018-08-28T12:11:02Z

Rebase changes to one commit and change HEAD from golos-v0.19.0 to golos-v0.18.5

maslenitsa93 added API changes softfork medium labels Aug 28, 2018

maslenitsa93 added this to the 0.19.0 milestone Aug 28, 2018

maslenitsa93 self-assigned this Aug 28, 2018

maslenitsa93 force-pushed the 936-extend-get_ops_in_block branch from cd6b981 to 1d6f249 Compare August 28, 2018 03:12

maslenitsa93 requested a review from afalaleev August 28, 2018 03:48

afalaleev suggested changes Aug 28, 2018

View reviewed changes

maslenitsa93 requested review from afalaleev and removed request for afalaleev August 28, 2018 05:00

maslenitsa93 requested a review from afalaleev August 28, 2018 05:15

afalaleev approved these changes Aug 28, 2018

View reviewed changes

afalaleev modified the milestones: 0.19.0, 0.18.5 Aug 28, 2018

afalaleev changed the base branch from golos-v0.19.0 to golos-v0.18.5 August 28, 2018 12:09

maslenitsa93 force-pushed the 936-extend-get_ops_in_block branch 6 times, most recently from e7225a7 to ee96922 Compare August 28, 2018 12:47

Added annotated_signed_block and get_block_with_virtual_ops #936

8905450

maslenitsa93 force-pushed the 936-extend-get_ops_in_block branch 5 times, most recently from e903797 to 8905450 Compare August 28, 2018 15:47

maslenitsa93 force-pushed the 936-extend-get_ops_in_block branch 2 times, most recently from 1435b6a to 8905450 Compare August 28, 2018 15:49

afalaleev merged commit 43d2301 into golos-v0.18.5 Aug 28, 2018

afalaleev deleted the 936-extend-get_ops_in_block branch August 28, 2018 16:58

isteric-senior mentioned this pull request Apr 24, 2020

Поправить API set_block_applied_callback. golos-blockchain/chain-node#92

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added annotated_signed_block #936 #945

Added annotated_signed_block #936 #945

maslenitsa93 commented Aug 28, 2018 •

edited

Loading

afalaleev Aug 28, 2018

afalaleev Aug 28, 2018

afalaleev Aug 28, 2018

afalaleev Aug 28, 2018

afalaleev Aug 28, 2018

afalaleev Aug 28, 2018

maslenitsa93 commented Aug 28, 2018

maslenitsa93 commented Aug 28, 2018

afalaleev commented Aug 28, 2018


		annotated_signed_block(const signed_block& block);

		annotated_signed_block(const signed_block& block, block_operations& ops);

Added annotated_signed_block #936 #945

Added annotated_signed_block #936 #945

Conversation

maslenitsa93 commented Aug 28, 2018 • edited Loading

Checklists

Check refactored cli_wallet's get_block (based on database_api's get_block):

Check new method get_block_with_virtual_ops

Check refactored set_block_applied_callback

afalaleev Aug 28, 2018

Choose a reason for hiding this comment

afalaleev Aug 28, 2018

Choose a reason for hiding this comment

afalaleev Aug 28, 2018

Choose a reason for hiding this comment

afalaleev Aug 28, 2018

Choose a reason for hiding this comment

afalaleev Aug 28, 2018

Choose a reason for hiding this comment

afalaleev Aug 28, 2018

Choose a reason for hiding this comment

maslenitsa93 commented Aug 28, 2018

maslenitsa93 commented Aug 28, 2018

afalaleev commented Aug 28, 2018

maslenitsa93 commented Aug 28, 2018 •

edited

Loading

Check refactored cli_wallet's `get_block` (based on database_api's get_block):

Check new method `get_block_with_virtual_ops`

Check refactored `set_block_applied_callback`