Skip to content

Abstract 0.24.0 generation #5

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 5 commits into from
Oct 11, 2024
Merged

Abstract 0.24.0 generation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b8730c
Abstract 2.0 generation
adairrr Oct 11, 2024
692671d
Update specs
adairrr Oct 11, 2024
740649c
Update ts-codegen snaps
adairrr Oct 11, 2024
2062d7f
Match ts-codegen version
adairrr Oct 11, 2024
4cecf93
Publish
adairrr Oct 11, 2024
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
1,112 changes: 1,112 additions & 0 deletions __fixtures__/abstract/apps/betting.json
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions __fixtures__/issues/98/out/98.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export interface 98Interface extends 98ReadOnlyInterface {
}: {
id: number;
instantiateMsg: Binary;
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
registerPlugin: ({
checksum,
codeId,
Expand All @@ -90,12 +90,12 @@ export interface 98Interface extends 98ReadOnlyInterface {
ipfsHash: string;
name: string;
version: string;
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
unregisterPlugin: ({
id
}: {
id: number;
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
updatePlugin: ({
checksum,
codeId,
Expand All @@ -112,17 +112,17 @@ export interface 98Interface extends 98ReadOnlyInterface {
ipfsHash?: string;
name?: string;
version?: string;
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
updateRegistryFee: ({
newFee
}: {
newFee: Coin;
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
updateDaoAddr: ({
newAddr
}: {
newAddr: string;
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<ExecuteResult>;
}
export class 98Client extends 98QueryClient implements 98Interface {
client: SigningCosmWasmClient;
Expand All @@ -148,13 +148,13 @@ export class 98Client extends 98QueryClient implements 98Interface {
}: {
id: number;
instantiateMsg: Binary;
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
proxy_install_plugin: {
id,
instantiate_msg: instantiateMsg
}
}, fee, memo, _funds);
}, fee_, memo_, funds_);
};
registerPlugin = async ({
checksum,
Expand All @@ -170,7 +170,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
ipfsHash: string;
name: string;
version: string;
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
register_plugin: {
checksum,
Expand All @@ -180,18 +180,18 @@ export class 98Client extends 98QueryClient implements 98Interface {
name,
version
}
}, fee, memo, _funds);
}, fee_, memo_, funds_);
};
unregisterPlugin = async ({
id
}: {
id: number;
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
unregister_plugin: {
id
}
}, fee, memo, _funds);
}, fee_, memo_, funds_);
};
updatePlugin = async ({
checksum,
Expand All @@ -209,7 +209,7 @@ export class 98Client extends 98QueryClient implements 98Interface {
ipfsHash?: string;
name?: string;
version?: string;
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
update_plugin: {
checksum,
Expand All @@ -220,28 +220,28 @@ export class 98Client extends 98QueryClient implements 98Interface {
name,
version
}
}, fee, memo, _funds);
}, fee_, memo_, funds_);
};
updateRegistryFee = async ({
newFee
}: {
newFee: Coin;
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
update_registry_fee: {
new_fee: newFee
}
}, fee, memo, _funds);
}, fee_, memo_, funds_);
};
updateDaoAddr = async ({
newAddr
}: {
newAddr: string;
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
update_dao_addr: {
new_addr: newAddr
}
}, fee, memo, _funds);
}, fee_, memo_, funds_);
};
}
98 changes: 37 additions & 61 deletions __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,13 +6,13 @@

import { CamelCasedProperties } from "type-fest";
import { SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
import { AbstractQueryClient, AbstractAccountQueryClient, AbstractAccountClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory, AbstractClient, AbstractAccountId } from "@abstract-money/abstract.js";
import { AccountPublicClient, AccountWalletClient, AppExecuteMsg, AppExecuteMsgFactory, AdapterExecuteMsg, AdapterExecuteMsgFactory } from "@abstract-money/core";
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";
export interface IAutocompounderAppQueryClient {
moduleId: string;
accountQueryClient: AbstractAccountQueryClient;
accountPublicClient: AccountPublicClient;
_moduleAddress: string | undefined;
config: () => Promise<Config>;
pendingClaims: (params: CamelCasedProperties<Extract<QueryMsg, {
Expand All @@ -29,33 +29,21 @@ export interface IAutocompounderAppQueryClient {
balance: (params: CamelCasedProperties<Extract<QueryMsg, {
balance: unknown;
}>["balance"]>) => Promise<Uint128>;
connectSigningClient: (signingClient: SigningCosmWasmClient, address: string) => AutocompounderAppClient;
getAddress: () => Promise<string>;
}
export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClient {
accountQueryClient: AbstractAccountQueryClient;
accountPublicClient: AccountPublicClient;
moduleId: string;
_moduleAddress: string | undefined;

constructor({
abstractQueryClient,
accountId,
managerAddress,
proxyAddress,
accountPublicClient,
moduleId
}: {
abstractQueryClient: AbstractQueryClient;
accountId: AbstractAccountId;
managerAddress: string;
proxyAddress: string;
accountPublicClient: AccountPublicClient;
moduleId: string;
}) {
this.accountQueryClient = new AbstractAccountQueryClient({
abstract: abstractQueryClient,
accountId,
managerAddress,
proxyAddress
});
this.accountPublicClient = accountPublicClient;
this.moduleId = moduleId;
this.config = this.config.bind(this);
this.pendingClaims = this.pendingClaims.bind(this);
Expand Down Expand Up @@ -97,7 +85,9 @@ export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClie
};
getAddress = async (): Promise<string> => {
if (!this._moduleAddress) {
const address = await this.accountQueryClient.getModuleAddress(this.moduleId);
const address = await this.accountPublicClient.getModuleAddress({
id: this.moduleId
});

if (address === null) {
throw new Error(`Module ${this.moduleId} not installed`);
Expand All @@ -108,59 +98,43 @@ export class AutocompounderAppQueryClient implements IAutocompounderAppQueryClie

return this._moduleAddress!;
};
connectSigningClient = (signingClient: SigningCosmWasmClient, address: string): AutocompounderAppClient => {
return new AutocompounderAppClient({
accountId: this.accountQueryClient.accountId,
managerAddress: this.accountQueryClient.managerAddress,
proxyAddress: this.accountQueryClient.proxyAddress,
moduleId: this.moduleId,
abstractClient: this.accountQueryClient.abstract.connectSigningClient(signingClient, address)
});
};
_query = async (queryMsg: QueryMsg): Promise<any> => {
return this.accountQueryClient.queryModule({
return this.accountPublicClient.queryModule({
moduleId: this.moduleId,
moduleType: "app",
queryMsg
});
};
}
export interface IAutocompounderAppClient extends IAutocompounderAppQueryClient {
accountClient: AbstractAccountClient;
accountWalletClient: AccountWalletClient;
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>;
}
export class AutocompounderAppClient extends AutocompounderAppQueryClient implements IAutocompounderAppClient {
accountClient: AbstractAccountClient;
accountWalletClient: AccountWalletClient;

constructor({
abstractClient,
accountId,
managerAddress,
proxyAddress,
accountPublicClient,
accountWalletClient,
moduleId
}: {
abstractClient: AbstractClient;
accountId: AbstractAccountId;
managerAddress: string;
proxyAddress: string;
accountPublicClient: AccountPublicClient;
accountWalletClient: AccountWalletClient;
moduleId: string;
}) {
super({
abstractQueryClient: abstractClient,
accountId,
managerAddress,
proxyAddress,
accountPublicClient,
moduleId
});
this.accountClient = AbstractAccountClient.fromQueryClient(this.accountQueryClient, abstractClient);
this.accountWalletClient = accountWalletClient;
this.updateFeeConfig = this.updateFeeConfig.bind(this);
this.deposit = this.deposit.bind(this);
this.withdraw = this.withdraw.bind(this);
Expand All @@ -170,25 +144,27 @@ export class AutocompounderAppClient extends AutocompounderAppQueryClient implem

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 signingCwClient = await this.accountWalletClient.getSigningCosmWasmClient();
const sender = await this.accountWalletClient.getSenderAddress();
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 signingCwClient.execute(sender, await this.getAddress(), moduleMsg, fee_, memo_, funds_);
};
}
Loading