Merge branch 'xion/main' into fix/v061OrigContractInfo

Author: 2xburnt

docs/proto/proto-docs.md

@@ -236,8 +236,8 @@ ContractInfo stores a WASM contract instance
 | `label` | [string](#string) |  | Label is optional metadata to be stored with a contract instance. |
 | `created` | [AbsoluteTxPosition](#cosmwasm.wasm.v1.AbsoluteTxPosition) |  | Created Tx position when the contract was instantiated. |
 | `ibc_port_id` | [string](#string) |  |  |
-| `ibc2_port_id` | [string](#string) |  |  |
 | `extension` | [google.protobuf.Any](#google.protobuf.Any) |  | Extension is an extension point to store custom metadata within the persistence model. |
+| `ibc2_port_id` | [string](#string) |  |  |
 
 
 

go.mod

@@ -245,6 +245,16 @@ replace (
 )
 
 retract (
+	// see https://github.com/CosmWasm/wasmd/issues/2386
+	v0.61.4
+	// see https://github.com/CosmWasm/wasmd/issues/2386
+	v0.61.3
+	// see https://github.com/CosmWasm/wasmd/issues/2386
+	v0.61.2
+	// see https://github.com/CosmWasm/wasmd/issues/2386
+	v0.61.1
+	// see https://github.com/CosmWasm/wasmd/issues/2386
+	v0.61.0
 	// see https://github.com/CosmWasm/wasmd/issues/1713
 	v0.44.0
 	// see https://github.com/CosmWasm/wasmd/issues/1713

proto/cosmwasm/wasm/v1/types.proto

@@ -88,13 +88,14 @@ message ContractInfo {
   // Created Tx position when the contract was instantiated.
   AbsoluteTxPosition created = 5;
   string ibc_port_id = 6 [ (gogoproto.customname) = "IBCPortID" ];
-  string ibc2_port_id = 7 [ (gogoproto.customname) = "IBC2PortID" ];
 
   // Extension is an extension point to store custom metadata within the
   // persistence model.
-  google.protobuf.Any extension = 8
+  google.protobuf.Any extension = 7
       [ (cosmos_proto.accepts_interface) =
             "cosmwasm.wasm.v1.ContractInfoExtension" ];
+
+  string ibc2_port_id = 8 [ (gogoproto.customname) = "IBC2PortID" ];
 }
 
 // ContractCodeHistoryOperationType actions that caused a code change