Fix missing renaming in docs and provisioning scripts

docs/development/local-keep-network.adoc

@@ -275,7 +275,7 @@ Running migration: 2_deploy_contracts.js
   KeepRandomBeaconServiceImplV1: 0x3179d9c794e597d6316736189bf040b74a2f1dd7
   Replacing KeepRandomBeaconService...
   ... 0x9facb5fe566862e67e50d6ad0fc622f717ee5cb795c7044ba9ad2ff32f9faa70
-  KeepRandomBeacon: 0x15045ff30d6327345cc052cc4b8c28dbe974a74b
+  KeepRandomBeaconService: 0x15045ff30d6327345cc052cc4b8c28dbe974a74b
   Replacing KeepRandomBeaconOperator...
   ... 0x9e49a94de6dfbc6496c89bb3edff8201ad407ba906893029185f72be2c4e9528
   KeepRandomBeaconOperator: 0x9da7876f5404dde662bf5cbc6ca1462e777571ff

docs/rfc/rfc-13-continuous-delivery.adoc

@@ -75,10 +75,10 @@ contracts before clients due to client startup behavior.
   KeyFile            = "path/to/in-use/keyfile"
 
 [ethereum.ContractAddresses]
-  # Hex-encoded address of KeepRandomBeacon contract
-  KeepRandomBeacon = "0x6299496199d9922193fdd2d717ef585f431er01"
-  # Hex-encoded address of KeepGroup contract
-  KeepGroup = "0x6299496449d11141193fdd2d717ef585f431er02"
+  # Hex-encoded address of KeepRandomBeaconService contract
+  KeepRandomBeaconService = "0x6299496199d9922193fdd2d717ef585f431er01"
+  # Hex-encoded address of KeepRandomBeaconOperator contract
+  KeepRandomBeaconOperator = "0x6299496449d11141193fdd2d717ef585f431er02"
   # StakingProxy
   Staking = "0x6297776199d99942293fdd2d717ef585f431er03"
 
@@ -104,10 +104,10 @@ contracts before clients due to client startup behavior.
   KeyFile            = "path/to/in-use/keyfile"
 
 [ethereum.ContractAddresses]
-  # Hex-encoded address of KeepRandomBeacon contract
-  KeepRandomBeacon = "0x6299496199d9922193fdd2d717ef585f431er01"
-  # Hex-encoded address of KeepGroup contract
-  KeepGroup = "0x6299496449d11141193fdd2d717ef585f431er02"
+  # Hex-encoded address of KeepRandomBeaconService contract
+  KeepRandomBeaconService = "0x6299496199d9922193fdd2d717ef585f431er01"
+  # Hex-encoded address of KeepRandomBeaconOperator contract
+  KeepRandomBeaconOperator = "0x6299496449d11141193fdd2d717ef585f431er02"
   # Hex-encoded address of StakingProxy contract
   Staking = "0x6297776199d99942293fdd2d717ef585f431er03"
 

infrastructure/kube/templates/keep-client/initcontainer/provision-keep-client/Dockerfile

@@ -25,8 +25,8 @@ ENV ETH_NETWORK_ID=$ETH_NETWORK_ID
 COPY ./StakingProxy.json /tmp/StakingProxy.json
 COPY ./TokenStaking.json /tmp/TokenStaking.json
 COPY ./KeepToken.json /tmp/KeepToken.json
-COPY ./KeepRandomBeacon.json /tmp/KeepRandomBeacon.json
-COPY ./KeepGroup.json /tmp/KeepGroup.json
+COPY ./KeepRandomBeaconService.json /tmp/KeepRandomBeaconService.json
+COPY ./KeepRandomBeaconOperator.json /tmp/KeepRandomBeaconOperator.json
 
 COPY ./keep-client-bootstrap-peer-template.toml /tmp/keep-client-bootstrap-peer-template.toml
 COPY ./keep-client-standard-peer-template.toml /tmp/keep-client-standard-peer-template.toml

infrastructure/kube/templates/keep-client/initcontainer/provision-keep-client/keep-client-bootstrap-peer-template.toml

@@ -9,10 +9,10 @@
     KeyFile = "/mnt/eth-data/eth-keyfile"
 
   [ethereum.ContractAddresses]
-    # Hex-encoded address of KeepRandomBeacon contract
-    KeepRandomBeacon = "Set by Kube"
-    # Hex-encoded address of KeepGroup contract
-    KeepGroup = "Set by Kube"
+    # Hex-encoded address of KeepRandomBeaconService contract
+    KeepRandomBeaconService = "Set by Kube"
+    # Hex-encoded address of KeepRandomBeaconOperator contract
+    KeepRandomBeaconOperator = "Set by Kube"
     # StakingProxy
     StakingProxy = "Set by Kube"
 

infrastructure/kube/templates/keep-client/initcontainer/provision-keep-client/keep-client-standard-peer-template.toml

@@ -9,10 +9,10 @@
     KeyFile = "Set by Kube"
 
   [ethereum.ContractAddresses]
-    # Hex-encoded address of KeepRandomBeacon contract
-    KeepRandomBeacon = "Set by Kube"
-    # Hex-encoded address of KeepGroup contract
-    KeepGroup = "Set by Kube"
+    # Hex-encoded address of KeepRandomBeaconService contract
+    KeepRandomBeaconService = "Set by Kube"
+    # Hex-encoded address of KeepRandomBeaconOperator contract
+    KeepRandomBeaconOperator = "Set by Kube"
     # StakingProxy
     StakingProxy = "Set by Kube"
 

infrastructure/kube/templates/keep-client/initcontainer/provision-keep-client/provision-keep-client.js

@@ -51,15 +51,15 @@ const keepTokenContractAbi = keepTokenContractParsed.abi;
 const keepTokenContractAddress = keepTokenContractParsed.networks[ethNetworkId].address;
 const keepTokenContract = new web3.eth.Contract(keepTokenContractAbi, keepTokenContractAddress);
 
-// keepRandomBeacon, only contract address for config file create
-const keepRandomBeaconJsonFile = '/tmp/KeepRandomBeacon.json';
-const keepRandomBeaconParsed = JSON.parse(fs.readFileSync(keepRandomBeaconJsonFile));
-const keepRandomBeaconContractAddress = keepRandomBeaconParsed.networks[ethNetworkId].address;
+// keepRandomBeaconService, only contract address for config file create
+const keepRandomBeaconServiceJsonFile = '/tmp/KeepRandomBeaconService.json';
+const keepRandomBeaconServiceParsed = JSON.parse(fs.readFileSync(keepRandomBeaconServiceJsonFile));
+const keepRandomBeaconServiceContractAddress = keepRandomBeaconServiceParsed.networks[ethNetworkId].address;
 
-// KeepGroup, only contract address for config file create
-const keepGroupJsonFile = '/tmp/KeepGroup.json';
-const keepGroupParsed = JSON.parse(fs.readFileSync(keepGroupJsonFile));
-const keepGroupContractAddress = keepGroupParsed.networks[ethNetworkId].address;
+// KeepRandomBeaconOperator, only contract address for config file create
+const keepRandomBeaconOperatorJsonFile = '/tmp/KeepRandomBeaconOperator.json';
+const keepRandomBeaconOperatorParsed = JSON.parse(fs.readFileSync(keepRandomBeaconOperatorJsonFile));
+const keepRandomBeaconOperatorContractAddress = keepRandomBeaconOperatorParsed.networks[ethNetworkId].address;
 
 // Stake a target eth account
 async function provisionKeepClient() {
@@ -233,8 +233,8 @@ async function createKeepClientConfig(operator) {
 
       parsedConfigFile.ethereum.URL = ethHost.replace('http://', 'ws://') + ':' + ethWsPort;
       parsedConfigFile.ethereum.URLRPC = ethHost + ':' + ethRpcPort;
-      parsedConfigFile.ethereum.ContractAddresses.KeepRandomBeacon = keepRandomBeaconContractAddress;
-      parsedConfigFile.ethereum.ContractAddresses.KeepGroup = keepGroupContractAddress;
+      parsedConfigFile.ethereum.ContractAddresses.KeepRandomBeaconService = keepRandomBeaconServiceContractAddress;
+      parsedConfigFile.ethereum.ContractAddresses.KeepRandomBeaconOperator = keepRandomBeaconOperatorContractAddress;
       parsedConfigFile.ethereum.ContractAddresses.StakingProxy = stakingProxyContractAddress;
       parsedConfigFile.LibP2P.Seed = 2;
       parsedConfigFile.LibP2P.Port = 3919;
@@ -260,8 +260,8 @@ async function createKeepClientConfig(operator) {
       parsedConfigFile.ethereum.URLRPC = ethHost + ':' + ethRpcPort;
       parsedConfigFile.ethereum.account.Address = operator;
       parsedConfigFile.ethereum.account.KeyFile = '/mnt/keep-client/config/eth_account_keyfile';
-      parsedConfigFile.ethereum.ContractAddresses.KeepRandomBeacon = keepRandomBeaconContractAddress;
-      parsedConfigFile.ethereum.ContractAddresses.KeepGroup = keepGroupContractAddress;
+      parsedConfigFile.ethereum.ContractAddresses.KeepRandomBeaconService = keepRandomBeaconServiceContractAddress;
+      parsedConfigFile.ethereum.ContractAddresses.KeepRandomBeaconOperator = keepRandomBeaconOperatorContractAddress;
       parsedConfigFile.ethereum.ContractAddresses.StakingProxy = stakingProxyContractAddress;
       parsedConfigFile.LibP2P.Port = 3919;