Update contracts (#66)

* Update razor network version

* package lock

* Update schelling coin to razor

* Fix for latest contracts

* Update npm version

Author: SkandaBhat

core/constants.go

@@ -4,7 +4,7 @@ import "math/big"
 
 //TODO: Change these addresses to the deployed address.
 var StakeManagerAddress = "0xBfBA8b5F2CaD3Fdd82893BECDBfb0193C878CED6"
-var SchellingCoinAddress = "0x1Ca31A8832c532DD22AcFB0a3cf7b9F87F4574e6"
+var RAZORAddress = "0x1Ca31A8832c532DD22AcFB0a3cf7b9F87F4574e6"
 var ParametersAddress = "0x1B08F228697A195fB0406A8EB24C3A4E35209c1A"
 var AssetManagerAddress = "0xC5edba1DdA6FF3D7682284Da6eeb65b793704a5c"
 var VoteManagerAddress = "0xA47b2F152628E2865A42153d59dFa4336E94be50"

core/types/contract.go

@@ -13,9 +13,8 @@ type Job struct {
 	Selector  string
 	Name      string
 	Repeat    bool
+	Active    bool
 	Creator   common.Address
-	Credit    *big.Int
-	Fulfilled bool
 	Result    *big.Int
 	AssetType *big.Int
 }

generate-bindings.sh

@@ -28,7 +28,7 @@ contracts=(
   "AssetManager assetManager.go"
   "AssetStorage assetStorage.go"
   "Random random.go"
-  "SchellingCoin schellingCoin.go"
+  "RAZOR RAZOR.go"
   "StakeManager stakeManager.go"
   "StakeStorage stakeStorage.go"
   "VoteManager voteManager.go"

package-lock.json

@@ -19,6 +19,6 @@
   },
   "homepage": "https://github.com/ashish10677/go-cli#readme",
   "dependencies": {
-    "@razor-network/contracts": "^0.1.0"
+    "@razor-network/contracts": "^0.1.1"
   }
 }

package.json

@@ -57,14 +57,15 @@ func GetActiveJob(client *ethclient.Client, address string, jobId *big.Int) (typ
 	assetManager := GetAssetManager(client)
 	callOpts := GetOptions(false, address, "")
 	epoch, err := GetEpoch(client, address)
+
 	if err != nil {
 		return types.Job{}, err
 	}
 	job, err := assetManager.Jobs(&callOpts, jobId)
 	if err != nil {
 		return types.Job{}, err
 	}
-	if !job.Fulfilled && job.Epoch.Cmp(epoch) < 0 {
+	if job.Active && job.Epoch.Cmp(epoch) < 0 {
 		return job, nil
 	}
 	return types.Job{}, errors.New("job already fulfilled")

utils/asset.go

@@ -11,8 +11,8 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 )
 
-func GetTokenManager(client *ethclient.Client) *bindings.SchellingCoin {
-	coinContract, err := bindings.NewSchellingCoin(common.HexToAddress(core.SchellingCoinAddress), client)
+func GetTokenManager(client *ethclient.Client) *bindings.RAZOR {
+	coinContract, err := bindings.NewRAZOR(common.HexToAddress(core.RAZORAddress), client)
 	if err != nil {
 		log.Fatal(err)
 	}