Feat/batch upload (#171)

* feat: Feegrant * feat: Feegrant * Create angry-horses-enjoy.md
bnb-chain · Jul 20, 2023 · e2ebac6 · e2ebac6
1 parent d894bad
commit e2ebac6
Show file tree

Hide file tree

Showing 9 changed files with 252 additions and 154 deletions.
diff --git a/.changeset/angry-horses-enjoy.md b/.changeset/angry-horses-enjoy.md
@@ -0,0 +1,6 @@
+---
+"@demo/wallet": patch
+"@bnb-chain/greenfield-chain-sdk": patch
+---
+
+feat: Feegrant `grantAllowance` API
diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -17,6 +17,7 @@
     "@cosmjs/proto-signing": "^0.29.5",
     "@cosmjs/stargate": "^0.29.5",
     "@ethersproject/signing-key": "^5.7.0",
+    "@ethersproject/wallet": "^5.7.0",
     "@metamask/eth-sig-util": "^5.0.2",
     "@next/font": "13.1.6",
     "@rainbow-me/rainbowkit": "^1.0.5",

diff --git a/examples/nextjs/src/components/batch/index.tsx b/examples/nextjs/src/components/batch/index.tsx
@@ -0,0 +1,87 @@
+import { client, selectSp } from '@/client';
+import { GRNToString, newBucketGRN, PermissionTypes } from '@bnb-chain/greenfield-chain-sdk';
+import { Wallet } from '@ethersproject/wallet';
+import { useState } from 'react';
+import { useAccount, useNetwork } from 'wagmi';
+
+export const FeeGrant = () => {
+  const { address } = useAccount();
+  const [bucketName, setBucketName] = useState<string>('');
+
+  return (
+    <>
+      <h4>Feegrant</h4>
+      bucket name :
+      <input
+        value={bucketName}
+        placeholder="bucket name"
+        onChange={(e) => {
+          setBucketName(e.target.value);
+        }}
+      />
+      <br />
+      <button
+        onClick={async () => {
+          if (!address) return;
+
+          // select sp to be primary sp
+          const spInfo = await selectSp();
+          const { primarySpAddress } = spInfo;
+
+          /* await client.bucket.createBucket({
+            bucketName,
+            creator: address,
+            visibility: 'VISIBILITY_TYPE_PUBLIC_READ',
+            chargedReadQuota: '0',
+            spInfo,
+            signType: 'authTypeV2',
+          }); */
+
+          const { sequence } = await client.account.getAccount(address);
+          console.log('sequence', sequence);
+
+          const wallet = Wallet.createRandom();
+          console.log('wallet', wallet, wallet.privateKey);
+
+          const grantAllowanceTx = await client.feegrant.grantAllowance({
+            granter: address,
+            grantee: wallet.address,
+            // allowance: ,
+          });
+
+          const simulateInfo = await grantAllowanceTx.simulate({
+            denom: 'BNB',
+          });
+
+          console.log('simulateInfo:', simulateInfo);
+
+          const res = await grantAllowanceTx.broadcast({
+            denom: 'BNB',
+            gasLimit: Number(simulateInfo?.gasLimit),
+            gasPrice: simulateInfo?.gasPrice || '5000000000',
+            payer: address,
+            granter: '',
+          });
+
+          console.log(res);
+
+          // const statement: PermissionTypes.Statement = {
+          //   effect: PermissionTypes.Effect.EFFECT_ALLOW,
+          //   actions: [PermissionTypes.ActionType.ACTION_UPDATE_BUCKET_INFO],
+          //   resources: [GRNToString(newBucketGRN(bucketName))],
+          // };
+          // const putPolicyTx = await client.bucket.putBucketPolicy(bucketName, {
+          //   operator: address,
+          //   statements: [statement],
+          //   principal: {
+          //     type: PermissionTypes.PrincipalType.PRINCIPAL_TYPE_GNFD_ACCOUNT,
+          //     value: '0x0000000000000000000000000000000000000001',
+          //   },
+          // });
+        }}
+      >
+        go batch
+      </button>
+    </>
+  );
+};
diff --git a/examples/nextjs/src/pages/tx.tsx b/examples/nextjs/src/pages/tx.tsx
@@ -1,3 +1,4 @@
+import { FeeGrant } from '@/components/batch';
 import { Bucket } from '@/components/bucket';
 import { Deposit } from '@/components/deposit';
 import { Group } from '@/components/group';
@@ -44,6 +45,8 @@ export default function Tx() {
           <hr style={{ margin: '10px 0' }} />
           <Policy />
           <hr style={{ margin: '10px 0' }} />
+          <FeeGrant />
+          <hr style={{ margin: '10px 0' }} />
           <MultiMsg />
         </>
       )}

diff --git a/packages/chain-sdk/src/api/account.ts b/packages/chain-sdk/src/api/account.ts
@@ -17,8 +17,11 @@ import {
   QueryGetPaymentAccountsByOwnerResponse,
 } from '@bnb-chain/greenfield-cosmos-types/greenfield/payment/query';
 import { MsgCreatePaymentAccount } from '@bnb-chain/greenfield-cosmos-types/greenfield/payment/tx';
+import { toBuffer } from '@ethereumjs/util';
+import { hexlify } from '@ethersproject/bytes';
 import { container, delay, inject, singleton } from 'tsyringe';
 import {
+  Long,
   MsgCreatePaymentAccountTypeUrl,
   MsgMultiSendTypeUrl,
   MsgSendTypeUrl,

diff --git a/packages/chain-sdk/src/api/basic.ts b/packages/chain-sdk/src/api/basic.ts
@@ -23,7 +23,7 @@ import {
 import { makeAuthInfoBytes } from '@cosmjs/proto-signing';
 import { DeliverTxResponse, StargateClient } from '@cosmjs/stargate';
 import { Tendermint37Client } from '@cosmjs/tendermint-rpc';
-import { toBuffer } from '@ethereumjs/util';
+import { bufferToHex, toBuffer } from '@ethereumjs/util';
 import Long from 'long';
 import { container, inject, singleton } from 'tsyringe';
 import { BroadcastOptions, ISimulateGasFee, MetaTxInfo, SimulateOptions, TxResponse } from '..';
@@ -366,6 +366,9 @@ export class Basic implements IBasic {
       txOption,
     );
 
+    // console.log('txOption', txOption);
+    // console.log('msgEIP712', msgEIP712);
+
     let signature,
       pubKey = undefined;
 
@@ -388,8 +391,14 @@ export class Basic implements IBasic {
         messageHash,
       });
       pubKey = makeCosmsPubKey(pk);
+
+      // console.log('messageHash', bufferToHex(messageHash));
+      // console.log('signature', signature);
+      // console.log('pubKey', pubKey, bufferToHex(Buffer.from(pubKey.value)));
     }
 
+    // console.log('eip712', eip712, JSON.stringify(eip712));
+
     const authInfoBytes = this.getAuthInfoBytes({
       denom,
       sequence: accountInfo.sequence + '',

diff --git a/packages/chain-sdk/src/api/feegrant.ts b/packages/chain-sdk/src/api/feegrant.ts
@@ -1,5 +1,9 @@
 import { MsgGrantAllowanceSDKTypeEIP712 } from '@/messages/feegrant/MsgGrantAllowance';
 import { MsgRevokeAllowanceSDKTypeEIP712 } from '@/messages/feegrant/MsgRevokeAllowance';
+import {
+  AllowedMsgAllowance,
+  BasicAllowance,
+} from '@bnb-chain/greenfield-cosmos-types/cosmos/feegrant/v1beta1/feegrant';
 import {
   QueryAllowanceRequest,
   QueryAllowanceResponse,
@@ -10,8 +14,16 @@ import {
   MsgGrantAllowance,
   MsgRevokeAllowance,
 } from '@bnb-chain/greenfield-cosmos-types/cosmos/feegrant/v1beta1/tx';
+import { Any } from '@bnb-chain/greenfield-cosmos-types/google/protobuf/any';
+import { Timestamp } from '@bnb-chain/greenfield-cosmos-types/google/protobuf/timestamp';
+import {
+  base64FromBytes,
+  bytesFromBase64,
+  toTimestamp,
+} from '@bnb-chain/greenfield-cosmos-types/helpers';
+import { toBuffer } from '@ethereumjs/util';
 import { container, singleton } from 'tsyringe';
-import { MsgGrantAllowanceTypeUrl, MsgRevokeAllowanceTypeUrl, TxResponse } from '..';
+import { encodeToHex, MsgGrantAllowanceTypeUrl, MsgRevokeAllowanceTypeUrl, TxResponse } from '..';
 import { Basic } from './basic';
 import { RpcQueryClient } from './queryclient';
 
@@ -31,12 +43,59 @@ export class FeeGrant implements IFeeGrant {
   private queryClient: RpcQueryClient = container.resolve(RpcQueryClient);
 
   public async grantAllowance(msg: MsgGrantAllowance) {
+    const basicAllowance: BasicAllowance = {
+      spendLimit: [
+        {
+          amount: '111',
+          denom: 'BNB',
+        },
+      ],
+    };
+
+    const allowedMsgAllowance: AllowedMsgAllowance = {
+      allowedMessages: ['/greenfield.storage.MsgCreateObject'],
+      allowance: Any.fromPartial({
+        typeUrl: '/cosmos.feegrant.v1beta1.BasicAllowance',
+        value: BasicAllowance.encode(basicAllowance).finish(),
+      }),
+    };
+
+    const grantAllowance: MsgGrantAllowance = {
+      ...msg,
+      allowance: Any.fromPartial({
+        typeUrl: '/cosmos.feegrant.v1beta1.AllowedMsgAllowance',
+        value: AllowedMsgAllowance.encode(allowedMsgAllowance).finish(),
+      }),
+    };
+
+    const marshal = {
+      '@type': '/cosmos.feegrant.v1beta1.AllowedMsgAllowance',
+      allowed_messages: ['/greenfield.storage.MsgCreateObject'],
+      allowance: Any.fromPartial({
+        typeUrl: '/cosmos.feegrant.v1beta1.BasicAllowance',
+        value: BasicAllowance.encode(basicAllowance).finish(),
+      }),
+      // expiration: null,
+      // spend_limit: [
+      //   {
+      //     amount: '111',
+      //     denom: 'BNB',
+      //   },
+      // ],
+    };
+
     return await this.basic.tx(
       MsgGrantAllowanceTypeUrl,
       msg.granter,
       MsgGrantAllowanceSDKTypeEIP712,
-      MsgGrantAllowance.toSDK(msg),
-      MsgGrantAllowance.encode(msg).finish(),
+      {
+        ...MsgGrantAllowance.toSDK(grantAllowance),
+        allowance: {
+          type: grantAllowance.allowance?.typeUrl,
+          value: toBuffer('0x' + encodeToHex(JSON.stringify(marshal))),
+        },
+      },
+      MsgGrantAllowance.encode(grantAllowance).finish(),
     );
   }
 

diff --git a/packages/chain-sdk/src/utils/allowance.ts b/packages/chain-sdk/src/utils/allowance.ts
@@ -0,0 +1,17 @@
+// import { AllowedMsgAllowance } from '@bnb-chain/greenfield-cosmos-types/cosmos/feegrant/v1beta1/feegrant';
+// import { Any } from '@bnb-chain/greenfield-cosmos-types/google/protobuf/any';
+
+// const myAny: Any = {
+//   typeUrl: '/cosmos.feegrant.v1beta1.MsgAllowance',
+//   // value:
+// };
+
+// const x: AllowedMsgAllowance = {
+//   allowedMessages: [],
+//   allowance: myAny,
+// };
+
+// export const NewAllowedMsgAllowance = (
+//   allowance: any,
+//   allowedMsgs: string[],
+// ): AllowedMsgAllowance => {};