From d52867dd06bfffeba78ac91c8bdd7386331cf217 Mon Sep 17 00:00:00 2001 From: RetricSu Date: Thu, 19 Sep 2024 13:14:29 +0800 Subject: [PATCH 1/4] chore: bump v2.11.0 (#454) --- website/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/package.json b/website/package.json index 52228ca6..c0999506 100644 --- a/website/package.json +++ b/website/package.json @@ -1,6 +1,6 @@ { "name": "docs.nervos.org", - "version": "2.10.0", + "version": "2.11.0", "description": "Official docs website for Nervos CKB", "license": "MIT", "scripts": { From 8631b21d623c089071c2ec400a9b9e8b80e7154d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:12:12 +0800 Subject: [PATCH 2/4] chore(deps): bump next in /examples/simple-lock/frontend (#455) Bumps [next](https://github.com/vercel/next.js) from 14.2.3 to 14.2.10. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.2.3...v14.2.10) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../simple-lock/frontend/package-lock.json | 88 +++++++++---------- examples/simple-lock/frontend/package.json | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/examples/simple-lock/frontend/package-lock.json b/examples/simple-lock/frontend/package-lock.json index 261dfc6e..adc4f5ee 100644 --- a/examples/simple-lock/frontend/package-lock.json +++ b/examples/simple-lock/frontend/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "dependencies": { "@ckb-ccc/core": "^0.0.14-alpha.0", - "next": "14.2.3", + "next": "14.2.10", "react": "^18", "react-dom": "^18" }, @@ -347,9 +347,9 @@ "integrity": "sha512-i9EVTXCT0bTLpAQXAoF5zHGLWYCXNE5AP4Zl0Niwl3ZplaVAZHNU6ygsh2O3EGmCFv5qlkoY2DuLmsjysEaNLA==" }, "node_modules/@next/env": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz", - "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==" + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.10.tgz", + "integrity": "sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==" }, "node_modules/@next/eslint-plugin-next": { "version": "14.2.3", @@ -361,9 +361,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz", - "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz", + "integrity": "sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==", "cpu": [ "arm64" ], @@ -376,9 +376,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz", - "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz", + "integrity": "sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==", "cpu": [ "x64" ], @@ -391,9 +391,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz", - "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz", + "integrity": "sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==", "cpu": [ "arm64" ], @@ -406,9 +406,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz", - "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz", + "integrity": "sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==", "cpu": [ "arm64" ], @@ -421,9 +421,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz", - "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz", + "integrity": "sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==", "cpu": [ "x64" ], @@ -436,9 +436,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz", - "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz", + "integrity": "sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==", "cpu": [ "x64" ], @@ -451,9 +451,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz", - "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz", + "integrity": "sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==", "cpu": [ "arm64" ], @@ -466,9 +466,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz", - "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz", + "integrity": "sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==", "cpu": [ "ia32" ], @@ -481,9 +481,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz", - "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz", + "integrity": "sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==", "cpu": [ "x64" ], @@ -3681,11 +3681,11 @@ "dev": true }, "node_modules/next": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz", - "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/next/-/next-14.2.10.tgz", + "integrity": "sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==", "dependencies": { - "@next/env": "14.2.3", + "@next/env": "14.2.10", "@swc/helpers": "0.5.5", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", @@ -3700,15 +3700,15 @@ "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "14.2.3", - "@next/swc-darwin-x64": "14.2.3", - "@next/swc-linux-arm64-gnu": "14.2.3", - "@next/swc-linux-arm64-musl": "14.2.3", - "@next/swc-linux-x64-gnu": "14.2.3", - "@next/swc-linux-x64-musl": "14.2.3", - "@next/swc-win32-arm64-msvc": "14.2.3", - "@next/swc-win32-ia32-msvc": "14.2.3", - "@next/swc-win32-x64-msvc": "14.2.3" + "@next/swc-darwin-arm64": "14.2.10", + "@next/swc-darwin-x64": "14.2.10", + "@next/swc-linux-arm64-gnu": "14.2.10", + "@next/swc-linux-arm64-musl": "14.2.10", + "@next/swc-linux-x64-gnu": "14.2.10", + "@next/swc-linux-x64-musl": "14.2.10", + "@next/swc-win32-arm64-msvc": "14.2.10", + "@next/swc-win32-ia32-msvc": "14.2.10", + "@next/swc-win32-x64-msvc": "14.2.10" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", diff --git a/examples/simple-lock/frontend/package.json b/examples/simple-lock/frontend/package.json index 1368ba2e..6c859437 100644 --- a/examples/simple-lock/frontend/package.json +++ b/examples/simple-lock/frontend/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@ckb-ccc/core": "^0.0.14-alpha.0", - "next": "14.2.3", + "next": "14.2.10", "react": "^18", "react-dom": "^18" }, From b77044ba294bba863d4084ed29eaad3d363e965a Mon Sep 17 00:00:00 2001 From: ptt <70423834+tea2x@users.noreply.github.com> Date: Sun, 6 Oct 2024 10:48:50 +0700 Subject: [PATCH 3/4] rephrasing & typo fixing (#459) * rephrase & fix typo * change word choice * fix typo * rephrasing --- website/docs/getting-started/how-ckb-works.mdx | 2 +- website/docs/script/intro-to-script.mdx | 4 ++-- website/docs/sdk-and-devtool/cli-tool.mdx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/getting-started/how-ckb-works.mdx b/website/docs/getting-started/how-ckb-works.mdx index 0be7b299..2f7d8bab 100644 --- a/website/docs/getting-started/how-ckb-works.mdx +++ b/website/docs/getting-started/how-ckb-works.mdx @@ -106,7 +106,7 @@ A Script in CKB is a binary executable that can be executed on-chain. It is a There’re two main types of Scripts: -- **Lock Script**: A required Script controlling the ownership and access to a Cell, ensuring only authorized users can spend its contents. +- **Lock Script**: A required Script controlling the ownership and access to a Cell, ensuring only authorized users can spend/consume the Cell. - **Type Script**: An optional Script dictating how a Cell can be used or modified in a transaction. ### CKB System Script diff --git a/website/docs/script/intro-to-script.mdx b/website/docs/script/intro-to-script.mdx index d729e014..8bc790e8 100644 --- a/website/docs/script/intro-to-script.mdx +++ b/website/docs/script/intro-to-script.mdx @@ -24,9 +24,9 @@ A Script can be one of two types: - **Lock Script** - Used to control ownership and access to a Cell. - **Type Script** - Used to control how a Cell is used in a transaction. -In most cases, Lock Script works the same with Type Script. The difference is that, only the Lock Script from the input Cells will be executed in the transaction, while the Type Script from both the input Cells and output Cells will be executed in the transaction. +In most cases, Lock Script and Type Script function similarly. The only key difference is that, the output Cells' Lock Scripts will NOT be executed in a transaction, whereas the input Cells' Lock Scripts, the input Cells' Type Scripts, and the output Cells' Type Scripts will be executed. -This difference has lead to the different usecases of Lock Script and Type Script as we have mentioned above. Lock Script is often used to control owner ship of a Cell while Type Script defines what kinds of changes of a Cell is valid for the transaction. +This difference has led to the different usecases of Lock Script and Type Script as we have mentioned above. Lock Script is often used to control owner ship of a Cell while Type Script defines what kinds of changes of a Cell is valid for the transaction. ## Script Structure diff --git a/website/docs/sdk-and-devtool/cli-tool.mdx b/website/docs/sdk-and-devtool/cli-tool.mdx index f18d1790..eafd290c 100644 --- a/website/docs/sdk-and-devtool/cli-tool.mdx +++ b/website/docs/sdk-and-devtool/cli-tool.mdx @@ -15,7 +15,7 @@ Command-line tools are often used by developers to perform specific blockchain t [ckb-cli](https://github.com/nervosnetwork/ckb-cli) is a CKB command-line tool developed in Rust. -If you need to interact with Mainnet blockchain from the command line, `ckb-cli` is an ideal choice to manager accounts, deploy Scripts and send Transactions. +If you need to interact with Mainnet blockchain from the command line, `ckb-cli` is an ideal choice to manage accounts, deploy Scripts and send Transactions. ### Features From 72ea5a9c43ebb195b7ee5e1b0bdc8a9669c355df Mon Sep 17 00:00:00 2001 From: "nervosyixiu.bit" <87553548+yixyxiu@users.noreply.github.com> Date: Sun, 6 Oct 2024 11:52:02 +0800 Subject: [PATCH 4/4] Ecosystem: remove nervosscan, add nervdao (#464) * remove nervosscan(service is out of operation due to the server costs), add nervdao * fix: ecosystem, optimized banner-nervape.svg, reducing its size from 36.2MB to 322KB, resulting in faster loading times. --- website/docs/ecosystem/EcoCardContents.tsx | 20 +++++++----- website/static/svg/banner-nervape.svg | 6 ++-- website/static/svg/banner-nervdao.svg | 38 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 website/static/svg/banner-nervdao.svg diff --git a/website/docs/ecosystem/EcoCardContents.tsx b/website/docs/ecosystem/EcoCardContents.tsx index 7f600e8d..c7a538bd 100644 --- a/website/docs/ecosystem/EcoCardContents.tsx +++ b/website/docs/ecosystem/EcoCardContents.tsx @@ -225,14 +225,6 @@ const ecoCardContents: EcoCardProps[] = [ }, ], }, - { - title: "Nervos Scan", - description: "A CKB Explorer produced with love by 7774.bit", - href: "https://nervosscan.com/", - bannerSrc: "nervosscan", - tags: ["Explorer"], - links: [{ label: "website", link: "https://nervosscan.com/" }], - }, { title: "Neuron", description: @@ -247,7 +239,17 @@ const ecoCardContents: EcoCardProps[] = [ }, ], }, - + { + title: "NervDAO", + description: "A Universal Wallet-Interfaced Nervos DAO Portal", + href: "https://www.nervdao.com/", + bannerSrc: "nervdao", + tags: ["DApp"], + links: [ + { label: "website", link: "https://www.nervdao.com/" }, + { label: "github", link: "https://github.com/ckb-ecofund/nervdao" }, + ], + }, { title: "CKBull", description: diff --git a/website/static/svg/banner-nervape.svg b/website/static/svg/banner-nervape.svg index 8f599c60..35a0692d 100644 --- a/website/static/svg/banner-nervape.svg +++ b/website/static/svg/banner-nervape.svg @@ -1,4 +1,4 @@ - + @@ -18,6 +18,6 @@ - + - + \ No newline at end of file diff --git a/website/static/svg/banner-nervdao.svg b/website/static/svg/banner-nervdao.svg new file mode 100644 index 00000000..6c49ebc6 --- /dev/null +++ b/website/static/svg/banner-nervdao.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file