Merge branch 'main' into feat/daily-consumed-quota

node-real · May 31, 2024 · 223b83f · 223b83f
2 parents ae86b84 + 944f3a4
commit 223b83f
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -138,12 +138,12 @@ If you use editor other than vscode, just make your app's directory as your work
 
 ## Documentation Links
 - [Greenfield Whitepaper](https://github.com/bnb-chain/greenfield-whitepaper)
-- [Guide to BNB Greenfield](https://docs.bnbchain.org/greenfield-docs/docs/guide/home)
+- [Guide to BNB Greenfield](https://docs.bnbchain.org/bnb-greenfield/)
 - [Guide to DCellar](https://docs.nodereal.io/docs/dcellar-get-started)
 - [Guide to Rush](https://rushjs.io/pages/intro/welcome/)
 - [Guide to Apollo](https://github.com/apolloconfig/apollo)
-- [BNB Greenfield Release Notes](https://docs.bnbchain.org/greenfield-docs/docs/release-notes/releaseNotes/#greenfield-v023---testnet-maintenance-upgrade-reset)
-- [BNB Greenfield RPC Endpoints](https://docs.bnbchain.org/greenfield-docs/docs/api/endpoints/)
+- [BNB Greenfield Release Notes](https://docs.bnbchain.org/bnb-greenfield/release-notes/releaseNotes/)
+- [BNB Greenfield RPC Endpoints](https://docs.bnbchain.org/bnb-greenfield/for-developers/network-endpoint/endpoints/?h=rpc)
 - [@bnb-chain/greenfield-js-sdk](https://docs.bnbchain.org/greenfield-js-sdk/)
 - [@node-real/uikit](https://node-real.github.io/uikit/#/guides)
 - [@node-real/wallketkit](https://node-real.github.io/walletkit/)

diff --git a/apps/dcellar-web-ui/CHANGELOG.json b/apps/dcellar-web-ui/CHANGELOG.json
@@ -1,6 +1,36 @@
 {
   "name": "dcellar-web-ui",
   "entries": [
+    {
+      "version": "1.6.1",
+      "tag": "dcellar-web-ui_v1.6.1",
+      "date": "Thu, 30 May 2024 10:00:54 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Correct the bucket status"
+          }
+        ]
+      }
+    },
+    {
+      "version": "1.6.0",
+      "tag": "dcellar-web-ui_v1.6.0",
+      "date": "Thu, 30 May 2024 09:05:12 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Unified encoding method same as go-sdk"
+          },
+          {
+            "comment": "Replace the related links of bnb greenfield doc"
+          },
+          {
+            "comment": "Add bucket status tip to the bucket detail drawer"
+          }
+        ]
+      }
+    },
     {
       "version": "1.5.0",
       "tag": "dcellar-web-ui_v1.5.0",

diff --git a/apps/dcellar-web-ui/CHANGELOG.md b/apps/dcellar-web-ui/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Change Log - dcellar-web-ui
 
-This log was last generated on Thu, 23 May 2024 03:42:29 GMT and should not be manually modified.
+This log was last generated on Thu, 30 May 2024 10:00:54 GMT and should not be manually modified.
+
+## 1.6.1
+Thu, 30 May 2024 10:00:54 GMT
+
+### Patches
+
+- Correct the bucket status
+
+## 1.6.0
+Thu, 30 May 2024 09:05:12 GMT
+
+### Minor changes
+
+- Unified encoding method same as go-sdk
+- Replace the related links of bnb greenfield doc
+- Add bucket status tip to the bucket detail drawer
 
 ## 1.5.0
 Thu, 23 May 2024 03:42:29 GMT

diff --git a/apps/dcellar-web-ui/package.json b/apps/dcellar-web-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dcellar-web-ui",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "private": false,
   "scripts": {
     "dev": "node ./scripts/dev.js -p 3200",
@@ -19,7 +19,7 @@
     "antd": "5.11.0",
     "ahooks": "3.7.7",
     "hash-wasm": "4.10.0",
-    "@bnb-chain/greenfield-js-sdk": "2.1.0-alpha.0",
+    "@bnb-chain/greenfield-js-sdk": "2.1.0-alpha.2",
     "@bnb-chain/greenfield-cosmos-types": "0.4.0-alpha.32",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",

diff --git a/apps/dcellar-web-ui/src/components/layout/Nav/index.tsx b/apps/dcellar-web-ui/src/components/layout/Nav/index.tsx
@@ -41,13 +41,13 @@ const MENU_ITEMS = [
 
 const ASIDE = [
   {
-    link: 'https://docs.bnbchain.org/greenfield-docs/',
+    link: 'https://docs.bnbchain.org/bnb-greenfield/',
     trackId: 'dc.main.nav.doc.click',
     icon: 'book',
     text: 'BNB Greenfield Docs',
   },
   {
-    link: 'https://docs.bnbchain.org/greenfield-docs/docs/release-notes/releaseNotes/',
+    link: 'https://docs.bnbchain.org/bnb-greenfield/for-developers/network-endpoint/endpoints/?h=rpc',
     trackId: 'dc.main.nav.release_note.click',
     icon: 'doc',
     text: 'Release Notes',

diff --git a/apps/dcellar-web-ui/src/modules/bucket/components/DetailBucketOperation.tsx b/apps/dcellar-web-ui/src/modules/bucket/components/DetailBucketOperation.tsx
@@ -44,6 +44,7 @@ import { useMount, useUnmount } from 'ahooks';
 import { DEFAULT_TAG } from '@/components/common/ManageTags';
 import { Activities } from '@/components/Activities';
 import { BucketStatus } from '@bnb-chain/greenfield-js-sdk';
+import { DiscontinueBanner } from '@/components/common/DiscontinueBanner';
 
 export const Label = ({ children }: PropsWithChildren) => (
   <Text as={'div'} fontSize={'14px'} fontWeight={500} color="readable.tertiary">
@@ -101,6 +102,12 @@ export const DetailBucketOperation = memo<DetailBucketOperationProps>(function D
     },
   };
 
+  const isFlowRateLimit = ['1', '3'].includes(selectedBucketInfo?.OffChainStatus);
+  const isBucketDiscontinue =
+    selectedBucketInfo.BucketStatus === BucketStatus.BUCKET_STATUS_DISCONTINUED;
+  const isBucketMigrating =
+    selectedBucketInfo.BucketStatus === BucketStatus.BUCKET_STATUS_MIGRATING;
+
   const quotaDetail = [
     {
       key: 'Monthly quota',
@@ -418,7 +425,7 @@ export const DetailBucketOperation = memo<DetailBucketOperationProps>(function D
     <>
       <QDrawerHeader>Bucket Detail</QDrawerHeader>
       <QDrawerBody>
-        <Flex mb={24}>
+        <Flex mb={16}>
           <IconFont type="detail-bucket" w={120} />
           <Box marginLeft={'24px'} flex={1}>
             <Text color="readable.tertiary" fontSize={'12px'} marginBottom="4px">
@@ -477,6 +484,27 @@ export const DetailBucketOperation = memo<DetailBucketOperationProps>(function D
             </Text>
           </Box>
         </Flex>
+        {isFlowRateLimit && (
+          <DiscontinueBanner
+            marginBottom={16}
+            content="The bucket's flow rate exceeds the payment account limit."
+          />
+        )}
+        {isBucketDiscontinue && (
+          <DiscontinueBanner
+            marginBottom={16}
+            content="All discontinued items in this bucket will be deleted by SP soon."
+          />
+        )}
+        {isBucketMigrating && (
+          <DiscontinueBanner
+            icon={<IconFont w={16} type={'migrate'} color={'#1184EE'} />}
+            color={'#1184EE'}
+            bg="opacity7"
+            marginBottom={16}
+            content="This bucket is in the process of data migration to another provider."
+          />
+        )}
         <Tabs>
           <TabList mb={24}>
             {VERSION_TABS.map((tab) => (

diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/FAQ.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/FAQ.tsx
@@ -150,9 +150,9 @@ export const FAQ = ({ openKeys, toggleOpenKeys }: FAQProps) => {
           more about it, please refer to{' '}
           <UnderlineLink
             target="_blank"
-            href="https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/modules/billing-and-payment#storage-fee-price-and-adjustment"
+            href="https://github.com/bnb-chain/greenfield/blob/master/docs/modules/billing-and-payment.md#storage-fee-price-and-adjustment"
           >
-            https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/modules/billing-and-payment#storage-fee-price-and-adjustment
+            https://github.com/bnb-chain/greenfield/blob/master/docs/modules/billing-and-payment.md#storage-fee-price-and-adjustment
           </UnderlineLink>
           .
         </Text>

diff --git a/apps/dcellar-web-ui/src/modules/pricing-calculator/components/PricingCard.tsx b/apps/dcellar-web-ui/src/modules/pricing-calculator/components/PricingCard.tsx
@@ -104,7 +104,7 @@ export const PricingCard = ({ storeParams }: PricingCardProps) => {
           }}
         >
           Global prices will update monthly based on all the SPs&apos; suggested prices.{' '}
-          <UnderlineLink href="https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/modules/billing-and-payment">
+          <UnderlineLink href="https://github.com/bnb-chain/greenfield/blob/master/docs/modules/billing-and-payment.md#billing-and-payment">
             Learn More
           </UnderlineLink>
         </Text>

diff --git a/apps/dcellar-web-ui/src/modules/welcome/components/DeveloperTools.tsx b/apps/dcellar-web-ui/src/modules/welcome/components/DeveloperTools.tsx
@@ -34,7 +34,7 @@ const datas = [
     icon: <ResponsiveIcon type="filled-docs" color={'readable.white'} />,
     iconBg: '#F5A861',
     name: 'BNB Greenfield Docs',
-    link: 'https://docs.bnbchain.org/greenfield-docs/docs/guide/home',
+    link: 'https://docs.bnbchain.org/bnb-greenfield/',
     gaClickName: 'dc_lp.homepage.tool.docs.click',
   },
   {

diff --git a/apps/dcellar-web-ui/src/utils/string.ts b/apps/dcellar-web-ui/src/utils/string.ts
@@ -1,5 +1,6 @@
 import { IQuotaProps } from '@bnb-chain/greenfield-js-sdk';
 import BigNumber from 'bignumber.js';
+import { hexlify, toUtf8Bytes } from 'ethers/lib/utils';
 
 export const trimFloatZero = (str: string) => {
   const [intStr, floatStr] = str.split('.');
@@ -89,22 +90,30 @@ export const encodeObjectName = (pathName: string) => {
         encodedPathName += s;
         continue;
 
+      // default:
+      //   // . ! @ # $ % ^ & * ) ( - + = { } [ ] / " , ' < > ~ \ .` ? : ; | \\
+      //   // eslint-disable-next-line no-useless-escape
+      //   if (/[.!@#$%^&*)(\-+={}\[\]\/",'<>~·`?:;|\\]+$/.test(s)) {
+      //     // english characters
+      //     const hexStr = s.charCodeAt(0).toString(16);
+      //     encodedPathName += '%' + hexStr.toUpperCase();
+      //   } else {
+      //     // others characters
+      //     try {
+      //       encodedPathName += encodeURI(s);
+      //     } catch (e) {
+      //       encodedPathName += s;
+      //     }
+      //   }
       // others characters need to be encoded
-      default:
-        // . ! @ # $ % ^ & * ) ( - + = { } [ ] / " , ' < > ~ \ .` ? : ; | \\
-        // eslint-disable-next-line no-useless-escape
-        if (/[.!@#$%^&*)(\-+={}\[\]\/",'<>~·`?:;|\\]+$/.test(s)) {
-          // english characters
-          const hexStr = s.charCodeAt(0).toString(16);
-          encodedPathName += '%' + hexStr.toUpperCase();
-        } else {
-          // others characters
-          try {
-            encodedPathName += encodeURI(s);
-          } catch (e) {
-            encodedPathName += s;
-          }
+      default: {
+        const u = toUtf8Bytes(s);
+
+        for (let i = 0; i < u.length; i++) {
+          const hexStr = hexlify(u[i]);
+          encodedPathName += '%' + hexStr.slice(2).toUpperCase();
         }
+      }
     }
   }
   return encodedPathName;

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml