Skip to content

Commit

Permalink
commit
Browse files Browse the repository at this point in the history
  • Loading branch information
adrian committed Dec 25, 2023
1 parent fa0eebd commit cc24d94
Show file tree
Hide file tree
Showing 365 changed files with 1,104 additions and 1,104 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ This repository contains the source code for the Cosmos SDK application responsi

`protocol` — Contains source code for the Cosmos SDK app that runs the protocol. See its [README](https://github.com/jinxprotocol/v4-chain/blob/main/indexer/README.md) for developer documentation.

`v4-proto-js` — Scripts for publishing proto package to [npm](https://www.npmjs.com/package/@jinxprotocol/v4-proto).
`v4-proto-js` — Scripts for publishing proto package to [npm](https://www.npmjs.com/package/@dydxprotocol/v4-proto).

`v4-proto-py` — Scripts for publishing proto package to [PyPI](https://pypi.org/project/v4-proto/).

Expand Down
2 changes: 1 addition & 1 deletion e2e-testing/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('./node_modules/@jinxprotocol-indexer/dev/.eslintrc');
const baseConfig = require('./node_modules/@dydxprotocol-indexer/dev/.eslintrc');

module.exports = {
...baseConfig,
Expand Down
4 changes: 2 additions & 2 deletions e2e-testing/__tests__/transfers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import {
SocketClient,
SubaccountInfo,
ValidatorClient,
} from '@jinxprotocol/v4-client-js';
} from '@dydxprotocol/v4-client-js';
import {
Ordering,
SubaccountTable,
TransferColumns,
TransferFromDatabase,
TransferTable,
} from '@jinxprotocol-indexer/postgres';
} from '@dydxprotocol-indexer/postgres';
import * as utils from './helpers/utils';
import { JINX_LOCAL_ADDRESS, JINX_LOCAL_MNEMONIC } from './helpers/constants';

Expand Down
8 changes: 4 additions & 4 deletions e2e-testing/docker-compose-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ services:
- --home
- /jinxprotocol/chain/.alice
- --p2p.persistent_peers
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@jinxprotocold0:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@jinxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@jinxprotocold3:26656"
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@dydxprotocold0:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@dydxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@dydxprotocold3:26656"
- --bridge-daemon-eth-rpc-endpoint
- "${ETH_RPC_ENDPOINT}"
environment:
Expand All @@ -81,7 +81,7 @@ services:
- --home
- /jinxprotocol/chain/.bob
- --p2p.persistent_peers
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@jinxprotocold0:26656,b69182310be02559483e42c77b7b104352713166@jinxprotocold1:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@jinxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@jinxprotocold3:26656"
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@dydxprotocold0:26656,b69182310be02559483e42c77b7b104352713166@dydxprotocold1:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@dydxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@dydxprotocold3:26656"
- --non-validating-full-node=true
- --bridge-daemon-eth-rpc-endpoint
- "${ETH_RPC_ENDPOINT}"
Expand All @@ -108,7 +108,7 @@ services:
- --home
- /jinxprotocol/chain/.carl
- --p2p.persistent_peers
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@jinxprotocold0:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@jinxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@jinxprotocold3:26656"
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@dydxprotocold0:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@dydxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@dydxprotocold3:26656"
- --bridge-daemon-eth-rpc-endpoint
- "${ETH_RPC_ENDPOINT}"
environment:
Expand All @@ -127,7 +127,7 @@ services:
- --home
- /jinxprotocol/chain/.dave
- --p2p.persistent_peers
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@jinxprotocold0:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@jinxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@jinxprotocold3:26656"
- "17e5e45691f0d01449c84fd4ae87279578cdd7ec@dydxprotocold0:26656,47539956aaa8e624e0f1d926040e54908ad0eb44@dydxprotocold2:26656,5882428984d83b03d0c907c1f0af343534987052@dydxprotocold3:26656"
- --bridge-daemon-eth-rpc-endpoint
- "${ETH_RPC_ENDPOINT}"
environment:
Expand Down
2 changes: 1 addition & 1 deletion e2e-testing/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Use the base configuration as-is.
module.exports = require('./node_modules/@jinxprotocol-indexer/dev/jest.config');
module.exports = require('./node_modules/@dydxprotocol-indexer/dev/jest.config');
14 changes: 7 additions & 7 deletions e2e-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"author": "",
"license": "AGPL-3.0",
"dependencies": {
"@jinxprotocol-indexer/base": "file:../indexer/packages/base",
"@jinxprotocol-indexer/kafka": "file:../indexer/packages/kafka",
"@jinxprotocol-indexer/postgres": "file:../indexer/packages/postgres",
"@jinxprotocol-indexer/v4-proto-parser": "file:../indexer/packages/v4-proto-parser",
"@jinxprotocol-indexer/v4-protos": "file:../indexer/packages/v4-protos",
"@jinxprotocol/v4-client-js": "^1.0.12",
"@dydxprotocol-indexer/base": "file:../indexer/packages/base",
"@dydxprotocol-indexer/kafka": "file:../indexer/packages/kafka",
"@dydxprotocol-indexer/postgres": "file:../indexer/packages/postgres",
"@dydxprotocol-indexer/v4-proto-parser": "file:../indexer/packages/v4-proto-parser",
"@dydxprotocol-indexer/v4-protos": "file:../indexer/packages/v4-protos",
"@dydxprotocol/v4-client-js": "^1.0.12",
"big.js": "^6.0.2",
"dotenv-flow": "^3.2.0",
"kafkajs": "^2.1.0",
Expand All @@ -30,7 +30,7 @@
"yargs": "^13.3.0"
},
"devDependencies": {
"@jinxprotocol-indexer/dev": "file:../indexer/packages/dev",
"@dydxprotocol-indexer/dev": "file:../indexer/packages/dev",
"@types/jest": "^28.1.4",
"@types/long": "4.0.2",
"@types/node": "^18.0.3",
Expand Down
34 changes: 17 additions & 17 deletions e2e-testing/pnpm-lock.yaml

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

6 changes: 3 additions & 3 deletions e2e-testing/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { baseConfigSchema, parseSchema } from '@jinxprotocol-indexer/base';
import { kafkaConfigSchema } from '@jinxprotocol-indexer/kafka';
import { postgresConfigSchema } from '@jinxprotocol-indexer/postgres';
import { baseConfigSchema, parseSchema } from '@dydxprotocol-indexer/base';
import { kafkaConfigSchema } from '@dydxprotocol-indexer/kafka';
import { postgresConfigSchema } from '@dydxprotocol-indexer/postgres';

export const configSchema = {
...baseConfigSchema,
Expand Down
2 changes: 1 addition & 1 deletion e2e-testing/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"strict": true,
"useUnknownInCatchVariables": false,
"paths": {
"@jinxprotocol-indexer/example-package": ["packages/example-package/src"],
"@dydxprotocol-indexer/example-package": ["packages/example-package/src"],
},
"baseUrl": ".",
"outDir": "build",
Expand Down
2 changes: 1 addition & 1 deletion indexer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Use `packages/example-package` as a template:
```
cp -r packages/example-package packages/<package-name>
```
- Update `package.json` name to `@jinxprotocol-indexer/<package-name>`, update the `README.md`, and run `pnpm i` to install dependencies.
- Update `package.json` name to `@dydxprotocol-indexer/<package-name>`, update the `README.md`, and run `pnpm i` to install dependencies.
- Add in `Dockerfile.service.local`, `Dockerfile.service.remote`, and `Dockerfile.postgres-package.local` to copy the `package.json` file and `build/` files.
- Add in `Dockerfile.bazooka.remote` to copy the package directory

Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/base/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('./node_modules/@jinxprotocol-indexer/dev/.eslintrc');
const baseConfig = require('./node_modules/@dydxprotocol-indexer/dev/.eslintrc');

module.exports = {
...baseConfig,
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/base/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Use the base configuration as-is.
module.exports = require('./node_modules/@jinxprotocol-indexer/dev/jest.config');
module.exports = require('./node_modules/@dydxprotocol-indexer/dev/jest.config');
4 changes: 2 additions & 2 deletions indexer/packages/base/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@jinxprotocol-indexer/base",
"name": "@dydxprotocol-indexer/base",
"version": "0.0.1",
"description": "",
"main": "build/index.js",
"devDependencies": {
"@jinxprotocol-indexer/dev": "workspace:^0.0.1",
"@dydxprotocol-indexer/dev": "workspace:^0.0.1",
"@types/big.js": "^6.1.5",
"@types/express": "^4.17.13",
"@types/lodash": "^4.14.182",
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/compliance/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('./node_modules/@jinxprotocol-indexer/dev/.eslintrc');
const baseConfig = require('./node_modules/@dydxprotocol-indexer/dev/.eslintrc');

module.exports = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
HOLISTIC,
} from '../../src/clients/elliptic-provider';
import { ComplianceClientError } from '../../src/lib/error';
import { TooManyRequestsError } from '@jinxprotocol-indexer/base';
import { TooManyRequestsError } from '@dydxprotocol-indexer/base';
import config from '../../src/config';
import { ComplianceClientResponse } from 'packages/compliance/src';

Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/compliance/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Use the base configuration as-is.
module.exports = require('./node_modules/@jinxprotocol-indexer/dev/jest.config');
module.exports = require('./node_modules/@dydxprotocol-indexer/dev/jest.config');
6 changes: 3 additions & 3 deletions indexer/packages/compliance/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@jinxprotocol-indexer/compliance",
"name": "@dydxprotocol-indexer/compliance",
"version": "0.0.1",
"description": "",
"main": "build/src/index.js",
"devDependencies": {
"@jinxprotocol-indexer/dev": "workspace:^0.0.1",
"@dydxprotocol-indexer/dev": "workspace:^0.0.1",
"jest": "^28.1.2",
"@types/jest": "^28.1.4",
"typescript": "^4.7.4"
Expand All @@ -28,7 +28,7 @@
},
"homepage": "https://github.com/jinxprotocol/indexer#readme",
"dependencies": {
"@jinxprotocol-indexer/base": "workspace:^0.0.1",
"@dydxprotocol-indexer/base": "workspace:^0.0.1",
"axios": "^1.2.1",
"dotenv-flow": "^3.2.0",
"lodash": "^4.17.21"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import crypto from 'crypto';

import { TooManyRequestsError, logger, stats } from '@jinxprotocol-indexer/base';
import { TooManyRequestsError, logger, stats } from '@dydxprotocol-indexer/base';
import axios, { AxiosResponse } from 'axios';
import _ from 'lodash';

Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/compliance/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
baseConfigSchema,
parseInteger,
parseBoolean,
} from '@jinxprotocol-indexer/base';
} from '@dydxprotocol-indexer/base';

export const complianceConfigSchema = {
...baseConfigSchema,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { stats } from '@jinxprotocol-indexer/base';
import { stats } from '@dydxprotocol-indexer/base';

import config from '../config';
import { isRestrictedCountry } from './util';
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/dev/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@jinxprotocol-indexer/dev",
"name": "@dydxprotocol-indexer/dev",
"version": "0.0.1",
"description": "",
"main": "build/index.js",
Expand Down
4 changes: 2 additions & 2 deletions indexer/packages/dev/src/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ export function mockNow(now: Date | number): FnMock<typeof Date.now> {
* Function to make `wrapBackgroundTask` a synchronous function for testing.
* Requires code like this at the top of the file:
*
* jest.mock('@jinxprotocol-indexer/base', () => ({
* ...jest.requireActual('@jinxprotocol-indexer/base'),
* jest.mock('@dydxprotocol-indexer/base', () => ({
* ...jest.requireActual('@dydxprotocol-indexer/base'),
* wrapBackgroundTask: jest.fn(),
* }));
*
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/example-package/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('./node_modules/@jinxprotocol-indexer/dev/.eslintrc');
const baseConfig = require('./node_modules/@dydxprotocol-indexer/dev/.eslintrc');

module.exports = {
...baseConfig,
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/example-package/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Use the base configuration as-is.
module.exports = require('./node_modules/@jinxprotocol-indexer/dev/jest.config');
module.exports = require('./node_modules/@dydxprotocol-indexer/dev/jest.config');
4 changes: 2 additions & 2 deletions indexer/packages/example-package/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@jinxprotocol-indexer/example-package",
"name": "@dydxprotocol-indexer/example-package",
"version": "0.0.1",
"description": "",
"main": "build/index.js",
"devDependencies": {
"@jinxprotocol-indexer/dev": "workspace:^0.0.1",
"@dydxprotocol-indexer/dev": "workspace:^0.0.1",
"typescript": "^4.7.4"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/kafka/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('./node_modules/@jinxprotocol-indexer/dev/.eslintrc');
const baseConfig = require('./node_modules/@dydxprotocol-indexer/dev/.eslintrc');

module.exports = {
...baseConfig,
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/kafka/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Use the base configuration as-is.
module.exports = require('./node_modules/@jinxprotocol-indexer/dev/jest.config');
module.exports = require('./node_modules/@dydxprotocol-indexer/dev/jest.config');
6 changes: 3 additions & 3 deletions indexer/packages/kafka/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@jinxprotocol-indexer/kafka",
"name": "@dydxprotocol-indexer/kafka",
"version": "0.0.1",
"description": "",
"main": "build/src/index.js",
"devDependencies": {
"@jinxprotocol-indexer/dev": "workspace:^0.0.1",
"@dydxprotocol-indexer/dev": "workspace:^0.0.1",
"@types/jest": "^28.1.4",
"@types/lodash": "^4.14.182",
"@types/node": "^18.0.3",
Expand All @@ -31,7 +31,7 @@
},
"homepage": "https://github.com/jinxprotocol/indexer#readme",
"dependencies": {
"@jinxprotocol-indexer/base": "workspace:^0.0.1",
"@dydxprotocol-indexer/base": "workspace:^0.0.1",
"dotenv-flow": "^3.2.0",
"kafkajs": "^2.1.0",
"lodash": "^4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/kafka/src/batch-kafka-producer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { logger } from '@jinxprotocol-indexer/base';
import { logger } from '@dydxprotocol-indexer/base';
import { Producer, RecordMetadata } from 'kafkajs';
import _ from 'lodash';

Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/kafka/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
parseSchema,
NodeEnv,
parseBoolean,
} from '@jinxprotocol-indexer/base';
} from '@dydxprotocol-indexer/base';

export const kafkaConfigSchema = {
// Required to set groupId and clientId for kafka.
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/kafka/src/consumer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
logger,
} from '@jinxprotocol-indexer/base';
} from '@dydxprotocol-indexer/base';
import { Consumer, ConsumerRunConfig, KafkaMessage } from 'kafkajs';
import { v4 as uuidv4 } from 'uuid';

Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/kafka/src/producer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { logger } from '@jinxprotocol-indexer/base';
import { logger } from '@dydxprotocol-indexer/base';
import { Partitioners, Producer } from 'kafkajs';

import { kafka } from './kafka';
Expand Down
2 changes: 1 addition & 1 deletion indexer/packages/postgres/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('./node_modules/@jinxprotocol-indexer/dev/.eslintrc');
const baseConfig = require('./node_modules/@dydxprotocol-indexer/dev/.eslintrc');

module.exports = {
...baseConfig,
Expand Down
Loading

0 comments on commit cc24d94

Please sign in to comment.