From 2b01f69391f1b55e1991dc073b81c82d85d69174 Mon Sep 17 00:00:00 2001 From: pyncz Date: Wed, 20 Nov 2024 13:25:52 +0300 Subject: [PATCH] fix(x/oracle): rename `creation_time` to `creation_time_unix_ms` --- proto/archway/oracle/v1/oracle.proto | 9 +- x/oracle/genesis_test.go | 6 +- x/oracle/keeper/keeper.go | 6 +- x/oracle/keeper/querier_test.go | 36 +++---- x/oracle/types/oracle.pb.go | 154 ++++++++++++++------------- 5 files changed, 107 insertions(+), 104 deletions(-) diff --git a/proto/archway/oracle/v1/oracle.proto b/proto/archway/oracle/v1/oracle.proto index 4ef64eb5..5dd4cd14 100644 --- a/proto/archway/oracle/v1/oracle.proto +++ b/proto/archway/oracle/v1/oracle.proto @@ -138,13 +138,14 @@ message DatedPrice { (gogoproto.nullable) = false ]; - /// creation_height defines the block height when price record was created + // creation_height defines the block height when price record was created int64 creation_height = 2 [ (gogoproto.moretags) = "yaml:\"creation_height\"" ]; - /// creation_time defines the block time when price record was created - uint64 creation_time = 3 - [ (gogoproto.moretags) = "yaml:\"creation_time\"" ]; + // creation_time_unix_ms defines the block time in milliseconds since unix epoch, + // when price record was created + uint64 creation_time_unix_ms = 3 + [ (gogoproto.moretags) = "yaml:\"creation_time_unix_ms\"" ]; } // Rewards defines a credit object towards validators diff --git a/x/oracle/genesis_test.go b/x/oracle/genesis_test.go index 1e81cdb2..e5d38856 100644 --- a/x/oracle/genesis_test.go +++ b/x/oracle/genesis_test.go @@ -28,9 +28,9 @@ func TestExportInitGenesis(t *testing.T) { require.NoError(t, keepers.OracleKeeper.Params.Set(ctx, types.DefaultParams())) require.NoError(t, keepers.OracleKeeper.FeederDelegations.Set(ctx, ValAddrs[0], AccAddrs[1])) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, "pair1:pair2", types.DatedPrice{ - ExchangeRate: math.LegacyNewDec(123), - CreationHeight: 0, - CreationTime: 0, + ExchangeRate: math.LegacyNewDec(123), + CreationHeight: 0, + CreationTimeUnixMs: 0, })) require.NoError(t, keepers.OracleKeeper.Prevotes.Set(ctx, ValAddrs[0], types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{123}, ValAddrs[0], uint64(2)))) require.NoError(t, keepers.OracleKeeper.Votes.Set(ctx, ValAddrs[0], types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Pair: "foo", ExchangeRate: math.LegacyNewDec(123)}}, ValAddrs[0]))) diff --git a/x/oracle/keeper/keeper.go b/x/oracle/keeper/keeper.go index cbb245cb..af87257e 100644 --- a/x/oracle/keeper/keeper.go +++ b/x/oracle/keeper/keeper.go @@ -207,9 +207,9 @@ func (k Keeper) GetExchangeRate(ctx sdk.Context, pair asset.Pair) (price math.Le // SetPrice sets the price for a pair as well as the price snapshot. func (k Keeper) SetPrice(ctx sdk.Context, pair asset.Pair, price math.LegacyDec) { if err := k.ExchangeRates.Set(ctx, pair, types.DatedPrice{ - ExchangeRate: price, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: price, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), }); err != nil { ctx.Logger().Error("failed to set DatedPrice", "pair", pair, "error", err) } diff --git a/x/oracle/keeper/querier_test.go b/x/oracle/keeper/querier_test.go index ff8f3011..f7267b66 100644 --- a/x/oracle/keeper/querier_test.go +++ b/x/oracle/keeper/querier_test.go @@ -39,9 +39,9 @@ func TestQueryExchangeRate(t *testing.T) { rate := math.LegacyNewDec(1700) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, asset.Registry.Pair(denoms.ETH, denoms.NUSD), types.DatedPrice{ - ExchangeRate: rate, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: rate, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), })) // empty request @@ -91,14 +91,14 @@ func TestQueryExchangeRates(t *testing.T) { rate := math.LegacyNewDec(1700) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, asset.Registry.Pair(denoms.BTC, denoms.NUSD), types.DatedPrice{ - ExchangeRate: rate, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: rate, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), })) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, asset.Registry.Pair(denoms.ETH, denoms.NUSD), types.DatedPrice{ - ExchangeRate: rate, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: rate, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), })) res, err := querier.ExchangeRates(ctx, &types.QueryExchangeRatesRequest{}) @@ -233,21 +233,21 @@ func TestQueryActives(t *testing.T) { rate := math.LegacyNewDec(1700) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, asset.Registry.Pair(denoms.BTC, denoms.NUSD), types.DatedPrice{ - ExchangeRate: rate, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: rate, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), })) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, asset.Registry.Pair(denoms.NIBI, denoms.NUSD), types.DatedPrice{ - ExchangeRate: rate, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: rate, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), })) require.NoError(t, keepers.OracleKeeper.ExchangeRates.Set(ctx, asset.Registry.Pair(denoms.ETH, denoms.NUSD), types.DatedPrice{ - ExchangeRate: rate, - CreationHeight: ctx.BlockHeight(), - CreationTime: uint64(ctx.BlockTime().UnixMilli()), + ExchangeRate: rate, + CreationHeight: ctx.BlockHeight(), + CreationTimeUnixMs: uint64(ctx.BlockTime().UnixMilli()), })) res, err := queryClient.Actives(ctx, &types.QueryActivesRequest{}) diff --git a/x/oracle/types/oracle.pb.go b/x/oracle/types/oracle.pb.go index d10dd903..085d4bf3 100644 --- a/x/oracle/types/oracle.pb.go +++ b/x/oracle/types/oracle.pb.go @@ -262,10 +262,11 @@ var xxx_messageInfo_ExchangeRateTuple proto.InternalMessageInfo type DatedPrice struct { ExchangeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=exchange_rate,json=exchangeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"exchange_rate" yaml:"exchange_rate"` - // / creation_height defines the block height when price record was created + // creation_height defines the block height when price record was created CreationHeight int64 `protobuf:"varint,2,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height,omitempty" yaml:"creation_height"` - // / creation_time defines the block time when price record was created - CreationTime uint64 `protobuf:"varint,3,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty" yaml:"creation_time"` + // creation_time_unix_ms defines the block time in milliseconds since unix epoch, + // when price record was created + CreationTimeUnixMs uint64 `protobuf:"varint,3,opt,name=creation_time_unix_ms,json=creationTimeUnixMs,proto3" json:"creation_time_unix_ms,omitempty" yaml:"creation_time_unix_ms"` } func (m *DatedPrice) Reset() { *m = DatedPrice{} } @@ -308,9 +309,9 @@ func (m *DatedPrice) GetCreationHeight() int64 { return 0 } -func (m *DatedPrice) GetCreationTime() uint64 { +func (m *DatedPrice) GetCreationTimeUnixMs() uint64 { if m != nil { - return m.CreationTime + return m.CreationTimeUnixMs } return 0 } @@ -393,70 +394,71 @@ func init() { func init() { proto.RegisterFile("archway/oracle/v1/oracle.proto", fileDescriptor_ceb632d7c2facf1a) } var fileDescriptor_ceb632d7c2facf1a = []byte{ - // 996 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0x1b, 0xc5, - 0x1b, 0xf6, 0x26, 0x4e, 0x1a, 0x8f, 0x93, 0x34, 0x9e, 0xa6, 0xfd, 0x6d, 0xd2, 0xca, 0x9b, 0xdf, - 0x80, 0x50, 0x0e, 0xb0, 0x56, 0xca, 0x3f, 0x11, 0xe0, 0xd0, 0x6d, 0xa8, 0xa8, 0x28, 0xc8, 0x1a, - 0x45, 0x20, 0xf5, 0x62, 0xc6, 0xbb, 0x93, 0xdd, 0x51, 0x76, 0x3d, 0x66, 0x66, 0x12, 0x27, 0xdf, - 0x80, 0x23, 0x5c, 0x10, 0xdc, 0x72, 0xe6, 0xc6, 0xb7, 0xe8, 0xb1, 0x47, 0xd4, 0xc3, 0x16, 0x92, - 0x4b, 0xc5, 0x71, 0x3f, 0x01, 0x9a, 0xd9, 0x71, 0xbc, 0xc1, 0x3e, 0x84, 0x8a, 0xdb, 0xbe, 0xef, - 0xf3, 0xee, 0xf3, 0x3e, 0xef, 0x9f, 0x99, 0x01, 0x6d, 0x22, 0xc2, 0x64, 0x44, 0x4e, 0x3b, 0x5c, - 0x90, 0x30, 0xa5, 0x9d, 0xe3, 0x1d, 0xfb, 0xe5, 0x0f, 0x05, 0x57, 0x1c, 0xb6, 0x2c, 0xee, 0x5b, - 0xef, 0xf1, 0xce, 0xe6, 0x7a, 0xcc, 0x63, 0x6e, 0xd0, 0x8e, 0xfe, 0x2a, 0x03, 0x37, 0xdb, 0x31, - 0xe7, 0x71, 0x4a, 0x3b, 0xc6, 0xea, 0x1f, 0x1d, 0x74, 0xa2, 0x23, 0x41, 0x14, 0xe3, 0x83, 0x31, - 0x1e, 0x72, 0x99, 0x71, 0xd9, 0xe9, 0x13, 0xa9, 0xb3, 0xf4, 0xa9, 0x22, 0x3b, 0x9d, 0x90, 0x33, - 0x8b, 0xa3, 0x5f, 0x96, 0xc0, 0x62, 0x97, 0x08, 0x92, 0x49, 0xf8, 0x21, 0x68, 0x1e, 0x73, 0x45, - 0x7b, 0x43, 0x2a, 0x18, 0x8f, 0x5c, 0x67, 0xcb, 0xd9, 0xae, 0x07, 0x77, 0x8a, 0xdc, 0x83, 0xa7, - 0x24, 0x4b, 0x77, 0x51, 0x05, 0x44, 0x18, 0x68, 0xab, 0x6b, 0x0c, 0x18, 0x82, 0x55, 0x83, 0xa9, - 0x44, 0x50, 0x99, 0xf0, 0x34, 0x72, 0xe7, 0xb6, 0x9c, 0xed, 0x46, 0xf0, 0xc9, 0xb3, 0xdc, 0xab, - 0xbd, 0xc8, 0xbd, 0xbb, 0xa5, 0x06, 0x19, 0x1d, 0xfa, 0x8c, 0x77, 0x32, 0xa2, 0x12, 0xff, 0x09, - 0x8d, 0x49, 0x78, 0xba, 0x47, 0xc3, 0x22, 0xf7, 0x6e, 0x57, 0xe8, 0x2f, 0x29, 0x10, 0x5e, 0xd1, - 0x8e, 0xfd, 0xb1, 0x0d, 0x9f, 0x82, 0xa6, 0xa0, 0x23, 0x22, 0xa2, 0x5e, 0x9f, 0x0c, 0x22, 0x77, - 0xde, 0x64, 0xf8, 0xe8, 0x7a, 0x19, 0x6c, 0x01, 0x95, 0xff, 0x11, 0x06, 0xa5, 0x15, 0x90, 0x41, - 0x04, 0x53, 0xd0, 0x18, 0x25, 0x4c, 0xd1, 0x94, 0x49, 0xe5, 0xd6, 0xb7, 0xe6, 0xb7, 0x1b, 0xc1, - 0x57, 0x2f, 0x72, 0xef, 0x83, 0x98, 0xa9, 0xe4, 0xa8, 0xef, 0x87, 0x3c, 0xeb, 0xd8, 0x79, 0xbc, - 0x33, 0xa0, 0x6a, 0xc4, 0xc5, 0xe1, 0xd8, 0xee, 0x9c, 0x8c, 0x27, 0x48, 0xa4, 0xa4, 0xca, 0xef, - 0x12, 0x26, 0x8a, 0xdc, 0x5b, 0x2b, 0x13, 0x5e, 0x92, 0x22, 0x3c, 0x49, 0xa0, 0xdb, 0x25, 0x53, - 0x22, 0x93, 0xde, 0x81, 0x20, 0xa1, 0x1e, 0x95, 0xbb, 0xf0, 0x1a, 0xed, 0xba, 0x4a, 0x81, 0xf0, - 0x8a, 0x71, 0x3c, 0xb2, 0x36, 0xdc, 0x05, 0xcb, 0x65, 0xc4, 0x88, 0x0d, 0x22, 0x3e, 0x72, 0x17, - 0xcd, 0x34, 0xff, 0x57, 0xe4, 0xde, 0xad, 0xea, 0xff, 0x25, 0x8a, 0x70, 0xd3, 0x98, 0xdf, 0x18, - 0x0b, 0x4a, 0xb0, 0x9e, 0xb1, 0x41, 0xef, 0x98, 0xa4, 0x2c, 0xd2, 0x03, 0x1f, 0x73, 0xdc, 0x30, - 0x32, 0x83, 0xeb, 0xc9, 0xbc, 0x5b, 0xa6, 0x99, 0x45, 0x84, 0x70, 0x2b, 0x63, 0x83, 0xaf, 0xb5, - 0xb7, 0x4b, 0x85, 0x4d, 0xfa, 0x93, 0x03, 0xd6, 0xd5, 0x88, 0x0c, 0x7b, 0x29, 0xe7, 0x87, 0x7d, - 0x12, 0x1e, 0x8e, 0xb3, 0x2e, 0x6d, 0x39, 0xdb, 0xcd, 0xfb, 0x1b, 0x7e, 0xb9, 0xe8, 0xfe, 0x78, - 0xd1, 0xfd, 0x3d, 0xbb, 0xe8, 0xc1, 0x63, 0x2d, 0xe8, 0xaf, 0xdc, 0x6b, 0xcf, 0xfa, 0xfd, 0x6d, - 0x9e, 0x31, 0x45, 0xb3, 0xa1, 0x3a, 0x9d, 0x68, 0x9a, 0x15, 0x87, 0x7e, 0x7e, 0xe9, 0x39, 0x18, - 0x6a, 0xe8, 0x89, 0x45, 0xac, 0xb0, 0xf7, 0x00, 0x30, 0x45, 0x70, 0x45, 0x85, 0x74, 0x1b, 0xa6, - 0x8f, 0xb7, 0x8b, 0xdc, 0x6b, 0x55, 0x0a, 0x34, 0x18, 0xc2, 0x0d, 0x5d, 0x96, 0xf9, 0x86, 0xdf, - 0x81, 0x5b, 0xa6, 0x6c, 0xa2, 0xb8, 0xe8, 0x1d, 0x50, 0xda, 0x33, 0x62, 0x5d, 0x60, 0x5a, 0xf8, - 0xe0, 0x7a, 0x2d, 0xdc, 0xb4, 0x07, 0x63, 0x9a, 0x07, 0xe1, 0xd6, 0xa5, 0xf7, 0x11, 0xa5, 0x58, - 0xfb, 0xe0, 0x63, 0xd0, 0xa2, 0x27, 0x43, 0x56, 0x76, 0xa5, 0xd7, 0x4f, 0x79, 0x78, 0x28, 0xdd, - 0xa6, 0xd1, 0x7b, 0xaf, 0xc8, 0x3d, 0xb7, 0x64, 0x9b, 0x0a, 0x41, 0x78, 0x6d, 0xe2, 0x0b, 0x8c, - 0x6b, 0xb7, 0xfe, 0xea, 0xcc, 0x73, 0xd0, 0x6f, 0x0e, 0xb8, 0xf7, 0x20, 0x8e, 0x05, 0x8d, 0x89, - 0xa2, 0x9f, 0x9d, 0x84, 0x09, 0x19, 0xc4, 0x3a, 0x17, 0xed, 0x0a, 0xaa, 0x4b, 0x86, 0x6f, 0x80, - 0x7a, 0x42, 0x64, 0x62, 0xae, 0x8a, 0x46, 0x70, 0xb3, 0xc8, 0xbd, 0x66, 0x99, 0x44, 0x7b, 0x11, - 0x36, 0x20, 0x7c, 0x0b, 0x2c, 0x98, 0xfe, 0xd8, 0x4b, 0x61, 0xad, 0xc8, 0xbd, 0xe5, 0xc9, 0x89, - 0x17, 0x08, 0x97, 0xb0, 0xd9, 0xd8, 0xa3, 0x7e, 0xc6, 0x54, 0xa9, 0xcb, 0x9c, 0xf0, 0xab, 0x1b, - 0x5b, 0x41, 0xf5, 0xc6, 0x1a, 0xd3, 0x08, 0xde, 0x5d, 0xfa, 0xfe, 0xcc, 0xab, 0xbd, 0x3a, 0xf3, - 0x6a, 0xe8, 0x4f, 0x07, 0x6c, 0xcc, 0xd4, 0xac, 0xe7, 0x02, 0x7f, 0x74, 0xc0, 0x3a, 0xb5, 0x4e, - 0xdd, 0x49, 0xda, 0x53, 0x47, 0xc3, 0x94, 0x4a, 0xd7, 0xd9, 0x9a, 0xdf, 0x6e, 0xde, 0x7f, 0xd3, - 0x9f, 0xba, 0x76, 0xfd, 0x2a, 0xc7, 0xbe, 0x0e, 0x2e, 0x2f, 0x9d, 0xc9, 0x36, 0xcd, 0xe2, 0x43, - 0xbf, 0xbe, 0xf4, 0xe0, 0xd4, 0x9f, 0x12, 0x43, 0x3a, 0xe5, 0xbb, 0x6e, 0x7f, 0x2a, 0x35, 0x9e, - 0x3b, 0xa0, 0x35, 0x45, 0x0e, 0x09, 0xa8, 0x0f, 0x09, 0x13, 0x76, 0x18, 0x5f, 0xda, 0x15, 0x7b, - 0xfd, 0x3b, 0xcc, 0x8e, 0x52, 0x73, 0x22, 0x6c, 0xa8, 0xe1, 0xb7, 0x60, 0xe5, 0x4a, 0xb5, 0x56, - 0xf2, 0xc7, 0xd7, 0x5b, 0xe7, 0xf5, 0x19, 0xfd, 0x42, 0x78, 0xb9, 0xda, 0x92, 0x4a, 0x91, 0x85, - 0x03, 0xc0, 0x1e, 0x51, 0x34, 0xea, 0x0a, 0x16, 0xd2, 0xe9, 0xd4, 0xce, 0x7f, 0x9c, 0x1a, 0x3e, - 0x04, 0x37, 0x43, 0x41, 0xcb, 0x93, 0x91, 0x50, 0x16, 0x27, 0xca, 0x94, 0x37, 0x1f, 0x6c, 0x16, - 0xb9, 0x77, 0xa7, 0x24, 0xf8, 0x47, 0x00, 0xc2, 0xab, 0x63, 0xcf, 0xe7, 0xc6, 0x01, 0x3f, 0x05, - 0x2b, 0x97, 0x31, 0x8a, 0x65, 0xd4, 0x6e, 0xb1, 0x3b, 0xd1, 0x70, 0x05, 0x46, 0x78, 0x79, 0x6c, - 0xef, 0x6b, 0x53, 0x82, 0x1b, 0xd8, 0x3c, 0x4b, 0x12, 0xae, 0x82, 0x39, 0x66, 0x1f, 0x61, 0x3c, - 0xc7, 0x22, 0xf8, 0x7f, 0xb0, 0x5c, 0x79, 0x80, 0xa5, 0xd1, 0x56, 0xc7, 0xcd, 0xc9, 0x33, 0x2c, - 0xe1, 0xfb, 0x60, 0x41, 0xbf, 0xec, 0xd2, 0x9d, 0x37, 0xdb, 0xbc, 0xe1, 0x97, 0x4d, 0xf1, 0xf5, - 0xdb, 0xef, 0xdb, 0xb7, 0xdf, 0x7f, 0xc8, 0xd9, 0x20, 0xa8, 0xeb, 0xb6, 0xe1, 0x32, 0x3a, 0xf8, - 0xe2, 0xd9, 0x79, 0xdb, 0x79, 0x7e, 0xde, 0x76, 0xfe, 0x38, 0x6f, 0x3b, 0x3f, 0x5c, 0xb4, 0x6b, - 0xcf, 0x2f, 0xda, 0xb5, 0xdf, 0x2f, 0xda, 0xb5, 0xa7, 0x3b, 0xff, 0x66, 0x79, 0xd4, 0xe9, 0x90, - 0xca, 0xfe, 0xa2, 0xb9, 0x9f, 0xdf, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x9b, 0xb4, 0x21, 0x70, - 0xe1, 0x08, 0x00, 0x00, + // 1011 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x73, 0xdb, 0x44, + 0x18, 0xb6, 0x12, 0x27, 0x8d, 0xd7, 0x49, 0x1a, 0x6f, 0x93, 0xe2, 0xa6, 0x19, 0xcb, 0x2c, 0x0c, + 0x93, 0x03, 0xc8, 0x93, 0xf2, 0x35, 0x04, 0x2e, 0x55, 0x43, 0x87, 0x0e, 0x2d, 0xe3, 0x59, 0x02, + 0xcc, 0xf4, 0x22, 0xd6, 0xd2, 0x46, 0xda, 0x89, 0xa4, 0x35, 0xda, 0x75, 0x9c, 0xfc, 0x83, 0x1e, + 0xe1, 0xc2, 0xc0, 0x2d, 0x67, 0x6e, 0xfc, 0x8b, 0x1e, 0x7b, 0x64, 0x7a, 0x50, 0x21, 0xb9, 0x74, + 0x38, 0xfa, 0x17, 0x30, 0xbb, 0x5a, 0xc7, 0x4a, 0xed, 0x43, 0xe8, 0xf4, 0xa6, 0xf7, 0x63, 0x9f, + 0xf7, 0x79, 0x3f, 0xf6, 0x5d, 0x81, 0x16, 0xc9, 0xfc, 0x68, 0x48, 0x4e, 0x3a, 0x3c, 0x23, 0x7e, + 0x4c, 0x3b, 0x47, 0x3b, 0xe6, 0xcb, 0xe9, 0x67, 0x5c, 0x72, 0xd8, 0x30, 0x76, 0xc7, 0x68, 0x8f, + 0x76, 0x36, 0xd7, 0x43, 0x1e, 0x72, 0x6d, 0xed, 0xa8, 0xaf, 0xc2, 0x71, 0xb3, 0x15, 0x72, 0x1e, + 0xc6, 0xb4, 0xa3, 0xa5, 0xde, 0xe0, 0xa0, 0x13, 0x0c, 0x32, 0x22, 0x19, 0x4f, 0xc7, 0x76, 0x9f, + 0x8b, 0x84, 0x8b, 0x4e, 0x8f, 0x08, 0x15, 0xa5, 0x47, 0x25, 0xd9, 0xe9, 0xf8, 0x9c, 0x19, 0x3b, + 0xfa, 0x7d, 0x09, 0x2c, 0x76, 0x49, 0x46, 0x12, 0x01, 0x3f, 0x05, 0xf5, 0x23, 0x2e, 0xa9, 0xd7, + 0xa7, 0x19, 0xe3, 0x41, 0xd3, 0x6a, 0x5b, 0xdb, 0x55, 0xf7, 0xe6, 0x28, 0xb7, 0xe1, 0x09, 0x49, + 0xe2, 0x5d, 0x54, 0x32, 0x22, 0x0c, 0x94, 0xd4, 0xd5, 0x02, 0xf4, 0xc1, 0xaa, 0xb6, 0xc9, 0x28, + 0xa3, 0x22, 0xe2, 0x71, 0xd0, 0x9c, 0x6b, 0x5b, 0xdb, 0x35, 0xf7, 0x8b, 0xa7, 0xb9, 0x5d, 0x79, + 0x9e, 0xdb, 0xb7, 0x0b, 0x0e, 0x22, 0x38, 0x74, 0x18, 0xef, 0x24, 0x44, 0x46, 0xce, 0x43, 0x1a, + 0x12, 0xff, 0x64, 0x8f, 0xfa, 0xa3, 0xdc, 0xde, 0x28, 0xc1, 0x5f, 0x40, 0x20, 0xbc, 0xa2, 0x14, + 0xfb, 0x63, 0x19, 0x3e, 0x06, 0xf5, 0x8c, 0x0e, 0x49, 0x16, 0x78, 0x3d, 0x92, 0x06, 0xcd, 0x79, + 0x1d, 0xe1, 0xb3, 0xab, 0x45, 0x30, 0x09, 0x94, 0xce, 0x23, 0x0c, 0x0a, 0xc9, 0x25, 0x69, 0x00, + 0x63, 0x50, 0x1b, 0x46, 0x4c, 0xd2, 0x98, 0x09, 0xd9, 0xac, 0xb6, 0xe7, 0xb7, 0x6b, 0xee, 0x37, + 0xcf, 0x73, 0xfb, 0x93, 0x90, 0xc9, 0x68, 0xd0, 0x73, 0x7c, 0x9e, 0x74, 0x4c, 0x3f, 0x3e, 0x48, + 0xa9, 0x1c, 0xf2, 0xec, 0x70, 0x2c, 0x77, 0x8e, 0xc7, 0x1d, 0x24, 0x42, 0x50, 0xe9, 0x74, 0x09, + 0xcb, 0x46, 0xb9, 0xbd, 0x56, 0x04, 0xbc, 0x00, 0x45, 0x78, 0x12, 0x40, 0x95, 0x4b, 0xc4, 0x44, + 0x44, 0xde, 0x41, 0x46, 0x7c, 0xd5, 0xaa, 0xe6, 0xc2, 0x6b, 0x94, 0xeb, 0x32, 0x04, 0xc2, 0x2b, + 0x5a, 0x71, 0xdf, 0xc8, 0x70, 0x17, 0x2c, 0x17, 0x1e, 0x43, 0x96, 0x06, 0x7c, 0xd8, 0x5c, 0xd4, + 0xdd, 0x7c, 0x6b, 0x94, 0xdb, 0x37, 0xca, 0xe7, 0x0b, 0x2b, 0xc2, 0x75, 0x2d, 0xfe, 0xa0, 0x25, + 0x28, 0xc0, 0x7a, 0xc2, 0x52, 0xef, 0x88, 0xc4, 0x2c, 0x50, 0x0d, 0x1f, 0x63, 0x5c, 0xd3, 0x34, + 0xdd, 0xab, 0xd1, 0xbc, 0x5d, 0x84, 0x99, 0x05, 0x84, 0x70, 0x23, 0x61, 0xe9, 0xf7, 0x4a, 0xdb, + 0xa5, 0x99, 0x09, 0xfa, 0xab, 0x05, 0xd6, 0xe5, 0x90, 0xf4, 0xbd, 0x98, 0xf3, 0xc3, 0x1e, 0xf1, + 0x0f, 0xc7, 0x51, 0x97, 0xda, 0xd6, 0x76, 0xfd, 0xce, 0x2d, 0xa7, 0x18, 0x74, 0x67, 0x3c, 0xe8, + 0xce, 0x9e, 0x19, 0x74, 0xf7, 0x81, 0x22, 0xf4, 0x6f, 0x6e, 0xb7, 0x66, 0x1d, 0x7f, 0x9f, 0x27, + 0x4c, 0xd2, 0xa4, 0x2f, 0x4f, 0x26, 0x9c, 0x66, 0xf9, 0xa1, 0xdf, 0x5e, 0xd8, 0x16, 0x86, 0xca, + 0xf4, 0xd0, 0x58, 0x0c, 0xb1, 0x8f, 0x00, 0xd0, 0x49, 0x70, 0x49, 0x33, 0xd1, 0xac, 0xe9, 0x3a, + 0x6e, 0x8c, 0x72, 0xbb, 0x51, 0x4a, 0x50, 0xdb, 0x10, 0xae, 0xa9, 0xb4, 0xf4, 0x37, 0xfc, 0x09, + 0xdc, 0xd0, 0x69, 0x13, 0xc9, 0x33, 0xef, 0x80, 0x52, 0x4f, 0x93, 0x6d, 0x02, 0x5d, 0xc2, 0xbb, + 0x57, 0x2b, 0xe1, 0xa6, 0xb9, 0x18, 0xd3, 0x38, 0x08, 0x37, 0x2e, 0xb4, 0xf7, 0x29, 0xc5, 0x4a, + 0x07, 0x1f, 0x80, 0x06, 0x3d, 0xee, 0xb3, 0xa2, 0x2a, 0x5e, 0x2f, 0xe6, 0xfe, 0xa1, 0x68, 0xd6, + 0x35, 0xdf, 0xad, 0x51, 0x6e, 0x37, 0x0b, 0xb4, 0x29, 0x17, 0x84, 0xd7, 0x26, 0x3a, 0x57, 0xab, + 0x76, 0xab, 0x2f, 0x4f, 0x6d, 0x0b, 0xfd, 0x69, 0x81, 0xad, 0xbb, 0x61, 0x98, 0xd1, 0x90, 0x48, + 0xfa, 0xe5, 0xb1, 0x1f, 0x91, 0x34, 0x54, 0xb1, 0x68, 0x37, 0xa3, 0x2a, 0x65, 0xf8, 0x0e, 0xa8, + 0x46, 0x44, 0x44, 0x7a, 0x55, 0xd4, 0xdc, 0xeb, 0xa3, 0xdc, 0xae, 0x17, 0x41, 0x94, 0x16, 0x61, + 0x6d, 0x84, 0xef, 0x81, 0x05, 0x5d, 0x1f, 0xb3, 0x14, 0xd6, 0x46, 0xb9, 0xbd, 0x3c, 0xb9, 0xf1, + 0x19, 0xc2, 0x85, 0x59, 0x4f, 0xec, 0xa0, 0x97, 0x30, 0x59, 0xf0, 0xd2, 0x37, 0xfc, 0xf2, 0xc4, + 0x96, 0xac, 0x6a, 0x62, 0xb5, 0xa8, 0x09, 0xef, 0x2e, 0x3d, 0x39, 0xb5, 0x2b, 0x2f, 0x4f, 0xed, + 0x0a, 0xfa, 0xc7, 0x02, 0xb7, 0x66, 0x72, 0x56, 0x7d, 0x81, 0xbf, 0x58, 0x60, 0x9d, 0x1a, 0xa5, + 0xaa, 0x24, 0xf5, 0xe4, 0xa0, 0x1f, 0x53, 0xd1, 0xb4, 0xda, 0xf3, 0xdb, 0xf5, 0x3b, 0xef, 0x3a, + 0x53, 0x6b, 0xd7, 0x29, 0x63, 0xec, 0x2b, 0xe7, 0x62, 0xe9, 0x4c, 0xa6, 0x69, 0x16, 0x1e, 0xfa, + 0xe3, 0x85, 0x0d, 0xa7, 0x4e, 0x0a, 0x0c, 0xe9, 0x94, 0xee, 0xaa, 0xf5, 0x29, 0xe5, 0x78, 0x66, + 0x81, 0xc6, 0x14, 0x38, 0x24, 0xa0, 0xda, 0x27, 0x2c, 0x33, 0xcd, 0x78, 0x64, 0x46, 0xec, 0xf5, + 0x77, 0x98, 0x69, 0xa5, 0xc2, 0x44, 0x58, 0x43, 0xc3, 0x1f, 0xc1, 0xca, 0xa5, 0x6c, 0x0d, 0xe5, + 0xcf, 0xaf, 0x36, 0xce, 0xeb, 0x33, 0xea, 0x85, 0xf0, 0x72, 0xb9, 0x24, 0xa5, 0x24, 0x9f, 0xcc, + 0x01, 0xb0, 0x47, 0x24, 0x0d, 0xba, 0x19, 0xf3, 0xe9, 0x74, 0x68, 0xeb, 0x0d, 0x87, 0x86, 0xf7, + 0xc0, 0x75, 0x3f, 0xa3, 0xc5, 0xcd, 0x88, 0x28, 0x0b, 0x23, 0xa9, 0xd3, 0x9b, 0x77, 0x37, 0x47, + 0xb9, 0x7d, 0xb3, 0x00, 0x78, 0xc5, 0x01, 0xe1, 0xd5, 0xb1, 0xe6, 0x2b, 0xad, 0x80, 0xdf, 0x82, + 0x8d, 0x0b, 0x1f, 0xc9, 0x12, 0xea, 0x0d, 0x52, 0x76, 0xec, 0x25, 0xc2, 0x4c, 0x73, 0x7b, 0x94, + 0xdb, 0x5b, 0xaf, 0x40, 0x95, 0xdd, 0x10, 0x86, 0x63, 0xfd, 0x3e, 0x4b, 0xe8, 0x77, 0x29, 0x3b, + 0x7e, 0x24, 0x90, 0x00, 0xd7, 0xb0, 0x7e, 0xac, 0x04, 0x5c, 0x05, 0x73, 0xcc, 0x3c, 0xcd, 0x78, + 0x8e, 0x05, 0xf0, 0x6d, 0xb0, 0x5c, 0x7a, 0x96, 0x85, 0x66, 0x5c, 0xc5, 0xf5, 0xc9, 0xe3, 0x2c, + 0xe0, 0xc7, 0x60, 0x41, 0xbd, 0xf7, 0x8a, 0xc2, 0xbc, 0x5e, 0xa4, 0x45, 0xa9, 0x1c, 0xf5, 0x47, + 0xe0, 0x98, 0x3f, 0x02, 0xe7, 0x1e, 0x67, 0xa9, 0x5b, 0x55, 0xc5, 0xc4, 0x85, 0xb7, 0xfb, 0xf5, + 0xd3, 0xb3, 0x96, 0xf5, 0xec, 0xac, 0x65, 0xfd, 0x7d, 0xd6, 0xb2, 0x7e, 0x3e, 0x6f, 0x55, 0x9e, + 0x9d, 0xb7, 0x2a, 0x7f, 0x9d, 0xb7, 0x2a, 0x8f, 0x77, 0xfe, 0xcf, 0x48, 0xc9, 0x93, 0x3e, 0x15, + 0xbd, 0x45, 0xbd, 0xb5, 0x3f, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x27, 0x88, 0xf6, 0xf7, + 0x08, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -782,8 +784,8 @@ func (m *DatedPrice) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.CreationTime != 0 { - i = encodeVarintOracle(dAtA, i, uint64(m.CreationTime)) + if m.CreationTimeUnixMs != 0 { + i = encodeVarintOracle(dAtA, i, uint64(m.CreationTimeUnixMs)) i-- dAtA[i] = 0x18 } @@ -965,8 +967,8 @@ func (m *DatedPrice) Size() (n int) { if m.CreationHeight != 0 { n += 1 + sovOracle(uint64(m.CreationHeight)) } - if m.CreationTime != 0 { - n += 1 + sovOracle(uint64(m.CreationTime)) + if m.CreationTimeUnixMs != 0 { + n += 1 + sovOracle(uint64(m.CreationTimeUnixMs)) } return n } @@ -1814,9 +1816,9 @@ func (m *DatedPrice) Unmarshal(dAtA []byte) error { } case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CreationTime", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CreationTimeUnixMs", wireType) } - m.CreationTime = 0 + m.CreationTimeUnixMs = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOracle @@ -1826,7 +1828,7 @@ func (m *DatedPrice) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.CreationTime |= uint64(b&0x7F) << shift + m.CreationTimeUnixMs |= uint64(b&0x7F) << shift if b < 0x80 { break }