Merge pull request #2843 from 0chain/fix/minstake

Fix minstake
0chain · Oct 10, 2023 · d642430 · d642430
2 parents ee39d7d + 4bdc0fe
commit d642430
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 10 deletions.
diff --git a/code/go/0chain.net/miner/testdata/config/sc.yaml b/code/go/0chain.net/miner/testdata/config/sc.yaml
@@ -42,6 +42,7 @@ smart_contracts:
     # etc
     min_stake: 0.0 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate: 1
     start_rounds: 50
     contribute_rounds: 50
     share_rounds: 50
@@ -104,6 +105,7 @@ smart_contracts:
     time_unit: "720h"
     min_stake: 0.01 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate: 1
     # max_mint
     max_mint: 1500000.0 # tokens, max amount of tokens can be minted by SC
     # min possible allocations size in bytes allowed by the SC

diff --git a/code/go/0chain.net/smartcontract/benchmark/benchmark.go b/code/go/0chain.net/smartcontract/benchmark/benchmark.go
@@ -176,6 +176,7 @@ const (
 	StorageMaxCharge                    = SmartContract + StorageSc + "max_charge"
 	StorageMinStake                     = SmartContract + StorageSc + "min_stake"
 	StorageMaxStake                     = SmartContract + StorageSc + "max_stake"
+	StorageMinStakePerDelegates         = SmartContract + StorageSc + "min_stake_per_delegate"
 	StorageMaxDelegates                 = SmartContract + StorageSc + "max_delegates"
 	StorageDiverseBlobbers              = SmartContract + StorageSc + "diverse_blobbers"
 	StorageReadPoolMinLock              = SmartContract + StorageSc + "readpool.min_lock"

diff --git a/code/go/0chain.net/smartcontract/benchmark/main/config/benchmark.yaml b/code/go/0chain.net/smartcontract/benchmark/main/config/benchmark.yaml
@@ -74,6 +74,7 @@ smart_contracts:
     max_delegates: 200
     min_stake: 0.0
     max_stake: 170.0
+    min_stake_per_delegate: 1
     max_n: 7 # 100
     min_n: 3 # 3
     max_s: 2 # 30
@@ -135,6 +136,7 @@ smart_contracts:
     max_charge: 0.2
     min_stake: 0.0
     max_stake: 20000.0
+    min_stake_per_delegate: 1
     max_delegates: 200
     diverse_blobbers: false
     failed_challenges_to_cancel: 0
@@ -197,6 +199,7 @@ smart_contracts:
     min_mint: 1
     min_burn: 1
     min_stake: 0
+    min_stake_per_delegate : 1
     max_stake: 2.7
     min_lock: 0
     min_authorizers: 1

diff --git a/code/go/0chain.net/smartcontract/minersc/miner.go b/code/go/0chain.net/smartcontract/minersc/miner.go
@@ -51,6 +51,7 @@ func (msc *MinerSmartContract) AddMiner(t *transaction.Transaction,
 
 	lockAllMiners.Lock()
 	defer lockAllMiners.Unlock()
+
 	newMiner.Settings.MinStake = gn.MinStakePerDelegate
 	magicBlockMiners := balances.GetChainCurrentMagicBlock().Miners
 

diff --git a/code/go/0chain.net/smartcontract/minersc/sharder.go b/code/go/0chain.net/smartcontract/minersc/sharder.go
@@ -130,6 +130,8 @@ func (msc *MinerSmartContract) AddSharder(
 
 	newSharder.NodeType = NodeTypeSharder // set node type
 	newSharder.ProviderType = spenum.Sharder
+	newSharder.Settings.MinStake = gn.MinStakePerDelegate
+
 	exist, err := msc.getSharderNode(newSharder.ID, balances)
 	if err != nil && err != util.ErrValueNotPresent {
 		return "", common.NewErrorf("add_sharder", "unexpected error: %v", err)

diff --git a/code/go/0chain.net/smartcontract/storagesc/benchmark_tests.go b/code/go/0chain.net/smartcontract/storagesc/benchmark_tests.go
@@ -770,13 +770,14 @@ func BenchmarkTests(
 					"blobber_slash":                    "0.1",
 					"max_read_price":                   "100",
 					"max_write_price":                  "100",
-					"max_file_size":            "40000000000000",
+					"max_file_size":                    "40000000000000",
 					"challenge_enabled":                "true",
 					"challenge_generation_gap":         "1",
 					"validators_per_challenge":         "2",
 					"num_validators_rewarded":          "10",
 					"max_blobber_select_for_challenge": "5",
 					"max_delegates":                    "100",
+					"min_stake_per_delegate":           "1",
 
 					"block_reward.block_reward":     "1000",
 					"block_reward.qualifying_stake": "1",

diff --git a/code/go/0chain.net/smartcontract/storagesc/stakepool.go b/code/go/0chain.net/smartcontract/storagesc/stakepool.go
@@ -1,13 +1,12 @@
 package storagesc
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
 	"0chain.net/chaincore/state"
 	"0chain.net/smartcontract/dbs/event"
 	"0chain.net/smartcontract/stakepool/spenum"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"github.com/0chain/common/core/currency"
 
 	"0chain.net/smartcontract/stakepool"

diff --git a/code/go/0chain.net/smartcontract/zcnsc/stakepool.go b/code/go/0chain.net/smartcontract/zcnsc/stakepool.go
@@ -1,16 +1,15 @@
 package zcnsc
 
 import (
-	"errors"
-	"fmt"
-
 	cstate "0chain.net/chaincore/chain/state"
 	"0chain.net/chaincore/state"
 	"0chain.net/chaincore/transaction"
 	"0chain.net/core/common"
 	"0chain.net/core/datastore"
 	"0chain.net/smartcontract/stakepool"
 	"0chain.net/smartcontract/stakepool/spenum"
+	"errors"
+	"fmt"
 	"github.com/0chain/common/core/util"
 )
 
@@ -137,6 +136,7 @@ func (zcn *ZCNSmartContract) getOrUpdateStakePool(gn *GlobalNode,
 		sp.Settings.MaxNumDelegates = settings.MaxNumDelegates
 		changed = true
 	}
+
 	if sp.Settings.MinStake != gn.MinStakePerDelegate {
 		sp.Settings.MinStake = gn.MinStakePerDelegate
 		changed = true

diff --git a/docker.local/config/benchmark.yaml b/docker.local/config/benchmark.yaml
@@ -67,6 +67,7 @@ smart_contracts:
     max_delegates: 200
     min_stake: 0.0
     max_stake: 170.0
+    min_stake_per_delegate: 1
     max_n: 7 # 100
     min_n: 3 # 3
     max_s: 2 # 30
@@ -130,6 +131,7 @@ smart_contracts:
     max_charge: 0.2
     min_stake: 0.0
     max_stake: 20000.0
+    min_stake_per_delegate: 1
     max_delegates: 200
     diverse_blobbers: false
     failed_challenges_to_cancel: 0
@@ -192,6 +194,7 @@ smart_contracts:
     min_mint: 1
     min_burn: 1
     min_stake: 0
+    min_stake_per_delegate : 1
     max_stake: 2.7
     min_lock: 0
     min_authorizers: 1

diff --git a/docker.local/config/loadtest_benchmark.yaml b/docker.local/config/loadtest_benchmark.yaml
@@ -61,6 +61,7 @@ smart_contracts:
     max_delegates: 200
     min_stake: 0.0
     max_stake: 170.0
+    min_stake_per_delegate: 1
     max_n: 7 # 100
     min_n: 3 # 3
     max_s: 2 # 30
@@ -103,6 +104,7 @@ smart_contracts:
     max_charge: 0.2
     min_stake: 0.0
     max_stake: 20000.0
+    min_stake_per_delegate: 1
     max_delegates: 200
     diverse_blobbers: false
     failed_challenges_to_cancel: 0
@@ -156,6 +158,7 @@ smart_contracts:
     min_mint: 1
     min_burn: 1
     min_stake: 3
+    min_stake_per_delegate : 1
     min_lock: 0
     min_authorizers: 1
     percent_authorizers: 0

diff --git a/docker.local/config/sc.yaml b/docker.local/config/sc.yaml
@@ -31,6 +31,7 @@ smart_contracts:
     # etc
     min_stake: 0.0 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate: 1
     start_rounds: 50
     contribute_rounds: 50
     share_rounds: 50
@@ -92,6 +93,7 @@ smart_contracts:
     time_unit: "720h"
     min_stake: 0.01 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate: 1
     # max_mint
     max_mint: 75000000.0 # tokens, max amount of tokens can be minted by SC
     # min possible allocations size in bytes allowed by the SC
@@ -232,6 +234,7 @@ smart_contracts:
     min_mint: 1
     min_burn: 1
     min_stake: 0
+    min_stake_per_delegate : 1
     min_authorizers: 1
     percent_authorizers: 0.7
     max_delegates: 10

diff --git a/quickstart/1s_2m_4b/config/1s_2m_4b/0Chain/docker.local/config/sc.yaml b/quickstart/1s_2m_4b/config/1s_2m_4b/0Chain/docker.local/config/sc.yaml
@@ -30,6 +30,7 @@ smart_contracts:
     # etc
     min_stake: 0.0 # 0.01 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate: 1
     start_rounds: 50
     contribute_rounds: 50
     share_rounds: 50
@@ -70,6 +71,7 @@ smart_contracts:
     time_unit: '720h'
     min_stake: 0.01 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate: 1
     # max_mint
     max_mint: 4000000.0 # tokens, max amount of tokens can be minted by SC
     # min possible allocations size in bytes allowed by the SC

diff --git a/quickstart/1s_2m_4b/config/1s_2m_4b/blobber/config/0chain_blobber.yaml b/quickstart/1s_2m_4b/config/1s_2m_4b/blobber/config/0chain_blobber.yaml
@@ -36,7 +36,6 @@ challenge_completion_time: 2m # duration to complete a challenge
 # a task and redeem tokens, it should be big enough
 read_lock_timeout: 1m
 write_lock_timeout: 1m
-max_file_size: 10485760 #10MB
 
 # update_allocations_interval used to refresh known allocation objects from SC
 update_allocations_interval: 1m

diff --git a/quickstart/1s_2m_4b/config/reference/0Chain/docker.local/config/sc.yaml b/quickstart/1s_2m_4b/config/reference/0Chain/docker.local/config/sc.yaml
@@ -30,6 +30,7 @@ smart_contracts:
     # etc
     min_stake: 0.0 # 0.01 # min stake can be set by a node (boundary for all nodes)
     max_stake: 20000.0 # max stake can be set by a node (boundary for all nodes)
+    min_stake_per_delegate : 1
     start_rounds: 50
     contribute_rounds: 50
     share_rounds: 50

diff --git a/quickstart/1s_2m_4b/config/reference/blobber/config/0chain_blobber.yaml b/quickstart/1s_2m_4b/config/reference/blobber/config/0chain_blobber.yaml
@@ -36,7 +36,6 @@ challenge_completion_time: 2m # duration to complete a challenge
 # a task and redeem tokens, it should be big enough
 read_lock_timeout: 1m
 write_lock_timeout: 1m
-max_file_size: 10485760 #10MB
 
 # update_allocations_interval used to refresh known allocation objects from SC
 update_allocations_interval: 1m