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

@@ -81,9 +81,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
@@ -117,7 +117,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"

chain/params.go

@@ -78,18 +78,15 @@ func (p *Params) GetEngine() string {
 
 // predefined forks
 const (
-	Homestead           = "homestead"
-	Byzantium           = "byzantium"
-	Constantinople      = "constantinople"
-	Petersburg          = "petersburg"
-	Istanbul            = "istanbul"
-	London              = "london"
-	EIP150              = "EIP150"
-	EIP158              = "EIP158"
-	EIP155              = "EIP155"
-	QuorumCalcAlignment = "quorumcalcalignment"
-	TxHashWithType      = "txHashWithType"
-	LondonFix           = "londonfix"
+	Homestead      = "homestead"
+	Byzantium      = "byzantium"
+	Constantinople = "constantinople"
+	Petersburg     = "petersburg"
+	Istanbul       = "istanbul"
+	London         = "london"
+	EIP150         = "EIP150"
+	EIP158         = "EIP158"
+	EIP155         = "EIP155"
 )
 
 // Forks is map which contains all forks and their starting blocks from genesis
@@ -116,18 +113,15 @@ func (f *Forks) RemoveFork(name string) *Forks {
 // At returns ForksInTime instance that shows which supported forks are enabled for the block
 func (f *Forks) At(block uint64) ForksInTime {
 	return ForksInTime{
-		Homestead:           f.IsActive(Homestead, block),
-		Byzantium:           f.IsActive(Byzantium, block),
-		Constantinople:      f.IsActive(Constantinople, block),
-		Petersburg:          f.IsActive(Petersburg, block),
-		Istanbul:            f.IsActive(Istanbul, block),
-		London:              f.IsActive(London, block),
-		EIP150:              f.IsActive(EIP150, block),
-		EIP158:              f.IsActive(EIP158, block),
-		EIP155:              f.IsActive(EIP155, block),
-		QuorumCalcAlignment: f.IsActive(QuorumCalcAlignment, block),
-		TxHashWithType:      f.IsActive(TxHashWithType, block),
-		LondonFix:           f.IsActive(LondonFix, block),
+		Homestead:      f.IsActive(Homestead, block),
+		Byzantium:      f.IsActive(Byzantium, block),
+		Constantinople: f.IsActive(Constantinople, block),
+		Petersburg:     f.IsActive(Petersburg, block),
+		Istanbul:       f.IsActive(Istanbul, block),
+		London:         f.IsActive(London, block),
+		EIP150:         f.IsActive(EIP150, block),
+		EIP158:         f.IsActive(EIP158, block),
+		EIP155:         f.IsActive(EIP155, block),
 	}
 }
 
@@ -177,24 +171,18 @@ type ForksInTime struct {
 	London,
 	EIP150,
 	EIP158,
-	EIP155,
-	QuorumCalcAlignment,
-	TxHashWithType,
-	LondonFix bool
+	EIP155 bool
 }
 
 // AllForksEnabled should contain all supported forks by current edge version
 var AllForksEnabled = &Forks{
-	Homestead:           NewFork(0),
-	EIP150:              NewFork(0),
-	EIP155:              NewFork(0),
-	EIP158:              NewFork(0),
-	Byzantium:           NewFork(0),
-	Constantinople:      NewFork(0),
-	Petersburg:          NewFork(0),
-	Istanbul:            NewFork(0),
-	London:              NewFork(0),
-	QuorumCalcAlignment: NewFork(0),
-	TxHashWithType:      NewFork(0),
-	LondonFix:           NewFork(0),
+	Homestead:      NewFork(0),
+	EIP150:         NewFork(0),
+	EIP155:         NewFork(0),
+	EIP158:         NewFork(0),
+	Byzantium:      NewFork(0),
+	Constantinople: NewFork(0),
+	Petersburg:     NewFork(0),
+	Istanbul:       NewFork(0),
+	London:         NewFork(0),
 }

command/bridge/bridge.go

@@ -3,11 +3,13 @@ package bridge
 import (
 	"github.com/spf13/cobra"
 
+	deploy "github.com/0xPolygon/polygon-edge/command/bridge/deploy"
 	depositERC1155 "github.com/0xPolygon/polygon-edge/command/bridge/deposit/erc1155"
 	depositERC20 "github.com/0xPolygon/polygon-edge/command/bridge/deposit/erc20"
 	depositERC721 "github.com/0xPolygon/polygon-edge/command/bridge/deposit/erc721"
 	"github.com/0xPolygon/polygon-edge/command/bridge/exit"
-	"github.com/0xPolygon/polygon-edge/command/bridge/mint"
+	"github.com/0xPolygon/polygon-edge/command/bridge/fund"
+	"github.com/0xPolygon/polygon-edge/command/bridge/server"
 	withdrawERC1155 "github.com/0xPolygon/polygon-edge/command/bridge/withdraw/erc1155"
 	withdrawERC20 "github.com/0xPolygon/polygon-edge/command/bridge/withdraw/erc20"
 	withdrawERC721 "github.com/0xPolygon/polygon-edge/command/bridge/withdraw/erc721"
@@ -41,7 +43,11 @@ func registerSubcommands(baseCmd *cobra.Command) {
 		withdrawERC1155.GetCommand(),
 		// bridge exit
 		exit.GetCommand(),
-		// bridge mint erc-20
-		mint.GetCommand(),
+		// bridge deploy
+		deploy.GetCommand(),
+		// bridge server
+		server.GetCommand(),
+		// bridge fund
+		fund.GetCommand(),
 	)
 }