[WIP] Rapha/feat/chain v1.4.0 upgrade (#95)

* feat: use buf to generate proto files * feat: upgrade types to 1.4.0 * feat: upgrade sdk to 1.4.0
KYVENetwork · Nov 8, 2023 · f36689b · f36689b
1 parent ba3c1d6
commit f36689b
Show file tree

Hide file tree

Showing 57 changed files with 9,567 additions and 4,629 deletions.
diff --git a/common/protocol/package.json b/common/protocol/package.json
@@ -24,12 +24,12 @@
     "@cosmjs/proto-signing": "^0.27.1",
     "@cosmjs/stargate": "^0.27.1",
     "@kyvejs/sdk": "1.0.5",
-    "@kyvejs/types": "1.0.3",
+    "@kyvejs/types": "1.1.0",
     "@types/cli-progress": "^3.9.2",
     "@types/jsonfile": "^6.0.1",
     "arweave": "^1.10.17",
     "axios": "^0.24.0",
-    "bignumber.js": "^9.0.1",
+    "bignumber.js": "^9.1.2",
     "clone": "^2.1.2",
     "commander": "^9.4.1",
     "diff": "^5.1.0",

diff --git a/common/sdk/README.md b/common/sdk/README.md
@@ -54,7 +54,7 @@ Sdk instance can be configured with a network object.
     const network = {
         rpc: "https://rpc.korellia.kyve.network",
         rest: "https://api.korellia.kyve.network",
-        chainId: "korellia",
+        chainId: "korellia-2",
         chainName: "Korellia",
    }
     const sdk = new KyveSDK(network);

diff --git a/common/sdk/package.json b/common/sdk/package.json
@@ -23,18 +23,18 @@
     "lint:fix": "eslint --fix . --ignore-path ../../.eslintignore --ext ts --ext tsx --ext js --ext jsx"
   },
   "dependencies": {
-    "@cosmjs/amino": "^0.30.1",
-    "@cosmjs/crypto": "^0.30.1",
-    "@cosmjs/encoding": "^0.30.1",
-    "@cosmjs/proto-signing": "^0.30.1",
-    "@cosmjs/stargate": "^0.30.1",
-    "@cosmjs/tendermint-rpc": "^0.30.1",
+    "@cosmjs/amino": "^0.31.3",
+    "@cosmjs/crypto": "^0.31.3",
+    "@cosmjs/encoding": "^0.31.3",
+    "@cosmjs/proto-signing": "^0.31.3",
+    "@cosmjs/stargate": "^0.31.3",
+    "@cosmjs/tendermint-rpc": "^0.31.3",
     "@cosmostation/extension-client": "^0.0.6",
-    "@keplr-wallet/cosmos": "^0.11.38",
-    "@kyvejs/types": "1.0.3",
+    "@keplr-wallet/cosmos": "^0.12.39",
+    "@kyvejs/types": "1.1.0",
     "axios": "0.25.0",
     "bech32": "2.0.0",
-    "bignumber.js": "9.0.2",
+    "bignumber.js": "9.1.2",
     "humanize-number": "0.0.2",
     "qs": "^6.10.5"
   },

diff --git a/common/sdk/src/amino/bundles.amino.ts b/common/sdk/src/amino/bundles.amino.ts
@@ -1,10 +1,11 @@
 import { AminoConverters } from "@cosmjs/stargate";
 import {
-  MsgSubmitBundleProposal,
-  MsgVoteBundleProposal,
   MsgClaimUploaderRole,
   MsgSkipUploaderRole,
+  MsgSubmitBundleProposal,
+  MsgVoteBundleProposal,
 } from "@kyvejs/types/client/kyve/bundles/v1beta1/tx";
+
 import { isNotEmpty } from "../utils";
 
 export const createBundlesAminoConverters = (): AminoConverters => {

diff --git a/common/sdk/src/amino/delegation.amino.ts b/common/sdk/src/amino/delegation.amino.ts
@@ -1,10 +1,11 @@
 import { AminoConverters } from "@cosmjs/stargate";
 import {
   MsgDelegate,
-  MsgWithdrawRewards,
   MsgRedelegate,
   MsgUndelegate,
+  MsgWithdrawRewards,
 } from "@kyvejs/types/client/kyve/delegation/v1beta1/tx";
+
 import { isNotEmpty } from "../utils";
 
 export const createDelegationAminoConverters = (): AminoConverters => {

diff --git a/common/sdk/src/amino/funders.amino.ts b/common/sdk/src/amino/funders.amino.ts
@@ -0,0 +1,82 @@
+import { AminoConverters } from "@cosmjs/stargate";
+import {
+  MsgCreateFunder,
+  MsgDefundPool,
+  MsgFundPool,
+  MsgUpdateFunder,
+} from "@kyvejs/types/client/kyve/funders/v1beta1/tx";
+
+import { isNotEmpty } from "../utils";
+
+export const createFundersAminoConverters = (): AminoConverters => {
+  return {
+    "/kyve.funders.v1beta1.MsgFundPool": {
+      aminoType: "kyve/funders/MsgFundPool",
+      toAmino: (msg: MsgFundPool) => ({
+        creator: msg.creator,
+        ...(isNotEmpty(msg.pool_id) && { pool_id: msg.pool_id }),
+        ...(isNotEmpty(msg.amount) && { amount: msg.amount }),
+        ...(isNotEmpty(msg.amount_per_bundle) && {
+          amount_per_bundle: msg.amount_per_bundle,
+        }),
+      }),
+      fromAmino: (msg): MsgFundPool => ({
+        creator: msg.creator,
+        pool_id: msg.pool_id,
+        amount: msg.amount,
+        amount_per_bundle: msg.amount_per_bundle,
+      }),
+    },
+    "/kyve.funders.v1beta1.MsgDefundPool": {
+      aminoType: "kyve/funders/MsgDefundPool",
+      toAmino: (msg: MsgDefundPool) => ({
+        creator: msg.creator,
+        ...(isNotEmpty(msg.pool_id) && { id: msg.pool_id }),
+        ...(isNotEmpty(msg.amount) && { amount: msg.amount }),
+      }),
+      fromAmino: (msg): MsgDefundPool => ({
+        creator: msg.creator,
+        pool_id: msg.pool_id,
+        amount: msg.amount,
+      }),
+    },
+    "/kyve.funders.v1beta1.MsgCreateFunder": {
+      aminoType: "kyve/funders/MsgCreateFunder",
+      toAmino: (msg: MsgCreateFunder) => ({
+        creator: msg.creator,
+        ...(isNotEmpty(msg.moniker) && { moniker: msg.moniker }),
+        ...(isNotEmpty(msg.description) && { description: msg.description }),
+        ...(isNotEmpty(msg.website) && { website: msg.website }),
+        ...(isNotEmpty(msg.identity) && { identity: msg.identity }),
+        ...(isNotEmpty(msg.contact) && { contact: msg.contact }),
+      }),
+      fromAmino: (msg): MsgCreateFunder => ({
+        creator: msg.creator,
+        moniker: msg.moniker,
+        description: msg.description,
+        website: msg.website,
+        identity: msg.identity,
+        contact: msg.contact,
+      }),
+    },
+    "/kyve.funders.v1beta1.MsgUpdateFunder": {
+      aminoType: "kyve/funders/MsgUpdateFunder",
+      toAmino: (msg: MsgUpdateFunder) => ({
+        creator: msg.creator,
+        ...(isNotEmpty(msg.moniker) && { moniker: msg.moniker }),
+        ...(isNotEmpty(msg.description) && { description: msg.description }),
+        ...(isNotEmpty(msg.website) && { website: msg.website }),
+        ...(isNotEmpty(msg.identity) && { identity: msg.identity }),
+        ...(isNotEmpty(msg.contact) && { contact: msg.contact }),
+      }),
+      fromAmino: (msg): MsgUpdateFunder => ({
+        creator: msg.creator,
+        moniker: msg.moniker,
+        description: msg.description,
+        website: msg.website,
+        identity: msg.identity,
+        contact: msg.contact,
+      }),
+    },
+  };
+};
diff --git a/common/sdk/src/amino/gov.v1.amino.ts b/common/sdk/src/amino/gov.v1.amino.ts
@@ -1,5 +1,6 @@
 import { AminoConverters } from "@cosmjs/stargate";
 import { MsgVote } from "@kyvejs/types/client/cosmos/gov/v1/tx";
+
 import { isNotEmpty } from "../utils";
 
 export const createGovV1AminoConverters = (): AminoConverters => {

diff --git a/common/sdk/src/amino/index.ts b/common/sdk/src/amino/index.ts
@@ -1,5 +1,5 @@
+export * from "./bundles.amino";
+export * from "./delegation.amino";
+export * from "./funders.amino";
 export * from "./gov.v1.amino";
-export * from "./pool.amino";
 export * from "./stakers.amino";
-export * from "./delegation.amino";
-export * from "./bundles.amino";
diff --git a/common/sdk/src/amino/pool.amino.ts b/common/sdk/src/amino/pool.amino.ts
diff --git a/common/sdk/src/amino/stakers.amino.ts b/common/sdk/src/amino/stakers.amino.ts
@@ -1,13 +1,14 @@
-import { AminoConverters } from "@cosmjs/stargate";
 import { Decimal } from "@cosmjs/math";
+import { AminoConverters } from "@cosmjs/stargate";
 import {
+  MsgClaimCommissionRewards,
   MsgCreateStaker,
-  MsgUpdateMetadata,
   MsgJoinPool,
-  MsgUpdateCommission,
   MsgLeavePool,
-  MsgClaimCommissionRewards,
+  MsgUpdateCommission,
+  MsgUpdateMetadata,
 } from "@kyvejs/types/client/kyve/stakers/v1beta1/tx";
+
 import { isNotEmpty } from "../utils";
 
 function protoDecimalToJson(decimal: string): string {

diff --git a/common/sdk/src/clients/full-client.ts b/common/sdk/src/clients/full-client.ts
@@ -1,20 +1,19 @@
 import { OfflineAminoSigner } from "@cosmjs/amino/build/signer";
 import { OfflineSigner, Registry } from "@cosmjs/proto-signing";
 import { AminoTypes, GasPrice, SigningStargateClient } from "@cosmjs/stargate";
-
-import { IConfig } from "../constants";
-import * as KyveRegistryTx from "../registry/tx.registry";
-import KyveClient from "./rpc-client/client";
-import KyveWebClient from "./rpc-client/web.client";
+import { createDefaultAminoConverters } from "@cosmjs/stargate";
 
 import {
-  createPoolAminoConverters,
-  createStakersAminoConverters,
-  createDelegationAminoConverters,
   createBundlesAminoConverters,
+  createDelegationAminoConverters,
+  createFundersAminoConverters,
   createGovV1AminoConverters,
+  createStakersAminoConverters,
 } from "../amino";
-import { createDefaultAminoConverters } from "@cosmjs/stargate";
+import { IConfig } from "../constants";
+import * as KyveRegistryTx from "../registry/tx.registry";
+import KyveClient from "./rpc-client/client";
+import KyveWebClient from "./rpc-client/web.client";
 
 export async function getSigningKyveClient(
   config: IConfig,
@@ -48,7 +47,7 @@ export async function getSigningKyveClient(
       aminoTypes: new AminoTypes({
         ...createDefaultAminoConverters(),
         ...createGovV1AminoConverters(),
-        ...createPoolAminoConverters(),
+        ...createFundersAminoConverters(),
         ...createStakersAminoConverters(),
         ...createDelegationAminoConverters(),
         ...createBundlesAminoConverters(),

diff --git a/common/sdk/src/clients/lcd-client/query/v1beta1/query.ts b/common/sdk/src/clients/lcd-client/query/v1beta1/query.ts
@@ -2,12 +2,14 @@ import paginationQuery from "@kyvejs/types/client/cosmos/base/query/v1beta1/pagi
 import kyveQueryAccount from "@kyvejs/types/client/kyve/query/v1beta1/account";
 import kyveQueryBundles from "@kyvejs/types/client/kyve/query/v1beta1/bundles";
 import kyveQueryDelegation from "@kyvejs/types/client/kyve/query/v1beta1/delegation";
+import kyveQueryFunders from "@kyvejs/types/client/kyve/query/v1beta1/funders";
 import kyveQueryParamsRes from "@kyvejs/types/client/kyve/query/v1beta1/params";
 import kyveQueryPools from "@kyvejs/types/client/kyve/query/v1beta1/pools";
 import kyveQueryStakers from "@kyvejs/types/client/kyve/query/v1beta1/stakers";
 import kyveQueryAccountRes from "@kyvejs/types/lcd/kyve/query/v1beta1/account";
 import kyveQueryBundlesRes from "@kyvejs/types/lcd/kyve/query/v1beta1/bundles";
 import kyveQueryDelegationRes from "@kyvejs/types/lcd/kyve/query/v1beta1/delegation";
+import kyveQueryFundersRes from "@kyvejs/types/lcd/kyve/query/v1beta1/funders";
 import kyveQueryPoolsRes from "@kyvejs/types/lcd/kyve/query/v1beta1/pools";
 import kyveQueryStakersRes from "@kyvejs/types/lcd/kyve/query/v1beta1/stakers";
 
@@ -249,4 +251,49 @@ export class KyveRegistryLCDClient extends AbstractKyveLCDClient {
     return await this.request(endpoint);
   }
   /** End Account **/
+
+  /** Funders **/
+  async funder(
+    params: kyveQueryFunders.QueryFunderRequest
+  ): Promise<kyveQueryFundersRes.QueryFunderResponse> {
+    const endpoint = `/kyve/query/v1beta1/funder/${params.address}`;
+    return await this.request(endpoint);
+  }
+
+  async funders(
+    params?: PaginationAllPartialRequestUtilType<kyveQueryFunders.QueryFundersRequest>
+  ): Promise<
+    PaginationResponseTypeUtil<kyveQueryFundersRes.QueryFundersResponse>
+  > {
+    const parameters: Record<string, any> = {};
+    if (typeof params?.pagination !== "undefined") {
+      parameters.pagination = params.pagination;
+    }
+
+    if (typeof params?.search !== "undefined") {
+      parameters.search = params.search;
+    }
+
+    const endpoint = `/kyve/query/v1beta1/funders`;
+    return await this.request(endpoint, parameters);
+  }
+
+  async fundings_by_funder(
+    params: PaginationPartialRequestUtilType<kyveQueryFunders.QueryFundingsByFunderRequest>
+  ): Promise<
+    PaginationResponseTypeUtil<kyveQueryFundersRes.QueryFundingsByFunderResponse>
+  > {
+    const endpoint = `/kyve/query/v1beta1/fundings_by_funder/${params.address}`;
+    return await this.request(endpoint, params);
+  }
+
+  async fundings_by_pool(
+    params: PaginationPartialRequestUtilType<kyveQueryFunders.QueryFundingsByPoolRequest>
+  ): Promise<
+    PaginationResponseTypeUtil<kyveQueryFundersRes.QueryFundingsByPoolResponse>
+  > {
+    const endpoint = `/kyve/query/v1beta1/fundings_by_pool/${params.pool_id}`;
+    return await this.request(endpoint, params);
+  }
+  /** EndFunders **/
 }
diff --git a/common/sdk/src/clients/rpc-client/client.ts b/common/sdk/src/clients/rpc-client/client.ts
@@ -7,8 +7,8 @@ import { IConfig } from "../../constants";
 import KyveBaseMethods from "./kyve/base/v1beta1/base";
 import KyveBundlesMethods from "./kyve/bundles/v1beta1/bundles";
 import KyveDelegationMethods from "./kyve/delegation/v1beta1/delegation";
+import KyveFundersMethods from "./kyve/funders/v1beta1/funders";
 import KyveGovMethodsV1 from "./kyve/gov/v1/gov";
-import KyvePoolMethods from "./kyve/pool/v1beta1/pool";
 import KyveStakersMethods from "./kyve/stakers/v1beta1/stakers";
 
 export default class KyveClient {
@@ -28,8 +28,8 @@ export default class KyveClient {
     delegation: {
       v1beta1: KyveDelegationMethods;
     };
-    pool: {
-      v1beta1: KyvePoolMethods;
+    funders: {
+      v1beta1: KyveFundersMethods;
     };
     stakers: {
       v1beta1: KyveStakersMethods;
@@ -68,8 +68,12 @@ export default class KyveClient {
       gov: {
         v1: new KyveGovMethodsV1(this.nativeClient, this.account, config),
       },
-      pool: {
-        v1beta1: new KyvePoolMethods(this.nativeClient, this.account, config),
+      funders: {
+        v1beta1: new KyveFundersMethods(
+          this.nativeClient,
+          this.account,
+          config
+        ),
       },
       stakers: {
         v1beta1: new KyveStakersMethods(