Merge branch 'master' into dev

semyon-dev · semyon-dev · commit a44764abeec4 · 2026-03-11T12:25:26.000+03:00
# Conflicts:
#	go.mod
#	go.sum
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -4,21 +4,14 @@ on:
   push:
     branches:
       - master
-      - dev
       - development
+      - dev
   pull_request:
     types: [opened, synchronize, reopened]
 
+  workflow_dispatch:
+
 jobs:
-  build:
-    name: Build and analyze
-    runs-on: ubuntu-latest
-    
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - uses: SonarSource/sonarqube-scan-action@v6.0.0
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+  sonar:
+    uses: singnet/security-workflows/.github/workflows/sonar.yml@master
+    secrets: inherit
diff --git a/blockchain/org_metadata.go b/blockchain/org_metadata.go
@@ -123,7 +123,7 @@ func InitOrganizationMetaDataFromJson(jsonData []byte) (metaData *OrganizationMe
 
 func checkMandatoryFields(metaData *OrganizationMetaData) (err error) {
 	if metaData.daemonGroup.PaymentDetails.PaymentChannelStorageClient.Endpoints == nil {
-		err = fmt.Errorf("Mandatory field : ETCD Client Endpoints are mising for the Group %v ", metaData.daemonGroup.GroupName)
+		err = fmt.Errorf("Mandatory field : ETCD Client Endpoints are missing for the Group %v ", metaData.daemonGroup.GroupName)
 	}
 
 	if metaData.recipientPaymentAddress == (common.Address{}) {
diff --git a/escrow/escrow.go b/escrow/escrow.go
@@ -10,7 +10,7 @@ import (
 
 // lockingPaymentChannelService implements PaymentChannelService interface
 // using locks around proxied service call to guarantee that only one payment
-// at time is applied to channel
+// at a time is applied to channel
 type lockingPaymentChannelService struct {
 	storage          *PaymentChannelStorage
 	paymentStorage   *PaymentStorage
@@ -52,8 +52,8 @@ func (h *lockingPaymentChannelService) PaymentChannel(key *PaymentChannelKey) (c
 	blockchainChannel, blockchainOk, err := h.blockchainReader.GetChannelStateFromBlockchain(key)
 
 	if !storageOk {
-		// Group ID check is only done for the first time, when the channel is added to storage from the blockchain,
-		// if the channel is already present in the storage, the group ID check is skipped.
+		// Group ID check is only done for the first time, when the channel is added to storage from the blockchain.
+		// If the channel is already present in the storage, the group ID check is skipped.
 		if blockchainChannel != nil {
 			blockChainGroupID := h.replicaGroupID()
 			if err = h.verifyGroupId(blockChainGroupID, blockchainChannel.GroupID); err != nil {
diff --git a/escrow/payment_channel_storage.go b/escrow/payment_channel_storage.go
@@ -78,7 +78,7 @@ func (storage *PaymentChannelStorage) Put(key *PaymentChannelKey, state *Payment
 	return storage.delegate.Put(key, state)
 }
 
-// PutIfAbsent storage payment channel by key if key is absent
+// PutIfAbsent stores a payment channel by key if the key is absent
 func (storage *PaymentChannelStorage) PutIfAbsent(key *PaymentChannelKey, state *PaymentChannelData) (ok bool, err error) {
 	return storage.delegate.PutIfAbsent(key, state)
 }
@@ -107,7 +107,7 @@ func NewBlockchainChannelReader(processor blockchain.Processor, cfg *viper.Viper
 }
 
 // GetChannelStateFromBlockchain returns channel state from Ethereum
-// blockchain. ok is false if channel was not found.
+// blockchain. ok is false if the channel is not found.
 func (reader *BlockchainChannelReader) GetChannelStateFromBlockchain(key *PaymentChannelKey) (channel *PaymentChannelData, ok bool, err error) {
 	ch, ok, err := reader.readChannelFromBlockchain(key.ID)
 	if err != nil || !ok {
diff --git a/escrow/payment_handler.go b/escrow/payment_handler.go
@@ -60,7 +60,7 @@ func (h *paymentChannelPaymentHandler) Payment(context *handler.GrpcStreamContex
 	income.Sub(internalPayment.Amount, transaction.Channel().AuthorizedAmount)
 	e = h.incomeValidator.Validate(&IncomeStreamData{Income: income, GrpcContext: context})
 	if e != nil {
-		//Make sure the transaction is Rolled back , else this will cause a lock on the channel
+		// Make sure the transaction is rolled back, else this will cause a lock on the channel
 		transaction.Rollback()
 		return nil, paymentErrorToGrpcError(e)
 	}
diff --git a/escrow/state_service.go b/escrow/state_service.go
@@ -46,7 +46,7 @@ func (service *BlockChainDisabledStateService) GetChannelState(context context.C
 	return &ChannelStateReply{}, nil
 }
 
-// verifies whether storage channel nonce is equal to blockchain nonce or not
+// StorageNonceMatchesWithBlockchainNonce verifies whether storage channel nonce is equal to blockchain nonce or not
 func (service *PaymentChannelStateService) StorageNonceMatchesWithBlockchainNonce(storageChannel *PaymentChannelData) (equal bool, err error) {
 	h := service.channelService
 
@@ -128,7 +128,7 @@ func (service *PaymentChannelStateService) GetChannelState(context context.Conte
 		return nil, err
 
 	} else if !nonceEqual {
-		// check for payments in the payment storage with current nonce - 1, this will happen  cli has issues in claiming process
+		// check for payments in the payment storage with current nonce - 1, this will happen if cli has issues in claiming process
 
 		paymentID := PaymentID(channel.ChannelID, (&big.Int{}).Sub(channel.Nonce, big.NewInt(1)))
 		payment, ok, err := service.paymentStorage.Get(paymentID)
diff --git a/escrow/token_service.go b/escrow/token_service.go
@@ -80,7 +80,7 @@ func (service *TokenService) verifySignatureAndSignedAmountEligibility(channelId
 	if channel.FullAmount.Cmp(latestAuthorizedAmount) < 0 {
 		return nil, fmt.Errorf("signed amount for token request cannot be greater than full amount in channel")
 	}
-	//verify signature
+	// Verify signature
 	signer, err := service.verifySignature(request, channel)
 	if err != nil {
 		return nil, err
@@ -89,7 +89,7 @@ func (service *TokenService) verifySignatureAndSignedAmountEligibility(channelId
 	if err = service.validator.Validate(payment, channel); err != nil {
 		return nil, err
 	}
-	//update the channel Signature if you have a new Signed Amount received
+	// Update the channel Signature if you have a new Signed Amount received
 	if latestAuthorizedAmount.Cmp(channel.AuthorizedAmount) > 0 {
 		transaction, err := service.channelService.StartPaymentTransaction(payment)
 		if err != nil {
@@ -140,7 +140,7 @@ func (service *TokenService) verifySignature(request *TokenRequest, channel *Pay
 
 func (service *TokenService) GetToken(ctx context.Context, request *TokenRequest) (reply *TokenReply, err error) {
 
-	//Check for update state
+	// Check for update state
 	channelID := big.NewInt(0).SetUint64(request.ChannelId)
 	latestAuthorizedAmount := big.NewInt(0).SetUint64(request.SignedAmount)
 
diff --git a/escrow/train_pay_handler.go b/escrow/train_pay_handler.go
@@ -48,7 +48,7 @@ func (t trainStreamPaymentHandler) Payment(context *handler.GrpcStreamContext) (
 	income.Sub(internalPayment.Amount, transaction.Channel().AuthorizedAmount)
 	e = t.incomeValidator.Validate(&IncomeStreamData{Income: income, GrpcContext: context})
 	if e != nil {
-		//Make sure the transaction is Rolled back , else this will cause a lock on the channel
+		// Make sure the transaction is rolled back, else this will cause a lock on the channel
 		transaction.Rollback()
 		return nil, paymentErrorToGrpcError(e)
 	}
@@ -143,7 +143,7 @@ func (h *trainUnaryPaymentHandler) Payment(context *handler.GrpcUnaryContext) (p
 	income.Sub(internalPayment.Amount, transaction.Channel().AuthorizedAmount)
 	e = h.incomeValidator.Validate(&IncomeUnaryData{Income: income, GrpcContext: context})
 	if e != nil {
-		//Make sure the transaction is Rolled back , else this will cause a lock on the channel
+		// Make sure the transaction is rolled back, else this will cause a lock on the channel
 		transaction.Rollback()
 		return nil, paymentErrorToGrpcError(e)
 	}
diff --git a/handler/stream_interceptor.go b/handler/stream_interceptor.go
@@ -45,9 +45,9 @@ const (
 	// PaymentChannelSignatureHeader is a signature of the client to confirm
 	// amount withdrawing authorization. Value is an array of bytes.
 	PaymentChannelSignatureHeader = "snet-payment-channel-signature-bin"
-	// This is useful information in the header sent in by the client
+	// This is useful information in the header sent by the client
 	// All clients will have this information and they need this to Sign anyways
-	// When Daemon is running in the block chain disabled mode , it would use this
+	// When Daemon is running in the block chain disabled mode, it would use this
 	// header to get the MPE address. The goal here is to keep the client oblivious to the
 	// Daemon block chain enabled or disabled mode and also standardize the signatures.
 	// id. Value is a string containing a decimal number.
diff --git a/pricing/fixed_method_pricing.go b/pricing/fixed_method_pricing.go
@@ -9,12 +9,12 @@ import (
 )
 
 type FixedMethodPrice struct {
-	//Service/Method is the key and value is he price
+	// Service/Method is the key and value is the price
 	methodToPriceMap map[string]*big.Int
 }
 
 func (priceType FixedMethodPrice) GetPrice(GrpcContext *handler.GrpcStreamContext) (price *big.Int, err error) {
-	//The returned string is in the format of "/packagename.service/method", for example /example_service.Calculator/mul
+	// The returned string is in the format of "/packagename.service/method", for example /example_service.Calculator/mul
 	methodName := GrpcContext.Info.FullMethod
 	if price, ok := priceType.methodToPriceMap[methodName]; !ok {
 		return nil, fmt.Errorf("price is not defined for the Method %v", methodName)
diff --git a/pricing/pricing_strategy.go b/pricing/pricing_strategy.go
@@ -13,25 +13,25 @@ import (
 )
 
 type PricingStrategy struct {
-	//Holds all the pricing types possible
+	// Holds all the pricing types possible
 	pricingTypes    map[string]PriceType
 	serviceMetaData *blockchain.ServiceMetadata
 }
 
 // Figure out which price type is to be used
 func (pricing PricingStrategy) determinePricingApplicable(fullMethod string) (priceType PriceType, err error) {
-	//For future, there could be multiple pricingTypes to select from and this method will help decide which pricing to pick
-	//but for now, we just have one pricing Type ( either Fixed Price or Fixed price per Method)
+	// For future, there could be multiple pricingTypes to select from and this method will help decide which pricing to pick
+	// but for now, we just have one pricing Type (either Fixed Price or Fixed price per Method)
 
 	if config.GetBool(config.EnableDynamicPricing) {
-		//Use Dynamic pricing ONLY when you find the mapped price method to be called.
+		// Use Dynamic pricing ONLY when you find the mapped price method to be called.
 		if _, ok := pricing.serviceMetaData.GetDynamicPricingMethodAssociated(fullMethod); ok {
 			return pricing.pricingTypes[DYNAMIC_PRICING], nil
 		} else {
 			zap.L().Info("No Dynamic Price method defined in service proto", zap.String("Method", fullMethod))
 		}
 	}
-	//Default pricing is Fixed Pricing
+	// Default pricing is Fixed Pricing
 	return pricing.pricingTypes[pricing.serviceMetaData.GetDefaultPricing().PriceModel], nil
 }
 
@@ -54,7 +54,7 @@ func (pricing *PricingStrategy) AddPricingTypes(priceType PriceType) {
 }
 
 func (pricing PricingStrategy) GetPrice(GrpcContext *handler.GrpcStreamContext) (price *big.Int, err error) {
-	//Based on the input request , determine which price type is to be used
+	// Based on the input request, determine which price type is to be used
 	if priceType, err := pricing.determinePricingApplicable(GrpcContext.Info.FullMethod); err != nil {
 		return nil, err
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func InitOrganizationMetaDataFromJson(jsonData []byte) (metaData *OrganizationMe`
`123`	`123`
`124`	`124`	`func checkMandatoryFields(metaData *OrganizationMetaData) (err error) {`
`125`	`125`	`if metaData.daemonGroup.PaymentDetails.PaymentChannelStorageClient.Endpoints == nil {`
`126`		`- err = fmt.Errorf("Mandatory field : ETCD Client Endpoints are mising for the Group %v ", metaData.daemonGroup.GroupName)`
	`126`	`+ err = fmt.Errorf("Mandatory field : ETCD Client Endpoints are missing for the Group %v ", metaData.daemonGroup.GroupName)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if metaData.recipientPaymentAddress == (common.Address{}) {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (storage PaymentChannelStorage) Put(key PaymentChannelKey, state *Payment`
`78`	`78`	`return storage.delegate.Put(key, state)`
`79`	`79`	`}`
`80`	`80`
`81`		`-// PutIfAbsent storage payment channel by key if key is absent`
	`81`	`+// PutIfAbsent stores a payment channel by key if the key is absent`
`82`	`82`	`func (storage PaymentChannelStorage) PutIfAbsent(key PaymentChannelKey, state *PaymentChannelData) (ok bool, err error) {`
`83`	`83`	`return storage.delegate.PutIfAbsent(key, state)`
`84`	`84`	`}`
`@@ -107,7 +107,7 @@ func NewBlockchainChannelReader(processor blockchain.Processor, cfg *viper.Viper`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// GetChannelStateFromBlockchain returns channel state from Ethereum`
`110`		`-// blockchain. ok is false if channel was not found.`
	`110`	`+// blockchain. ok is false if the channel is not found.`
`111`	`111`	`func (reader BlockchainChannelReader) GetChannelStateFromBlockchain(key PaymentChannelKey) (channel *PaymentChannelData, ok bool, err error) {`
`112`	`112`	`ch, ok, err := reader.readChannelFromBlockchain(key.ID)`
`113`	`113`	`if err != nil \|\| !ok {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (h paymentChannelPaymentHandler) Payment(context handler.GrpcStreamContex`
`60`	`60`	`income.Sub(internalPayment.Amount, transaction.Channel().AuthorizedAmount)`
`61`	`61`	`e = h.incomeValidator.Validate(&IncomeStreamData{Income: income, GrpcContext: context})`
`62`	`62`	`if e != nil {`
`63`		`- //Make sure the transaction is Rolled back , else this will cause a lock on the channel`
	`63`	`+ // Make sure the transaction is rolled back, else this will cause a lock on the channel`
`64`	`64`	`transaction.Rollback()`
`65`	`65`	`return nil, paymentErrorToGrpcError(e)`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type FixedMethodPrice struct {`
`12`		`- //Service/Method is the key and value is he price`
	`12`	`+ // Service/Method is the key and value is the price`
`13`	`13`	`methodToPriceMap map[string]*big.Int`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`func (priceType FixedMethodPrice) GetPrice(GrpcContext handler.GrpcStreamContext) (price big.Int, err error) {`
`17`		`- //The returned string is in the format of "/packagename.service/method", for example /example_service.Calculator/mul`
	`17`	`+ // The returned string is in the format of "/packagename.service/method", for example /example_service.Calculator/mul`
`18`	`18`	`methodName := GrpcContext.Info.FullMethod`
`19`	`19`	`if price, ok := priceType.methodToPriceMap[methodName]; !ok {`
`20`	`20`	`return nil, fmt.Errorf("price is not defined for the Method %v", methodName)`