Skip to content

Commit 5e9837a

Browse files
authored
Merge pull request #2244 from oasisprotocol/lw/rofl-cleanup
ts-web/rt: cleanup rofl and roflmarket types
2 parents 180af4e + 30372ca commit 5e9837a

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

client-sdk/ts-web/rt/src/rofl.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,44 +42,54 @@ export class Wrapper extends wrapper.Base {
4242
super(runtimeID);
4343
}
4444

45+
/** Create a new ROFL application. */
4546
callCreate() {
4647
return this.call<types.RoflCreate, void>(METHOD_CREATE);
4748
}
4849

50+
/** Update a ROFL application. */
4951
callUpdate() {
5052
return this.call<types.RoflUpdate, void>(METHOD_UPDATE);
5153
}
5254

55+
/** Remove a ROFL application. */
5356
callRemove() {
5457
return this.call<types.RoflRemove, void>(METHOD_REMOVE);
5558
}
5659

60+
/** Register a new ROFL App instance replica. */
5761
callRegister() {
5862
return this.call<types.RoflRegister, void>(METHOD_REGISTER);
5963
}
6064

65+
/** Returns the configuration for the given ROFL application. */
6166
queryApp() {
6267
return this.query<types.RoflAppQuery, types.RoflAppConfig>(METHOD_APP);
6368
}
6469

70+
/** Returns all ROFL app configurations. */
6571
queryApps() {
6672
return this.query<void, types.RoflAppConfig[]>(METHOD_APPS);
6773
}
6874

75+
/** Returns a specific registered instance replica for the given ROFL application. */
6976
queryAppInstance() {
7077
return this.query<types.RoflAppInstanceQuery, types.RoflRegistration>(METHOD_APP_INSTANCE);
7178
}
7279

80+
/** Returns a list of all registered instances replicas for the given ROFL application. */
7381
queryAppInstances() {
7482
return this.query<types.RoflAppQuery, types.RoflRegistration[]>(METHOD_APP_INSTANCES);
7583
}
7684

85+
/** Returns the minimum stake thresholds for managing ROFL. */
7786
queryStakeThresholds() {
7887
return this.query<void, types.RoflStakeThresholds>(METHOD_STAKE_THRESHOLDS);
7988
}
8089

90+
/** Queries the module parameters */
8191
queryParameters() {
82-
return this.query<void, types.RoflParameters>(METHOD_PARAMETERS);
92+
return this.query<void, void>(METHOD_PARAMETERS);
8393
}
8494
}
8595

client-sdk/ts-web/rt/src/roflmarket.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,76 +45,93 @@ export class Wrapper extends wrapper.Base {
4545
super(runtimeID);
4646
}
4747

48+
/** Creates a new machine provider. */
4849
callProviderCreate() {
4950
return this.call<types.RoflmarketProviderCreate, void>(METHOD_PROVIDER_CREATE);
5051
}
5152

53+
/** Updates an existing provider. */
5254
callProviderUpdate() {
5355
return this.call<types.RoflmarketProviderUpdate, void>(METHOD_PROVIDER_UPDATE);
5456
}
5557

58+
/** Updates offers for a provider. */
5659
callProviderUpdateOffers() {
5760
return this.call<types.RoflmarketProviderUpdateOffers, void>(METHOD_PROVIDER_UPDATE_OFFERS);
5861
}
5962

63+
/** Removes a provider. */
6064
callProviderRemove() {
6165
return this.call<types.RoflmarketProviderRemove, void>(METHOD_PROVIDER_REMOVE);
6266
}
6367

68+
/** Creates a new machine instance. */
6469
callInstanceCreate() {
6570
return this.call<types.RoflmarketInstanceCreate, void>(METHOD_INSTANCE_CREATE);
6671
}
6772

73+
/** Tops up a machine instance. */
6874
callInstanceTopUp() {
6975
return this.call<types.RoflmarketInstanceTopUp, void>(METHOD_INSTANCE_TOP_UP);
7076
}
7177

78+
/** Cancels a machine instance. */
7279
callInstanceCancel() {
7380
return this.call<types.RoflmarketInstanceCancel, void>(METHOD_INSTANCE_CANCEL);
7481
}
7582

83+
/** Executes commands on a machine instance. */
7684
callInstanceExecuteCmds() {
7785
return this.call<types.RoflmarketInstanceExecuteCmds, void>(METHOD_INSTANCE_EXECUTE_CMDS);
7886
}
7987

88+
/** Returns the provider descriptor. */
8089
queryProvider() {
8190
return this.query<types.RoflmarketProviderQuery, types.RoflmarketProvider>(METHOD_PROVIDER);
8291
}
8392

93+
/** Returns all provider descriptors. */
8494
queryProviders() {
8595
return this.query<void, types.RoflmarketProvider[]>(METHOD_PROVIDERS);
8696
}
8797

98+
/** Returns the specified offer. */
8899
queryOffer() {
89100
return this.query<types.RoflmarketOfferQuery, types.RoflmarketOffer>(METHOD_OFFER);
90101
}
91102

103+
/** Returns all offers of a given provider. */
92104
queryOffers() {
93105
return this.query<types.RoflmarketProviderQuery, types.RoflmarketOffer[]>(METHOD_OFFERS);
94106
}
95107

108+
/** Returns the machine instance descriptor. */
96109
queryInstance() {
97110
return this.query<types.RoflmarketInstanceQuery, types.RoflmarketInstance>(METHOD_INSTANCE);
98111
}
99112

113+
/** Returns all instances of a given provider. */
100114
queryInstances() {
101115
return this.query<types.RoflmarketProviderQuery, types.RoflmarketInstance[]>(
102116
METHOD_INSTANCES,
103117
);
104118
}
105119

120+
/** Returns all queued commands of a given machine instance. */
106121
queryInstanceCommands() {
107122
return this.query<types.RoflmarketInstanceQuery, types.RoflmarketQueuedCommand[]>(
108123
METHOD_INSTANCE_COMMANDS,
109124
);
110125
}
111126

127+
/** Returns the stake requirements. */
112128
queryStakeThresholds() {
113129
return this.query<void, types.RoflmarketStakeThresholds>(METHOD_STAKE_THRESHOLDS);
114130
}
115131

132+
/** Returns the module parameters. */
116133
queryParameters() {
117-
return this.query<void, types.RoflmarketParameters>(METHOD_PARAMETERS);
134+
return this.query<void, void>(METHOD_PARAMETERS);
118135
}
119136
}
120137

client-sdk/ts-web/rt/src/types.ts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -987,8 +987,6 @@ export interface RoflmarketStakeThresholds {
987987
provider_create: BaseUnits;
988988
}
989989

990-
export interface RoflmarketParameters {}
991-
992990
// Event types
993991
export interface RoflmarketProviderCreatedEvent {
994992
address: Uint8Array;
@@ -1034,33 +1032,10 @@ export interface RoflmarketInstanceCommandQueuedEvent {
10341032

10351033
// Types for rofl module
10361034

1037-
export interface RoflQuotePolicy {
1038-
ias?: {
1039-
disabled?: boolean;
1040-
allowed_quote_statuses?: number[];
1041-
gid_blacklist?: number[];
1042-
min_tcb_evaluation_data_number?: number;
1043-
};
1044-
pcs?: {
1045-
disabled?: boolean;
1046-
tcb_validity_period: number;
1047-
min_tcb_evaluation_data_number: number;
1048-
fmspc_blacklist?: string[];
1049-
tdx?: {
1050-
// TDX-specific policy fields
1051-
};
1052-
};
1053-
}
1054-
1055-
export interface RoflEnclaveIdentity {
1056-
mr_enclave: Uint8Array;
1057-
mr_signer: Uint8Array;
1058-
}
1059-
10601035
export interface RoflAllowedEndorsement {
1061-
any?: {};
1062-
role_compute?: {};
1063-
role_observer?: {};
1036+
any?: oasis.types.NotModeled;
1037+
role_compute?: oasis.types.NotModeled;
1038+
role_observer?: oasis.types.NotModeled;
10641039
entity?: Uint8Array;
10651040
node?: Uint8Array;
10661041
}
@@ -1076,8 +1051,8 @@ export enum FeePolicy {
10761051
}
10771052

10781053
export interface RoflAppAuthPolicy {
1079-
quotes: RoflQuotePolicy;
1080-
enclaves: RoflEnclaveIdentity[];
1054+
quotes: oasis.types.SGXPolicy;
1055+
enclaves: oasis.types.SGXEnclaveIdentity[];
10811056
endorsements: RoflAllowedEndorsement[];
10821057
fees: FeePolicy;
10831058
max_expiration: oasis.types.longnum;
@@ -1152,8 +1127,6 @@ export interface RoflRegistration {
11521127
metadata?: {[key: string]: string};
11531128
}
11541129

1155-
export interface RoflParameters {}
1156-
11571130
export interface RoflStakeThresholds {
11581131
app_create?: BaseUnits;
11591132
}

0 commit comments

Comments
 (0)