diff --git a/CHANGELOG.md b/CHANGELOG.md index 5582987b1d..a770f4d956 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased](https://github.com/CosmWasm/wasmd/tree/HEAD) +Bind eureka port and store it in ContractInfo [\#2122](https://github.com/CosmWasm/wasmd/pull/2122) + [Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.54.0...HEAD) ## [v0.54.0](https://github.com/CosmWasm/wasmd/tree/v0.54.0) (2025-01-08) diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 0cb320e960..15eaf39797 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -236,6 +236,7 @@ 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) | | | +| `eureka_port_id` | [string](#string) | | | | `extension` | [google.protobuf.Any](#google.protobuf.Any) | | Extension is an extension point to store custom metadata within the persistence model. | diff --git a/go.mod b/go.mod index 4e4a54f004..05e8bf731d 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/CosmWasm/wasmd go 1.23.1 require ( - github.com/CosmWasm/wasmvm/v2 v2.2.1 + github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250212100917-aea2a1cdd849 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/cosmos-sdk v0.50.11 github.com/cosmos/gogogateway v1.2.0 // indirect @@ -221,13 +221,13 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + github.com/CosmWasm/wasmvm/v2 => github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250212100917-aea2a1cdd849 // dgrijalva/jwt-go is deprecated and doesn't receive security updates. // See: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // See: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 - // pin version! 126854af5e6d has issues with the store so that queries fail github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index a193a377a3..6a9380b331 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CosmWasm/wasmvm/v2 v2.2.1 h1:cmOnM+TDfUl2VRugeo1eJBw4U/Lw0WLviuQHKSo9DVQ= -github.com/CosmWasm/wasmvm/v2 v2.2.1/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= +github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250212100917-aea2a1cdd849 h1:cMULScnfrGMd3W3k15i/8KKgDmz5TuEU9L+w76f+pH8= +github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250212100917-aea2a1cdd849/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/proto/cosmwasm/wasm/v1/types.proto b/proto/cosmwasm/wasm/v1/types.proto index ad530854a2..595a548147 100644 --- a/proto/cosmwasm/wasm/v1/types.proto +++ b/proto/cosmwasm/wasm/v1/types.proto @@ -88,10 +88,11 @@ message ContractInfo { // Created Tx position when the contract was instantiated. AbsoluteTxPosition created = 5; string ibc_port_id = 6 [ (gogoproto.customname) = "IBCPortID" ]; + string eureka_port_id = 7 [ (gogoproto.customname) = "EurekaPortID" ]; // Extension is an extension point to store custom metadata within the // persistence model. - google.protobuf.Any extension = 7 + google.protobuf.Any extension = 8 [ (cosmos_proto.accepts_interface) = "cosmwasm.wasm.v1.ContractInfoExtension" ]; } diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 543a5f200a..538a89c085 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -106,6 +106,9 @@ type Keeper struct { // propagate gov authZ to sub-messages propagateGovAuthorization map[types.AuthorizationPolicyAction]struct{} + // Binds port for Eureka + customBindEurekaPort func(ctx sdk.Context, contractAddr sdk.AccAddress) (string, error) + // the address capable of executing a MsgUpdateParams message. Typically, this // should be the x/gov module account. authority string @@ -376,6 +379,15 @@ func (k Keeper) instantiate( } contractInfo.IBCPortID = ibcPort } + // Should we bind the port in some special way for Eureka? + if report.HasEurekaEntryPoints { + // register Eureka port + eurekaPort, err := k.bindEurekaPort(sdkCtx, contractAddress) + if err != nil { + return nil, nil, err + } + contractInfo.EurekaPortID = eurekaPort + } // store contract before dispatch so that contract could be called back historyEntry := contractInfo.InitialHistory(initMsg) @@ -409,6 +421,14 @@ func (k Keeper) instantiate( return contractAddress, data, nil } +func (k Keeper) bindEurekaPort(sdkCtx sdk.Context, contractAddress sdk.AccAddress) (string, error) { + if k.customBindEurekaPort != nil { + return k.customBindEurekaPort(sdkCtx, contractAddress) + } else { + return k.ensureIbcPort(sdkCtx, contractAddress) + } +} + // Execute executes the contract instance func (k Keeper) execute(ctx context.Context, contractAddress, caller sdk.AccAddress, msg []byte, coins sdk.Coins) ([]byte, error) { defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "execute") @@ -544,6 +564,16 @@ func (k Keeper) migrate( } k.mustStoreContractInfo(ctx, contractAddress, contractInfo) + // Should we bind the port in some special way for Eureka? + if report.HasEurekaEntryPoints && contractInfo.EurekaPortID != "" { + // register Eureka port + eurekaPort, err := k.bindEurekaPort(sdkCtx, contractAddress) + if err != nil { + return nil, err + } + contractInfo.EurekaPortID = eurekaPort + } + sdkCtx.EventManager().EmitEvent(sdk.NewEvent( types.EventTypeMigrate, sdk.NewAttribute(types.AttributeKeyCodeID, strconv.FormatUint(newCodeID, 10)), diff --git a/x/wasm/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go index 2980968229..4ec949924a 100644 --- a/x/wasm/keeper/query_plugins.go +++ b/x/wasm/keeper/query_plugins.go @@ -669,11 +669,12 @@ func WasmQuerier(k wasmQueryKeeper) func(ctx sdk.Context, request *wasmvmtypes.W Wrapf("address %s", contractAddr) } res := wasmvmtypes.ContractInfoResponse{ - CodeID: info.CodeID, - Creator: info.Creator, - Admin: info.Admin, - Pinned: k.IsPinnedCode(ctx, info.CodeID), - IBCPort: info.IBCPortID, + CodeID: info.CodeID, + Creator: info.Creator, + Admin: info.Admin, + Pinned: k.IsPinnedCode(ctx, info.CodeID), + IBCPort: info.IBCPortID, + EurekaPort: info.EurekaPortID, } return json.Marshal(res) case request.CodeInfo != nil: diff --git a/x/wasm/types/types.pb.go b/x/wasm/types/types.pb.go index 0f797a6827..53e9d9c2a7 100644 --- a/x/wasm/types/types.pb.go +++ b/x/wasm/types/types.pb.go @@ -288,11 +288,12 @@ type ContractInfo struct { // Label is optional metadata to be stored with a contract instance. Label string `protobuf:"bytes,4,opt,name=label,proto3" json:"label,omitempty"` // Created Tx position when the contract was instantiated. - Created *AbsoluteTxPosition `protobuf:"bytes,5,opt,name=created,proto3" json:"created,omitempty"` - IBCPortID string `protobuf:"bytes,6,opt,name=ibc_port_id,json=ibcPortId,proto3" json:"ibc_port_id,omitempty"` + Created *AbsoluteTxPosition `protobuf:"bytes,5,opt,name=created,proto3" json:"created,omitempty"` + IBCPortID string `protobuf:"bytes,6,opt,name=ibc_port_id,json=ibcPortId,proto3" json:"ibc_port_id,omitempty"` + EurekaPortID string `protobuf:"bytes,7,opt,name=eureka_port_id,json=eurekaPortId,proto3" json:"eureka_port_id,omitempty"` // Extension is an extension point to store custom metadata within the // persistence model. - Extension *types.Any `protobuf:"bytes,7,opt,name=extension,proto3" json:"extension,omitempty"` + Extension *types.Any `protobuf:"bytes,8,opt,name=extension,proto3" json:"extension,omitempty"` } func (m *ContractInfo) Reset() { *m = ContractInfo{} } @@ -491,82 +492,84 @@ func init() { func init() { proto.RegisterFile("cosmwasm/wasm/v1/types.proto", fileDescriptor_e6155d98fa173e02) } var fileDescriptor_e6155d98fa173e02 = []byte{ - // 1198 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xf7, 0xda, 0x4e, 0x62, 0x4f, 0xf2, 0xfd, 0xb2, 0x1d, 0x52, 0xd5, 0x31, 0x91, 0x6d, 0x96, - 0x12, 0xda, 0xb4, 0xb5, 0xdb, 0x80, 0x2a, 0xd4, 0x43, 0x25, 0xff, 0xd8, 0x36, 0x5b, 0x29, 0xb6, - 0x35, 0x76, 0x29, 0x41, 0x2a, 0xab, 0xf5, 0xee, 0xd8, 0x19, 0x6a, 0xef, 0x58, 0x3b, 0xe3, 0xd4, - 0xbe, 0x72, 0x42, 0x46, 0x48, 0x1c, 0x38, 0x20, 0x24, 0x4b, 0x48, 0x20, 0xe8, 0xb1, 0x87, 0xfe, - 0x03, 0xdc, 0x2a, 0x4e, 0x15, 0x27, 0x4e, 0x16, 0xa4, 0x87, 0x72, 0xce, 0x81, 0x43, 0x4f, 0x68, - 0x67, 0x62, 0x76, 0x45, 0x9b, 0xc6, 0x70, 0x59, 0xcd, 0xbc, 0xf7, 0x3e, 0x9f, 0xf7, 0xde, 0x67, - 0x66, 0xdf, 0x2e, 0x58, 0xb7, 0x29, 0xeb, 0xdd, 0xb7, 0x58, 0xaf, 0x20, 0x1e, 0xfb, 0x57, 0x0a, - 0x7c, 0xd4, 0xc7, 0x2c, 0xdf, 0xf7, 0x28, 0xa7, 0x50, 0x9d, 0x79, 0xf3, 0xe2, 0xb1, 0x7f, 0x25, - 0xbd, 0xe6, 0x5b, 0x28, 0x33, 0x85, 0xbf, 0x20, 0x37, 0x32, 0x38, 0xbd, 0xda, 0xa1, 0x1d, 0x2a, - 0xed, 0xfe, 0xea, 0xc8, 0xba, 0xd6, 0xa1, 0xb4, 0xd3, 0xc5, 0x05, 0xb1, 0x6b, 0x0d, 0xda, 0x05, - 0xcb, 0x1d, 0x1d, 0xb9, 0x4e, 0x59, 0x3d, 0xe2, 0xd2, 0x82, 0x78, 0x4a, 0x93, 0x76, 0x17, 0xbc, - 0x56, 0xb4, 0x6d, 0xcc, 0x58, 0x73, 0xd4, 0xc7, 0x75, 0xcb, 0xb3, 0x7a, 0xb0, 0x02, 0x16, 0xf6, - 0xad, 0xee, 0x00, 0xa7, 0x94, 0x9c, 0x72, 0xee, 0xff, 0x5b, 0xeb, 0xf9, 0x7f, 0xd6, 0x94, 0x0f, - 0x10, 0x25, 0xf5, 0x70, 0x9a, 0x5d, 0x19, 0x59, 0xbd, 0xee, 0x35, 0x4d, 0x80, 0x34, 0x24, 0xc1, - 0xd7, 0xe2, 0x5f, 0x7f, 0x9b, 0x55, 0xb4, 0x1f, 0x15, 0xb0, 0x22, 0xa3, 0xcb, 0xd4, 0x6d, 0x93, - 0x0e, 0x6c, 0x00, 0xd0, 0xc7, 0x5e, 0x8f, 0x30, 0x46, 0xa8, 0x3b, 0x57, 0x86, 0xd3, 0x87, 0xd3, - 0xec, 0x29, 0x99, 0x21, 0x40, 0x6a, 0x28, 0x44, 0x03, 0xaf, 0x82, 0xa4, 0xe5, 0x38, 0x1e, 0x66, - 0x0c, 0xb3, 0x54, 0x2c, 0x17, 0x3b, 0x97, 0x2c, 0xa5, 0x7e, 0x79, 0x74, 0x69, 0xf5, 0x48, 0xad, - 0xa2, 0xf4, 0x35, 0xb8, 0x47, 0xdc, 0x0e, 0x0a, 0x42, 0x65, 0x8d, 0xb7, 0xe2, 0x89, 0xa8, 0x1a, - 0xd3, 0xbe, 0x8a, 0x82, 0x45, 0xd1, 0x3f, 0x83, 0x1c, 0x40, 0x9b, 0x3a, 0xd8, 0x1c, 0xf4, 0xbb, - 0xd4, 0x72, 0x4c, 0x4b, 0xd4, 0x22, 0x6a, 0x5d, 0xde, 0xca, 0x1c, 0x57, 0xab, 0xec, 0xaf, 0xb4, - 0xf1, 0x78, 0x9a, 0x8d, 0x1c, 0x4e, 0xb3, 0x6b, 0xb2, 0xe2, 0x17, 0x79, 0xb4, 0x07, 0xcf, 0x1e, - 0x6e, 0x2a, 0x48, 0xf5, 0x3d, 0xb7, 0x85, 0x43, 0xe2, 0xe1, 0x17, 0x0a, 0xc8, 0x10, 0x97, 0x71, - 0xcb, 0xe5, 0xc4, 0xe2, 0xd8, 0x74, 0x70, 0xdb, 0x1a, 0x74, 0xb9, 0x19, 0x92, 0x2b, 0x3a, 0x87, - 0x5c, 0xe7, 0x0f, 0xa7, 0xd9, 0xb7, 0x65, 0xf2, 0x57, 0xb3, 0x69, 0x68, 0x3d, 0x14, 0x50, 0x91, - 0xfe, 0xfa, 0xdf, 0x6e, 0x21, 0x4e, 0x44, 0xfb, 0x49, 0x01, 0x89, 0x32, 0x75, 0xb0, 0xe1, 0xb6, - 0x29, 0x7c, 0x03, 0x24, 0x45, 0x43, 0x7b, 0x16, 0xdb, 0x13, 0x7a, 0xac, 0xa0, 0x84, 0x6f, 0xd8, - 0xb6, 0xd8, 0x1e, 0xdc, 0x02, 0x4b, 0xb6, 0x87, 0x2d, 0x4e, 0x3d, 0x51, 0xe7, 0xab, 0x8e, 0x60, - 0x16, 0x08, 0x3f, 0x04, 0x30, 0x5c, 0xa4, 0x2d, 0x34, 0x4c, 0x2d, 0xcc, 0xa5, 0x74, 0xd2, 0x57, - 0x5a, 0x8a, 0x79, 0x2a, 0x44, 0x22, 0xbd, 0xb7, 0xe2, 0x89, 0x98, 0x1a, 0xbf, 0x15, 0x4f, 0xc4, - 0xd5, 0x05, 0xed, 0xd3, 0x18, 0x58, 0x29, 0x53, 0x97, 0x7b, 0x96, 0xcd, 0x45, 0x1f, 0x6f, 0x81, - 0x25, 0xd1, 0x07, 0x71, 0x44, 0x17, 0xf1, 0x12, 0x38, 0x98, 0x66, 0x17, 0x45, 0x9b, 0x15, 0xb4, - 0xe8, 0xbb, 0x0c, 0xe7, 0x3f, 0xf5, 0x93, 0x07, 0x0b, 0x96, 0xd3, 0x23, 0x6e, 0x2a, 0x76, 0x02, - 0x42, 0x86, 0xc1, 0x55, 0xb0, 0xd0, 0xb5, 0x5a, 0xb8, 0x9b, 0x8a, 0xfb, 0xf1, 0x48, 0x6e, 0xe0, - 0xf5, 0xa3, 0xcc, 0xd8, 0x39, 0x92, 0xe2, 0xec, 0x4b, 0xa4, 0x68, 0x31, 0xda, 0x1d, 0x70, 0xdc, - 0x1c, 0xd6, 0x29, 0x23, 0x9c, 0x50, 0x17, 0xcd, 0x40, 0xf0, 0x12, 0x58, 0x26, 0x2d, 0xdb, 0xec, - 0x53, 0x8f, 0xfb, 0x2d, 0x2e, 0x8a, 0x5a, 0xfe, 0x77, 0x30, 0xcd, 0x26, 0x8d, 0x52, 0xb9, 0x4e, - 0x3d, 0x6e, 0x54, 0x50, 0x92, 0xb4, 0x6c, 0xb1, 0x74, 0xe0, 0xc7, 0x20, 0x89, 0x87, 0x1c, 0xbb, - 0xe2, 0x8a, 0x2d, 0x89, 0x84, 0xab, 0x79, 0x39, 0x44, 0xf2, 0xb3, 0x21, 0x92, 0x2f, 0xba, 0xa3, - 0xd2, 0xe6, 0xcf, 0x8f, 0x2e, 0x6d, 0xbc, 0x50, 0x49, 0x58, 0x59, 0x7d, 0xc6, 0x83, 0x02, 0xca, - 0x6b, 0xf1, 0x3f, 0xfc, 0x49, 0xf0, 0x79, 0x14, 0xa4, 0x66, 0xa1, 0xbe, 0xd2, 0xdb, 0x84, 0x71, - 0xea, 0x8d, 0x74, 0x97, 0x7b, 0x23, 0x58, 0x07, 0x49, 0xda, 0xc7, 0x9e, 0xc5, 0x83, 0xa1, 0xb0, - 0x95, 0x3f, 0x36, 0x53, 0x08, 0x5e, 0x9b, 0xa1, 0xfc, 0xbb, 0x8f, 0x02, 0x92, 0xf0, 0x11, 0x47, - 0x8f, 0x3d, 0xe2, 0xeb, 0x60, 0x69, 0xd0, 0x77, 0x84, 0xd0, 0xb1, 0x7f, 0x23, 0xf4, 0x11, 0x08, - 0xbe, 0x0f, 0x62, 0x3d, 0xd6, 0x11, 0x87, 0xb7, 0x52, 0xda, 0x78, 0x3e, 0xcd, 0x42, 0x64, 0xdd, - 0x9f, 0x55, 0xb9, 0x83, 0x19, 0xb3, 0x3a, 0xf8, 0x9b, 0x67, 0x0f, 0x37, 0x97, 0x89, 0xdb, 0x25, - 0x2e, 0x36, 0x3f, 0x61, 0xd4, 0x45, 0x3e, 0x44, 0x43, 0x00, 0xbe, 0x48, 0x0c, 0xdf, 0x04, 0x2b, - 0xad, 0x2e, 0xb5, 0xef, 0x99, 0x7b, 0x98, 0x74, 0xf6, 0xb8, 0xbc, 0x9c, 0x68, 0x59, 0xd8, 0xb6, - 0x85, 0x09, 0xae, 0x81, 0x04, 0x1f, 0x9a, 0xc4, 0x75, 0xf0, 0x50, 0x36, 0x86, 0x96, 0xf8, 0xd0, - 0xf0, 0xb7, 0x1a, 0x06, 0x0b, 0x3b, 0xd4, 0xc1, 0x5d, 0x78, 0x03, 0xc4, 0xee, 0xe1, 0x91, 0x7c, - 0x41, 0x4b, 0xef, 0x3d, 0x9f, 0x66, 0x2f, 0x77, 0x08, 0xdf, 0x1b, 0xb4, 0xf2, 0x36, 0xed, 0x15, - 0x6c, 0xda, 0xc3, 0xbc, 0xd5, 0xe6, 0xc1, 0xa2, 0x4b, 0x5a, 0xac, 0xd0, 0x1a, 0x71, 0xcc, 0xf2, - 0xdb, 0x78, 0x58, 0xf2, 0x17, 0xc8, 0x27, 0xf0, 0x6f, 0xa7, 0xfc, 0x10, 0x44, 0xc5, 0xab, 0x2e, - 0x37, 0x9b, 0x7f, 0x2a, 0x00, 0x04, 0xf3, 0x06, 0x5e, 0x05, 0x67, 0x8a, 0xe5, 0xb2, 0xde, 0x68, - 0x98, 0xcd, 0xdd, 0xba, 0x6e, 0xde, 0xae, 0x36, 0xea, 0x7a, 0xd9, 0xb8, 0x61, 0xe8, 0x15, 0x35, - 0x92, 0x5e, 0x1b, 0x4f, 0x72, 0xa7, 0x83, 0xe0, 0xdb, 0x2e, 0xeb, 0x63, 0x9b, 0xb4, 0x09, 0x76, - 0xe0, 0x45, 0x00, 0xc3, 0xb8, 0x6a, 0xad, 0x54, 0xab, 0xec, 0xaa, 0x4a, 0x7a, 0x75, 0x3c, 0xc9, - 0xa9, 0x01, 0xa4, 0x4a, 0x5b, 0xd4, 0x19, 0xc1, 0x2d, 0x70, 0x3a, 0x1c, 0xad, 0x7f, 0xa0, 0xa3, - 0x5d, 0x01, 0x88, 0xa5, 0xcf, 0x8c, 0x27, 0xb9, 0xd7, 0x03, 0x80, 0xbe, 0x8f, 0xbd, 0x91, 0xc0, - 0x5c, 0x07, 0xeb, 0x61, 0x4c, 0xb1, 0xba, 0x6b, 0xd6, 0x6e, 0x98, 0xc5, 0x4a, 0x05, 0xe9, 0x8d, - 0x86, 0xde, 0x50, 0xe3, 0xe9, 0xf5, 0xf1, 0x24, 0x97, 0x0a, 0xa0, 0x45, 0x77, 0x54, 0x6b, 0x17, - 0x67, 0x5f, 0x87, 0x74, 0xe2, 0xb3, 0xef, 0x32, 0x91, 0x07, 0xdf, 0x67, 0x22, 0x9a, 0xff, 0x85, - 0x88, 0x6e, 0xfe, 0x10, 0x03, 0xb9, 0x93, 0xae, 0x20, 0xc4, 0xe0, 0x72, 0xb9, 0x56, 0x6d, 0xa2, - 0x62, 0xb9, 0x69, 0x96, 0x6b, 0x15, 0xdd, 0xdc, 0x36, 0x1a, 0xcd, 0x1a, 0xda, 0x35, 0x6b, 0x75, - 0x1d, 0x15, 0x9b, 0x46, 0xad, 0xfa, 0x32, 0x9d, 0x0a, 0xe3, 0x49, 0xee, 0xc2, 0x49, 0xdc, 0x61, - 0xf5, 0xee, 0x80, 0xf3, 0x73, 0xa5, 0x31, 0xaa, 0x46, 0x53, 0x55, 0xd2, 0xe7, 0xc6, 0x93, 0xdc, - 0xd9, 0x93, 0xf8, 0x0d, 0x97, 0x70, 0x78, 0x17, 0x5c, 0x9c, 0x8b, 0x78, 0xc7, 0xb8, 0x89, 0x8a, - 0x4d, 0x5d, 0x8d, 0xa6, 0x2f, 0x8c, 0x27, 0xb9, 0x77, 0x4e, 0xe2, 0xde, 0x21, 0x1d, 0xcf, 0xe2, - 0x78, 0x6e, 0xfa, 0x9b, 0x7a, 0x55, 0x6f, 0x18, 0x0d, 0x35, 0x36, 0x1f, 0xfd, 0x4d, 0xec, 0x62, - 0x46, 0x58, 0x3a, 0xee, 0x1f, 0x59, 0x69, 0xfb, 0xf1, 0xef, 0x99, 0xc8, 0x83, 0x83, 0x8c, 0xf2, - 0xf8, 0x20, 0xa3, 0x3c, 0x39, 0xc8, 0x28, 0xbf, 0x1d, 0x64, 0x94, 0x2f, 0x9f, 0x66, 0x22, 0x4f, - 0x9e, 0x66, 0x22, 0xbf, 0x3e, 0xcd, 0x44, 0x3e, 0xda, 0x08, 0xbd, 0x10, 0x65, 0xca, 0x7a, 0x77, - 0x66, 0xff, 0x63, 0x4e, 0x61, 0x28, 0xff, 0xcb, 0xc4, 0x4f, 0x59, 0x6b, 0x51, 0xcc, 0xbf, 0x77, - 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xba, 0x63, 0x50, 0xbd, 0xb5, 0x09, 0x00, 0x00, + // 1224 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x8f, 0xdb, 0xc4, + 0x17, 0x8f, 0x93, 0xec, 0x6e, 0x32, 0x9b, 0x6f, 0xbf, 0xee, 0xb0, 0x55, 0xb3, 0x61, 0x95, 0x04, + 0x53, 0x96, 0x76, 0xdb, 0x26, 0xed, 0x82, 0x2a, 0xd4, 0x43, 0xa5, 0xfc, 0x70, 0xbb, 0xae, 0xb4, + 0x49, 0xe4, 0xa4, 0x94, 0x45, 0x2a, 0x96, 0x63, 0x4f, 0x92, 0xa1, 0x89, 0x27, 0xf2, 0x4c, 0xb6, + 0xc9, 0x7f, 0x80, 0x82, 0x90, 0x38, 0x70, 0x40, 0x48, 0x91, 0x90, 0x40, 0xd0, 0x63, 0x0f, 0x3d, + 0x71, 0xe3, 0x56, 0x71, 0xaa, 0x38, 0x71, 0x8a, 0x20, 0x3d, 0x94, 0xf3, 0x1e, 0x38, 0xf4, 0x84, + 0x3c, 0x93, 0xd4, 0x16, 0xfd, 0xb1, 0x81, 0x8b, 0x35, 0xf3, 0xde, 0xfb, 0x7c, 0xe6, 0xbd, 0xcf, + 0x1b, 0x3f, 0x1b, 0x6c, 0x59, 0x84, 0xf6, 0xee, 0x99, 0xb4, 0x97, 0xe7, 0x8f, 0xc3, 0xcb, 0x79, + 0x36, 0xea, 0x23, 0x9a, 0xeb, 0xbb, 0x84, 0x11, 0x28, 0x2f, 0xbc, 0x39, 0xfe, 0x38, 0xbc, 0x9c, + 0xda, 0xf4, 0x2c, 0x84, 0x1a, 0xdc, 0x9f, 0x17, 0x1b, 0x11, 0x9c, 0xda, 0x68, 0x93, 0x36, 0x11, + 0x76, 0x6f, 0x35, 0xb7, 0x6e, 0xb6, 0x09, 0x69, 0x77, 0x51, 0x9e, 0xef, 0x9a, 0x83, 0x56, 0xde, + 0x74, 0x46, 0x73, 0xd7, 0x49, 0xb3, 0x87, 0x1d, 0x92, 0xe7, 0x4f, 0x61, 0x52, 0xee, 0x80, 0xff, + 0x17, 0x2c, 0x0b, 0x51, 0xda, 0x18, 0xf5, 0x51, 0xcd, 0x74, 0xcd, 0x1e, 0x2c, 0x83, 0x95, 0x43, + 0xb3, 0x3b, 0x40, 0x49, 0x29, 0x2b, 0x9d, 0x3d, 0xb1, 0xbb, 0x95, 0xfb, 0x67, 0x4e, 0x39, 0x1f, + 0x51, 0x94, 0x8f, 0xa6, 0x99, 0xc4, 0xc8, 0xec, 0x75, 0xaf, 0x2a, 0x1c, 0xa4, 0xe8, 0x02, 0x7c, + 0x35, 0xfa, 0xf5, 0xb7, 0x19, 0x49, 0xf9, 0x51, 0x02, 0x09, 0x11, 0x5d, 0x22, 0x4e, 0x0b, 0xb7, + 0x61, 0x1d, 0x80, 0x3e, 0x72, 0x7b, 0x98, 0x52, 0x4c, 0x9c, 0xa5, 0x4e, 0x38, 0x75, 0x34, 0xcd, + 0x9c, 0x14, 0x27, 0xf8, 0x48, 0x45, 0x0f, 0xd0, 0xc0, 0x2b, 0x20, 0x6e, 0xda, 0xb6, 0x8b, 0x28, + 0x45, 0x34, 0x19, 0xc9, 0x46, 0xce, 0xc6, 0x8b, 0xc9, 0x5f, 0x1f, 0x5e, 0xdc, 0x98, 0xab, 0x55, + 0x10, 0xbe, 0x3a, 0x73, 0xb1, 0xd3, 0xd6, 0xfd, 0x50, 0x91, 0xe3, 0xcd, 0x68, 0x2c, 0x2c, 0x47, + 0x94, 0xaf, 0xc2, 0x60, 0x95, 0xd7, 0x4f, 0x21, 0x03, 0xd0, 0x22, 0x36, 0x32, 0x06, 0xfd, 0x2e, + 0x31, 0x6d, 0xc3, 0xe4, 0xb9, 0xf0, 0x5c, 0xd7, 0x77, 0xd3, 0xaf, 0xca, 0x55, 0xd4, 0x57, 0xdc, + 0x7e, 0x34, 0xcd, 0x84, 0x8e, 0xa6, 0x99, 0x4d, 0x91, 0xf1, 0x8b, 0x3c, 0xca, 0xfd, 0xa7, 0x0f, + 0x76, 0x24, 0x5d, 0xf6, 0x3c, 0xb7, 0xb8, 0x43, 0xe0, 0xe1, 0x17, 0x12, 0x48, 0x63, 0x87, 0x32, + 0xd3, 0x61, 0xd8, 0x64, 0xc8, 0xb0, 0x51, 0xcb, 0x1c, 0x74, 0x99, 0x11, 0x90, 0x2b, 0xbc, 0x84, + 0x5c, 0xe7, 0x8e, 0xa6, 0x99, 0x77, 0xc4, 0xe1, 0xaf, 0x67, 0x53, 0xf4, 0xad, 0x40, 0x40, 0x59, + 0xf8, 0x6b, 0xcf, 0xdd, 0x5c, 0x9c, 0x90, 0xf2, 0xb3, 0x04, 0x62, 0x25, 0x62, 0x23, 0xcd, 0x69, + 0x11, 0xf8, 0x26, 0x88, 0xf3, 0x82, 0x3a, 0x26, 0xed, 0x70, 0x3d, 0x12, 0x7a, 0xcc, 0x33, 0xec, + 0x99, 0xb4, 0x03, 0x77, 0xc1, 0x9a, 0xe5, 0x22, 0x93, 0x11, 0x97, 0xe7, 0xf9, 0xba, 0x16, 0x2c, + 0x02, 0xe1, 0x47, 0x00, 0x06, 0x93, 0xb4, 0xb8, 0x86, 0xc9, 0x95, 0xa5, 0x94, 0x8e, 0x7b, 0x4a, + 0x0b, 0x31, 0x4f, 0x06, 0x48, 0x84, 0xf7, 0x66, 0x34, 0x16, 0x91, 0xa3, 0x37, 0xa3, 0xb1, 0xa8, + 0xbc, 0xa2, 0xfc, 0x14, 0x01, 0x89, 0x12, 0x71, 0x98, 0x6b, 0x5a, 0x8c, 0xd7, 0xf1, 0x36, 0x58, + 0xe3, 0x75, 0x60, 0x9b, 0x57, 0x11, 0x2d, 0x82, 0xd9, 0x34, 0xb3, 0xca, 0xcb, 0x2c, 0xeb, 0xab, + 0x9e, 0x4b, 0xb3, 0xff, 0x53, 0x3d, 0x39, 0xb0, 0x62, 0xda, 0x3d, 0xec, 0x24, 0x23, 0xc7, 0x20, + 0x44, 0x18, 0xdc, 0x00, 0x2b, 0x5d, 0xb3, 0x89, 0xba, 0xc9, 0xa8, 0x17, 0xaf, 0x8b, 0x0d, 0xbc, + 0x36, 0x3f, 0x19, 0xd9, 0x73, 0x29, 0xce, 0xbc, 0x44, 0x8a, 0x26, 0x25, 0xdd, 0x01, 0x43, 0x8d, + 0x61, 0x8d, 0x50, 0xcc, 0x30, 0x71, 0xf4, 0x05, 0x08, 0x5e, 0x04, 0xeb, 0xb8, 0x69, 0x19, 0x7d, + 0xe2, 0x32, 0xaf, 0xc4, 0x55, 0x9e, 0xcb, 0xff, 0x66, 0xd3, 0x4c, 0x5c, 0x2b, 0x96, 0x6a, 0xc4, + 0x65, 0x5a, 0x59, 0x8f, 0xe3, 0xa6, 0xc5, 0x97, 0x36, 0xbc, 0x02, 0x4e, 0xa0, 0x81, 0x8b, 0xee, + 0x9a, 0xcf, 0x11, 0x6b, 0x1c, 0x21, 0xcf, 0xa6, 0x99, 0x84, 0xca, 0x3d, 0x73, 0x50, 0x02, 0xf9, + 0x3b, 0x1b, 0x7e, 0x02, 0xe2, 0x68, 0xc8, 0x90, 0xc3, 0xaf, 0x66, 0x8c, 0x27, 0xba, 0x91, 0x13, + 0xc3, 0x27, 0xb7, 0x18, 0x3e, 0xb9, 0x82, 0x33, 0x2a, 0xee, 0xfc, 0xf2, 0xf0, 0xe2, 0xf6, 0x0b, + 0x15, 0x04, 0x3b, 0xa2, 0x2e, 0x78, 0x74, 0x9f, 0xf2, 0x6a, 0xf4, 0x4f, 0x6f, 0x82, 0x7c, 0x1e, + 0x06, 0xc9, 0x45, 0xa8, 0xd7, 0xa1, 0x3d, 0x4c, 0x19, 0x71, 0x47, 0xaa, 0xc3, 0xdc, 0x11, 0xac, + 0x81, 0x38, 0xe9, 0x23, 0xd7, 0x64, 0xfe, 0x30, 0xd9, 0xcd, 0xbd, 0xf2, 0xa4, 0x00, 0xbc, 0xba, + 0x40, 0x79, 0xef, 0x8c, 0xee, 0x93, 0x04, 0xaf, 0x46, 0xf8, 0x95, 0x57, 0xe3, 0x1a, 0x58, 0x1b, + 0xf4, 0x6d, 0xde, 0xa0, 0xc8, 0xbf, 0x69, 0xd0, 0x1c, 0x04, 0x3f, 0x00, 0x91, 0x1e, 0x6d, 0xf3, + 0xa6, 0x27, 0x8a, 0xdb, 0xcf, 0xa6, 0x19, 0xa8, 0x9b, 0xf7, 0x16, 0x59, 0xee, 0x23, 0x4a, 0xcd, + 0x36, 0xfa, 0xe6, 0xe9, 0x83, 0x9d, 0x75, 0xec, 0x74, 0xb1, 0x83, 0x8c, 0x4f, 0x29, 0x71, 0x74, + 0x0f, 0xa2, 0xe8, 0x00, 0xbe, 0x48, 0x0c, 0xdf, 0x02, 0x89, 0x66, 0x97, 0x58, 0x77, 0x8d, 0x0e, + 0xc2, 0xed, 0x0e, 0x13, 0x97, 0x5a, 0x5f, 0xe7, 0xb6, 0x3d, 0x6e, 0x82, 0x9b, 0x20, 0xc6, 0x86, + 0x06, 0x76, 0x6c, 0x34, 0x14, 0x85, 0xe9, 0x6b, 0x6c, 0xa8, 0x79, 0x5b, 0x05, 0x81, 0x95, 0x7d, + 0x62, 0xa3, 0x2e, 0xbc, 0x0e, 0x22, 0x77, 0xd1, 0x48, 0xbc, 0xd8, 0xc5, 0xf7, 0x9f, 0x4d, 0x33, + 0x97, 0xda, 0x98, 0x75, 0x06, 0xcd, 0x9c, 0x45, 0x7a, 0x79, 0x8b, 0xf4, 0x10, 0x6b, 0xb6, 0x98, + 0xbf, 0xe8, 0xe2, 0x26, 0xcd, 0x37, 0x47, 0x0c, 0xd1, 0xdc, 0x1e, 0x1a, 0x16, 0xbd, 0x85, 0xee, + 0x11, 0x78, 0xb7, 0x5a, 0x7c, 0x40, 0xc2, 0x7c, 0x44, 0x88, 0xcd, 0xce, 0x5f, 0x12, 0x00, 0xfe, + 0x9c, 0x82, 0x57, 0xc0, 0xe9, 0x42, 0xa9, 0xa4, 0xd6, 0xeb, 0x46, 0xe3, 0xa0, 0xa6, 0x1a, 0xb7, + 0x2a, 0xf5, 0x9a, 0x5a, 0xd2, 0xae, 0x6b, 0x6a, 0x59, 0x0e, 0xa5, 0x36, 0xc7, 0x93, 0xec, 0x29, + 0x3f, 0xf8, 0x96, 0x43, 0xfb, 0xc8, 0xc2, 0x2d, 0x8c, 0x6c, 0x78, 0x01, 0xc0, 0x20, 0xae, 0x52, + 0x2d, 0x56, 0xcb, 0x07, 0xb2, 0x94, 0xda, 0x18, 0x4f, 0xb2, 0xb2, 0x0f, 0xa9, 0x90, 0x26, 0xb1, + 0x47, 0x70, 0x17, 0x9c, 0x0a, 0x46, 0xab, 0x1f, 0xaa, 0xfa, 0x01, 0x07, 0x44, 0x52, 0xa7, 0xc7, + 0x93, 0xec, 0x1b, 0x3e, 0x40, 0x3d, 0x44, 0xee, 0x88, 0x63, 0xae, 0x81, 0xad, 0x20, 0xa6, 0x50, + 0x39, 0x30, 0xaa, 0xd7, 0x8d, 0x42, 0xb9, 0xac, 0xab, 0xf5, 0xba, 0x5a, 0x97, 0xa3, 0xa9, 0xad, + 0xf1, 0x24, 0x9b, 0xf4, 0xa1, 0x05, 0x67, 0x54, 0x6d, 0x15, 0x16, 0x5f, 0x95, 0x54, 0xec, 0xb3, + 0xef, 0xd2, 0xa1, 0xfb, 0xdf, 0xa7, 0x43, 0x8a, 0xf7, 0x65, 0x09, 0xef, 0xfc, 0x10, 0x01, 0xd9, + 0xe3, 0xae, 0x20, 0x44, 0xe0, 0x52, 0xa9, 0x5a, 0x69, 0xe8, 0x85, 0x52, 0xc3, 0x28, 0x55, 0xcb, + 0xaa, 0xb1, 0xa7, 0xd5, 0x1b, 0x55, 0xfd, 0xc0, 0xa8, 0xd6, 0x54, 0xbd, 0xd0, 0xd0, 0xaa, 0x95, + 0x97, 0xe9, 0x94, 0x1f, 0x4f, 0xb2, 0xe7, 0x8f, 0xe3, 0x0e, 0xaa, 0x77, 0x1b, 0x9c, 0x5b, 0xea, + 0x18, 0xad, 0xa2, 0x35, 0x64, 0x29, 0x75, 0x76, 0x3c, 0xc9, 0x9e, 0x39, 0x8e, 0x5f, 0x73, 0x30, + 0x83, 0x77, 0xc0, 0x85, 0xa5, 0x88, 0xf7, 0xb5, 0x1b, 0x7a, 0xa1, 0xa1, 0xca, 0xe1, 0xd4, 0xf9, + 0xf1, 0x24, 0xfb, 0xee, 0x71, 0xdc, 0xfb, 0xb8, 0xed, 0x9a, 0x0c, 0x2d, 0x4d, 0x7f, 0x43, 0xad, + 0xa8, 0x75, 0xad, 0x2e, 0x47, 0x96, 0xa3, 0xbf, 0x81, 0x1c, 0x44, 0x31, 0x4d, 0x45, 0xbd, 0x96, + 0x15, 0xf7, 0x1e, 0xfd, 0x91, 0x0e, 0xdd, 0x9f, 0xa5, 0xa5, 0x47, 0xb3, 0xb4, 0xf4, 0x78, 0x96, + 0x96, 0x7e, 0x9f, 0xa5, 0xa5, 0x2f, 0x9f, 0xa4, 0x43, 0x8f, 0x9f, 0xa4, 0x43, 0xbf, 0x3d, 0x49, + 0x87, 0x3e, 0xde, 0x0e, 0xbc, 0x10, 0x25, 0x42, 0x7b, 0xb7, 0x17, 0xff, 0x71, 0x76, 0x7e, 0x28, + 0xfe, 0xe7, 0xf8, 0xcf, 0x5c, 0x73, 0x95, 0xcf, 0xbf, 0xf7, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, + 0xa4, 0xa0, 0x24, 0x04, 0xed, 0x09, 0x00, 0x00, } func (this *AccessTypeParam) Equal(that interface{}) bool { @@ -723,6 +726,9 @@ func (this *ContractInfo) Equal(that interface{}) bool { if this.IBCPortID != that1.IBCPortID { return false } + if this.EurekaPortID != that1.EurekaPortID { + return false + } if !this.Extension.Equal(that1.Extension) { return false } @@ -999,6 +1005,13 @@ func (m *ContractInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x42 + } + if len(m.EurekaPortID) > 0 { + i -= len(m.EurekaPortID) + copy(dAtA[i:], m.EurekaPortID) + i = encodeVarintTypes(dAtA, i, uint64(len(m.EurekaPortID))) + i-- dAtA[i] = 0x3a } if len(m.IBCPortID) > 0 { @@ -1275,6 +1288,10 @@ func (m *ContractInfo) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + l = len(m.EurekaPortID) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } if m.Extension != nil { l = m.Extension.Size() n += 1 + l + sovTypes(uint64(l)) @@ -1983,6 +2000,38 @@ func (m *ContractInfo) Unmarshal(dAtA []byte) error { m.IBCPortID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EurekaPortID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EurekaPortID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Extension", wireType) }