chore(core): remove connectkit workaround (#1216)

* chore(core): remove connectkit workaround * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): bump deps * chore(ops): remove npx * chore(ops): remove npx * chore(ops): fix ts * chore(ops): remove npx * chore(ops): remove npx --------- Co-authored-by: JJ Adonis <[email protected]>
BirthdayResearch · Aug 28, 2023 · 423ab71 · 423ab71
1 parent a18213b
commit 423ab71
Show file tree

Hide file tree

Showing 11 changed files with 1,667 additions and 1,834 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,7 +70,6 @@ yarn.lock
 node_modules
 
 package-lock.json
-!/package-lock.json
 
 # coverage
 coverage

diff --git a/.idea/bridge.iml b/.idea/bridge.iml
diff --git a/apps/server/package.json b/apps/server/package.json
@@ -6,7 +6,7 @@
     "build": "tsc -b ./tsconfig.build.json",
     "clean": "rm -rf dist",
     "dev": "pnpm run migration:dev && nest start --watch",
-    "docker:pull": "docker pull ghcr.io/birthdayresearch/whale-api:3.31.1 && docker pull ghcr.io/birthdayresearch/playground-api:3.31.1 && docker pull defi/defichain:master-92f1c507b && docker pull postgres:15.2-alpine",
+    "docker:pull": "docker pull ghcr.io/birthdayresearch/whale-api:4.0.0-beta.10 && docker pull ghcr.io/birthdayresearch/playground-api:4.0.0-beta.10 && docker pull defi/defichain:master-92f1c507b && docker pull postgres:15.4-alpine",
     "generate:migrations": "./with-db migrate dev && pnpm prisma format",
     "generate:prisma": "prisma generate",
     "lint": "eslint .",
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@prisma/client": "^5.2.0",
-    "@waveshq/standard-api-fastify": "^1.8.0",
-    "@waveshq/walletkit-core": "^0.52.0",
-    "@waveshq/walletkit-ui": "^0.52.0",
+    "@waveshq/standard-api-fastify": "^2.2.0",
+    "@waveshq/walletkit-core": "^1.2.0",
+    "@waveshq/walletkit-ui": "^1.2.0",
     "bignumber.js": "^9.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
@@ -62,11 +62,11 @@
   },
   "devDependencies": {
     "@jest/test-sequencer": "^29.6.2",
-    "@stickyjs/eslint-config": "^1.3.1",
-    "@stickyjs/prettier": "^1.3.1",
-    "@stickyjs/testcontainers": "^1.3.1",
-    "@stickyjs/turbo-jest": "^1.3.1",
-    "@stickyjs/typescript": "^1.3.1",
+    "@stickyjs/eslint-config": "^1.3.2",
+    "@stickyjs/prettier": "^1.3.2",
+    "@stickyjs/testcontainers": "^1.3.2",
+    "@stickyjs/turbo-jest": "^1.3.2",
+    "@stickyjs/typescript": "^1.3.2",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.15.3",

diff --git a/apps/server/src/defichain/providers/WhaleApiClientProvider.ts b/apps/server/src/defichain/providers/WhaleApiClientProvider.ts
@@ -4,7 +4,7 @@ import { ConfigService } from '@nestjs/config';
 import { EnvironmentNetwork, getJellyfishNetwork, newOceanOptions, newWhaleAPIClient } from '@waveshq/walletkit-core';
 
 // TODO: To update Jellyfish to export this type
-export type SupportedNetwork = 'mainnet' | 'testnet' | 'regtest' | 'devnet';
+export type SupportedNetwork = 'mainnet' | 'testnet' | 'regtest' | 'devnet' | 'changi';
 
 @Injectable()
 export class WhaleApiClientProvider {

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -20,28 +20,28 @@
     "@headlessui/react": "^1.7.17",
     "@reduxjs/toolkit": "^1.9.5",
     "@tailwindcss/line-clamp": "^0.4.4",
-    "@waveshq/standard-web": "^1.8.0",
+    "@waveshq/standard-web": "^2.2.0",
     "axios": "^1.4.0",
     "bignumber.js": "^9.1.1",
-    "clsx": "^1.2.1",
-    "connectkit": "^1.5.1",
+    "clsx": "^2.0.0",
+    "connectkit": "^1.5.2",
     "dayjs": "^1.11.9",
     "react-circular-progressbar": "^2.1.0",
     "react-content-loader": "^6.2.1",
     "react-qr-code": "^2.0.12",
     "react-secure-storage": "^1.2.8",
     "sass": "^1.66.1",
-    "viem": "^1.6.6",
+    "viem": "1.6.6",
     "wagmi": "^1.3.10"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.11.0",
     "@netlify/plugin-lighthouse": "^5.0.0",
-    "@netlify/plugin-nextjs": "^4.40.0",
+    "@netlify/plugin-nextjs": "^4.40.1",
     "@tailwindcss/typography": "^0.5.9",
     "@testing-library/cypress": "^9.0.0",
     "@types/node": "^18.15.3",
-    "@waveshq/standard-web-linter": "^1.8.0",
+    "@waveshq/standard-web-linter": "^2.2.0",
     "autoprefixer": "^10.4.15",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-jsx-remove-data-test-id": "^3.0.0",

diff --git a/apps/web/src/layouts/Base.tsx b/apps/web/src/layouts/Base.tsx
@@ -12,7 +12,6 @@ import {
 import { configureChains, createConfig, WagmiConfig } from "wagmi";
 import { sepolia, mainnet } from "wagmi/chains";
 import { MetaMaskConnector } from "wagmi/connectors/metaMask";
-import { InjectedConnector } from "wagmi/connectors/injected";
 import { jsonRpcProvider } from "wagmi/providers/jsonRpc";
 import { publicProvider } from "wagmi/providers/public";
 import { ConnectKitProvider, getDefaultConfig } from "connectkit";
@@ -34,14 +33,6 @@ import { ETHEREUM_MAINNET_ID } from "../constants";
 import { MAINNET_CONFIG, TESTNET_CONFIG } from "../config";
 import { QueueStorageProvider } from "./contexts/QueueStorageContext";
 
-/**
- * TODO (lyka): remove unnecessary `InjectedConnector` once issue is resolved
- * bug ticket: https://github.com/family/connectkit/issues/294
- */
-const injected = new InjectedConnector({
-  chains: [mainnet, sepolia],
-});
-
 const metamask = new MetaMaskConnector({
   chains: [mainnet, sepolia],
 });
@@ -67,7 +58,7 @@ const config = createConfig(
     autoConnect: true,
     chains,
     appName,
-    connectors: [metamask, injected],
+    connectors: [metamask],
     walletConnectProjectId:
       process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID ?? "",
   }),

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   defi-blockchain:
-    image: defi/defichain:master-c14a2ba13
+    image: defi/defichain:4.0.0-beta10-ocean
     command: >
       defid
       -printtoconsole
@@ -57,7 +57,7 @@ services:
       -nextnetworkupgradeheight=18
 
   defi-playground:
-    image: ghcr.io/birthdayresearch/playground-api:3.35.0
+    image: ghcr.io/birthdayresearch/playground-api:4.0.0-beta.10
     depends_on:
       - defi-blockchain
     ports:
@@ -70,7 +70,7 @@ services:
       - "traefik.http.routers.playground.entrypoints=web"
 
   defi-whale:
-    image: ghcr.io/birthdayresearch/whale-api:3.35.0
+    image: ghcr.io/birthdayresearch/whale-api:4.0.0-beta.10
     depends_on:
       - defi-blockchain
     ports:
@@ -87,7 +87,7 @@ services:
       - "traefik.http.routers.whale.entrypoints=web"
 
   postgres:
-    image: postgres:15.2-alpine
+    image: postgres:15.4-alpine
     restart: always
     env_file:
       - ./apps/server/.env

diff --git a/package.json b/package.json
@@ -17,12 +17,12 @@
     "migration:deploy": "turbo run migration:deploy"
   },
   "dependencies": {
-    "@waveshq/standard-defichain-jellyfishsdk": "^1.8.0"
+    "@waveshq/standard-defichain-jellyfishsdk": "^2.2.0"
   },
   "devDependencies": {
-    "@stickyjs/turbo": "^1.3.1",
+    "@stickyjs/turbo": "^1.3.2",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.0"
+    "lint-staged": "^14.0.1"
   },
   "engines": {
     "node": ">=18.0.0",

diff --git a/packages/smartcontracts-queue/package.json b/packages/smartcontracts-queue/package.json
@@ -67,13 +67,14 @@
     "@nomicfoundation/hardhat-toolbox": "^2.0.2",
     "@openzeppelin/contracts": "4.8.3",
     "@openzeppelin/contracts-upgradeable": "4.8.3",
-    "@stickyjs/eslint-config": "^1.3.1",
-    "@stickyjs/testcontainers": "^1.3.1",
-    "@stickyjs/turbo-jest": "^1.3.1",
-    "@stickyjs/typescript": "^1.3.1",
+    "@stickyjs/eslint-config": "^1.3.2",
+    "@stickyjs/testcontainers": "^1.3.2",
+    "@stickyjs/turbo-jest": "^1.3.2",
+    "@stickyjs/typescript": "^1.3.2",
     "cross-fetch": "^3.1.8",
     "dotenv": "^16.3.1",
     "ethers": "~5.7.2",
-    "hardhat": "2.14.0"
+    "hardhat": "2.14.0",
+    "typescript": "4.9.5"
   }
 }
diff --git a/packages/smartcontracts/package.json b/packages/smartcontracts/package.json
@@ -69,10 +69,10 @@
     "@nomicfoundation/hardhat-toolbox": "^2.0.1",
     "@openzeppelin/contracts": "4.8.2",
     "@openzeppelin/contracts-upgradeable": "4.8.2",
-    "@stickyjs/eslint-config": "^1.3.1",
-    "@stickyjs/testcontainers": "^1.3.1",
-    "@stickyjs/turbo-jest": "^1.3.1",
-    "@stickyjs/typescript": "^1.3.1",
+    "@stickyjs/eslint-config": "^1.3.2",
+    "@stickyjs/testcontainers": "^1.3.2",
+    "@stickyjs/turbo-jest": "^1.3.2",
+    "@stickyjs/typescript": "^1.3.2",
     "@typechain/ethers-v5": "10.2.1",
     "@types/chai": "4.3.5",
     "@types/mocha": "10.0.1",
@@ -83,6 +83,7 @@
     "ethers": "~5.7.2",
     "hardhat": "2.14.0",
     "mocha": "10.2.0",
-    "ts-node": "10.9.1"
+    "ts-node": "10.9.1",
+    "typescript": "4.9.5"
   }
 }