From abc293f22d33a7b162248295fd360d6316e6da4c Mon Sep 17 00:00:00 2001 From: Mateus Santana <42101423+1Mateus@users.noreply.github.com> Date: Mon, 10 Apr 2023 21:25:46 -0300 Subject: [PATCH] feat(bot): wip --- .husky/pre-commit | 4 --- .../tests-ts/src/constants/merkle-tree.ts | 2 +- packages/denylist-bot/.env.example | 6 +++++ packages/denylist-bot/jest.config copy.js | 25 ------------------- packages/denylist-bot/jest.config.js | 5 +--- packages/denylist-bot/src/{utils => }/near.ts | 2 +- .../services/consumer.spec.ts} | 8 +++--- .../denylist-bot/src/services/consumer.ts | 2 +- packages/denylist-bot/src/services/request.ts | 6 ++--- packages/denylist-bot/test/tsconfig.json | 7 ------ 10 files changed, 17 insertions(+), 50 deletions(-) delete mode 100755 .husky/pre-commit delete mode 100644 packages/denylist-bot/jest.config copy.js rename packages/denylist-bot/src/{utils => }/near.ts (96%) rename packages/denylist-bot/{test/queue.test.ts => src/services/consumer.spec.ts} (89%) delete mode 100644 packages/denylist-bot/test/tsconfig.json diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index 5a182ef10..000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -yarn lint-staged diff --git a/packages/contracts/tests-ts/src/constants/merkle-tree.ts b/packages/contracts/tests-ts/src/constants/merkle-tree.ts index 875900e66..87d894b8c 100644 --- a/packages/contracts/tests-ts/src/constants/merkle-tree.ts +++ b/packages/contracts/tests-ts/src/constants/merkle-tree.ts @@ -18,7 +18,7 @@ export const FT_DECIMALS = "000000"; export const NEAR_DECIMALS = "000000000000000000000000"; -export const HAPI_ONE_TESTNET = "proxy.hapi-npo.testnet"; +export const HAPI_ONE_TESTNET = "dev-1681141193055-11311550135061"; export const Q = "21888242871839275222246405745257275088548364400416034343698204186575808495617"; diff --git a/packages/denylist-bot/.env.example b/packages/denylist-bot/.env.example index e69de29bb..2ccafe4fa 100644 --- a/packages/denylist-bot/.env.example +++ b/packages/denylist-bot/.env.example @@ -0,0 +1,6 @@ +GRAPHQL_URL="https://api.thegraph.com/subgraphs/name/hack-a-chain/hyc_mainnet" +RPC_URL="https://rpc.testnet.near.org/" +PRIVATE_KEY="" +ACCOUNT_ID="" +HYC_CONTRACT="" +NEAR_NETWORK="testnet" diff --git a/packages/denylist-bot/jest.config copy.js b/packages/denylist-bot/jest.config copy.js deleted file mode 100644 index 3a9152e21..000000000 --- a/packages/denylist-bot/jest.config copy.js +++ /dev/null @@ -1,25 +0,0 @@ -export default { - preset: "ts-jest/presets/default-esm", - globals: { - "ts-jest": { - tsconfig: "test/tsconfig.json", - useESM: true, - }, - }, - moduleNameMapper: { - "^@/(.*)$": "/src/$1", - "^(\\.{1,2}/.*)\\.js$": "$1", - }, - testEnvironment: "miniflare", - forceExit: true, - verbose: true, - detectOpenHandles: true, - clearMocks: true, - testEnvironmentOptions: { - // Miniflare doesn't yet support the `main` field in `wrangler.toml` so we - // need to explicitly tell it where our built worker is. We also need to - // explicitly mark it as an ES module. - scriptPath: "dist/index.mjs", - modules: true, - }, -}; diff --git a/packages/denylist-bot/jest.config.js b/packages/denylist-bot/jest.config.js index 3a9152e21..d2640b2c0 100644 --- a/packages/denylist-bot/jest.config.js +++ b/packages/denylist-bot/jest.config.js @@ -6,12 +6,9 @@ export default { useESM: true, }, }, - moduleNameMapper: { - "^@/(.*)$": "/src/$1", - "^(\\.{1,2}/.*)\\.js$": "$1", - }, testEnvironment: "miniflare", forceExit: true, + transform: {}, verbose: true, detectOpenHandles: true, clearMocks: true, diff --git a/packages/denylist-bot/src/utils/near.ts b/packages/denylist-bot/src/near.ts similarity index 96% rename from packages/denylist-bot/src/utils/near.ts rename to packages/denylist-bot/src/near.ts index a71bd15f3..a8b84ea11 100644 --- a/packages/denylist-bot/src/utils/near.ts +++ b/packages/denylist-bot/src/near.ts @@ -1,6 +1,6 @@ import Process from "process"; import { Buffer } from "buffer"; -import type { Env } from "../types/env"; +import type { Env } from "./types/env"; import { connect, keyStores, KeyPair, providers } from "near-api-js"; /* tslint:disable */ diff --git a/packages/denylist-bot/test/queue.test.ts b/packages/denylist-bot/src/services/consumer.spec.ts similarity index 89% rename from packages/denylist-bot/test/queue.test.ts rename to packages/denylist-bot/src/services/consumer.spec.ts index 3cd0ce1a8..26c492539 100644 --- a/packages/denylist-bot/test/queue.test.ts +++ b/packages/denylist-bot/src/services/consumer.spec.ts @@ -1,7 +1,7 @@ -import testnetSetup from "./test_setup.json"; -import { consumer } from "../src/services/consumer"; +import { consumer } from "./consumer"; +import testnetSetup from "../../test_setup.json"; +import { setupNear, viewFunction } from "../near"; import { describe, expect, jest, it, beforeAll } from '@jest/globals'; -import { setupNear, viewFunction } from "../src//utils/near"; const payload = { counter: '34', @@ -74,6 +74,6 @@ describe("Test all service actions", () => { }, ); - expect(inDenylist).toEqual(true); + expect(inDenylist).toEqual(false); }); }); diff --git a/packages/denylist-bot/src/services/consumer.ts b/packages/denylist-bot/src/services/consumer.ts index 54ab81d5a..7a1ad93a0 100644 --- a/packages/denylist-bot/src/services/consumer.ts +++ b/packages/denylist-bot/src/services/consumer.ts @@ -1,6 +1,6 @@ import type { Env } from "../types/env"; import { AttachedGas } from "../constants"; -import { setupNear, viewFunction } from "../utils/near"; +import { setupNear, viewFunction } from "../near"; import type { QueuedData } from "../types/pagination"; const riskMap: any = { diff --git a/packages/denylist-bot/src/services/request.ts b/packages/denylist-bot/src/services/request.ts index 04f67eea1..bff7c549e 100644 --- a/packages/denylist-bot/src/services/request.ts +++ b/packages/denylist-bot/src/services/request.ts @@ -1,7 +1,7 @@ -import { Env } from "@/types/env"; -import { getHapioneEntriesQuery } from "@/query"; -import { FeederState, FetchResponseInterface } from "@/types/pagination"; +import type { Env } from "../types/env"; +import { getHapioneEntriesQuery } from "../query"; +import type { FeederState, FetchResponseInterface } from "../types/pagination"; export const sendRequest = async (counter: FeederState, env: Env): Promise => { const response = await fetch(env.GRAPHQL_URL, { diff --git a/packages/denylist-bot/test/tsconfig.json b/packages/denylist-bot/test/tsconfig.json deleted file mode 100644 index f6923df30..000000000 --- a/packages/denylist-bot/test/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "types": ["@cloudflare/workers-types", "jest", "../bindings"] - }, - "include": ["../src/**/*", "**/*"] -}