diff --git a/proto/crosschain/query.proto b/proto/crosschain/query.proto index f73f8ed140..43479940fc 100644 --- a/proto/crosschain/query.proto +++ b/proto/crosschain/query.proto @@ -342,7 +342,7 @@ message QueryLastZetaHeightResponse { } message QueryConvertGasToZetaRequest { - string chain = 1; + int64 chainId = 1; string gasLimit = 2; } diff --git a/x/crosschain/keeper/zeta_conversion_rate.go b/x/crosschain/keeper/zeta_conversion_rate.go index 2ff34b1687..1b045f86bf 100644 --- a/x/crosschain/keeper/zeta_conversion_rate.go +++ b/x/crosschain/keeper/zeta_conversion_rate.go @@ -14,8 +14,8 @@ import ( func (k Keeper) ConvertGasToZeta(context context.Context, request *types.QueryConvertGasToZetaRequest) (*types.QueryConvertGasToZetaResponse, error) { ctx := sdk.UnwrapSDKContext(context) - chainName := common.ParseChainName(request.Chain) - chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainName(chainName) + chain := common.GetChainFromChainID(request.ChainId) + if chain == nil { return nil, zetaObserverTypes.ErrSupportedChains } @@ -24,7 +24,7 @@ func (k Keeper) ConvertGasToZeta(context context.Context, request *types.QueryCo return nil, status.Error(codes.InvalidArgument, "invalid request: param chain") } gasLimit := math.NewUintFromString(request.GasLimit) - outTxGasFee := medianGasPrice.Mul(gasLimit) + outTxGasFee := medianGasPrice.Mul(gasLimit).MulUint64(2) //FIXME: parameterize this to sync with where this fee is charged zrc20, err := k.fungibleKeeper.QuerySystemContractGasCoinZRC20(ctx, big.NewInt(chain.ChainId)) if err != nil { return nil, status.Error(codes.NotFound, "zrc20 not found") diff --git a/x/crosschain/types/query.pb.go b/x/crosschain/types/query.pb.go index 3657aef87f..580cd68f06 100644 --- a/x/crosschain/types/query.pb.go +++ b/x/crosschain/types/query.pb.go @@ -2107,7 +2107,7 @@ func (m *QueryLastZetaHeightResponse) GetHeight() int64 { } type QueryConvertGasToZetaRequest struct { - Chain string `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"` + ChainId int64 `protobuf:"varint,1,opt,name=chainId,proto3" json:"chainId,omitempty"` GasLimit string `protobuf:"bytes,2,opt,name=gasLimit,proto3" json:"gasLimit,omitempty"` } @@ -2144,11 +2144,11 @@ func (m *QueryConvertGasToZetaRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryConvertGasToZetaRequest proto.InternalMessageInfo -func (m *QueryConvertGasToZetaRequest) GetChain() string { +func (m *QueryConvertGasToZetaRequest) GetChainId() int64 { if m != nil { - return m.Chain + return m.ChainId } - return "" + return 0 } func (m *QueryConvertGasToZetaRequest) GetGasLimit() string { @@ -3114,7 +3114,7 @@ func init() { func init() { proto.RegisterFile("crosschain/query.proto", fileDescriptor_65a992045e92a606) } var fileDescriptor_65a992045e92a606 = []byte{ - // 2995 bytes of a gzipped FileDescriptorProto + // 2994 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4f, 0x6f, 0x1b, 0xc7, 0x15, 0xf7, 0x8a, 0x12, 0x25, 0x8d, 0xfe, 0x7a, 0xac, 0x38, 0x0c, 0x63, 0x8b, 0xce, 0x3a, 0xfe, 0x13, 0xdb, 0x21, 0x63, 0xc5, 0x76, 0x12, 0xc7, 0x09, 0x2a, 0xd9, 0xb1, 0x63, 0xc4, 0x49, 0xd4, @@ -3187,122 +3187,122 @@ var fileDescriptor_65a992045e92a606 = []byte{ 0xc8, 0x19, 0x73, 0xa3, 0x2a, 0x48, 0x65, 0x57, 0x73, 0x63, 0x0a, 0xc0, 0xaf, 0x22, 0x37, 0x66, 0xd2, 0x29, 0x77, 0x00, 0x9d, 0x46, 0xb7, 0x7b, 0xc7, 0xd0, 0x38, 0x32, 0x00, 0xde, 0x63, 0xc2, 0x4c, 0x04, 0x73, 0xfd, 0x32, 0xea, 0xd4, 0x3d, 0x8a, 0x3a, 0x1d, 0x25, 0x79, 0x25, 0xbd, 0xe4, - 0x0c, 0xec, 0xe9, 0xeb, 0x98, 0x70, 0xaf, 0xfb, 0xde, 0x36, 0x0b, 0xe4, 0x0d, 0x75, 0xc3, 0x97, - 0xec, 0xa9, 0x8f, 0xfb, 0xe9, 0xe8, 0x71, 0x5f, 0x24, 0x53, 0xb6, 0xc9, 0xef, 0x38, 0x75, 0x47, - 0xe0, 0x85, 0xbf, 0xd3, 0xd7, 0x7f, 0xaa, 0x61, 0x8e, 0xee, 0x15, 0x89, 0x58, 0x2e, 0x90, 0xc3, - 0x7e, 0x53, 0x6c, 0xfa, 0x4d, 0xaf, 0x76, 0xcb, 0xe4, 0xb7, 0x3d, 0x39, 0x88, 0xf2, 0x7b, 0x07, - 0xe4, 0x6c, 0xf8, 0xdc, 0x65, 0xf9, 0xee, 0x4d, 0xc6, 0x70, 0x76, 0xb8, 0x68, 0xef, 0x00, 0x3d, - 0x4b, 0x16, 0xe4, 0xaf, 0x9a, 0x67, 0x72, 0x10, 0x06, 0xba, 0xc9, 0xfa, 0x19, 0x72, 0x0a, 0x60, - 0xbe, 0xcd, 0x38, 0x37, 0x6d, 0xb6, 0x6e, 0x72, 0xee, 0x78, 0xf6, 0x7a, 0x2c, 0x31, 0xb2, 0xec, - 0x4d, 0x72, 0x7a, 0xd0, 0x44, 0x54, 0xec, 0x18, 0x99, 0xbe, 0xdf, 0x81, 0x18, 0x2a, 0x14, 0x13, - 0xf4, 0x57, 0x71, 0xc1, 0x7b, 0x6f, 0x7c, 0xe3, 0x6d, 0xf9, 0x14, 0x09, 0x4c, 0x8f, 0x9b, 0x96, - 0xdc, 0x5a, 0x83, 0x59, 0xcc, 0x69, 0x74, 0xfc, 0x9c, 0x92, 0xf1, 0xad, 0xf8, 0x2b, 0x00, 0xb4, - 0xf5, 0x7f, 0x8f, 0x23, 0x8a, 0x3d, 0xb8, 0x3b, 0xe6, 0x25, 0xf8, 0x95, 0xb2, 0x23, 0x64, 0x6d, - 0xae, 0xdd, 0x2a, 0x4d, 0x03, 0x55, 0xbe, 0x76, 0x8d, 0xb8, 0x49, 0x57, 0xc8, 0x6c, 0x38, 0xdb, - 0x6b, 0xd6, 0x37, 0x59, 0x10, 0x5a, 0x76, 0x6d, 0xa1, 0xdd, 0x2a, 0xcd, 0x00, 0xfd, 0x1d, 0x20, - 0x1b, 0x6a, 0x87, 0xbe, 0x4e, 0x16, 0x2d, 0xdf, 0x13, 0x81, 0x69, 0x89, 0xaa, 0x19, 0x3e, 0x0c, - 0xc1, 0xca, 0xd3, 0x6b, 0x47, 0xda, 0xad, 0xd2, 0x42, 0x34, 0x16, 0xbd, 0x19, 0xbb, 0x09, 0xf4, - 0x0d, 0x72, 0xc4, 0x6a, 0xd6, 0x9b, 0xae, 0x29, 0x9c, 0x6d, 0x56, 0xb5, 0x4d, 0x5e, 0x6d, 0x72, - 0x56, 0x2b, 0x8c, 0x83, 0x88, 0x27, 0xda, 0xad, 0xd2, 0xe1, 0x78, 0xf8, 0x96, 0xc9, 0xdf, 0xe3, - 0xac, 0x66, 0xf4, 0x92, 0xe8, 0x31, 0x32, 0x7e, 0x3f, 0xf0, 0xeb, 0x85, 0x09, 0xe0, 0x9b, 0x6a, - 0xb7, 0x4a, 0xd0, 0x37, 0xe0, 0x2f, 0x3d, 0x0d, 0x3e, 0x1a, 0x4a, 0xce, 0xc3, 0x8c, 0x99, 0x76, - 0xab, 0x34, 0x69, 0xa3, 0xbc, 0xa8, 0x21, 0xcd, 0xe5, 0xfa, 0x36, 0xaf, 0x6e, 0xba, 0xbe, 0x5f, - 0x2f, 0x4c, 0xc6, 0xe6, 0x92, 0xd4, 0x35, 0x49, 0x34, 0xe2, 0x26, 0xd5, 0x49, 0x9e, 0x0b, 0x53, - 0x34, 0x79, 0x61, 0x0a, 0x66, 0x92, 0x76, 0xab, 0x84, 0x14, 0x03, 0x7f, 0xe9, 0x51, 0x32, 0x26, - 0xfc, 0xc2, 0x34, 0x8c, 0xe7, 0xdb, 0xad, 0xd2, 0x98, 0xf0, 0x8d, 0x31, 0xe1, 0x4b, 0xb3, 0x89, - 0x78, 0xdb, 0xc2, 0xed, 0x21, 0xb1, 0xd9, 0x94, 0x31, 0xd8, 0xa4, 0x6e, 0x02, 0x5d, 0x25, 0x87, - 0x55, 0xfe, 0x30, 0x58, 0xcf, 0x80, 0x80, 0xa5, 0x76, 0xab, 0xa4, 0x0a, 0xbf, 0x2d, 0xc7, 0x8c, - 0x1e, 0x0a, 0xbd, 0x42, 0xc6, 0xa5, 0x2e, 0x85, 0x59, 0x88, 0x69, 0x83, 0x1e, 0xbd, 0x77, 0x7c, - 0xdb, 0x80, 0xf9, 0xfa, 0x87, 0x39, 0x92, 0xbb, 0xe3, 0xdb, 0x32, 0xbb, 0x46, 0x1b, 0x1e, 0x7a, - 0x67, 0xd4, 0x95, 0x01, 0x46, 0xf8, 0x0d, 0xc7, 0xe2, 0x85, 0xb1, 0x13, 0xb9, 0xb3, 0xd3, 0x06, - 0xf6, 0xa4, 0x33, 0xd7, 0x4c, 0x61, 0x86, 0xfe, 0x61, 0x40, 0xbb, 0xc7, 0xe7, 0xe4, 0xc6, 0x8f, - 0x0f, 0xf6, 0xb9, 0x1e, 0xe3, 0x4d, 0x1c, 0xd4, 0x78, 0x79, 0x58, 0x38, 0xab, 0xf1, 0x92, 0x07, - 0x6b, 0x72, 0xc0, 0xc1, 0x7a, 0x8e, 0x48, 0xb7, 0xc1, 0x85, 0xa6, 0x60, 0xa1, 0xd9, 0x76, 0xab, - 0x34, 0xe5, 0xfa, 0x76, 0xb8, 0x40, 0xa7, 0x45, 0x4f, 0x91, 0xc9, 0x80, 0xd5, 0xfd, 0x6d, 0x56, - 0x03, 0xaf, 0x99, 0x0a, 0x3d, 0x15, 0x49, 0x46, 0xd4, 0xd0, 0x2f, 0xe1, 0x8d, 0x3e, 0x2d, 0x04, - 0xf4, 0x8f, 0x1c, 0xff, 0x1a, 0xc7, 0xdb, 0x79, 0x1a, 0xdb, 0x7f, 0x2d, 0x64, 0x44, 0x67, 0x35, - 0x97, 0x7a, 0x56, 0x9f, 0x22, 0x39, 0xdb, 0xe4, 0x18, 0x00, 0x26, 0xdb, 0xad, 0x92, 0xec, 0x1a, - 0xf2, 0x8f, 0x34, 0x63, 0xa7, 0x66, 0x83, 0x1b, 0x0e, 0x66, 0xb4, 0x3b, 0xdf, 0x10, 0xa2, 0x96, - 0x5c, 0x03, 0xf0, 0xe7, 0xe3, 0x35, 0x64, 0x3f, 0xb4, 0x03, 0x2d, 0xc9, 0xeb, 0x4d, 0xa3, 0x29, - 0x70, 0xe3, 0xa6, 0xdb, 0xad, 0x52, 0x48, 0x30, 0xc2, 0x1f, 0x39, 0x21, 0xac, 0x51, 0x4c, 0xc5, - 0x13, 0x80, 0x80, 0xe5, 0x8a, 0xbe, 0xe7, 0x3a, 0xd5, 0xb5, 0xc8, 0xbe, 0xce, 0x65, 0x89, 0x4c, - 0x6c, 0x9b, 0x6e, 0x93, 0xe1, 0x71, 0x86, 0xb5, 0x81, 0x60, 0x84, 0x3f, 0x52, 0x37, 0xb1, 0xdb, - 0x60, 0x85, 0xd9, 0x58, 0x37, 0xd9, 0x37, 0xe0, 0x2f, 0xad, 0x90, 0x19, 0xd3, 0xb2, 0x18, 0xe7, - 0x55, 0xd7, 0xe1, 0xa2, 0x30, 0x27, 0x4f, 0xe0, 0xda, 0x7c, 0xbb, 0x55, 0x22, 0x21, 0xf9, 0x8e, - 0x23, 0xaf, 0x40, 0x71, 0x5b, 0x06, 0xc7, 0xb0, 0x48, 0xe5, 0xd4, 0x0a, 0xf3, 0x71, 0x70, 0xc4, - 0xab, 0x72, 0x7c, 0x67, 0x3e, 0x42, 0xb4, 0xed, 0xc2, 0x02, 0x4c, 0x98, 0x68, 0xb7, 0x4a, 0xda, - 0xb6, 0xa1, 0x6d, 0x4b, 0x62, 0x50, 0x58, 0x8c, 0x89, 0x81, 0xa1, 0x05, 0x92, 0xc8, 0x0b, 0x87, - 0x63, 0x22, 0x37, 0x34, 0xae, 0x5f, 0x25, 0x27, 0x54, 0xd7, 0x83, 0xf4, 0xbb, 0xb6, 0x8b, 0xfe, - 0x81, 0x3e, 0x7b, 0x94, 0xe4, 0xb7, 0xe2, 0x9b, 0xc9, 0xb8, 0x81, 0x3d, 0xfd, 0xef, 0x93, 0xe4, - 0x99, 0x3d, 0x98, 0xd1, 0x73, 0x75, 0x92, 0x47, 0x2f, 0xd4, 0xe2, 0x78, 0x1c, 0x52, 0x0c, 0xfc, - 0xed, 0xf8, 0xc5, 0x58, 0xaa, 0x5f, 0x54, 0xc8, 0x4c, 0xc3, 0x0c, 0x98, 0x27, 0x42, 0xe7, 0x0f, - 0x1d, 0x14, 0x6c, 0x17, 0x92, 0xc1, 0xfb, 0x95, 0x76, 0xec, 0x27, 0xe3, 0x7d, 0xfc, 0xa4, 0x42, - 0x66, 0xf8, 0x96, 0xf9, 0x62, 0xb5, 0xe9, 0x59, 0x2e, 0xe3, 0xe8, 0xb4, 0x20, 0x51, 0x92, 0xdf, - 0x03, 0xaa, 0xa1, 0xb4, 0xbb, 0x52, 0x50, 0x7e, 0x40, 0x0a, 0x4a, 0xba, 0x1b, 0xaf, 0x06, 0xbe, - 0x1f, 0x39, 0x75, 0xb7, 0xbb, 0x71, 0xc3, 0xf7, 0x85, 0xd1, 0x43, 0x91, 0x0b, 0xca, 0x5c, 0xc5, - 0x42, 0xde, 0xa9, 0x78, 0x41, 0xa0, 0x02, 0x53, 0xdc, 0xa4, 0x97, 0xc9, 0x5c, 0x10, 0xde, 0x31, - 0x70, 0xb1, 0xf0, 0x08, 0x2c, 0xb6, 0x5b, 0xa5, 0xd9, 0x68, 0x00, 0x78, 0x12, 0x3d, 0x69, 0xa7, - 0xba, 0xe3, 0xb1, 0x00, 0x8f, 0x02, 0xd8, 0x09, 0x08, 0x46, 0xf8, 0x43, 0xcb, 0x84, 0xd4, 0x9c, - 0xfb, 0xf7, 0x1d, 0xab, 0xe9, 0x8a, 0x5d, 0xf4, 0x7c, 0x30, 0x53, 0x4c, 0x35, 0x94, 0x36, 0xa4, - 0x00, 0x5f, 0x98, 0x6e, 0x55, 0xe1, 0x9a, 0x55, 0x52, 0x80, 0x1c, 0xbb, 0x11, 0xb3, 0x76, 0x13, - 0xa4, 0xd6, 0x6c, 0x47, 0x04, 0x66, 0x15, 0x12, 0xd2, 0x5c, 0xac, 0x35, 0x50, 0x6f, 0x98, 0xc2, - 0x34, 0xe2, 0xa6, 0xf4, 0x1a, 0xee, 0x7c, 0xc0, 0xf0, 0x78, 0x80, 0xd7, 0xc8, 0xbe, 0x01, 0x7f, - 0xa3, 0xb0, 0xe4, 0xc2, 0x15, 0x78, 0x21, 0x11, 0x96, 0xe0, 0x1a, 0x1c, 0x5f, 0x88, 0x13, 0x17, - 0x91, 0xc5, 0x3d, 0x2e, 0x22, 0xe7, 0xc9, 0xb4, 0x70, 0xea, 0x8c, 0x0b, 0xb3, 0xde, 0xc0, 0x93, - 0x04, 0xe8, 0x3a, 0x44, 0x23, 0x6e, 0xd2, 0x4b, 0x64, 0x56, 0xdd, 0xd5, 0x02, 0x85, 0x23, 0x0f, - 0x5b, 0x92, 0xd8, 0xed, 0x44, 0x4f, 0x9e, 0x16, 0x74, 0xca, 0x23, 0x30, 0x1f, 0x4e, 0x4b, 0x48, - 0x31, 0xf0, 0x97, 0x5e, 0x25, 0x8b, 0xf2, 0x55, 0x52, 0xbd, 0xcf, 0x58, 0xb5, 0xc1, 0x02, 0x79, - 0x3d, 0x2b, 0x2c, 0x01, 0x9a, 0xc3, 0xed, 0x56, 0x69, 0x4e, 0x8e, 0xdd, 0x64, 0x6c, 0x9d, 0x05, - 0xb7, 0x4c, 0x6e, 0x24, 0xbb, 0x52, 0xd5, 0xba, 0x13, 0xd6, 0xfa, 0x0b, 0x4f, 0xc4, 0xaa, 0xd6, - 0x1d, 0x28, 0xb2, 0x18, 0x51, 0x63, 0xe5, 0xfb, 0xcf, 0x92, 0x09, 0x38, 0xdb, 0xf4, 0x47, 0x1a, - 0xc9, 0x87, 0xa5, 0x66, 0x7a, 0x71, 0xc0, 0x6d, 0xa4, 0xb7, 0xd6, 0x5d, 0x5c, 0xd9, 0x0f, 0x4b, - 0x18, 0x31, 0xf4, 0x53, 0x1f, 0x7e, 0xf1, 0xcf, 0x1f, 0x8e, 0x95, 0xe8, 0xf1, 0x8a, 0xe4, 0x78, - 0x5e, 0xa9, 0xdb, 0xab, 0x25, 0x78, 0xfa, 0xa9, 0x46, 0x66, 0xd5, 0xea, 0x20, 0xbd, 0x9a, 0x65, - 0xad, 0xf4, 0xc2, 0x78, 0xf1, 0xd5, 0xa1, 0x78, 0x11, 0xf0, 0x6b, 0x00, 0xf8, 0x25, 0x7a, 0xb9, - 0x0f, 0x60, 0xb5, 0x5e, 0x59, 0x79, 0x88, 0x15, 0xf7, 0x47, 0x95, 0x87, 0x10, 0x8c, 0x1e, 0xd1, - 0x8f, 0x35, 0xb2, 0xa0, 0xca, 0x5d, 0x75, 0xdd, 0x6c, 0xba, 0xa4, 0x97, 0xc7, 0xb3, 0xe9, 0xd2, - 0xa7, 0xe4, 0xad, 0x9f, 0x07, 0x5d, 0x4e, 0xd1, 0x93, 0x19, 0x74, 0xa1, 0x5f, 0x68, 0xe4, 0x68, - 0x17, 0x72, 0xac, 0xfa, 0xd2, 0xd5, 0x21, 0x40, 0x24, 0xcb, 0xd6, 0xc5, 0xb5, 0x83, 0x88, 0x40, - 0x75, 0x56, 0x40, 0x9d, 0x0b, 0xf4, 0x5c, 0x06, 0x75, 0x22, 0xe8, 0x7f, 0xd1, 0xc8, 0x7c, 0xb2, - 0x18, 0x49, 0xaf, 0x65, 0x74, 0x8f, 0xd4, 0xe2, 0x6b, 0xf1, 0xb5, 0x21, 0xb9, 0x51, 0x87, 0x97, - 0x41, 0x87, 0x15, 0xfa, 0x42, 0x1f, 0x1d, 0x92, 0x25, 0xd2, 0xca, 0xc3, 0xa8, 0xff, 0x88, 0xfe, - 0x41, 0x23, 0x87, 0x93, 0x42, 0xa5, 0x6f, 0x5d, 0xcb, 0x68, 0xd7, 0x03, 0x28, 0xd3, 0xb7, 0x3a, - 0xac, 0x3f, 0x0f, 0xca, 0x9c, 0xa1, 0xa7, 0x32, 0x29, 0x43, 0xff, 0xaa, 0xf5, 0x54, 0x58, 0x69, - 0x56, 0x73, 0xa6, 0xd7, 0x75, 0x8b, 0xaf, 0x0f, 0xcb, 0xbe, 0xd7, 0x76, 0x44, 0x82, 0x2a, 0x7b, - 0xfc, 0xc7, 0x14, 0xfd, 0xbd, 0x46, 0xe6, 0x12, 0xc5, 0x5a, 0xfa, 0x72, 0x46, 0x2c, 0x3d, 0xc5, - 0xdf, 0xe2, 0x2b, 0x43, 0x70, 0xa2, 0x02, 0x2f, 0x81, 0x02, 0x17, 0x69, 0x65, 0x90, 0x02, 0x36, - 0x13, 0x55, 0xc1, 0x79, 0xf4, 0x05, 0x81, 0xfe, 0x44, 0x8b, 0x8a, 0xbf, 0xf4, 0x52, 0xc6, 0xe5, - 0x13, 0x65, 0xe5, 0xe2, 0xe5, 0x7d, 0x72, 0x65, 0x4c, 0x08, 0xe1, 0x7f, 0x98, 0xd1, 0x8f, 0x34, - 0xa8, 0x17, 0x67, 0x4b, 0x53, 0x89, 0x02, 0x74, 0xb6, 0x34, 0x95, 0xac, 0x4e, 0xeb, 0x3a, 0xa0, - 0x3a, 0x46, 0x8b, 0x7d, 0x50, 0x49, 0x28, 0xbf, 0xd0, 0xe2, 0xd2, 0x2b, 0xbd, 0x92, 0x71, 0x91, - 0xae, 0x1a, 0x71, 0xf1, 0xa5, 0x7d, 0xf3, 0x21, 0xc2, 0x0a, 0x20, 0x7c, 0x8e, 0x9e, 0xe9, 0x83, - 0x30, 0x7a, 0x97, 0xc9, 0x90, 0x51, 0x63, 0x3b, 0x8f, 0xe8, 0xcf, 0x34, 0x32, 0x13, 0x49, 0x91, - 0x91, 0xe2, 0x4a, 0xc6, 0xb3, 0x3e, 0x14, 0xe2, 0x94, 0x4a, 0xb5, 0x7e, 0x06, 0x10, 0x3f, 0x43, - 0x4b, 0x03, 0x10, 0xd3, 0x4f, 0x34, 0xb2, 0xd8, 0xfd, 0xf9, 0x92, 0x66, 0x4a, 0x7c, 0x7d, 0xbe, - 0xa3, 0x16, 0xaf, 0x0d, 0xc7, 0x9c, 0xd1, 0xd4, 0x56, 0x37, 0xd6, 0x4f, 0x35, 0x32, 0xa3, 0x7c, - 0xa1, 0xa4, 0x37, 0xb2, 0x2c, 0x3f, 0xe8, 0x4b, 0x68, 0xf1, 0x8d, 0x03, 0x4a, 0x41, 0x6d, 0xce, - 0x81, 0x36, 0xcf, 0x52, 0xbd, 0xdf, 0x0d, 0x4c, 0x01, 0xfe, 0x5b, 0x2d, 0x51, 0xa8, 0xa6, 0x59, - 0x03, 0x53, 0x6f, 0x69, 0xbd, 0x78, 0x75, 0x18, 0xd6, 0x8c, 0x89, 0xde, 0x8a, 0x79, 0x3a, 0xee, - 0xfe, 0x2b, 0x8d, 0xcc, 0x2b, 0xb2, 0xa4, 0xc7, 0xbf, 0x92, 0xd1, 0x73, 0x87, 0x45, 0x9f, 0x5e, - 0xec, 0x1f, 0x68, 0x70, 0x05, 0x3d, 0xfd, 0x9d, 0x46, 0x16, 0x13, 0xc5, 0x70, 0x89, 0x3b, 0xeb, - 0x9d, 0x2f, 0xad, 0x66, 0x5f, 0xbc, 0x36, 0x1c, 0x33, 0x62, 0xbf, 0x00, 0xd8, 0x4f, 0xd3, 0x67, - 0xfb, 0x39, 0x8b, 0xca, 0x45, 0x3f, 0xd3, 0x7a, 0xea, 0xcc, 0x99, 0x13, 0x7a, 0x7a, 0x95, 0x3c, - 0x73, 0x42, 0xef, 0x53, 0xf9, 0xd6, 0xaf, 0x80, 0x02, 0x2f, 0xd0, 0x72, 0x1f, 0x05, 0xdc, 0x24, - 0x5f, 0xc7, 0x7d, 0xfe, 0xa8, 0x11, 0xda, 0x25, 0x53, 0x6e, 0x45, 0xd6, 0x0b, 0xd2, 0x41, 0xb4, - 0xe9, 0x5f, 0xc7, 0xd7, 0xcb, 0xa0, 0xcd, 0x59, 0x7a, 0x3a, 0x9b, 0x36, 0x32, 0xa9, 0x8f, 0xc3, - 0x55, 0x2b, 0x6b, 0x0e, 0x54, 0x2f, 0x83, 0x2f, 0xee, 0x8b, 0x27, 0xe3, 0x13, 0xc3, 0xc2, 0x5b, - 0x2c, 0x18, 0xf9, 0xc7, 0x1a, 0x99, 0x8c, 0x2e, 0xae, 0x2b, 0x59, 0x4f, 0xd8, 0x7e, 0x11, 0x76, - 0x95, 0xd6, 0xf5, 0x93, 0x80, 0xf0, 0x38, 0x7d, 0x7a, 0x0f, 0x84, 0x61, 0xf4, 0x08, 0x91, 0xe1, - 0xc1, 0xc8, 0x1e, 0x3d, 0x7a, 0xaa, 0xe2, 0xd9, 0xa3, 0x47, 0x6f, 0x3d, 0x7b, 0x70, 0xf4, 0x88, - 0x79, 0x20, 0x5c, 0xab, 0xc5, 0xcf, 0xac, 0xe1, 0xba, 0xb7, 0xda, 0x9b, 0x39, 0x5c, 0xa7, 0x54, - 0x70, 0x07, 0x86, 0x6b, 0x2f, 0xe6, 0x49, 0x84, 0x6b, 0x45, 0xd6, 0x7e, 0xc2, 0xf5, 0xb0, 0xe8, - 0xd3, 0xeb, 0xcf, 0x03, 0x0d, 0xae, 0xa0, 0xa7, 0xbf, 0xd1, 0xc8, 0x7c, 0xb2, 0xe4, 0x9b, 0x0d, - 0x75, 0x6a, 0x11, 0x39, 0x1b, 0xea, 0xf4, 0x0a, 0xf3, 0xc0, 0xa7, 0x97, 0x9b, 0x60, 0x5b, 0x7b, - 0xeb, 0xb3, 0x2f, 0x97, 0xb5, 0xcf, 0xbf, 0x5c, 0xd6, 0xfe, 0xf1, 0xe5, 0xb2, 0xf6, 0xd1, 0xe3, - 0xe5, 0x43, 0x9f, 0x3f, 0x5e, 0x3e, 0xf4, 0xb7, 0xc7, 0xcb, 0x87, 0xee, 0x5d, 0xb4, 0x1d, 0xb1, - 0xd5, 0xdc, 0x2c, 0x5b, 0x7e, 0x3d, 0xf5, 0x09, 0xb1, 0xa3, 0x4a, 0x15, 0xbb, 0x0d, 0xc6, 0x37, - 0xf3, 0x70, 0x65, 0x78, 0xf1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x67, 0x9d, 0xf9, 0x06, 0x19, - 0x33, 0x00, 0x00, + 0x0c, 0xec, 0xe9, 0x1b, 0x98, 0x70, 0xaf, 0xfb, 0xde, 0x36, 0x0b, 0xe4, 0x0d, 0x75, 0xc3, 0x97, + 0xec, 0x7d, 0x8e, 0x53, 0x2e, 0x3e, 0x4e, 0x45, 0x32, 0x65, 0x9b, 0xfc, 0x8e, 0x53, 0x77, 0x04, + 0x5e, 0xfa, 0x3b, 0x7d, 0xfd, 0xa7, 0x1a, 0xe6, 0xe9, 0x5e, 0xb1, 0x88, 0xe7, 0x02, 0x39, 0xec, + 0x37, 0xc5, 0xa6, 0xdf, 0xf4, 0x6a, 0xb7, 0x4c, 0x7e, 0xdb, 0x93, 0x83, 0xe8, 0x78, 0xbd, 0x03, + 0x72, 0x36, 0x7c, 0xf2, 0xb2, 0x7c, 0xf7, 0x26, 0x63, 0x38, 0x3b, 0x5c, 0xb4, 0x77, 0x80, 0x9e, + 0x25, 0x0b, 0xf2, 0x57, 0xcd, 0x35, 0x39, 0x08, 0x05, 0xdd, 0x64, 0xfd, 0x0c, 0x39, 0x05, 0x30, + 0xdf, 0x66, 0x9c, 0x9b, 0x36, 0x5b, 0x37, 0x39, 0x77, 0x3c, 0x7b, 0x3d, 0x96, 0x18, 0x59, 0xf7, + 0x26, 0x39, 0x3d, 0x68, 0x22, 0x2a, 0x76, 0x8c, 0x4c, 0xdf, 0xef, 0x40, 0x0c, 0x15, 0x8a, 0x09, + 0xfa, 0xab, 0xb8, 0xe0, 0xbd, 0x37, 0xbe, 0xf1, 0xb6, 0x7c, 0x8e, 0x04, 0xa6, 0xc7, 0x4d, 0x4b, + 0x6e, 0xaf, 0xc1, 0x2c, 0xe6, 0x34, 0x3a, 0xbe, 0x4e, 0xc9, 0xf8, 0x56, 0xfc, 0x25, 0x00, 0xda, + 0xfa, 0xbf, 0xc7, 0x11, 0xc5, 0x1e, 0xdc, 0x1d, 0xf3, 0x12, 0xfc, 0x52, 0xd9, 0x11, 0xb2, 0x36, + 0xd7, 0x6e, 0x95, 0xa6, 0x81, 0x2a, 0x5f, 0xbc, 0x46, 0xdc, 0xa4, 0x2b, 0x64, 0x36, 0x9c, 0xed, + 0x35, 0xeb, 0x9b, 0x2c, 0x08, 0x2d, 0xbb, 0xb6, 0xd0, 0x6e, 0x95, 0x66, 0x80, 0xfe, 0x0e, 0x90, + 0x0d, 0xb5, 0x43, 0x5f, 0x27, 0x8b, 0x96, 0xef, 0x89, 0xc0, 0xb4, 0x44, 0xd5, 0x0c, 0x1f, 0x87, + 0x60, 0xe5, 0xe9, 0xb5, 0x23, 0xed, 0x56, 0x69, 0x21, 0x1a, 0x8b, 0xde, 0x8d, 0xdd, 0x04, 0xfa, + 0x06, 0x39, 0x62, 0x35, 0xeb, 0x4d, 0xd7, 0x14, 0xce, 0x36, 0xab, 0xda, 0x26, 0xaf, 0x36, 0x39, + 0xab, 0x15, 0xc6, 0x41, 0xc4, 0x13, 0xed, 0x56, 0xe9, 0x70, 0x3c, 0x7c, 0xcb, 0xe4, 0xef, 0x71, + 0x56, 0x33, 0x7a, 0x49, 0xf4, 0x18, 0x19, 0xbf, 0x1f, 0xf8, 0xf5, 0xc2, 0x04, 0xf0, 0x4d, 0xb5, + 0x5b, 0x25, 0xe8, 0x1b, 0xf0, 0x97, 0x9e, 0x06, 0x1f, 0x0d, 0x25, 0xe7, 0x61, 0xc6, 0x4c, 0xbb, + 0x55, 0x9a, 0xb4, 0x51, 0x5e, 0xd4, 0x90, 0xe6, 0x72, 0x7d, 0x9b, 0x57, 0x37, 0x5d, 0xdf, 0xaf, + 0x17, 0x26, 0x63, 0x73, 0x49, 0xea, 0x9a, 0x24, 0x1a, 0x71, 0x93, 0xea, 0x24, 0xcf, 0x85, 0x29, + 0x9a, 0xbc, 0x30, 0x05, 0x33, 0x49, 0xbb, 0x55, 0x42, 0x8a, 0x81, 0xbf, 0xf4, 0x28, 0x19, 0x13, + 0x7e, 0x61, 0x1a, 0xc6, 0xf3, 0xed, 0x56, 0x69, 0x4c, 0xf8, 0xc6, 0x98, 0xf0, 0xa5, 0xd9, 0x44, + 0xbc, 0x6d, 0xe1, 0xf6, 0x90, 0xd8, 0x6c, 0xca, 0x18, 0x6c, 0x52, 0x37, 0x81, 0xae, 0x92, 0xc3, + 0x2a, 0x7f, 0x18, 0xb0, 0x67, 0x40, 0xc0, 0x52, 0xbb, 0x55, 0x52, 0x85, 0xdf, 0x96, 0x63, 0x46, + 0x0f, 0x85, 0x5e, 0x21, 0xe3, 0x52, 0x97, 0xc2, 0x2c, 0xc4, 0xb5, 0x41, 0x0f, 0xdf, 0x3b, 0xbe, + 0x6d, 0xc0, 0x7c, 0xfd, 0xc3, 0x1c, 0xc9, 0xdd, 0xf1, 0x6d, 0x19, 0x12, 0xa2, 0x0d, 0x0f, 0xbd, + 0x33, 0xea, 0xca, 0x20, 0x23, 0xfc, 0x86, 0x63, 0xf1, 0xc2, 0xd8, 0x89, 0xdc, 0xd9, 0x69, 0x03, + 0x7b, 0xd2, 0x99, 0x6b, 0xa6, 0x30, 0x43, 0xff, 0x30, 0xa0, 0xdd, 0xe3, 0x73, 0x72, 0xe3, 0xc7, + 0x07, 0xfb, 0x5c, 0x8f, 0xf1, 0x26, 0x0e, 0x6a, 0xbc, 0x3c, 0x2c, 0x9c, 0xd5, 0x78, 0xc9, 0x83, + 0x35, 0x39, 0xe0, 0x60, 0x3d, 0x47, 0xa4, 0xdb, 0xe0, 0x42, 0x53, 0xb0, 0xd0, 0x6c, 0xbb, 0x55, + 0x9a, 0x72, 0x7d, 0x3b, 0x5c, 0xa0, 0xd3, 0xa2, 0xa7, 0xc8, 0x64, 0xc0, 0xea, 0xfe, 0x36, 0xab, + 0x81, 0xd7, 0x4c, 0x85, 0x9e, 0x8a, 0x24, 0x23, 0x6a, 0xe8, 0x97, 0xf0, 0x56, 0x9f, 0x16, 0x02, + 0xfa, 0x47, 0x8e, 0x7f, 0x8d, 0xe3, 0x0d, 0x3d, 0x8d, 0xed, 0xbf, 0x16, 0x32, 0xa2, 0xb3, 0x9a, + 0x4b, 0x3d, 0xab, 0x4f, 0x91, 0x9c, 0x6d, 0x72, 0x0c, 0x00, 0x93, 0xed, 0x56, 0x49, 0x76, 0x0d, + 0xf9, 0x47, 0x9a, 0xb1, 0x53, 0xb7, 0xc1, 0x0d, 0x07, 0x33, 0xda, 0x9d, 0xef, 0x08, 0x51, 0x4b, + 0xae, 0x01, 0xf8, 0xf3, 0xf1, 0x1a, 0xb2, 0x1f, 0xda, 0x81, 0x96, 0xe4, 0x15, 0xa7, 0xd1, 0x14, + 0xb8, 0x71, 0xd3, 0xed, 0x56, 0x29, 0x24, 0x18, 0xe1, 0x8f, 0x9c, 0x10, 0xd6, 0x29, 0xa6, 0xe2, + 0x09, 0x40, 0xc0, 0x92, 0x45, 0xdf, 0x73, 0x9d, 0xea, 0x5a, 0x64, 0x5f, 0xe7, 0xb2, 0x44, 0x26, + 0xb6, 0x4d, 0xb7, 0xc9, 0xf0, 0x38, 0xc3, 0xda, 0x40, 0x30, 0xc2, 0x1f, 0xa9, 0x9b, 0xd8, 0x6d, + 0xb0, 0xc2, 0x6c, 0xac, 0x9b, 0xec, 0x1b, 0xf0, 0x97, 0x56, 0xc8, 0x8c, 0x69, 0x59, 0x8c, 0xf3, + 0xaa, 0xeb, 0x70, 0x51, 0x98, 0x93, 0x27, 0x70, 0x6d, 0xbe, 0xdd, 0x2a, 0x91, 0x90, 0x7c, 0xc7, + 0x91, 0xd7, 0xa0, 0xb8, 0x2d, 0x83, 0x63, 0x58, 0xa8, 0x72, 0x6a, 0x85, 0xf9, 0x38, 0x38, 0x62, + 0x7e, 0x8f, 0x13, 0xfd, 0x11, 0xa2, 0x6d, 0x17, 0x16, 0x60, 0xc2, 0x44, 0xbb, 0x55, 0xd2, 0xb6, + 0x0d, 0x6d, 0x5b, 0x12, 0x83, 0xc2, 0x62, 0x4c, 0x0c, 0x0c, 0x2d, 0x90, 0x44, 0x5e, 0x38, 0x1c, + 0x13, 0xb9, 0xa1, 0x71, 0xfd, 0x2a, 0x39, 0xa1, 0xba, 0x1e, 0xa4, 0xdf, 0xb5, 0x5d, 0xf4, 0x0f, + 0xf4, 0xd9, 0xa3, 0x24, 0xbf, 0x15, 0xdf, 0x4e, 0xc6, 0x0d, 0xec, 0xe9, 0x7f, 0x9f, 0x24, 0xcf, + 0xec, 0xc1, 0x8c, 0x9e, 0xab, 0x93, 0x3c, 0x7a, 0xa1, 0x16, 0xc7, 0xe3, 0x90, 0x62, 0xe0, 0x6f, + 0xc7, 0x2f, 0xc6, 0x52, 0xfd, 0xa2, 0x42, 0x66, 0x1a, 0x66, 0xc0, 0x3c, 0x11, 0x3a, 0x7f, 0xe8, + 0xa0, 0x60, 0xbb, 0x90, 0x0c, 0xde, 0xaf, 0xb4, 0x63, 0x3f, 0x19, 0xef, 0xe3, 0x27, 0x15, 0x32, + 0xc3, 0xb7, 0xcc, 0x17, 0xab, 0x4d, 0xcf, 0x72, 0x19, 0x47, 0xa7, 0x05, 0x89, 0x92, 0xfc, 0x1e, + 0x50, 0x0d, 0xa5, 0xdd, 0x95, 0x82, 0xf2, 0x03, 0x52, 0x50, 0xd2, 0xdd, 0x78, 0x35, 0xf0, 0xfd, + 0xc8, 0xa9, 0xbb, 0xdd, 0x8d, 0x1b, 0xbe, 0x2f, 0x8c, 0x1e, 0x8a, 0x5c, 0x50, 0xe6, 0x2a, 0x16, + 0xf2, 0x4e, 0xc5, 0x0b, 0x02, 0x15, 0x98, 0xe2, 0x26, 0xbd, 0x4c, 0xe6, 0x82, 0xf0, 0x8e, 0x81, + 0x8b, 0x85, 0x47, 0x60, 0xb1, 0xdd, 0x2a, 0xcd, 0x46, 0x03, 0xc0, 0x93, 0xe8, 0x49, 0x3b, 0xd5, + 0x1d, 0x8f, 0x05, 0x78, 0x14, 0xc0, 0x4e, 0x40, 0x30, 0xc2, 0x1f, 0x5a, 0x26, 0xa4, 0xe6, 0xdc, + 0xbf, 0xef, 0x58, 0x4d, 0x57, 0xec, 0xa2, 0xe7, 0x83, 0x99, 0x62, 0xaa, 0xa1, 0xb4, 0x21, 0x05, + 0xf8, 0xc2, 0x74, 0xab, 0x0a, 0xd7, 0xac, 0x92, 0x02, 0xe4, 0xd8, 0x8d, 0x98, 0xb5, 0x9b, 0x20, + 0xb5, 0x66, 0x3b, 0x22, 0x30, 0xab, 0x90, 0x90, 0xe6, 0x62, 0xad, 0x81, 0x7a, 0xc3, 0x14, 0xa6, + 0x11, 0x37, 0xa5, 0xd7, 0x70, 0xe7, 0x03, 0x86, 0xc7, 0x03, 0xbc, 0x46, 0xf6, 0x0d, 0xf8, 0x1b, + 0x85, 0x25, 0x17, 0xae, 0xc0, 0x0b, 0x89, 0xb0, 0x04, 0xd7, 0xe0, 0xf8, 0x42, 0x9c, 0xb8, 0x88, + 0x2c, 0xee, 0x71, 0x11, 0x39, 0x4f, 0xa6, 0x85, 0x53, 0x67, 0x5c, 0x98, 0xf5, 0x06, 0x9e, 0x24, + 0x40, 0xd7, 0x21, 0x1a, 0x71, 0x93, 0x5e, 0x22, 0xb3, 0xea, 0xae, 0x16, 0x28, 0x1c, 0x79, 0xd8, + 0x92, 0xc4, 0x6e, 0x27, 0x7a, 0xf2, 0xb4, 0xa0, 0x53, 0x1e, 0x81, 0xf9, 0x70, 0x5a, 0x42, 0x8a, + 0x81, 0xbf, 0xf4, 0x2a, 0x59, 0x94, 0x2f, 0x93, 0xea, 0x7d, 0xc6, 0xaa, 0x0d, 0x16, 0xc8, 0xeb, + 0x59, 0x61, 0x09, 0xd0, 0x1c, 0x6e, 0xb7, 0x4a, 0x73, 0x72, 0xec, 0x26, 0x63, 0xeb, 0x2c, 0xb8, + 0x65, 0x72, 0x23, 0xd9, 0x95, 0xaa, 0xd6, 0x9d, 0xb0, 0xde, 0x5f, 0x78, 0x22, 0x56, 0xb5, 0xee, + 0x40, 0xa1, 0xc5, 0x88, 0x1a, 0x2b, 0xdf, 0x7f, 0x96, 0x4c, 0xc0, 0xd9, 0xa6, 0x3f, 0xd2, 0x48, + 0x3e, 0x2c, 0x37, 0xd3, 0x8b, 0x03, 0x6e, 0x23, 0xbd, 0xf5, 0xee, 0xe2, 0xca, 0x7e, 0x58, 0xc2, + 0x88, 0xa1, 0x9f, 0xfa, 0xf0, 0x8b, 0x7f, 0xfe, 0x70, 0xac, 0x44, 0x8f, 0x57, 0x24, 0xc7, 0xf3, + 0x4a, 0xed, 0x5e, 0x2d, 0xc3, 0xd3, 0x4f, 0x35, 0x32, 0xab, 0x56, 0x08, 0xe9, 0xd5, 0x2c, 0x6b, + 0xa5, 0x17, 0xc7, 0x8b, 0xaf, 0x0e, 0xc5, 0x8b, 0x80, 0x5f, 0x03, 0xc0, 0x2f, 0xd1, 0xcb, 0x7d, + 0x00, 0xab, 0x35, 0xcb, 0xca, 0x43, 0xac, 0xba, 0x3f, 0xaa, 0x3c, 0x84, 0x60, 0xf4, 0x88, 0x7e, + 0xac, 0x91, 0x05, 0x55, 0xee, 0xaa, 0xeb, 0x66, 0xd3, 0x25, 0xbd, 0x44, 0x9e, 0x4d, 0x97, 0x3e, + 0x65, 0x6f, 0xfd, 0x3c, 0xe8, 0x72, 0x8a, 0x9e, 0xcc, 0xa0, 0x0b, 0xfd, 0x42, 0x23, 0x47, 0xbb, + 0x90, 0x63, 0xe5, 0x97, 0xae, 0x0e, 0x01, 0x22, 0x59, 0xba, 0x2e, 0xae, 0x1d, 0x44, 0x04, 0xaa, + 0xb3, 0x02, 0xea, 0x5c, 0xa0, 0xe7, 0x32, 0xa8, 0x13, 0x41, 0xff, 0x8b, 0x46, 0xe6, 0x93, 0x05, + 0x49, 0x7a, 0x2d, 0xa3, 0x7b, 0xa4, 0x16, 0x60, 0x8b, 0xaf, 0x0d, 0xc9, 0x8d, 0x3a, 0xbc, 0x0c, + 0x3a, 0xac, 0xd0, 0x17, 0xfa, 0xe8, 0x90, 0x2c, 0x93, 0x56, 0x1e, 0x46, 0xfd, 0x47, 0xf4, 0x0f, + 0x1a, 0x39, 0x9c, 0x14, 0x2a, 0x7d, 0xeb, 0x5a, 0x46, 0xbb, 0x1e, 0x40, 0x99, 0xbe, 0x15, 0x62, + 0xfd, 0x79, 0x50, 0xe6, 0x0c, 0x3d, 0x95, 0x49, 0x19, 0xfa, 0x57, 0xad, 0xa7, 0xca, 0x4a, 0xb3, + 0x9a, 0x33, 0xbd, 0xb6, 0x5b, 0x7c, 0x7d, 0x58, 0xf6, 0xbd, 0xb6, 0x23, 0x12, 0x54, 0xd9, 0xe3, + 0xbf, 0xa6, 0xe8, 0xef, 0x35, 0x32, 0x97, 0x28, 0xd8, 0xd2, 0x97, 0x33, 0x62, 0xe9, 0x29, 0x00, + 0x17, 0x5f, 0x19, 0x82, 0x13, 0x15, 0x78, 0x09, 0x14, 0xb8, 0x48, 0x2b, 0x83, 0x14, 0xb0, 0x99, + 0xa8, 0x0a, 0xce, 0xa3, 0x2f, 0x08, 0xf4, 0x27, 0x5a, 0x54, 0x00, 0xa6, 0x97, 0x32, 0x2e, 0x9f, + 0x28, 0x2d, 0x17, 0x2f, 0xef, 0x93, 0x2b, 0x63, 0x42, 0x08, 0xff, 0xcb, 0x8c, 0x7e, 0xa4, 0x41, + 0xcd, 0x38, 0x5b, 0x9a, 0x4a, 0x14, 0xa1, 0xb3, 0xa5, 0xa9, 0x64, 0x85, 0x5a, 0xd7, 0x01, 0xd5, + 0x31, 0x5a, 0xec, 0x83, 0x4a, 0x42, 0xf9, 0x85, 0x16, 0x97, 0x5f, 0xe9, 0x95, 0x8c, 0x8b, 0x74, + 0xd5, 0x89, 0x8b, 0x2f, 0xed, 0x9b, 0x0f, 0x11, 0x56, 0x00, 0xe1, 0x73, 0xf4, 0x4c, 0x1f, 0x84, + 0xd1, 0xbb, 0x4c, 0x86, 0x8c, 0x1a, 0xdb, 0x79, 0x44, 0x7f, 0xa6, 0x91, 0x99, 0x48, 0x8a, 0x8c, + 0x14, 0x57, 0x32, 0x9e, 0xf5, 0xa1, 0x10, 0xa7, 0x54, 0xab, 0xf5, 0x33, 0x80, 0xf8, 0x19, 0x5a, + 0x1a, 0x80, 0x98, 0x7e, 0xa2, 0x91, 0xc5, 0xee, 0xcf, 0x97, 0x34, 0x53, 0xe2, 0xeb, 0xf3, 0x2d, + 0xb5, 0x78, 0x6d, 0x38, 0xe6, 0x8c, 0xa6, 0xb6, 0xba, 0xb1, 0x7e, 0xaa, 0x91, 0x19, 0xe5, 0x0b, + 0x25, 0xbd, 0x91, 0x65, 0xf9, 0x41, 0x5f, 0x42, 0x8b, 0x6f, 0x1c, 0x50, 0x0a, 0x6a, 0x73, 0x0e, + 0xb4, 0x79, 0x96, 0xea, 0xfd, 0x6e, 0x60, 0x0a, 0xf0, 0xdf, 0x6a, 0x89, 0x62, 0x35, 0xcd, 0x1a, + 0x98, 0x7a, 0xcb, 0xeb, 0xc5, 0xab, 0xc3, 0xb0, 0x66, 0x4c, 0xf4, 0x56, 0xcc, 0xd3, 0x71, 0xf7, + 0x5f, 0x69, 0x64, 0x5e, 0x91, 0x25, 0x3d, 0xfe, 0x95, 0x8c, 0x9e, 0x3b, 0x2c, 0xfa, 0xf4, 0x82, + 0xff, 0x40, 0x83, 0x2b, 0xe8, 0xe9, 0xef, 0x34, 0xb2, 0x98, 0x28, 0x88, 0x4b, 0xdc, 0x59, 0xef, + 0x7c, 0x69, 0x75, 0xfb, 0xe2, 0xb5, 0xe1, 0x98, 0x11, 0xfb, 0x05, 0xc0, 0x7e, 0x9a, 0x3e, 0xdb, + 0xcf, 0x59, 0x54, 0x2e, 0xfa, 0x99, 0xd6, 0x53, 0x6b, 0xce, 0x9c, 0xd0, 0xd3, 0x2b, 0xe5, 0x99, + 0x13, 0x7a, 0x9f, 0xea, 0xb7, 0x7e, 0x05, 0x14, 0x78, 0x81, 0x96, 0xfb, 0x28, 0xe0, 0x26, 0xf9, + 0x3a, 0xee, 0xf3, 0x47, 0x8d, 0xd0, 0x2e, 0x99, 0x72, 0x2b, 0xb2, 0x5e, 0x90, 0x0e, 0xa2, 0x4d, + 0xff, 0x5a, 0xbe, 0x5e, 0x06, 0x6d, 0xce, 0xd2, 0xd3, 0xd9, 0xb4, 0x91, 0x49, 0x7d, 0x1c, 0xae, + 0x5a, 0x59, 0x73, 0xa0, 0x7a, 0x19, 0x7c, 0x71, 0x5f, 0x3c, 0x19, 0x9f, 0x18, 0x16, 0xde, 0x62, + 0xc1, 0xc8, 0x3f, 0xd6, 0xc8, 0x64, 0x74, 0x71, 0x5d, 0xc9, 0x7a, 0xc2, 0xf6, 0x8b, 0xb0, 0xab, + 0xbc, 0xae, 0x9f, 0x04, 0x84, 0xc7, 0xe9, 0xd3, 0x7b, 0x20, 0x0c, 0xa3, 0x47, 0x88, 0x0c, 0x0f, + 0x46, 0xf6, 0xe8, 0xd1, 0x53, 0x19, 0xcf, 0x1e, 0x3d, 0x7a, 0x6b, 0xda, 0x83, 0xa3, 0x47, 0xcc, + 0x03, 0xe1, 0x5a, 0x2d, 0x80, 0x66, 0x0d, 0xd7, 0xbd, 0x15, 0xdf, 0xcc, 0xe1, 0x3a, 0xa5, 0x8a, + 0x3b, 0x30, 0x5c, 0x7b, 0x31, 0x4f, 0x22, 0x5c, 0x2b, 0xb2, 0xf6, 0x13, 0xae, 0x87, 0x45, 0x9f, + 0x5e, 0x83, 0x1e, 0x68, 0x70, 0x05, 0x3d, 0xfd, 0x8d, 0x46, 0xe6, 0x93, 0x65, 0xdf, 0x6c, 0xa8, + 0x53, 0x0b, 0xc9, 0xd9, 0x50, 0xa7, 0x57, 0x99, 0x07, 0x3e, 0xbd, 0xdc, 0x04, 0xdb, 0xda, 0x5b, + 0x9f, 0x7d, 0xb9, 0xac, 0x7d, 0xfe, 0xe5, 0xb2, 0xf6, 0x8f, 0x2f, 0x97, 0xb5, 0x8f, 0x1e, 0x2f, + 0x1f, 0xfa, 0xfc, 0xf1, 0xf2, 0xa1, 0xbf, 0x3d, 0x5e, 0x3e, 0x74, 0xef, 0xa2, 0xed, 0x88, 0xad, + 0xe6, 0x66, 0xd9, 0xf2, 0xeb, 0xa9, 0x4f, 0x88, 0x1d, 0x55, 0xaa, 0xd8, 0x6d, 0x30, 0xbe, 0x99, + 0x87, 0x2b, 0xc3, 0x8b, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x11, 0x54, 0xd2, 0x1e, 0x1d, 0x33, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5937,12 +5937,10 @@ func (m *QueryConvertGasToZetaRequest) MarshalToSizedBuffer(dAtA []byte) (int, e i-- dAtA[i] = 0x12 } - if len(m.Chain) > 0 { - i -= len(m.Chain) - copy(dAtA[i:], m.Chain) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Chain))) + if m.ChainId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -7309,9 +7307,8 @@ func (m *QueryConvertGasToZetaRequest) Size() (n int) { } var l int _ = l - l = len(m.Chain) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if m.ChainId != 0 { + n += 1 + sovQuery(uint64(m.ChainId)) } l = len(m.GasLimit) if l > 0 { @@ -11737,10 +11734,10 @@ func (m *QueryConvertGasToZetaRequest) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) } - var stringLen uint64 + m.ChainId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -11750,24 +11747,11 @@ func (m *QueryConvertGasToZetaRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.ChainId |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Chain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field GasLimit", wireType)