From bcf8303aca46c30805ea1a85874c98cae9e763ed Mon Sep 17 00:00:00 2001 From: "zapaz.eth" Date: Thu, 25 Jan 2024 13:05:58 +0100 Subject: [PATCH] extract config from common as a workspace --- common/build-config.ts | 8 - common/build-others.ts | 11 -- common/config/.gitignore | 3 - common/lib/apis/api-covalent.ts | 2 +- common/lib/common/config.ts | 2 +- common/lib/common/ens-get.ts | 2 +- common/lib/common/networks.ts | 4 +- common/lib/nft/storage/storage.ts | 2 +- common/package.json | 9 +- common/tsconfig.json | 1 - common/turbo.json | 17 -- common/utils/getNonce.ts | 19 --- common/utils/runHandlebarsConfig.ts | 18 --- common/utils/runHandlebarsEnv.ts | 31 ---- config/.gitignore | 1 + config/package.json | 19 +++ config/scripts/build.ts | 9 ++ config/scripts/handlebars.ts | 33 ++++ .../src}/config.handlebars.json | 0 .../src}/mainnets.handlebars.json | 72 +++------ .../src}/testnets.handlebars.json | 74 +++------ config/tsconfig.json | 11 ++ config/turbo.json | 9 ++ contracts/.gas-snapshot | 8 - contracts/.gitignore | 5 +- contracts/turbo.json | 5 +- pnpm-lock.yaml | 151 ++++++++++-------- pnpm-workspace.yaml | 11 +- svelte/components/Global/Navigation.svelte | 2 +- svelte/helpers/widget.ts | 2 +- svelte/package.json | 1 + svelte/tsconfig.json | 1 - svelte/turbo.json | 2 +- turbo.json | 2 +- wordpress/package.json | 6 +- wordpress/scripts/build.ts | 9 ++ wordpress/tsconfig.json | 2 +- wordpress/turbo.json | 11 ++ 38 files changed, 258 insertions(+), 317 deletions(-) delete mode 100644 common/build-config.ts delete mode 100644 common/build-others.ts delete mode 100644 common/config/.gitignore delete mode 100644 common/turbo.json delete mode 100644 common/utils/getNonce.ts delete mode 100644 common/utils/runHandlebarsConfig.ts delete mode 100644 common/utils/runHandlebarsEnv.ts create mode 100644 config/.gitignore create mode 100644 config/package.json create mode 100644 config/scripts/build.ts create mode 100644 config/scripts/handlebars.ts rename {common/config => config/src}/config.handlebars.json (100%) rename {common/config => config/src}/mainnets.handlebars.json (87%) rename {common/config => config/src}/testnets.handlebars.json (83%) create mode 100644 config/tsconfig.json create mode 100644 config/turbo.json delete mode 100644 contracts/.gas-snapshot create mode 100644 wordpress/scripts/build.ts create mode 100644 wordpress/turbo.json diff --git a/common/build-config.ts b/common/build-config.ts deleted file mode 100644 index 03ae57ebf..000000000 --- a/common/build-config.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { runHandlebarsEnv } from "@utils/runHandlebarsEnv"; - -const main = async (): Promise => { - await runHandlebarsEnv("common/config/config.handlebars.json", "common/config/config.json"); - await runHandlebarsEnv("common/config/config.handlebars.json", "contracts/config.json"); -}; - -main().catch(console.error); diff --git a/common/build-others.ts b/common/build-others.ts deleted file mode 100644 index 9ec10d0ab..000000000 --- a/common/build-others.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { runHandlebarsEnv } from "@utils/runHandlebarsEnv"; -import { runHandlebarsConfig } from "@utils/runHandlebarsConfig"; - -const main = async (): Promise => { - await runHandlebarsEnv("common/config/mainnets.handlebars.json", "common/config/mainnets.json"); - await runHandlebarsEnv("common/config/testnets.handlebars.json", "common/config/testnets.json"); - await runHandlebarsConfig("wordpress/readme.handlebars.txt", "wordpress/plugins/kredeum-nfts/readme.txt"); - await runHandlebarsConfig("wordpress/kredeum-nfts.handlebars.php", "wordpress/plugins/kredeum-nfts/kredeum-nfts.php"); -}; - -main().catch(console.error); diff --git a/common/config/.gitignore b/common/config/.gitignore deleted file mode 100644 index a5312471f..000000000 --- a/common/config/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -config.json -mainnets.json -testnets.json \ No newline at end of file diff --git a/common/lib/apis/api-covalent.ts b/common/lib/apis/api-covalent.ts index 54aa96be9..32fda6559 100644 --- a/common/lib/apis/api-covalent.ts +++ b/common/lib/apis/api-covalent.ts @@ -6,7 +6,7 @@ import { getChecksumAddress } from "@lib/common/config"; import { DEFAULT_NAME, DEFAULT_SYMBOL } from "@lib/common/config"; import { fetchJson, FETCH_LIMIT } from "@lib/common/fetch"; import { keyCollection, keyNft } from "@lib/common/keys"; -import config from "@config/config.json"; +import config from "@kredeum/config/dist/config.json"; import { networks } from "@lib/common/networks"; const _covalentUrlPath = (chainId: number, path: string): string => { diff --git a/common/lib/common/config.ts b/common/lib/common/config.ts index 61a9b0167..74a43c6cd 100644 --- a/common/lib/common/config.ts +++ b/common/lib/common/config.ts @@ -4,7 +4,7 @@ import { Fragment, Interface } from "@ethersproject/abi"; import type { CollectionType, NftType, RefPageType, AddressesType } from "@lib/common/types"; -import config from "@config/config.json"; +import config from "@kredeum/config/dist/config.json"; import addressesRaw from "@kredeum/contracts/addresses.json"; import { formatEther } from "ethers/lib/utils"; diff --git a/common/lib/common/ens-get.ts b/common/lib/common/ens-get.ts index af31ecb31..abae5d20a 100644 --- a/common/lib/common/ens-get.ts +++ b/common/lib/common/ens-get.ts @@ -1,7 +1,7 @@ import { providers } from "ethers"; import { JsonRpcProvider } from "@ethersproject/providers"; -import config from "@config/config.json"; +import config from "@kredeum/config/dist/config.json"; const ens = (() => { const ensProvider: JsonRpcProvider = new providers.JsonRpcProvider(config.ens.rpcUrl); diff --git a/common/lib/common/networks.ts b/common/lib/common/networks.ts index 0c3c40006..9b2c3dc95 100644 --- a/common/lib/common/networks.ts +++ b/common/lib/common/networks.ts @@ -1,6 +1,6 @@ import type { NetworkType, NftType } from "@lib/common/types"; -import mainnetsJson from "@config/mainnets.json"; -import testnetsJson from "@config/testnets.json"; +import mainnetsJson from "@kredeum/config/dist/mainnets.json"; +import testnetsJson from "@kredeum/config/dist/testnets.json"; const networks = (() => { const _networksMap = new Map( diff --git a/common/lib/nft/storage/storage.ts b/common/lib/nft/storage/storage.ts index 2397ae70c..4f14e600d 100644 --- a/common/lib/nft/storage/storage.ts +++ b/common/lib/nft/storage/storage.ts @@ -5,7 +5,7 @@ import { NftType, StorageConfigType, StorageParamsType, StorageType } from "@lib/common/types"; import { ipfsGateway, ipfsGatewayUrl, ipfsLinkToUrlHttp, ipfsGetLink } from "./ipfs"; import { swarmGateway, swarmGatewayUrl, swarmLinkToUrlHttp, swarmGetLink } from "./swarm"; -import config from "@config/config.json"; +import config from "@kredeum/config/dist/config.json"; // IN MEMORY Storage Config let _storageConfig: StorageConfigType; diff --git a/common/package.json b/common/package.json index f8561423b..3e714f6f2 100644 --- a/common/package.json +++ b/common/package.json @@ -7,10 +7,9 @@ "lib": "lib" }, "scripts": { - "clean": "rm -rf node_modules types abis config/networks.json", - "format": "prettier lib/**/*.ts --write --list-different --loglevel log", - "check": "eslint lib/**/*.ts", - "build": "pnpx ts-node build-config && pnpx ts-node build-others" + "clean": "rm -rf node_modules types abis", + "format": "prettier lib/**/*.ts --write --list-different", + "check": "eslint lib/**/*.ts" }, "keywords": [], "author": "", @@ -36,7 +35,6 @@ "ethers": "^5.7.2", "findup-sync": "^5.0.0", "fs-extra": "^11.2.0", - "handlebars": "^4.7.8", "multiformats": "^12.1.3", "pdfjs-dist": "^3.11.174", "prettier": "^3.2.4", @@ -45,6 +43,7 @@ "typescript": "^5.3.3" }, "dependencies": { + "@kredeum/config": "workspace:^", "@kredeum/contracts": "workspace:^" } } \ No newline at end of file diff --git a/common/tsconfig.json b/common/tsconfig.json index 1bf41bdfa..6a840ab5d 100644 --- a/common/tsconfig.json +++ b/common/tsconfig.json @@ -9,7 +9,6 @@ "paths": { "@lib/*": ["common/lib/*"], "@utils/*": ["common/utils/*"], - "@config/*": ["common/config/*"], "@soltypes/*": ["contracts/types/*"], "@artifacts/*": ["contracts/out/*"] } diff --git a/common/turbo.json b/common/turbo.json deleted file mode 100644 index 0883d4257..000000000 --- a/common/turbo.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": ["//"], - "pipeline": { - "build": { - "inputs": [ - "config/config.handlebars.json", - "config/mainnets.handlebars.json", - "config/testnets.handlebars.json" - ], - "outputs": [ - "config/config.json", - "config/mainnets.json", - "config/testnets.json" - ] - } - } -} \ No newline at end of file diff --git a/common/utils/getNonce.ts b/common/utils/getNonce.ts deleted file mode 100644 index a7130c65d..000000000 --- a/common/utils/getNonce.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { SignerWithAddress } from "hardhat-deploy-ethers/signers"; - -let nonce = 0; -let noncePrevious = 0; - -const getNonce = async (deployer: SignerWithAddress, name = "", label = "", noPrevious = false): Promise => { - if (deployer) { - nonce = await deployer.getTransactionCount(); - if (!noPrevious) { - // console.log("Nonces", name, label, noncePrevious, nonce); - if (nonce != noncePrevious + 1) console.warn("Strange nonces...", noncePrevious, nonce); - } - - noncePrevious = nonce; - } - return nonce; -}; - -export { getNonce }; diff --git a/common/utils/runHandlebarsConfig.ts b/common/utils/runHandlebarsConfig.ts deleted file mode 100644 index 5256aca23..000000000 --- a/common/utils/runHandlebarsConfig.ts +++ /dev/null @@ -1,18 +0,0 @@ -import Handlebars from "handlebars"; -import { readFile, writeFile } from "fs-extra"; -import config from "@config/config.json"; - -const ROOT = `${__dirname}/../..`; - -const runHandlebarsConfig = async (pathIN: string, pathOUT: string): Promise => { - const template = Handlebars.compile(String(await readFile(`${ROOT}/${pathIN}`))); - - const result = template(config); - // console.log("build", `${ROOT}/${pathOUT}`, "from", pathIN); - - await writeFile(`${ROOT}/${pathOUT}`, result); - - console.log("runHandlebarsConfig", pathIN, "=>",pathOUT); -}; - -export { runHandlebarsConfig }; diff --git a/common/utils/runHandlebarsEnv.ts b/common/utils/runHandlebarsEnv.ts deleted file mode 100644 index 386277557..000000000 --- a/common/utils/runHandlebarsEnv.ts +++ /dev/null @@ -1,31 +0,0 @@ - -import Handlebars from "handlebars"; -import { readFile, writeFile } from "fs-extra"; - -import dotenv from "dotenv"; -import findupSync from "findup-sync"; - -if (!process.env.ENVIR) { - dotenv.config({ path: findupSync(".env") || "" }); - if (!process.env.ENVIR) { - throw new Error("ENV variable ENVIR not set!"); - } -} - -const ROOT = `${__dirname}/../..`; - -const runHandlebarsEnv = async (pathIN: string, pathOUT: string): Promise => { - const template = Handlebars.compile(String(await readFile(`${ROOT}/${pathIN}`))); - - const env = process.env; - // console.log(env); - - const result = template(env); - // console.log("build", `${ROOT}/${pathOUT}`, "from", pathIN); - - await writeFile(`${ROOT}/${pathOUT}`, result); - - console.log("runHandlebarsEnv ", pathIN, "=>", pathOUT); -}; - -export { runHandlebarsEnv }; diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 000000000..1521c8b76 --- /dev/null +++ b/config/.gitignore @@ -0,0 +1 @@ +dist diff --git a/config/package.json b/config/package.json new file mode 100644 index 000000000..144b7d080 --- /dev/null +++ b/config/package.json @@ -0,0 +1,19 @@ +{ + "name": "@kredeum/config", + "version": "1.4.0", + "description": "", + "main": "index.ts", + "scripts": { + "clean": "rm -rf node_modules dist", + "build": "pnpx ts-node scripts/build.ts" + }, + "keywords": [], + "author": "", + "license": "ISC", + "devDependencies": { + "@types/fs-extra": "^11.0.4", + "@types/node": "^20.11.6", + "fs-extra": "^11.2.0", + "handlebars": "^4.7.8" + } +} diff --git a/config/scripts/build.ts b/config/scripts/build.ts new file mode 100644 index 000000000..0554ca276 --- /dev/null +++ b/config/scripts/build.ts @@ -0,0 +1,9 @@ +import { runHandlebarsEnv, runHandlebarsConfig } from "./handlebars"; + +const main = async (): Promise => { + await runHandlebarsEnv("src/config.handlebars.json", "dist/config.json"); + await runHandlebarsEnv("src/mainnets.handlebars.json", "dist/mainnets.json"); + await runHandlebarsEnv("src/testnets.handlebars.json", "dist/testnets.json"); +}; + +main().catch(console.error); diff --git a/config/scripts/handlebars.ts b/config/scripts/handlebars.ts new file mode 100644 index 000000000..25a39fa1a --- /dev/null +++ b/config/scripts/handlebars.ts @@ -0,0 +1,33 @@ +import { outputFile, readFile } from "fs-extra"; +import Handlebars from "handlebars"; + +const runHandlebars = (buffer: string, vars: any): string => { + const template = Handlebars.compile(buffer); + + const result = template(vars); + // console.log("runHandlebars ~ result:", result); + + return result; +}; + +const runHandlebarsEnv = async (pathIN: string, pathOUT: string): Promise => { + const buffer = String(await readFile(pathIN)); + + const result = runHandlebars(buffer, process.env); + + await outputFile(pathOUT, result); + + console.log("runHandlebarsEnv ", pathIN, "=>", pathOUT); +}; + +const runHandlebarsConfig = async (pathIN: string, pathOUT: string, config: any): Promise => { + const buffer = String(await readFile(pathIN)); + + const result = runHandlebars(buffer, config); + + await outputFile(pathOUT, result); + + console.log("runHandlebarsConfig", pathIN, "=>", pathOUT); +}; + +export { runHandlebars, runHandlebarsConfig, runHandlebarsEnv }; diff --git a/common/config/config.handlebars.json b/config/src/config.handlebars.json similarity index 100% rename from common/config/config.handlebars.json rename to config/src/config.handlebars.json diff --git a/common/config/mainnets.handlebars.json b/config/src/mainnets.handlebars.json similarity index 87% rename from common/config/mainnets.handlebars.json rename to config/src/mainnets.handlebars.json index 4b49049e8..932585a90 100644 --- a/common/config/mainnets.handlebars.json +++ b/config/src/mainnets.handlebars.json @@ -12,9 +12,7 @@ "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://etherscan.io" - ], + "blockExplorerUrls": ["https://etherscan.io"], "openSea": "https://opensea.io/assets", "blur": "https://blur.io/asset", "subgraph": { @@ -65,9 +63,7 @@ "symbol": "AETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://nova-explorer.arbitrum.io" - ], + "blockExplorerUrls": ["https://nova-explorer.arbitrum.io"], "linkedLayer1": 1, "active": false }, @@ -85,9 +81,7 @@ "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://optimistic.etherscan.io" - ], + "blockExplorerUrls": ["https://optimistic.etherscan.io"], "etherscanApiKey": "{{ETHERSCAN_API_KEY_OPTIMISM}}", "alchemy": { "url": "https://opt-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY_OPTIMISM}}", @@ -134,27 +128,20 @@ "symbol": "MNT", "decimals": 18 }, - "blockExplorerUrls": [ - "https://explorer.mantle.xyz/" - ], + "blockExplorerUrls": ["https://explorer.mantle.xyz/"], "linkedLayer1": 1, "create": true }, { "chainId": 1101, "chainName": "polygon-zkevm", - "rpcUrls": [ - "https://zkevm-rpc.com", - "https://rpc.ankr.com/polygon_zkevm" - ], + "rpcUrls": ["https://zkevm-rpc.com", "https://rpc.ankr.com/polygon_zkevm"], "nativeCurrency": { "name": "Ether", "symbol": "zkETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://zkevm.polygonscan.com/" - ], + "blockExplorerUrls": ["https://zkevm.polygonscan.com/"], "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON_ZKEVM}}", "create": true, "linkedLayer1": 1 @@ -182,17 +169,13 @@ { "chainId": 534352, "chainName": "scroll", - "rpcUrls": [ - "https://rpc.scroll.io" - ], + "rpcUrls": ["https://rpc.scroll.io"], "nativeCurrency": { "name": "Scroll Ether", "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://blockscout.scroll.io" - ], + "blockExplorerUrls": ["https://blockscout.scroll.io"], "linkedLayer1": 1, "active": false, "create": false @@ -200,17 +183,13 @@ { "chainId": 7777777, "chainName": "zora", - "rpcUrls": [ - "https://rpc.zora.energy" - ], + "rpcUrls": ["https://rpc.zora.energy"], "nativeCurrency": { "name": "Zora Ether", "symbol": "zETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://explorer.zora.energy" - ], + "blockExplorerUrls": ["https://explorer.zora.energy"], "linkedLayer1": 1, "active": false, "create": true @@ -218,17 +197,13 @@ { "chainId": 424, "chainName": "pgn", - "rpcUrls": [ - "https://rpc.publicgoods.network" - ], + "rpcUrls": ["https://rpc.publicgoods.network"], "nativeCurrency": { "name": "PGN Ether", "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://explorer.publicgoods.network" - ], + "blockExplorerUrls": ["https://explorer.publicgoods.network"], "linkedLayer1": 1, "active": false, "create": false @@ -308,10 +283,7 @@ { "chainId": 42220, "chainName": "celo", - "rpcUrls": [ - "https://forno.celo.org", - "wss://forno.celo.org/ws" - ], + "rpcUrls": ["https://forno.celo.org", "wss://forno.celo.org/ws"], "nativeCurrency": { "name": "CELO", "symbol": "CELO", @@ -337,9 +309,7 @@ "symbol": "FTM", "decimals": 18 }, - "blockExplorerUrls": [ - "https://ftmscan.com" - ], + "blockExplorerUrls": ["https://ftmscan.com"], "etherscanApiKey": "{{ETHERSCAN_API_KEY_FANTOM}}", "create": true }, @@ -358,28 +328,22 @@ "symbol": "BNB", "decimals": 18 }, - "blockExplorerUrls": [ - "https://bscscan.com" - ], + "blockExplorerUrls": ["https://bscscan.com"], "etherscanApiKey": "{{ETHERSCAN_API_KEY_BINANCE}}", "create": true }, { "chainId": 40, "chainName": "telos", - "rpcUrls": [ - "https://mainnet.telos.net/evm" - ], + "rpcUrls": ["https://mainnet.telos.net/evm"], "nativeCurrency": { "name": "TELOS", "symbol": "TLOS", "decimals": 18 }, - "blockExplorerUrls": [ - "https://teloscan.io" - ], + "blockExplorerUrls": ["https://teloscan.io"], "eip1559": false, "create": true, "active": false } -] \ No newline at end of file +] diff --git a/common/config/testnets.handlebars.json b/config/src/testnets.handlebars.json similarity index 83% rename from common/config/testnets.handlebars.json rename to config/src/testnets.handlebars.json index 26c6ebd95..3481cf548 100644 --- a/common/config/testnets.handlebars.json +++ b/config/src/testnets.handlebars.json @@ -2,17 +2,13 @@ { "chainId": 5, "chainName": "goerli", - "rpcUrls": [ - "https://goerli.infura.io/v3/{{INFURA_API_KEY}}" - ], + "rpcUrls": ["https://goerli.infura.io/v3/{{INFURA_API_KEY}}"], "nativeCurrency": { "name": "Ether", "symbol": "GOETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://goerli.etherscan.io" - ], + "blockExplorerUrls": ["https://goerli.etherscan.io"], "openSea": "https://testnets.opensea.io/assets", "subgraph": { "url": "https://api.thegraph.com/subgraphs/name/zapaz/eip721-goerli", @@ -29,9 +25,7 @@ { "chainId": 84531, "chainName": "base-goerli", - "rpcUrls": [ - "https://goerli.base.org" - ], + "rpcUrls": ["https://goerli.base.org"], "nativeCurrency": { "name": "Goerli Ether", "symbol": "ETH", @@ -69,9 +63,7 @@ { "chainId": 1442, "chainName": "polygon-zkevm-testnet", - "rpcUrls": [ - "https://rpc.public.zkevm-test.net" - ], + "rpcUrls": ["https://rpc.public.zkevm-test.net"], "nativeCurrency": { "name": "Ether", "symbol": "zktETH", @@ -99,9 +91,7 @@ "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://sepolia.etherscan.io" - ], + "blockExplorerUrls": ["https://sepolia.etherscan.io"], "etherscan": { "apiUrl": "https://api-sepolia.etherscan.io/" }, @@ -112,17 +102,13 @@ { "chainId": 534351, "chainName": "scroll-sepolia", - "rpcUrls": [ - "https://sepolia-rpc.scroll.io/" - ], + "rpcUrls": ["https://sepolia-rpc.scroll.io/"], "nativeCurrency": { "name": "Scroll Ether", "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://sepolia-blockscout.scroll.io" - ], + "blockExplorerUrls": ["https://sepolia-blockscout.scroll.io"], "linkedMainnet": 534352, "linkedLayer1": 11155111, "eip1559": false, @@ -131,17 +117,13 @@ { "chainId": 999, "chainName": "zora-goerli", - "rpcUrls": [ - "https://testnet.rpc.zora.energy" - ], + "rpcUrls": ["https://testnet.rpc.zora.energy"], "nativeCurrency": { "name": "Zora Ether", "symbol": "zETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://testnet.explorer.zora.energy" - ], + "blockExplorerUrls": ["https://testnet.explorer.zora.energy"], "linkedMainnet": 7777777, "linkedLayer1": 5, "create": true @@ -149,17 +131,13 @@ { "chainId": 58008, "chainName": "pgn-sepolia", - "rpcUrls": [ - "https://sepolia.publicgoods.network" - ], + "rpcUrls": ["https://sepolia.publicgoods.network"], "nativeCurrency": { "name": "PGN Ether", "symbol": "pgnETH", "decimals": 18 }, - "blockExplorerUrls": [ - "https://explorer.sepolia.publicgoods.network" - ], + "blockExplorerUrls": ["https://explorer.sepolia.publicgoods.network"], "linkedMainnet": 424, "linkedLayer1": 11155111, "create": true @@ -244,9 +222,7 @@ "symbol": "CELO", "decimals": 18 }, - "blockExplorerUrls": [ - "https://https://alfajores.celoscan.io/" - ], + "blockExplorerUrls": ["https://https://alfajores.celoscan.io/"], "linkedMainnet": 42220, "create": true }, @@ -262,9 +238,7 @@ "symbol": "FTM", "decimals": 18 }, - "blockExplorerUrls": [ - "https://testnet.ftmscan.com" - ], + "blockExplorerUrls": ["https://testnet.ftmscan.com"], "etherscanApiKey": "{{ETHERSCAN_API_KEY_FANTOM}}", "create": true, "linkedMainnet": 250 @@ -283,9 +257,7 @@ "symbol": "BNB", "decimals": 18 }, - "blockExplorerUrls": [ - "https://testnet.bscscan.com/" - ], + "blockExplorerUrls": ["https://testnet.bscscan.com/"], "etherscanApiKey": "{{ETHERSCAN_API_KEY_BINANCE}}", "create": true, "linkedMainnet": 56, @@ -294,17 +266,13 @@ { "chainId": 41, "chainName": "telos-testnet", - "rpcUrls": [ - "https://testnet.telos.net/evm" - ], + "rpcUrls": ["https://testnet.telos.net/evm"], "nativeCurrency": { "name": "TELOS", "symbol": "TLOS", "decimals": 18 }, - "blockExplorerUrls": [ - "https://testnet.teloscan.io" - ], + "blockExplorerUrls": ["https://testnet.teloscan.io"], "eip1559": false, "create": true, "linkedMainnet": 40 @@ -312,18 +280,14 @@ { "chainId": 31337, "chainName": "local", - "rpcUrls": [ - "http://127.0.0.1:8545" - ], + "rpcUrls": ["http://127.0.0.1:8545"], "nativeCurrency": { "name": "Ether", "symbol": "ETH", "decimals": 18 }, - "blockExplorerUrls": [ - "http://localhost/explorer" - ], + "blockExplorerUrls": ["http://localhost/explorer"], "linkedMainnet": 31337, "create": true } -] \ No newline at end of file +] diff --git a/config/tsconfig.json b/config/tsconfig.json new file mode 100644 index 000000000..83fc8dc28 --- /dev/null +++ b/config/tsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "target": "es2020", + "module": "commonjs", + "strict": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "baseUrl": "./", + }, + "include": ["**/*.ts"], +} diff --git a/config/turbo.json b/config/turbo.json new file mode 100644 index 000000000..cc3aa3ddc --- /dev/null +++ b/config/turbo.json @@ -0,0 +1,9 @@ +{ + "extends": ["//"], + "pipeline": { + "build": { + "inputs": ["src/*"], + "outputs": ["dist/*"] + } + } +} diff --git a/contracts/.gas-snapshot b/contracts/.gas-snapshot deleted file mode 100644 index 1ffdf6ffe..000000000 --- a/contracts/.gas-snapshot +++ /dev/null @@ -1,8 +0,0 @@ -OpenNFTsV4Test:testBuy() (gas: 160303) -OpenNFTsV4Test:testBuyNotEnoughFunds() (gas: 80422) -OpenNFTsV4Test:testBuyNotToSell() (gas: 34856) -OpenNFTsV4Test:testBuyTwice() (gas: 155431) -OpenNFTsV4Test:testInterfaceIds() (gas: 15445) -OpenNFTsV4Test:testRoyaltyInfoOverFlow() (gas: 52344) -OpenNFTsV4Test:testSetTokenPriceNoToken() (gas: 13291) -OpenNFTsV4Test:testSetTokenRoyaltyNoToken() (gas: 15682) diff --git a/contracts/.gitignore b/contracts/.gitignore index 472305d32..5aaa5cf62 100644 --- a/contracts/.gitignore +++ b/contracts/.gitignore @@ -17,7 +17,4 @@ broadcast .certora* .zip* -*.zip - -# build config -config.json +*.zip \ No newline at end of file diff --git a/contracts/turbo.json b/contracts/turbo.json index f0f343607..a7ce66931 100644 --- a/contracts/turbo.json +++ b/contracts/turbo.json @@ -5,6 +5,9 @@ "inputs": ["src/**/*.sol"], "outputs": ["out/**", "types/**"] }, - "deploy": { "dependsOn": ["build"], "outputs": ["addresses.json"] } + "deploy": { + "dependsOn": ["build"], + "outputs": ["addresses.json"] + } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48a2a92ac..ec0b33eeb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: common: dependencies: + '@kredeum/config': + specifier: workspace:^ + version: link:../config '@kredeum/contracts': specifier: workspace:^ version: link:../contracts @@ -53,7 +56,7 @@ importers: version: 11.0.4 '@types/node': specifier: ^20.11.5 - version: 20.11.5 + version: 20.11.6 '@typescript-eslint/eslint-plugin': specifier: ^6.19.1 version: 6.19.1(@typescript-eslint/parser@6.19.1)(eslint@8.56.0)(typescript@5.3.3) @@ -62,7 +65,7 @@ importers: version: 6.19.1(eslint@8.56.0)(typescript@5.3.3) dotenv: specifier: ^16.3.2 - version: 16.3.2 + version: 16.4.1 eslint: specifier: ^8.56.0 version: 8.56.0 @@ -78,9 +81,6 @@ importers: fs-extra: specifier: ^11.2.0 version: 11.2.0 - handlebars: - specifier: ^4.7.8 - version: 4.7.8 multiformats: specifier: ^12.1.3 version: 12.1.3 @@ -92,7 +92,7 @@ importers: version: 3.2.4 ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.11.5)(typescript@5.3.3) + version: 10.9.2(@types/node@20.11.6)(typescript@5.3.3) tsconfig-paths: specifier: ^4.2.0 version: 4.2.0 @@ -100,6 +100,21 @@ importers: specifier: ^5.3.3 version: 5.3.3 + config: + devDependencies: + '@types/fs-extra': + specifier: ^11.0.4 + version: 11.0.4 + '@types/node': + specifier: ^20.11.6 + version: 20.11.6 + fs-extra: + specifier: ^11.2.0 + version: 11.2.0 + handlebars: + specifier: ^4.7.8 + version: 4.7.8 + contracts: devDependencies: '@ethersproject/abi': @@ -125,7 +140,7 @@ importers: version: 0.8.5(hardhat@2.19.4) ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.11.5)(typescript@5.3.3) + version: 10.9.2(@types/node@20.11.6)(typescript@5.3.3) tsconfig-paths: specifier: ^4.2.0 version: 4.2.0 @@ -152,7 +167,7 @@ importers: version: 6.1.1 dotenv: specifier: ^16.3.2 - version: 16.3.2 + version: 16.4.1 gulp: specifier: ^4.0.2 version: 4.0.2 @@ -195,6 +210,9 @@ importers: svelte: dependencies: + '@kredeum/config': + specifier: workspace:^ + version: link:../config '@kredeum/contracts': specifier: workspace:^ version: link:../contracts @@ -246,7 +264,7 @@ importers: version: 6.19.1(eslint@8.56.0)(typescript@5.3.3) dotenv: specifier: ^16.3.2 - version: 16.3.2 + version: 16.4.1 eslint: specifier: ^8.56.0 version: 8.56.0 @@ -330,10 +348,14 @@ importers: version: 5.3.3 wordpress: + dependencies: + '@kredeum/config': + specifier: workspace:^ + version: link:../config devDependencies: ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.11.5)(typescript@5.3.3) + version: 10.9.2(@types/node@20.11.6)(typescript@5.3.3) tsconfig-paths: specifier: ^4.2.0 version: 4.2.0 @@ -457,7 +479,7 @@ packages: engines: {node: '>=14'} dependencies: '@ethereumjs/rlp': 4.0.1 - ethereum-cryptography: 2.1.2 + ethereum-cryptography: 2.1.3 micro-ftch: 0.3.1 dev: true @@ -474,7 +496,7 @@ packages: js-sha3: 0.8.0 ky: 0.33.3 ky-universal: 0.11.0(ky@0.33.3)(web-streams-polyfill@4.0.0-beta.3) - semver: 7.5.4 + semver: 7.3.8 tar-js: 0.3.0 utf-8-validate: 5.0.10 web-streams-polyfill: 4.0.0-beta.3 @@ -912,7 +934,7 @@ packages: nopt: 5.0.0 npmlog: 5.0.1 rimraf: 3.0.2 - semver: 7.5.4 + semver: 7.3.8 tar: 6.2.0 transitivePeerDependencies: - encoding @@ -936,18 +958,18 @@ packages: tweetnacl-util: 0.15.1 dev: true - /@noble/curves@1.1.0: - resolution: {integrity: sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==} + /@noble/curves@1.3.0: + resolution: {integrity: sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==} dependencies: - '@noble/hashes': 1.3.1 + '@noble/hashes': 1.3.3 dev: true /@noble/hashes@1.2.0: resolution: {integrity: sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==} dev: true - /@noble/hashes@1.3.1: - resolution: {integrity: sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==} + /@noble/hashes@1.3.3: + resolution: {integrity: sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==} engines: {node: '>= 16'} dev: true @@ -1381,11 +1403,11 @@ packages: '@scure/base': 1.1.5 dev: true - /@scure/bip32@1.3.1: - resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==} + /@scure/bip32@1.3.3: + resolution: {integrity: sha512-LJaN3HwRbfQK0X1xFSi0Q9amqOgzQnnDngIt+ZlsBC3Bm7/nE7K0kwshZHyaru79yIVRv/e1mQAjZyuZG6jOFQ==} dependencies: - '@noble/curves': 1.1.0 - '@noble/hashes': 1.3.1 + '@noble/curves': 1.3.0 + '@noble/hashes': 1.3.3 '@scure/base': 1.1.5 dev: true @@ -1396,10 +1418,10 @@ packages: '@scure/base': 1.1.5 dev: true - /@scure/bip39@1.2.1: - resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==} + /@scure/bip39@1.2.2: + resolution: {integrity: sha512-HYf9TUXG80beW+hGAt3TRM8wU6pQoYur9iNypTROm42dorCGmLnFe3eWjz3gOq6G62H2WRh0FCzAR1PI+29zIA==} dependencies: - '@noble/hashes': 1.3.1 + '@noble/hashes': 1.3.3 '@scure/base': 1.1.5 dev: true @@ -1532,13 +1554,13 @@ packages: /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/bn.js@5.1.5: resolution: {integrity: sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/braces@3.0.4: @@ -1563,14 +1585,14 @@ packages: resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/json-schema@7.0.15: @@ -1580,14 +1602,14 @@ packages: /@types/jsonfile@6.1.4: resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} requiresBuild: true dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true optional: true @@ -1605,8 +1627,8 @@ packages: resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} dev: true - /@types/node@20.11.5: - resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==} + /@types/node@20.11.6: + resolution: {integrity: sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==} dependencies: undici-types: 5.26.5 dev: true @@ -1614,7 +1636,7 @@ packages: /@types/pbkdf2@3.1.2: resolution: {integrity: sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/prettier@2.7.3: @@ -1634,28 +1656,28 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 safe-buffer: 5.1.2 dev: true /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} requiresBuild: true dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true optional: true /@types/secp256k1@4.0.6: resolution: {integrity: sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 dev: true /@types/semver@7.5.6: @@ -2290,7 +2312,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.22.2 - caniuse-lite: 1.0.30001579 + caniuse-lite: 1.0.30001580 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2585,8 +2607,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001579 - electron-to-chromium: 1.4.640 + caniuse-lite: 1.0.30001580 + electron-to-chromium: 1.4.645 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.2) dev: true @@ -2754,13 +2776,13 @@ packages: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} dependencies: browserslist: 4.22.2 - caniuse-lite: 1.0.30001579 + caniuse-lite: 1.0.30001580 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 dev: true - /caniuse-lite@1.0.30001579: - resolution: {integrity: sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==} + /caniuse-lite@1.0.30001580: + resolution: {integrity: sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==} dev: true /canvas@2.11.2: @@ -3921,8 +3943,8 @@ packages: domhandler: 5.0.3 dev: true - /dotenv@16.3.2: - resolution: {integrity: sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==} + /dotenv@16.4.1: + resolution: {integrity: sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==} engines: {node: '>=12'} dev: true @@ -3996,8 +4018,8 @@ packages: object.defaults: 1.1.0 dev: true - /electron-to-chromium@1.4.640: - resolution: {integrity: sha512-z/6oZ/Muqk4BaE7P69bXhUhpJbUM9ZJeka43ZwxsDshKtePns4mhBlh8bU5+yrnOnz3fhG82XLzGUXazOmsWnA==} + /electron-to-chromium@1.4.645: + resolution: {integrity: sha512-EeS1oQDCmnYsRDRy2zTeC336a/4LZ6WKqvSaM1jLocEk5ZuyszkQtCpsqvuvaIXGOUjwtvF6LTcS8WueibXvSw==} dev: true /elliptic@6.5.4: @@ -4393,13 +4415,13 @@ packages: '@scure/bip39': 1.1.1 dev: true - /ethereum-cryptography@2.1.2: - resolution: {integrity: sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug==} + /ethereum-cryptography@2.1.3: + resolution: {integrity: sha512-BlwbIL7/P45W8FGW2r7LGuvoEZ+7PWsniMvQ4p5s2xCyw9tmaDlpfsN9HjAucbF+t/qpVHwZUisgfK24TCW8aA==} dependencies: - '@noble/curves': 1.1.0 - '@noble/hashes': 1.3.1 - '@scure/bip32': 1.3.1 - '@scure/bip39': 1.2.1 + '@noble/curves': 1.3.0 + '@noble/hashes': 1.3.3 + '@scure/bip32': 1.3.3 + '@scure/bip39': 1.2.2 dev: true /ethereumjs-abi@0.6.8: @@ -5777,7 +5799,7 @@ packages: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.2(@types/node@20.11.5)(typescript@5.3.3) + ts-node: 10.9.2(@types/node@20.11.6)(typescript@5.3.3) tsort: 0.0.1 typescript: 5.3.3 undici: 5.28.2 @@ -6667,7 +6689,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.11.6 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -9623,7 +9645,7 @@ packages: rollup: ^1.20.0 || ^2.0.0 || ^3.0.0 dependencies: '@rollup/plugin-replace': 5.0.5(rollup@2.79.1) - dotenv: 16.3.2 + dotenv: 16.4.1 rollup: 2.79.1 dev: true @@ -10191,7 +10213,7 @@ packages: pify: 4.0.1 recursive-readdir: 2.2.3 sc-istanbul: 0.4.6 - semver: 7.5.4 + semver: 7.3.8 shelljs: 0.8.5 web3-utils: 1.10.3 transitivePeerDependencies: @@ -10307,14 +10329,14 @@ packages: spdx-license-ids: 3.0.16 dev: true - /spdx-exceptions@2.3.0: - resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==} + /spdx-exceptions@2.4.0: + resolution: {integrity: sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==} dev: true /spdx-expression-parse@3.0.1: resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} dependencies: - spdx-exceptions: 2.3.0 + spdx-exceptions: 2.4.0 spdx-license-ids: 3.0.16 dev: true @@ -11025,7 +11047,7 @@ packages: typescript: 5.3.3 dev: true - /ts-node@10.9.2(@types/node@20.11.5)(typescript@5.3.3): + /ts-node@10.9.2(@types/node@20.11.6)(typescript@5.3.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -11044,7 +11066,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.5 + '@types/node': 20.11.6 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 @@ -11285,6 +11307,7 @@ packages: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} hasBin: true + requiresBuild: true dev: true /unbox-primitive@1.0.2: @@ -11585,7 +11608,7 @@ packages: '@ethereumjs/util': 8.1.0 bn.js: 5.2.1 ethereum-bloom-filters: 1.0.10 - ethereum-cryptography: 2.1.2 + ethereum-cryptography: 2.1.3 ethjs-unit: 0.1.6 number-to-bn: 1.7.0 randombytes: 2.1.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index be6e0185d..06f2d99ec 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,6 +1,7 @@ packages: - - 'common' - - 'contracts' - - 'gulp' - - 'svelte' - - 'wordpress' + - config + - common + - contracts + - gulp + - svelte + - wordpress diff --git a/svelte/components/Global/Navigation.svelte b/svelte/components/Global/Navigation.svelte index d21f923e4..6a3dee8dd 100644 --- a/svelte/components/Global/Navigation.svelte +++ b/svelte/components/Global/Navigation.svelte @@ -1,5 +1,5 @@