L1-chain

.gitmodules

@@ -2,6 +2,6 @@
 	path = tests/tests
 	url = https://github.com/ethereum/tests.git
 	shallow = true
-[submodule "core-contracts"]
-	path = core-contracts
-	url = https://github.com/0xPolygon/core-contracts
+[submodule "blade-contracts"]
+	path = blade-contracts
+	url = https://github.com/Ethernal-Tech/blade-contracts

Makefile

@@ -82,9 +82,9 @@ test-property-polybft: check-go
 	env EDGE_BINARY=${PWD}/artifacts/blade E2E_TESTS=true E2E_LOGS=true go test -v -timeout=30m ./e2e-polybft/property/... \
 	-rapid.checks=10
 
-.PHONY: compile-core-contracts
-compile-core-contracts: check-npm
-	cd core-contracts && npm install && npm run compile
+.PHONY: compile-blade-contracts
+compile-blade-contracts: check-npm
+	cd blade-contracts && npm install && npm run compile
 	$(MAKE) generate-smart-contract-bindings
 
 .PHONY: generate-smart-contract-bindings
@@ -118,7 +118,7 @@ help:
 	@printf "  %-35s - %s\n" "test-e2e" "Run end-to-end tests"
 	@printf "  %-35s - %s\n" "test-e2e-polybft" "Run end-to-end tests for PolyBFT"
 	@printf "  %-35s - %s\n" "test-property-polybft" "Run property tests for PolyBFT"
-	@printf "  %-35s - %s\n" "compile-core-contracts" "Compile core contracts"
+	@printf "  %-35s - %s\n" "compile-blade-contracts" "Compile blade contracts"
 	@printf "  %-35s - %s\n" "generate-smart-contract-bindings" "Generate smart contract bindings"
 	@printf "  %-35s - %s\n" "run-docker" "Run Docker cluster for PolyBFT"
 	@printf "  %-35s - %s\n" "stop-docker" "Stop Docker cluster for PolyBFT"

command/genesis/genesis.go

@@ -64,6 +64,16 @@ func setFlags(cmd *cobra.Command) {
 		),
 	)
 
+	cmd.Flags().StringArrayVar(
+		&params.stake,
+		stakeFlag,
+		[]string{},
+		fmt.Sprintf(
+			"the staked accounts and balances (format: <address>[:<balance>]). Default staked balance: %d",
+			command.DefaultStake,
+		),
+	)
+
 	cmd.Flags().Uint64Var(
 		&params.blockGasLimit,
 		blockGasLimitFlag,

command/genesis/params.go

@@ -27,6 +27,7 @@ const (
 	dirFlag                      = "dir"
 	nameFlag                     = "name"
 	premineFlag                  = "premine"
+	stakeFlag                    = "stake"
 	chainIDFlag                  = "chain-id"
 	epochSizeFlag                = "epoch-size"
 	epochRewardFlag              = "epoch-reward"
@@ -71,6 +72,7 @@ type genesisParams struct {
 	name         string
 	consensusRaw string
 	premine      []string
+	stake        []string
 	bootnodes    []string
 
 	chainID   uint64
@@ -128,6 +130,7 @@ type genesisParams struct {
 	nativeTokenConfig    *polybft.TokenConfig
 
 	premineInfos []*helper.PremineInfo
+	stakeInfos   map[types.Address]*big.Int
 
 	// rewards
 	rewardTokenCode string
@@ -159,6 +162,10 @@ func (p *genesisParams) validateFlags() error {
 		return err
 	}
 
+	if err := p.parseStakeInfo(); err != nil {
+		return err
+	}
+
 	if p.isPolyBFTConsensus() {
 		if err := p.extractNativeTokenMetadata(); err != nil {
 			return err
@@ -519,6 +526,21 @@ func (p *genesisParams) parsePremineInfo() error {
 	return nil
 }
 
+func (p *genesisParams) parseStakeInfo() error {
+	p.stakeInfos = make(map[types.Address]*big.Int, len(p.stake))
+
+	for _, stake := range p.stake {
+		stakeInfo, err := helper.ParsePremineInfo(stake)
+		if err != nil {
+			return fmt.Errorf("invalid stake balance amount provided: %w", err)
+		}
+
+		p.stakeInfos[stakeInfo.Address] = stakeInfo.Amount
+	}
+
+	return nil
+}
+
 // validatePremineInfo validates whether reserve account (0x0 address) is premined
 func (p *genesisParams) validatePremineInfo() error {
 	for _, premineInfo := range p.premineInfos {

command/genesis/polybft_params.go

@@ -365,6 +365,10 @@ func (p *genesisParams) deployContracts(
 			artifact: contractsapi.RewardPool,
 			address:  contracts.RewardPoolContractV1,
 		},
+		{
+			artifact: contractsapi.StakeManager,
+			address:  contracts.StakeManagerContract,
+		},
 	}
 
 	if !params.nativeTokenConfig.IsMintable {
@@ -528,7 +532,7 @@ func (p *genesisParams) getValidatorAccounts() ([]*validator.GenesisValidator, e
 				MultiAddr: parts[0],
 				Address:   addr,
 				BlsKey:    trimmedBLSKey,
-				Stake:     big.NewInt(0),
+				Stake:     p.stakeInfos[addr],
 			}
 		}
 
@@ -540,7 +544,7 @@ func (p *genesisParams) getValidatorAccounts() ([]*validator.GenesisValidator, e
 		validatorsPath = path.Dir(p.genesisPath)
 	}
 
-	validators, err := ReadValidatorsByPrefix(validatorsPath, p.validatorsPrefixPath)
+	validators, err := ReadValidatorsByPrefixStakeInfos(validatorsPath, p.validatorsPrefixPath, p.stakeInfos)
 	if err != nil {
 		return nil, err
 	}

command/genesis/utils.go

@@ -246,6 +246,35 @@ func ReadValidatorsByPrefix(dir, prefix string) ([]*validator.GenesisValidator,
 	return validators, nil
 }
 
+// ReadValidatorsByPrefix reads validators secrets on a given root directory and with given folder prefix
+func ReadValidatorsByPrefixStakeInfos(dir, prefix string,
+	stakeInfos map[types.Address]*big.Int) ([]*validator.GenesisValidator, error) {
+	validatorKeyFiles, err := GetValidatorKeyFiles(dir, prefix)
+	if err != nil {
+		return nil, err
+	}
+
+	validators := make([]*validator.GenesisValidator, len(validatorKeyFiles))
+
+	for i, file := range validatorKeyFiles {
+		path := filepath.Join(dir, file)
+
+		account, nodeID, err := getSecrets(path)
+		if err != nil {
+			return nil, err
+		}
+
+		validators[i] = &validator.GenesisValidator{
+			Address:   types.Address(account.Ecdsa.Address()),
+			BlsKey:    hex.EncodeToString(account.Bls.PublicKey().Marshal()),
+			MultiAddr: fmt.Sprintf("/ip4/%s/tcp/%d/p2p/%s", "127.0.0.1", bootnodePortStart+int64(i), nodeID),
+			Stake:     stakeInfos[types.Address(account.Ecdsa.Address())],
+		}
+	}
+
+	return validators, nil
+}
+
 func getSecrets(directory string) (*wallet.Account, string, error) {
 	baseConfig := &secrets.SecretsManagerParams{
 		Logger: hclog.NewNullLogger(),

command/polybft/polybft_command.go

@@ -1,14 +1,13 @@
 package polybft
 
 import (
-	"github.com/0xPolygon/polygon-edge/command/rootchain/registration"
-	"github.com/0xPolygon/polygon-edge/command/rootchain/staking"
-	"github.com/0xPolygon/polygon-edge/command/rootchain/supernet"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/supernet/stakemanager"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/validators"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/whitelist"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/withdraw"
+	"github.com/0xPolygon/polygon-edge/command/sidechain/registration"
 	"github.com/0xPolygon/polygon-edge/command/sidechain/rewards"
+	"github.com/0xPolygon/polygon-edge/command/sidechain/staking"
 	"github.com/0xPolygon/polygon-edge/command/sidechain/unstaking"
 	sidechainWithdraw "github.com/0xPolygon/polygon-edge/command/sidechain/withdraw"
 	"github.com/spf13/cobra"
@@ -37,9 +36,6 @@ func GetCommand() *cobra.Command {
 		registration.GetCommand(),
 		// rootchain (stake manager) stake command
 		staking.GetCommand(),
-		// rootchain (supernet manager) command for finalizing genesis
-		// validator set and enabling staking
-		supernet.GetCommand(),
 		// rootchain command for deploying stake manager
 		stakemanager.GetCommand(),
 	)

command/rootchain/deploy/deploy.go

@@ -1,8 +1,7 @@
 package deploy
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"sync"
 
@@ -18,7 +17,6 @@
 	"github.com/0xPolygon/polygon-edge/consensus/polybft"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi/artifact"
-	"github.com/0xPolygon/polygon-edge/consensus/polybft/signer"
 	"github.com/0xPolygon/polygon-edge/consensus/polybft/validator"
 	"github.com/0xPolygon/polygon-edge/contracts"
 	"github.com/0xPolygon/polygon-edge/txrelayer"
@@ -114,24 +112,6 @@
 	// initializersMap maps rootchain contract names to initializer function callbacks
 	initializersMap = map[string]func(command.OutputFormatter, txrelayer.TxRelayer,
 		*polybft.RootchainConfig, ethgo.Key) error{
-		getProxyNameForImpl(customSupernetManagerName): func(fmt command.OutputFormatter,
-			relayer txrelayer.TxRelayer,
-			config *polybft.RootchainConfig,
-			key ethgo.Key) error {
-			initParams := &contractsapi.InitializeCustomSupernetManagerFn{
-				NewStakeManager:       config.StakeManagerAddress,
-				NewBls:                config.BLSAddress,
-				NewStateSender:        config.StateSenderAddress,
-				NewMatic:              types.StringToAddress(params.stakeTokenAddr),
-				NewChildValidatorSet:  contracts.ValidatorSetContract,
-				NewExitHelper:         config.ExitHelperAddress,
-				NewDomain:             signer.DomainValidatorSetString,
-				NewRootERC20Predicate: config.RootERC20PredicateAddress,
-			}
-
-			return initContract(fmt, relayer, initParams,
-				config.CustomSupernetManagerAddress, customSupernetManagerName, key)
-		},
 		getProxyNameForImpl(exitHelperName): func(fmt command.OutputFormatter,
 			relayer txrelayer.TxRelayer,
 			config *polybft.RootchainConfig,
@@ -153,7 +133,7 @@
 				NewChildERC20Predicate: contracts.ChildERC20PredicateContract,
 				NewChildTokenTemplate:  contracts.ChildERC20Contract,
 				// map root native token address should be non-zero only if native token is non-mintable on a childchain
 				NewNativeTokenRoot: config.RootNativeERC20Address,
 			}
 
 			return initContract(fmt, relayer, inputParams,
@@ -234,7 +214,6 @@
 
 type deploymentResultInfo struct {
 	RootchainCfg   *polybft.RootchainConfig
-	SupernetID     int64
 	CommandResults []command.CommandResult
 }
 
@@ -386,7 +365,6 @@
 	consensusCfg.Bridge.EventTrackerStartBlocks = map[types.Address]uint64{
 		deploymentResultInfo.RootchainCfg.StateSenderAddress: blockNum,
 	}
-	consensusCfg.SupernetID = deploymentResultInfo.SupernetID
 
 	// write updated consensus configuration
 	chainConfig.Params.Engine[polybft.ConsensusName] = consensusCfg
@@ -409,13 +387,13 @@
 	initialValidators []*validator.GenesisValidator, cmdCtx context.Context) (deploymentResultInfo, error) {
 	txRelayer, err := txrelayer.NewTxRelayer(txrelayer.WithClient(client), txrelayer.WithWriter(outputter))
 	if err != nil {
-		return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil},
+		return deploymentResultInfo{RootchainCfg: nil, CommandResults: nil},
 			fmt.Errorf("failed to initialize tx relayer: %w", err)
 	}
 
 	deployerKey, err := helper.DecodePrivateKey(params.deployerKey)
 	if err != nil {
-		return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil},
+		return deploymentResultInfo{RootchainCfg: nil, CommandResults: nil},
 			fmt.Errorf("failed to initialize deployer key: %w", err)
 	}
 
@@ -424,7 +402,7 @@
 
 		txn := helper.CreateTransaction(ethgo.ZeroAddress, &deployerAddr, nil, ethgo.Ether(1), true)
 		if _, err = txRelayer.SendTransactionLocal(txn); err != nil {
-			return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil}, err
+			return deploymentResultInfo{RootchainCfg: nil, CommandResults: nil}, err
 		}
 	}
 
@@ -449,7 +427,7 @@
 			// use existing root chain ERC20 token
 			if err := populateExistingTokenAddr(client.Eth(),
 				params.rootERC20TokenAddr, rootERC20Name, rootchainConfig); err != nil {
-				return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil}, err
+				return deploymentResultInfo{RootchainCfg: nil, CommandResults: nil}, err
 			}
 		} else {
 			// deploy MockERC20 as a root chain root native token
@@ -537,11 +515,6 @@
 			name:     erc1155TemplateName,
 			artifact: contractsapi.ChildERC1155,
 		},
-		{
-			name:     customSupernetManagerName,
-			artifact: contractsapi.CustomSupernetManager,
-			hasProxy: true,
-		},
 	}
 
 	allContracts = append(tokenContracts, allContracts...)
@@ -655,18 +628,17 @@
 	}
 
 	if err := g.Wait(); err != nil {
-		return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil}, err
+		return deploymentResultInfo{RootchainCfg: nil, CommandResults: nil}, err
 	}
 
 	// register supernets manager on stake manager
-	supernetID, err := registerChainOnStakeManager(txRelayer, rootchainConfig, deployerKey)
-	if err != nil {
-		return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil}, err
-	}
-
+	/* 	supernetID, err := registerChainOnStakeManager(txRelayer, rootchainConfig, deployerKey)
+	   	if err != nil {
+	   		return deploymentResultInfo{RootchainCfg: nil, SupernetID: 0, CommandResults: nil}, err
+	   	}
+	*/
 	return deploymentResultInfo{
 		RootchainCfg:   rootchainConfig,
-		SupernetID:     supernetID,
 		CommandResults: commandResults}, nil
 }
 
@@ -694,7 +666,7 @@
 }
 
 // registerChainOnStakeManager registers child chain and its supernet manager on rootchain
-func registerChainOnStakeManager(txRelayer txrelayer.TxRelayer,
+/* func registerChainOnStakeManager(txRelayer txrelayer.TxRelayer,
 	rootchainCfg *polybft.RootchainConfig, deployerKey ethgo.Key) (int64, error) {
 	registerChainFn := &contractsapi.RegisterChildChainStakeManagerFn{
 		Manager: rootchainCfg.CustomSupernetManagerAddress,
@@ -738,7 +710,7 @@
 	}
 
 	return supernetID, nil
-}
+} */
 
 // initContract initializes arbitrary contract with given parameters deployed on a given address
 func initContract(cmdOutput command.OutputFormatter, txRelayer txrelayer.TxRelayer,
@@ -778,8 +750,8 @@
 	commandResults = append([]command.CommandResult{messageResult}, commandResults...)
 
 	return deploymentResultInfo{
-		RootchainCfg:   nil,
-		SupernetID:     0,
+		RootchainCfg: nil,
+
 		CommandResults: commandResults}
 }
 

command/rootchain/helper/utils.go

@@ -159,9 +159,9 @@ func GetECDSAKey(privateKey, accountDir, accountConfig string) (ethgo.Key, error
 // GetValidatorInfo queries SupernetManager smart contract on root
 // and retrieves validator info for given address
 func GetValidatorInfo(validatorAddr ethgo.Address, supernetManagerAddr, stakeManagerAddr types.Address,
-	chainID int64, txRelayer txrelayer.TxRelayer) (*polybft.ValidatorInfo, error) {
+	txRelayer txrelayer.TxRelayer) (*polybft.ValidatorInfo, error) {
 	caller := ethgo.Address(contracts.SystemCaller)
-	getValidatorMethod := contractsapi.CustomSupernetManager.Abi.GetMethod("getValidator")
+	getValidatorMethod := contractsapi.StakeManager.Abi.GetMethod("stakeOf")
 
 	encode, err := getValidatorMethod.Encode([]interface{}{validatorAddr})
 	if err != nil {
@@ -201,7 +201,6 @@ func GetValidatorInfo(validatorAddr ethgo.Address, supernetManagerAddr, stakeMan
 	}
 
 	stakeOfFn := &contractsapi.StakeOfStakeManagerFn{
-		ID:        new(big.Int).SetInt64(chainID),
 		Validator: types.Address(validatorAddr),
 	}