kvazar/keva-stratum
1
0
Fork 0
mirror of https://github.com/kvazar-network/keva-stratum.git synced 2025-01-12 08:08:18 +00:00
Code Issues Projects Releases Wiki Activity

Displayed error message other than 500 internal error.

Browse Source
This commit is contained in:
Jianping Wu 2019-03-21 19:22:58 -07:00
parent 267c5a7927
commit 95c758018a
11 changed files with 201 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cnutil/cnutil.go
View File

@ -20,6 +20,15 @@ func ConvertBlob(blob []byte) []byte {
return output
}
func ValidateAddress(addr string) bool {
input := C.CString(addr)
defer C.free(unsafe.Pointer(input))
size := (C.uint32_t)(len(addr))
result := C.validate_address(input, size)
return (bool)(result)
}
func Hash(blob []byte, fast bool, height int) []byte {
output := make([]byte, 32)
if fast {

7
cnutil/src/cnutil.cpp
View File

@ -18,3 +18,10 @@ extern "C" uint32_t convert_blob(const char *blob, size_t len, char *out) {
output.copy(out, output.length(), 0);
return output.length();
}
extern "C" bool validate_address(const char *addr, size_t len) {
std::string input = std::string(addr, len);
std::string output = "";
uint64_t prefix;
return tools::base58::decode_addr(addr, prefix, output);
}

1
cnutil/src/cnutil.h
View File

@ -6,6 +6,7 @@ extern "C" {
#endif
uint32_t convert_blob(const char *blob, uint32_t len, char *out);
bool validate_address(const char *addr, uint32_t len);
void cryptonight_hash(const char* input, char* output, uint32_t len, int height);
void cryptonight_fast_hash(const char* input, char* output, uint32_t len);

7
cnutil/src/main.cc
View File

@ -26,6 +26,13 @@ extern "C" uint32_t convert_blob(const char *blob, size_t len, char *out) {
return output.length();
}
extern "C" bool validate_address(const char *addr, size_t len) {
std::string input = std::string(addr, len);
std::string output = "";
uint64_t prefix;
return tools::base58::decode_addr(addr, prefix, output);
}
extern "C" void cryptonight_hash(const char* input, char* output, uint32_t len, int height) {
const int variant = input[0] >= 7 ? input[0] - 6 : 0;
crypto::cn_slow_hash(input, len, output, variant, 0, height);

65
config_keva.json Normal file
View File

@ -0,0 +1,65 @@
{
"isKeva": true,
"address": "TKj7HMzeLAxd5DSoo35XuCfNH2yWC9y2Xb",
"bypassAddressValidation": false,
"bypassShareValidation": false,
"threads": 1,
"estimationWindow": "15m",
"luckWindow": "24h",
"largeLuckWindow": "72h",
"blockRefreshInterval": "1s",
"stratum": {
"timeout": "15m",
"listen": [
{
"host": "0.0.0.0",
"port": 1111,
"diff": 8000,
"maxConn": 32768
},
{
"host": "0.0.0.0",
"port": 3333,
"diff": 16000,
"maxConn": 32768
},
{
"host": "0.0.0.0",
"port": 5555,
"diff": 16000,
"maxConn": 32768
}
]
},
"frontend": {
"enabled": true,
"listen": "0.0.0.0:8082",
"login": "admin",
"password": "",
"hideIP": false
},
"upstreamCheckInterval": "5s",
"upstream": [
{
"name": "Test",
"host": "127.0.0.1",
"port": 19332,
"timeout": "300s",
"user": "yourusername",
"password": "yourpassword"
}
],
"newrelicEnabled": false,
"newrelicName": "MyStratum",
"newrelicKey": "SECRET_KEY",
"newrelicVerbose": false
}

65
config_monero.json Normal file
View File

@ -0,0 +1,65 @@
{
"isKeva": false,
"address": "47v4BWeUPFrM9YkYRYk2pkS9CubAPEc7BJjNjg4FvF66Y2oVrTAaBjDZhmFzAXgqCNRvBH2gupQ2gNag2FkP983ZMptvUWG",
"bypassAddressValidation": false,
"bypassShareValidation": false,
"threads": 1,
"estimationWindow": "15m",
"luckWindow": "24h",
"largeLuckWindow": "72h",
"blockRefreshInterval": "1s",
"stratum": {
"timeout": "15m",
"listen": [
{
"host": "0.0.0.0",
"port": 1111,
"diff": 8000,
"maxConn": 32768
},
{
"host": "0.0.0.0",
"port": 3333,
"diff": 16000,
"maxConn": 32768
},
{
"host": "0.0.0.0",
"port": 5555,
"diff": 16000,
"maxConn": 32768
}
]
},
"frontend": {
"enabled": true,
"listen": "0.0.0.0:8082",
"login": "admin",
"password": "",
"hideIP": false
},
"upstreamCheckInterval": "5s",
"upstream": [
{
"name": "Test",
"host": "127.0.0.1",
"port": 18081,
"timeout": "300s",
"user": "yourusername",
"password": "yourpassword"
}
],
"newrelicEnabled": false,
"newrelicName": "MyStratum",
"newrelicKey": "SECRET_KEY",
"newrelicVerbose": false
}

1
pool/pool.go
View File

@ -1,6 +1,7 @@
package pool
type Config struct {
IsKeva bool `json:"isKeva"`
Address string `json:"address"`
BypassAddressValidation bool `json:"bypassAddressValidation"`
BypassShareValidation bool `json:"bypassShareValidation"`

8
rpc/rpc.go
View File

@ -121,9 +121,11 @@ func (r *RPCClient) doPost(url, method string, params interface{}) (*JSONRpcResp
}
defer resp.Body.Close()
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
return nil, errors.New(resp.Status)
}
/*
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
return nil, errors.New(resp.Status)
}
*/
var rpcResp *JSONRpcResp
err = json.NewDecoder(resp.Body).Decode(&rpcResp)

16
stratum/handlers.go
View File

@ -5,6 +5,8 @@ import (
"regexp"
"strings"
"sync/atomic"
"../util"
)
var noncePattern *regexp.Regexp
@ -17,15 +19,19 @@ func init() {
func (s *StratumServer) handleLoginRPC(cs *Session, params *LoginParams) (*JobReply, *ErrorReply) {
_, id := extractWorkerId(params.Login)
address, id := extractWorkerId(params.Login)
/*
r := s.rpc()
if !s.config.BypassAddressValidation && !util.ValidateAddress(r, address, false) {
r := s.rpc()
if !s.config.BypassAddressValidation {
if s.config.IsKeva && !util.ValidateAddress_Keva(r, address, false) {
log.Printf("Invalid address %s used for login by %s", address, cs.ip)
return nil, &ErrorReply{Code: -1, Message: "Invalid address used for login"}
}
*/
if !s.config.IsKeva && !util.ValidateAddress(address, s.config.Address) {
log.Printf("Invalid address %s used for login by %s", address, cs.ip)
return nil, &ErrorReply{Code: -1, Message: "Invalid address used for login"}
}
}
t := s.currentBlockTemplate()
if t == nil {

20
stratum/stratum.go
View File

@ -13,6 +13,7 @@ import (
"sync/atomic"
"time"
"../cnutil"
"../pool"
"../rpc"
"../util"
@ -79,11 +80,6 @@ func NewStratum(cfg *pool.Config) *StratumServer {
}
log.Printf("Default upstream: %s => %s", stratum.rpc().Name, stratum.rpc().Url)
r := stratum.rpc()
if !cfg.BypassAddressValidation && !util.ValidateAddress(r, cfg.Address, true) {
log.Fatal(cfg.Address + " is either not a valid address or not owned by upstream server")
}
stratum.miners = NewMinersMap()
stratum.sessions = make(map[*Session]struct{})
@ -132,6 +128,7 @@ func NewStratum(cfg *pool.Config) *StratumServer {
}()
go func() {
var addressedCheck = false
for {
select {
case <-infoTimer.C:
@ -140,6 +137,19 @@ func NewStratum(cfg *pool.Config) *StratumServer {
if err != nil {
log.Printf("Unable to update info on upstream %s: %v", v.Name, err)
}
if err == nil && !addressedCheck {
addressedCheck = true
r := stratum.rpc()
if !cfg.BypassAddressValidation {
if cfg.IsKeva && !util.ValidateAddress_Keva(r, cfg.Address, true) {
log.Fatal(cfg.Address + " is either not a valid address or not owned by upstream server")
}
if !cfg.IsKeva && !cnutil.ValidateAddress(cfg.Address) {
log.Fatal(cfg.Address + " is not a valid address")
}
}
}
}
current := stratum.rpc()
poll(current)

16
util/util.go
View File

@ -5,7 +5,9 @@ import (
"encoding/json"
"math/big"
"time"
"unicode/utf8"
"../cnutil"
"../rpc"
)
@ -42,7 +44,7 @@ func GetHashDifficulty(hashBytes []byte) (*big.Int, bool) {
return diff.Div(Diff1, diff), true
}
func ValidateAddress(r *rpc.RPCClient, addr string, checkIsMine bool) bool {
func ValidateAddress_Keva(r *rpc.RPCClient, addr string, checkIsMine bool) bool {
rpcResp, err := r.ValidateAddress(addr)
if err != nil {
return false
@ -61,6 +63,18 @@ func ValidateAddress(r *rpc.RPCClient, addr string, checkIsMine bool) bool {
return false
}
func ValidateAddress(addy string, poolAddy string) bool {
if len(addy) != len(poolAddy) {
return false
}
prefix, _ := utf8.DecodeRuneInString(addy)
poolPrefix, _ := utf8.DecodeRuneInString(poolAddy)
if prefix != poolPrefix {
return false
}
return cnutil.ValidateAddress(addy)
}
func reverse(src []byte) []byte {
dst := make([]byte, len(src))
for i := len(src); i > 0; i-- {