wip (#448)

* wip * remove unneeded logic * prettier * remove isMobile * fix build * node 18 * test npx * fix build * kill adding it via docker * add typesRoots * try node-cron * try .d.ts file * work * move types to typeings
helium · Oct 16, 2023 · 8ef17af · 8ef17af
1 parent bc5db11
commit 8ef17af
Show file tree

Hide file tree

Showing 45 changed files with 99 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
   "utils/proposal",
 ]
 exclude = [
-  "deps/metaplex-program-library/bubblegum/program", 
+  "deps/metaplex-program-library/bubblegum/program",
   "deps/metaplex-program-library/token-metadata/program",
   "utils/ecc-sig-verifier",
   "utils/migration-tx-executor",
@@ -19,7 +19,7 @@ exclude = [
 [workspace.dependencies]
 anchor-lang = { version = "0.28.0", features = ["init-if-needed"] }
 anchor-spl = { version = "0.28.0", features = ["mint", "token"] }
-mpl-token-metadata = { version = "3.0.1" }
+mpl-token-metadata = { version = "3.1.0" }
 account-compression-cpi = { rev = "a2d12e4a157d91feb73aa40a97fe297fd477dd87", git = "https://github.com/helium/account-compression-anchor-gen.git", features = ["cpi"]}
 bubblegum-cpi = { rev = "a2d12e4a157d91feb73aa40a97fe297fd477dd87", git = "https://github.com/helium/account-compression-anchor-gen.git", features = ["cpi"]}
 solana-security-txt = "1.1.1"

diff --git a/package.json b/package.json
@@ -30,9 +30,9 @@
     "@coral-xyz/anchor": "^0.28.0",
     "@coral-xyz/anchor-cli": "^0.28.0",
     "@coral-xyz/borsh": "^0.2.6",
+    "@helium/crypto": "^4.10.2",
     "@helium/modular-governance-idls": "^0.0.2",
     "@helium/proposal-sdk": "^0.0.2",
-    "@helium/crypto": "^4.10.2",
     "@helium/transactions": "^3.38.0",
     "@metaplex-foundation/mpl-bubblegum": "^0.7.0",
     "@pythnetwork/client": "^2.8.0",
@@ -56,6 +56,6 @@
     "prettier": "^2.6.2",
     "shx": "^0.3.4",
     "ts-mocha": "^10.0.0",
-    "typescript": "^4.3.5"
+    "typescript": "^5.2.2"
   }
 }
diff --git a/packages/account-fetch-cache-hooks/package.json b/packages/account-fetch-cache-hooks/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "peerDependencies": {

diff --git a/packages/account-fetch-cache/package.json b/packages/account-fetch-cache/package.json
@@ -36,7 +36,7 @@
   "devDependencies": {
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/account-postgres-sink-service/Dockerfile b/packages/account-postgres-sink-service/Dockerfile
@@ -1,5 +1,5 @@
 # Specify the base image
-FROM node:16-alpine AS BUILD_IMAGE
+FROM node:18-alpine AS BUILD_IMAGE
 
 WORKDIR /usr/src/app
 
@@ -8,14 +8,15 @@ COPY package.json ./
 RUN yarn install
 
 COPY src src
+COPY typeings typeings
 COPY tsconfig.build.json tsconfig.json
 
 RUN yarn global add typescript
 RUN yarn run build
 
 RUN npm prune --production
 
-FROM node:16-alpine
+FROM node:18-alpine
 
 WORKDIR /usr/src/app
 

diff --git a/packages/account-postgres-sink-service/package.json b/packages/account-postgres-sink-service/package.json
@@ -68,7 +68,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/account-postgres-sink-service/tsconfig.build.json b/packages/account-postgres-sink-service/tsconfig.build.json
@@ -16,12 +16,12 @@
     "moduleResolution": "Node",
     "skipLibCheck": true,
     "baseUrl": ".",
-    "typeRoots": ["node_modules/@types"],
+    "typeRoots": ["node_modules/@types", "typeings"],
     "strict": true,
     "paths": {
       "@/*": ["*"]
     },
-    "outDir": "lib"
+    "outDir": "lib",
   },
-  "include": ["src"]
+  "include": ["src"],
 }
diff --git a/packages/account-postgres-sink-service/typeings/cron.d.ts b/packages/account-postgres-sink-service/typeings/cron.d.ts
@@ -0,0 +1,4 @@
+declare module "cron" {
+  let _cron: any;
+  export = _cron;
+}
diff --git a/packages/active-device-oracle/package.json b/packages/active-device-oracle/package.json
@@ -41,7 +41,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/anchor-resolvers/package.json b/packages/anchor-resolvers/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/circuit-breaker-sdk/package.json b/packages/circuit-breaker-sdk/package.json
@@ -41,7 +41,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/crons/package.json b/packages/crons/package.json
@@ -56,7 +56,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   }
 }
diff --git a/packages/data-credits-sdk/package.json b/packages/data-credits-sdk/package.json
@@ -45,7 +45,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/distributor-oracle/package.json b/packages/distributor-oracle/package.json
@@ -68,7 +68,7 @@
     "nodemon": "^2.0.20",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/fanout-metadata-service/package.json b/packages/fanout-metadata-service/package.json
@@ -53,7 +53,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/fanout-sdk/package.json b/packages/fanout-sdk/package.json
@@ -41,7 +41,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/faucet-service/package.json b/packages/faucet-service/package.json
@@ -53,7 +53,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/helium-admin-cli/package.json b/packages/helium-admin-cli/package.json
@@ -68,7 +68,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "author": "",

diff --git a/packages/helium-entity-manager-sdk/package.json b/packages/helium-entity-manager-sdk/package.json
@@ -47,7 +47,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/helium-react-hooks/package.json b/packages/helium-react-hooks/package.json
@@ -45,7 +45,7 @@
     "@solana/wallet-adapter-react": "^0.15.32",
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "peerDependencies": {

diff --git a/packages/helium-sub-daos-sdk/package.json b/packages/helium-sub-daos-sdk/package.json
@@ -43,7 +43,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/idls/package.json b/packages/idls/package.json
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "ts-loader": "^9.2.3",
-    "typescript": "^4.8.4"
+    "typescript": "^5.2.2"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"
 }
diff --git a/packages/iot-premine-data-only-service/package.json b/packages/iot-premine-data-only-service/package.json
@@ -52,7 +52,7 @@
     "@types/yargs": "^17.0.24",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   }
 }
diff --git a/packages/lazy-distributor-sdk/package.json b/packages/lazy-distributor-sdk/package.json
@@ -41,7 +41,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/lazy-transactions-sdk/package.json b/packages/lazy-transactions-sdk/package.json
@@ -43,7 +43,7 @@
     "git-format-staged": "^2.1.3",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"

diff --git a/packages/metadata-service/package.json b/packages/metadata-service/package.json
@@ -37,6 +37,7 @@
     "@helium/address": "^4.10.2",
     "@helium/helium-entity-manager-sdk": "^0.4.1",
     "@helium/helium-sub-daos-sdk": "^0.4.1",
+    "@helium/spl-utils": "^0.4.1",
     "@metaplex-foundation/mpl-token-metadata": "^2.10.0",
     "@solana/spl-token": "^0.3.8",
     "@solana/web3.js": "^1.78.4",
@@ -56,7 +57,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^4.8.4",
+    "typescript": "^5.2.2",
     "yarn": "^1.22.18"
   },
   "keywords": [],

diff --git a/packages/metadata-service/src/constants.ts b/packages/metadata-service/src/constants.ts
@@ -0,0 +1,2 @@
+export const SHDW_DRIVE_URL =
+  "https://shdw-drive.genesysgo.net/6tcnBSybPG7piEDShBcrVtYJDPSvGrDbVvXmXKpzBvWP";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const SHDW_DRIVE_URL =
		"https://shdw-drive.genesysgo.net/6tcnBSybPG7piEDShBcrVtYJDPSvGrDbVvXmXKpzBvWP";