feat: new proto files, add token credit transfer, add liquid staking …

…tests

__tests__/flows/claims.ts

@@ -48,6 +48,24 @@ export const claimsBasic = () =>
     //   ])
     // );
 
+    // Create relayer node entity first
+    let relayerNodeEntity = "";
+    testMsg("/ixo.entity.v1beta1.MsgCreateEntity protocol", async () => {
+      const res = await Entity.CreateEntity(
+        "dao",
+        undefined,
+        "",
+        WalletUsers.charlie
+      );
+      relayerNodeEntity = utils.common.getValueFromEvents(
+        res,
+        "wasm",
+        "token_id"
+      );
+      console.log({ relayerNodeEntity });
+      return res;
+    });
+
     // Create protocol
     let protocol = "did:ixo:entity:065ba0b99948e2e8ff3228836dee423b";
     let adminAccount = "ixo14p4eh3hvunmlvegyysfp5lg8gf6cp6suxxx672";
@@ -56,7 +74,7 @@ export const claimsBasic = () =>
       const res = await Entity.CreateEntity(
         "protocol",
         undefined,
-        "",
+        relayerNodeEntity,
         WalletUsers.charlie
       );
       protocol = utils.common.getValueFromEvents(res, "wasm", "token_id");

__tests__/flows/liquidStaking.ts

@@ -1,22 +1,7 @@
-import {
-  chunkArray,
-  generateNewWallet,
-  getFileFromPath,
-  getUser,
-  queryClient,
-  saveFileToPath,
-  sendFromFaucet,
-  testMsg,
-  timeout,
-} from "../helpers/common";
+import { testMsg, timeout } from "../helpers/common";
 import * as Cosmos from "../modules/Cosmos";
 import * as LiquidStake from "../modules/LiquidStake";
-import { WalletUsers } from "../helpers/constants";
-// @ts-ignore
-import Long from "long";
-import { Grant } from "../../src/codegen/cosmos/feegrant/v1beta1/feegrant";
-import { createRegistry, utils } from "../../src";
-import { fromTimestamp } from "../../src/codegen/helpers";
+import { utils } from "../../src";
 
 export const prepareModuleWithProposals = () =>
   describe("Preparing Liquid Stake Module with proposals", () => {
@@ -40,17 +25,25 @@ export const prepareModuleWithProposals = () =>
       async () => {
         // wait for proposal to pass
         await timeout(1000 * 100);
-        const res = await LiquidStake.MsgUpdateLiquidStakeWhitelist();
-        await timeout(1000 * 10);
+        const res = await LiquidStake.MsgUpdateWhitelistedValidators();
         return res;
       }
     );
 
+    // Third update weighted rewards receivers
+    testMsg("/ixo.liquidstake.v1beta1.MsgUpdateWeightedRewardsReceivers", () =>
+      LiquidStake.MsgUpdateWeightedRewardsReceivers()
+    );
+
     testMsg("/ixo.liquidstake.v1beta1.MsgLiquidStake", () =>
       LiquidStake.MsgLiquidStake("10000000000")
     );
 
     testMsg("/ixo.liquidstake.v1beta1.MsgLiquidUnstake", () =>
       LiquidStake.MsgLiquidUnstake("1000000000")
     );
+
+    testMsg("/cosmos.bank.v1beta1.MsgSend", () =>
+      LiquidStake.BankSendZeroTrx(1000000000)
+    );
   });

__tests__/flows/smartaccount.ts

@@ -2,7 +2,7 @@ import { testMsg } from "../helpers/common";
 import * as Smartaccount from "../modules/Smartaccount";
 
 export const smartaccountBasic = () =>
-  describe("Testing the cosmos bank module", () => {
+  describe("Testing the ixo smartaccount module", () => {
     testMsg("/ixo.smartaccount.v1beta1.MsgAddAuthenticator", async () =>
       Smartaccount.MsgAddAuthenticator()
     );

__tests__/flows/tokens.ts

@@ -104,6 +104,15 @@ export const tokenBasic = () =>
       ])
     );
 
+    testMsg("/ixo.token.v1beta1.MsgTransferCredit", () =>
+      Token.TransferCredit([
+        {
+          id: tokenId,
+          amount: 1,
+        },
+      ])
+    );
+
     // testMsg("/ixo.token.v1beta1.MsgPauseToken", () =>
     //   Token.PauseToken(contractAddress1155, false)
     // );

__tests__/index.spec.ts

@@ -37,6 +37,7 @@ IID.generateBlockchainTestUsers();
 // Claims.claimsBasic();
 // CosmWasm.daoCore();
 // Smartaccount.smartaccountBasic();
+// LiquidStake.prepareModuleWithProposals();
 // Cosmos.sendTokens();
 // IID.iidAddEdKeys();
 // Bonds.bondsSellsDisabled();
@@ -71,8 +72,7 @@ IID.generateBlockchainTestUsers();
 // Cosmos.authzBasic();
 // Cosmos.textProposalBasic();
 // Authz.authzBasic();
-// LiquidStake.prepareModuleWithProposals();
-CosmWasm.daoCore2();
+// CosmWasm.daoCore2();
 // Claims.supamotoClaims3();
 // Queries.quickQueries();
 // web3Storage();

__tests__/modules/Cosmos.ts

@@ -488,18 +488,19 @@ export const MsgSubmitProposalUpdateParams = async () => {
   const account = (await tester.getAccounts())[0];
   const myAddress = account.address;
 
-  // const subspace = "mint";
-  // const key = "ImpactRewardsReceivers";
+  const subspace = "mint";
+  const key = "EpochIdentifier";
+  const value = JSON.stringify("hour");
   // const value = JSON.stringify([
   //   { address: "ixo1jtlkhddkfvzu4p2vl4dvlszzkqvlthghee44jz", weight: "0.5" },
   //   { address: "ixo1ruwxxfsp6jgdk88fmyzyp7s3hs20vqmg5f3htp", weight: "0.5" },
   // ]);
 
-  const subspace = "smartaccount";
-  // const key = "IsSmartAccountActive";
-  // const value = JSON.stringify(false);
-  const key = "CircuitBreakerControllers";
-  const value = JSON.stringify(["ixo1jtlkhddkfvzu4p2vl4dvlszzkqvlthghee44jz"]);
+  // const subspace = "smartaccount";
+  // // const key = "IsSmartAccountActive";
+  // // const value = JSON.stringify(false);
+  // const key = "CircuitBreakerControllers";
+  // const value = JSON.stringify(["ixo1jtlkhddkfvzu4p2vl4dvlszzkqvlthghee44jz"]);
 
   const message = {
     typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal",

__tests__/modules/LiquidStake.ts

@@ -4,8 +4,6 @@ import {
   getUser,
   cosmos,
   queryClient,
-  cosmwasm,
-  getFileFromPath,
   ixo,
 } from "../helpers/common";
 
@@ -46,10 +44,11 @@ export const MsgSubmitProposalUpdateLiquidStakeParams = async () => {
             ixo.liquidstake.v1beta1.MsgUpdateParams.fromPartial({
               authority: govModAcc,
               params: ixo.liquidstake.v1beta1.Params.fromPartial({
-                unstakeFeeRate: "0",
-                autocompoundFeeRate: "0",
+                unstakeFeeRate: "100000000000000000",
+                autocompoundFeeRate: "100000000000000000",
                 minLiquidStakeAmount: "10000",
-                feeAccountAddress: myAddress,
+                feeAccountAddress:
+                  "ixo1w2q3mashs2k4wcpqzs5q5xewnhnnr7wslr34safzvwqzvuqh3gjq7yprry",
                 whitelistAdminAddress: myAddress,
                 // unchanged but cant be blank
                 liquidBondDenom: "uixo",
@@ -69,7 +68,7 @@ export const MsgSubmitProposalUpdateLiquidStakeParams = async () => {
   return response;
 };
 
-export const MsgUpdateLiquidStakeWhitelist = async () => {
+export const MsgUpdateWhitelistedValidators = async () => {
   const client = await createClient();
 
   const tester = getUser();
@@ -82,7 +81,7 @@ export const MsgUpdateLiquidStakeWhitelist = async () => {
       authority: myAddress,
       whitelistedValidators: [
         {
-          // addrss of the validator for local chain spinup
+          // address of the validator for local chain spinup
           validatorAddress: "ixovaloper1n8yrmeatsk74dw0zs95ess9sgzptd6thzncf20",
           targetWeight: "10000",
         },
@@ -98,6 +97,35 @@ export const MsgUpdateLiquidStakeWhitelist = async () => {
   return response;
 };
 
+export const MsgUpdateWeightedRewardsReceivers = async () => {
+  const client = await createClient();
+
+  const tester = getUser();
+  const account = (await tester.getAccounts())[0];
+  const myAddress = account.address;
+
+  const message = {
+    typeUrl: "/ixo.liquidstake.v1beta1.MsgUpdateWeightedRewardsReceivers",
+    value:
+      ixo.liquidstake.v1beta1.MsgUpdateWeightedRewardsReceivers.fromPartial({
+        authority: myAddress,
+        weightedRewardsReceivers: [
+          ixo.liquidstake.v1beta1.WeightedAddress.fromPartial({
+            address: "ixo1ym5uxusc7z3d93em0hf8dulmrjagg8tghaqhup",
+            weight: "100000000000000000",
+          }),
+        ],
+      }),
+  };
+
+  const response = await client.signAndBroadcast(
+    myAddress,
+    [message],
+    getFee(1, await client.simulate(myAddress, [message], undefined))
+  );
+  return response;
+};
+
 export const MsgLiquidStake = async (amount = "10000000000") => {
   const client = await createClient();
 
@@ -149,3 +177,35 @@ export const MsgLiquidUnstake = async (amount = "10000000000") => {
   );
   return response;
 };
+
+export const BankSendZeroTrx = async (
+  amount = Math.pow(10, 10),
+  fromUser = WalletUsers.tester,
+  toUser = WalletUsers.bob
+) => {
+  const client = await createClient(getUser(fromUser));
+
+  const fromAddress = (await getUser(fromUser).getAccounts())[0].address;
+  const toAddress = (await getUser(toUser).getAccounts())[0].address;
+
+  const message = {
+    typeUrl: "/cosmos.bank.v1beta1.MsgSend",
+    value: cosmos.bank.v1beta1.MsgSend.fromPartial({
+      fromAddress,
+      toAddress,
+      amount: [
+        cosmos.base.v1beta1.Coin.fromPartial({
+          amount: amount.toString(),
+          denom: "uzero",
+        }),
+      ],
+    }),
+  };
+
+  const response = await client.signAndBroadcast(
+    fromAddress,
+    [message],
+    getFee(1, await client.simulate(fromAddress, [message], undefined))
+  );
+  return response as any;
+};

__tests__/modules/Token.ts

@@ -164,6 +164,36 @@ export const RetireToken = async (
   return response;
 };
 
+export const TransferCredit = async (
+  tokens: {
+    id: string;
+    amount: number;
+  }[]
+) => {
+  const client = await createClient();
+
+  const tester = (await getUser(WalletUsers.tester).getAccounts())[0].address;
+
+  const message = {
+    typeUrl: "/ixo.token.v1beta1.MsgTransferCredit",
+    value: ixo.token.v1beta1.MsgTransferCredit.fromPartial({
+      owner: tester,
+      reason: "reason",
+      jurisdiction: "jurisdiction",
+      tokens: tokens.map((b) =>
+        ixo.token.v1beta1.TokenBatch.fromPartial({
+          id: b.id,
+          amount: b.amount.toString(),
+        })
+      ),
+      authorizationId: "authorizationId",
+    }),
+  };
+
+  const response = await client.signAndBroadcast(tester, [message], fee);
+  return response;
+};
+
 export const PauseToken = async (contractAddress: string, paused: boolean) => {
   const client = await createClient();
 

__tests__/setup/constants.ts

@@ -36,12 +36,14 @@ export const dids = {
   ai4gCollection: "",
   didOracle: "",
   aquaminerCollection: "did:ixo:entity:323dd1f9999c20142789010dae287a65",
+  fairClimateCollection: "",
 };
 
 export const adminEntityAccounts = {
   assetCollection: "ixo19e74tjy6gdwt0hjj6ph6xgtjhuulgqkzk8xaj4",
   legacyCollection: "ixo1kaluffrp0ncy3dlrerla3nd8v6zxwzmega3v7g",
   ai4gCollection: "",
+  fairClimateCollection: "",
 };
 
 // export const EcsCredentialsWorkerUrl = "http://localhost:3000/";

proto/ixo/bonds/v1beta1/bonds.proto

@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v4/x/bonds/types";
 
 // FunctionParam is a key-value pair used for specifying a specific bond
 // parameter.
@@ -39,11 +39,11 @@ message Bond {
   string description = 3;
   string creator_did = 4 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v4/x/iid/types.DIDFragment"
   ];
   string controller_did = 5 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v4/x/iid/types.DIDFragment"
   ];
   string function_type = 6;
   repeated FunctionParam function_parameters = 7 [
@@ -108,7 +108,7 @@ message Bond {
   string bond_did = 27;
   string oracle_did = 28 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v4/x/iid/types.DIDFragment"
   ];
 }
 
@@ -117,7 +117,7 @@ message Bond {
 message BaseOrder {
   string account_did = 1 [
     (gogoproto.casttype) =
-        "github.com/ixofoundation/ixo-blockchain/v3/x/iid/types.DIDFragment"
+        "github.com/ixofoundation/ixo-blockchain/v4/x/iid/types.DIDFragment"
   ];
   cosmos.base.v1beta1.Coin amount = 2 [ (gogoproto.nullable) = false ];
   bool cancelled = 3;

proto/ixo/bonds/v1beta1/event.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package ixo.bonds.v1beta1;
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v4/x/bonds/types";
 
 import "gogoproto/gogo.proto";
 import "ixo/bonds/v1beta1/bonds.proto";

proto/ixo/bonds/v1beta1/genesis.proto

@@ -4,7 +4,7 @@ package ixo.bonds.v1beta1;
 import "gogoproto/gogo.proto";
 import "ixo/bonds/v1beta1/bonds.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v4/x/bonds/types";
 
 // GenesisState defines the bonds module's genesis state.
 message GenesisState {

proto/ixo/bonds/v1beta1/query.proto

@@ -7,7 +7,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "cosmos_proto/cosmos.proto";
 import "ixo/bonds/v1beta1/bonds.proto";
 
-option go_package = "github.com/ixofoundation/ixo-blockchain/v3/x/bonds/types";
+option go_package = "github.com/ixofoundation/ixo-blockchain/v4/x/bonds/types";
 
 // Query defines the gRPC querier service.
 service Query {