Skip to content

Commit

Permalink
Update protobufs for string admin
Browse files Browse the repository at this point in the history
  • Loading branch information
assafmo committed Jun 12, 2023
1 parent 96af4f0 commit 9e619da
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/grpc_gateway/secret/compute/v1beta1/msg.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export type MsgInstantiateContract = {
init_msg?: Uint8Array
init_funds?: CosmosBaseV1beta1Coin.Coin[]
callback_sig?: Uint8Array
admin?: Uint8Array
admin?: string
}

export type MsgInstantiateContractResponse = {
Expand Down
2 changes: 1 addition & 1 deletion src/grpc_gateway/secret/compute/v1beta1/types.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export type ContractInfo = {
label?: string
created?: AbsoluteTxPosition
ibc_port_id?: string
admin?: Uint8Array
admin?: string
admin_proof?: Uint8Array
}

Expand Down
21 changes: 8 additions & 13 deletions src/protobuf/secret/compute/v1beta1/msg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export interface MsgInstantiateContract {
/** used internally for encryption, should always be empty in a signed transaction */
callback_sig: Uint8Array;
/** Admin is an optional address that can execute migrations */
admin: Uint8Array;
admin: string;
}

/** MsgInstantiateContractResponse return instantiation result data */
Expand Down Expand Up @@ -273,7 +273,7 @@ function createBaseMsgInstantiateContract(): MsgInstantiateContract {
init_msg: new Uint8Array(),
init_funds: [],
callback_sig: new Uint8Array(),
admin: new Uint8Array(),
admin: "",
};
}

Expand Down Expand Up @@ -303,8 +303,8 @@ export const MsgInstantiateContract = {
if (message.callback_sig.length !== 0) {
writer.uint32(58).bytes(message.callback_sig);
}
if (message.admin.length !== 0) {
writer.uint32(66).bytes(message.admin);
if (message.admin !== "") {
writer.uint32(66).string(message.admin);
}
return writer;
},
Expand Down Expand Up @@ -341,7 +341,7 @@ export const MsgInstantiateContract = {
message.callback_sig = reader.bytes();
break;
case 8:
message.admin = reader.bytes();
message.admin = reader.string();
break;
default:
reader.skipType(tag & 7);
Expand Down Expand Up @@ -370,9 +370,7 @@ export const MsgInstantiateContract = {
callback_sig: isSet(object.callback_sig)
? bytesFromBase64(object.callback_sig)
: new Uint8Array(),
admin: isSet(object.admin)
? bytesFromBase64(object.admin)
: new Uint8Array(),
admin: isSet(object.admin) ? String(object.admin) : "",
};
},

Expand Down Expand Up @@ -403,10 +401,7 @@ export const MsgInstantiateContract = {
? message.callback_sig
: new Uint8Array(),
));
message.admin !== undefined &&
(obj.admin = base64FromBytes(
message.admin !== undefined ? message.admin : new Uint8Array(),
));
message.admin !== undefined && (obj.admin = message.admin);
return obj;
},

Expand All @@ -422,7 +417,7 @@ export const MsgInstantiateContract = {
message.init_funds =
object.init_funds?.map((e) => Coin.fromPartial(e)) || [];
message.callback_sig = object.callback_sig ?? new Uint8Array();
message.admin = object.admin ?? new Uint8Array();
message.admin = object.admin ?? "";
return message;
},
};
Expand Down
21 changes: 8 additions & 13 deletions src/protobuf/secret/compute/v1beta1/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export interface ContractInfo {
created?: AbsoluteTxPosition;
ibc_port_id: string;
/** Admin is an optional address that can execute migrations */
admin: Uint8Array;
admin: string;
/** Proof that enclave executed the instantiate command */
admin_proof: Uint8Array;
}
Expand Down Expand Up @@ -551,7 +551,7 @@ function createBaseContractInfo(): ContractInfo {
label: "",
created: undefined,
ibc_port_id: "",
admin: new Uint8Array(),
admin: "",
admin_proof: new Uint8Array(),
};
}
Expand Down Expand Up @@ -579,8 +579,8 @@ export const ContractInfo = {
if (message.ibc_port_id !== "") {
writer.uint32(50).string(message.ibc_port_id);
}
if (message.admin.length !== 0) {
writer.uint32(58).bytes(message.admin);
if (message.admin !== "") {
writer.uint32(58).string(message.admin);
}
if (message.admin_proof.length !== 0) {
writer.uint32(66).bytes(message.admin_proof);
Expand Down Expand Up @@ -611,7 +611,7 @@ export const ContractInfo = {
message.ibc_port_id = reader.string();
break;
case 7:
message.admin = reader.bytes();
message.admin = reader.string();
break;
case 8:
message.admin_proof = reader.bytes();
Expand All @@ -635,9 +635,7 @@ export const ContractInfo = {
? AbsoluteTxPosition.fromJSON(object.created)
: undefined,
ibc_port_id: isSet(object.ibc_port_id) ? String(object.ibc_port_id) : "",
admin: isSet(object.admin)
? bytesFromBase64(object.admin)
: new Uint8Array(),
admin: isSet(object.admin) ? String(object.admin) : "",
admin_proof: isSet(object.admin_proof)
? bytesFromBase64(object.admin_proof)
: new Uint8Array(),
Expand All @@ -658,10 +656,7 @@ export const ContractInfo = {
: undefined);
message.ibc_port_id !== undefined &&
(obj.ibc_port_id = message.ibc_port_id);
message.admin !== undefined &&
(obj.admin = base64FromBytes(
message.admin !== undefined ? message.admin : new Uint8Array(),
));
message.admin !== undefined && (obj.admin = message.admin);
message.admin_proof !== undefined &&
(obj.admin_proof = base64FromBytes(
message.admin_proof !== undefined
Expand All @@ -683,7 +678,7 @@ export const ContractInfo = {
? AbsoluteTxPosition.fromPartial(object.created)
: undefined;
message.ibc_port_id = object.ibc_port_id ?? "";
message.admin = object.admin ?? new Uint8Array();
message.admin = object.admin ?? "";
message.admin_proof = object.admin_proof ?? new Uint8Array();
return message;
},
Expand Down
2 changes: 1 addition & 1 deletion src/tx/compute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class MsgInstantiateContract implements Msg {
// callback_sig & callback_code_hash are internal stuff that doesn't matter here
callback_sig: new Uint8Array(0),
callback_code_hash: "",
admin: addressToBytes(this.admin),
admin: this.admin,
};

return {
Expand Down

0 comments on commit 9e619da

Please sign in to comment.