From 04c492097568fb31fd359f291d0a4446a88f23a4 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Sat, 23 Jul 2022 16:01:54 +0530 Subject: [PATCH 01/25] chore(#6392): rename to ts file --- package.json | 2 +- .../{generate-heading-ids.js => generate-heading-ids.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/scripts/{generate-heading-ids.js => generate-heading-ids.ts} (100%) diff --git a/package.json b/package.json index b94493f8871..cd86a8e8dfa 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin", "crowdin-import": "ts-node src/scripts/crowdin-import.ts", "format": "prettier --write \"**/*.{js,jsx,json,md}\"", - "generate-heading-ids": "node src/scripts/generate-heading-ids.js", + "generate-heading-ids": "ts-node src/scripts/generate-heading-ids.ts", "start": "gatsby develop", "start:lambda": "netlify-lambda serve src/lambda", "start:static": "gatsby build && gatsby serve", diff --git a/src/scripts/generate-heading-ids.js b/src/scripts/generate-heading-ids.ts similarity index 100% rename from src/scripts/generate-heading-ids.js rename to src/scripts/generate-heading-ids.ts From 1341083f6af96ad80f0ace369a1ef9144742d2a2 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 22:38:10 +0530 Subject: [PATCH 02/25] chore(tsconfig): set typeroots --- tsconfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index e10a4bc5313..e3360a0e586 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,9 @@ "strict": true, "noImplicitAny": false, "skipLibCheck": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "typeRoots": ["./node_modules/@types"], + "types": ["node"] }, "include": [ "./src/**/*", From 737930af0907132891e5009a31a5c95105374403 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 22:39:32 +0530 Subject: [PATCH 03/25] chore(#6392): set basic types --- src/scripts/generate-heading-ids.ts | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index 56a990f900d..2b9a1399ebb 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -13,16 +13,24 @@ const GitHubSlugger = require("github-slugger") // TODO we should auto-run this script when new markdown files are added to the project -const toc = {} +//FIXME: Find a better name for this variable +const toc: Record< + number, + { + text: string + slug: string + } +> = {} let curLevel = [0, 0, 0] let curMaxLevel = 1 -const walk = (dir, doc) => { - let results = [] - const list = fs.readdirSync(dir) - list.forEach(function (file) { - file = dir + "/" + file +//TODO: Figure out what `doc` is and rename it to something better +const walk = (directoryPath: string, doc: string | null) => { + let results: Array = [] + const directoryContents: Array = fs.readdirSync(directoryPath) + directoryContents.forEach(function (file) { + file = directoryPath + "/" + file const stat = fs.statSync(file) if (stat && stat.isDirectory()) { // Recurse into a subdirectory @@ -41,7 +49,7 @@ const walk = (dir, doc) => { return results } -const stripLinks = (line) => { +const stripLinks = (line): number => { return line.replace(/\[([^\]]+)\]\([^)]+\)/, (match, p1) => p1) } @@ -72,7 +80,7 @@ const addHeaderID = (line, slugger, write = false) => { curLevel[l] = 0 } curMaxLevel = 1 - const headerNumber = curLevel.join(".") + const headerNumber: string = curLevel.join(".") let slug = null if (!write) { // const match = /^.+(\s*\{#([A-Za-z0-9\-_]+?)\}\s*)$/.exec(line); @@ -126,7 +134,7 @@ const addHeaderIDs = (lines, write = false) => { return results } -const traverseHeaders = (path, doc = "", write = false) => { +const traverseHeaders = (path: string, doc = "", write = false) => { const files = walk(path, doc) files.forEach((file) => { if (!file.endsWith(".md")) { From 9c8f4dab3f24476bcc1abf068eb53b992e2330e4 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 22:56:27 +0530 Subject: [PATCH 04/25] chore: addHeaderId & stripLink types --- src/scripts/generate-heading-ids.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index 2b9a1399ebb..d047e0b63ab 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -13,9 +13,13 @@ const GitHubSlugger = require("github-slugger") // TODO we should auto-run this script when new markdown files are added to the project +interface IGitHubSlugger { + slug: (headingText: string) => string +} + //FIXME: Find a better name for this variable const toc: Record< - number, + string, { text: string slug: string @@ -49,11 +53,11 @@ const walk = (directoryPath: string, doc: string | null) => { return results } -const stripLinks = (line): number => { - return line.replace(/\[([^\]]+)\]\([^)]+\)/, (match, p1) => p1) +const stripLinks = (line: string): string => { + return line.replace(/\[([^\]]+)\]\([^)]+\)/, (match, p1: string) => p1) } -const addHeaderID = (line, slugger, write = false) => { +const addHeaderID = (line: string, slugger: IGitHubSlugger, write = false) => { // check if we're a header at all if (!line.startsWith("#")) { return line @@ -80,7 +84,7 @@ const addHeaderID = (line, slugger, write = false) => { curLevel[l] = 0 } curMaxLevel = 1 - const headerNumber: string = curLevel.join(".") + const headerNumber = curLevel.join(".") let slug = null if (!write) { // const match = /^.+(\s*\{#([A-Za-z0-9\-_]+?)\}\s*)$/.exec(line); @@ -114,7 +118,7 @@ const addHeaderID = (line, slugger, write = false) => { const addHeaderIDs = (lines, write = false) => { // Sluggers should be per file - const slugger = new GitHubSlugger() + const slugger: IGitHubSlugger = new GitHubSlugger() let inCode = false const results = [] lines.forEach((line) => { @@ -155,7 +159,7 @@ const traverseHeaders = (path: string, doc = "", write = false) => { } } -const addHeaderIDsForDir = (path) => { +const addHeaderIDsForDir = (path: string) => { if (path.includes("translations")) { throw new Error(`Heading ID generation is intended for English files only.`) } From b25ffdcac1456c47789fd0a93f2adca5dedf100c Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 23:05:47 +0530 Subject: [PATCH 05/25] chore: types for addHeaderIDs --- src/scripts/generate-heading-ids.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index d047e0b63ab..f3cd2b5a5b4 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -116,11 +116,11 @@ const addHeaderID = (line: string, slugger: IGitHubSlugger, write = false) => { } } -const addHeaderIDs = (lines, write = false) => { +const addHeaderIDs = (lines: Array, write = false): Array => { // Sluggers should be per file const slugger: IGitHubSlugger = new GitHubSlugger() let inCode = false - const results = [] + const results: Array = [] lines.forEach((line) => { // Ignore code blocks if (line.startsWith("```")) { @@ -133,7 +133,10 @@ const addHeaderIDs = (lines, write = false) => { return } - results.push(addHeaderID(line, slugger, write)) + const headerTextWithSlug = addHeaderID(line, slugger, write) + if (headerTextWithSlug) { + results.push(headerTextWithSlug) + } }) return results } @@ -147,8 +150,8 @@ const traverseHeaders = (path: string, doc = "", write = false) => { console.log(`>>> processing ${file}`) curLevel = [0, 0, 0] - const content = fs.readFileSync(file, "utf8") - const lines = content.split("\n") + const content: string = fs.readFileSync(file, "utf8") + const lines: Array = content.split("\n") const updatedLines = addHeaderIDs(lines, write) if (write) { fs.writeFileSync(file, updatedLines.join("\n")) From 2d78153d4153b91da99707beb13e802e2e41245f Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 23:19:33 +0530 Subject: [PATCH 06/25] refactor(traverseHeaders): new function signature Define a config object to pass in optional parameters to traverse headers --- src/scripts/generate-heading-ids.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index f3cd2b5a5b4..98528e8ceeb 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -141,7 +141,15 @@ const addHeaderIDs = (lines: Array, write = false): Array => { return results } -const traverseHeaders = (path: string, doc = "", write = false) => { +type TraverseHeadersFunction = ( + path: string, + config: { doc?: string; write?: boolean } +) => void + +const traverseHeaders: TraverseHeadersFunction = ( + path, + { doc = "", write = false } +) => { const files = walk(path, doc) files.forEach((file) => { if (!file.endsWith(".md")) { @@ -167,8 +175,8 @@ const addHeaderIDsForDir = (path: string) => { throw new Error(`Heading ID generation is intended for English files only.`) } const fullPath = `src/content/${path}` - traverseHeaders(fullPath, null, false) - traverseHeaders(fullPath, null, true) + traverseHeaders(fullPath, { write: false }) + traverseHeaders(fullPath, { write: true }) } const [path] = process.argv.slice(2) From 5a52113d2d1b9c14ef6fc61109f14127446f90ab Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 23:20:13 +0530 Subject: [PATCH 07/25] fix(generateHeadings): throw error on no path Throw error if no valid path is provided --- src/scripts/generate-heading-ids.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index 98528e8ceeb..d428b46d599 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -181,4 +181,8 @@ const addHeaderIDsForDir = (path: string) => { const [path] = process.argv.slice(2) +if (!path) { + throw new Error("No Valid Path Provided") +} + addHeaderIDsForDir(path) From 92dd6b700143f6bfd120d16929cb649fa4d8fe0b Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 23:24:32 +0530 Subject: [PATCH 08/25] chore(addHeaderId): add return type --- src/scripts/generate-heading-ids.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index d428b46d599..93e8c929ed7 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -57,7 +57,11 @@ const stripLinks = (line: string): string => { return line.replace(/\[([^\]]+)\]\([^)]+\)/, (match, p1: string) => p1) } -const addHeaderID = (line: string, slugger: IGitHubSlugger, write = false) => { +const addHeaderID = ( + line: string, + slugger: IGitHubSlugger, + write = false +): string | undefined => { // check if we're a header at all if (!line.startsWith("#")) { return line @@ -85,7 +89,7 @@ const addHeaderID = (line: string, slugger: IGitHubSlugger, write = false) => { } curMaxLevel = 1 const headerNumber = curLevel.join(".") - let slug = null + let slug = "" if (!write) { // const match = /^.+(\s*\{#([A-Za-z0-9\-_]+?)\}\s*)$/.exec(line); // slug = match ? match[2].toLowerCase() : slugger.slug(stripLinks(headingText)); From 6ada1de5c42390a4f79f7490865ae22e1cbd5463 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Mon, 25 Jul 2022 23:30:26 +0530 Subject: [PATCH 09/25] refactor: rename toc to headersToChange --- src/scripts/generate-heading-ids.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index 93e8c929ed7..a179c4bc60e 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -17,8 +17,7 @@ interface IGitHubSlugger { slug: (headingText: string) => string } -//FIXME: Find a better name for this variable -const toc: Record< +const headersToChange: Record< string, { text: string @@ -94,7 +93,7 @@ const addHeaderID = ( // const match = /^.+(\s*\{#([A-Za-z0-9\-_]+?)\}\s*)$/.exec(line); // slug = match ? match[2].toLowerCase() : slugger.slug(stripLinks(headingText)); slug = slugger.slug(stripLinks(headingText)) - toc[headerNumber] = { + headersToChange[headerNumber] = { text: headingText, slug, } @@ -103,8 +102,8 @@ const addHeaderID = ( // if (curLevel[1] > 0) // console.log(` ${curLevel[1]}. [${title}](#${slug})`); } else { - if (headerNumber in toc) { - slug = toc[headerNumber].slug + if (headerNumber in headersToChange) { + slug = headersToChange[headerNumber].slug console.log("\twrite heading ID", headerNumber, headingText, "==>", slug) return `${headingLevel} ${headingText} {#${slug}}` } else { @@ -170,7 +169,7 @@ const traverseHeaders: TraverseHeadersFunction = ( } }) if (!write) { - console.log(toc) + console.log(headersToChange) } } From 9cc1a71053b2f1604bd6e0934d304afafef08ae2 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Fri, 29 Jul 2022 20:40:29 +0530 Subject: [PATCH 10/25] fix(tsconfig): remove typeroots --- tsconfig.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index e3360a0e586..e10a4bc5313 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,9 +10,7 @@ "strict": true, "noImplicitAny": false, "skipLibCheck": true, - "resolveJsonModule": true, - "typeRoots": ["./node_modules/@types"], - "types": ["node"] + "resolveJsonModule": true }, "include": [ "./src/**/*", From 893b5eede3d772b79e9df65295ba94893c5a503c Mon Sep 17 00:00:00 2001 From: SNikhill Date: Fri, 29 Jul 2022 21:07:50 +0530 Subject: [PATCH 11/25] fix(type): use typeof for githubSlugger --- src/scripts/generate-heading-ids.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generate-heading-ids.ts index a179c4bc60e..6df468a4329 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generate-heading-ids.ts @@ -1,5 +1,5 @@ const fs = require("fs") -const GitHubSlugger = require("github-slugger") +const gitHubSlugger = require("github-slugger") // Given a directory (e.g. `pt`), this script adds custom heading IDs // within all markdown files of the directory (only if one does not exist). @@ -13,10 +13,6 @@ const GitHubSlugger = require("github-slugger") // TODO we should auto-run this script when new markdown files are added to the project -interface IGitHubSlugger { - slug: (headingText: string) => string -} - const headersToChange: Record< string, { @@ -58,7 +54,7 @@ const stripLinks = (line: string): string => { const addHeaderID = ( line: string, - slugger: IGitHubSlugger, + slugger: typeof gitHubSlugger, write = false ): string | undefined => { // check if we're a header at all @@ -121,7 +117,7 @@ const addHeaderID = ( const addHeaderIDs = (lines: Array, write = false): Array => { // Sluggers should be per file - const slugger: IGitHubSlugger = new GitHubSlugger() + const slugger = new gitHubSlugger() let inCode = false const results: Array = [] lines.forEach((line) => { From 6cfdd343917f8562f4d2e3d30d2aca98f9992366 Mon Sep 17 00:00:00 2001 From: Mikko Ohtamaa Date: Wed, 3 Aug 2022 11:58:01 +0200 Subject: [PATCH 12/25] Even more Vyper links --- .../developers/docs/smart-contracts/languages/index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/content/developers/docs/smart-contracts/languages/index.md b/src/content/developers/docs/smart-contracts/languages/index.md index c40ec272ce1..c769126380f 100644 --- a/src/content/developers/docs/smart-contracts/languages/index.md +++ b/src/content/developers/docs/smart-contracts/languages/index.md @@ -113,7 +113,9 @@ For more information, [read the Vyper rationale](https://vyper.readthedocs.io/en - [Smart contract development frameworks and tools for Vyper](/developers/docs/programming-languages/python/) - [VyperPunk - learn to secure and hack Vyper smart contracts](https://github.com/SupremacyTeam/VyperPunk) - [VyperExamples - Vyper vulnerability examples](https://www.vyperexamples.com/reentrancy) -- [Update Jan 8, 2020](https://blog.ethereum.org/2020/01/08/update-on-the-vyper-compiler) +- [Vyper Hub for development](https://github.com/zcor/vyper-dev) +- [Vyper greatest hits smart contract examples](https://github.com/pynchmeister/vyper-greatest-hits/tree/main/contracts) +- [Awesome Vyper curated resources](https://github.com/spadebuilders/awesome-vyper) ### Example {#example} From dc64724dd9f09be60505165e426bd6160463df55 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Sat, 6 Aug 2022 00:35:11 +0530 Subject: [PATCH 13/25] chore(package): add ts-node & github-slugger type --- package.json | 4 ++- yarn.lock | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cd86a8e8dfa..82f05f354fd 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "devDependencies": { "@netlify/functions": "^1.0.0", "@types/browser-lang": "^0.1.0", + "@types/github-slugger": "^1.3.0", "@types/luxon": "^2.3.2", "@types/mdx-js__react": "^1.5.5", "@types/node": "^17.0.23", @@ -90,6 +91,7 @@ "prettier": "^2.2.1", "pretty-quick": "^3.1.0", "react-test-renderer": "^17.0.1", + "ts-node": "^10.9.1", "typescript": "^4.6.3" }, "scripts": { @@ -100,7 +102,7 @@ "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin", "crowdin-import": "ts-node src/scripts/crowdin-import.ts", "format": "prettier --write \"**/*.{js,jsx,json,md}\"", - "generate-heading-ids": "ts-node src/scripts/generate-heading-ids.ts", + "generate-heading-ids": "ts-node --esm src/scripts/generate-heading-ids.mts", "start": "gatsby develop", "start:lambda": "netlify-lambda serve src/lambda", "start:static": "gatsby build && gatsby serve", diff --git a/yarn.lock b/yarn.lock index 9a828fe29b1..f5d701722af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1744,6 +1744,13 @@ resolved "https://registry.yarnpkg.com/@builder.io/partytown/-/partytown-0.5.4.tgz#1a89069978734e132fa4a59414ddb64e4b94fde7" integrity sha512-qnikpQgi30AS01aFlNQV6l8/qdZIcP76mp90ti+u4rucXHsn4afSKivQXApqxvrQG9+Ibv45STyvHizvxef/7A== +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== + dependencies: + "@jridgewell/trace-mapping" "0.3.9" + "@emotion/cache@^11.4.0", "@emotion/cache@^11.7.1": version "11.7.1" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" @@ -2956,6 +2963,14 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.9": version "0.3.13" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" @@ -3569,6 +3584,26 @@ resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== +"@tsconfig/node10@^1.0.7": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" + integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== + +"@tsconfig/node12@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== + +"@tsconfig/node14@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== + +"@tsconfig/node16@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" + integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== + "@turist/fetch@^7.1.7": version "7.1.7" resolved "https://registry.yarnpkg.com/@turist/fetch/-/fetch-7.1.7.tgz#a2b1f7ec0265e6fe0946c51eef34bad9b9efc865" @@ -3660,6 +3695,11 @@ resolved "https://registry.yarnpkg.com/@types/get-port/-/get-port-3.2.0.tgz#f9e0a11443cc21336470185eae3dfba4495d29bc" integrity sha512-TiNg8R1kjDde5Pub9F9vCwZA/BNW9HeXP5b9j7Qucqncy/McfPZ6xze/EyBdXS5FhMIGN6Fx3vg75l5KHy3V1Q== +"@types/github-slugger@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@types/github-slugger/-/github-slugger-1.3.0.tgz#16ab393b30d8ae2a111ac748a015ac05a1fc5524" + integrity sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g== + "@types/glob@*": version "7.2.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -4346,6 +4386,11 @@ acorn-jsx@^5.3.1: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== +acorn-walk@^8.1.1: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== + acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" @@ -15765,6 +15810,25 @@ ts-invariant@^0.9.4: dependencies: tslib "^2.1.0" +ts-node@^10.9.1: + version "10.9.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" + integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== + dependencies: + "@cspotcode/source-map-support" "^0.8.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + v8-compile-cache-lib "^3.0.1" + yn "3.1.1" + ts-node@^9: version "9.1.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" @@ -16392,6 +16456,11 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== + v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" From 136c4f9a235bded262976e9a71b32ea258eecba0 Mon Sep 17 00:00:00 2001 From: SNikhill Date: Sat, 6 Aug 2022 00:42:33 +0530 Subject: [PATCH 14/25] refactor(addHeaderId): convert to ESModule --- package.json | 2 +- .../{generate-heading-ids.ts => generateHeadingIds.mts} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/scripts/{generate-heading-ids.ts => generateHeadingIds.mts} (97%) diff --git a/package.json b/package.json index 82f05f354fd..13db3eaf466 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin", "crowdin-import": "ts-node src/scripts/crowdin-import.ts", "format": "prettier --write \"**/*.{js,jsx,json,md}\"", - "generate-heading-ids": "ts-node --esm src/scripts/generate-heading-ids.mts", + "generate-heading-ids": "ts-node --esm src/scripts/generateHeadingIds.mts", "start": "gatsby develop", "start:lambda": "netlify-lambda serve src/lambda", "start:static": "gatsby build && gatsby serve", diff --git a/src/scripts/generate-heading-ids.ts b/src/scripts/generateHeadingIds.mts similarity index 97% rename from src/scripts/generate-heading-ids.ts rename to src/scripts/generateHeadingIds.mts index 6df468a4329..cba04c68d8e 100644 --- a/src/scripts/generate-heading-ids.ts +++ b/src/scripts/generateHeadingIds.mts @@ -1,5 +1,5 @@ -const fs = require("fs") -const gitHubSlugger = require("github-slugger") +import fs from "fs" +import BananaSlug from "github-slugger" // Given a directory (e.g. `pt`), this script adds custom heading IDs // within all markdown files of the directory (only if one does not exist). @@ -54,7 +54,7 @@ const stripLinks = (line: string): string => { const addHeaderID = ( line: string, - slugger: typeof gitHubSlugger, + slugger: BananaSlug, write = false ): string | undefined => { // check if we're a header at all @@ -117,7 +117,7 @@ const addHeaderID = ( const addHeaderIDs = (lines: Array, write = false): Array => { // Sluggers should be per file - const slugger = new gitHubSlugger() + const slugger = new BananaSlug() let inCode = false const results: Array = [] lines.forEach((line) => { From 887ef1ed0024c4d489cbfee2f6a0556da968f50f Mon Sep 17 00:00:00 2001 From: rogueassasin1729 <92800000+rogueassasin1729@users.noreply.github.com> Date: Sat, 6 Aug 2022 15:24:29 +0530 Subject: [PATCH 15/25] Update types of standards Updated the Types of Standard tab to elucidate the different types of EIPs(Standard, Meta & Informational) , and list down the sub-categories of Standard Track EIP. --- src/content/developers/docs/standards/index.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/content/developers/docs/standards/index.md b/src/content/developers/docs/standards/index.md index 3c921ed7276..dbbecb37f8f 100644 --- a/src/content/developers/docs/standards/index.md +++ b/src/content/developers/docs/standards/index.md @@ -23,9 +23,19 @@ Typically standards are introduced as [Ethereum Improvement Proposals](/eips/) ( ## Types of standards {#types-of-standards} -Certain EIPs relate to application-level standards (e.g. a standard smart-contract format), which are introduced as [Ethereum Requests for Comment (ERC)](https://eips.ethereum.org/erc). Many ERCs are critical standards used widely across the Ethereum ecosystem. +There are 3 types of EIPs: +- [Standard Track](https://eips.ethereum.org/) +- [Meta Track](https://eips.ethereum.org/meta) +- [Informational Track](https://eips.ethereum.org/informational) -- [List of ERCs](https://eips.ethereum.org/erc) +Further, the Standard Track is sub-divided into 4 categories: + +- [Core](https://eips.ethereum.org/core) +- [Networking](https://eips.ethereum.org/networking) +- [Interface](https://eips.ethereum.org/interface) +- [ERC](https://eips.ethereum.org/erc) + +The main difference in the above categories of Standards Track EIP is where it's deployed. For instance, ERCs are deployed at the application level and therefore don't need to be adopted by all participants. However, Core Track EIP is deployed at the protocol level and requires a broader consensus in the community as all core EIPs must be widely adopted (i.e. all the nodes must upgrade to remain part of the network) ### Token standards {#token-standards} From 6f005bcf77f4e12be840a3f9e5e109eb8de277ca Mon Sep 17 00:00:00 2001 From: Joshua <62268199+minimalsm@users.noreply.github.com> Date: Mon, 8 Aug 2022 09:57:27 +0100 Subject: [PATCH 16/25] Remove mentions of ethermining subreddit --- src/content/community/online/index.md | 1 - src/content/community/support/index.md | 2 +- src/content/translations/ca/community/support/index.md | 2 +- src/content/translations/de/community/support/index.md | 2 +- src/content/translations/es/community/online/index.md | 1 - src/content/translations/es/community/support/index.md | 2 +- src/content/translations/fa/community/online/index.md | 1 - src/content/translations/fa/community/support/index.md | 2 +- src/content/translations/fr/community/support/index.md | 2 +- src/content/translations/id/community/support/index.md | 2 +- src/content/translations/it/community/online/index.md | 1 - src/content/translations/it/community/support/index.md | 2 +- src/content/translations/ja/community/online/index.md | 1 - src/content/translations/ja/community/support/index.md | 2 +- src/content/translations/nl/community/support/index.md | 2 +- src/content/translations/pt-br/community/support/index.md | 2 +- src/content/translations/ro/community/support/index.md | 2 +- src/content/translations/ru/community/online/index.md | 1 - src/content/translations/ru/community/support/index.md | 2 +- src/content/translations/sw/community/online/index.md | 1 - src/content/translations/sw/community/support/index.md | 2 +- src/content/translations/tr/community/support/index.md | 2 +- src/content/translations/zh/community/support/index.md | 2 +- 23 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/content/community/online/index.md b/src/content/community/online/index.md index 32729d090e3..22edcec9e3e 100644 --- a/src/content/community/online/index.md +++ b/src/content/community/online/index.md @@ -15,7 +15,6 @@ Hundreds of thousands of Ethereum enthusiasts gather in these online forums to s r/ethfinance - the financial side of Ethereum, including DeFi r/ethdev - focused on Ethereum development r/ethtrader - trends & market analysis -r/EtherMining - focused on securing the Ethereum Network (mining) r/ethstaker - welcome to all interested in staking on Ethereum Fellowship of Ethereum Magicians - community oriented around technical standards in Ethereum Ethereum Stackexchange - discussion and help for Ethereum developers diff --git a/src/content/community/support/index.md b/src/content/community/support/index.md index b92b4fa5338..0b90a73463c 100644 --- a/src/content/community/support/index.md +++ b/src/content/community/support/index.md @@ -107,4 +107,4 @@ Transactions on Ethereum can sometimes get stuck if you have submitted a lower t #### How do I mine Ethereum? {#mining-ethereum} -We do not recommend buying mining equipment if you are not already mining Ethereum. In ~Q3/Q4 2022, [The Merge](/upgrades/merge/) will happen, switching Ethereum from proof-of-work to proof-of-stake. This change means mining Ethereum will no longer be possible. If you are still interested in mining Ethereum, you can seek help from mining communities, such as [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +We do not recommend buying mining equipment if you are not already mining Ethereum. In ~Q3/Q4 2022, [The Merge](/upgrades/merge/) will happen, switching Ethereum from proof-of-work to proof-of-stake. This change means mining Ethereum will no longer be possible. diff --git a/src/content/translations/ca/community/support/index.md b/src/content/translations/ca/community/support/index.md index 797e3e2e12f..0f58a520270 100644 --- a/src/content/translations/ca/community/support/index.md +++ b/src/content/translations/ca/community/support/index.md @@ -107,4 +107,4 @@ Les transaccions en Ethereum, de vegades, poden restar bloquejades si heu enviat #### Com puc minar Ethereum? {#mining-ethereum} -No recomanem comprar equipament per a la mineria si no esteu minant Ethereum actualment. Durant el segon trimestre de 2022 tindrà lloc [la fusió](/upgrades/merge/): canviarem Ethereum de la prova de treball a la prova de participació. Aquest canvi significa que minar Ethereum ja no serà possible. Si encara us interessa minar Ethereum, podeu buscar ajuda en les comunitats mineres, com ara [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +No recomanem comprar equipament per a la mineria si no esteu minant Ethereum actualment. Durant el segon trimestre de 2022 tindrà lloc [la fusió](/upgrades/merge/): canviarem Ethereum de la prova de treball a la prova de participació. Aquest canvi significa que minar Ethereum ja no serà possible. diff --git a/src/content/translations/de/community/support/index.md b/src/content/translations/de/community/support/index.md index c564a5f7b9b..d314b38994b 100644 --- a/src/content/translations/de/community/support/index.md +++ b/src/content/translations/de/community/support/index.md @@ -107,4 +107,4 @@ Transaktionen auf Ethereum können manchmal stecken bleiben, wenn Sie eine niedr #### Wie kann ich Ethereum minen? {#mining-ethereum} -Wir raten davon ab, Mining-Ausrüstung zu kaufen, wenn Sie nicht bereits schon Ethereum minen. Vorraussichtlich im 3./4. Quartal 2022 wird [Die Zusammenführung](/upgrades/merge/) vonstattengehen, wodurch Ethereum von Proof-of-Work zu Proof-of-Stake wechselt. Diese Änderung bedeutet, dass das Mining von Ethereum nicht mehr möglich sein wird. Wenn Sie weiterhin daran interessiert sind, Ethereum zu schürfen, können Sie in Mining-Communitys wie [/r/EtherMining](https://www.reddit.com/r/EtherMining/) Hilfe suchen. +Wir raten davon ab, Mining-Ausrüstung zu kaufen, wenn Sie nicht bereits schon Ethereum minen. Vorraussichtlich im 3./4. Quartal 2022 wird [Die Zusammenführung](/upgrades/merge/) vonstattengehen, wodurch Ethereum von Proof-of-Work zu Proof-of-Stake wechselt. Diese Änderung bedeutet, dass das Mining von Ethereum nicht mehr möglich sein wird. diff --git a/src/content/translations/es/community/online/index.md b/src/content/translations/es/community/online/index.md index a72fce6fd51..7f1a6c26c26 100644 --- a/src/content/translations/es/community/online/index.md +++ b/src/content/translations/es/community/online/index.md @@ -15,7 +15,6 @@ Cientos de miles de entusiastas de Ethereum se reúnen en estos foros en línea r/ethfinance : el lado financiero de Ethereum, incluidas las DeFi r/ethdev : foco puesto en el desarollo de Ethereum r/ethtrader : tendencias y análisis de mercado -r/EtherMining : foco puesto en la protección de la red Ethereum (minería) r/ethstaker : bienvenidos a todos los interesados en las apuestas en Ethereum Programa de becas de Ethereum Magicians : un foro orientado a la comunidad en el que se debaten los estándares técnicos en Ethereum Ethereum Stackexchange : foro de debate y ayuda para desarrolladores de Ethereum diff --git a/src/content/translations/es/community/support/index.md b/src/content/translations/es/community/support/index.md index db0fa84da3c..2b31729acb8 100644 --- a/src/content/translations/es/community/support/index.md +++ b/src/content/translations/es/community/support/index.md @@ -107,4 +107,4 @@ Debido a la demanda de la red, las transacciones en Ethereum pueden a veces esta #### ¿Cómo puedo minar Ethereum? {#mining-ethereum} -No recomendamos comprar equipo destinado a minar si aún no ha minado en Ethereum. En el tercer/cuarto trimestre de 2022, se producirá [la fusión](/upgrades/merge/), cambiando Ethereum de prueba de trabajo a prueba de participación. Este cambio significa que ya no se podrá minar Ethereum. Si todavía le interesa minar Ethereum, puede pedir ayuda a comunidades mineras, como [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +No recomendamos comprar equipo destinado a minar si aún no ha minado en Ethereum. En el tercer/cuarto trimestre de 2022, se producirá [la fusión](/upgrades/merge/), cambiando Ethereum de prueba de trabajo a prueba de participación. Este cambio significa que ya no se podrá minar Ethereum. diff --git a/src/content/translations/fa/community/online/index.md b/src/content/translations/fa/community/online/index.md index 6a2117d497a..f6ec0946fe9 100644 --- a/src/content/translations/fa/community/online/index.md +++ b/src/content/translations/fa/community/online/index.md @@ -15,7 +15,6 @@ lang: fa r/ethfinance _- جنبه مالی اتریوم، از جمله DeFi_ r/ethdev _- متمرکز بر توسعه اتریوم_ r/ethtrader _- روندها و تحلیل بازار_ -r/EtherMining _- متمرکز بر ایمن‌سازی شبکه اتریوم (استخراج)_ r/ethstaker _- به همه علاقمندان به سهام‌گذاری در اتریوم خوش آمدید_ انجمن شعبده بازان اتریوم _- جامعه گرا حول استانداردهای فنی در اتریوم_ Ethereum Stackexchange _- بحث و کمک برای توسعه دهندگان اتریوم_ diff --git a/src/content/translations/fa/community/support/index.md b/src/content/translations/fa/community/support/index.md index ca2cabb7e22..153ee983542 100644 --- a/src/content/translations/fa/community/support/index.md +++ b/src/content/translations/fa/community/support/index.md @@ -107,4 +107,4 @@ _این یک فهرست جامع نیست. برای پیدا کردن پشتیب #### چگونه می‌توانم اتریوم را استخراج کنم؟ {#mining-ethereum} -اگر در تاکنون اتریوم را استخراج نکرده‌اید، خرید تجهیزات استخراج را توصیه نمی‌کنیم. [ادغام](/upgrades/merge/) حوالی سه‌ماهه‌ی سوم/چهارم سال 2022 اتفاق خواهد افتاد و سازوکار اتریوم را از اثبات کار به اثبات سهام تغییر خواهد داد. این تغییر به این معنی است که استخراج اتریوم دیگر امکان‌پذیر نخواهد بود. اگر همچنان به استخراج اتریوم علاقه دارید، می‌توانید از انجمن‌های استخراج مانند [/r/EtherMining](https://www.reddit.com/r/EtherMining/) کمک بگیرید. +اگر در تاکنون اتریوم را استخراج نکرده‌اید، خرید تجهیزات استخراج را توصیه نمی‌کنیم. [ادغام](/upgrades/merge/) حوالی سه‌ماهه‌ی سوم/چهارم سال 2022 اتفاق خواهد افتاد و سازوکار اتریوم را از اثبات کار به اثبات سهام تغییر خواهد داد. diff --git a/src/content/translations/fr/community/support/index.md b/src/content/translations/fr/community/support/index.md index 616462b8c54..4a3a09872a0 100644 --- a/src/content/translations/fr/community/support/index.md +++ b/src/content/translations/fr/community/support/index.md @@ -107,4 +107,4 @@ Les transactions sur Ethereum peuvent parfois se bloquer si vous avez soumis des #### Comment miner de l'Ethereum ? {#mining-ethereum} -Nous ne vous recommandons pas d'investir dans de l'équipement de minage si vous n'êtes pas déjà en train de miner de l'Ethereum. Pendant le deuxième trimestre de 2022, [la fusion](/upgrades/merge/) aura lieu, ce qui aura pour conséquence de faire passer Ethereum de la preuve de travail à la preuve d'enjeu. Ce changement signifie que miner de l'Ethereum ne sera plus possible. Si le minage d'Ethereum vous intéresse quand-même, vous pouvez demander de l'aide auprès de communautés spécialisées, telles que [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Nous ne vous recommandons pas d'investir dans de l'équipement de minage si vous n'êtes pas déjà en train de miner de l'Ethereum. Pendant le deuxième trimestre de 2022, [la fusion](/upgrades/merge/) aura lieu, ce qui aura pour conséquence de faire passer Ethereum de la preuve de travail à la preuve d'enjeu. Ce changement signifie que miner de l'Ethereum ne sera plus possible. diff --git a/src/content/translations/id/community/support/index.md b/src/content/translations/id/community/support/index.md index dda8ca5a631..cfd5d41f542 100644 --- a/src/content/translations/id/community/support/index.md +++ b/src/content/translations/id/community/support/index.md @@ -107,4 +107,4 @@ Transaksi di Ethereum dapat terkadang mengalami kemacetan jika Anda telah mengir #### Bagaimana cara menambang Ethereum? {#mining-ethereum} -Kami tidak menyarankan membeli peralatan menambang jika Anda belum menambang Ethereum. Di ~Q3/Q4 2022, [penggabungan](/upgrades/merge/) akan terjadi, yang mengalihkan Ethereum dari bukti kerja ke bukti taruhan. Perubahan ini berarti menambang Ethereum tidak akan mungkin lagi. Jika Anda masih tertarik dengan menambang Ethereum, Anda dapat mencari bantuan dari komunitas menambang, seperti [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Kami tidak menyarankan membeli peralatan menambang jika Anda belum menambang Ethereum. Di ~Q3/Q4 2022, [penggabungan](/upgrades/merge/) akan terjadi, yang mengalihkan Ethereum dari bukti kerja ke bukti taruhan. Perubahan ini berarti menambang Ethereum tidak akan mungkin lagi. diff --git a/src/content/translations/it/community/online/index.md b/src/content/translations/it/community/online/index.md index ba243287940..bfa29468d2a 100644 --- a/src/content/translations/it/community/online/index.md +++ b/src/content/translations/it/community/online/index.md @@ -15,7 +15,6 @@ Centinaia di migliaia di appassionati di Ethereum si riuniscono in questi forum r/ethfinance - il lato finanziario di Ethereum, inclusa la DeFi r/ethdev - focalizzato sullo sviluppo di Ethereum r/ethtrader - tendenze e analisi di mercato -r/EtherMining - focalizzato sulla protezione della rete Ethereum (mining) r/ethstaker - benvenuti a tutti gli interessati a fare staking su Ethereum Fellowship of Ethereum Magicians - community orientata intorno a standard tecnici in Ethereum Ethereum Stackexchange - discussioni e aiuto per gli sviluppatori di Ethereum diff --git a/src/content/translations/it/community/support/index.md b/src/content/translations/it/community/support/index.md index c4ae984a13d..454aef105fe 100644 --- a/src/content/translations/it/community/support/index.md +++ b/src/content/translations/it/community/support/index.md @@ -107,4 +107,4 @@ Le transazioni su Ethereum a volte possono bloccarsi se hai inviato una commissi #### Come posso fare mining in Ethereum? {#mining-ethereum} -Non consigliamo di acquistare attrezzature per mining se non si sta già facendo mining in Ethereum. Circa tra il terzo e il quarto trimestre del 2022, avrà luogo [La Fusione](/upgrades/merge/), con il passaggio dal proof-of-work al proof-of-stake. Questo cambiamento significa che fare mining in Ethereum non sarà più possibile. Se sei ancora interessato a fare mining in Ethereum, puoi chiedere aiuto alle community per il mining, come [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Non consigliamo di acquistare attrezzature per mining se non si sta già facendo mining in Ethereum. Circa tra il terzo e il quarto trimestre del 2022, avrà luogo [La Fusione](/upgrades/merge/), con il passaggio dal proof-of-work al proof-of-stake. Questo cambiamento significa che fare mining in Ethereum non sarà più possibile. diff --git a/src/content/translations/ja/community/online/index.md b/src/content/translations/ja/community/online/index.md index ed6a623713c..99429d30ee8 100644 --- a/src/content/translations/ja/community/online/index.md +++ b/src/content/translations/ja/community/online/index.md @@ -15,7 +15,6 @@ lang: ja r/ethfinance - 分散型金融(DeFi)などイーサリアムの金融面 r/ethdev - イーサリアム開発 r/ethtrader - トレンドと市場分析 -r/EtherMining - イーサリアムネットワーク(マイニング)のセキュリティ r/ethstaker - イーサリアムのステーキングに関心のある方向け Fellowship of Ethereum Magicians - イーサリアムの技術規格に関するコミュニティ Ethereum Stackexchange - イーサリアム開発者向けの議論とサポート diff --git a/src/content/translations/ja/community/support/index.md b/src/content/translations/ja/community/support/index.md index f7115d04110..aca610dbf9f 100644 --- a/src/content/translations/ja/community/support/index.md +++ b/src/content/translations/ja/community/support/index.md @@ -107,4 +107,4 @@ _このリストはすべてを網羅するものではありません。 特定 #### イーサリアムのマイニング方法を教えてください {#mining-ethereum} -まだイーサリアムのマイニングをしていない方には、マイニング機器の購入をお勧めしません。 2022 年第 3、第 4 四半期に[マージ](/upgrades/merge/)が起こり、イーサリアムがプルーフ・オブ・ワークからプルーフ・オブ・ステークに切り替わり、 イーサリアムのマイニングができなくなるためです。 それでもまだイーサリアムのマイニングにご興味がある場合は、[/r/EtherMining](https://www.reddit.com/r/EtherMining/)などのマイニングコミュニティでサポートを求めてください。 +まだイーサリアムのマイニングをしていない方には、マイニング機器の購入をお勧めしません。 2022 年第 3、第 4 四半期に[マージ](/upgrades/merge/)が起こり、イーサリアムがプルーフ・オブ・ワークからプルーフ・オブ・ステークに切り替わり、 イーサリアムのマイニングができなくなるためです。 diff --git a/src/content/translations/nl/community/support/index.md b/src/content/translations/nl/community/support/index.md index afe4221fb36..f4b60de6037 100644 --- a/src/content/translations/nl/community/support/index.md +++ b/src/content/translations/nl/community/support/index.md @@ -107,4 +107,4 @@ Transacties op Ethereum kunnen soms vast komen te zitten als u een lagere transa #### Hoe kan ik Ethereum minen? {#mining-ethereum} -We raden u niet aan om mining-uitrusting te kopen als u Ethereum nog niet aan het minen bent. In het tweede kwartaal van 2022 zal [de merge](/upgrades/merge/) plaatsvinden die Ethereum van proof-of-work naar proof-of-stake overschakelt. Deze wijziging betekent dat het minen van Ethereum niet langer mogelijk zal zijn. Als u nog steeds geïnteresseerd bent in het minen van Ethereum, kunt u hulp vragen aan mining-gemeenschappen zoals [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +We raden u niet aan om mining-uitrusting te kopen als u Ethereum nog niet aan het minen bent. In het tweede kwartaal van 2022 zal [de merge](/upgrades/merge/) plaatsvinden die Ethereum van proof-of-work naar proof-of-stake overschakelt. Deze wijziging betekent dat het minen van Ethereum niet langer mogelijk zal zijn. diff --git a/src/content/translations/pt-br/community/support/index.md b/src/content/translations/pt-br/community/support/index.md index cb5ddd28098..74ec3424482 100644 --- a/src/content/translations/pt-br/community/support/index.md +++ b/src/content/translations/pt-br/community/support/index.md @@ -107,4 +107,4 @@ Transações em Ethereum podem algumas vezes ficar bloqueadas se você tiver env #### Como minero Ethereum? {#mining-ethereum} -Não recomendamos comprar equipamentos de mineração, se você ainda não está minerando Ethereum. A [fusão](/upgrades/merge/) que ocorrerá cerca do 2º trimestre de 2022 fará a transição do Ethereum da prova de trabalho para a prova de participação. Esta mudança significa que a mineração de Ethereum não será mais possível. Se você ainda está interessado em minerar o Ethereum, poderá procurar ajuda em comunidades de mineração, como [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Não recomendamos comprar equipamentos de mineração, se você ainda não está minerando Ethereum. A [fusão](/upgrades/merge/) que ocorrerá cerca do 2º trimestre de 2022 fará a transição do Ethereum da prova de trabalho para a prova de participação. Esta mudança significa que a mineração de Ethereum não será mais possível. diff --git a/src/content/translations/ro/community/support/index.md b/src/content/translations/ro/community/support/index.md index 63abf759ac9..ce8bb7d20aa 100644 --- a/src/content/translations/ro/community/support/index.md +++ b/src/content/translations/ro/community/support/index.md @@ -107,4 +107,4 @@ Tranzacțiile pe Ethereum pot rămâne uneori blocate dacă ați trimis un comis #### Cum pot să minez pe Ethereum? {#mining-ethereum} -Nu vă recomandăm să cumpărați echipament de minare dacă nu ați minat deja pe Ethereum. În -T2 2022 va avea loc [fuziunea](/upgrades/merge/), prin care Ethereum va trece de la dovada-muncii la dovada-mizei. Această schimbare înseamnă că minarea pe Ethereum nu va mai fi posibilă. Dacă sunteți în continuare interesat să minați pe Ethereum, puteți căuta ajutor la comunitățile de miner-i, cum ar fi [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Nu vă recomandăm să cumpărați echipament de minare dacă nu ați minat deja pe Ethereum. În -T2 2022 va avea loc [fuziunea](/upgrades/merge/), prin care Ethereum va trece de la dovada-muncii la dovada-mizei. Această schimbare înseamnă că minarea pe Ethereum nu va mai fi posibilă. diff --git a/src/content/translations/ru/community/online/index.md b/src/content/translations/ru/community/online/index.md index b1e3c7352eb..3d78fb89d45 100644 --- a/src/content/translations/ru/community/online/index.md +++ b/src/content/translations/ru/community/online/index.md @@ -15,7 +15,6 @@ lang: ru r/ethfinance — финансовая сторона Ethereum, включая децентрализованные финансы (DeFi) r/ethdev — главным образом, развитие Ethereum r/ethtrader — анализ рынка и тенденций -r/EtherMining — главным образом, обеспечение безопасности сети Ethereum (майнинг) r/ethstaker — введение для всех заинтересованных в стейкинге в Ethereum Fellowship of Ethereum Magicians — сообщество, обсуждающее технические стандарты Ethereum Ethereum Stackexchange — обсуждения и помощь разработчикам Ethereum diff --git a/src/content/translations/ru/community/support/index.md b/src/content/translations/ru/community/support/index.md index 846e70f395d..63565532c5d 100644 --- a/src/content/translations/ru/community/support/index.md +++ b/src/content/translations/ru/community/support/index.md @@ -107,4 +107,4 @@ _Это не полный список. Нужна помощь в поиске #### Как я могу выполнить майнинг Ethereum? {#mining-ethereum} -Мы не рекомендуем покупать оборудование для майнинга, если вы в настоящее время не занимаетесь майнингом Ethereum. Примерно в третьем-четвертом квартале 2022 года произойдет [слияние](/upgrades/merge/), в результате чего Ethereum перейдет с доказательства работы на доказательство владения. Это изменение означает, что майнинг Ethereum станет невозможен. Если вы все еще заинтересованы в майнинге Ethereum, вы можете обратиться за помощью к сообществам майнеров, например [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Мы не рекомендуем покупать оборудование для майнинга, если вы в настоящее время не занимаетесь майнингом Ethereum. Примерно в третьем-четвертом квартале 2022 года произойдет [слияние](/upgrades/merge/), в результате чего Ethereum перейдет с доказательства работы на доказательство владения. Это изменение означает, что майнинг Ethereum станет невозможен. diff --git a/src/content/translations/sw/community/online/index.md b/src/content/translations/sw/community/online/index.md index 638e6cdefbf..d0c7f73f565 100644 --- a/src/content/translations/sw/community/online/index.md +++ b/src/content/translations/sw/community/online/index.md @@ -15,7 +15,6 @@ Mamia ya maelfu ya wapenzi wa Ethereum hukusanyika kwenye majukwaa haya ya mtand r/ethfinance - upande wa fedha kuhusu Ethereum, ikiwemo DeFi r/ethdev - kulenga maboresho ya r/ethtrader - mitindo na uchanganuzi wa soko -r/EtherMining - kulenga kulinga Mtandao wa Ethereum (uchimbaji) r/ethstaker - karibuni nyote mnaotaka kuweka hisa kwenye Ushirika wa Ethereum Magicians - jamii iliyozama kwenye viwango vya kiufundi katika Ethereum Stackexchange - majadiliano na usaidizi wa wasanidi programu wa diff --git a/src/content/translations/sw/community/support/index.md b/src/content/translations/sw/community/support/index.md index dbdc7d53014..278cf1e6247 100644 --- a/src/content/translations/sw/community/support/index.md +++ b/src/content/translations/sw/community/support/index.md @@ -107,4 +107,4 @@ Wakati mwingine miamala hugita kwenye Ethereum kama umetoa kiwango kidogo cha ma #### Nawezaje kuchimba Ethereum? {#mining-ethereum} -Hatushauri kununua maunzi ya kuchimba Ethereum kama bado haujaanza kuchimba. Kwenye ~Q3. Q4 2022, [Muungano](/upgrades/merge/) utatokea, utabadilisha Ethereum kutoka kwenye uthibitisho-wa-kazi kwenda kwenye usthibitisho-wa-hisa. Haya mabadiliko yatafanya uchimbaji wa Ethereum kutowezekana tena. Kama bado unavutiwa na uchimbaji wa Ethereum, unawweza kupara msaada kwenye jamii za wachimbaji, kama vile [/r/EtherMining](https://www.reddit.com/r/EtherMining/). +Hatushauri kununua maunzi ya kuchimba Ethereum kama bado haujaanza kuchimba. Kwenye ~Q3. Q4 2022, [Muungano](/upgrades/merge/) utatokea, utabadilisha Ethereum kutoka kwenye uthibitisho-wa-kazi kwenda kwenye usthibitisho-wa-hisa. Haya mabadiliko yatafanya uchimbaji wa Ethereum kutowezekana tena. diff --git a/src/content/translations/tr/community/support/index.md b/src/content/translations/tr/community/support/index.md index 3498a49265d..f8b7b2fcac4 100644 --- a/src/content/translations/tr/community/support/index.md +++ b/src/content/translations/tr/community/support/index.md @@ -107,4 +107,4 @@ Ağ talebi nedeniyle gerekenden daha düşük bir işlem ücreti gönderdiyseniz #### Ethereum madenciliği nasıl yapılır? {#mining-ethereum} -Halihazırda Ethereum madenciliği yapmıyorsanız madencilik ekipmanı satın almanızı önermiyoruz. 2022'nin 3./4. Çeyreğinde [Birleştirme](/upgrades/merge/) gerçekleşerek Ethereum'u iş ispatından hisse ispatına çevirecek. Bu değişiklik, Ethereum madenciliğinin artık mümkün olmayacağı anlamına geliyor. Hâlâ Ethereum madenciliği yapmakla ilgileniyorsanız, [/r/EtherMining](https://www.reddit.com/r/EtherMining/) gibi madencilik topluluklarından yardım isteyebilirsiniz. +Halihazırda Ethereum madenciliği yapmıyorsanız madencilik ekipmanı satın almanızı önermiyoruz. 2022'nin 3./4. Çeyreğinde [Birleştirme](/upgrades/merge/) gerçekleşerek Ethereum'u iş ispatından hisse ispatına çevirecek. Bu değişiklik, Ethereum madenciliğinin artık mümkün olmayacağı anlamına geliyor. diff --git a/src/content/translations/zh/community/support/index.md b/src/content/translations/zh/community/support/index.md index c067378650a..e1dc2a657d7 100644 --- a/src/content/translations/zh/community/support/index.md +++ b/src/content/translations/zh/community/support/index.md @@ -107,4 +107,4 @@ _这并不是完整的列表。 需要帮助寻找特定钱包的支持？ 加 #### 我如何开采以太坊？ {#mining-ethereum} -如果您尚未开采以太坊，我们不建议购买挖矿设备。 2022 年第 3/4 季度，[合并](/upgrades/merge/)将启动，以太坊将从工作量证明过渡到权益证明。 这就意味着以太坊将不再可能被开采。 如果您仍然对开采以太坊感兴趣，可以从采矿社区寻求帮助，例如 [/r/EtherMining](https://www.reddit.com/r/EtherMining/)。 +如果您尚未开采以太坊，我们不建议购买挖矿设备。 2022 年第 3/4 季度，[合并](/upgrades/merge/)将启动，以太坊将从工作量证明过渡到权益证明。 这就意味着以太坊将不再可能被开采。 From 78abd7faa594a36133e58721e594f61c61125fe2 Mon Sep 17 00:00:00 2001 From: Kostas Date: Mon, 8 Aug 2022 17:31:04 +0200 Subject: [PATCH 17/25] Fix styling for node services list --- .../nodes-and-clients/nodes-as-a-service/index.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/content/developers/docs/nodes-and-clients/nodes-as-a-service/index.md b/src/content/developers/docs/nodes-and-clients/nodes-as-a-service/index.md index b978200c84f..b437723d2f6 100644 --- a/src/content/developers/docs/nodes-and-clients/nodes-as-a-service/index.md +++ b/src/content/developers/docs/nodes-and-clients/nodes-as-a-service/index.md @@ -209,13 +209,16 @@ Here is a list of some of the most popular Ethereum node providers, feel free to - Suitable for Developers to Enterprises - [**Rivet**](https://rivet.cloud/) - [Docs](https://rivet.readthedocs.io/en/latest/) - - Features - Free tier option - Scale as you go -[**SenseiNode**](https://senseinode.com) + - Features + - Free tier option + - Scale as you go +- [**SenseiNode**](https://senseinode.com) - [Docs](https://docs.senseinode.com/) - Features - - Dedicated and Share nodes - - Dashboard - - Hosting off AWS on multiple hosting providers accross different locations in Latin America - - Prysm and Lighthouse clients + - Dedicated and Share nodes + - Dashboard + - Hosting off AWS on multiple hosting providers accross different locations in Latin America + - Prysm and Lighthouse clients - [**SettleMint**](https://console.settlemint.com/) - [Docs](https://docs.settlemint.com/) - Features From fd91098cab8e4c04a24e9d147b06d0c0ec89bee8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:36:51 +0000 Subject: [PATCH 18/25] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 676ca178671..55982e038ee 100644 --- a/README.md +++ b/README.md @@ -1333,6 +1333,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Michael McCallam
📖
Polina G.
📖
Neeraj Gahlot
📖 🐛 +
Kostas
📖 From 3e7b36882cc6c0818d4cb95af0783cd4136ab9ee Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:36:52 +0000 Subject: [PATCH 19/25] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 39bae120d2d..ec801f8b29d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -8347,6 +8347,15 @@ "doc", "bug" ] + }, + { + "login": "vrinek", + "name": "Kostas", + "avatar_url": "https://avatars.githubusercontent.com/u/81346?v=4", + "profile": "https://github.com/vrinek", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 7, From fb80cb2bc56ebb2c1ea7bab0f50b3357eee6c272 Mon Sep 17 00:00:00 2001 From: Joshua <62268199+minimalsm@users.noreply.github.com> Date: Mon, 8 Aug 2022 18:39:35 +0100 Subject: [PATCH 20/25] Apply suggestions from code review Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> --- src/content/developers/docs/standards/index.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/content/developers/docs/standards/index.md b/src/content/developers/docs/standards/index.md index dbbecb37f8f..4ffc425542d 100644 --- a/src/content/developers/docs/standards/index.md +++ b/src/content/developers/docs/standards/index.md @@ -24,18 +24,19 @@ Typically standards are introduced as [Ethereum Improvement Proposals](/eips/) ( ## Types of standards {#types-of-standards} There are 3 types of EIPs: + - [Standard Track](https://eips.ethereum.org/) - [Meta Track](https://eips.ethereum.org/meta) - [Informational Track](https://eips.ethereum.org/informational) -Further, the Standard Track is sub-divided into 4 categories: +Furthermore, the Standard Track is subdivided into 4 categories: -- [Core](https://eips.ethereum.org/core) -- [Networking](https://eips.ethereum.org/networking) -- [Interface](https://eips.ethereum.org/interface) -- [ERC](https://eips.ethereum.org/erc) +- [Core](https://eips.ethereum.org/core): improvements requiring a consensus fork +- [Networking](https://eips.ethereum.org/networking): improvements around devp2p and Light Ethereum Subprotocol, as well as proposed improvements to network protocol specifications of whisper and swarm. +- [Interface](https://eips.ethereum.org/interface): improvements around client API/RPC specifications and standards, and certain language-level standards like method names and contract ABIs. +- [ERC](https://eips.ethereum.org/erc): application-level standards and conventions -The main difference in the above categories of Standards Track EIP is where it's deployed. For instance, ERCs are deployed at the application level and therefore don't need to be adopted by all participants. However, Core Track EIP is deployed at the protocol level and requires a broader consensus in the community as all core EIPs must be widely adopted (i.e. all the nodes must upgrade to remain part of the network) +More detailed information on these different types and categories can be found in [EIP-1](https://eips.ethereum.org/EIPS/eip-1#eip-types) ### Token standards {#token-standards} From 12b3f2717d0f15f3f282477242f46903b6f609d0 Mon Sep 17 00:00:00 2001 From: Joshua <62268199+minimalsm@users.noreply.github.com> Date: Mon, 8 Aug 2022 18:39:51 +0100 Subject: [PATCH 21/25] Apply suggestions from code review Co-authored-by: Pandapip1 <45835846+Pandapip1@users.noreply.github.com> --- src/content/developers/docs/standards/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/content/developers/docs/standards/index.md b/src/content/developers/docs/standards/index.md index 4ffc425542d..887570c15de 100644 --- a/src/content/developers/docs/standards/index.md +++ b/src/content/developers/docs/standards/index.md @@ -25,9 +25,9 @@ Typically standards are introduced as [Ethereum Improvement Proposals](/eips/) ( There are 3 types of EIPs: -- [Standard Track](https://eips.ethereum.org/) -- [Meta Track](https://eips.ethereum.org/meta) -- [Informational Track](https://eips.ethereum.org/informational) +- [Standards Track](https://eips.ethereum.org/): describes any change that affects most or all Ethereum implementations +- [Meta Track](https://eips.ethereum.org/meta): describes a process surrounding Ethereum or proposes a change to a process +- [Informational Track](https://eips.ethereum.org/informational): describes an Ethereum design issue or provides general guidelines or information to the Ethereum community Furthermore, the Standard Track is subdivided into 4 categories: From a45edfc52564d37395be00bf5212111a15cb9490 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:44:50 +0000 Subject: [PATCH 22/25] docs: update README.md [skip ci] --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 55982e038ee..186b8062b20 100644 --- a/README.md +++ b/README.md @@ -1335,6 +1335,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Neeraj Gahlot
📖 🐛
Kostas
📖 + +
rogueassasin1729
📖 + From 8dd2109a8413caf60884ebc27c684b625d1e2685 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:44:51 +0000 Subject: [PATCH 23/25] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index ec801f8b29d..64c8dc55750 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -8356,6 +8356,15 @@ "contributions": [ "doc" ] + }, + { + "login": "rogueassasin1729", + "name": "rogueassasin1729", + "avatar_url": "https://avatars.githubusercontent.com/u/92800000?v=4", + "profile": "https://github.com/rogueassasin1729", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 7, From e043dadbf967a2e138f007ed1c9a421539cee2e4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:45:11 +0000 Subject: [PATCH 24/25] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 186b8062b20..78b67cd73ee 100644 --- a/README.md +++ b/README.md @@ -1337,6 +1337,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
rogueassasin1729
📖 +
Pandapip1
📖 From 60fa76debea23a597575133d0bf7cda8c78c869a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:45:12 +0000 Subject: [PATCH 25/25] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 64c8dc55750..61dfd854520 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -8365,6 +8365,15 @@ "contributions": [ "doc" ] + }, + { + "login": "Pandapip1", + "name": "Pandapip1", + "avatar_url": "https://avatars.githubusercontent.com/u/45835846?v=4", + "profile": "https://pandapip1.com/", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 7,