Feat/validator (#310)

* feat: EditValidator * feat: Add proposal api * refactor: TxClient * feat: Bucket listBucketsByPaymentAccount api * fix: Proposal and Validator API * feat: ListUserPaymentAccount api
bnb-chain · Sep 7, 2023 · 695379e · 695379e
1 parent 53b8001
commit 695379e
Show file tree

Hide file tree

Showing 41 changed files with 1,221 additions and 380 deletions.
diff --git a/.changeset/heavy-seas-talk.md b/.changeset/heavy-seas-talk.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+feat: Validator API - editValidator
diff --git a/.changeset/soft-doors-perform.md b/.changeset/soft-doors-perform.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+feat: Proposal vote api
diff --git a/.changeset/spicy-jokes-wave.md b/.changeset/spicy-jokes-wave.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+feat: ListUserPaymentAccount api
diff --git a/.changeset/stale-beans-jog.md b/.changeset/stale-beans-jog.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+feat: Bucket listBucketsByPaymentAccount api
diff --git a/.changeset/stupid-dodos-fold.md b/.changeset/stupid-dodos-fold.md
@@ -0,0 +1,5 @@
+---
+'@bnb-chain/greenfield-js-sdk': patch
+---
+
+refactor: basic.multi -> txClient.multi
diff --git a/examples/nextjs/.env.simple b/examples/nextjs/.env.simple
@@ -14,3 +14,6 @@ NEXT_PUBLIC_CROSS_CHAIN_CONTRACT_ADDRESS=0xeEBe00Ac0756308ac4AaBfD76c05c4F3088B8
 # ACCOUNT
 NEXT_PUBLIC_ACCOUNT_ADDRESS=
 NEXT_PUBLIC_ACCOUNT_PRIVATEKEY=
+
+# VALIDATOR
+NEXT_PUBLIC_VALIDATOR_PRIVATEKEY=
diff --git a/examples/nextjs/src/components/feegrant/createObj.tsx b/examples/nextjs/src/components/feegrant/createObj.tsx
@@ -91,7 +91,7 @@ export const CreateObj = () => {
           });
 
           // 4. broadcast txs include 2 msg
-          const txs = await client.basic.multiTx([grantAllowanceTx, putPolicyTx]);
+          const txs = await client.txClient.multiTx([grantAllowanceTx, putPolicyTx]);
           const simuluateInfo = await txs.simulate({
             denom: 'BNB',
           });

diff --git a/examples/nextjs/src/components/feegrant/delObj.tsx b/examples/nextjs/src/components/feegrant/delObj.tsx
@@ -77,7 +77,7 @@ export const DelObj = () => {
           });
 
           // 4. broadcast txs include 2 msg
-          const txs = await client.basic.multiTx([grantAllowanceTx, putPolicyTx]);
+          const txs = await client.txClient.multiTx([grantAllowanceTx, putPolicyTx]);
           const simuluateInfo = await txs.simulate({
             denom: 'BNB',
           });

diff --git a/examples/nextjs/src/components/multimsg/index.tsx b/examples/nextjs/src/components/multimsg/index.tsx
@@ -36,7 +36,7 @@ export const MultiMsg = () => {
 
             console.log(transferOutTx.metaTxInfo);
 
-            const txs = await client.basic.multiTx([transferTx, transferOutTx]);
+            const txs = await client.txClient.multiTx([transferTx, transferOutTx]);
 
             const simuluateInfo = await txs.simulate({
               denom: 'BNB',

diff --git a/examples/nextjs/src/components/proposal/index.tsx b/examples/nextjs/src/components/proposal/index.tsx
@@ -0,0 +1,48 @@
+import { client } from '@/client';
+import { VALIDATOR_PRIVATEKEY } from '@/config/env';
+import { Long } from '@bnb-chain/greenfield-js-sdk';
+import { useAccount } from 'wagmi';
+
+export const Proposal = () => {
+  const { address, connector } = useAccount();
+
+  return (
+    <>
+      <h3>proposal</h3>
+      <h4>vote</h4>
+      <button
+        onClick={async () => {
+          if (!address) return;
+
+          const voteProposalTx = await client.proposal.voteProposal({
+            metadata: 'meta',
+            option: 1,
+            proposalId: Long.fromString('15'),
+            voter: address,
+          });
+
+          const simulateInfo = await voteProposalTx.simulate({
+            denom: 'BNB',
+          });
+
+          console.log('simulateInfo', simulateInfo);
+
+          const res = await voteProposalTx.broadcast({
+            denom: 'BNB',
+            gasLimit: Number(simulateInfo?.gasLimit),
+            gasPrice: simulateInfo?.gasPrice || '5000000000',
+            payer: address,
+            granter: '',
+            privateKey: VALIDATOR_PRIVATEKEY,
+          });
+
+          if (res.code === 0) {
+            alert('success');
+          }
+        }}
+      >
+        vote proposal
+      </button>
+    </>
+  );
+};
diff --git a/examples/nextjs/src/components/query/index.tsx b/examples/nextjs/src/components/query/index.tsx
@@ -1,9 +1,11 @@
 import { client } from '@/client';
+import { ACCOUNT_PRIVATEKEY } from '@/config/env';
+import { getOffchainAuthKeys } from '@/utils/offchainAuth';
 import { Long } from '@bnb-chain/greenfield-js-sdk';
 import { useAccount } from 'wagmi';
 
 export const QueryComponent = () => {
-  const { address } = useAccount();
+  const { address, connector } = useAccount();
   return (
     <>
       <h2>open console panel</h2>
@@ -117,6 +119,24 @@ export const QueryComponent = () => {
             onClick={async () => {
               if (!address) return;
 
+              const { paymentAccounts } = await client.payment.getPaymentAccountsByOwner({
+                owner: address,
+              });
+
+              const res = await client.bucket.listBucketsByPaymentAccount({
+                paymentAccount: paymentAccounts[0],
+              });
+              console.log('res', res);
+            }}
+          >
+            list bucket by payment
+          </button>
+        </li>
+        <li>
+          <button
+            onClick={async () => {
+              if (!address) return;
+
               const res = await client.sp.listGroupsMembers({
                 groupId: 269,
               });
@@ -161,6 +181,39 @@ export const QueryComponent = () => {
             list user owned groups
           </button>
         </li>
+
+        <li>
+          <button
+            onClick={async () => {
+              if (!address) return;
+
+              const provider = await connector?.getProvider();
+              const offChainData = await getOffchainAuthKeys(address, provider);
+              if (!offChainData) {
+                alert('No offchain, please create offchain pairs first');
+                return;
+              }
+
+              const res = await client.payment.listUserPaymentAccounts(
+                {
+                  account: address,
+                },
+                {
+                  // type: 'ECDSA',
+                  // privateKey: ACCOUNT_PRIVATEKEY,
+                  type: 'EDDSA',
+                  domain: window.location.origin,
+                  seed: offChainData.seedString,
+                  address,
+                },
+              );
+
+              console.log('res', res);
+            }}
+          >
+            listUserPaymentAccounts
+          </button>
+        </li>
       </ul>
     </>
   );

diff --git a/examples/nextjs/src/components/validator/index.tsx b/examples/nextjs/src/components/validator/index.tsx
@@ -0,0 +1,128 @@
+import { client } from '@/client';
+import { VALIDATOR_PRIVATEKEY } from '@/config/env';
+import { Long } from '@bnb-chain/greenfield-js-sdk';
+import { useAccount } from 'wagmi';
+
+export const Validator = () => {
+  const { address, connector } = useAccount();
+
+  return (
+    <>
+      {/* <h4>create validator</h4>
+      <button
+        onClick={async () => {
+          if (!address) return;
+          const createValidatorTx = await client.validator.createValidator(address, {
+            description: {
+              moniker: 'test',
+              details: 'test',
+              identity: 'test',
+              securityContact: 'test',
+              website: 'test',
+            },
+            blsKey: 'test',
+            blsProof: '',
+            challengerAddress: '0x4038993E087832D84e2Ac855d27f6b0b2EEc1907',
+            relayerAddress: '0xA4A2957E858529FFABBBb483D1D704378a9fca6b',
+            commission: {
+              maxChangeRate: '10000000000000000',
+              maxRate: '10000000000000000',
+              rate: '10000000000000000',
+            },
+            delegatorAddress: address,
+            from: address,
+            value: ,
+
+          });
+
+          const simulateInfo = await createValidatorTx.simulate({
+            denom: 'BNB',
+          });
+
+          console.log('simulateInfo', simulateInfo);
+
+          const res = await createValidatorTx.broadcast({
+            denom: 'BNB',
+            gasLimit: Number(simulateInfo?.gasLimit),
+            gasPrice: simulateInfo?.gasPrice || '5000000000',
+            payer: address,
+            granter: '',
+          });
+
+          if (res.code === 0) {
+            alert('success');
+          }
+        }}
+      >
+        create
+      </button> */}
+
+      <button
+        onClick={async () => {
+          const res = await client.validator.listValidators({
+            status: 'BOND_STATUS_BONDED',
+            pagination: {
+              limit: Long.fromInt(10),
+              offset: Long.fromInt(0),
+              countTotal: true,
+              key: Uint8Array.from([]),
+              reverse: false,
+            },
+          });
+
+          console.log('res', res);
+
+          // console.log('blsKey', toHex(res.validators[0].blsKey));
+        }}
+      >
+        list
+      </button>
+
+      <h4>edit validator</h4>
+      <button
+        onClick={async () => {
+          if (!address) return;
+
+          const editValidatorTx = await client.validator.editValidator(address, {
+            blsKey:
+              '0xb3c5eaba9ae74bc6308054f586db909ea8482d158b24789d66c47578bb9b293b7d00d5acfb0645e528f39526ff04994b',
+            blsProof: '',
+            challengerAddress: '0x52A57571D08692d2D60596DD9b588Ff59ACdf02E',
+            description: {
+              moniker: 'test',
+              details: 'test',
+              identity: 'test',
+              securityContact: 'test',
+              website: 'test',
+            },
+            relayerAddress: '0x68EA59d9aFB06a838E05d511eDdA2049D1b6fF61',
+            validatorAddress: '0x84800aaFDD595f1b7C77292c98988ad424068470',
+            commissionRate: '',
+            minSelfDelegation: '',
+          });
+
+          const simulateInfo = await editValidatorTx.simulate({
+            denom: 'BNB',
+          });
+
+          console.log('simulateInfo', simulateInfo);
+
+          const res = await editValidatorTx.broadcast({
+            denom: 'BNB',
+            gasLimit: Number(simulateInfo?.gasLimit),
+            gasPrice: simulateInfo?.gasPrice || '5000000000',
+            payer: address,
+            granter: '',
+            privateKey: VALIDATOR_PRIVATEKEY,
+          });
+
+          if (res.code === 0) {
+            alert('success');
+          }
+        }}
+      >
+        edit validator
+      </button>
+    </>
+  );
+};
diff --git a/examples/nextjs/src/config/env.ts b/examples/nextjs/src/config/env.ts
@@ -11,6 +11,7 @@ const {
   NEXT_PUBLIC_CROSS_CHAIN_CONTRACT_ADDRESS,
   NEXT_PUBLIC_ACCOUNT_ADDRESS,
   NEXT_PUBLIC_ACCOUNT_PRIVATEKEY,
+  NEXT_PUBLIC_VALIDATOR_PRIVATEKEY,
 } = publicRuntimeConfig || {};
 
 export const GRPC_URL = NEXT_PUBLIC_GRPC_URL;
@@ -22,3 +23,4 @@ export const TOKEN_HUB_CONTRACT_ADDRESS = NEXT_PUBLIC_TOKEN_HUB_CONTRACT_ADDRESS
 export const CROSS_CHAIN_CONTRACT_ADDRESS = NEXT_PUBLIC_CROSS_CHAIN_CONTRACT_ADDRESS;
 export const ACCOUNT_ADDRESS = NEXT_PUBLIC_ACCOUNT_ADDRESS;
 export const ACCOUNT_PRIVATEKEY = NEXT_PUBLIC_ACCOUNT_PRIVATEKEY;
+export const VALIDATOR_PRIVATEKEY = NEXT_PUBLIC_VALIDATOR_PRIVATEKEY;
diff --git a/examples/nextjs/src/pages/tx.tsx b/examples/nextjs/src/pages/tx.tsx
@@ -12,6 +12,8 @@ import { Withdraw } from '@/components/withdraw';
 import { useIsMounted } from '@/hooks/useIsMounted';
 import { useAccount } from 'wagmi';
 import { PaymentComponent } from '@/components/payment';
+import { Validator } from '@/components/validator';
+import { Proposal } from '@/components/proposal';
 
 export default function Tx() {
   const isMounted = useIsMounted();
@@ -47,6 +49,10 @@ export default function Tx() {
           <hr style={{ margin: '10px 0' }} />
           <FeeGrant />
           <hr style={{ margin: '10px 0' }} />
+          <Proposal />
+          <hr style={{ margin: '10px 0' }} />
+          <Validator />
+          <hr style={{ margin: '10px 0' }} />
           <MultiMsg />
         </>
       )}

diff --git a/packages/chain-sdk/src/api/account.ts b/packages/chain-sdk/src/api/account.ts
@@ -1,3 +1,4 @@
+import { TxClient } from '@/clients/txClient';
 import { MsgMultiSendSDKTypeEIP712 } from '@/messages/bank/MsgMultiSend';
 import { MsgSendSDKTypeEIP712 } from '@/messages/bank/MsgSend';
 import { MsgCreatePaymentAccountSDKTypeEIP712 } from '@/messages/greenfield/payment/MsgCreatePaymentAccount';
@@ -24,7 +25,6 @@ import {
   MsgSendTypeUrl,
   TxResponse,
 } from '..';
-import { Basic } from './basic';
 import { RpcQueryClient } from '../clients/queryclient';
 
 export interface IAccount {
@@ -67,12 +67,12 @@ export interface IAccount {
 
 @singleton()
 export class Account implements IAccount {
-  constructor(@inject(delay(() => Basic)) private basic: Basic) {}
+  constructor(@inject(delay(() => TxClient)) private txClient: TxClient) {}
 
   private queryClient = container.resolve(RpcQueryClient);
 
   public async multiTransfer(address: string, msg: MsgMultiSend) {
-    return await this.basic.tx(
+    return await this.txClient.tx(
       MsgMultiSendTypeUrl,
       address,
       MsgMultiSendSDKTypeEIP712,
@@ -82,7 +82,7 @@ export class Account implements IAccount {
   }
 
   public async createPaymentAccount(msg: MsgCreatePaymentAccount) {
-    return await this.basic.tx(
+    return await this.txClient.tx(
       MsgCreatePaymentAccountTypeUrl,
       msg.creator,
       MsgCreatePaymentAccountSDKTypeEIP712,
@@ -131,7 +131,7 @@ export class Account implements IAccount {
   }
 
   public async transfer(msg: MsgSend) {
-    return await this.basic.tx(
+    return await this.txClient.tx(
       MsgSendTypeUrl,
       msg.fromAddress,
       MsgSendSDKTypeEIP712,