Skip to content

Commit

Permalink
Update protobufs to support callback_sig in MsgMigrateContract & Msg{…
Browse files Browse the repository at this point in the history 
…Update,Clear}Admin
  • Loading branch information
@assafmo
assafmo committed Jul 5, 2023
1 parent 4516ace commit 849b1f7
Show file tree
Hide file tree
Showing 5 changed files with 186 additions and 120 deletions.
10 changes: 10 additions & 0 deletions src/grpc_gateway/secret/compute/v1beta1/msg.pb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ export type MsgMigrateContract = {
contract?: string
code_id?: string
msg?: Uint8Array
callback_sig?: Uint8Array
callback_code_hash?: string
}

export type MsgMigrateContractResponse = {
Expand All @@ -61,6 +63,7 @@ export type MsgUpdateAdmin = {
sender?: string
new_admin?: string
contract?: string
callback_sig?: Uint8Array
}

export type MsgUpdateAdminResponse = {
Expand All @@ -69,6 +72,7 @@ export type MsgUpdateAdminResponse = {
export type MsgClearAdmin = {
sender?: string
contract?: string
callback_sig?: Uint8Array
}

export type MsgClearAdminResponse = {
Expand All @@ -87,4 +91,10 @@ export class Msg {
static MigrateContract(req: MsgMigrateContract, initReq?: fm.InitReq): Promise<MsgMigrateContractResponse> {
return fm.fetchReq<MsgMigrateContract, MsgMigrateContractResponse>(`/secret.compute.v1beta1.Msg/MigrateContract`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
}
static UpdateAdmin(req: MsgUpdateAdmin, initReq?: fm.InitReq): Promise<MsgUpdateAdminResponse> {
return fm.fetchReq<MsgUpdateAdmin, MsgUpdateAdminResponse>(`/secret.compute.v1beta1.Msg/UpdateAdmin`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
}
static ClearAdmin(req: MsgClearAdmin, initReq?: fm.InitReq): Promise<MsgClearAdminResponse> {
return fm.fetchReq<MsgClearAdmin, MsgClearAdminResponse>(`/secret.compute.v1beta1.Msg/ClearAdmin`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
}
}
10 changes: 3 additions & 7 deletions src/grpc_gateway/secret/compute/v1beta1/types.pb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,9 @@ export type ContractCustomInfo = {
}

export type ContractKey = {
key?: Uint8Array
original?: ContractKeyWithProof
}

export type ContractKeyWithProof = {
key?: Uint8Array
proof?: Uint8Array
og_contract_key?: Uint8Array
current_contract_key?: Uint8Array
current_contract_key_proof?: Uint8Array
}

export type ContractInfo = {
Expand Down
118 changes: 115 additions & 3 deletions src/protobuf/secret/compute/v1beta1/msg.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export interface MsgExecuteContract {
contract: Uint8Array;
/** msg is an encrypted input to pass to the contract on execute */
msg: Uint8Array;
/** used internally for encryption, should always be empty in a signed transaction */
callback_code_hash: string;
sent_funds: Coin[];
/** used internally for encryption, should always be empty in a signed transaction */
Expand All @@ -74,6 +75,10 @@ export interface MsgMigrateContract {
code_id: string;
/** msg is an encrypted input to pass to the contract on migration */
msg: Uint8Array;
/** used internally for encryption, should always be empty in a signed transaction */
callback_sig: Uint8Array;
/** used internally for encryption, should always be empty in a signed transaction */
callback_code_hash: string;
}

/** MsgMigrateContractResponse returns contract migration result data. */
Expand All @@ -93,6 +98,8 @@ export interface MsgUpdateAdmin {
new_admin: string;
/** Contract is the address of the smart contract */
contract: string;
/** used internally for encryption, should always be empty in a signed transaction */
callback_sig: Uint8Array;
}

/** MsgUpdateAdminResponse returns empty data */
Expand All @@ -104,6 +111,8 @@ export interface MsgClearAdmin {
sender: string;
/** Contract is the address of the smart contract */
contract: string;
/** used internally for encryption, should always be empty in a signed transaction */
callback_sig: Uint8Array;
}

/** MsgClearAdminResponse returns empty data */
Expand Down Expand Up @@ -694,7 +703,14 @@ export const MsgExecuteContractResponse = {
};

function createBaseMsgMigrateContract(): MsgMigrateContract {
return { sender: "", contract: "", code_id: "0", msg: new Uint8Array() };
return {
sender: "",
contract: "",
code_id: "0",
msg: new Uint8Array(),
callback_sig: new Uint8Array(),
callback_code_hash: "",
};
}

export const MsgMigrateContract = {
Expand All @@ -714,6 +730,12 @@ export const MsgMigrateContract = {
if (message.msg.length !== 0) {
writer.uint32(34).bytes(message.msg);
}
if (message.callback_sig.length !== 0) {
writer.uint32(58).bytes(message.callback_sig);
}
if (message.callback_code_hash !== "") {
writer.uint32(66).string(message.callback_code_hash);
}
return writer;
},

Expand All @@ -736,6 +758,12 @@ export const MsgMigrateContract = {
case 4:
message.msg = reader.bytes();
break;
case 7:
message.callback_sig = reader.bytes();
break;
case 8:
message.callback_code_hash = reader.string();
break;
default:
reader.skipType(tag & 7);
break;
Expand All @@ -750,6 +778,12 @@ export const MsgMigrateContract = {
contract: isSet(object.contract) ? String(object.contract) : "",
code_id: isSet(object.code_id) ? String(object.code_id) : "0",
msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array(),
callback_sig: isSet(object.callback_sig)
? bytesFromBase64(object.callback_sig)
: new Uint8Array(),
callback_code_hash: isSet(object.callback_code_hash)
? String(object.callback_code_hash)
: "",
};
},

Expand All @@ -762,6 +796,14 @@ export const MsgMigrateContract = {
(obj.msg = base64FromBytes(
message.msg !== undefined ? message.msg : new Uint8Array(),
));
message.callback_sig !== undefined &&
(obj.callback_sig = base64FromBytes(
message.callback_sig !== undefined
? message.callback_sig
: new Uint8Array(),
));
message.callback_code_hash !== undefined &&
(obj.callback_code_hash = message.callback_code_hash);
return obj;
},

Expand All @@ -773,6 +815,8 @@ export const MsgMigrateContract = {
message.contract = object.contract ?? "";
message.code_id = object.code_id ?? "0";
message.msg = object.msg ?? new Uint8Array();
message.callback_sig = object.callback_sig ?? new Uint8Array();
message.callback_code_hash = object.callback_code_hash ?? "";
return message;
},
};
Expand Down Expand Up @@ -840,7 +884,12 @@ export const MsgMigrateContractResponse = {
};

function createBaseMsgUpdateAdmin(): MsgUpdateAdmin {
return { sender: "", new_admin: "", contract: "" };
return {
sender: "",
new_admin: "",
contract: "",
callback_sig: new Uint8Array(),
};
}

export const MsgUpdateAdmin = {
Expand All @@ -857,6 +906,9 @@ export const MsgUpdateAdmin = {
if (message.contract !== "") {
writer.uint32(26).string(message.contract);
}
if (message.callback_sig.length !== 0) {
writer.uint32(58).bytes(message.callback_sig);
}
return writer;
},

Expand All @@ -876,6 +928,9 @@ export const MsgUpdateAdmin = {
case 3:
message.contract = reader.string();
break;
case 7:
message.callback_sig = reader.bytes();
break;
default:
reader.skipType(tag & 7);
break;
Expand All @@ -889,6 +944,9 @@ export const MsgUpdateAdmin = {
sender: isSet(object.sender) ? String(object.sender) : "",
new_admin: isSet(object.new_admin) ? String(object.new_admin) : "",
contract: isSet(object.contract) ? String(object.contract) : "",
callback_sig: isSet(object.callback_sig)
? bytesFromBase64(object.callback_sig)
: new Uint8Array(),
};
},

Expand All @@ -897,6 +955,12 @@ export const MsgUpdateAdmin = {
message.sender !== undefined && (obj.sender = message.sender);
message.new_admin !== undefined && (obj.new_admin = message.new_admin);
message.contract !== undefined && (obj.contract = message.contract);
message.callback_sig !== undefined &&
(obj.callback_sig = base64FromBytes(
message.callback_sig !== undefined
? message.callback_sig
: new Uint8Array(),
));
return obj;
},

Expand All @@ -907,6 +971,7 @@ export const MsgUpdateAdmin = {
message.sender = object.sender ?? "";
message.new_admin = object.new_admin ?? "";
message.contract = object.contract ?? "";
message.callback_sig = object.callback_sig ?? new Uint8Array();
return message;
},
};
Expand Down Expand Up @@ -959,7 +1024,7 @@ export const MsgUpdateAdminResponse = {
};

function createBaseMsgClearAdmin(): MsgClearAdmin {
return { sender: "", contract: "" };
return { sender: "", contract: "", callback_sig: new Uint8Array() };
}

export const MsgClearAdmin = {
Expand All @@ -973,6 +1038,9 @@ export const MsgClearAdmin = {
if (message.contract !== "") {
writer.uint32(26).string(message.contract);
}
if (message.callback_sig.length !== 0) {
writer.uint32(58).bytes(message.callback_sig);
}
return writer;
},

Expand All @@ -989,6 +1057,9 @@ export const MsgClearAdmin = {
case 3:
message.contract = reader.string();
break;
case 7:
message.callback_sig = reader.bytes();
break;
default:
reader.skipType(tag & 7);
break;
Expand All @@ -1001,13 +1072,22 @@ export const MsgClearAdmin = {
return {
sender: isSet(object.sender) ? String(object.sender) : "",
contract: isSet(object.contract) ? String(object.contract) : "",
callback_sig: isSet(object.callback_sig)
? bytesFromBase64(object.callback_sig)
: new Uint8Array(),
};
},

toJSON(message: MsgClearAdmin): unknown {
const obj: any = {};
message.sender !== undefined && (obj.sender = message.sender);
message.contract !== undefined && (obj.contract = message.contract);
message.callback_sig !== undefined &&
(obj.callback_sig = base64FromBytes(
message.callback_sig !== undefined
? message.callback_sig
: new Uint8Array(),
));
return obj;
},

Expand All @@ -1017,6 +1097,7 @@ export const MsgClearAdmin = {
const message = createBaseMsgClearAdmin();
message.sender = object.sender ?? "";
message.contract = object.contract ?? "";
message.callback_sig = object.callback_sig ?? new Uint8Array();
return message;
},
};
Expand Down Expand Up @@ -1080,9 +1161,14 @@ export interface Msg {
ExecuteContract(
request: MsgExecuteContract,
): Promise<MsgExecuteContractResponse>;
/** Migrate runs a code upgrade/ downgrade for a smart contract */
MigrateContract(
request: MsgMigrateContract,
): Promise<MsgMigrateContractResponse>;
/** UpdateAdmin sets a new admin for a smart contract */
UpdateAdmin(request: MsgUpdateAdmin): Promise<MsgUpdateAdminResponse>;
/** ClearAdmin removes any admin stored for a smart contract */
ClearAdmin(request: MsgClearAdmin): Promise<MsgClearAdminResponse>;
}

export class MsgClientImpl implements Msg {
Expand All @@ -1093,6 +1179,8 @@ export class MsgClientImpl implements Msg {
this.InstantiateContract = this.InstantiateContract.bind(this);
this.ExecuteContract = this.ExecuteContract.bind(this);
this.MigrateContract = this.MigrateContract.bind(this);
this.UpdateAdmin = this.UpdateAdmin.bind(this);
this.ClearAdmin = this.ClearAdmin.bind(this);
}
StoreCode(request: MsgStoreCode): Promise<MsgStoreCodeResponse> {
const data = MsgStoreCode.encode(request).finish();
Expand Down Expand Up @@ -1147,6 +1235,30 @@ export class MsgClientImpl implements Msg {
MsgMigrateContractResponse.decode(new _m0.Reader(data)),
);
}

UpdateAdmin(request: MsgUpdateAdmin): Promise<MsgUpdateAdminResponse> {
const data = MsgUpdateAdmin.encode(request).finish();
const promise = this.rpc.request(
"secret.compute.v1beta1.Msg",
"UpdateAdmin",
data,
);
return promise.then((data) =>
MsgUpdateAdminResponse.decode(new _m0.Reader(data)),
);
}

ClearAdmin(request: MsgClearAdmin): Promise<MsgClearAdminResponse> {
const data = MsgClearAdmin.encode(request).finish();
const promise = this.rpc.request(
"secret.compute.v1beta1.Msg",
"ClearAdmin",
data,
);
return promise.then((data) =>
MsgClearAdminResponse.decode(new _m0.Reader(data)),
);
}
}

interface Rpc {
Expand Down
Loading

0 comments on commit 849b1f7

Please sign in to comment.