razor-network
diff --git a/‎.github/workflows/develop.yml
Lines changed: 5 additions & 1 deletion b/‎.github/workflows/develop.yml
Lines changed: 5 additions & 1 deletion
diff --git a/‎addresses/testnet.json
Lines changed: 11 additions & 11 deletions b/‎addresses/testnet.json
Lines changed: 11 additions & 11 deletions
diff --git a/‎cache/collectionCache.go
Lines changed: 34 additions & 0 deletions b/‎cache/collectionCache.go
Lines changed: 34 additions & 0 deletions
diff --git a/‎cache/jobCache.go
Lines changed: 34 additions & 0 deletions b/‎cache/jobCache.go
Lines changed: 34 additions & 0 deletions
diff --git a/‎cmd/addStake_test.go
Lines changed: 1 addition & 13 deletions b/‎cmd/addStake_test.go
Lines changed: 1 addition & 13 deletions
diff --git a/‎cmd/approve_test.go
Lines changed: 1 addition & 13 deletions b/‎cmd/approve_test.go
Lines changed: 1 addition & 13 deletions
diff --git a/‎cmd/claimBounty_test.go
Lines changed: 1 addition & 7 deletions b/‎cmd/claimBounty_test.go
Lines changed: 1 addition & 7 deletions
diff --git a/‎cmd/claimCommission_test.go
Lines changed: 1 addition & 7 deletions b/‎cmd/claimCommission_test.go
Lines changed: 1 addition & 7 deletions
@@ -3,6 +3,9 @@ on:
   push:
     branches:
       - "develop"
+  pull_request:
+    branches:
+      - "feature/*"
 
 jobs:
   test:
@@ -58,7 +61,7 @@ jobs:
           golangci-lint run -v --timeout 5m
       - name: Execute test case
         run: |
-          go-acc ./... --ignore razor/accounts/mocks --ignore razor/cmd/mocks --ignore razor/utils/mocks --ignore pkg --ignore razor/path/mocks --output coverage.txt
+          go-acc ./... --ignore razor/accounts/mocks --ignore razor/cmd/mocks --ignore razor/cmd/eventListeners.go --ignore razor/utils/mocks --ignore pkg --ignore razor/path/mocks --output coverage.txt
       - name: Run benchmarks
         run: |
           go test ./... -bench=. -run=^#
@@ -71,6 +74,7 @@ jobs:
           action: persist
 
   push-docker-build:
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/develop')
     runs-on: ubuntu-latest
     needs: test
     steps:
 
@@ -1,12 +1,12 @@
 {
-    "Governance": "0xD2A74B7A962FFc85827da0124A4278e731D15464",
-    "BlockManager": "0x096e44B0d8b68376C8Efe40F28C3857951f03069",
-    "CollectionManager": "0x3b76eB8c0282dAf531D7C507E4f3143A9A9c38b1",
-    "StakeManager": "0x9f55a2C6C1F1Be8B01562cEae2df2F22931C7a46",
-    "RewardManager": "0x07875369943951b1Af9c37f4ea137dcED9d9181d",
-    "VoteManager": "0x11995b74D6d07a6Edc05653a71F3e8B3354caBF0",
-    "Delegator": "0xe295863DF95AaAeC66E7de11D3aD0C35698d0fE9",
-    "RAZOR": "0x4500E10fEb89e46E9fb642D0c62b1a761278155D",
-    "StakedTokenFactory": "0xe20e11687F269fE9e356da92C4B15aBF98BbC9ff",
-    "RandomNoManager": "0x31463bC4D5E67Bca623fFc6152D253Ea17216fA9"
-  }
+    "Governance": "0x6aC4BbACE4E38B085BA82bDA5477cc85222C2B40",
+    "BlockManager": "0x39D4B78bb09DEEC54fA2df729808b19962Cb9aae",
+    "CollectionManager": "0x7B8BF9a0B648Dd9f75D5E9e8a3054D18E8C4Cc5e",
+    "StakeManager": "0x432bDa6F3E5148898929be9d3555Ca5AA82b214b",
+    "RewardManager": "0x09FF6AB6F720F9866fe7b782566448E853c1F306",
+    "VoteManager": "0x86886e048fd0f253E6E75c13a3f924598799e06A",
+    "Delegator": "0x5755d776F77bF88d226EEEe0bA7f337F49Ac7FaE",
+    "RAZOR": "0xbF3BCf61f64C9825C7Af3f3D79817c9Cf44afBa7",
+    "StakedTokenFactory": "0x5008862c54ff6fae663Acd36E52D4614DcaF4329",
+    "RandomNoManager": "0x1495Ab19E7937e4259e3C292D906bB2e6302802f"
+}
@@ -0,0 +1,34 @@
+package cache
+
+import (
+	"razor/pkg/bindings"
+	"sync"
+)
+
+// CollectionsCacheStruct struct to hold collection cache and associated mutex
+type CollectionsCacheStruct struct {
+	Collections map[uint16]bindings.StructsCollection
+	Mu          sync.RWMutex
+}
+
+// CollectionsCache Global instances of CollectionsCacheStruct directly initialized
+var CollectionsCache = CollectionsCacheStruct{
+	Collections: make(map[uint16]bindings.StructsCollection),
+	Mu:          sync.RWMutex{},
+}
+
+func GetCollectionFromCache(collectionId uint16) (bindings.StructsCollection, bool) {
+	CollectionsCache.Mu.RLock() // Use read lock for concurrency safety
+	defer CollectionsCache.Mu.RUnlock()
+
+	collection, exists := CollectionsCache.Collections[collectionId]
+	return collection, exists
+}
+
+func UpdateCollectionCache(collectionId uint16, updatedCollection bindings.StructsCollection) {
+	CollectionsCache.Mu.Lock()
+	defer CollectionsCache.Mu.Unlock()
+
+	// Update or add the collection in the cache with the new data
+	CollectionsCache.Collections[collectionId] = updatedCollection
+}
@@ -0,0 +1,34 @@
+package cache
+
+import (
+	"razor/pkg/bindings"
+	"sync"
+)
+
+// JobsCacheStruct struct to hold job cache and associated mutex
+type JobsCacheStruct struct {
+	Jobs map[uint16]bindings.StructsJob
+	Mu   sync.RWMutex
+}
+
+// JobsCache Global instance of JobsCacheStruct directly initialized
+var JobsCache = JobsCacheStruct{
+	Jobs: make(map[uint16]bindings.StructsJob),
+	Mu:   sync.RWMutex{},
+}
+
+func GetJobFromCache(jobId uint16) (bindings.StructsJob, bool) {
+	JobsCache.Mu.RLock() // Use read lock for concurrency safety
+	defer JobsCache.Mu.RUnlock()
+
+	job, exists := JobsCache.Jobs[jobId]
+	return job, exists
+}
+
+func UpdateJobCache(jobId uint16, updatedJob bindings.StructsJob) {
+	JobsCache.Mu.Lock()
+	defer JobsCache.Mu.Unlock()
+
+	// Update or add the job in the cache with the new data
+	JobsCache.Jobs[jobId] = updatedJob
+}
@@ -1,17 +1,13 @@
 package cmd
 
 import (
-	"crypto/ecdsa"
-	"crypto/rand"
 	"errors"
-	"github.com/ethereum/go-ethereum/crypto"
 	"math/big"
 	"razor/core"
 	"razor/core/types"
 	"razor/pkg/bindings"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	Types "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -20,17 +16,12 @@ import (
 )
 
 func TestStakeCoins(t *testing.T) {
-
-	privateKey, _ := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
-	txnOpts, _ := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(31337))
-
 	txnArgs := types.TransactionOptions{
 		Amount: big.NewInt(10000),
 	}
 
 	type args struct {
 		txnArgs     types.TransactionOptions
-		txnOpts     *bind.TransactOpts
 		epoch       uint32
 		getEpochErr error
 		stakeTxn    *Types.Transaction
@@ -49,7 +40,6 @@ func TestStakeCoins(t *testing.T) {
 				txnArgs: types.TransactionOptions{
 					Amount: big.NewInt(1000),
 				},
-				txnOpts:     txnOpts,
 				epoch:       2,
 				getEpochErr: nil,
 				stakeTxn:    &Types.Transaction{},
@@ -65,7 +55,6 @@ func TestStakeCoins(t *testing.T) {
 				txnArgs: types.TransactionOptions{
 					Amount: big.NewInt(1000),
 				},
-				txnOpts:     txnOpts,
 				epoch:       2,
 				getEpochErr: errors.New("waitForAppropriateState error"),
 				stakeTxn:    &Types.Transaction{},
@@ -81,7 +70,6 @@ func TestStakeCoins(t *testing.T) {
 				txnArgs: types.TransactionOptions{
 					Amount: big.NewInt(1000),
 				},
-				txnOpts:     txnOpts,
 				epoch:       2,
 				getEpochErr: nil,
 				stakeTxn:    &Types.Transaction{},
@@ -96,7 +84,7 @@ func TestStakeCoins(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			SetUpMockInterfaces()
 			utilsMock.On("GetEpoch", mock.AnythingOfType("*ethclient.Client")).Return(tt.args.epoch, tt.args.getEpochErr)
-			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(txnOpts)
+			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(TxnOpts)
 			transactionMock.On("Hash", mock.Anything).Return(tt.args.hash)
 			stakeManagerMock.On("Stake", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.args.stakeTxn, tt.args.stakeErr)
 
 
@@ -2,13 +2,10 @@ package cmd
 
 import (
 	"context"
-	"crypto/ecdsa"
-	"crypto/rand"
 	"errors"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	Types "github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/mock"
 	"math/big"
 	"razor/core"
@@ -17,14 +14,9 @@ import (
 )
 
 func TestApprove(t *testing.T) {
-
-	privateKey, _ := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
-	txnOpts, _ := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(1))
-
 	type args struct {
 		txnArgs         types.TransactionOptions
 		callOpts        bind.CallOpts
-		transactOpts    *bind.TransactOpts
 		allowanceAmount *big.Int
 		allowanceError  error
 		approveTxn      *Types.Transaction
@@ -50,7 +42,6 @@ func TestApprove(t *testing.T) {
 					BlockNumber: big.NewInt(1),
 					Context:     context.Background(),
 				},
-				transactOpts:    txnOpts,
 				allowanceAmount: big.NewInt(0),
 				allowanceError:  nil,
 				approveTxn:      &Types.Transaction{},
@@ -72,7 +63,6 @@ func TestApprove(t *testing.T) {
 					BlockNumber: big.NewInt(1),
 					Context:     context.Background(),
 				},
-				transactOpts:    txnOpts,
 				allowanceAmount: big.NewInt(10000),
 				allowanceError:  nil,
 				approveTxn:      &Types.Transaction{},
@@ -94,7 +84,6 @@ func TestApprove(t *testing.T) {
 					BlockNumber: big.NewInt(1),
 					Context:     context.Background(),
 				},
-				transactOpts:    txnOpts,
 				allowanceAmount: big.NewInt(0),
 				allowanceError:  errors.New("allowance error"),
 				approveTxn:      &Types.Transaction{},
@@ -117,7 +106,6 @@ func TestApprove(t *testing.T) {
 					BlockNumber: big.NewInt(1),
 					Context:     context.Background(),
 				},
-				transactOpts:    txnOpts,
 				allowanceAmount: big.NewInt(0),
 				allowanceError:  nil,
 				approveTxn:      &Types.Transaction{},
@@ -133,7 +121,7 @@ func TestApprove(t *testing.T) {
 			SetUpMockInterfaces()
 
 			utilsMock.On("GetOptions").Return(tt.args.callOpts)
-			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(txnOpts)
+			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(TxnOpts)
 			transactionMock.On("Hash", mock.Anything).Return(tt.args.hash)
 			tokenManagerMock.On("Allowance", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.args.allowanceAmount, tt.args.allowanceError)
 			tokenManagerMock.On("Approve", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.args.approveTxn, tt.args.approveError)
 
@@ -1,10 +1,7 @@
 package cmd
 
 import (
-	"crypto/ecdsa"
-	"crypto/rand"
 	"errors"
-	"github.com/ethereum/go-ethereum/crypto"
 	"io/fs"
 	"math/big"
 	"razor/cmd/mocks"
@@ -148,9 +145,6 @@ func TestExecuteClaimBounty(t *testing.T) {
 }
 
 func TestClaimBounty(t *testing.T) {
-	privateKey, _ := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
-	txnOpts, _ := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(1))
-
 	var config types.Configurations
 	var client *ethclient.Client
 	var bountyInput types.RedeemBountyInput
@@ -273,7 +267,7 @@ func TestClaimBounty(t *testing.T) {
 			stakeManagerMock.On("GetBountyLock", mock.AnythingOfType("*ethclient.Client"), mock.AnythingOfType("*bind.CallOpts"), mock.AnythingOfType("uint32")).Return(tt.args.bountyLock, tt.args.bountyLockErr)
 			timeMock.On("Sleep", mock.AnythingOfType("time.Duration")).Return()
 			utilsMock.On("CalculateBlockTime", mock.AnythingOfType("*ethclient.Client")).Return(blockTime)
-			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(txnOpts)
+			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(TxnOpts)
 			stakeManagerMock.On("RedeemBounty", mock.AnythingOfType("*ethclient.Client"), mock.AnythingOfType("*bind.TransactOpts"), mock.AnythingOfType("uint32")).Return(tt.args.redeemBountyTxn, tt.args.redeemBountyErr)
 			utilsMock.On("SecondsToReadableTime", mock.AnythingOfType("int")).Return(tt.args.time)
 			transactionUtilsMock.On("Hash", mock.Anything).Return(tt.args.hash)
 
@@ -1,10 +1,7 @@
 package cmd
 
 import (
-	"crypto/ecdsa"
-	"crypto/rand"
 	"errors"
-	"github.com/ethereum/go-ethereum/crypto"
 	"math/big"
 	"razor/core/types"
 	"testing"
@@ -22,9 +19,6 @@ func TestClaimCommission(t *testing.T) {
 	var flagSet *pflag.FlagSet
 	var callOpts bind.CallOpts
 
-	privateKey, _ := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
-	txnOpts, _ := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(31337))
-
 	type args struct {
 		config        types.Configurations
 		configErr     error
@@ -209,7 +203,7 @@ func TestClaimCommission(t *testing.T) {
 			utilsMock.On("AssignPassword", mock.AnythingOfType("*pflag.FlagSet")).Return(tt.args.password)
 			utilsMock.On("CheckPassword", mock.Anything, mock.Anything).Return(nil)
 			utilsMock.On("ConnectToClient", mock.AnythingOfType("string")).Return(client)
-			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(txnOpts)
+			utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(TxnOpts)
 			utilsMock.On("WaitForBlockCompletion", mock.AnythingOfType("*ethclient.Client"), mock.Anything).Return(nil)
 
 			stakeManagerMock.On("StakerInfo", mock.AnythingOfType("*ethclient.Client"), mock.AnythingOfType("*bind.CallOpts"), mock.AnythingOfType("uint32")).Return(tt.args.stakerInfo, tt.args.stakerInfoErr)