razor-network
diff --git a/‎.github/CONTRIBUTING.md
Lines changed: 2 additions & 2 deletions b/‎.github/CONTRIBUTING.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 36 additions & 0 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 36 additions & 0 deletions
diff --git a/‎.github/workflows/go.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/go.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎Makefile
Lines changed: 4 additions & 2 deletions b/‎Makefile
Lines changed: 4 additions & 2 deletions
diff --git a/‎README.md
Lines changed: 43 additions & 22 deletions b/‎README.md
Lines changed: 43 additions & 22 deletions
diff --git a/‎accounts/accounts.go
Lines changed: 3 additions & 1 deletion b/‎accounts/accounts.go
Lines changed: 3 additions & 1 deletion
diff --git a/‎cmd/addJobToCollection.go
Lines changed: 18 additions & 28 deletions b/‎cmd/addJobToCollection.go
Lines changed: 18 additions & 28 deletions
diff --git a/‎cmd/approve.go
Lines changed: 28 additions & 0 deletions b/‎cmd/approve.go
Lines changed: 28 additions & 0 deletions
@@ -13,13 +13,13 @@ We use github to host code, to track issues and feature requests, as well as acc
 ## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
 Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
 
-1. Fork the repo and create your branch from `main`.
+1. Fork the repo and create your branch from `develop`.
 2. If you've added code that should be tested, add tests.
 3. If you've changed commands, update the documentation.
 4. Ensure the test suite passes.
 5. Issue that pull request!
 
-PS: make sure that your commits are [signed](https://docs.github.com/en/github/authenticating-to-github/managing-commit-signature-verification/about-commit-signature-verification). Only signed commits can be merged to the `main` branch.
+PS: make sure that your commits are [signed](https://docs.github.com/en/github/authenticating-to-github/managing-commit-signature-verification/about-commit-signature-verification). Only signed commits can be merged to the `develop` branch.
 
 ## Report bugs using Github's [issues](https://github.com/razor-network/razor-go/issues)
 If you've found something wrong we want to know about it, please help us understand the problem so we can resolve it.
 
@@ -0,0 +1,36 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B
+
+**Test Configuration**:
+* Contracts version:
+* Hardware:
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules
@@ -2,10 +2,10 @@ name: Go
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
     tags: [ v* ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 jobs:
 
 
@@ -5,13 +5,15 @@ RAZOR = ${BIN_DIR}/razor
 
 all: fetch_bindings install_razor set_config
 build: install_razor set_config
-docker-build: fetch_bindings install_razor
+build-noargs: fetch_bindings install_razor
 setup: fetch_bindings
 
 fetch_bindings:
 	@echo "Installing contract dependencies..."
+	@echo ""
 	@${SHELL} generate-bindings.sh
-	@echo "Contract bindings generated....\n"
+	@echo "Contract bindings generated...."
+	@echo ""
 
 install_razor:
 	@echo "Installing razor node...."
 
@@ -168,9 +168,40 @@ Example:
 $ ./razor transfer --amount 100 --to 0x91b1E6488307450f4c0442a1c35Bc314A505293e --from 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c
 ```
 
+### Set Config
+There are a set of parameters that are configurable. These include:
+
+* Provider: The RPC URL of the provider you are using to connect to the blockchain.
+* Gas Multiplier: The value with which the gas price will be multiplied while sending every transaction.
+* Buffer Size: Buffer size determines, out of all blocks in a state, in how many blocks the voting or any other operation can be performed.
+* Wait Time: This is the number of blocks the system will wait while voting.
+* Gas Price: The value of gas price if you want to set manually. If you don't provide any value or simply keep it to 0, the razor client will automatically calculate the optimum gas price and send it.
+* Log Level: Normally debug logs are not logged into the log file. But if you want you can set `logLevel` to `debug` and fetch the debug logs.
+
+The config is set while the build is generated, but if you need to change any of the above parameter, you can use the `setConfig` command.
+
+```
+$ ./razor setConfig --provider <rpc_provider> --gasmultiplier <multiplier_value> --buffer <buffer_percentage> --wait <wait_for_n_blocks> --gasprice <gas_price> --logLevel <debug_or_info>
+```
+
+Example:
+```
+$ ./razor setConfig --provider https://infura/v3/matic --gasmultiplier 1.5 --buffer 20 --wait 70 --gasprice 1 --logLevel debug
+```
+
+Other than setting these parameters in the config, you can use different values of these parameters in different command. Just add the same flag to any command you want to use and the new config changes will appear for that command.
+
+Example:
+```
+$ ./razor vote --address 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c --gasprice 10 
+```
+This will cause this particular vote command to run with a gas price of 10.
+
+
 ### Create Job
-You can create new jobs using `creteJob` command. This command will work only for admins.
+Create new jobs using `creteJob` command. 
 
+_Note: This command is restricted to "Admin Role"_
 ```
 $ ./razor createJob --url <URL> --selector <selector_in_json_selector_format> --name <name> --address <address> --repeat <true_or_false>
 ```
@@ -185,7 +216,9 @@ $  ./razor createJob --address 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c -n eth
 ```
 
 ### Create Collection
-You can create new collections using `creteCollection` command. This command will work only for admins.
+Create new collections using `creteCollection` command.
+
+_Note: This command is restricted to "Admin Role"_
 
 ```
 $ ./razor createCollection --name <collection_name> --address <address> --jobIds <list_of_job_ids> --aggregation <aggregation_method>
@@ -197,7 +230,9 @@ $ ./razor createCollection --name btcCollectionMean --address 0x5a0b54d5dc17e0aa
 ```
 
 ### Add Job to Collection
-You can add existing jobs to existing collections using `addJobToCollection` command. This command will work only for admins.
+Add existing jobs to existing collections using `addJobToCollection` command.
+
+_Note: This command is restricted to "Admin Role"_
 
 ```
 $ ./razor addJobToCollection --address <address> --jobId <job_id> --collectionId <collection_id>
@@ -208,33 +243,19 @@ Example:
 $ ./razor addJobToCollection --address 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c --collectionId 6 --jobId 7
 ```
 
-### Set Config
-There are a set of parameters that are configurable. These include:
-
-* Provider: The RPC URL of the provider you are using to connect to the blockchain.
-* Gas Multiplier: The value with which the gas price will be multiplied while sending every transaction.
-* Buffer Size: Buffer size determines, out of all blocks in a state, in how many blocks the voting or any other operation can be performed.
-* Wait Time: This is the number of blocks the system will wait while voting.
-* Gas Price: The value of gas price if you want to set manually. If you don't provide any value or simply keep it to 0, the razor client will automatically calculate the optimum gas price and send it.
-
-The config is set while the build is generated, but if you need to change any of the above parameter, you can use the `setconfig` command.
+### Modify Asset Status
+Modify the active status of an asset using the `modifyAssetStatus` command.
 
-```
-$ ./razor setconfig --provider <rpc_provider> --gasmultiplier <multiplier_value> --buffer <buffer_percentage> --wait <wait_for_n_blocks> --gasprice <gas_price>
-```
+_Note: This command is restricted to "Admin Role"_
 
-Example:
 ```
-$ ./razor setconfig --provider https://infura/v3/matic --gasmultiplier 1.5 --buffer 20 --wait 70 --gasprice 1
+$ ./razor modifyAssetStatus --assetId <assetId> --address <address> --status <true_or_false>
 ```
 
-Other than setting these parameters in the config, you can use different values of these parameters in different command. Just add the same flag to any command you want to use and the new config changes will appear for that command.
-
 Example:
 ```
-$ ./razor vote --address 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c --gasprice 10 
+$ ./razor modifyAssetStatus --assetId 1 --address 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c --status false
 ```
-This will cause this particular vote command to run with a gas price of 10.
 
 ### Contribute to razor-go 
 We would really appreciate your contribution. To see our [contribution guideline](https://github.com/razor-network/razor-go/blob/main/.github/CONTRIBUTING.md)
@@ -5,12 +5,14 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/crypto"
-	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"razor/core/types"
+	"razor/logger"
 	"strings"
 )
 
+var log = logger.NewLogger()
+
 func CreateAccount(path string, password string) accounts.Account {
 	ks := keystore.NewKeyStore(path, keystore.StandardScryptN, keystore.StandardScryptP)
 	accounts.NewManager(&accounts.Config{InsecureUnlockAllowed: false}, ks)
 
@@ -1,25 +1,24 @@
 package cmd
 
 import (
-	log "github.com/sirupsen/logrus"
-	"math/big"
 	"razor/core"
 	"razor/core/types"
 	"razor/utils"
 
 	"github.com/spf13/cobra"
 )
 
-// addJobToCollectionCmd represents the addJobToCollection command
 var addJobToCollectionCmd = &cobra.Command{
 	Use:   "addJobToCollection",
-	Short: "A brief description of your command",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
+	Short: "addJobToCollection can be used to add a particular job to an existing collection",
+	Long: `If there are existing jobs and collections, this command can be used to add a job to a collection.
 
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+Example: 
+  ./razor addJobToCollection --address 0x5a0b54d5dc17e0aadc383d2db43b0a0d3e029c4c --collectionId 6 --jobId 7 
+
+Note: 
+  This command only works for the admin.
+`,
 	Run: func(cmd *cobra.Command, args []string) {
 		config, err := GetConfigData()
 		if err != nil {
@@ -29,21 +28,11 @@ to quickly create a Cobra application.`,
 		password := utils.PasswordPrompt()
 
 		address, _ := cmd.Flags().GetString("address")
-		jobId, _ := cmd.Flags().GetString("jobId")
-		collectionId, _ := cmd.Flags().GetString("collectionId")
+		jobId, _ := cmd.Flags().GetUint8("jobId")
+		collectionId, _ := cmd.Flags().GetUint8("collectionId")
 
 		client := utils.ConnectToClient(config.Provider)
 
-		jobIdInBigInt, ok := new(big.Int).SetString(jobId, 10)
-		if !ok {
-			log.Fatal("SetString: error")
-		}
-
-		collectionIdInBigInt, ok := new(big.Int).SetString(collectionId, 10)
-		if !ok {
-			log.Fatal("SetString: error")
-		}
-
 		txnOpts := utils.GetTxnOpts(types.TransactionOptions{
 			Client:         client,
 			Password:       password,
@@ -53,11 +42,12 @@ to quickly create a Cobra application.`,
 		})
 
 		assetManager := utils.GetAssetManager(client)
-		log.Infof("Adding Job %s to collection %s", jobIdInBigInt, collectionIdInBigInt)
-		txn, err := assetManager.AddJobToCollection(txnOpts, collectionIdInBigInt, jobIdInBigInt)
+		log.Infof("Adding Job %d to collection %d", jobId, collectionId)
+		txn, err := assetManager.AddJobToCollection(txnOpts, collectionId, jobId)
 		if err != nil {
 			log.Fatal(err)
 		}
+		log.Info("Txn Hash: ", txn.Hash())
 		utils.WaitForBlockCompletion(client, txn.Hash().String())
 	},
 }
@@ -67,13 +57,13 @@ func init() {
 
 	var (
 		Account      string
-		JobId        string
-		CollectionId string
+		JobId        uint8
+		CollectionId uint8
 	)
 
-	addJobToCollectionCmd.Flags().StringVarP(&Account, "address", "", "", "address of the job creator")
-	addJobToCollectionCmd.Flags().StringVarP(&JobId, "jobId", "", "", "job id to add to the  collection")
-	addJobToCollectionCmd.Flags().StringVarP(&CollectionId, "collectionId", "", "", "collection id")
+	addJobToCollectionCmd.Flags().StringVarP(&Account, "address", "a", "", "address of the job creator")
+	addJobToCollectionCmd.Flags().Uint8VarP(&JobId, "jobId", "", 0, "job id to add to the  collection")
+	addJobToCollectionCmd.Flags().Uint8VarP(&CollectionId, "collectionId", "", 0, "collection id")
 
 	addrErr := addJobToCollectionCmd.MarkFlagRequired("address")
 	utils.CheckError("Address error: ", addrErr)
 
@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+	"razor/core"
+	"razor/core/types"
+)
+
+func approve(txnArgs types.TransactionOptions, razorUtils utilsInterface, tokenManagerUtils tokenManagerInterface, transactionUtils transactionInterface) (common.Hash, error) {
+	opts := razorUtils.GetOptions(false, txnArgs.AccountAddress, "")
+	allowance, err := tokenManagerUtils.Allowance(txnArgs.Client, &opts, common.HexToAddress(txnArgs.AccountAddress), common.HexToAddress(core.StakeManagerAddress))
+	if err != nil {
+		return common.Hash{0x00}, err
+	}
+	if allowance.Cmp(txnArgs.Amount) >= 0 {
+		log.Debug("Sufficient allowance, no need to increase")
+		return common.Hash{0x00}, nil
+	} else {
+		log.Info("Sending Approve transaction...")
+		txnOpts := razorUtils.GetTxnOpts(txnArgs)
+		txn, err := tokenManagerUtils.Approve(txnArgs.Client, txnOpts, common.HexToAddress(core.StakeManagerAddress), txnArgs.Amount)
+		if err != nil {
+			return common.Hash{0x00}, err
+		}
+		log.Info("Txn Hash: ", transactionUtils.Hash(txn))
+		return transactionUtils.Hash(txn), nil
+	}
+}