Merge pull request #22 from tonlabs/0.1.7

0.1.7

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.7] – 2022-06-27
+
+### New
+
+- support `query { blockchain { .. } }` GraphQL API queries in Evernode DApp Server
+
+### Improvements
+
+- updated ton-q-server from `0.48.1` to `0.52.0`
+- updated ton-labs-node from `49a724639a175752f44bcda65d907f2ca3ad97aa` to `5c3951a4de03833a49079d1c07ad5a05798df169`
+- updated kafka-connect-arangodb to custom solution with additional `overwritemode` parameter
+- changed arangodb-messages-sink configuration to update messages instead of replacing
+- added 20 new indexes to arangodb
+- make `query { blockchain { .. } }` GraphQL API queries properly work
+
 ## [0.1.6] – 2022-03-29
 
 ### Improvements

docker-compose/arangodb/build/arango/initdb.d/upgrade-arango-db.js

@@ -18,6 +18,10 @@ const BLOCKCHAIN = {
                 sortedIndex(['master.min_shard_gen_utime']),
                 sortedIndex(['prev_ref.root_hash', '_key']),
                 sortedIndex(['prev_alt_ref.root_hash', '_key']),
+                sortedIndex(['chain_order']),
+                sortedIndex(['key_block', 'chain_order']),
+                sortedIndex(['workchain_id', 'chain_order']),
+                sortedIndex(['workchain_id', 'shard', 'chain_order']),
             ],
         },
         accounts: {
@@ -37,6 +41,7 @@ const BLOCKCHAIN = {
                 sortedIndex(['src', 'created_at']),
                 sortedIndex(['dst', 'created_at']),
                 sortedIndex(['created_lt']),
+                sortedIndex(['msg_type', 'created_at']),
                 sortedIndex(['created_at']),
                 sortedIndex(['code_hash', 'created_at']),
                 sortedIndex(['code_hash', 'last_paid']),
@@ -45,10 +50,21 @@ const BLOCKCHAIN = {
                 sortedIndex(['dst', 'msg_type', 'created_at', 'created_lt']),
                 sortedIndex(['src', 'msg_type', 'created_at', 'created_lt']),
                 sortedIndex(['src', 'dst', 'value', 'created_at', 'created_lt']),
-                sortedIndex(['src',  'value' , 'msg_type', 'created_at', 'created_lt']),
-                sortedIndex(['dst',  'value' , 'msg_type', 'created_at', 'created_lt']),
+                sortedIndex(['src', 'value', 'msg_type', 'created_at', 'created_lt']),
+                sortedIndex(['dst', 'value', 'msg_type', 'created_at', 'created_lt']),
                 sortedIndex(['src', 'dst', 'created_at', 'created_lt']),
                 sortedIndex(['src', 'body_hash', 'created_at', 'created_lt']),
+                sortedIndex(['chain_order']),
+                sortedIndex(['dst_chain_order']),
+                sortedIndex(['src_chain_order']),
+                sortedIndex(['msg_type', 'dst_chain_order']),
+                sortedIndex(['msg_type', 'src_chain_order']),
+                sortedIndex(['dst', 'dst_chain_order']),
+                sortedIndex(['dst', 'msg_type', 'dst_chain_order']),
+                sortedIndex(['dst', 'msg_type', 'src', 'dst_chain_order']),
+                sortedIndex(['src', 'src_chain_order']),
+                sortedIndex(['src', 'msg_type', 'src_chain_order']),
+                sortedIndex(['src', 'msg_type', 'dst', 'src_chain_order']),
             ],
         },
         transactions: {
@@ -68,6 +84,10 @@ const BLOCKCHAIN = {
                 sortedIndex(['account_addr', 'balance_delta', 'now', 'lt']),
                 sortedIndex(['account_addr', 'lt', 'now']),
                 sortedIndex(['block_id', 'lt']),
+                sortedIndex(['chain_order']),
+                sortedIndex(['account_addr', 'chain_order']),
+                sortedIndex(['workchain_id', 'chain_order']),
+                sortedIndex(['account_addr', 'aborted', 'chain_order']),
             ],
         },
         blocks_signatures: {
@@ -92,7 +112,7 @@ function checkCollection(name, props) {
         console.log(`Collection ${name} does not exist. Created.`);
         collection = db._create(name);
     } else {
-        console.log(`Collection ${name} already exist.`);
+        console.log(`Collection ${name} already exists.`);
     }
     props.indexes.forEach((index) => {
         console.log(`Ensure index ${index.fields.join(', ')}`);
@@ -104,7 +124,7 @@ function checkCollection(name, props) {
 function checkDB(db_name, collections_schema) {
     db._useDatabase('_system');
     if (db._databases().find(x => x.toLowerCase() === db_name)) {
-        console.log(`Database ${db_name} already exist.`);
+        console.log(`Database ${db_name} already exists.`);
     } else {
         console.log(`Database ${db_name} does not exist. Created.`);
         db._createDatabase(db_name, {}, []);

docker-compose/kafka/build_check/connectors/arangodb-messages-sink.properties

@@ -25,6 +25,7 @@ arangodb.user=root
 arangodb.password=iJJ9fWxb9Z6CS1aPagoW
 arangodb.port=8529
 arangodb.database.name=blockchain
+arangodb.insert.overwritemode=update
 
 transforms=KeyTransform
 transforms.KeyTransform.field=id
@@ -33,4 +34,4 @@ transforms.KeyTransform.type=org.apache.kafka.connect.transforms.HoistField$Key
 key.converter.schemas.enable=false
 key.converter=org.apache.kafka.connect.json.JsonConverter
 value.converter.schemas.enable=false
-value.converter=org.apache.kafka.connect.json.JsonConverter
+value.converter=org.apache.kafka.connect.json.JsonConverter

docker-compose/kafka/files/kafka-connect-arangodb/README.md

@@ -0,0 +1 @@
+kafka-connect-arangodb-1.0.8.jar is from fork: https://github.com/tonlabs/kafka-connect-arangodb

docker-compose/ton-node/build/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.58.0
+ARG RUST_VERSION=1.61.0
 
 FROM ubuntu:18.04 as build
 

scripts/env.sh

@@ -20,6 +20,6 @@ export EMAIL_FOR_NOTIFICATIONS="[email protected]"
 export COMPOSE_HTTP_TIMEOUT=120 # in sec, 60 sec - default
 HOSTNAME=$(hostname -f)
 export TON_Q_SERVER_GITHUB_REPO="https://github.com/tonlabs/ton-q-server"
-export TON_Q_SERVER_GITHUB_COMMIT_ID="0.48.1"
+export TON_Q_SERVER_GITHUB_COMMIT_ID="0.52.0"
 export TON_NODE_GITHUB_REPO="https://github.com/tonlabs/ton-labs-node"
-export TON_NODE_GITHUB_COMMIT_ID="49a724639a175752f44bcda65d907f2ca3ad97aa"
+export TON_NODE_GITHUB_COMMIT_ID="5c3951a4de03833a49079d1c07ad5a05798df169"