Merge remote-tracking branch 'origin/main' into issue-#151

Author: andrewnguyen22

cmd/rpc/admin.go

@@ -369,7 +369,9 @@ func (s *Server) TransactionCloseOrder(w http.ResponseWriter, r *http.Request, _
 			return nil, err
 		}
 		// Execute rpc call to the root chain
+		s.rcManager.l.Lock()
 		order, err := s.rcManager.GetOrder(rootChainId, 0, ptr.OrderId, s.config.ChainId)
+		s.rcManager.l.Unlock()
 		if err != nil {
 			return nil, err
 		}

cmd/rpc/query.go

@@ -47,39 +47,42 @@ func (s *Server) Height(w http.ResponseWriter, _ *http.Request, _ httprouter.Par
 
 // Height response with the latest block
 func (s *Server) EcoParameters(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	// Unmarshal the requested chain id
+	// unmarshal the requested chain id
 	post := new(chainRequest)
 	if ok := unmarshal(w, r, post); !ok {
 		return
 	}
-	// Create a read-only state for the latest block and determine economic parameters
+	// create a read-only state for the latest block and determine economic parameters
 	s.readOnlyState(0, func(state *fsm.StateMachine) lib.ErrorI {
-		// Get the lottery winner
-		delegate, err := s.controller.GetRootChainLotteryWinner(state.Height())
-		// if an error occurred
+		// get the root id
+		rootChainId, err := state.GetRootChainId()
 		if err != nil {
 			return err
 		}
-
-		// Get the root id
-		rootChainId, err := state.GetRootChainId()
+		// get the lottery winner
+		s.rcManager.l.Lock()
+		delegate, err := s.rcManager.GetLotteryWinner(rootChainId, 0, s.config.ChainId)
+		s.rcManager.l.Unlock()
+		// if an error occurred
 		if err != nil {
 			return err
 		}
-		// Find proposer cut
-		proposerCut := uint64(100 - delegate.Cut)
-		// Remove sub-validator and sub-delegate cuts if requested chain id is non-root id
+		// ensure non-nil delegate
+		if delegate == nil {
+			return lib.ErrEmptyLotteryWinner()
+		}
+		// find proposer cut
+		proposerCut := 100 - delegate.Cut
+		// remove sub-validator and sub-delegate cuts if requested chain id is non-root id
 		if post.ChainId != rootChainId {
 			proposerCut -= delegate.Cut // sub-validator
 			proposerCut -= delegate.Cut // sub-delegate
 		}
-
 		daoCut, totalMint, committeeMint, err := state.GetBlockMintStats(post.ChainId)
 		if err != nil {
 			write(w, err.Error(), http.StatusBadRequest)
 			return nil
 		}
-
 		write(w, economicParameterResponse{
 			DAOCut:           daoCut,
 			MintPerBlock:     totalMint,

cmd/rpc/sock.go

@@ -227,8 +227,6 @@ func (r *RCManager) GetLotteryWinner(rootChainId, height, id uint64) (*lib.Lotte
 		// exit with the lottery winner
 		return sub.Info.LotteryWinner, nil
 	}
-	// warn of the remote RPC call to the API of the 'root chain'
-	r.log.Warnf("Executing remote Lottery call with requested height=%d and rootChainId=%d", height, rootChainId)
 	// exit with the results of the remote RPC call to the API of the 'root chain'
 	return sub.Lottery(height, id)
 }

lib/error.go

@@ -254,6 +254,7 @@ const (
 	CodeSlashNonValidator        ErrorCode = 90
 	CodeEmptyOrderBook           ErrorCode = 91
 	CodeNoSubsidizedCommittees   ErrorCode = 92
+	CodeEmptyLotteryWinner       ErrorCode = 93
 
 	// P2P Module
 	P2PModule ErrorModule = "p2p"
@@ -776,5 +777,8 @@ func ErrStringToCommittee(s string) ErrorI {
 
 func ErrNoSubsidizedCommittees(chainId uint64) ErrorI {
 	return NewError(CodeNoSubsidizedCommittees, StateMachineModule, fmt.Sprintf("Chain ID %d has no subsidized committees", chainId))
+}
 
+func ErrEmptyLotteryWinner() ErrorI {
+	return NewError(CodeEmptyLotteryWinner, StateMachineModule, "Lottery winner is empty")
 }