Merge pull request #291 from anandrgitnirman/testcasefailure

#287, Add mpe_address to GetChannelState authentication
singnet · Jun 12, 2019 · c1071b4 · c1071b4
2 parents 148491b + 8fc2ab5
commit c1071b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/escrow/state_service.go b/escrow/state_service.go
@@ -7,7 +7,9 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/singnet/snet-daemon/authutils"
+	"github.com/singnet/snet-daemon/blockchain"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"math/big"
@@ -17,6 +19,7 @@ import (
 type PaymentChannelStateService struct {
 	channelService PaymentChannelService
 	paymentStorage *PaymentStorage
+	mpeAddress func() (address common.Address)
 }
 
 // verifies whether storage channel nonce is equal to blockchain nonce or not
@@ -35,10 +38,11 @@ func (service *PaymentChannelStateService) StorageNonceMatchesWithBlockchainNonc
 }
 
 // NewPaymentChannelStateService returns new instance of PaymentChannelStateService
-func NewPaymentChannelStateService(channelService PaymentChannelService, paymentStorage *PaymentStorage) *PaymentChannelStateService {
+func NewPaymentChannelStateService(channelService PaymentChannelService, paymentStorage *PaymentStorage,metaData *blockchain.ServiceMetadata) *PaymentChannelStateService {
 	return &PaymentChannelStateService{
 		channelService: channelService,
 		paymentStorage: paymentStorage,
+		mpeAddress:func() common.Address { return metaData.GetMpeAddress() },
 	}
 }
 
@@ -65,6 +69,7 @@ func (service *PaymentChannelStateService) GetChannelState(context context.Conte
 	// signature verification
 	message := bytes.Join([][]byte{
 		[]byte("__get_channel_state"),
+		service.mpeAddress().Bytes(),
 		bigIntToBytes(channelID),
 		abi.U256(big.NewInt(int64(request.CurrentBlock))),
 	}, nil)

diff --git a/escrow/state_service_test.go b/escrow/state_service_test.go
@@ -53,11 +53,13 @@ var stateServiceTest = func() stateServiceTestType {
 	}
 
 	paymentStorage := NewPaymentStorage(NewMemStorage())
+	verificationAddress:= common.HexToAddress("0xf25186b5081ff5ce73482ad761db0eb0d25abfbf")
 
 	return stateServiceTestType{
 		service: PaymentChannelStateService{
 			channelService: channelServiceMock,
 			paymentStorage: paymentStorage,
+			mpeAddress: func() common.Address {return verificationAddress},
 		},
 		senderAddress:      senderAddress,
 		signerPrivateKey:   signerPrivateKey,

diff --git a/snetd/cmd/components.go b/snetd/cmd/components.go
@@ -251,7 +251,7 @@ func (components *Components) PaymentChannelStateService() (service *escrow.Paym
 	components.paymentChannelStateService = escrow.NewPaymentChannelStateService(
 		components.PaymentChannelService(),
 		components.PaymentStorage(),
-	)
+		components.ServiceMetaData())
 
 	return components.paymentChannelStateService
 }