v3.4.x

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v3.4.0](https://github.com/MinterTeam/minter-go-node/tree/v3.4.0)
+
+[Full Changelog](https://github.com/MinterTeam/minter-go-node/compare/v3.3.0...v3.4.0)
+
+### Added
+
+- API methods: `waitlist_all`, `limit_orders_by_owner`
+- Indexed tags to search for transactions by order
+- Starting a node without processing new states with tag `--only-api-mode`
+
+### Fixed
+
+- API Balance deadlock
+- Calculation of x3 rewards
+
 ## [v3.3.0](https://github.com/MinterTeam/minter-go-node/tree/v3.3.0)
 
 [Full Changelog](https://github.com/MinterTeam/minter-go-node/compare/v3.2.0...v3.3.0)

api/v2/service/block.go

@@ -82,126 +82,8 @@ func (s *Service) Block(ctx context.Context, req *pb.BlockRequest) (*pb.BlockRes
  if req.Events {
  loadEvents := s.blockchain.GetEventsDB().LoadEvents(uint32(req.Height))
  for _, event := range loadEvents {
- var m proto.Message
- switch e := event.(type) {
- case *events.JailEvent:
- m = &pb.JailEvent{
- ValidatorPubKey: e.ValidatorPubKeyString(),
- JailedUntil: e.JailedUntil,
- }
- case *events.OrderExpiredEvent:
- m = &pb.OrderExpiredEvent{
- Id: e.ID,
- Address: e.AddressString(),
- Coin: e.Coin,
- Amount: e.Amount,
- }
- case *events.RewardEvent:
- m = &pb.RewardEvent{
- Role: pb.RewardEvent_Role(pb.RewardEvent_Role_value[e.Role]),
- Address: e.AddressString(),
- Amount: e.Amount,
- ForCoin: e.ForCoin,
- ValidatorPubKey: e.ValidatorPubKeyString(),
- }
- case *events.SlashEvent:
- m = &pb.SlashEvent{
- Address: e.AddressString(),
- Amount: e.Amount,
- Coin: e.Coin,
- ValidatorPubKey: e.ValidatorPubKeyString(),
- }
- case *events.StakeKickEvent:
- m = &pb.StakeKickEvent{
- Address: e.AddressString(),
- Amount: e.Amount,
- Coin: e.Coin,
- ValidatorPubKey: e.ValidatorPubKeyString(),
- }
- case *events.UnbondEvent:
- m = &pb.UnbondEvent{
- Address: e.AddressString(),
- Amount: e.Amount,
- Coin: e.Coin,
- ValidatorPubKey: e.ValidatorPubKeyString(),
- }
- case *events.UnlockEvent:
- m = &pb.UnlockEvent{
- Address: e.AddressString(),
- Amount: e.Amount,
- Coin: e.Coin,
- }
- case *events.StakeMoveEvent:
- m = &pb.StakeMoveEvent{
- Address: e.AddressString(),
- Amount: e.Amount,
- Coin: e.Coin,
- CandidatePubKey: e.CandidatePubKey.String(),
- ToCandidatePubKey: e.ToCandidatePubKey.String(),
- }
- case *events.RemoveCandidateEvent:
- m = &pb.RemoveCandidateEvent{
- CandidatePubKey: e.CandidatePubKeyString(),
- }
- case *events.UpdateNetworkEvent:
- m = &pb.UpdateNetworkEvent{
- Version: e.Version,
- }
- case *events.UpdatedBlockRewardEvent:
- m = &pb.UpdatedBlockRewardEvent{
- Value: e.Value,
- ValueLockedStakeRewards: e.ValueLockedStakeRewards,
- }
- case *events.UpdateCommissionsEvent:
- m = &pb.UpdateCommissionsEvent{
- Coin: e.Coin,
- PayloadByte: e.PayloadByte,
- Send: e.Send,
- BuyBancor: e.BuyBancor,
- SellBancor: e.SellBancor,
- SellAllBancor: e.SellAllBancor,
- BuyPoolBase: e.BuyPoolBase,
- BuyPoolDelta: e.BuyPoolDelta,
- SellPoolBase: e.SellPoolBase,
- SellPoolDelta: e.SellPoolDelta,
- SellAllPoolBase: e.SellAllPoolBase,
- SellAllPoolDelta: e.SellAllPoolDelta,
- CreateTicker3: e.CreateTicker3,
- CreateTicker4: e.CreateTicker4,
- CreateTicker5: e.CreateTicker5,
- CreateTicker6: e.CreateTicker6,
- CreateTicker7_10: e.CreateTicker7_10,
- CreateCoin: e.CreateCoin,
- CreateToken: e.CreateToken,
- RecreateCoin: e.RecreateCoin,
- RecreateToken: e.RecreateToken,
- DeclareCandidacy: e.DeclareCandidacy,
- Delegate: e.Delegate,
- Unbond: e.Unbond,
- RedeemCheck: e.RedeemCheck,
- SetCandidateOn: e.SetCandidateOn,
- SetCandidateOff: e.SetCandidateOff,
- CreateMultisig: e.CreateMultisig,
- MultisendBase: e.MultisendBase,
- MultisendDelta: e.MultisendDelta,
- EditCandidate: e.EditCandidate,
- SetHaltBlock: e.SetHaltBlock,
- EditTickerOwner: e.EditTickerOwner,
- EditMultisig: e.EditMultisig,
- EditCandidatePublicKey: e.EditCandidatePublicKey,
- CreateSwapPool: e.CreateSwapPool,
- AddLiquidity: e.AddLiquidity,
- RemoveLiquidity: e.RemoveLiquidity,
- EditCandidateCommission: e.EditCandidateCommission,
- MintToken: e.MintToken,
- BurnToken: e.BurnToken,
- VoteCommission: e.VoteCommission,
- VoteUpdate: e.VoteUpdate,
- FailedTx: e.FailedTx,
- AddLimitOrder: e.AddLimitOrder,
- RemoveLimitOrder: e.RemoveLimitOrder,
- }
- default:
+ m := DecodeEvent(event)
+ if m == nil {
  return nil, status.Error(codes.Internal, "unknown event type")
  }
 
@@ -258,6 +140,132 @@ func (s *Service) Block(ctx context.Context, req *pb.BlockRequest) (*pb.BlockRes
  return response, nil
 }
 
+func DecodeEvent(event events.Event) proto.Message {
+ var m proto.Message
+ switch e := event.(type) {
+ case *events.JailEvent:
+ m = &pb.JailEvent{
+ ValidatorPubKey: e.ValidatorPubKeyString(),
+ JailedUntil: e.JailedUntil,
+ }
+ case *events.OrderExpiredEvent:
+ m = &pb.OrderExpiredEvent{
+ Id: e.ID,
+ Address: e.AddressString(),
+ Coin: e.Coin,
+ Amount: e.Amount,
+ }
+ case *events.RewardEvent:
+ m = &pb.RewardEvent{
+ Role: pb.RewardEvent_Role(pb.RewardEvent_Role_value[e.Role]),
+ Address: e.AddressString(),
+ Amount: e.Amount,
+ ForCoin: e.ForCoin,
+ ValidatorPubKey: e.ValidatorPubKeyString(),
+ }
+ case *events.SlashEvent:
+ m = &pb.SlashEvent{
+ Address: e.AddressString(),
+ Amount: e.Amount,
+ Coin: e.Coin,
+ ValidatorPubKey: e.ValidatorPubKeyString(),
+ }
+ case *events.StakeKickEvent:
+ m = &pb.StakeKickEvent{
+ Address: e.AddressString(),
+ Amount: e.Amount,
+ Coin: e.Coin,
+ ValidatorPubKey: e.ValidatorPubKeyString(),
+ }
+ case *events.UnbondEvent:
+ m = &pb.UnbondEvent{
+ Address: e.AddressString(),
+ Amount: e.Amount,
+ Coin: e.Coin,
+ ValidatorPubKey: e.ValidatorPubKeyString(),
+ }
+ case *events.UnlockEvent:
+ m = &pb.UnlockEvent{
+ Address: e.AddressString(),
+ Amount: e.Amount,
+ Coin: e.Coin,
+ }
+ case *events.StakeMoveEvent:
+ m = &pb.StakeMoveEvent{
+ Address: e.AddressString(),
+ Amount: e.Amount,
+ Coin: e.Coin,
+ CandidatePubKey: e.CandidatePubKey.String(),
+ ToCandidatePubKey: e.ToCandidatePubKey.String(),
+ }
+ case *events.RemoveCandidateEvent:
+ m = &pb.RemoveCandidateEvent{
+ CandidatePubKey: e.CandidatePubKeyString(),
+ }
+ case *events.UpdateNetworkEvent:
+ m = &pb.UpdateNetworkEvent{
+ Version: e.Version,
+ }
+ case *events.UpdatedBlockRewardEvent:
+ m = &pb.UpdatedBlockRewardEvent{
+ Value: e.Value,
+ ValueLockedStakeRewards: e.ValueLockedStakeRewards,
+ }
+ case *events.UpdateCommissionsEvent:
+ m = &pb.UpdateCommissionsEvent{
+ Coin: e.Coin,
+ PayloadByte: e.PayloadByte,
+ Send: e.Send,
+ BuyBancor: e.BuyBancor,
+ SellBancor: e.SellBancor,
+ SellAllBancor: e.SellAllBancor,
+ BuyPoolBase: e.BuyPoolBase,
+ BuyPoolDelta: e.BuyPoolDelta,
+ SellPoolBase: e.SellPoolBase,
+ SellPoolDelta: e.SellPoolDelta,
+ SellAllPoolBase: e.SellAllPoolBase,
+ SellAllPoolDelta: e.SellAllPoolDelta,
+ CreateTicker3: e.CreateTicker3,
+ CreateTicker4: e.CreateTicker4,
+ CreateTicker5: e.CreateTicker5,
+ CreateTicker6: e.CreateTicker6,
+ CreateTicker7_10: e.CreateTicker7_10,
+ CreateCoin: e.CreateCoin,
+ CreateToken: e.CreateToken,
+ RecreateCoin: e.RecreateCoin,
+ RecreateToken: e.RecreateToken,
+ DeclareCandidacy: e.DeclareCandidacy,
+ Delegate: e.Delegate,
+ Unbond: e.Unbond,
+ RedeemCheck: e.RedeemCheck,
+ SetCandidateOn: e.SetCandidateOn,
+ SetCandidateOff: e.SetCandidateOff,
+ CreateMultisig: e.CreateMultisig,
+ MultisendBase: e.MultisendBase,
+ MultisendDelta: e.MultisendDelta,
+ EditCandidate: e.EditCandidate,
+ SetHaltBlock: e.SetHaltBlock,
+ EditTickerOwner: e.EditTickerOwner,
+ EditMultisig: e.EditMultisig,
+ EditCandidatePublicKey: e.EditCandidatePublicKey,
+ CreateSwapPool: e.CreateSwapPool,
+ AddLiquidity: e.AddLiquidity,
+ RemoveLiquidity: e.RemoveLiquidity,
+ EditCandidateCommission: e.EditCandidateCommission,
+ MintToken: e.MintToken,
+ BurnToken: e.BurnToken,
+ VoteCommission: e.VoteCommission,
+ VoteUpdate: e.VoteUpdate,
+ FailedTx: e.FailedTx,
+ AddLimitOrder: e.AddLimitOrder,
+ RemoveLimitOrder: e.RemoveLimitOrder,
+ }
+ default:
+ return nil
+ }
+ return m
+}
+
 func blockEvidence(block *core_types.ResultBlock) (*pb.BlockResponse_Evidence, error) {
  evidences := make([]*_struct.Struct, 0, len(block.Block.Evidence.Evidence))
  for _, evidence := range block.Block.Evidence.Evidence {

api/v2/service/candidates.go

@@ -30,6 +30,17 @@ func (s *Service) Candidates(ctx context.Context, req *pb.CandidatesRequest) (*p
  candidates := cState.Candidates().GetCandidates()
 
  response := &pb.CandidatesResponse{}
+ if req.Status == pb.CandidatesRequest_all || req.Status == pb.CandidatesRequest_deleted {
+ for _, dc := range cState.Candidates().DeletedCandidates() {
+ response.Deleted = append(response.Deleted, &pb.CandidatesResponse_Deleted{
+ Id: uint64(dc.ID),
+ PublicKey: dc.PubKey.String(),
+ })
+ }
+ }
+ if req.Status == pb.CandidatesRequest_deleted {
+ return response, nil
+ }
  for _, candidate := range candidates {
 
  if timeoutStatus := s.checkTimeout(ctx); timeoutStatus != nil {

api/v2/service/custom.go

@@ -0,0 +1,57 @@
+package service
+
+import (
+ "math/big"
+ "net/http"
+ "strconv"
+
+ "github.com/MinterTeam/minter-go-node/coreV2/types"
+ "github.com/gin-gonic/gin"
+)
+
+func (s *Service) changeAmountsForPrice(c *gin.Context) {
+ coin0S := c.Param("coin0")
+ coin1S := c.Param("coin1")
+ priceS := c.Param("price")
+ coin0I, err := strconv.Atoi(coin0S)
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{
+ "error": map[string]string{
+ "message": err.Error(),
+ },
+ })
+ return
+ }
+ coin1I, err := strconv.Atoi(coin1S)
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{
+ "error": map[string]string{
+ "message": err.Error(),
+ },
+ })
+ return
+ }
+ priceF, err := strconv.ParseFloat(priceS, 10)
+ if err != nil {
+ c.JSON(http.StatusBadRequest, gin.H{
+ "error": map[string]string{
+ "message": err.Error(),
+ },
+ })
+ return
+ }
+ amount0, amount1 := s.blockchain.CurrentState().Swap().GetSwapper(types.CoinID(coin0I), types.CoinID(coin1I)).CalculateAddAmountsForPrice(big.NewFloat(1 / priceF))
+ c.JSON(200, gin.H{
+ "amount0In": amount0,
+ "amount1Out": amount1,
+ // todo: reverse price if amounts nil
+ })
+}
+
+// CustomHandlers return custom http methods
+func (s *Service) CustomHandlers() http.Handler {
+ gin.SetMode(gin.ReleaseMode)
+ r := gin.Default()
+ r.GET("/change_amounts_for_price/:coin0/:coin1/:price", s.changeAmountsForPrice)
+ return r
+}

api/v2/service/estimate_coin_sell_all.go

@@ -129,7 +129,7 @@ func (s *Service) EstimateCoinSellAll(ctx context.Context, req *pb.EstimateCoinS
  valueBancor, errBancor = s.calcSellAllFromBancor(valueToSell, coinTo, coinFrom, commissionInBaseCoin)
  }
  if req.SwapFrom == pb.SwapFrom_pool || req.SwapFrom == pb.SwapFrom_optimal {
- commissionInBaseCoin := new(big.Int).Set(commissions.SellAllPoolBase)
+ commissionInBaseCoin := new(big.Int).Add(commissions.SellAllPoolBase, new(big.Int).Mul(commissions.SellAllPoolDelta, big.NewInt(int64(len(req.Route)))))
  if !commissions.Coin.IsBaseCoin() {
  commissionInBaseCoin, _ = cState.Swap().GetSwapper(types.GetBaseCoinID(), commissions.Coin).CalculateSellForBuyWithOrders(commissionInBaseCoin)
  }

api/v2/service/subscribe.go

@@ -39,7 +39,8 @@ func (s *Service) Subscribe(request *pb.SubscribeRequest, stream pb.ApiService_S
  }
  }()
 
- ctxSubscribeConnection, _ := context.WithTimeout(stream.Context(), s.minterCfg.WSConnectionDuration)
+ ctxSubscribeConnection, cancel2 := context.WithTimeout(stream.Context(), s.minterCfg.WSConnectionDuration)
+ defer cancel2()
 
  for {
  select {