Firewall: Modified remote peer checks

cmd/network.go

@@ -303,8 +303,7 @@ func (pm *PongMessage) Unmarshal(bytes []byte) error {
 }
 
 // getBootstrapPeerOperatorKey returns hardcoded public and private operator key
-// of the bootstrap peer. We hardcode those values because we need to initialize
-// stakes on both sides of the connection using the local, stubbed `StakeMonitor`.
+// of the bootstrap peer.
 func getBootstrapPeerOperatorKey() (
 	*operator.PrivateKey,
 	*operator.PublicKey,
@@ -313,8 +312,7 @@ func getBootstrapPeerOperatorKey() (
 }
 
 // getStandardPeerOperatorKey returns hardcoded public and private operator key
-// of the standard peer. We hardcode those values because we need to initialize
-// stake on both sides of the connection using local, stubbed `StakeMonitor`.
+// of the standard peer.
 func getStandardPeerOperatorKey() (
 	*operator.PrivateKey,
 	*operator.PublicKey,

cmd/start.go

@@ -62,7 +62,7 @@ func Start(c *cli.Context) error {
 		config.LibP2P.Port = c.Int(portFlag)
 	}
 
-	beaconChain, _, err := ethereum.Connect(ctx, config.Ethereum)
+	beaconChain, tbtcChain, err := ethereum.Connect(ctx, config.Ethereum)
 	if err != nil {
 		return fmt.Errorf("error connecting to Ethereum node: [%v]", err)
 	}
@@ -77,13 +77,16 @@ func Start(c *cli.Context) error {
 		return fmt.Errorf("failed to get block counter: [%v]", err)
 	}
 
+	firewall := firewall.AnyApplicationPolicy(
+		[]firewall.Application{beaconChain, tbtcChain},
+	)
+
 	netProvider, err := libp2p.Connect(
 		ctx,
 		config.LibP2P,
 		operatorPrivateKey,
 		libp2p.ProtocolBeacon,
-		// TODO: Use the firewall policy developed in https://github.com/keep-network/keep-core/pull/3060
-		firewall.Disabled,
+		firewall,
 		retransmission.NewTicker(blockCounter.WatchBlocks(ctx)),
 	)
 	if err != nil {

configs/config.toml.SAMPLE

@@ -52,12 +52,9 @@
 	KeyFile            = "/Users/someuser/ethereum/data/keystore/UTC--2018-03-11T01-37-33.202765887Z--AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAA"
 
 [ethereum.ContractAddresses]
+	TokenStaking = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
 	RandomBeacon = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-
-    # Legacy v1 contracts, do not have to be set. Soon to be removed.
-	KeepRandomBeaconOperator = "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
-	TokenStaking = "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
-	KeepRandomBeaconService = "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
+	WalletRegistry = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
 
 [LibP2P]
  	Peers = ["/ip4/127.0.0.1/tcp/3919/ipfs/16Uiu2HAmFRJtCWfdXhZEZHWb4tUpH1QMMgzH1oiamCfUuK6NgqWX"]

pkg/beacon/chain/chain.go

@@ -125,8 +125,6 @@ type Interface interface {
 	BlockCounter() (chain.BlockCounter, error)
 	// Signing returns the chain's signer.
 	Signing() chain.Signing
-	// StakeMonitor returns the chain's stake monitor.
-	StakeMonitor() (chain.StakeMonitor, error)
 	// OperatorKeyPair returns the key pair of the operator assigned to this
 	// chain handle.
 	OperatorKeyPair() (*operator.PrivateKey, *operator.PublicKey, error)

pkg/beacon/dkg/dkg_test.go

@@ -31,7 +31,7 @@ func setup() {
 	gjkrResult = &gjkr.Result{GroupPublicKey: groupPublicKey}
 	dkgResultChannel = make(chan *event.DKGResultSubmission, 1)
 	startPublicationBlockHeight = uint64(0)
-	localChain := local_v1.Connect(5, 3, big.NewInt(10))
+	localChain := local_v1.Connect(5, 3)
 	beaconChain = localChain
 	blockCounter, _ = beaconChain.BlockCounter()
 }

pkg/beacon/dkg/result/signing_test.go

@@ -2,7 +2,6 @@ package result
 
 import (
 	"github.com/keep-network/keep-core/pkg/chain/local_v1"
-	"math/big"
 	"reflect"
 	"testing"
 
@@ -310,7 +309,6 @@ func initializeSigningMembers(groupSize int) (
 ) {
 	honestThreshold := groupSize/2 + 1
 	dishonestThreshold := groupSize - honestThreshold
-	minimumStake := big.NewInt(200)
 
 	dkgGroup := group.NewDkgGroup(dishonestThreshold, groupSize)
 
@@ -334,7 +332,6 @@ func initializeSigningMembers(groupSize int) (
 		localChain := local_v1.ConnectWithKey(
 			groupSize,
 			honestThreshold,
-			minimumStake,
 			operatorPrivateKey,
 		)
 

pkg/beacon/dkg/result/submission_test.go

@@ -2,7 +2,6 @@ package result
 
 import (
 	"github.com/keep-network/keep-core/pkg/chain/local_v1"
-	"math/big"
 	"testing"
 
 	beaconchain "github.com/keep-network/keep-core/pkg/beacon/chain"
@@ -221,7 +220,7 @@ func initChainHandle(honestThreshold int, groupSize int) (
 	uint64,
 	error,
 ) {
-	chainHandle := local_v1.Connect(groupSize, honestThreshold, big.NewInt(200))
+	chainHandle := local_v1.Connect(groupSize, honestThreshold)
 
 	blockCounter, err := chainHandle.BlockCounter()
 	if err != nil {

pkg/beacon/group/membership_validator_test.go

@@ -4,12 +4,11 @@ import (
 	"github.com/keep-network/keep-core/pkg/chain"
 	"github.com/keep-network/keep-core/pkg/chain/local_v1"
 	"github.com/keep-network/keep-core/pkg/operator"
-	"math/big"
 	"testing"
 )
 
 func TestIsInGroup(t *testing.T) {
-	localChain := local_v1.Connect(3, 3, big.NewInt(100))
+	localChain := local_v1.Connect(3, 3)
 	signing := localChain.Signing()
 
 	publicKey1 := generatePublicKey(t)
@@ -43,7 +42,7 @@ func TestIsInGroup(t *testing.T) {
 }
 
 func TestIsValidMembership(t *testing.T) {
-	localChain := local_v1.Connect(3, 3, big.NewInt(100))
+	localChain := local_v1.Connect(3, 3)
 	signing := localChain.Signing()
 
 	publicKey1 := generatePublicKeyBytes(t)

pkg/beacon/node_test.go

@@ -11,7 +11,7 @@ var address = "0x65ea55c1f10491038425725dc00dffeab2a1e28a"
 var relayEntryTimeout = uint64(15)
 
 func TestMonitorRelayEntryOnChain_EntrySubmitted(t *testing.T) {
-	localChain := local_v1.Connect(5, 3, big.NewInt(200))
+	localChain := local_v1.Connect(5, 3)
 
 	node := &node{
 		beaconChain: localChain,
@@ -62,7 +62,7 @@ func TestMonitorRelayEntryOnChain_EntrySubmitted(t *testing.T) {
 }
 
 func TestMonitorRelayEntryOnChain_EntryNotSubmitted(t *testing.T) {
-	localChain := local_v1.Connect(5, 3, big.NewInt(200))
+	localChain := local_v1.Connect(5, 3)
 
 	node := &node{
 		beaconChain: localChain,

pkg/beacon/registry/groups_test.go

@@ -52,7 +52,7 @@ var (
 )
 
 func TestRegisterGroup(t *testing.T) {
-	localChain := local_v1.Connect(5, 3, big.NewInt(200))
+	localChain := local_v1.Connect(5, 3)
 
 	gr := NewGroupRegistry(localChain, persistenceMock)
 
@@ -76,7 +76,7 @@ func TestRegisterGroup(t *testing.T) {
 }
 
 func TestLoadGroup(t *testing.T) {
-	localChain := local_v1.Connect(5, 3, big.NewInt(200))
+	localChain := local_v1.Connect(5, 3)
 	gr := NewGroupRegistry(localChain, persistenceMock)
 
 	if len(gr.myGroups) != 0 {

pkg/beacon/state/machine_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/keep-network/keep-core/pkg/chain/local_v1"
-	"math/big"
 	"reflect"
 	"testing"
 
@@ -20,7 +19,7 @@ var blockCounter chain.BlockCounter
 func TestExecute(t *testing.T) {
 	testLog = make(map[uint64][]string)
 
-	localChain := local_v1.Connect(10, 5, big.NewInt(200))
+	localChain := local_v1.Connect(10, 5)
 	blockCounter, _ = localChain.BlockCounter()
 	provider := netLocal.Connect()
 	channel, err := provider.BroadcastChannelFor("transitions_test")

pkg/chain/ethereum/beacon.go

@@ -1,7 +1,6 @@
 package ethereum
 
 import (
-	"bytes"
 	"context"
 	"encoding/binary"
 	"fmt"
@@ -19,6 +18,7 @@ import (
 	"github.com/keep-network/keep-common/pkg/chain/ethereum"
 	"github.com/keep-network/keep-core/pkg/chain"
 	"github.com/keep-network/keep-core/pkg/chain/ethereum/beacon/gen/contract"
+	"github.com/keep-network/keep-core/pkg/operator"
 )
 
 // Definitions of contract names.
@@ -131,16 +131,13 @@ func (bc *BeaconChain) OperatorToStakingProvider() (chain.Address, bool, error)
 	stakingProvider, err := bc.randomBeacon.OperatorToStakingProvider(bc.key.Address)
 	if err != nil {
 		return "", false, fmt.Errorf(
-			"failed to map operator %v to a staking provider: [%v]",
+			"failed to map operator [%v] to a staking provider: [%v]",
 			bc.key.Address,
 			err,
 		)
 	}
 
-	if bytes.Equal(
-		stakingProvider.Bytes(),
-		bytes.Repeat([]byte{0}, common.AddressLength),
-	) {
+	if (stakingProvider == common.Address{}) {
 		return "", false, nil
 	}
 
@@ -365,6 +362,53 @@ func (bc *BeaconChain) CalculateDKGResultHash(
 	return beaconchain.DKGResultHashFromBytes(hash)
 }
 
+// IsRecognized checks whether the given operator is recognized by the BeaconChain
+// as eligible to join the network. If the operator has a stake delegation or
+// had a stake delegation in the past, it will be recognized.
+func (bc *BeaconChain) IsRecognized(operatorPublicKey *operator.PublicKey) (bool, error) {
+	operatorAddress, err := operatorPublicKeyToChainAddress(operatorPublicKey)
+	if err != nil {
+		return false, fmt.Errorf(
+			"cannot convert from operator key to chain address: [%v]",
+			err,
+		)
+	}
+
+	stakingProvider, err := bc.randomBeacon.OperatorToStakingProvider(
+		operatorAddress,
+	)
+	if err != nil {
+		return false, fmt.Errorf(
+			"failed to map operator [%v] to a staking provider: [%v]",
+			operatorAddress,
+			err,
+		)
+	}
+
+	if (stakingProvider == common.Address{}) {
+		return false, nil
+	}
+
+	// Check if the staking provider has an owner. This check ensures that there
+	// is/was a stake delegation for the given staking provider.
+	_, _, _, hasStakeDelegation, err := bc.Chain.RolesOf(
+		chain.Address(stakingProvider.Hex()),
+	)
+	if err != nil {
+		return false, fmt.Errorf(
+			"failed to check stake delegation for staking provider [%v]: [%v]",
+			stakingProvider,
+			err,
+		)
+	}
+
+	if !hasStakeDelegation {
+		return false, nil
+	}
+
+	return true, nil
+}
+
 // TODO: Implement a real SubmitRelayEntry function.
 func (bc *BeaconChain) SubmitRelayEntry(
 	entry []byte,

pkg/chain/ethereum/ethereum.go

@@ -15,6 +15,12 @@ import (
 	"github.com/keep-network/keep-common/pkg/chain/ethereum"
 	"github.com/keep-network/keep-common/pkg/chain/ethereum/ethutil"
 	"github.com/keep-network/keep-common/pkg/rate"
+	"github.com/keep-network/keep-core/pkg/chain/ethereum/threshold/gen/contract"
+)
+
+// Definitions of contract names.
+const (
+	TokenStakingContractName = "TokenStaking"
 )
 
 var logger = log.Logger("keep-chain-ethereum")
@@ -44,6 +50,8 @@ type Chain struct {
 	// nonce. Serializing submission ensures that each nonce is requested after
 	// a previous transaction has been submitted.
 	transactionMutex *sync.Mutex
+
+	tokenStaking *contract.TokenStaking
 }
 
 // Connect creates Random Beacon and TBTC Ethereum chain handles.
@@ -70,7 +78,7 @@ func Connect(
 		return nil, nil, fmt.Errorf("could not create beacon chain handle: [%v]", err)
 	}
 
-	tbtcChain, err := newTbtcChain(baseChain)
+	tbtcChain, err := newTbtcChain(config, baseChain)
 	if err != nil {
 		return nil, nil, fmt.Errorf("could not create TBTC chain handle: [%v]", err)
 	}
@@ -117,16 +125,46 @@ func newChain(
 
 	miningWaiter := ethutil.NewMiningWaiter(clientWithAddons, config)
 
+	transactionMutex := &sync.Mutex{}
+
 	// TODO: Consider adding the balance monitoring.
 
+	tokenStakingAddress, err := config.ContractAddress(TokenStakingContractName)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to resolve %s contract address: [%v]",
+			TokenStakingContractName,
+			err,
+		)
+	}
+
+	tokenStaking, err :=
+		contract.NewTokenStaking(
+			tokenStakingAddress,
+			chainID,
+			key,
+			client,
+			nonceManager,
+			miningWaiter,
+			blockCounter,
+			transactionMutex,
+		)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to attach to TokenStaking contract: [%v]",
+			err,
+		)
+	}
+
 	return &Chain{
 		key:              key,
 		client:           clientWithAddons,
 		chainID:          chainID,
 		blockCounter:     blockCounter,
 		nonceManager:     nonceManager,
 		miningWaiter:     miningWaiter,
-		transactionMutex: &sync.Mutex{},
+		transactionMutex: transactionMutex,
+		tokenStaking:     tokenStaking,
 	}, nil
 }