Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/amino interfaces #286

Merged
merged 3 commits into from
Jan 1, 2023
Merged

Fix/amino interfaces #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7685732
proto and amino fixes
pyramation Jan 1, 2023
59c7f29
snaps
pyramation Jan 1, 2023
d91569b
fixtures
pyramation Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions __fixtures__/outputv2/cosmos/auth/v1beta1/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,7 @@ export const AccountI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/BaseAccount":
return Any.fromPartial({
typeUrl: "/cosmos.auth.v1beta1.BaseAccount",
value: BaseAccount.encode(BaseAccount.fromPartial((content.value as DeepPartial<BaseAccount>))).finish()
value: BaseAccount.encode(BaseAccount.fromPartial(BaseAccount.fromAmino(content.value))).finish()
});

default:
Expand Down Expand Up @@ -1945,7 +1945,7 @@ export const ModuleAccountI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/ModuleAccount":
return Any.fromPartial({
typeUrl: "/cosmos.auth.v1beta1.ModuleAccount",
value: ModuleAccount.encode(ModuleAccount.fromPartial((content.value as DeepPartial<ModuleAccount>))).finish()
value: ModuleAccount.encode(ModuleAccount.fromPartial(ModuleAccount.fromAmino(content.value))).finish()
});

default:
Expand Down
10 changes: 5 additions & 5 deletions __fixtures__/outputv2/cosmos/authz/v1beta1/authz.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,31 +715,31 @@ export const Authorization_FromAmino = (content: AnyAmino) => {
case "/akash.deployment.v1beta1.DepositDeploymentAuthorization":
return Any.fromPartial({
typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization",
value: DepositDeploymentAuthorization1.encode(DepositDeploymentAuthorization1.fromPartial((content.value as DeepPartial<DepositDeploymentAuthorization1>))).finish()
value: DepositDeploymentAuthorization1.encode(DepositDeploymentAuthorization1.fromPartial(DepositDeploymentAuthorization1.fromAmino(content.value))).finish()
});

case "/akash.deployment.v1beta2.DepositDeploymentAuthorization":
return Any.fromPartial({
typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization",
value: DepositDeploymentAuthorization2.encode(DepositDeploymentAuthorization2.fromPartial((content.value as DeepPartial<DepositDeploymentAuthorization2>))).finish()
value: DepositDeploymentAuthorization2.encode(DepositDeploymentAuthorization2.fromPartial(DepositDeploymentAuthorization2.fromAmino(content.value))).finish()
});

case "cosmos-sdk/GenericAuthorization":
return Any.fromPartial({
typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization",
value: GenericAuthorization.encode(GenericAuthorization.fromPartial((content.value as DeepPartial<GenericAuthorization>))).finish()
value: GenericAuthorization.encode(GenericAuthorization.fromPartial(GenericAuthorization.fromAmino(content.value))).finish()
});

case "cosmos-sdk/SendAuthorization":
return Any.fromPartial({
typeUrl: "/cosmos.bank.v1beta1.SendAuthorization",
value: SendAuthorization.encode(SendAuthorization.fromPartial((content.value as DeepPartial<SendAuthorization>))).finish()
value: SendAuthorization.encode(SendAuthorization.fromPartial(SendAuthorization.fromAmino(content.value))).finish()
});

case "cosmos-sdk/StakeAuthorization":
return Any.fromPartial({
typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization",
value: StakeAuthorization.encode(StakeAuthorization.fromPartial((content.value as DeepPartial<StakeAuthorization>))).finish()
value: StakeAuthorization.encode(StakeAuthorization.fromPartial(StakeAuthorization.fromAmino(content.value))).finish()
});

default:
Expand Down
6 changes: 3 additions & 3 deletions __fixtures__/outputv2/cosmos/feegrant/v1beta1/feegrant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,19 +875,19 @@ export const FeeAllowanceI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/BasicAllowance":
return Any.fromPartial({
typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance",
value: BasicAllowance.encode(BasicAllowance.fromPartial((content.value as DeepPartial<BasicAllowance>))).finish()
value: BasicAllowance.encode(BasicAllowance.fromPartial(BasicAllowance.fromAmino(content.value))).finish()
});

case "cosmos-sdk/PeriodicAllowance":
return Any.fromPartial({
typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance",
value: PeriodicAllowance.encode(PeriodicAllowance.fromPartial((content.value as DeepPartial<PeriodicAllowance>))).finish()
value: PeriodicAllowance.encode(PeriodicAllowance.fromPartial(PeriodicAllowance.fromAmino(content.value))).finish()
});

case "cosmos-sdk/AllowedMsgAllowance":
return Any.fromPartial({
typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance",
value: AllowedMsgAllowance.encode(AllowedMsgAllowance.fromPartial((content.value as DeepPartial<AllowedMsgAllowance>))).finish()
value: AllowedMsgAllowance.encode(AllowedMsgAllowance.fromPartial(AllowedMsgAllowance.fromAmino(content.value))).finish()
});

default:
Expand Down
6 changes: 3 additions & 3 deletions __fixtures__/outputv2/cosmos/feegrant/v1beta1/tx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,19 +592,19 @@ export const FeeAllowanceI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/BasicAllowance":
return Any.fromPartial({
typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance",
value: BasicAllowance.encode(BasicAllowance.fromPartial((content.value as DeepPartial<BasicAllowance>))).finish()
value: BasicAllowance.encode(BasicAllowance.fromPartial(BasicAllowance.fromAmino(content.value))).finish()
});

case "cosmos-sdk/PeriodicAllowance":
return Any.fromPartial({
typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance",
value: PeriodicAllowance.encode(PeriodicAllowance.fromPartial((content.value as DeepPartial<PeriodicAllowance>))).finish()
value: PeriodicAllowance.encode(PeriodicAllowance.fromPartial(PeriodicAllowance.fromAmino(content.value))).finish()
});

case "cosmos-sdk/AllowedMsgAllowance":
return Any.fromPartial({
typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance",
value: AllowedMsgAllowance.encode(AllowedMsgAllowance.fromPartial((content.value as DeepPartial<AllowedMsgAllowance>))).finish()
value: AllowedMsgAllowance.encode(AllowedMsgAllowance.fromPartial(AllowedMsgAllowance.fromAmino(content.value))).finish()
});

default:
Expand Down
20 changes: 10 additions & 10 deletions __fixtures__/outputv2/cosmos/gov/v1/tx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,61 +1612,61 @@ export const ProposalContentI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/v1/TextProposal":
return Any.fromPartial({
typeUrl: "/cosmos.gov.v1beta1.TextProposal",
value: TextProposal.encode(TextProposal.fromPartial((content.value as DeepPartial<TextProposal>))).finish()
value: TextProposal.encode(TextProposal.fromPartial(TextProposal.fromAmino(content.value))).finish()
});

case "/evmos.incentives.v1.RegisterIncentiveProposal":
return Any.fromPartial({
typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal",
value: RegisterIncentiveProposal.encode(RegisterIncentiveProposal.fromPartial((content.value as DeepPartial<RegisterIncentiveProposal>))).finish()
value: RegisterIncentiveProposal.encode(RegisterIncentiveProposal.fromPartial(RegisterIncentiveProposal.fromAmino(content.value))).finish()
});

case "cosmos-sdk/ClientUpdateProposal":
return Any.fromPartial({
typeUrl: "/ibc.core.client.v1.ClientUpdateProposal",
value: ClientUpdateProposal.encode(ClientUpdateProposal.fromPartial((content.value as DeepPartial<ClientUpdateProposal>))).finish()
value: ClientUpdateProposal.encode(ClientUpdateProposal.fromPartial(ClientUpdateProposal.fromAmino(content.value))).finish()
});

case "cosmos-sdk/UpgradeProposal":
return Any.fromPartial({
typeUrl: "/ibc.core.client.v1.UpgradeProposal",
value: UpgradeProposal.encode(UpgradeProposal.fromPartial((content.value as DeepPartial<UpgradeProposal>))).finish()
value: UpgradeProposal.encode(UpgradeProposal.fromPartial(UpgradeProposal.fromAmino(content.value))).finish()
});

case "osmosis/poolincentives/replace-pool-incentives-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal",
value: ReplacePoolIncentivesProposal.encode(ReplacePoolIncentivesProposal.fromPartial((content.value as DeepPartial<ReplacePoolIncentivesProposal>))).finish()
value: ReplacePoolIncentivesProposal.encode(ReplacePoolIncentivesProposal.fromPartial(ReplacePoolIncentivesProposal.fromAmino(content.value))).finish()
});

case "osmosis/poolincentives/update-pool-incentives-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal",
value: UpdatePoolIncentivesProposal.encode(UpdatePoolIncentivesProposal.fromPartial((content.value as DeepPartial<UpdatePoolIncentivesProposal>))).finish()
value: UpdatePoolIncentivesProposal.encode(UpdatePoolIncentivesProposal.fromPartial(UpdatePoolIncentivesProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/set-superfluid-assets-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal",
value: SetSuperfluidAssetsProposal.encode(SetSuperfluidAssetsProposal.fromPartial((content.value as DeepPartial<SetSuperfluidAssetsProposal>))).finish()
value: SetSuperfluidAssetsProposal.encode(SetSuperfluidAssetsProposal.fromPartial(SetSuperfluidAssetsProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/remove-superfluid-assets-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal",
value: RemoveSuperfluidAssetsProposal.encode(RemoveSuperfluidAssetsProposal.fromPartial((content.value as DeepPartial<RemoveSuperfluidAssetsProposal>))).finish()
value: RemoveSuperfluidAssetsProposal.encode(RemoveSuperfluidAssetsProposal.fromPartial(RemoveSuperfluidAssetsProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/update-unpool-white-list-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal",
value: UpdateUnpoolWhiteListProposal.encode(UpdateUnpoolWhiteListProposal.fromPartial((content.value as DeepPartial<UpdateUnpoolWhiteListProposal>))).finish()
value: UpdateUnpoolWhiteListProposal.encode(UpdateUnpoolWhiteListProposal.fromPartial(UpdateUnpoolWhiteListProposal.fromAmino(content.value))).finish()
});

case "osmosis/txfees/update-fee-token-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal",
value: UpdateFeeTokenProposal.encode(UpdateFeeTokenProposal.fromPartial((content.value as DeepPartial<UpdateFeeTokenProposal>))).finish()
value: UpdateFeeTokenProposal.encode(UpdateFeeTokenProposal.fromPartial(UpdateFeeTokenProposal.fromAmino(content.value))).finish()
});

default:
Expand Down
20 changes: 10 additions & 10 deletions __fixtures__/outputv2/cosmos/gov/v1beta1/gov.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,61 +2001,61 @@ export const ProposalContentI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/TextProposal":
return Any.fromPartial({
typeUrl: "/cosmos.gov.v1beta1.TextProposal",
value: TextProposal.encode(TextProposal.fromPartial((content.value as DeepPartial<TextProposal>))).finish()
value: TextProposal.encode(TextProposal.fromPartial(TextProposal.fromAmino(content.value))).finish()
});

case "/evmos.incentives.v1.RegisterIncentiveProposal":
return Any.fromPartial({
typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal",
value: RegisterIncentiveProposal.encode(RegisterIncentiveProposal.fromPartial((content.value as DeepPartial<RegisterIncentiveProposal>))).finish()
value: RegisterIncentiveProposal.encode(RegisterIncentiveProposal.fromPartial(RegisterIncentiveProposal.fromAmino(content.value))).finish()
});

case "cosmos-sdk/ClientUpdateProposal":
return Any.fromPartial({
typeUrl: "/ibc.core.client.v1.ClientUpdateProposal",
value: ClientUpdateProposal.encode(ClientUpdateProposal.fromPartial((content.value as DeepPartial<ClientUpdateProposal>))).finish()
value: ClientUpdateProposal.encode(ClientUpdateProposal.fromPartial(ClientUpdateProposal.fromAmino(content.value))).finish()
});

case "cosmos-sdk/UpgradeProposal":
return Any.fromPartial({
typeUrl: "/ibc.core.client.v1.UpgradeProposal",
value: UpgradeProposal.encode(UpgradeProposal.fromPartial((content.value as DeepPartial<UpgradeProposal>))).finish()
value: UpgradeProposal.encode(UpgradeProposal.fromPartial(UpgradeProposal.fromAmino(content.value))).finish()
});

case "osmosis/poolincentives/replace-pool-incentives-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal",
value: ReplacePoolIncentivesProposal.encode(ReplacePoolIncentivesProposal.fromPartial((content.value as DeepPartial<ReplacePoolIncentivesProposal>))).finish()
value: ReplacePoolIncentivesProposal.encode(ReplacePoolIncentivesProposal.fromPartial(ReplacePoolIncentivesProposal.fromAmino(content.value))).finish()
});

case "osmosis/poolincentives/update-pool-incentives-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal",
value: UpdatePoolIncentivesProposal.encode(UpdatePoolIncentivesProposal.fromPartial((content.value as DeepPartial<UpdatePoolIncentivesProposal>))).finish()
value: UpdatePoolIncentivesProposal.encode(UpdatePoolIncentivesProposal.fromPartial(UpdatePoolIncentivesProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/set-superfluid-assets-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal",
value: SetSuperfluidAssetsProposal.encode(SetSuperfluidAssetsProposal.fromPartial((content.value as DeepPartial<SetSuperfluidAssetsProposal>))).finish()
value: SetSuperfluidAssetsProposal.encode(SetSuperfluidAssetsProposal.fromPartial(SetSuperfluidAssetsProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/remove-superfluid-assets-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal",
value: RemoveSuperfluidAssetsProposal.encode(RemoveSuperfluidAssetsProposal.fromPartial((content.value as DeepPartial<RemoveSuperfluidAssetsProposal>))).finish()
value: RemoveSuperfluidAssetsProposal.encode(RemoveSuperfluidAssetsProposal.fromPartial(RemoveSuperfluidAssetsProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/update-unpool-white-list-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal",
value: UpdateUnpoolWhiteListProposal.encode(UpdateUnpoolWhiteListProposal.fromPartial((content.value as DeepPartial<UpdateUnpoolWhiteListProposal>))).finish()
value: UpdateUnpoolWhiteListProposal.encode(UpdateUnpoolWhiteListProposal.fromPartial(UpdateUnpoolWhiteListProposal.fromAmino(content.value))).finish()
});

case "osmosis/txfees/update-fee-token-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal",
value: UpdateFeeTokenProposal.encode(UpdateFeeTokenProposal.fromPartial((content.value as DeepPartial<UpdateFeeTokenProposal>))).finish()
value: UpdateFeeTokenProposal.encode(UpdateFeeTokenProposal.fromPartial(UpdateFeeTokenProposal.fromAmino(content.value))).finish()
});

default:
Expand Down
20 changes: 10 additions & 10 deletions __fixtures__/outputv2/cosmos/gov/v1beta1/tx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,61 +1281,61 @@ export const ProposalContentI_FromAmino = (content: AnyAmino) => {
case "cosmos-sdk/TextProposal":
return Any.fromPartial({
typeUrl: "/cosmos.gov.v1beta1.TextProposal",
value: TextProposal.encode(TextProposal.fromPartial((content.value as DeepPartial<TextProposal>))).finish()
value: TextProposal.encode(TextProposal.fromPartial(TextProposal.fromAmino(content.value))).finish()
});

case "/evmos.incentives.v1.RegisterIncentiveProposal":
return Any.fromPartial({
typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal",
value: RegisterIncentiveProposal.encode(RegisterIncentiveProposal.fromPartial((content.value as DeepPartial<RegisterIncentiveProposal>))).finish()
value: RegisterIncentiveProposal.encode(RegisterIncentiveProposal.fromPartial(RegisterIncentiveProposal.fromAmino(content.value))).finish()
});

case "cosmos-sdk/ClientUpdateProposal":
return Any.fromPartial({
typeUrl: "/ibc.core.client.v1.ClientUpdateProposal",
value: ClientUpdateProposal.encode(ClientUpdateProposal.fromPartial((content.value as DeepPartial<ClientUpdateProposal>))).finish()
value: ClientUpdateProposal.encode(ClientUpdateProposal.fromPartial(ClientUpdateProposal.fromAmino(content.value))).finish()
});

case "cosmos-sdk/UpgradeProposal":
return Any.fromPartial({
typeUrl: "/ibc.core.client.v1.UpgradeProposal",
value: UpgradeProposal.encode(UpgradeProposal.fromPartial((content.value as DeepPartial<UpgradeProposal>))).finish()
value: UpgradeProposal.encode(UpgradeProposal.fromPartial(UpgradeProposal.fromAmino(content.value))).finish()
});

case "osmosis/poolincentives/replace-pool-incentives-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal",
value: ReplacePoolIncentivesProposal.encode(ReplacePoolIncentivesProposal.fromPartial((content.value as DeepPartial<ReplacePoolIncentivesProposal>))).finish()
value: ReplacePoolIncentivesProposal.encode(ReplacePoolIncentivesProposal.fromPartial(ReplacePoolIncentivesProposal.fromAmino(content.value))).finish()
});

case "osmosis/poolincentives/update-pool-incentives-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal",
value: UpdatePoolIncentivesProposal.encode(UpdatePoolIncentivesProposal.fromPartial((content.value as DeepPartial<UpdatePoolIncentivesProposal>))).finish()
value: UpdatePoolIncentivesProposal.encode(UpdatePoolIncentivesProposal.fromPartial(UpdatePoolIncentivesProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/set-superfluid-assets-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal",
value: SetSuperfluidAssetsProposal.encode(SetSuperfluidAssetsProposal.fromPartial((content.value as DeepPartial<SetSuperfluidAssetsProposal>))).finish()
value: SetSuperfluidAssetsProposal.encode(SetSuperfluidAssetsProposal.fromPartial(SetSuperfluidAssetsProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/remove-superfluid-assets-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal",
value: RemoveSuperfluidAssetsProposal.encode(RemoveSuperfluidAssetsProposal.fromPartial((content.value as DeepPartial<RemoveSuperfluidAssetsProposal>))).finish()
value: RemoveSuperfluidAssetsProposal.encode(RemoveSuperfluidAssetsProposal.fromPartial(RemoveSuperfluidAssetsProposal.fromAmino(content.value))).finish()
});

case "osmosis/v1beta1/update-unpool-white-list-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal",
value: UpdateUnpoolWhiteListProposal.encode(UpdateUnpoolWhiteListProposal.fromPartial((content.value as DeepPartial<UpdateUnpoolWhiteListProposal>))).finish()
value: UpdateUnpoolWhiteListProposal.encode(UpdateUnpoolWhiteListProposal.fromPartial(UpdateUnpoolWhiteListProposal.fromAmino(content.value))).finish()
});

case "osmosis/txfees/update-fee-token-proposal":
return Any.fromPartial({
typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal",
value: UpdateFeeTokenProposal.encode(UpdateFeeTokenProposal.fromPartial((content.value as DeepPartial<UpdateFeeTokenProposal>))).finish()
value: UpdateFeeTokenProposal.encode(UpdateFeeTokenProposal.fromPartial(UpdateFeeTokenProposal.fromAmino(content.value))).finish()
});

default:
Expand Down