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.

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

feat: ica/icq api and models definition #53

Merged
merged 4 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@terra-money/feather.js",
"version": "2.0.0-beta.1",
"version": "2.0.0-beta.5",
"description": "The JavaScript SDK for Terra and Feather chains",
"license": "MIT",
"author": "Terraform Labs, PTE.",
Expand Down Expand Up @@ -87,7 +87,7 @@
"dependencies": {
"@ethersproject/bytes": "^5.7.0",
"@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7",
"@terra-money/terra.proto": "^4.0.3",
"@terra-money/terra.proto": "^4.0.4",
"assert": "^2.0.0",
"axios": "^0.27.2",
"bech32": "^2.0.0",
Expand Down
6 changes: 6 additions & 0 deletions src/client/lcd/LCDClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import { AllianceAPI } from './api/AllianceAPI';
import { PobAPI } from './api/PobAPI';
import { FeeshareAPI } from './api/FeeshareAPI';
import { GovV1API } from './api/GovV1API';
import { ICAv1API } from './api/ICAv1API';
import { ICQv1API } from './api/ICQv1API';

export interface LCDClientConfig {
/**
Expand Down Expand Up @@ -114,6 +116,8 @@ export class LCDClient {
public wasm: WasmAPI;
public tx: TxAPI;
public ibc: IbcAPI;
public icaV1: ICAv1API;
public icqV1: ICQv1API;
public ibcTransfer: IbcTransferAPI;
public pob: PobAPI;
public feeshare: FeeshareAPI;
Expand Down Expand Up @@ -157,6 +161,8 @@ export class LCDClient {
this.tendermint = new TendermintAPI(this);
this.wasm = new WasmAPI(this);
this.ibc = new IbcAPI(this);
this.icaV1 = new ICAv1API(this);
this.icqV1 = new ICQv1API(this);
this.ibcTransfer = new IbcTransferAPI(this);
this.tx = new TxAPI(this);
this.pob = new PobAPI(this);
Expand Down
64 changes: 64 additions & 0 deletions src/client/lcd/api/ICAv1API.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { Params as HostParams } from '@terra-money/terra.proto/ibc/applications/interchain_accounts/host/v1/host';
import { Params as ControllerParams } from '@terra-money/terra.proto/ibc/applications/interchain_accounts/controller/v1/controller';
import { QueryInterchainAccountResponse } from '@terra-money/terra.proto/ibc/applications/interchain_accounts/controller/v1/query';
import { APIParams } from '../APIRequester';
import { LCDClient } from '../LCDClient';
import { BaseAPI } from './BaseAPI';
import { AccAddress } from 'core';

export class ICAv1API extends BaseAPI {
constructor(public lcd: LCDClient) {
super(lcd.apiRequesters, lcd.config);
}

/**
* Query interchain account host module params
*
* @tags Query
* @name params
* @request GET:/ibc/apps/interchain_accounts/host/v1/params
*/
public async hostParams(chainId: string, params: Partial<APIParams> = {}) {
return this.getReqFromChainID(chainId).get<{ params: HostParams }>(
`/ibc/apps/interchain_accounts/host/v1/params`,
params
);
}

/**
* Query interchain account controller module params
*
* @tags Query
* @name params
* @request GET:/ibc/apps/interchain_accounts/controller/v1/params
*/
public async controllerParams(
chainId: string,
params: Partial<APIParams> = {}
) {
return this.getReqFromChainID(chainId).get<{ params: ControllerParams }>(
`/ibc/apps/interchain_accounts/controller/v1/params`,
params
);
}

/**
* Returns the interchain account address for a given owner address on a given connection
*
* @tags Query
* @name params
* @request GET:/ibc/apps/interchain_accounts/controller/v1/owners/${ownerAddr}/connections/${connectionId}
*/
public async controllerAccountAddress(
ownerAddr: AccAddress,
connectionId: string,
params: Partial<APIParams> = {}
) {
return this.getReqFromAddress(
ownerAddr
).get<QueryInterchainAccountResponse>(
`/ibc/apps/interchain_accounts/controller/v1/owners/${ownerAddr}/connections/${connectionId}`,
params
);
}
}
25 changes: 25 additions & 0 deletions src/client/lcd/api/ICQv1API.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Params } from '@terra-money/terra.proto/icq/v1/icq';
import { APIParams } from '../APIRequester';
import { LCDClient } from '../LCDClient';
import { BaseAPI } from './BaseAPI';

export class ICQv1API extends BaseAPI {
constructor(public lcd: LCDClient) {
super(lcd.apiRequesters, lcd.config);
}

/**
* Query all parameters associated with the icq module.
*
* @tags Query
* @name params
* @summary Query icq module params
* @request GET:/async-icq/v1/params
*/
public async params(chainId: string, params: Partial<APIParams> = {}) {
return this.getReqFromChainID(chainId).get<{ params: Params }>(
`/async-icq/v1/params`,
params
);
}
}
21 changes: 21 additions & 0 deletions src/core/Msg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ import {
MsgRegisterFeeShare,
MsgUpdateFeeShare,
} from './feeshare';
import {
ICAMsg,
MsgRegisterInterchainAccount,
MsgSendTx,
} from './ica/controller/v1/msgs';

export type Msg =
| BankMsg
Expand All @@ -127,6 +132,7 @@ export type Msg =
| IbcClientMsg
| IbcConnectionMsg
| IbcChannelMsg
| ICAMsg
| AllianceMsg
| CustomMsg
| CrisisMsg
Expand Down Expand Up @@ -169,6 +175,7 @@ export namespace Msg {
| IbcClientMsg.Data
| IbcConnectionMsg.Data
| IbcChannelMsg.Data
| ICAMsg.Data
| AllianceMsg.Data
| CustomMsg.Data
| CrisisMsg.Data
Expand All @@ -188,6 +195,7 @@ export namespace Msg {
| VestingMsg.Proto
| WasmMsg.Proto
| IbcTransferMsg.Proto
| ICAMsg.Proto
| IbcClientMsg.Proto
| IbcConnectionMsg.Proto
| IbcChannelMsg.Proto
Expand Down Expand Up @@ -492,6 +500,7 @@ export namespace Msg {
return MsgAminoCustom.fromAmino(data as any, isClassic);
}
}

export function fromData(data: Msg.Data, isClassic?: boolean): Msg {
switch (data['@type']) {
// alliance
Expand Down Expand Up @@ -616,6 +625,12 @@ export namespace Msg {
case '/ibc.applications.transfer.v1.MsgTransfer':
return MsgTransfer.fromData(data, isClassic);

// ibc ica
case '/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount':
return MsgRegisterInterchainAccount.fromData(data, isClassic);
case '/ibc.applications.interchain_accounts.controller.v1.MsgSendTx':
return MsgSendTx.fromData(data, isClassic);

// ibc-client
case '/ibc.core.client.v1.MsgCreateClient':
return MsgCreateClient.fromData(data, isClassic);
Expand Down Expand Up @@ -814,6 +829,12 @@ export namespace Msg {
case '/ibc.applications.transfer.v1.MsgTransfer':
return MsgTransfer.unpackAny(proto, isClassic);

// ibc ica
case '/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount':
return MsgRegisterInterchainAccount.unpackAny(proto, isClassic);
case '/ibc.applications.interchain_accounts.controller.v1.MsgSendTx':
return MsgSendTx.unpackAny(proto, isClassic);

// ibc-client
case '/ibc.core.client.v1.MsgCreateClient':
return MsgCreateClient.unpackAny(proto, isClassic);
Expand Down
91 changes: 91 additions & 0 deletions src/core/ica/controller/v1/CosmosTx.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import { Msg } from '../../../Msg';
import { JSONSerializable } from '../../../../util/json';
import { CosmosTx as CosmosTx_pb } from '@terra-money/terra.proto/ibc/applications/interchain_accounts/v1/packet';
import { Any } from '@terra-money/terra.proto/google/protobuf/any';

/**
* CosmosTx represents the encoded transaction
*/
export class CosmosTx extends JSONSerializable<
{},
CosmosTx.Data,
CosmosTx.Proto
> {
/**
* @param messages all proto messages that are part of the transaction
*/
constructor(public messages: Msg[]) {
super();
}

public static fromAmino(data: CosmosTx.Amino, _?: boolean): CosmosTx {
_;
data;
throw new Error('Amino not supported on CosmosTx');
}

public toAmino(_?: boolean): CosmosTx.Amino {
_;
throw new Error('Amino not supported on CosmosTx');
}

public static fromData(data: CosmosTx.Data, _?: boolean): CosmosTx {
_;
console.log('CosmosTx#fromData', data);
const parsedData = Buffer.from(data, 'base64');
const { messages } = CosmosTx_pb.decode(parsedData);
return new CosmosTx(messages.map(msg => Msg.fromProto(msg)));
}

public toData(_?: boolean): CosmosTx.Data {
_;
console.log('CosmosTx#toData', this.messages);
const { messages } = this;

const ct = CosmosTx_pb.encode({
messages: messages.map(msg => msg.packAny()) as Any[],
});

return Buffer.from(ct.finish()).toString('base64');
}

public static fromProto(proto: CosmosTx.Proto, _?: boolean): CosmosTx {
_;
console.log('CosmosTx#fromProto', proto);
return new CosmosTx(proto.messages.map(msg => Msg.fromProto(msg)));
}

public toProto(_?: boolean): CosmosTx.Proto {
_;
console.log('CosmosTx#toProto', this.messages);
const { messages } = this;

const ct = CosmosTx_pb.encode({
messages: messages.map(msg => msg.packAny()) as Any[],
});

return Buffer.from(ct.finish()).toString('base64') as any;
}

public packAny(isClassic?: boolean): Any {
console.log('CosmosTx#packAny', this.messages);
return Any.fromPartial({
value: this.toProto(isClassic) as any,
});
}

public static unpackAny(msgAny: Any, isClassic?: boolean): CosmosTx {
console.log('CosmosTx#unpackAny', msgAny);
return CosmosTx.fromProto(CosmosTx_pb.decode(msgAny.value), isClassic);
}
}

export namespace CosmosTx {
export interface Amino {
value: {};
}
type Base64String = string;
export type Data = Base64String;

export type Proto = CosmosTx_pb;
}
Loading
Loading