Merge branch 'release/0.4.7' into fix(resolver)/validate-bch-gateways

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:stable-slim AS final
+FROM debian:buster-slim AS final
 # Set up final runner first, so that it caches
 
 # Install Filecoin and Solana dependencies.
@@ -27,7 +27,7 @@ WORKDIR /lightnode
 
 ARG GITHUB_TOKEN
 
-RUN apt-get update && apt-get install -y ocl-icd-opencl-dev libgmp3-dev
+RUN apt-get update && apt-get install -y ocl-icd-opencl-dev libgmp3-dev libhwloc-dev
 
 # Use GitHub personal access token to fetch dependencies.
 RUN git config --global url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/"

compat/v0/compat.go

@@ -663,12 +663,12 @@ func V1TxFromV0Burn(ctx context.Context, v0tx Tx, bindings *binding.Binding, net
 
 	details, err := gatewayBinding.GetBurn(&bind.CallOpts{}, ref.Int)
 	if err != nil {
-		return tx.Tx{}, err
+		return tx.Tx{}, fmt.Errorf("getting burn with ref=%v: %v", ref, err)
 	}
 
 	latestBlockHeader, err := client.HeaderByNumber(ctx, nil)
 	if err != nil {
-		return tx.Tx{}, err
+		return tx.Tx{}, fmt.Errorf("getting latest block header: %v", err)
 	}
 	confirmations := new(big.Int).Sub(latestBlockHeader.Number, details.Blocknumber).Uint64()
 	if pack.U64(confirmations) > options.MaxConfirmations {
@@ -682,18 +682,18 @@ func V1TxFromV0Burn(ctx context.Context, v0tx Tx, bindings *binding.Binding, net
 		Context: ctx,
 	}, []*big.Int{ref.Int}, nil)
 	if err != nil {
-		return tx.Tx{}, err
+		return tx.Tx{}, fmt.Errorf("filtering burn logs for block #%v (ref=%v): %v", blockNumber, ref, err)
 	}
 	if iter == nil {
-		return tx.Tx{}, err
+		return tx.Tx{}, fmt.Errorf("no burn logs for block #%v (ref=%v): %v", blockNumber, ref, err)
 	}
 	var txid pack.Bytes
 	for iter.Next() {
 		txid = iter.Event.Raw.TxHash.Bytes()
 		break
 	}
 	if iter.Error() != nil {
-		return tx.Tx{}, err
+		return tx.Tx{}, fmt.Errorf("getting burn log details for block #%v (ref=%v): %v", blockNumber, ref, err)
 	}
 
 	amount := pack.NewU256FromInt(details.Amount)
@@ -706,7 +706,7 @@ func V1TxFromV0Burn(ctx context.Context, v0tx Tx, bindings *binding.Binding, net
 		to = multichain.Address(base58.Encode(toBytes))
 		toDecode, err = decoder.DecodeAddress(to)
 		if err != nil {
-			return tx.Tx{}, err
+			return tx.Tx{}, fmt.Errorf("decoding address=%v (ref=%v): %v", to, ref, err)
 		}
 	}
 
@@ -726,7 +726,7 @@ func V1TxFromV0Burn(ctx context.Context, v0tx Tx, bindings *binding.Binding, net
 		Ghash:   ghash,
 	})
 	if err != nil {
-		return tx.Tx{}, err
+		return tx.Tx{}, fmt.Errorf("encoding input (ref=%v): %v", ref, err)
 	}
 	return tx.NewTx(selector, pack.Typed(input.(pack.Struct)))
 }

compat/v0/store.go

@@ -131,7 +131,7 @@ func (store Store) decodeHashString(s string) (id.Hash, error) {
 	hash := id.Hash{}
 	hashBytes, err1 := base64.RawURLEncoding.DecodeString(s)
 	if err1 != nil {
-		hashBytes2, err2 := base64.RawStdEncoding.DecodeString(s)
+		hashBytes2, err2 := base64.StdEncoding.DecodeString(s)
 		if err2 != nil {
 			err := fmt.Errorf("invalid hash encoding ( %v ) persisted: not base64URL %v not base64 %v", s, err1, err2)
 			return hash, err

resolver/resolver_test.go

@@ -762,6 +762,30 @@ var _ = Describe("Resolver", func() {
 
 		ipString = "1.1.1.1,9.9.9.9,,,"
 		httpRequest.Header.Set("x-forwarded-for", ipString)
+		Eventually(func() jsonrpc.Response {
+			_, resp := validator.ValidateRequest(innerCtx, httpRequest, jsonrpc.Request{
+				Version: "2.0",
+				ID:      nil,
+				Method:  jsonrpc.MethodSubmitTx,
+				Params:  paramsJSON,
+			})
+			return resp
+		}).Should(Equal(jsonrpc.Response{}))
+
+		ipString = "1.1.1.1 , 9.9.9.9,,,"
+		httpRequest.Header.Set("x-forwarded-for", ipString)
+		Eventually(func() jsonrpc.Response {
+			_, resp := validator.ValidateRequest(innerCtx, httpRequest, jsonrpc.Request{
+				Version: "2.0",
+				ID:      nil,
+				Method:  jsonrpc.MethodSubmitTx,
+				Params:  paramsJSON,
+			})
+			return resp
+		}).Should(Equal(jsonrpc.Response{}))
+
+		ipString = "1.1,9.9.9,,,"
+		httpRequest.Header.Set("x-forwarded-for", ipString)
 		Eventually(func() jsonrpc.Response {
 			_, resp := validator.ValidateRequest(innerCtx, httpRequest, jsonrpc.Request{
 				Version: "2.0",
@@ -773,8 +797,9 @@ var _ = Describe("Resolver", func() {
 		}).Should(Equal(
 			jsonrpc.NewResponse(nil, nil, &jsonrpc.Error{
 				Code:    jsonrpc.ErrorCodeInvalidRequest,
-				Message: fmt.Sprintf("could not determine ip for %v", ipString),
+				Message: fmt.Sprintf("could not parse ip: 9.9.9"),
 			}),
 		))
+
 	})
 })

resolver/validator.go

@@ -52,13 +52,18 @@ func (validator *LightnodeValidator) ValidateRequest(ctx context.Context, r *htt
 	if ipString == "" {
 		ipString = r.RemoteAddr
 	} else if ipStrings := strings.Split(ipString, ","); len(ipStrings) > 0 {
-		ipString = ipStrings[len(ipStrings)-1]
+		i := 1
+		ipString = ""
+		for ipString == "" && len(ipStrings) >= i {
+			ipString = strings.TrimSpace(ipStrings[len(ipStrings)-i])
+			i++
+		}
 		// if there is a trailling comma, or the x-forwarded-for header is malformed,
 		// skip parsing
 		if ipString == "" {
 			return nil, jsonrpc.NewResponse(req.ID, nil, &jsonrpc.Error{
 				Code:    jsonrpc.ErrorCodeInvalidRequest,
-				Message: fmt.Sprintf("could not determine ip for %v", strings.Join(ipStrings, ",")),
+				Message: fmt.Sprintf("could not find forwarded ip in %v", strings.Join(ipStrings, ",")),
 			})
 		}
 	}
@@ -74,7 +79,7 @@ func (validator *LightnodeValidator) ValidateRequest(ctx context.Context, r *htt
 		if err != nil {
 			return nil, jsonrpc.NewResponse(req.ID, nil, &jsonrpc.Error{
 				Code:    jsonrpc.ErrorCodeInvalidRequest,
-				Message: fmt.Sprintf("could not determine ip for %v", ipString),
+				Message: fmt.Sprintf("could not parse ip: %v", ipString),
 			})
 		}
 	}