diff --git a/docs/proto/provider.md b/docs/proto/provider.md index 6f06c604..aa7fe3f4 100644 --- a/docs/proto/provider.md +++ b/docs/proto/provider.md @@ -357,6 +357,7 @@ | `endpoint_sequence_number` | [uint32](#uint32) | | The sequence number of the associated endpoint in the on-chain data | | `port_range` | [string](#string) | | | | `port_range_as` | [string](#string) | | | + | `use_public_port` | [bool](#bool) | | | diff --git a/go/manifest/v2beta2/serviceexpose.pb.go b/go/manifest/v2beta2/serviceexpose.pb.go index e5cae464..f991270b 100644 --- a/go/manifest/v2beta2/serviceexpose.pb.go +++ b/go/manifest/v2beta2/serviceexpose.pb.go @@ -40,8 +40,9 @@ type ServiceExpose struct { IP string `protobuf:"bytes,8,opt,name=ip,proto3" json:"ip" yaml:"ip"` // The sequence number of the associated endpoint in the on-chain data EndpointSequenceNumber uint32 `protobuf:"varint,9,opt,name=endpoint_sequence_number,json=endpointSequenceNumber,proto3" json:"endpointSequenceNumber" yaml:"endpointSequenceNumber"` - PortRange string `protobuf:"bytes,10,opt,name=port_range,json=portRange,proto3" json:"portRange" yaml:"portRange"` - PortRangeAs string `protobuf:"bytes,11,opt,name=port_range_as,json=portRangeAs,proto3" json:"portRangeAs" yaml:"portRangeAs"` + PortRange string `protobuf:"bytes,10,opt,name=port_range,json=portRange,proto3" json:"port_range" yaml:"port_range"` + PortRangeAs string `protobuf:"bytes,11,opt,name=port_range_as,json=portRangeAs,proto3" json:"port_range_as" yaml:"port_range_as"` + UsePublicPort bool `protobuf:"varint,12,opt,name=use_public_port,json=usePublicPort,proto3" json:"use_public_port" yaml:"use_public_port"` } func (m *ServiceExpose) Reset() { *m = ServiceExpose{} } @@ -85,46 +86,49 @@ func init() { } var fileDescriptor_e8dad39b3d78f39d = []byte{ - // 613 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xe3, 0xb4, 0x4d, 0x9b, 0x4b, 0x03, 0xe8, 0x40, 0xc5, 0x2d, 0xaa, 0x2f, 0xba, 0x85, - 0xf0, 0xa3, 0x36, 0x6a, 0x91, 0xa8, 0xca, 0x84, 0x25, 0x10, 0x48, 0xfc, 0x88, 0xae, 0x1d, 0x50, - 0x97, 0xc8, 0x49, 0xaf, 0x8e, 0xd5, 0xc4, 0x77, 0xd8, 0x4e, 0x55, 0x36, 0x46, 0x16, 0x24, 0xfe, - 0x04, 0xfe, 0x9c, 0x4e, 0xa8, 0x63, 0xa7, 0x13, 0xb8, 0x9b, 0x47, 0x8f, 0x4c, 0xc8, 0x77, 0x67, - 0x9c, 0x8a, 0x76, 0xf3, 0xfb, 0xbc, 0xef, 0xf7, 0xdd, 0xd3, 0x7b, 0xcf, 0xe0, 0xa1, 0x77, 0xe4, - 0xc5, 0x23, 0x67, 0xe2, 0x85, 0xc1, 0x21, 0x8d, 0x13, 0xe7, 0x78, 0x73, 0x40, 0x13, 0x6f, 0xd3, - 0x89, 0x69, 0x74, 0x1c, 0x0c, 0x29, 0x3d, 0xe1, 0x2c, 0xa6, 0x36, 0x8f, 0x58, 0xc2, 0xe0, 0x8a, - 0xd4, 0xda, 0xa5, 0xd6, 0xd6, 0xda, 0xb5, 0x3b, 0x3e, 0xf3, 0x99, 0x94, 0x38, 0xc5, 0x97, 0x52, - 0xaf, 0x75, 0xaf, 0xa9, 0x3c, 0x4a, 0x12, 0xce, 0x78, 0x12, 0xb0, 0x30, 0x56, 0x4a, 0xfc, 0xb3, - 0x01, 0xda, 0xbb, 0xea, 0xbd, 0x97, 0xf2, 0x3d, 0xf8, 0x08, 0xcc, 0x73, 0x16, 0x25, 0xa6, 0xd1, - 0x31, 0xba, 0x6d, 0xf7, 0x6e, 0x26, 0x90, 0x8c, 0x73, 0x81, 0x5a, 0x9f, 0xbd, 0xc9, 0x78, 0x07, - 0x17, 0x11, 0x26, 0x12, 0xc2, 0xb7, 0xa0, 0x4d, 0x4f, 0x12, 0x1a, 0x85, 0xde, 0xb8, 0x2f, 0x5d, - 0x75, 0xe9, 0xba, 0x9f, 0x09, 0xb4, 0x5c, 0x26, 0x7a, 0xca, 0x7d, 0x5b, 0xb9, 0x67, 0x29, 0x26, - 0x97, 0x44, 0xd0, 0x05, 0x0b, 0xb2, 0x2b, 0x73, 0xae, 0x63, 0x74, 0x9b, 0xee, 0xe3, 0x4c, 0x20, - 0x05, 0x72, 0x81, 0x96, 0xf5, 0xe3, 0xb2, 0xeb, 0x3f, 0x02, 0xdd, 0xd4, 0x5d, 0xf7, 0x0a, 0x30, - 0x64, 0x63, 0xa2, 0x94, 0xf0, 0x19, 0x58, 0xd4, 0xf3, 0x33, 0xe7, 0x65, 0x95, 0xf5, 0x4c, 0xa0, - 0x12, 0xe5, 0x02, 0xdd, 0x50, 0x75, 0x34, 0xc0, 0xa4, 0x4c, 0xc1, 0x2d, 0xd0, 0xf0, 0xc7, 0x6c, - 0xe0, 0x8d, 0xcd, 0x85, 0x8e, 0xd1, 0x5d, 0x72, 0xef, 0x65, 0x02, 0x69, 0x92, 0x0b, 0xd4, 0x56, - 0x36, 0x15, 0x63, 0xa2, 0x13, 0xd0, 0x01, 0x0b, 0x23, 0x16, 0x27, 0xb1, 0xd9, 0xe8, 0xcc, 0x75, - 0x9b, 0xee, 0x6a, 0xd1, 0xb1, 0x04, 0x55, 0xc7, 0x32, 0xc4, 0x44, 0x61, 0xf8, 0xcd, 0x00, 0xcb, - 0xc5, 0x16, 0xfa, 0x7a, 0x0d, 0xe6, 0x62, 0xc7, 0xe8, 0xb6, 0x36, 0x9f, 0xd8, 0x57, 0xef, 0xd7, - 0xbe, 0xb4, 0x9b, 0xd7, 0x7b, 0x7b, 0xbd, 0x0f, 0xca, 0xe7, 0x6e, 0x9f, 0x0a, 0x54, 0x4b, 0x05, - 0x6a, 0xcd, 0xc0, 0x4c, 0xa0, 0x56, 0x51, 0x5c, 0x87, 0xb9, 0x40, 0x50, 0xf7, 0x50, 0x41, 0x4c, - 0x66, 0x25, 0xf0, 0x01, 0xa8, 0x07, 0xdc, 0x5c, 0x92, 0x93, 0x5a, 0x4d, 0x05, 0xaa, 0xbf, 0xe9, - 0x65, 0x02, 0xd5, 0x03, 0x9e, 0x0b, 0xd4, 0x54, 0xe6, 0x80, 0x63, 0x52, 0x0f, 0x38, 0x9c, 0x02, - 0x93, 0x86, 0x07, 0x9c, 0x05, 0x61, 0xd2, 0x8f, 0xe9, 0xa7, 0x29, 0x0d, 0x87, 0xb4, 0x1f, 0x4e, - 0x27, 0x03, 0x1a, 0x99, 0x4d, 0xb9, 0xf6, 0xe7, 0x99, 0x40, 0x2b, 0xa5, 0x66, 0x57, 0x4b, 0xde, - 0x4b, 0x45, 0x2e, 0xd0, 0xba, 0x3e, 0x80, 0x2b, 0xf3, 0x98, 0x5c, 0x63, 0x84, 0xef, 0x00, 0x28, - 0x2e, 0xab, 0x1f, 0x79, 0xa1, 0x4f, 0x4d, 0x20, 0x3b, 0xb5, 0x53, 0x81, 0x9a, 0xc5, 0xc9, 0x90, - 0x02, 0x66, 0x02, 0x35, 0x79, 0x19, 0xe4, 0x02, 0xdd, 0xaa, 0xee, 0x54, 0x22, 0x4c, 0xaa, 0x34, - 0xfc, 0x08, 0xda, 0x55, 0xb9, 0xbe, 0x17, 0x9b, 0x2d, 0x59, 0xf1, 0x69, 0x31, 0xca, 0x7f, 0x15, - 0x5f, 0xc8, 0x51, 0xf2, 0x2a, 0xac, 0x46, 0x39, 0x03, 0x31, 0x99, 0x95, 0xec, 0xcc, 0x7f, 0xfd, - 0x81, 0x6a, 0xee, 0xfe, 0xf9, 0x6f, 0xab, 0xf6, 0x25, 0xb5, 0x8c, 0xd3, 0xd4, 0x32, 0xce, 0x52, - 0xcb, 0xf8, 0x95, 0x5a, 0xc6, 0xf7, 0x0b, 0xab, 0x76, 0x76, 0x61, 0xd5, 0xce, 0x2f, 0xac, 0xda, - 0xfe, 0xb6, 0x1f, 0x24, 0xa3, 0xe9, 0xc0, 0x1e, 0xb2, 0x89, 0x13, 0xf3, 0x11, 0x8d, 0x58, 0xf8, - 0xea, 0x20, 0x74, 0xe4, 0x01, 0x6c, 0x78, 0x3c, 0xd8, 0x38, 0x64, 0xd1, 0x91, 0xe3, 0xb3, 0xff, - 0x7e, 0xdf, 0x41, 0x43, 0x9e, 0xf8, 0xd6, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0x3b, 0x8c, - 0x58, 0x39, 0x04, 0x00, 0x00, + // 664 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x94, 0x4d, 0x4f, 0xdb, 0x4c, + 0x10, 0xc7, 0xe3, 0xf0, 0x9a, 0x4d, 0xfc, 0xa0, 0x67, 0x1f, 0xc4, 0x63, 0xa8, 0xf0, 0x44, 0xbe, + 0x34, 0x7d, 0x21, 0x46, 0x70, 0x28, 0xa2, 0x52, 0xa5, 0x5a, 0x6a, 0xd5, 0x4a, 0x55, 0x89, 0x0c, + 0xbd, 0xa0, 0x4a, 0x96, 0x13, 0x96, 0xc4, 0x22, 0xf1, 0x6e, 0xfd, 0x82, 0xe8, 0xad, 0xc7, 0x5e, + 0x2a, 0xf5, 0x23, 0xf4, 0x83, 0xf4, 0x03, 0x70, 0xe4, 0xc8, 0x69, 0xd5, 0x9a, 0x9b, 0x8f, 0x3e, + 0xf6, 0x54, 0xed, 0xae, 0xd3, 0x04, 0x0a, 0xb7, 0xec, 0x7f, 0x7e, 0xff, 0x99, 0xd1, 0xcc, 0x38, + 0xe8, 0xa1, 0x7f, 0xe2, 0xc7, 0x03, 0x7b, 0xe4, 0x87, 0xc1, 0x31, 0x89, 0x13, 0xfb, 0x74, 0xab, + 0x4b, 0x12, 0x7f, 0xcb, 0x8e, 0x49, 0x74, 0x1a, 0xf4, 0x08, 0x39, 0x63, 0x34, 0x26, 0x6d, 0x16, + 0xd1, 0x84, 0xe2, 0x15, 0xc9, 0xb6, 0xc7, 0x6c, 0xbb, 0x64, 0xd7, 0x96, 0xfb, 0xb4, 0x4f, 0x25, + 0x62, 0x8b, 0x5f, 0x8a, 0x5e, 0x6b, 0xdd, 0x91, 0x79, 0x90, 0x24, 0x8c, 0xb2, 0x24, 0xa0, 0x61, + 0xac, 0x48, 0xeb, 0xfb, 0x02, 0xd2, 0xf7, 0x55, 0xbd, 0x17, 0xb2, 0x1e, 0x7e, 0x84, 0x66, 0x19, + 0x8d, 0x12, 0x43, 0x6b, 0x6a, 0x2d, 0xdd, 0xf9, 0x3f, 0xe7, 0x20, 0xdf, 0x05, 0x87, 0xfa, 0x47, + 0x7f, 0x34, 0xdc, 0xb5, 0xc4, 0xcb, 0x72, 0xa5, 0x88, 0xdf, 0x20, 0x9d, 0x9c, 0x25, 0x24, 0x0a, + 0xfd, 0xa1, 0x27, 0x5d, 0x55, 0xe9, 0xba, 0x9f, 0x73, 0x68, 0x8c, 0x03, 0x1d, 0xe5, 0xfe, 0x4f, + 0xb9, 0xa7, 0x55, 0xcb, 0xbd, 0x06, 0x61, 0x07, 0xcd, 0xc9, 0xae, 0x8c, 0x99, 0xa6, 0xd6, 0xaa, + 0x39, 0x8f, 0x73, 0x0e, 0x4a, 0x28, 0x38, 0x34, 0xca, 0xe2, 0xb2, 0xeb, 0x5f, 0x1c, 0x96, 0xca, + 0xae, 0x3b, 0x42, 0xe8, 0xd1, 0xa1, 0xab, 0x48, 0xfc, 0x04, 0x2d, 0x94, 0xf3, 0x33, 0x66, 0x65, + 0x96, 0xf5, 0x9c, 0xc3, 0x58, 0x2a, 0x38, 0xfc, 0xa3, 0xf2, 0x94, 0x82, 0xe5, 0x8e, 0x43, 0x78, + 0x1b, 0xcd, 0xf7, 0x87, 0xb4, 0xeb, 0x0f, 0x8d, 0xb9, 0xa6, 0xd6, 0x5a, 0x74, 0xee, 0xe5, 0x1c, + 0x4a, 0xa5, 0xe0, 0xa0, 0x2b, 0x9b, 0x7a, 0x5b, 0x6e, 0x19, 0xc0, 0x36, 0x9a, 0x1b, 0xd0, 0x38, + 0x89, 0x8d, 0xf9, 0xe6, 0x4c, 0xab, 0xe6, 0xac, 0x8a, 0x8e, 0xa5, 0x30, 0xe9, 0x58, 0x3e, 0x2d, + 0x57, 0xc9, 0xf8, 0x8b, 0x86, 0x1a, 0x62, 0x0b, 0x5e, 0xb9, 0x06, 0x63, 0xa1, 0xa9, 0xb5, 0xea, + 0x5b, 0x9b, 0xed, 0xdb, 0xf7, 0xdb, 0xbe, 0xb6, 0x9b, 0x57, 0x07, 0x07, 0x9d, 0x3d, 0xe5, 0x73, + 0x76, 0xce, 0x39, 0x54, 0x32, 0x0e, 0xf5, 0x29, 0x31, 0xe7, 0x50, 0x17, 0xc9, 0xcb, 0x67, 0xc1, + 0x01, 0x97, 0x3d, 0x4c, 0x44, 0xcb, 0x9d, 0x46, 0xf0, 0x03, 0x54, 0x0d, 0x98, 0xb1, 0x28, 0x27, + 0xb5, 0x9a, 0x71, 0xa8, 0xbe, 0xee, 0xe4, 0x1c, 0xaa, 0x01, 0x2b, 0x38, 0xd4, 0x94, 0x39, 0x60, + 0x96, 0x5b, 0x0d, 0x18, 0x4e, 0x91, 0x41, 0xc2, 0x23, 0x46, 0x83, 0x30, 0xf1, 0x62, 0xf2, 0x21, + 0x25, 0x61, 0x8f, 0x78, 0x61, 0x3a, 0xea, 0x92, 0xc8, 0xa8, 0xc9, 0xb5, 0x3f, 0xcd, 0x39, 0xac, + 0x8c, 0x99, 0xfd, 0x12, 0x79, 0x2b, 0x89, 0x82, 0xc3, 0x7a, 0x79, 0x00, 0xb7, 0xc6, 0x2d, 0xf7, + 0x0e, 0x23, 0xde, 0x43, 0x48, 0x5c, 0x96, 0x17, 0xf9, 0x61, 0x9f, 0x18, 0x48, 0x76, 0xba, 0x99, + 0x71, 0xa8, 0x89, 0x93, 0x71, 0x85, 0x98, 0x73, 0x98, 0x42, 0x0a, 0x0e, 0xff, 0x4e, 0x0e, 0x55, + 0x69, 0x96, 0x5b, 0x63, 0x63, 0x1a, 0xbf, 0x47, 0xfa, 0x24, 0xe2, 0xf9, 0xb1, 0x51, 0x97, 0x39, + 0x77, 0xc4, 0x30, 0xff, 0xe4, 0x7c, 0x2e, 0x86, 0x79, 0x9d, 0x2b, 0x38, 0x2c, 0xdf, 0x4c, 0xec, + 0xf9, 0x62, 0xa0, 0x6c, 0xe2, 0xc2, 0xc7, 0x68, 0x29, 0x8d, 0x89, 0xc7, 0xd2, 0xee, 0x30, 0xe8, + 0xa9, 0x6f, 0xa2, 0x21, 0xef, 0xe9, 0x59, 0xc6, 0x41, 0x7f, 0x17, 0x93, 0x8e, 0x8c, 0x88, 0x42, + 0x39, 0x87, 0x9b, 0x6c, 0xc1, 0x61, 0x45, 0xd5, 0xb8, 0x11, 0xb0, 0x5c, 0x3d, 0x9d, 0xf6, 0xee, + 0xce, 0x7e, 0xfe, 0x06, 0x15, 0xe7, 0xf0, 0xf2, 0xa7, 0x59, 0xf9, 0x94, 0x99, 0xda, 0x79, 0x66, + 0x6a, 0x17, 0x99, 0xa9, 0xfd, 0xc8, 0x4c, 0xed, 0xeb, 0x95, 0x59, 0xb9, 0xb8, 0x32, 0x2b, 0x97, + 0x57, 0x66, 0xe5, 0x70, 0xa7, 0x1f, 0x24, 0x83, 0xb4, 0xdb, 0xee, 0xd1, 0x91, 0x1d, 0xb3, 0x01, + 0x89, 0x68, 0xf8, 0xf2, 0x28, 0xb4, 0xe5, 0xb9, 0x6d, 0xf8, 0x2c, 0xd8, 0x38, 0xa6, 0xd1, 0x89, + 0xdd, 0xa7, 0x7f, 0xfd, 0x59, 0x74, 0xe7, 0xe5, 0x07, 0xb5, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, + 0xc2, 0x6c, 0x3e, 0x30, 0xa7, 0x04, 0x00, 0x00, } func (m *ServiceExpose) Marshal() (dAtA []byte, err error) { @@ -147,6 +151,16 @@ func (m *ServiceExpose) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.UsePublicPort { + i-- + if m.UsePublicPort { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x60 + } if len(m.PortRangeAs) > 0 { i -= len(m.PortRangeAs) copy(dAtA[i:], m.PortRangeAs) @@ -286,6 +300,9 @@ func (m *ServiceExpose) Size() (n int) { if l > 0 { n += 1 + l + sovServiceexpose(uint64(l)) } + if m.UsePublicPort { + n += 2 + } return n } @@ -311,6 +328,7 @@ func (this *ServiceExpose) String() string { `EndpointSequenceNumber:` + fmt.Sprintf("%v", this.EndpointSequenceNumber) + `,`, `PortRange:` + fmt.Sprintf("%v", this.PortRange) + `,`, `PortRangeAs:` + fmt.Sprintf("%v", this.PortRangeAs) + `,`, + `UsePublicPort:` + fmt.Sprintf("%v", this.UsePublicPort) + `,`, `}`, }, "") return s @@ -654,6 +672,26 @@ func (m *ServiceExpose) Unmarshal(dAtA []byte) error { } m.PortRangeAs = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 12: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UsePublicPort", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowServiceexpose + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.UsePublicPort = bool(v != 0) default: iNdEx = preIndex skippy, err := skipServiceexpose(dAtA[iNdEx:]) diff --git a/proto/provider/akash/manifest/v2beta2/serviceexpose.proto b/proto/provider/akash/manifest/v2beta2/serviceexpose.proto index 6684d276..3193c036 100644 --- a/proto/provider/akash/manifest/v2beta2/serviceexpose.proto +++ b/proto/provider/akash/manifest/v2beta2/serviceexpose.proto @@ -70,12 +70,17 @@ message ServiceExpose { ]; string port_range = 10 [ (gogoproto.customname) = "PortRange", - (gogoproto.jsontag) = "portRange", - (gogoproto.moretags) = "yaml:\"portRange\"" + (gogoproto.jsontag) = "port_range", + (gogoproto.moretags) = "yaml:\"port_range\"" ]; string port_range_as = 11 [ (gogoproto.customname) = "PortRangeAs", - (gogoproto.jsontag) = "portRangeAs", - (gogoproto.moretags) = "yaml:\"portRangeAs\"" + (gogoproto.jsontag) = "port_range_as", + (gogoproto.moretags) = "yaml:\"port_range_as\"" + ]; + bool use_public_port = 12 [ + (gogoproto.customname) = "UsePublicPort", + (gogoproto.jsontag) = "use_public_port", + (gogoproto.moretags) = "yaml:\"use_public_port\"" ]; }