fix: Delete Policy

bnb-chain · Sep 14, 2023 · 896dadf · 896dadf
1 parent 2f8e36c
commit 896dadf
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 22 deletions.
diff --git a/.changeset/tender-bats-help.md b/.changeset/tender-bats-help.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+fix: Delete Policy
diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -11,7 +11,6 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@bnb-chain/greenfield-cosmos-types": "0.4.0-alpha.23",
     "@bnb-chain/greenfield-js-sdk": "workspace:*",
     "@bnb-chain/greenfiled-file-handle": "workspace:*",
     "@cosmjs/encoding": "^0.29.5",

diff --git a/examples/nextjs/src/components/customtx/index.tsx b/examples/nextjs/src/components/customtx/index.tsx
@@ -1,5 +1,4 @@
 import { client } from '@/client';
-import { MsgSend } from '@bnb-chain/greenfield-cosmos-types/cosmos/bank/v1beta1/tx';
 import { useAccount } from 'wagmi';
 
 export const CustomTx = () => {

diff --git a/examples/nextjs/src/components/policy/bucketPolicy/index.tsx b/examples/nextjs/src/components/policy/bucketPolicy/index.tsx
@@ -63,6 +63,55 @@ export const BucketPolicy = () => {
       >
         put bucket policy
       </button>
+      <button
+        onClick={async () => {
+          if (!address) return;
+
+          const tx = await client.bucket.deleteBucketPolicy(
+            address,
+            policyBucketInfo.bucketName,
+            address,
+            'PRINCIPAL_TYPE_GNFD_ACCOUNT',
+          );
+
+          const simulateInfo = await tx.simulate({
+            denom: 'BNB',
+          });
+
+          console.log('simulateInfo', simulateInfo);
+
+          const res = await tx.broadcast({
+            denom: 'BNB',
+            gasLimit: Number(simulateInfo?.gasLimit),
+            gasPrice: simulateInfo?.gasPrice || '5000000000',
+            payer: address,
+            granter: '',
+          });
+
+          console.log('res', res);
+
+          if (res.code === 0) {
+            alert('success');
+          }
+        }}
+      >
+        delete bucket policy
+      </button>
+      {/* <button onClick={async () => {
+        if (!address) return;
+
+        const principal: PermissionTypes.Principal = {
+
+        }
+
+        await client.storage.deletePolicy({
+          operator: address,
+          principal,
+          resource:
+        })
+      }}>
+        xx
+      </button> */}
     </>
   );
 };
diff --git a/examples/nextjs/src/components/policy/objectPolicy/index.tsx b/examples/nextjs/src/components/policy/objectPolicy/index.tsx
@@ -77,6 +77,41 @@ export const ObjectPolicy = () => {
       >
         put object policy
       </button>
+      <button
+        onClick={async () => {
+          if (!address) return;
+
+          const tx = await client.object.deleteObjectPolicy(
+            address,
+            policyObjectInfo.bucketName,
+            policyObjectInfo.objectName,
+            address,
+            'PRINCIPAL_TYPE_GNFD_GROUP',
+          );
+
+          const simulateInfo = await tx.simulate({
+            denom: 'BNB',
+          });
+
+          console.log('simulateInfo', simulateInfo);
+
+          const res = await tx.broadcast({
+            denom: 'BNB',
+            gasLimit: Number(simulateInfo?.gasLimit),
+            gasPrice: simulateInfo?.gasPrice || '5000000000',
+            payer: address,
+            granter: '',
+          });
+
+          console.log('res', res);
+
+          if (res.code === 0) {
+            alert('success');
+          }
+        }}
+      >
+        delete object policy
+      </button>
     </>
   );
 };
diff --git a/packages/chain-sdk/src/api/bucket.ts b/packages/chain-sdk/src/api/bucket.ts
@@ -38,6 +38,7 @@ import {
   ActionType,
   Principal,
   PrincipalType,
+  principalTypeFromJSON,
 } from '@bnb-chain/greenfield-cosmos-types/greenfield/permission/common';
 import { visibilityTypeFromJSON } from '@bnb-chain/greenfield-cosmos-types/greenfield/storage/common';
 import {
@@ -107,6 +108,7 @@ export interface IBucket {
     operator: string,
     bucketName: string,
     principalAddr: string,
+    principalType: keyof typeof PrincipalType,
   ): Promise<TxResponse>;
 
   getBucketMeta(params: GetBucketMetaRequest): Promise<SpResponse<GetBucketMetaResponse>>;
@@ -496,10 +498,15 @@ export class Bucket implements IBucket {
     return this.storage.putPolicy(msg);
   }
 
-  public async deleteBucketPolicy(operator: string, bucketName: string, principalAddr: string) {
+  public async deleteBucketPolicy(
+    operator: string,
+    bucketName: string,
+    principalAddr: string,
+    principalType: keyof typeof PrincipalType,
+  ) {
     const resource = GRNToString(newBucketGRN(bucketName));
     const principal: Principal = {
-      type: PrincipalType.PRINCIPAL_TYPE_GNFD_ACCOUNT,
+      type: principalTypeFromJSON(principalType),
       value: principalAddr,
     };
 

diff --git a/packages/chain-sdk/src/api/objectt.ts b/packages/chain-sdk/src/api/objectt.ts
@@ -31,6 +31,7 @@ import {
   ActionType,
   Principal,
   PrincipalType,
+  principalTypeFromJSON,
 } from '@bnb-chain/greenfield-cosmos-types/greenfield/permission/common';
 import {
   redundancyTypeFromJSON,
@@ -148,6 +149,7 @@ export interface IObject {
     bucketName: string,
     objectName: string,
     principalAddr: string,
+    principalType: keyof typeof PrincipalType,
   ): Promise<TxResponse>;
 
   isObjectPermissionAllowed(
@@ -669,10 +671,11 @@ export class Objectt implements IObject {
     bucketName: string,
     objectName: string,
     principalAddr: string,
+    principalType: keyof typeof PrincipalType,
   ) {
     const resource = GRNToString(newObjectGRN(bucketName, objectName));
     const principal: Principal = {
-      type: PrincipalType.PRINCIPAL_TYPE_GNFD_ACCOUNT,
+      type: principalTypeFromJSON(principalType),
       value: principalAddr,
     };
 

diff --git a/packages/chain-sdk/src/clients/txClient.ts b/packages/chain-sdk/src/clients/txClient.ts
@@ -364,7 +364,7 @@ export class TxClient implements ITxClient {
         );
 
         const eip712 = createEIP712(wrapperTypes, this.chainId, messages);
-        // console.log('eip712', eip712);
+
         const { pubKey, signature } = privateKey
           ? this.getSignByPriKey(eip712, privateKey)
           : await this.getSignByWallet(eip712, accountInfo.address, signTypedDataCallback);

diff --git a/packages/chain-sdk/src/messages/greenfield/storage/MsgDeletePolicy.ts b/packages/chain-sdk/src/messages/greenfield/storage/MsgDeletePolicy.ts
@@ -12,5 +12,19 @@ export const MsgDeletePolicySDKTypeEIP712 = {
       name: 'resource',
       type: 'string',
     },
+    {
+      name: 'principal',
+      type: 'TypeMsg1Principal',
+    },
+  ],
+  TypeMsg1Principal: [
+    {
+      name: 'type',
+      type: 'string',
+    },
+    {
+      name: 'value',
+      type: 'string',
+    },
   ],
 };