Skip to content

Commit a8d89f7

Browse files
adairrradairrr
authored
Merge pull request #3 from AbstractSDK/adair/memoFix
Suffix fee, memo, and funds with underscores
2 parents 737b7d2 + 49ba363 commit a8d89f7

27 files changed

+1050
-842
lines changed

‎__output__/abstract/apps/autocompounder/Autocompounder.client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { CamelCasedProperties } from "type-fest";
88
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
9-
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
9+
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
1010
import { StdFee, Coin } from "@cosmjs/amino";
1111
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";
1212
import { AutocompounderQueryMsgBuilder, AutocompounderExecuteMsgBuilder } from "./Autocompounder.message-builder";

‎__output__/abstract/apps/etf-prefix/Etf.client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { CamelCasedProperties } from "type-fest";
88
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
9-
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
9+
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
1010
import { StdFee, Coin } from "@cosmjs/amino";
1111
import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types";
1212
import { EtfQueryMsgBuilder, EtfExecuteMsgBuilder } from "./Etf.message-builder";

‎__output__/abstract/apps/etf/Etf.client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { CamelCasedProperties } from "type-fest";
88
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
9-
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
9+
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
1010
import { StdFee, Coin } from "@cosmjs/amino";
1111
import { Decimal, InstantiateMsg, ExecuteMsg, Uint128, AssetInfoBaseForString, AssetBaseForString, QueryMsg, MigrateMsg, StateResponse } from "./Etf.types";
1212
import { EtfQueryMsgBuilder, EtfExecuteMsgBuilder } from "./Etf.message-builder";

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/ts-codegen/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@abstract-money/ts-codegen",
3-
"version": "0.35.7",
3+
"version": "0.36.1",
44
"description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
55
"author": "Dan Lynch <[email protected]>",
66
"homepage": "https://github.com/cosmwasm/ts-codegen",
@@ -101,6 +101,6 @@
101101
"parse-package-name": "1.0.0",
102102
"rimraf": "3.0.2",
103103
"shelljs": "0.8.5",
104-
"wasm-ast-types": "npm:@abstract-money/wasm-ast-types@0.26.6"
104+
"wasm-ast-types": "npm:@abstract-money/wasm-ast-types@0.27.1"
105105
}
106106
}

‎packages/wasm-ast-types/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@abstract-money/wasm-ast-types",
3-
"version": "0.26.7",
3+
"version": "0.27.1",
44
"description": "CosmWasm TypeScript AST generation",
55
"author": "Dan Lynch <[email protected]>",
66
"homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",

‎packages/wasm-ast-types/src/abstract-app/__snapshots__/abstract-app.spec.ts.snap‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@ exports[`AutocompounderAppClient 1`] = `
3434
3535
updateFeeConfig = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
3636
update_fee_config: unknown;
37-
}>[\\"update_fee_config\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
38-
return this._execute(AutocompounderExecuteMsgBuilder.updateFeeConfig(params), fee, memo, _funds);
37+
}>[\\"update_fee_config\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
38+
return this._execute(AutocompounderExecuteMsgBuilder.updateFeeConfig(params), fee_, memo_, funds_);
3939
};
4040
deposit = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
4141
deposit: unknown;
42-
}>[\\"deposit\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
43-
return this._execute(AutocompounderExecuteMsgBuilder.deposit(params), fee, memo, _funds);
42+
}>[\\"deposit\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
43+
return this._execute(AutocompounderExecuteMsgBuilder.deposit(params), fee_, memo_, funds_);
4444
};
45-
withdraw = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
46-
return this._execute(AutocompounderExecuteMsgBuilder.withdraw(), fee, memo, _funds);
45+
withdraw = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
46+
return this._execute(AutocompounderExecuteMsgBuilder.withdraw(), fee_, memo_, funds_);
4747
};
48-
compound = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
49-
return this._execute(AutocompounderExecuteMsgBuilder.compound(), fee, memo, _funds);
48+
compound = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
49+
return this._execute(AutocompounderExecuteMsgBuilder.compound(), fee_, memo_, funds_);
5050
};
51-
batchUnbond = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
52-
return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee, memo, _funds);
51+
batchUnbond = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
52+
return this._execute(AutocompounderExecuteMsgBuilder.batchUnbond(), fee_, memo_, funds_);
5353
};
54-
_execute = async (msg: ExecuteMsg, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
54+
_execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
5555
const moduleMsg: AppExecuteMsg<ExecuteMsg> = AppExecuteMsgFactory.executeApp(msg);
56-
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds);
56+
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
5757
};
5858
}"
5959
`;
@@ -186,25 +186,25 @@ exports[`DexAdapterClient 1`] = `
186186
187187
updateFee = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
188188
update_fee: unknown;
189-
}>[\\"update_fee\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
190-
return this._execute(DexClientExecuteMsgBuilder.updateFee(params), fee, memo, _funds);
189+
}>[\\"update_fee\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
190+
return this._execute(DexClientExecuteMsgBuilder.updateFee(params), fee_, memo_, funds_);
191191
};
192192
ansAction = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
193193
ans_action: unknown;
194-
}>[\\"ans_action\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
195-
return this._execute(DexClientExecuteMsgBuilder.ansAction(params), fee, memo, _funds);
194+
}>[\\"ans_action\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
195+
return this._execute(DexClientExecuteMsgBuilder.ansAction(params), fee_, memo_, funds_);
196196
};
197197
rawAction = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
198198
raw_action: unknown;
199-
}>[\\"raw_action\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
200-
return this._execute(DexClientExecuteMsgBuilder.rawAction(params), fee, memo, _funds);
199+
}>[\\"raw_action\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
200+
return this._execute(DexClientExecuteMsgBuilder.rawAction(params), fee_, memo_, funds_);
201201
};
202-
_execute = async (msg: ExecuteMsg, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
202+
_execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
203203
const moduleMsg: AdapterExecuteMsg<ExecuteMsg> = AdapterExecuteMsgFactory.executeAdapter({
204204
request: msg,
205205
proxyAddress: this.accountQueryClient.proxyAddress
206206
});
207-
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds);
207+
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
208208
};
209209
}"
210210
`;
@@ -214,13 +214,13 @@ exports[`IAutocompounderAppClient 1`] = `
214214
accountClient: AbstractAccountClient;
215215
updateFeeConfig: (params: CamelCasedProperties<Extract<ExecuteMsg, {
216216
update_fee_config: unknown;
217-
}>[\\"update_fee_config\\"]>, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
217+
}>[\\"update_fee_config\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
218218
deposit: (params: CamelCasedProperties<Extract<ExecuteMsg, {
219219
deposit: unknown;
220-
}>[\\"deposit\\"]>, fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
221-
withdraw: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
222-
compound: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
223-
batchUnbond: (fee?: number | StdFee | \\"auto\\", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
220+
}>[\\"deposit\\"]>, fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
221+
withdraw: (fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
222+
compound: (fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
223+
batchUnbond: (fee_?: number | StdFee | \\"auto\\", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
224224
}"
225225
`;
226226
@@ -281,18 +281,18 @@ exports[`IbcMailClientAppClient 1`] = `
281281
282282
sendMessage = async (params: CamelCasedProperties<Extract<ExecuteMsg, {
283283
send_message: unknown;
284-
}>[\\"send_message\\"]>, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
285-
return this._execute(IbcMailClientExecuteMsgBuilder.sendMessage(params), fee, memo, _funds);
284+
}>[\\"send_message\\"]>, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
285+
return this._execute(IbcMailClientExecuteMsgBuilder.sendMessage(params), fee_, memo_, funds_);
286286
};
287-
receiveMessage = async (message: Message, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
288-
return this._execute(IbcMailClientExecuteMsgBuilder.receiveMessage(message), fee, memo, _funds);
287+
receiveMessage = async (message: Message, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
288+
return this._execute(IbcMailClientExecuteMsgBuilder.receiveMessage(message), fee_, memo_, funds_);
289289
};
290-
updateConfig = async (fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
291-
return this._execute(IbcMailClientExecuteMsgBuilder.updateConfig(), fee, memo, _funds);
290+
updateConfig = async (fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
291+
return this._execute(IbcMailClientExecuteMsgBuilder.updateConfig(), fee_, memo_, funds_);
292292
};
293-
_execute = async (msg: ExecuteMsg, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
293+
_execute = async (msg: ExecuteMsg, fee_: number | StdFee | \\"auto\\" = \\"auto\\", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
294294
const moduleMsg: AppExecuteMsg<ExecuteMsg> = AppExecuteMsgFactory.executeApp(msg);
295-
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee, memo, _funds);
295+
return await this.accountClient.abstract.client.execute(this.accountClient.sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
296296
};
297297
}"
298298
`;

‎packages/wasm-ast-types/src/abstract-app/abstract-app.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ function extractCamelcasedMethodParams(
405405
)
406406
),
407407
t.identifier('moduleMsg'),
408-
t.identifier('fee'),
409-
t.identifier('memo'),
410-
t.identifier('_funds')
408+
t.identifier('fee_'),
409+
t.identifier('memo_'),
410+
t.identifier('funds_')
411411
]
412412
)
413413
)

‎packages/wasm-ast-types/src/client/client.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ export const createWasmExecMethod = (
256256
t.objectExpression([
257257
t.objectProperty(msgAction, msgActionValue)
258258
]),
259-
t.identifier('fee'),
260-
t.identifier('memo'),
261-
t.identifier('_funds')
259+
t.identifier('fee_'),
260+
t.identifier('memo_'),
261+
t.identifier('funds_')
262262
]
263263
)
264264
)

0 commit comments

Comments
 (0)