Merge branch 'main' into noah/use-interfaces-option

hyperweb-io · Nov 10, 2023 · 0c52f67 · 0c52f67
2 parents bbb900d + 6a08da7
commit 0c52f67
Show file tree

Hide file tree

Showing 213 changed files with 1,249 additions and 1,265 deletions.
diff --git a/__fixtures__/output1/cosmos/authz/v1beta1/tx.amino.ts b/__fixtures__/output1/cosmos/authz/v1beta1/tx.amino.ts
@@ -1,7 +1,6 @@
 import { Grant, GrantSDKType } from "./authz";
 import { Any, AnySDKType } from "../../../google/protobuf/any";
 import { AminoMsg } from "@cosmjs/amino";
-import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp";
 import { MsgGrant, MsgGrantSDKType, MsgExec, MsgExecSDKType, MsgRevoke, MsgRevokeSDKType } from "./tx";
 export interface MsgGrantAminoType extends AminoMsg {
   type: "cosmos-sdk/MsgGrant";
@@ -13,10 +12,7 @@ export interface MsgGrantAminoType extends AminoMsg {
         type_url: string;
         value: Uint8Array;
       };
-      expiration: {
-        seconds: string;
-        nanos: number;
-      };
+      expiration: string;
     };
   };
 }

diff --git a/__fixtures__/output1/cosmos/group/v1/tx.amino.ts b/__fixtures__/output1/cosmos/group/v1/tx.amino.ts
@@ -2,7 +2,6 @@ import { Member, MemberSDKType, VoteOption, VoteOptionSDKType, voteOptionFromJSO
 import { Any, AnySDKType } from "../../../google/protobuf/any";
 import { AminoMsg } from "@cosmjs/amino";
 import { Long } from "../../../helpers";
-import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp";
 import { execFromJSON, MsgCreateGroup, MsgCreateGroupSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicySDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicySDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataSDKType, MsgSubmitProposal, MsgSubmitProposalSDKType, MsgWithdrawProposal, MsgWithdrawProposalSDKType, MsgVote, MsgVoteSDKType, MsgExec, MsgExecSDKType, MsgLeaveGroup, MsgLeaveGroupSDKType } from "./tx";
 export interface MsgCreateGroupAminoType extends AminoMsg {
   type: "cosmos-sdk/MsgCreateGroup";
@@ -12,10 +11,7 @@ export interface MsgCreateGroupAminoType extends AminoMsg {
       address: string;
       weight: string;
       metadata: string;
-      added_at: {
-        seconds: string;
-        nanos: number;
-      };
+      added_at: string;
     }[];
     metadata: string;
   };
@@ -29,10 +25,7 @@ export interface MsgUpdateGroupMembersAminoType extends AminoMsg {
       address: string;
       weight: string;
       metadata: string;
-      added_at: {
-        seconds: string;
-        nanos: number;
-      };
+      added_at: string;
     }[];
   };
 }
@@ -72,10 +65,7 @@ export interface MsgCreateGroupWithPolicyAminoType extends AminoMsg {
       address: string;
       weight: string;
       metadata: string;
-      added_at: {
-        seconds: string;
-        nanos: number;
-      };
+      added_at: string;
     }[];
     group_metadata: string;
     group_policy_metadata: string;

diff --git a/__fixtures__/output1/cosmos/upgrade/v1beta1/tx.amino.ts b/__fixtures__/output1/cosmos/upgrade/v1beta1/tx.amino.ts
@@ -1,7 +1,6 @@
 import { Plan, PlanSDKType } from "./upgrade";
 import { AminoMsg } from "@cosmjs/amino";
 import { Long } from "../../../helpers";
-import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp";
 import { Any, AnySDKType } from "../../../google/protobuf/any";
 import { MsgSoftwareUpgrade, MsgSoftwareUpgradeSDKType, MsgCancelUpgrade, MsgCancelUpgradeSDKType } from "./tx";
 export interface MsgSoftwareUpgradeAminoType extends AminoMsg {
@@ -10,10 +9,7 @@ export interface MsgSoftwareUpgradeAminoType extends AminoMsg {
     authority: string;
     plan: {
       name: string;
-      time: {
-        seconds: string;
-        nanos: number;
-      };
+      time: string;
       height: string;
       info: string;
       upgraded_client_state: {

diff --git a/__fixtures__/output1/evmos/vesting/v1/tx.amino.ts b/__fixtures__/output1/evmos/vesting/v1/tx.amino.ts
@@ -9,10 +9,7 @@ export interface MsgCreateClawbackVestingAccountAminoType extends AminoMsg {
   value: {
     from_address: string;
     to_address: string;
-    start_time: {
-      seconds: string;
-      nanos: number;
-    };
+    start_time: string;
     lockup_periods: {
       length: string;
       amount: {

diff --git a/__fixtures__/output1/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts b/__fixtures__/output1/osmosis/gamm/pool-models/balancer/tx/tx.amino.ts
@@ -2,7 +2,6 @@
 import { PoolParams, PoolParamsSDKType, PoolAsset, PoolAssetSDKType, SmoothWeightChangeParams, SmoothWeightChangeParamsSDKType } from "../balancerPool";
 import { AminoMsg } from "@cosmjs/amino";
 import { Long } from "../../../../../helpers";
-import { Timestamp, TimestampSDKType } from "../../../../../google/protobuf/timestamp";
 import { Duration, DurationSDKType } from "../../../../../google/protobuf/duration";
 import { Coin, CoinSDKType } from "../../../../../cosmos/base/v1beta1/coin";
 import { MsgCreateBalancerPool, MsgCreateBalancerPoolSDKType } from "./tx";
@@ -14,10 +13,7 @@ export interface MsgCreateBalancerPoolAminoType extends AminoMsg {
       swap_fee: string;
       exit_fee: string;
       smooth_weight_change_params: {
-        start_time: {
-          seconds: string;
-          nanos: number;
-        };
+        start_time: string;
         duration: {
           seconds: string;
           nanos: number;

diff --git a/__fixtures__/output1/osmosis/incentives/tx.amino.ts b/__fixtures__/output1/osmosis/incentives/tx.amino.ts
@@ -18,19 +18,13 @@ export interface MsgCreateGaugeAminoType extends AminoMsg {
         seconds: string;
         nanos: number;
       };
-      timestamp: {
-        seconds: string;
-        nanos: number;
-      };
+      timestamp: string;
     };
     coins: {
       denom: string;
       amount: string;
     }[];
-    start_time: {
-      seconds: string;
-      nanos: number;
-    };
+    start_time: string;
     num_epochs_paid_over: string;
   };
 }

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts
@@ -252,13 +252,13 @@ export const Grant = {
   fromAmino(object: GrantAmino): Grant {
     return {
       authorization: object?.authorization ? Any.fromAmino(object.authorization) : undefined,
-      expiration: object?.expiration
+      expiration: object?.expiration ? fromTimestamp(Timestamp.fromAmino(object.expiration)) : undefined
     };
   },
   toAmino(message: Grant): GrantAmino {
     const obj: any = {};
     obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined;
-    obj.expiration = message.expiration;
+    obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined;
     return obj;
   },
   fromAminoMsg(object: GrantAminoMsg): Grant {
@@ -387,15 +387,15 @@ export const GrantAuthorization = {
       granter: object.granter,
       grantee: object.grantee,
       authorization: object?.authorization ? Any.fromAmino(object.authorization) : undefined,
-      expiration: object?.expiration
+      expiration: object?.expiration ? fromTimestamp(Timestamp.fromAmino(object.expiration)) : undefined
     };
   },
   toAmino(message: GrantAuthorization): GrantAuthorizationAmino {
     const obj: any = {};
     obj.granter = message.granter;
     obj.grantee = message.grantee;
     obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined;
-    obj.expiration = message.expiration;
+    obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined;
     return obj;
   },
   fromAminoMsg(object: GrantAuthorizationAminoMsg): GrantAuthorization {

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.amino.ts
@@ -1,7 +1,6 @@
 import { Grant, GrantSDKType } from "./authz";
 import { Any, AnySDKType } from "../../../google/protobuf/any";
 import { AminoMsg } from "@cosmjs/amino";
-import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp";
 import { MsgGrant, MsgGrantSDKType, MsgExec, MsgExecSDKType, MsgRevoke, MsgRevokeSDKType } from "./tx";
 export interface MsgGrantAminoType extends AminoMsg {
   type: "cosmos-sdk/MsgGrant";
@@ -13,10 +12,7 @@ export interface MsgGrantAminoType extends AminoMsg {
         type_url: string;
         value: Uint8Array;
       };
-      expiration: {
-        seconds: string;
-        nanos: number;
-      };
+      expiration: string;
     };
   };
 }

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts
@@ -128,15 +128,15 @@ export const Equivocation = {
   fromAmino(object: EquivocationAmino): Equivocation {
     return {
       height: BigInt(object.height),
-      time: object.time,
+      time: object?.time ? fromTimestamp(Timestamp.fromAmino(object.time)) : undefined,
       power: BigInt(object.power),
       consensusAddress: object.consensus_address
     };
   },
   toAmino(message: Equivocation): EquivocationAmino {
     const obj: any = {};
     obj.height = message.height ? message.height.toString() : undefined;
-    obj.time = message.time;
+    obj.time = message.time ? Timestamp.toAmino(toTimestamp(message.time)) : undefined;
     obj.power = message.power ? message.power.toString() : undefined;
     obj.consensus_address = message.consensusAddress;
     return obj;

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts
@@ -191,7 +191,7 @@ export const BasicAllowance = {
   fromAmino(object: BasicAllowanceAmino): BasicAllowance {
     return {
       spendLimit: Array.isArray(object?.spend_limit) ? object.spend_limit.map((e: any) => Coin.fromAmino(e)) : [],
-      expiration: object?.expiration
+      expiration: object?.expiration ? fromTimestamp(Timestamp.fromAmino(object.expiration)) : undefined
     };
   },
   toAmino(message: BasicAllowance): BasicAllowanceAmino {
@@ -201,7 +201,7 @@ export const BasicAllowance = {
     } else {
       obj.spend_limit = [];
     }
-    obj.expiration = message.expiration;
+    obj.expiration = message.expiration ? Timestamp.toAmino(toTimestamp(message.expiration)) : undefined;
     return obj;
   },
   fromAminoMsg(object: BasicAllowanceAminoMsg): BasicAllowance {
@@ -360,7 +360,7 @@ export const PeriodicAllowance = {
       period: object?.period ? Duration.fromAmino(object.period) : undefined,
       periodSpendLimit: Array.isArray(object?.period_spend_limit) ? object.period_spend_limit.map((e: any) => Coin.fromAmino(e)) : [],
       periodCanSpend: Array.isArray(object?.period_can_spend) ? object.period_can_spend.map((e: any) => Coin.fromAmino(e)) : [],
-      periodReset: object.period_reset
+      periodReset: object?.period_reset ? fromTimestamp(Timestamp.fromAmino(object.period_reset)) : undefined
     };
   },
   toAmino(message: PeriodicAllowance): PeriodicAllowanceAmino {
@@ -377,7 +377,7 @@ export const PeriodicAllowance = {
     } else {
       obj.period_can_spend = [];
     }
-    obj.period_reset = message.periodReset;
+    obj.period_reset = message.periodReset ? Timestamp.toAmino(toTimestamp(message.periodReset)) : undefined;
     return obj;
   },
   fromAminoMsg(object: PeriodicAllowanceAminoMsg): PeriodicAllowance {

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts
@@ -749,11 +749,11 @@ export const Proposal = {
       messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [],
       status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1,
       finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined,
-      submitTime: object?.submit_time,
-      depositEndTime: object?.deposit_end_time,
+      submitTime: object?.submit_time ? fromTimestamp(Timestamp.fromAmino(object.submit_time)) : undefined,
+      depositEndTime: object?.deposit_end_time ? fromTimestamp(Timestamp.fromAmino(object.deposit_end_time)) : undefined,
       totalDeposit: Array.isArray(object?.total_deposit) ? object.total_deposit.map((e: any) => Coin.fromAmino(e)) : [],
-      votingStartTime: object?.voting_start_time,
-      votingEndTime: object?.voting_end_time,
+      votingStartTime: object?.voting_start_time ? fromTimestamp(Timestamp.fromAmino(object.voting_start_time)) : undefined,
+      votingEndTime: object?.voting_end_time ? fromTimestamp(Timestamp.fromAmino(object.voting_end_time)) : undefined,
       metadata: object.metadata
     };
   },
@@ -767,15 +767,15 @@ export const Proposal = {
     }
     obj.status = message.status;
     obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined;
-    obj.submit_time = message.submitTime;
-    obj.deposit_end_time = message.depositEndTime;
+    obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined;
+    obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined;
     if (message.totalDeposit) {
       obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined);
     } else {
       obj.total_deposit = [];
     }
-    obj.voting_start_time = message.votingStartTime;
-    obj.voting_end_time = message.votingEndTime;
+    obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined;
+    obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined;
     obj.metadata = message.metadata;
     return obj;
   },

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts
@@ -868,11 +868,11 @@ export const Proposal = {
       content: object?.content ? Any.fromAmino(object.content) : undefined,
       status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1,
       finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined,
-      submitTime: object.submit_time,
-      depositEndTime: object.deposit_end_time,
+      submitTime: object?.submit_time ? fromTimestamp(Timestamp.fromAmino(object.submit_time)) : undefined,
+      depositEndTime: object?.deposit_end_time ? fromTimestamp(Timestamp.fromAmino(object.deposit_end_time)) : undefined,
       totalDeposit: Array.isArray(object?.total_deposit) ? object.total_deposit.map((e: any) => Coin.fromAmino(e)) : [],
-      votingStartTime: object.voting_start_time,
-      votingEndTime: object.voting_end_time
+      votingStartTime: object?.voting_start_time ? fromTimestamp(Timestamp.fromAmino(object.voting_start_time)) : undefined,
+      votingEndTime: object?.voting_end_time ? fromTimestamp(Timestamp.fromAmino(object.voting_end_time)) : undefined
     };
   },
   toAmino(message: Proposal): ProposalAmino {
@@ -881,15 +881,15 @@ export const Proposal = {
     obj.content = message.content ? Any.toAmino(message.content) : undefined;
     obj.status = message.status;
     obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined;
-    obj.submit_time = message.submitTime;
-    obj.deposit_end_time = message.depositEndTime;
+    obj.submit_time = message.submitTime ? Timestamp.toAmino(toTimestamp(message.submitTime)) : undefined;
+    obj.deposit_end_time = message.depositEndTime ? Timestamp.toAmino(toTimestamp(message.depositEndTime)) : undefined;
     if (message.totalDeposit) {
       obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined);
     } else {
       obj.total_deposit = [];
     }
-    obj.voting_start_time = message.votingStartTime;
-    obj.voting_end_time = message.votingEndTime;
+    obj.voting_start_time = message.votingStartTime ? Timestamp.toAmino(toTimestamp(message.votingStartTime)) : undefined;
+    obj.voting_end_time = message.votingEndTime ? Timestamp.toAmino(toTimestamp(message.votingEndTime)) : undefined;
     return obj;
   },
   fromAminoMsg(object: ProposalAminoMsg): Proposal {

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.amino.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.amino.ts
@@ -1,7 +1,6 @@
 import { Member, MemberSDKType, VoteOption, VoteOptionSDKType, voteOptionFromJSON } from "./types";
 import { Any, AnySDKType } from "../../../google/protobuf/any";
 import { AminoMsg } from "@cosmjs/amino";
-import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp";
 import { execFromJSON, MsgCreateGroup, MsgCreateGroupSDKType, MsgUpdateGroupMembers, MsgUpdateGroupMembersSDKType, MsgUpdateGroupAdmin, MsgUpdateGroupAdminSDKType, MsgUpdateGroupMetadata, MsgUpdateGroupMetadataSDKType, MsgCreateGroupPolicy, MsgCreateGroupPolicySDKType, MsgCreateGroupWithPolicy, MsgCreateGroupWithPolicySDKType, MsgUpdateGroupPolicyAdmin, MsgUpdateGroupPolicyAdminSDKType, MsgUpdateGroupPolicyDecisionPolicy, MsgUpdateGroupPolicyDecisionPolicySDKType, MsgUpdateGroupPolicyMetadata, MsgUpdateGroupPolicyMetadataSDKType, MsgSubmitProposal, MsgSubmitProposalSDKType, MsgWithdrawProposal, MsgWithdrawProposalSDKType, MsgVote, MsgVoteSDKType, MsgExec, MsgExecSDKType, MsgLeaveGroup, MsgLeaveGroupSDKType } from "./tx";
 export interface MsgCreateGroupAminoType extends AminoMsg {
   type: "cosmos-sdk/MsgCreateGroup";
@@ -11,10 +10,7 @@ export interface MsgCreateGroupAminoType extends AminoMsg {
       address: string;
       weight: string;
       metadata: string;
-      added_at: {
-        seconds: string;
-        nanos: number;
-      };
+      added_at: string;
     }[];
     metadata: string;
   };
@@ -28,10 +24,7 @@ export interface MsgUpdateGroupMembersAminoType extends AminoMsg {
       address: string;
       weight: string;
       metadata: string;
-      added_at: {
-        seconds: string;
-        nanos: number;
-      };
+      added_at: string;
     }[];
   };
 }
@@ -71,10 +64,7 @@ export interface MsgCreateGroupWithPolicyAminoType extends AminoMsg {
       address: string;
       weight: string;
       metadata: string;
-      added_at: {
-        seconds: string;
-        nanos: number;
-      };
+      added_at: string;
     }[];
     group_metadata: string;
     group_policy_metadata: string;