Skip to content

Suffix fee, memo, and funds with underscores #3

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

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Suffix fee, memo, and funds with underscores #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __output__/abstract/apps/autocompounder/Autocompounder.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { CamelCasedProperties } from "type-fest";
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { StdFee, Coin } from "@cosmjs/amino";
import { Decimal, AssetEntry, BondingPeriodSelector, Duration, InstantiateMsg, ExecuteMsg, Uint128, AnsAsset, QueryMsg, MigrateMsg, Expiration, Timestamp, Uint64, ArrayOfTupleOfStringAndArrayOfClaim, Claim, ArrayOfClaim, Addr, PoolAddressBaseForAddr, AssetInfoBaseForAddr, PoolType, Config, PoolMetadata } from "./Autocompounder.types";
import { AutocompounderQueryMsgBuilder, AutocompounderExecuteMsgBuilder } from "./Autocompounder.message-builder";
Expand Down
2 changes: 1 addition & 1 deletion __output__/abstract/apps/etf-prefix/Etf.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { CamelCasedProperties } from "type-fest";
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { StdFee, Coin } from "@cosmjs/amino";
import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types";
import { EtfQueryMsgBuilder, EtfExecuteMsgBuilder } from "./Etf.message-builder";
Expand Down
2 changes: 1 addition & 1 deletion __output__/abstract/apps/etf/Etf.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { CamelCasedProperties } from "type-fest";
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { StdFee, Coin } from "@cosmjs/amino";
import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types";
import { EtfQueryMsgBuilder, EtfExecuteMsgBuilder } from "./Etf.message-builder";
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/ts-codegen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@abstract-money/ts-codegen",
"version": "0.35.7",
"version": "0.36.1",
"description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
"author": "Dan Lynch <pyramation@gmail.com>",
"homepage": "https://github.com/cosmwasm/ts-codegen",
Expand Down Expand Up @@ -101,6 +101,6 @@
"parse-package-name": "1.0.0",
"rimraf": "3.0.2",
"shelljs": "0.8.5",
"wasm-ast-types": "npm:@abstract-money/wasm-ast-types@0.26.6"
"wasm-ast-types": "npm:@abstract-money/wasm-ast-types@0.27.1"
}
}
2 changes: 1 addition & 1 deletion packages/wasm-ast-types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@abstract-money/wasm-ast-types",
"version": "0.26.7",
"version": "0.27.1",
"description": "CosmWasm TypeScript AST generation",
"author": "Dan Lynch <pyramation@gmail.com>",
"homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
Expand Down
66 changes: 33 additions & 33 deletions packages/wasm-ast-types/src/abstract-app/__snapshots__/abstract-app.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@ exports[`AutocompounderAppClient 1`] = `

updateFeeConfig = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
update_fee_config: unknown;
}>[\\"update_fee_config\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.updateFeeConfig(params), fee, memo, _funds);
}>[\\"update_fee_config\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.updateFeeConfig(params), fee_, memo_, funds_);
};
deposit = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
deposit: unknown;
}>[\\"deposit\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.deposit(params), fee, memo, _funds);
}>[\\"deposit\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.deposit(params), fee_, memo_, funds_);
};
withdraw = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.withdraw(), fee, memo, _funds);
withdraw = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.withdraw(), fee_, memo_, funds_);
};
compound = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.compound(), fee, memo, _funds);
compound = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.compound(), fee_, memo_, funds_);
};
batchUnbond = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee, memo, _funds);
batchUnbond = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee_, memo_, funds_);
};
_execute = async (msg: ExecuteMsg, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
_execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
const moduleMsg: AppExecuteMsg<ExecuteMsg> = AppExecuteMsgFactory.executeApp(msg);
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds);
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
};
}"
`;
Expand Down Expand Up @@ -186,25 +186,25 @@ exports[`DexAdapterClient 1`] = `

updateFee = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
update_fee: unknown;
}>[\\"update_fee\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(DexClientExecuteMsgBuilder.updateFee(params), fee, memo, _funds);
}>[\\"update_fee\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(DexClientExecuteMsgBuilder.updateFee(params), fee_, memo_, funds_);
};
ansAction = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
ans_action: unknown;
}>[\\"ans_action\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(DexClientExecuteMsgBuilder.ansAction(params), fee, memo, _funds);
}>[\\"ans_action\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(DexClientExecuteMsgBuilder.ansAction(params), fee_, memo_, funds_);
};
rawAction = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
raw_action: unknown;
}>[\\"raw_action\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(DexClientExecuteMsgBuilder.rawAction(params), fee, memo, _funds);
}>[\\"raw_action\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(DexClientExecuteMsgBuilder.rawAction(params), fee_, memo_, funds_);
};
_execute = async (msg: ExecuteMsg, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
_execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
const moduleMsg: AdapterExecuteMsg<ExecuteMsg> = AdapterExecuteMsgFactory.executeAdapter({
request: msg,
proxyAddress: this.accountQueryClient.proxyAddress
});
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds);
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
};
}"
`;
Expand All @@ -214,13 +214,13 @@ exports[`IAutocompounderAppClient 1`] = `
accountClient: AbstractAccountClient;
updateFeeConfig: (params: CamelCasedProperties<Extract<ExecuteMsg, {
update_fee_config: unknown;
}>[\\"update_fee_config\\"]>, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}>[\\"update_fee_config\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
deposit: (params: CamelCasedProperties<Extract<ExecuteMsg, {
deposit: unknown;
}>[\\"deposit\\"]>, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
withdraw: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
compound: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
batchUnbond: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}>[\\"deposit\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
withdraw: (fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
compound: (fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
batchUnbond: (fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
}"
`;

Expand Down Expand Up @@ -281,18 +281,18 @@ exports[`IbcMailClientAppClient 1`] = `

sendMessage = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
send_message: unknown;
}>[\\"send_message\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(IbcMailClientExecuteMsgBuilder.sendMessage(params), fee, memo, _funds);
}>[\\"send_message\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(IbcMailClientExecuteMsgBuilder.sendMessage(params), fee_, memo_, funds_);
};
receiveMessage = async (message: Message, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(IbcMailClientExecuteMsgBuilder.receiveMessage(message), fee, memo, _funds);
receiveMessage = async (message: Message, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(IbcMailClientExecuteMsgBuilder.receiveMessage(message), fee_, memo_, funds_);
};
updateConfig = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
return this._execute(IbcMailClientExecuteMsgBuilder.updateConfig(), fee, memo, _funds);
updateConfig = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return this._execute(IbcMailClientExecuteMsgBuilder.updateConfig(), fee_, memo_, funds_);
};
_execute = async (msg: ExecuteMsg, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
_execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
const moduleMsg: AppExecuteMsg<ExecuteMsg> = AppExecuteMsgFactory.executeApp(msg);
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds);
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
};
}"
`;
6 changes: 3 additions & 3 deletions packages/wasm-ast-types/src/abstract-app/abstract-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ function extractCamelcasedMethodParams(
)
),
t.identifier('moduleMsg'),
t.identifier('fee'),
t.identifier('memo'),
t.identifier('_funds')
t.identifier('fee_'),
t.identifier('memo_'),
t.identifier('funds_')
]
)
)
Expand Down
6 changes: 3 additions & 3 deletions packages/wasm-ast-types/src/client/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,9 @@ export const createWasmExecMethod = (
t.objectExpression([
t.objectProperty(msgAction, msgActionValue)
]),
t.identifier('fee'),
t.identifier('memo'),
t.identifier('_funds')
t.identifier('fee_'),
t.identifier('memo_'),
t.identifier('funds_')
]
)
)
Expand Down
Loading