diff --git a/scripts/generate_protobuf.sh b/scripts/generate_protobuf.sh index cb4765ba..808cc196 100755 --- a/scripts/generate_protobuf.sh +++ b/scripts/generate_protobuf.sh @@ -4,7 +4,7 @@ set -o errexit -o nounset -o pipefail SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" rm -rf "${SCRIPT_PATH}/SecretNetwork" -git clone --depth 1 --branch cosmwasm-v1 https://github.com/scrtlabs/SecretNetwork "${SCRIPT_PATH}/SecretNetwork" +git clone --depth 1 --branch v1.5.0-beta.11 https://github.com/scrtlabs/SecretNetwork "${SCRIPT_PATH}/SecretNetwork" OUT_DIR="${SCRIPT_PATH}/../src/protobuf_stuff" mkdir -p "$OUT_DIR" diff --git a/src/protobuf_stuff/cosmos/auth/v1beta1/query.ts b/src/protobuf_stuff/cosmos/auth/v1beta1/query.ts index af2fb306..40606c7c 100644 --- a/src/protobuf_stuff/cosmos/auth/v1beta1/query.ts +++ b/src/protobuf_stuff/cosmos/auth/v1beta1/query.ts @@ -55,6 +55,16 @@ export interface QueryParamsResponse { params?: Params; } +/** QueryModuleAccountByNameRequest is the request type for the Query/ModuleAccountByName RPC method. */ +export interface QueryModuleAccountByNameRequest { + name: string; +} + +/** QueryModuleAccountByNameResponse is the response type for the Query/ModuleAccountByName RPC method. */ +export interface QueryModuleAccountByNameResponse { + account?: Any; +} + function createBaseQueryAccountsRequest(): QueryAccountsRequest { return { pagination: undefined }; } @@ -422,6 +432,124 @@ export const QueryParamsResponse = { }, }; +function createBaseQueryModuleAccountByNameRequest(): QueryModuleAccountByNameRequest { + return { name: "" }; +} + +export const QueryModuleAccountByNameRequest = { + encode( + message: QueryModuleAccountByNameRequest, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.name !== "") { + writer.uint32(10).string(message.name); + } + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number, + ): QueryModuleAccountByNameRequest { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryModuleAccountByNameRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): QueryModuleAccountByNameRequest { + return { + name: isSet(object.name) ? String(object.name) : "", + }; + }, + + toJSON(message: QueryModuleAccountByNameRequest): unknown { + const obj: any = {}; + message.name !== undefined && (obj.name = message.name); + return obj; + }, + + fromPartial, I>>( + object: I, + ): QueryModuleAccountByNameRequest { + const message = createBaseQueryModuleAccountByNameRequest(); + message.name = object.name ?? ""; + return message; + }, +}; + +function createBaseQueryModuleAccountByNameResponse(): QueryModuleAccountByNameResponse { + return { account: undefined }; +} + +export const QueryModuleAccountByNameResponse = { + encode( + message: QueryModuleAccountByNameResponse, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.account !== undefined) { + Any.encode(message.account, writer.uint32(10).fork()).ldelim(); + } + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number, + ): QueryModuleAccountByNameResponse { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryModuleAccountByNameResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.account = Any.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): QueryModuleAccountByNameResponse { + return { + account: isSet(object.account) ? Any.fromJSON(object.account) : undefined, + }; + }, + + toJSON(message: QueryModuleAccountByNameResponse): unknown { + const obj: any = {}; + message.account !== undefined && + (obj.account = message.account ? Any.toJSON(message.account) : undefined); + return obj; + }, + + fromPartial< + I extends Exact, I>, + >(object: I): QueryModuleAccountByNameResponse { + const message = createBaseQueryModuleAccountByNameResponse(); + message.account = + object.account !== undefined && object.account !== null + ? Any.fromPartial(object.account) + : undefined; + return message; + }, +}; + /** Query defines the gRPC querier service. */ export interface Query { /** @@ -443,6 +571,11 @@ export interface Query { request: DeepPartial, metadata?: grpc.Metadata, ): Promise; + /** ModuleAccountByName returns the module account info by module name */ + moduleAccountByName( + request: DeepPartial, + metadata?: grpc.Metadata, + ): Promise; } export class QueryClientImpl implements Query { @@ -453,6 +586,7 @@ export class QueryClientImpl implements Query { this.accounts = this.accounts.bind(this); this.account = this.account.bind(this); this.params = this.params.bind(this); + this.moduleAccountByName = this.moduleAccountByName.bind(this); } accounts( @@ -487,6 +621,17 @@ export class QueryClientImpl implements Query { metadata, ); } + + moduleAccountByName( + request: DeepPartial, + metadata?: grpc.Metadata, + ): Promise { + return this.rpc.unary( + QueryModuleAccountByNameDesc, + QueryModuleAccountByNameRequest.fromPartial(request), + metadata, + ); + } } export const QueryDesc = { @@ -559,6 +704,28 @@ export const QueryParamsDesc: UnaryMethodDefinitionish = { } as any, }; +export const QueryModuleAccountByNameDesc: UnaryMethodDefinitionish = { + methodName: "ModuleAccountByName", + service: QueryDesc, + requestStream: false, + responseStream: false, + requestType: { + serializeBinary() { + return QueryModuleAccountByNameRequest.encode(this).finish(); + }, + } as any, + responseType: { + deserializeBinary(data: Uint8Array) { + return { + ...QueryModuleAccountByNameResponse.decode(data), + toObject() { + return this; + }, + }; + }, + } as any, +}; + interface UnaryMethodDefinitionishR extends grpc.UnaryMethodDefinition { requestStream: any; diff --git a/src/protobuf_stuff/cosmos/base/node/v1beta1/query.ts b/src/protobuf_stuff/cosmos/base/node/v1beta1/query.ts new file mode 100644 index 00000000..f27c58a0 --- /dev/null +++ b/src/protobuf_stuff/cosmos/base/node/v1beta1/query.ts @@ -0,0 +1,280 @@ +/* eslint-disable */ +import Long from "long"; +import { grpc } from "@improbable-eng/grpc-web"; +import * as _m0 from "protobufjs/minimal"; +import { BrowserHeaders } from "browser-headers"; + +export const protobufPackage = "cosmos.base.node.v1beta1"; + +/** ConfigRequest defines the request structure for the Config gRPC query. */ +export interface ConfigRequest {} + +/** ConfigResponse defines the response structure for the Config gRPC query. */ +export interface ConfigResponse { + minimumGasPrice: string; +} + +function createBaseConfigRequest(): ConfigRequest { + return {}; +} + +export const ConfigRequest = { + encode( + _: ConfigRequest, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): ConfigRequest { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseConfigRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(_: any): ConfigRequest { + return {}; + }, + + toJSON(_: ConfigRequest): unknown { + const obj: any = {}; + return obj; + }, + + fromPartial, I>>( + _: I, + ): ConfigRequest { + const message = createBaseConfigRequest(); + return message; + }, +}; + +function createBaseConfigResponse(): ConfigResponse { + return { minimumGasPrice: "" }; +} + +export const ConfigResponse = { + encode( + message: ConfigResponse, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.minimumGasPrice !== "") { + writer.uint32(10).string(message.minimumGasPrice); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): ConfigResponse { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseConfigResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.minimumGasPrice = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): ConfigResponse { + return { + minimumGasPrice: isSet(object.minimumGasPrice) + ? String(object.minimumGasPrice) + : "", + }; + }, + + toJSON(message: ConfigResponse): unknown { + const obj: any = {}; + message.minimumGasPrice !== undefined && + (obj.minimumGasPrice = message.minimumGasPrice); + return obj; + }, + + fromPartial, I>>( + object: I, + ): ConfigResponse { + const message = createBaseConfigResponse(); + message.minimumGasPrice = object.minimumGasPrice ?? ""; + return message; + }, +}; + +/** Service defines the gRPC querier service for node related queries. */ +export interface Service { + /** Config queries for the operator configuration. */ + config( + request: DeepPartial, + metadata?: grpc.Metadata, + ): Promise; +} + +export class ServiceClientImpl implements Service { + private readonly rpc: Rpc; + + constructor(rpc: Rpc) { + this.rpc = rpc; + this.config = this.config.bind(this); + } + + config( + request: DeepPartial, + metadata?: grpc.Metadata, + ): Promise { + return this.rpc.unary( + ServiceConfigDesc, + ConfigRequest.fromPartial(request), + metadata, + ); + } +} + +export const ServiceDesc = { + serviceName: "cosmos.base.node.v1beta1.Service", +}; + +export const ServiceConfigDesc: UnaryMethodDefinitionish = { + methodName: "Config", + service: ServiceDesc, + requestStream: false, + responseStream: false, + requestType: { + serializeBinary() { + return ConfigRequest.encode(this).finish(); + }, + } as any, + responseType: { + deserializeBinary(data: Uint8Array) { + return { + ...ConfigResponse.decode(data), + toObject() { + return this; + }, + }; + }, + } as any, +}; + +interface UnaryMethodDefinitionishR + extends grpc.UnaryMethodDefinition { + requestStream: any; + responseStream: any; +} + +type UnaryMethodDefinitionish = UnaryMethodDefinitionishR; + +interface Rpc { + unary( + methodDesc: T, + request: any, + metadata: grpc.Metadata | undefined, + ): Promise; +} + +export class GrpcWebImpl { + private host: string; + private options: { + transport?: grpc.TransportFactory; + + debug?: boolean; + metadata?: grpc.Metadata; + }; + + constructor( + host: string, + options: { + transport?: grpc.TransportFactory; + + debug?: boolean; + metadata?: grpc.Metadata; + }, + ) { + this.host = host; + this.options = options; + } + + unary( + methodDesc: T, + _request: any, + metadata: grpc.Metadata | undefined, + ): Promise { + const request = { ..._request, ...methodDesc.requestType }; + const maybeCombinedMetadata = + metadata && this.options.metadata + ? new BrowserHeaders({ + ...this.options?.metadata.headersMap, + ...metadata?.headersMap, + }) + : metadata || this.options.metadata; + return new Promise((resolve, reject) => { + grpc.unary(methodDesc, { + request, + host: this.host, + metadata: maybeCombinedMetadata, + transport: this.options.transport, + debug: this.options.debug, + onEnd: function (response) { + if (response.status === grpc.Code.OK) { + resolve(response.message); + } else { + const err = new Error(response.statusMessage) as any; + err.code = response.status; + err.metadata = response.trailers; + reject(err); + } + }, + }); + }); + } +} + +type Builtin = + | Date + | Function + | Uint8Array + | string + | number + | boolean + | undefined; + +export type DeepPartial = T extends Builtin + ? T + : T extends Array + ? Array> + : T extends ReadonlyArray + ? ReadonlyArray> + : T extends {} + ? { [K in keyof T]?: DeepPartial } + : Partial; + +type KeysOfUnion = T extends T ? keyof T : never; +export type Exact = P extends Builtin + ? P + : P & { [K in keyof P]: Exact } & Record< + Exclude>, + never + >; + +if (_m0.util.Long !== Long) { + _m0.util.Long = Long as any; + _m0.configure(); +} + +function isSet(value: any): boolean { + return value !== null && value !== undefined; +} diff --git a/src/protobuf_stuff/cosmos/feegrant/v1beta1/query.ts b/src/protobuf_stuff/cosmos/feegrant/v1beta1/query.ts index c1ac88a3..797e8530 100644 --- a/src/protobuf_stuff/cosmos/feegrant/v1beta1/query.ts +++ b/src/protobuf_stuff/cosmos/feegrant/v1beta1/query.ts @@ -42,6 +42,21 @@ export interface QueryAllowancesResponse { pagination?: PageResponse; } +/** QueryAllowancesByGranterRequest is the request type for the Query/AllowancesByGranter RPC method. */ +export interface QueryAllowancesByGranterRequest { + granter: string; + /** pagination defines an pagination for the request. */ + pagination?: PageRequest; +} + +/** QueryAllowancesByGranterResponse is the response type for the Query/AllowancesByGranter RPC method. */ +export interface QueryAllowancesByGranterResponse { + /** allowances that have been issued by the granter. */ + allowances: Grant[]; + /** pagination defines an pagination for the response. */ + pagination?: PageResponse; +} + function createBaseQueryAllowanceRequest(): QueryAllowanceRequest { return { granter: "", grantee: "" }; } @@ -333,6 +348,166 @@ export const QueryAllowancesResponse = { }, }; +function createBaseQueryAllowancesByGranterRequest(): QueryAllowancesByGranterRequest { + return { granter: "", pagination: undefined }; +} + +export const QueryAllowancesByGranterRequest = { + encode( + message: QueryAllowancesByGranterRequest, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + if (message.granter !== "") { + writer.uint32(10).string(message.granter); + } + if (message.pagination !== undefined) { + PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim(); + } + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number, + ): QueryAllowancesByGranterRequest { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryAllowancesByGranterRequest(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.granter = reader.string(); + break; + case 2: + message.pagination = PageRequest.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): QueryAllowancesByGranterRequest { + return { + granter: isSet(object.granter) ? String(object.granter) : "", + pagination: isSet(object.pagination) + ? PageRequest.fromJSON(object.pagination) + : undefined, + }; + }, + + toJSON(message: QueryAllowancesByGranterRequest): unknown { + const obj: any = {}; + message.granter !== undefined && (obj.granter = message.granter); + message.pagination !== undefined && + (obj.pagination = message.pagination + ? PageRequest.toJSON(message.pagination) + : undefined); + return obj; + }, + + fromPartial, I>>( + object: I, + ): QueryAllowancesByGranterRequest { + const message = createBaseQueryAllowancesByGranterRequest(); + message.granter = object.granter ?? ""; + message.pagination = + object.pagination !== undefined && object.pagination !== null + ? PageRequest.fromPartial(object.pagination) + : undefined; + return message; + }, +}; + +function createBaseQueryAllowancesByGranterResponse(): QueryAllowancesByGranterResponse { + return { allowances: [], pagination: undefined }; +} + +export const QueryAllowancesByGranterResponse = { + encode( + message: QueryAllowancesByGranterResponse, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + for (const v of message.allowances) { + Grant.encode(v!, writer.uint32(10).fork()).ldelim(); + } + if (message.pagination !== undefined) { + PageResponse.encode( + message.pagination, + writer.uint32(18).fork(), + ).ldelim(); + } + return writer; + }, + + decode( + input: _m0.Reader | Uint8Array, + length?: number, + ): QueryAllowancesByGranterResponse { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseQueryAllowancesByGranterResponse(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.allowances.push(Grant.decode(reader, reader.uint32())); + break; + case 2: + message.pagination = PageResponse.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): QueryAllowancesByGranterResponse { + return { + allowances: Array.isArray(object?.allowances) + ? object.allowances.map((e: any) => Grant.fromJSON(e)) + : [], + pagination: isSet(object.pagination) + ? PageResponse.fromJSON(object.pagination) + : undefined, + }; + }, + + toJSON(message: QueryAllowancesByGranterResponse): unknown { + const obj: any = {}; + if (message.allowances) { + obj.allowances = message.allowances.map((e) => + e ? Grant.toJSON(e) : undefined, + ); + } else { + obj.allowances = []; + } + message.pagination !== undefined && + (obj.pagination = message.pagination + ? PageResponse.toJSON(message.pagination) + : undefined); + return obj; + }, + + fromPartial< + I extends Exact, I>, + >(object: I): QueryAllowancesByGranterResponse { + const message = createBaseQueryAllowancesByGranterResponse(); + message.allowances = + object.allowances?.map((e) => Grant.fromPartial(e)) || []; + message.pagination = + object.pagination !== undefined && object.pagination !== null + ? PageResponse.fromPartial(object.pagination) + : undefined; + return message; + }, +}; + /** Query defines the gRPC querier service. */ export interface Query { /** Allowance returns fee granted to the grantee by the granter. */ @@ -345,6 +520,14 @@ export interface Query { request: DeepPartial, metadata?: grpc.Metadata, ): Promise; + /** + * AllowancesByGranter returns all the grants given by an address + * Since v0.46 + */ + allowancesByGranter( + request: DeepPartial, + metadata?: grpc.Metadata, + ): Promise; } export class QueryClientImpl implements Query { @@ -354,6 +537,7 @@ export class QueryClientImpl implements Query { this.rpc = rpc; this.allowance = this.allowance.bind(this); this.allowances = this.allowances.bind(this); + this.allowancesByGranter = this.allowancesByGranter.bind(this); } allowance( @@ -377,6 +561,17 @@ export class QueryClientImpl implements Query { metadata, ); } + + allowancesByGranter( + request: DeepPartial, + metadata?: grpc.Metadata, + ): Promise { + return this.rpc.unary( + QueryAllowancesByGranterDesc, + QueryAllowancesByGranterRequest.fromPartial(request), + metadata, + ); + } } export const QueryDesc = { @@ -427,6 +622,28 @@ export const QueryAllowancesDesc: UnaryMethodDefinitionish = { } as any, }; +export const QueryAllowancesByGranterDesc: UnaryMethodDefinitionish = { + methodName: "AllowancesByGranter", + service: QueryDesc, + requestStream: false, + responseStream: false, + requestType: { + serializeBinary() { + return QueryAllowancesByGranterRequest.encode(this).finish(); + }, + } as any, + responseType: { + deserializeBinary(data: Uint8Array) { + return { + ...QueryAllowancesByGranterResponse.decode(data), + toObject() { + return this; + }, + }; + }, + } as any, +}; + interface UnaryMethodDefinitionishR extends grpc.UnaryMethodDefinition { requestStream: any; diff --git a/src/protobuf_stuff/secret/compute/v1beta1/query.ts b/src/protobuf_stuff/secret/compute/v1beta1/query.ts index e0654290..b19c8eb9 100644 --- a/src/protobuf_stuff/secret/compute/v1beta1/query.ts +++ b/src/protobuf_stuff/secret/compute/v1beta1/query.ts @@ -24,7 +24,7 @@ export interface QueryByContractAddressRequest { contractAddress: string; } -export interface QueryByCodeIDRequest { +export interface QueryByCodeIdRequest { codeId: string; } @@ -46,7 +46,7 @@ export interface ContractInfoWithAddress { ContractInfo?: ContractInfo; } -export interface QueryContractsByCodeIDResponse { +export interface QueryContractsByCodeIdResponse { contractInfos: ContractInfoWithAddress[]; } @@ -87,8 +87,12 @@ export interface DecryptedAnswer { input: string; outputData: string; outputDataAsString: string; +} + +export interface DecryptedAnswers { + answers: DecryptedAnswer[]; outputLogs: StringEvent[]; - outputError: Uint8Array; + outputError: string; plaintextError: string; } @@ -280,13 +284,13 @@ export const QueryByContractAddressRequest = { }, }; -function createBaseQueryByCodeIDRequest(): QueryByCodeIDRequest { +function createBaseQueryByCodeIdRequest(): QueryByCodeIdRequest { return { codeId: "0" }; } -export const QueryByCodeIDRequest = { +export const QueryByCodeIdRequest = { encode( - message: QueryByCodeIDRequest, + message: QueryByCodeIdRequest, writer: _m0.Writer = _m0.Writer.create(), ): _m0.Writer { if (message.codeId !== "0") { @@ -298,10 +302,10 @@ export const QueryByCodeIDRequest = { decode( input: _m0.Reader | Uint8Array, length?: number, - ): QueryByCodeIDRequest { + ): QueryByCodeIdRequest { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryByCodeIDRequest(); + const message = createBaseQueryByCodeIdRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -316,22 +320,22 @@ export const QueryByCodeIDRequest = { return message; }, - fromJSON(object: any): QueryByCodeIDRequest { + fromJSON(object: any): QueryByCodeIdRequest { return { codeId: isSet(object.codeId) ? String(object.codeId) : "0", }; }, - toJSON(message: QueryByCodeIDRequest): unknown { + toJSON(message: QueryByCodeIdRequest): unknown { const obj: any = {}; message.codeId !== undefined && (obj.codeId = message.codeId); return obj; }, - fromPartial, I>>( + fromPartial, I>>( object: I, - ): QueryByCodeIDRequest { - const message = createBaseQueryByCodeIDRequest(); + ): QueryByCodeIdRequest { + const message = createBaseQueryByCodeIdRequest(); message.codeId = object.codeId ?? "0"; return message; }, @@ -559,13 +563,13 @@ export const ContractInfoWithAddress = { }, }; -function createBaseQueryContractsByCodeIDResponse(): QueryContractsByCodeIDResponse { +function createBaseQueryContractsByCodeIdResponse(): QueryContractsByCodeIdResponse { return { contractInfos: [] }; } -export const QueryContractsByCodeIDResponse = { +export const QueryContractsByCodeIdResponse = { encode( - message: QueryContractsByCodeIDResponse, + message: QueryContractsByCodeIdResponse, writer: _m0.Writer = _m0.Writer.create(), ): _m0.Writer { for (const v of message.contractInfos) { @@ -577,10 +581,10 @@ export const QueryContractsByCodeIDResponse = { decode( input: _m0.Reader | Uint8Array, length?: number, - ): QueryContractsByCodeIDResponse { + ): QueryContractsByCodeIdResponse { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseQueryContractsByCodeIDResponse(); + const message = createBaseQueryContractsByCodeIdResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -597,7 +601,7 @@ export const QueryContractsByCodeIDResponse = { return message; }, - fromJSON(object: any): QueryContractsByCodeIDResponse { + fromJSON(object: any): QueryContractsByCodeIdResponse { return { contractInfos: Array.isArray(object?.contractInfos) ? object.contractInfos.map((e: any) => @@ -607,7 +611,7 @@ export const QueryContractsByCodeIDResponse = { }; }, - toJSON(message: QueryContractsByCodeIDResponse): unknown { + toJSON(message: QueryContractsByCodeIdResponse): unknown { const obj: any = {}; if (message.contractInfos) { obj.contractInfos = message.contractInfos.map((e) => @@ -619,10 +623,10 @@ export const QueryContractsByCodeIDResponse = { return obj; }, - fromPartial, I>>( + fromPartial, I>>( object: I, - ): QueryContractsByCodeIDResponse { - const message = createBaseQueryContractsByCodeIDResponse(); + ): QueryContractsByCodeIdResponse { + const message = createBaseQueryContractsByCodeIdResponse(); message.contractInfos = object.contractInfos?.map((e) => ContractInfoWithAddress.fromPartial(e), @@ -1040,15 +1044,7 @@ export const QueryCodeHashResponse = { }; function createBaseDecryptedAnswer(): DecryptedAnswer { - return { - type: "", - input: "", - outputData: "", - outputDataAsString: "", - outputLogs: [], - outputError: new Uint8Array(), - plaintextError: "", - }; + return { type: "", input: "", outputData: "", outputDataAsString: "" }; } export const DecryptedAnswer = { @@ -1068,15 +1064,6 @@ export const DecryptedAnswer = { if (message.outputDataAsString !== "") { writer.uint32(34).string(message.outputDataAsString); } - for (const v of message.outputLogs) { - StringEvent.encode(v!, writer.uint32(42).fork()).ldelim(); - } - if (message.outputError.length !== 0) { - writer.uint32(50).bytes(message.outputError); - } - if (message.plaintextError !== "") { - writer.uint32(58).string(message.plaintextError); - } return writer; }, @@ -1099,15 +1086,6 @@ export const DecryptedAnswer = { case 4: message.outputDataAsString = reader.string(); break; - case 5: - message.outputLogs.push(StringEvent.decode(reader, reader.uint32())); - break; - case 6: - message.outputError = reader.bytes(); - break; - case 7: - message.plaintextError = reader.string(); - break; default: reader.skipType(tag & 7); break; @@ -1124,15 +1102,6 @@ export const DecryptedAnswer = { outputDataAsString: isSet(object.outputDataAsString) ? String(object.outputDataAsString) : "", - outputLogs: Array.isArray(object?.outputLogs) - ? object.outputLogs.map((e: any) => StringEvent.fromJSON(e)) - : [], - outputError: isSet(object.outputError) - ? bytesFromBase64(object.outputError) - : new Uint8Array(), - plaintextError: isSet(object.plaintextError) - ? String(object.plaintextError) - : "", }; }, @@ -1143,6 +1112,96 @@ export const DecryptedAnswer = { message.outputData !== undefined && (obj.outputData = message.outputData); message.outputDataAsString !== undefined && (obj.outputDataAsString = message.outputDataAsString); + return obj; + }, + + fromPartial, I>>( + object: I, + ): DecryptedAnswer { + const message = createBaseDecryptedAnswer(); + message.type = object.type ?? ""; + message.input = object.input ?? ""; + message.outputData = object.outputData ?? ""; + message.outputDataAsString = object.outputDataAsString ?? ""; + return message; + }, +}; + +function createBaseDecryptedAnswers(): DecryptedAnswers { + return { answers: [], outputLogs: [], outputError: "", plaintextError: "" }; +} + +export const DecryptedAnswers = { + encode( + message: DecryptedAnswers, + writer: _m0.Writer = _m0.Writer.create(), + ): _m0.Writer { + for (const v of message.answers) { + DecryptedAnswer.encode(v!, writer.uint32(10).fork()).ldelim(); + } + for (const v of message.outputLogs) { + StringEvent.encode(v!, writer.uint32(18).fork()).ldelim(); + } + if (message.outputError !== "") { + writer.uint32(26).string(message.outputError); + } + if (message.plaintextError !== "") { + writer.uint32(34).string(message.plaintextError); + } + return writer; + }, + + decode(input: _m0.Reader | Uint8Array, length?: number): DecryptedAnswers { + const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + let end = length === undefined ? reader.len : reader.pos + length; + const message = createBaseDecryptedAnswers(); + while (reader.pos < end) { + const tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.answers.push(DecryptedAnswer.decode(reader, reader.uint32())); + break; + case 2: + message.outputLogs.push(StringEvent.decode(reader, reader.uint32())); + break; + case 3: + message.outputError = reader.string(); + break; + case 4: + message.plaintextError = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }, + + fromJSON(object: any): DecryptedAnswers { + return { + answers: Array.isArray(object?.answers) + ? object.answers.map((e: any) => DecryptedAnswer.fromJSON(e)) + : [], + outputLogs: Array.isArray(object?.outputLogs) + ? object.outputLogs.map((e: any) => StringEvent.fromJSON(e)) + : [], + outputError: isSet(object.outputError) ? String(object.outputError) : "", + plaintextError: isSet(object.plaintextError) + ? String(object.plaintextError) + : "", + }; + }, + + toJSON(message: DecryptedAnswers): unknown { + const obj: any = {}; + if (message.answers) { + obj.answers = message.answers.map((e) => + e ? DecryptedAnswer.toJSON(e) : undefined, + ); + } else { + obj.answers = []; + } if (message.outputLogs) { obj.outputLogs = message.outputLogs.map((e) => e ? StringEvent.toJSON(e) : undefined, @@ -1151,27 +1210,21 @@ export const DecryptedAnswer = { obj.outputLogs = []; } message.outputError !== undefined && - (obj.outputError = base64FromBytes( - message.outputError !== undefined - ? message.outputError - : new Uint8Array(), - )); + (obj.outputError = message.outputError); message.plaintextError !== undefined && (obj.plaintextError = message.plaintextError); return obj; }, - fromPartial, I>>( + fromPartial, I>>( object: I, - ): DecryptedAnswer { - const message = createBaseDecryptedAnswer(); - message.type = object.type ?? ""; - message.input = object.input ?? ""; - message.outputData = object.outputData ?? ""; - message.outputDataAsString = object.outputDataAsString ?? ""; + ): DecryptedAnswers { + const message = createBaseDecryptedAnswers(); + message.answers = + object.answers?.map((e) => DecryptedAnswer.fromPartial(e)) || []; message.outputLogs = object.outputLogs?.map((e) => StringEvent.fromPartial(e)) || []; - message.outputError = object.outputError ?? new Uint8Array(); + message.outputError = object.outputError ?? ""; message.plaintextError = object.plaintextError ?? ""; return message; }, @@ -1185,10 +1238,10 @@ export interface Query { metadata?: grpc.Metadata, ): Promise; /** Query code info by id */ - contractsByCodeID( - request: DeepPartial, + contractsByCodeId( + request: DeepPartial, metadata?: grpc.Metadata, - ): Promise; + ): Promise; /** Query secret contract */ querySecretContract( request: DeepPartial, @@ -1196,7 +1249,7 @@ export interface Query { ): Promise; /** Query a specific contract code by id */ code( - request: DeepPartial, + request: DeepPartial, metadata?: grpc.Metadata, ): Promise; /** Query all contract codes on-chain */ @@ -1210,8 +1263,8 @@ export interface Query { metadata?: grpc.Metadata, ): Promise; /** Query code hash by code id */ - codeHashByCodeID( - request: DeepPartial, + codeHashByCodeId( + request: DeepPartial, metadata?: grpc.Metadata, ): Promise; /** Query contract label by address */ @@ -1232,12 +1285,12 @@ export class QueryClientImpl implements Query { constructor(rpc: Rpc) { this.rpc = rpc; this.contractInfo = this.contractInfo.bind(this); - this.contractsByCodeID = this.contractsByCodeID.bind(this); + this.contractsByCodeId = this.contractsByCodeId.bind(this); this.querySecretContract = this.querySecretContract.bind(this); this.code = this.code.bind(this); this.codes = this.codes.bind(this); this.codeHashByContractAddress = this.codeHashByContractAddress.bind(this); - this.codeHashByCodeID = this.codeHashByCodeID.bind(this); + this.codeHashByCodeId = this.codeHashByCodeId.bind(this); this.labelByAddress = this.labelByAddress.bind(this); this.addressByLabel = this.addressByLabel.bind(this); } @@ -1253,13 +1306,13 @@ export class QueryClientImpl implements Query { ); } - contractsByCodeID( - request: DeepPartial, + contractsByCodeId( + request: DeepPartial, metadata?: grpc.Metadata, - ): Promise { + ): Promise { return this.rpc.unary( - QueryContractsByCodeIDDesc, - QueryByCodeIDRequest.fromPartial(request), + QueryContractsByCodeIdDesc, + QueryByCodeIdRequest.fromPartial(request), metadata, ); } @@ -1276,12 +1329,12 @@ export class QueryClientImpl implements Query { } code( - request: DeepPartial, + request: DeepPartial, metadata?: grpc.Metadata, ): Promise { return this.rpc.unary( QueryCodeDesc, - QueryByCodeIDRequest.fromPartial(request), + QueryByCodeIdRequest.fromPartial(request), metadata, ); } @@ -1304,13 +1357,13 @@ export class QueryClientImpl implements Query { ); } - codeHashByCodeID( - request: DeepPartial, + codeHashByCodeId( + request: DeepPartial, metadata?: grpc.Metadata, ): Promise { return this.rpc.unary( - QueryCodeHashByCodeIDDesc, - QueryByCodeIDRequest.fromPartial(request), + QueryCodeHashByCodeIdDesc, + QueryByCodeIdRequest.fromPartial(request), metadata, ); } @@ -1364,20 +1417,20 @@ export const QueryContractInfoDesc: UnaryMethodDefinitionish = { } as any, }; -export const QueryContractsByCodeIDDesc: UnaryMethodDefinitionish = { - methodName: "ContractsByCodeID", +export const QueryContractsByCodeIdDesc: UnaryMethodDefinitionish = { + methodName: "ContractsByCodeId", service: QueryDesc, requestStream: false, responseStream: false, requestType: { serializeBinary() { - return QueryByCodeIDRequest.encode(this).finish(); + return QueryByCodeIdRequest.encode(this).finish(); }, } as any, responseType: { deserializeBinary(data: Uint8Array) { return { - ...QueryContractsByCodeIDResponse.decode(data), + ...QueryContractsByCodeIdResponse.decode(data), toObject() { return this; }, @@ -1415,7 +1468,7 @@ export const QueryCodeDesc: UnaryMethodDefinitionish = { responseStream: false, requestType: { serializeBinary() { - return QueryByCodeIDRequest.encode(this).finish(); + return QueryByCodeIdRequest.encode(this).finish(); }, } as any, responseType: { @@ -1474,14 +1527,14 @@ export const QueryCodeHashByContractAddressDesc: UnaryMethodDefinitionish = { } as any, }; -export const QueryCodeHashByCodeIDDesc: UnaryMethodDefinitionish = { - methodName: "CodeHashByCodeID", +export const QueryCodeHashByCodeIdDesc: UnaryMethodDefinitionish = { + methodName: "CodeHashByCodeId", service: QueryDesc, requestStream: false, responseStream: false, requestType: { serializeBinary() { - return QueryByCodeIDRequest.encode(this).finish(); + return QueryByCodeIdRequest.encode(this).finish(); }, } as any, responseType: { diff --git a/src/query/compute.ts b/src/query/compute.ts index 9d8dbd85..84125d76 100644 --- a/src/query/compute.ts +++ b/src/query/compute.ts @@ -190,7 +190,7 @@ export class ComputeQuerier { ): Promise { await this.init(); - const response = await this.client!.contractsByCodeID( + const response = await this.client!.contractsByCodeId( { codeId: String(codeId), }, diff --git a/test/globalSetup.ts b/test/globalSetup.ts index 7273e19d..c88eb37a 100644 --- a/test/globalSetup.ts +++ b/test/globalSetup.ts @@ -8,7 +8,7 @@ module.exports = async () => { console.log("\nSetting up LocalSecret..."); await exec("docker rm -f localsecret || true"); const { /* stdout, */ stderr } = await exec( - "docker run -it -d -p 9091:9091 --name localsecret ghcr.io/scrtlabs/localsecret:v1.4.0", + "docker run -it -d -p 9091:9091 --name localsecret ghcr.io/scrtlabs/localsecret:v1.5.0-beta.11", ); // console.log("stdout (testnet container id?):", stdout);