Execution Node Versioning Contract for Rolling Upgrades

.github/workflows/ci.yml

@@ -10,6 +10,18 @@ jobs:
  - uses: actions/setup-go@v1
  with:
  go-version: '1.18'
+ - uses: actions/setup-node@v3
+ with:
+ node-version: 16
+ cache: 'npm'
+ cache-dependency-path: lib/js/test/package-lock.json
+ - name: Install Flow CLI
+ run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)"
+ - name: Flow cli Version
+ run: flow version
+ - name: Update PATH
+ run: echo "/root/.local/bin" >> $GITHUB_PATH
+ - name: Install dependencies
+ run: cd lib/js/test && npm ci
  - name: Run tests
  run: export GOPATH=$HOME/go && make ci
-

.gitignore

@@ -6,7 +6,7 @@
 
 .DS_Store
 
-flow.json
+node_modules
 
 # IDE related files
 .idea

Makefile

@@ -2,7 +2,9 @@
 test: 
  $(MAKE) generate -C lib/go
  $(MAKE) test -C lib/go
+ $(MAKE) test -C lib/js/test
 
 .PHONY: ci
 ci:
  $(MAKE) ci -C lib/go
+ $(MAKE) ci -C lib/js/test

flow.json

@@ -0,0 +1,29 @@
+{
+ "networks": {
+ "emulator": "127.0.0.1:3569",
+ "mainnet": "access.mainnet.nodes.onflow.org:9000",
+ "testnet": "access.devnet.nodes.onflow.org:9000"
+ },
+ "contracts": {
+ "FlowClusterQC": "./contracts/epochs/FlowClusterQC.cdc",
+ "FlowEpoch": "./contracts/epochs/FlowEpoch.cdc",
+ "FlowDKG": "./contracts/epochs/FlowEpoch.cdc",
+ "ExecutionNodeVersionBeacon": "./contracts/ExecutionNodeVersionBeacon.cdc",
+ "FlowContractAudits": "./contracts/FlowContractAudits.cdc",
+ "FlowFees": "./contracts/FlowFees.cdc",
+ "FlowIDTableStaking": "./contracts/FlowIDTableStaking.cdc",
+ "FlowIDTableStaking_old": "./contracts/FlowIDTableStaking_old.cdc",
+ "FlowServiceAccount": "./contracts/FlowServiceAccount.cdc",
+ "FlowStakingCollection": "./contracts/FlowStakingCollection.cdc",
+ "FlowStorageFees": "./contracts/FlowStorageFees.cdc",
+ "FlowToken": "./contracts/FlowToken.cdc",
+ "LockedTokens": "./contracts/LockedTokens.cdc",
+ "StakingProxy": "./contracts/StakingProxy.cdc"
+ },
+ "accounts": {
+ "emulator-account": {
+ "address": "f8d6e0586b0a20c7",
+ "key": "c33f601b3d88ca23bcdd77637eca81f905e3354d4229dce3cb1fd4920e7cbe66"
+ }
+ }
+}

lib/go/contracts/contracts.go

@@ -25,36 +25,38 @@ import (
 ///
 
 const (
- flowFeesFilename = "FlowFees.cdc"
- storageFeesFilename = "FlowStorageFees.cdc"
- flowServiceAccountFilename = "FlowServiceAccount.cdc"
- flowTokenFilename = "FlowToken.cdc"
- flowIdentityTableFilename = "FlowIDTableStaking.cdc"
- flowQCFilename = "epochs/FlowClusterQC.cdc"
- flowDKGFilename = "epochs/FlowDKG.cdc"
- flowEpochFilename = "epochs/FlowEpoch.cdc"
- flowLockedTokensFilename = "LockedTokens.cdc"
- flowStakingProxyFilename = "StakingProxy.cdc"
- flowStakingCollectionFilename = "FlowStakingCollection.cdc"
- flowContractAuditsFilename = "FlowContractAudits.cdc"
+ flowFeesFilename = "FlowFees.cdc"
+ storageFeesFilename = "FlowStorageFees.cdc"
+ flowServiceAccountFilename = "FlowServiceAccount.cdc"
+ flowTokenFilename = "FlowToken.cdc"
+ flowIdentityTableFilename = "FlowIDTableStaking.cdc"
+ flowQCFilename = "epochs/FlowClusterQC.cdc"
+ flowDKGFilename = "epochs/FlowDKG.cdc"
+ flowEpochFilename = "epochs/FlowEpoch.cdc"
+ flowLockedTokensFilename = "LockedTokens.cdc"
+ flowStakingProxyFilename = "StakingProxy.cdc"
+ flowStakingCollectionFilename = "FlowStakingCollection.cdc"
+ flowContractAuditsFilename = "FlowContractAudits.cdc"
+ executionNodeVersionBeaconFilename = "ExecutionNodeVersionBeacon.cdc"
 
  // Test contracts
  // only used for testing
  TESTFlowIdentityTableFilename = "testContracts/TestFlowIDTableStaking.cdc"
 
  // Each contract has placeholder addresses that need to be replaced
  // depending on which network they are being used with
- placeholderFungibleTokenAddress = "0xFUNGIBLETOKENADDRESS"
- placeholderFlowTokenAddress = "0xFLOWTOKENADDRESS"
- placeholderIDTableAddress = "0xFLOWIDTABLESTAKINGADDRESS"
- placeholderStakingProxyAddress = "0xSTAKINGPROXYADDRESS"
- placeholderQCAddr = "0xQCADDRESS"
- placeholderDKGAddr = "0xDKGADDRESS"
- placeholderEpochAddr = "0xEPOCHADDRESS"
- placeholderFlowFeesAddress = "0xFLOWFEESADDRESS"
- placeholderStorageFeesAddress = "0xFLOWSTORAGEFEESADDRESS"
- placeholderLockedTokensAddress = "0xLOCKEDTOKENSADDRESS"
- placeholderStakingCollectionAddress = "0xFLOWSTAKINGCOLLECTIONADDRESS"
+ placeholderFungibleTokenAddress = "0xFUNGIBLETOKENADDRESS"
+ placeholderFlowTokenAddress = "0xFLOWTOKENADDRESS"
+ placeholderIDTableAddress = "0xFLOWIDTABLESTAKINGADDRESS"
+ placeholderStakingProxyAddress = "0xSTAKINGPROXYADDRESS"
+ placeholderQCAddr = "0xQCADDRESS"
+ placeholderDKGAddr = "0xDKGADDRESS"
+ placeholderEpochAddr = "0xEPOCHADDRESS"
+ placeholderFlowFeesAddress = "0xFLOWFEESADDRESS"
+ placeholderStorageFeesAddress = "0xFLOWSTORAGEFEESADDRESS"
+ placeholderLockedTokensAddress = "0xLOCKEDTOKENSADDRESS"
+ placeholderStakingCollectionAddress = "0xFLOWSTAKINGCOLLECTIONADDRESS"
+ placeholderExecutionNodeVersionBeaconAddress = "0xEXECUTIONNODEVERSIONBEACONADDRESS"
 )
 
 // Adds a `0x` prefix to the provided address string
@@ -116,7 +118,6 @@ func FlowFees(fungibleTokenAddress, flowTokenAddress string) []byte {
 
 // FlowStorageFees returns the FlowStorageFees contract
 // which imports the fungible token and flow token contracts
-//
 func FlowStorageFees(fungibleTokenAddress, flowTokenAddress string) []byte {
  code := assets.MustAssetString(storageFeesFilename)
 
@@ -171,7 +172,7 @@ func FlowServiceAccount(fungibleTokenAddress, flowTokenAddress, flowFeesAddress,
 
 // FlowIDTableStaking returns the FlowIDTableStaking contract
 //
-// The staking contract imports the FungibleToken and FlowToken contracts
+// # The staking contract imports the FungibleToken and FlowToken contracts
 //
 // Parameter: latest: indicates if the contract is the latest version, or an old version. Used to test upgrades
 func FlowIDTableStaking(fungibleTokenAddress, flowTokenAddress, flowFeesAddress string, latest bool) []byte {
@@ -226,7 +227,6 @@ func FlowStakingCollection(
 // FlowLockedTokens return the LockedTokens contract
 //
 // Locked Tokens imports FungibleToken, FlowToken, FlowIDTableStaking, StakingProxy, and FlowStorageFees
-//
 func FlowLockedTokens(
  fungibleTokenAddress,
  flowTokenAddress,