Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip #448

Merged
merged 14 commits into from
Oct 16, 2023
Merged

wip #448

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/account-fetch-cache-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/account-fetch-cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions packages/account-postgres-sink-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/account-postgres-sink-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
6 changes: 3 additions & 3 deletions packages/account-postgres-sink-service/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
}
4 changes: 4 additions & 0 deletions packages/account-postgres-sink-service/typeings/cron.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare module "cron" {
let _cron: any;
export = _cron;
}
2 changes: 1 addition & 1 deletion packages/active-device-oracle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion packages/anchor-resolvers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/circuit-breaker-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion packages/crons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/data-credits-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion packages/distributor-oracle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/fanout-metadata-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion packages/fanout-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/faucet-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion packages/helium-admin-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/helium-entity-manager-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/helium-react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/helium-sub-daos-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/idls/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"ts-loader": "^9.2.3",
"typescript": "^4.8.4"
"typescript": "^5.2.2"
},
"gitHead": "5a8bf0b7b88e5934ef8d774e686f7c95804fbb8d"
}
2 changes: 1 addition & 1 deletion packages/iot-premine-data-only-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/lazy-distributor-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/lazy-transactions-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion packages/metadata-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": [],
Expand Down
2 changes: 2 additions & 0 deletions packages/metadata-service/src/constants.ts
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";
Loading
Loading