add restapi to update gasPrice and gasLimit for nodes

Author: dryruner

config.json

@@ -1,13 +1,13 @@
 {
-    "VERSION": "v1.0-beta.23",
+    "VERSION": "v1.0.0-m",
     "NodeIP": "#REPLACE-WITH-IP",
     "NodePort": "9501",
     "ChainType": "ETH",
-    "DOSAddressBridgeAddress": "0x72840b59CeE8f0ce40f33219DDf9Ca73B6B29ab2",
+    "DOSAddressBridgeAddress": "0x98A0E7026778840Aacd28B9c03137D32e06F5ff1",
     "EthGasLimit": "1500000",
     "BootStrapIPs": [
     ],
     "ChainNodePool": [
-        "wss://rinkeby.infura.io/ws/v3/#REPLACE-WITH-INFURA-APIKEY"
+        "wss://mainnet.infura.io/ws/v3/#REPLACE-WITH-INFURA-APIKEY"
     ]
 }

dosnode/dos_restapis.go

@@ -16,6 +16,8 @@ func (d *DosNode) startRESTServer() (err error) {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/", d.status)
 	mux.HandleFunc("/balance", d.balance)
+	mux.HandleFunc("/setGasPrice", d.setGasPrice)
+	mux.HandleFunc("/setGasLimit", d.setGasLimit)
 	mux.HandleFunc("/enableAdmin", d.enableAdmin)
 	mux.HandleFunc("/disableAdmin", d.disableAdmin)
 	mux.HandleFunc("/enableGuardian", d.enableGuardian)
@@ -51,13 +53,13 @@ func (d *DosNode) status(w http.ResponseWriter, r *http.Request) {
 	html = html + "TotalQuery        : " + strconv.Itoa(d.totalQuery) + "\n|"
 	html = html + "FulfilledQuery    : " + strconv.Itoa(d.fulfilledQuery) + "\n|"
 	html = html + "Group Number      : " + strconv.Itoa(d.numOfworkingGroup) + "\n|"
-	html = html + "=================================================" + "\n|"
-	//	result := d.dkg.GetGroupNumber()
+	html = html + "gasPrice          : " + strconv.FormatUint(d.chain.GetGasPrice(), 10) + "\n|"
+	html = html + "gasLimit          : " + strconv.FormatUint(d.chain.GetGasLimit(), 10) + "\n|"
 	balance, err := d.chain.Balance()
 	if err != nil {
-		html = html + "Balance  : " + err.Error() + "\n|"
+		html = html + "Balance           : " + err.Error() + "\n|"
 	} else {
-		html = html + "Balance  : " + balance.String() + "\n|"
+		html = html + "Balance           : " + balance.String() + "\n|"
 	}
 	workingGroupNum, err := d.chain.GetWorkingGroupSize()
 	if err != nil {
@@ -83,7 +85,6 @@ func (d *DosNode) status(w http.ResponseWriter, r *http.Request) {
 	} else {
 		html = html + "PendingNodeSize   : " + strconv.FormatUint(pendingNodeNum, 10) + "\n|"
 	}
-
 	curBlk, err := d.chain.CurrentBlock()
 	if err != nil {
 		html = html + "CurrentBlock      : " + err.Error() + "\n"
@@ -105,6 +106,39 @@ func (d *DosNode) balance(w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte(html))
 }
 
+func (d *DosNode) setGasLimit(w http.ResponseWriter, r *http.Request) {
+	gasLimits, ok := r.URL.Query()["gasLimit"]
+	if !ok || len(gasLimits) == 0 {
+		return
+	}
+	g, ok := new(big.Int).SetString(gasLimits[0], 10)
+	if !ok {
+		d.logger.Error(fmt.Errorf("GasLimit SetString error"))
+		return
+	}
+	if g.Cmp(big.NewInt(0)) == 0 {
+		d.logger.Error(fmt.Errorf("GasLimit cannot be set to 0"))
+		return
+	}
+	d.logger.Info(fmt.Sprintf("Set GasLimit to %v", g))
+	d.chain.SetGasLimit(g)
+}
+
+func (d *DosNode) setGasPrice(w http.ResponseWriter, r *http.Request) {
+	gasPrices, ok := r.URL.Query()["gasPrice"]
+	if !ok || len(gasPrices) == 0 {
+		return
+	}
+	g, ok := new(big.Int).SetString(gasPrices[0], 10)
+	if !ok {
+		d.logger.Error(fmt.Errorf("GasPrice SetString error"))
+		return
+	}
+	// Set to 0 means using estimate gas price by default
+	d.logger.Info(fmt.Sprintf("Set GasPrice to %v wei", g))
+	d.chain.SetGasPrice(g)
+}
+
 func (d *DosNode) enableAdmin(w http.ResponseWriter, r *http.Request) {
 	d.logger.Info("isAdmin")
 	d.isAdmin = true

onchain/chain_adaptor.go

@@ -40,7 +40,11 @@ type ProxyAdapter interface {
 	StartCommitReveal(startBlock int64, commitDuration int64, revealDuration int64, revealThreshold int64) (err error)
 	Commit(cid *big.Int, commitment [32]byte) (err error)
 	Reveal(cid *big.Int, secret *big.Int) (err error)
+	SetGasPrice(gasPrice *big.Int)
+	SetGasLimit(gasLimit *big.Int)
 	//Get functions
+	GetGasPrice() (result uint64)
+	GetGasLimit() (result uint64)
 	GroupToPick() (result uint64, err error)
 	PendingNonce() (result uint64, err error)
 	GetExpiredWorkingGroupSize() (r uint64, err error)

onchain/eth_get.go

@@ -565,6 +565,25 @@ func (e *ethAdaptor) BootstrapStartThreshold() (result uint64, err error) {
 	}
 	return
 }
+
+func (e *ethAdaptor) GetGasPrice() (result uint64) {
+	if len(e.proxies) != 0 {
+		if e.proxies[0].TransactOpts.GasPrice == nil {
+			result = 0
+		} else {
+			result = e.proxies[0].TransactOpts.GasPrice.Uint64()
+		}
+	}
+	return
+}
+
+func (e *ethAdaptor) GetGasLimit() (result uint64) {
+	if len(e.proxies) != 0 {
+		result = e.proxies[0].TransactOpts.GasLimit
+	}
+	return
+}
+
 func (e *ethAdaptor) GroupPubKey(gIdx int) (result [4]*big.Int, err error) {
 	if !e.isConnecting() {
 		err = errors.New("not connecting to geth")

onchain/eth_proxy.go

@@ -44,8 +44,8 @@ type ethAdaptor struct {
 	httpUrls         []string
 	wsUrls           []string
 	key              *keystore.Key
-	gasPrice         int64
-	gasLimit         int64
+	gasPrice         uint64
+	gasLimit         uint64
 	connTimeout      time.Duration
 	getTimeout       time.Duration
 	setTimeout       time.Duration
@@ -76,7 +76,7 @@ func NewEthAdaptor(key *keystore.Key, config *configuration.Config, l logger) (a
 	adaptor.key = key
 	adaptor.logger = l
 	adaptor.reqQueue = make(chan *request)
-	adaptor.gasLimit = int64(gasLimitInt)
+	adaptor.gasLimit = uint64(gasLimitInt)
 	adaptor.connTimeout = 60 * time.Second
 	adaptor.getTimeout = 60 * time.Second
 	adaptor.setTimeout = 60 * time.Second
@@ -204,7 +204,7 @@ func (e *ethAdaptor) Connect(urls []string, t time.Time) (err error) {
 		ctx, cancel := context.WithCancel(e.ctx)
 		ctx = context.WithValue(ctx, "index", len(e.ctxes))
 		auth := bind.NewKeyedTransactor(e.key.PrivateKey)
-		auth.GasLimit = uint64(e.gasLimit)
+		auth.GasLimit = e.gasLimit
 		auth.Context = ctx
 
 		if bootStrapUrl != "" {

onchain/eth_set.go

@@ -355,6 +355,25 @@ func (e *ethAdaptor) SignalGroupDissolve() (err error) {
 	return
 }
 
+func (e *ethAdaptor) SetGasLimit(gasLimit *big.Int) {
+	if len(e.proxies) > 0 && len(e.crs) > 0 {
+		e.proxies[0].TransactOpts.GasLimit = gasLimit.Uint64()
+		e.crs[0].TransactOpts.GasLimit = gasLimit.Uint64()
+	}
+}
+
+func (e *ethAdaptor) SetGasPrice(gasPrice *big.Int) {
+	if len(e.proxies) > 0 && len(e.crs) > 0 {
+		if gasPrice.Cmp(big.NewInt(0)) == 0 {
+			e.proxies[0].TransactOpts.GasPrice = nil
+			e.crs[0].TransactOpts.GasPrice = nil
+		} else {
+			e.proxies[0].TransactOpts.GasPrice = gasPrice
+			e.crs[0].TransactOpts.GasPrice = gasPrice
+		}
+	}
+}
+
 func (e *ethAdaptor) SignalBootstrap(cid *big.Int) (err error) {
 	if !e.isConnecting() {
 		err = errors.New("not connecting to geth")