Skip to content

Commit

Permalink
Merge pull request #390 from everx-labs/rebranding
Browse files Browse the repository at this point in the history
Version 0.67.0. Rebranding
  • Loading branch information
AtomXY authored May 10, 2024
2 parents 11bbffb + 1974d4c commit 1b1b6a9
Show file tree
Hide file tree
Showing 27 changed files with 88 additions and 84 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@

All notable changes to this project will be documented in this file.

## [0.67.0] - 2024-05-02

- Rebranding changes

## [0.66.0] - 2023-10-18

### New

- Added fields: `BlockchainMessage { src_code_hash dst_code_hash }`, `BlockchainTransaction { code_hash }`,
`Message { src_code_hash dst_code_hash } `, `Transaction { code_hash }`.
- Added arguments: `blockchain.messages(src_code_hash dst_code_hash)`, `blockchain.transactions(code_hash)`.
- In `TCP_ADNL` request mode Q-Server uses TON LiteServer API as an account provider.
- In `TCP_ADNL` request mode Q-Server uses Everscale LiteServer API as an account provider.

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ G_node = resources.getFreeLock(/Linux[0-9]+/)
G_promoted_version = "master"
G_promoted_tag = "latest"

G_giturl = "https://github.com/tonlabs/ton-q-server.git"
G_giturl = "https://github.com/everx-labs/ever-q-server.git"
G_gitcred = "TonJenSSH"
G_dockerCred = 'TonJenDockerHub'
G_gqlimage_base = "tonlabs/q-server"
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# ton-q-server
# ever-q-server

TON GraphQL Server.
Everscale GraphQL Server.

This component is a part of TON-Server and must not be accessed directly but through TON Labs Client
This component is a part of EverX Labs Server and must not be accessed directly but through EverX Labs Client
Libraries.

## Prerequisites
Expand Down Expand Up @@ -278,7 +278,7 @@ node index.js

Q-Server is accessible with GraphQL HTTP/WebSocket protocol on port "4000" and path "/graphql".

There is the only valid way to communicate with Q-Server – TON Labs Client Libraries.
There is the only valid way to communicate with Q-Server – EverX Labs Client Libraries.

## StatsD

Expand Down Expand Up @@ -323,8 +323,8 @@ Q-Server can report additional tags with help of optional parameter `Q_STATSD_TA

If you need to add or change or remove index in Arango Db you must change following files:

- [https://github.com/tonlabs/ton-q-server/blob/d491c7c0e6e11cb70d5f7f0813eef719ea6b997d/src/server/data/data-provider.js#L65]
- [https://github.com/tonlabs/TON-infrastructure/blob/ef4d409d9508ca5e1d815c5f21ec11f16c4b8f39/pipelines/arango/arango/initdb.d/upgrade-arango-db.js#L7]
- [https://github.com/everx-labs/ever-q-server/blob/d491c7c0e6e11cb70d5f7f0813eef719ea6b997d/src/server/data/data-provider.js#L65]
- [https://github.com/everx-labs/TVM-infrastructure/blob/ef4d409d9508ca5e1d815c5f21ec11f16c4b8f39/pipelines/arango/arango/initdb.d/upgrade-arango-db.js#L7]

How to determine which index required to serve some slow query.

Expand Down
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2020 TON DEV SOLUTIONS LTD.
* Copyright 2018-2020 EverX Labs Ltd.
*
* Licensed under the SOFTWARE EVALUATION License (the "License"); you may not use
* this file except in compliance with the License. You may obtain a copy of the
Expand All @@ -10,7 +10,7 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific TON DEV software governing permissions and
* See the License for the specific EverX Labs software governing permissions and
* limitations under the License.
*/

Expand Down
12 changes: 6 additions & 6 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "ton-q-server",
"version": "0.66.0",
"description": "TON Q Server – realtime queries over TON blockchain.",
"name": "ever-q-server",
"version": "0.67.0",
"description": "Ever Q Server – realtime queries over Everscale blockchain.",
"main": "index.js",
"repository": "git@github.com:tonlabs/ton-q-server.git",
"repository": "git@github.com:everx-labs/ever-q-server.git",
"scripts": {
"format": "npm run eslint-fix",
"gen": "npm run gen-schema-no-format && npm run gen-blockchain-no-format && npm run format",
Expand Down Expand Up @@ -43,7 +43,7 @@
"apollo-server": "2.25.3",
"apollo-server-express": "2.16.1",
"apollo-utilities": "1.3.4",
"arangochair": "git+https://github.com/tonlabs/arangochair.git",
"arangochair": "git+https://github.com/everx-labs/arangochair.git",
"arangojs": "6.14.1",
"commander": "6.0.0",
"express": "4.17.1",
Expand Down
2 changes: 1 addition & 1 deletion res/type-defs-blockchain/account.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Account type
Recall that a smart contract and an account are the same thing in the context
of the TON Blockchain, and that these terms can be used interchangeably, at
of the Everscale Blockchain, and that these terms can be used interchangeably, at
least as long as only small (or “usual”) smart contracts are considered. A large
smart-contract may employ several accounts lying in different shardchains of
the same workchain for load balancing purposes.
Expand Down
2 changes: 1 addition & 1 deletion res/type-defs-blockchain/block.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ type BlockchainBlock implements Node {
shard: String
"""
Logical creation time automatically set by the block formation start.
Logical time is a component of the TON Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see the TON blockchain specification
Logical time is a component of the Everscale Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see the Everscale blockchain specification
"""
start_lt(format: BigIntFormat): String
state_update: BlockStateUpdate
Expand Down
4 changes: 2 additions & 2 deletions res/type-defs-blockchain/codegen-stubs.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ type Config {
p37: ValidatorSet
"Array of validator signed temporary keys"
p39: [ConfigP39]
"Address of TON DNS root smart contract in the masterchain"
"Address of Everscale DNS root smart contract in the masterchain"
p4: String
"Array of suspended smart contracts addresses"
p44: [String]
Expand All @@ -488,7 +488,7 @@ type Config {
type BlockMasterShardHashesDescr {
before_merge: Boolean
"""
TON Blockchain supports dynamic sharding, so the shard configuration may change from block to block because of shard merge and split events. Therefore, we cannot simply say that each shardchain corresponds to a fixed set of account chains.
Everscale Blockchain supports dynamic sharding, so the shard configuration may change from block to block because of shard merge and split events. Therefore, we cannot simply say that each shardchain corresponds to a fixed set of account chains.
A shardchain block and its state may each be classified into two distinct parts. The parts with the ISP-dictated form of will be called the split parts of the block and its state, while the remainder will be called the non-split parts.
The masterchain cannot be split or merged.
"""
Expand Down
2 changes: 1 addition & 1 deletion res/type-defs-blockchain/transaction.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type BlockchainTransaction implements Node {
in_message: BlockchainMessage
in_msg: String
installed: Boolean
"Logical time. A component of the TON Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see [the TON blockchain specification](https://test.ton.org/tblkch.pdf)."
"Logical time. A component of the Everscale Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see [the Everscale blockchain specification](https://test.ton.org/tblkch.pdf)."
lt(format: BigIntFormat): String
"seq_no of masterchain block which commited shard block containing the transaction"
master_seq_no: Float
Expand Down
24 changes: 12 additions & 12 deletions res/type-defs-generated.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ type Config {
p37: ValidatorSet
"Array of validator signed temporary keys"
p39: [ConfigP39]
"Address of TON DNS root smart contract in the masterchain"
"Address of Everscale DNS root smart contract in the masterchain"
p4: String
p40: ConfigP40
p42: ConfigP42
Expand Down Expand Up @@ -763,7 +763,7 @@ type BlockStateUpdate {
type BlockMasterShardHashesDescr {
before_merge: Boolean
"""
TON Blockchain supports dynamic sharding, so the shard configuration may change from block to block because of shard merge and split events. Therefore, we cannot simply say that each shardchain corresponds to a fixed set of account chains.
Everscale Blockchain supports dynamic sharding, so the shard configuration may change from block to block because of shard merge and split events. Therefore, we cannot simply say that each shardchain corresponds to a fixed set of account chains.
A shardchain block and its state may each be classified into two distinct parts. The parts with the ISP-dictated form of will be called the split parts of the block and its state, while the remainder will be called the non-split parts.
The masterchain cannot be split or merged.
"""
Expand Down Expand Up @@ -1010,7 +1010,7 @@ type ZerostateLibraries {
# Account type
Recall that a smart contract and an account are the same thing in the context
of the TON Blockchain, and that these terms can be used interchangeably, at
of the Everscale Blockchain, and that these terms can be used interchangeably, at
least as long as only small (or “usual”) smart contracts are considered. A large
smart-contract may employ several accounts lying in different shardchains of
the same workchain for load balancing purposes.
Expand Down Expand Up @@ -1147,7 +1147,7 @@ type Account {
workchain_id: Int
}

"TON Transaction"
"Everscale Transaction"
type Transaction {
id: String
aborted: Boolean
Expand Down Expand Up @@ -1198,7 +1198,7 @@ type Transaction {
in_message(timeout: Int, "**DEPRECATED**" when: TransactionFilter): Message
in_msg: String
installed: Boolean
"Logical time. A component of the TON Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see [the TON blockchain specification](https://test.ton.org/tblkch.pdf)."
"Logical time. A component of the Everscale Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see [the Everscale blockchain specification](https://test.ton.org/tblkch.pdf)."
lt(format: BigIntFormat): String
"seq_no of masterchain block which commited shard block containing the transaction"
master_seq_no: Float
Expand Down Expand Up @@ -1423,7 +1423,7 @@ type Block {
signatures(timeout: Int, "**DEPRECATED**" when: BlockFilter): BlockSignatures
"""
Logical creation time automatically set by the block formation start.
Logical time is a component of the TON Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see the TON blockchain specification
Logical time is a component of the Everscale Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see the Everscale blockchain specification
"""
start_lt(format: BigIntFormat): String
state_update: BlockStateUpdate
Expand Down Expand Up @@ -1957,7 +1957,7 @@ input ConfigFilter {
p37: ValidatorSetFilter
"Array of validator signed temporary keys"
p39: ConfigP39ArrayFilter
"Address of TON DNS root smart contract in the masterchain"
"Address of Everscale DNS root smart contract in the masterchain"
p4: StringFilter
p40: ConfigP40Filter
p42: ConfigP42Filter
Expand Down Expand Up @@ -2233,7 +2233,7 @@ input SplitTypeEnumFilter {
input BlockMasterShardHashesDescrFilter {
before_merge: BooleanFilter
"""
TON Blockchain supports dynamic sharding, so the shard configuration may change from block to block because of shard merge and split events. Therefore, we cannot simply say that each shardchain corresponds to a fixed set of account chains.
Everscale Blockchain supports dynamic sharding, so the shard configuration may change from block to block because of shard merge and split events. Therefore, we cannot simply say that each shardchain corresponds to a fixed set of account chains.
A shardchain block and its state may each be classified into two distinct parts. The parts with the ISP-dictated form of will be called the split parts of the block and its state, while the remainder will be called the non-split parts.
The masterchain cannot be split or merged.
"""
Expand Down Expand Up @@ -2512,7 +2512,7 @@ input ZerostateLibrariesFilter {
# Account type
Recall that a smart contract and an account are the same thing in the context
of the TON Blockchain, and that these terms can be used interchangeably, at
of the Everscale Blockchain, and that these terms can be used interchangeably, at
least as long as only small (or “usual”) smart contracts are considered. A large
smart-contract may employ several accounts lying in different shardchains of
the same workchain for load balancing purposes.
Expand Down Expand Up @@ -2682,7 +2682,7 @@ input TransactionTypeEnumFilter {
notIn: [TransactionTypeEnum]
}

"TON Transaction"
"Everscale Transaction"
input TransactionFilter {
id: StringFilter
aborted: BooleanFilter
Expand Down Expand Up @@ -2733,7 +2733,7 @@ input TransactionFilter {
in_message: MessageFilter
in_msg: StringFilter
installed: BooleanFilter
"Logical time. A component of the TON Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see [the TON blockchain specification](https://test.ton.org/tblkch.pdf)."
"Logical time. A component of the Everscale Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see [the Everscale blockchain specification](https://test.ton.org/tblkch.pdf)."
lt: StringFilter
"seq_no of masterchain block which commited shard block containing the transaction"
master_seq_no: FloatFilter
Expand Down Expand Up @@ -3005,7 +3005,7 @@ input BlockFilter {
signatures: BlockSignaturesFilter
"""
Logical creation time automatically set by the block formation start.
Logical time is a component of the TON Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see the TON blockchain specification
Logical time is a component of the Everscale Blockchain that also plays an important role in message delivery is the logical time, usually denoted by Lt. It is a non-negative 64-bit integer, assigned to certain events. For more details, see the Everscale blockchain specification
"""
start_lt: StringFilter
state_update: BlockStateUpdateFilter
Expand Down
8 changes: 4 additions & 4 deletions src/__tests__/aggregations.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import gql from "graphql-tag"
import { AggregationFn } from "../server/data/aggregations"
import QLogs from "../server/logs"
import TONQServer from "../server/server"
import EverQServer from "../server/server"
import {
aggregationQueryText,
createLocalArangoTestData,
Expand Down Expand Up @@ -137,7 +137,7 @@ function aggregateStrings<T>(items: T[], getValue: (item: T) => string) {

test("Partitioned Data", async () => {
const data = createLocalArangoTestData(new QLogs())
const server = new TONQServer({
const server = new EverQServer({
config: testConfig,
logs: new QLogs(),
data,
Expand Down Expand Up @@ -236,7 +236,7 @@ test("Partitioned Data", async () => {

test("Partitioned data with null", async () => {
const data = createLocalArangoTestData(new QLogs())
const server = new TONQServer({
const server = new EverQServer({
config: testConfig,
logs: new QLogs(),
data,
Expand All @@ -262,7 +262,7 @@ test("Partitioned data with null", async () => {

test.skip("Balance delta sum", async () => {
const data = createLocalArangoTestData(new QLogs())
const server = new TONQServer({
const server = new EverQServer({
config: testConfig,
logs: new QLogs(),
data,
Expand Down
10 changes: 5 additions & 5 deletions src/__tests__/blockchain-mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
block_signatures as blockSignaturesData,
} from "./blockchain-mock-data"
import { QConfig, resolveConfig, SubscriptionsMode } from "../server/config"
import TONQServer, { DataProviderFactory } from "../server/server"
import EverQServer, { DataProviderFactory } from "../server/server"
import QLogs from "../server/logs"
import QBlockchainData from "../server/data/blockchain"
import { QTracer } from "../server/tracing"
Expand Down Expand Up @@ -122,8 +122,8 @@ export function startNodeRpcMock(

export async function startTestServer(
overrideConfig?: (config: QConfig) => void,
): Promise<TONQServer> {
// prepare TONQServer
): Promise<EverQServer> {
// prepare EverQServer
const dbUrl = getTestDbUrl(false)

const config = resolveConfig(
Expand Down Expand Up @@ -160,7 +160,7 @@ export async function startTestServer(

const serverConfig = cloneDeep(testConfig) as QConfig
overrideConfig?.(serverConfig)
const server = new TONQServer({
const server = new EverQServer({
config: serverConfig,
logs: new QLogs(),
data: blockchainData,
Expand Down Expand Up @@ -275,7 +275,7 @@ type TestSetupOptions = {
export class TestSetup {
constructor(
public client: ApolloClient<any>,
public server: TONQServer,
public server: EverQServer,
public accountProvider?: NodeRpcMock,
) {}

Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/blockchain.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import gql from "graphql-tag"

import TONQServer from "../server/server"
import EverQServer from "../server/server"

import { createTestClient } from "./init-tests"
import { createTestData, startTestServer, TestSetup } from "./blockchain-mock"
import { InternalEvent, LastKeyBlockCacheEventArg } from "../server/request"

let server: TONQServer | null = null
let server: EverQServer | null = null

beforeAll(async () => {
await createTestData()
Expand Down
Loading

0 comments on commit 1b1b6a9

Please sign in to comment.