Skip to content

Commit b18701f

Browse files
iboss-ptkiboss-ptk
committed
rebuild with 91e6167
1 parent be80543 commit b18701f

File tree

5 files changed

+34
-5
lines changed

5 files changed

+34
-5
lines changed

‎packages/osmosis-std/src/types/OSMOSIS_COMMIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
origin/main
1+
v15.1.0

‎packages/osmosis-std/src/types/cosmwasm/wasm/v1.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ pub struct CodeInfo {
301301
pub struct ContractInfo {
302302
/// CodeID is the reference to the stored Wasm code
303303
#[prost(uint64, tag = "1")]
304+
#[serde(alias = "codeID")]
304305
#[serde(
305306
serialize_with = "crate::serde::as_str::serialize",
306307
deserialize_with = "crate::serde::as_str::deserialize"
@@ -319,6 +320,7 @@ pub struct ContractInfo {
319320
#[prost(message, optional, tag = "5")]
320321
pub created: ::core::option::Option<AbsoluteTxPosition>,
321322
#[prost(string, tag = "6")]
323+
#[serde(alias = "ibc_portID")]
322324
pub ibc_port_id: ::prost::alloc::string::String,
323325
/// Extension is an extension point to store custom metadata within the
324326
/// persistence model.
@@ -347,6 +349,7 @@ pub struct ContractCodeHistoryEntry {
347349
pub operation: i32,
348350
/// CodeID is the reference to the stored WASM code
349351
#[prost(uint64, tag = "2")]
352+
#[serde(alias = "codeID")]
350353
#[serde(
351354
serialize_with = "crate::serde::as_str::serialize",
352355
deserialize_with = "crate::serde::as_str::deserialize"
@@ -538,6 +541,7 @@ pub struct MsgStoreCode {
538541
pub struct MsgStoreCodeResponse {
539542
/// CodeID is the reference to the stored WASM code
540543
#[prost(uint64, tag = "1")]
544+
#[serde(alias = "codeID")]
541545
#[serde(
542546
serialize_with = "crate::serde::as_str::serialize",
543547
deserialize_with = "crate::serde::as_str::deserialize"
@@ -570,6 +574,7 @@ pub struct MsgInstantiateContract {
570574
pub admin: ::prost::alloc::string::String,
571575
/// CodeID is the reference to the stored WASM code
572576
#[prost(uint64, tag = "3")]
577+
#[serde(alias = "codeID")]
573578
#[serde(
574579
serialize_with = "crate::serde::as_str::serialize",
575580
deserialize_with = "crate::serde::as_str::deserialize"
@@ -608,6 +613,7 @@ pub struct MsgInstantiateContract2 {
608613
pub admin: ::prost::alloc::string::String,
609614
/// CodeID is the reference to the stored WASM code
610615
#[prost(uint64, tag = "3")]
616+
#[serde(alias = "codeID")]
611617
#[serde(
612618
serialize_with = "crate::serde::as_str::serialize",
613619
deserialize_with = "crate::serde::as_str::deserialize"
@@ -739,6 +745,7 @@ pub struct MsgMigrateContract {
739745
pub contract: ::prost::alloc::string::String,
740746
/// CodeID references the new WASM code
741747
#[prost(uint64, tag = "3")]
748+
#[serde(alias = "codeID")]
742749
#[serde(
743750
serialize_with = "crate::serde::as_str::serialize",
744751
deserialize_with = "crate::serde::as_str::deserialize"
@@ -928,6 +935,7 @@ pub mod genesis_state {
928935
#[proto_message(type_url = "/cosmwasm.wasm.v1.Code")]
929936
pub struct Code {
930937
#[prost(uint64, tag = "1")]
938+
#[serde(alias = "codeID")]
931939
#[serde(
932940
serialize_with = "crate::serde::as_str::serialize",
933941
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1115,6 +1123,7 @@ pub struct InstantiateContractProposal {
11151123
pub admin: ::prost::alloc::string::String,
11161124
/// CodeID is the reference to the stored WASM code
11171125
#[prost(uint64, tag = "5")]
1126+
#[serde(alias = "codeID")]
11181127
#[serde(
11191128
serialize_with = "crate::serde::as_str::serialize",
11201129
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1157,6 +1166,7 @@ pub struct MigrateContractProposal {
11571166
pub contract: ::prost::alloc::string::String,
11581167
/// CodeID references the new WASM code
11591168
#[prost(uint64, tag = "5")]
1169+
#[serde(alias = "codeID")]
11601170
#[serde(
11611171
serialize_with = "crate::serde::as_str::serialize",
11621172
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1302,6 +1312,7 @@ pub struct PinCodesProposal {
13021312
pub description: ::prost::alloc::string::String,
13031313
/// CodeIDs references the new WASM codes
13041314
#[prost(uint64, repeated, packed = "false", tag = "3")]
1315+
#[serde(alias = "codeIDs")]
13051316
pub code_ids: ::prost::alloc::vec::Vec<u64>,
13061317
}
13071318
/// UnpinCodesProposal gov proposal content type to unpin a set of code ids in
@@ -1327,6 +1338,7 @@ pub struct UnpinCodesProposal {
13271338
pub description: ::prost::alloc::string::String,
13281339
/// CodeIDs references the WASM codes
13291340
#[prost(uint64, repeated, packed = "false", tag = "3")]
1341+
#[serde(alias = "codeIDs")]
13301342
pub code_ids: ::prost::alloc::vec::Vec<u64>,
13311343
}
13321344
/// AccessConfigUpdate contains the code id and the access config to be
@@ -1346,6 +1358,7 @@ pub struct UnpinCodesProposal {
13461358
pub struct AccessConfigUpdate {
13471359
/// CodeID is the reference to the stored WASM code to be updated
13481360
#[prost(uint64, tag = "1")]
1361+
#[serde(alias = "codeID")]
13491362
#[serde(
13501363
serialize_with = "crate::serde::as_str::serialize",
13511364
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1552,6 +1565,7 @@ pub struct QueryContractHistoryResponse {
15521565
pub struct QueryContractsByCodeRequest {
15531566
/// grpc-gateway_out does not support Go style CodID
15541567
#[prost(uint64, tag = "1")]
1568+
#[serde(alias = "codeID")]
15551569
#[serde(
15561570
serialize_with = "crate::serde::as_str::serialize",
15571571
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1740,6 +1754,7 @@ pub struct QuerySmartContractStateResponse {
17401754
pub struct QueryCodeRequest {
17411755
/// grpc-gateway_out does not support Go style CodID
17421756
#[prost(uint64, tag = "1")]
1757+
#[serde(alias = "codeID")]
17431758
#[serde(
17441759
serialize_with = "crate::serde::as_str::serialize",
17451760
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1762,6 +1777,7 @@ pub struct QueryCodeRequest {
17621777
pub struct CodeInfoResponse {
17631778
/// id for legacy support
17641779
#[prost(uint64, tag = "1")]
1780+
#[serde(alias = "codeID")]
17651781
#[serde(
17661782
serialize_with = "crate::serde::as_str::serialize",
17671783
deserialize_with = "crate::serde::as_str::deserialize"
@@ -1877,6 +1893,7 @@ pub struct QueryPinnedCodesRequest {
18771893
#[proto_message(type_url = "/cosmwasm.wasm.v1.QueryPinnedCodesResponse")]
18781894
pub struct QueryPinnedCodesResponse {
18791895
#[prost(uint64, repeated, packed = "false", tag = "1")]
1896+
#[serde(alias = "codeIDs")]
18801897
pub code_ids: ::prost::alloc::vec::Vec<u64>,
18811898
/// pagination defines the pagination in the response.
18821899
#[prost(message, optional, tag = "2")]

‎packages/proto-build/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use proto_build::{
1414
const COSMOS_SDK_REV: &str = "origin/osmosis-main";
1515

1616
/// The osmosis commit or tag to be cloned and used to build the proto files
17-
const OSMOSIS_REV: &str = "origin/main";
17+
const OSMOSIS_REV: &str = "v15.1.0";
1818

1919
/// The wasmd commit or tag to be cloned and used to build the proto files
2020
const WASMD_REV: &str = "v0.30.0";

‎packages/proto-build/src/main.rs--

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ use proto_build::{
1414
const COSMOS_SDK_REV: &str = "origin/osmosis-main";
1515

1616
/// The osmosis commit or tag to be cloned and used to build the proto files
17-
const OSMOSIS_REV: &str = "origin/main";
17+
const OSMOSIS_REV: &str = "v15.1.0";
18+
19+
/// The wasmd commit or tag to be cloned and used to build the proto files
20+
const WASMD_REV: &str = "v0.30.0";
1821

1922
// All paths must end with a / and either be absolute or include a ./ to reference the current
2023
// working directory.
@@ -25,6 +28,8 @@ const OUT_DIR: &str = "../osmosis-std/src/types/";
2528
const COSMOS_SDK_DIR: &str = "../../dependencies/cosmos-sdk/";
2629
/// Directory where the osmosis submodule is located
2730
const OSMOSIS_DIR: &str = "../../dependencies/osmosis/";
31+
/// Directory where the wasmd submodule is located
32+
const WASMD_DIR: &str = "../../dependencies/wasmd/";
2833

2934
/// A temporary directory for proto building
3035
const TMP_BUILD_DIR: &str = "/tmp/tmp-protobuf/";
@@ -34,6 +39,7 @@ pub fn generate() {
3439
if args.iter().any(|arg| arg == "--update-deps") {
3540
git::update_submodule(COSMOS_SDK_DIR, COSMOS_SDK_REV);
3641
git::update_submodule(OSMOSIS_DIR, OSMOSIS_REV);
42+
git::update_submodule(WASMD_DIR, WASMD_REV);
3743
}
3844

3945
let tmp_build_dir: PathBuf = TMP_BUILD_DIR.parse().unwrap();
@@ -45,6 +51,12 @@ pub fn generate() {
4551
project_dir: OSMOSIS_DIR.to_string(),
4652
include_mods: vec![],
4753
};
54+
let wasmd_project = CosmosProject {
55+
name: "wasmd".to_string(),
56+
version: WASMD_REV.to_string(),
57+
project_dir: WASMD_DIR.to_string(),
58+
include_mods: vec![],
59+
};
4860
let cosmos_project = CosmosProject {
4961
name: "cosmos".to_string(),
5062
version: COSMOS_SDK_REV.to_string(),
@@ -64,7 +76,7 @@ pub fn generate() {
6476
out_dir,
6577
tmp_build_dir,
6678
osmosis_project,
67-
vec![cosmos_project],
79+
vec![cosmos_project, wasmd_project],
6880
);
6981

7082
osmosis_code_generator.generate();

‎scripts/update-and-rebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euxo pipefail
55
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
66
OSMOSIS_REV=${1:-main}
77

8-
LATEST_OSMOSIS_VERSION="v13"
8+
LATEST_OSMOSIS_VERSION="v15"
99

1010
# if "$OSMOIS_REV" is /v\d+/ then extract it as var
1111
if [[ "$OSMOSIS_REV" =~ ^v[0-9]+ ]]; then

0 commit comments

Comments
 (0)