Replace depricated testnetworks with current ones

inblockio · Apr 2, 2024 · c85b5dd · c85b5dd
1 parent f0b49e5
commit c85b5dd
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 35 deletions.
diff --git a/extension.json b/extension.json
@@ -24,7 +24,7 @@
 		},
 		"WitnessNetwork": {
 			"description": "The Ethereum blockhain network used for witnessing.",
-			"value": "goerli"
+			"value": "sepolia"
 		},
 		"SmartContractAddress": {
 			"description": "The smart contract address used to publish for witnessing.",

diff --git a/i18n/de.json b/i18n/de.json
@@ -29,10 +29,8 @@
 	"da-specialdaconfig-witnessconfiguration-smartcontractaddress-label": "Smart-Contract-Addresse:",
 	"da-specialdaconfig-witnessconfiguration-witnessnetwork-label": "Witness Netzwerk:",
 	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-mainnet": "Mainnet",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-ropsten": "Ropsten",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-kovan": "Kovan",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-rinkeby": "Rinkeby",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-goerli": "Goerli",
+	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-sepolia": "Sepolia",
+	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-holesky": "Holesky",
 	"da-specialdaconfig-save-label": "Speichern",
 	"da-export-field-titles-label": "Zu exportierende Seiten (eine pro Zeile)",
 	"da-export-field-transclusions-label": "Eingebettete Ressourcen einbeziehen",

diff --git a/i18n/en.json b/i18n/en.json
@@ -32,10 +32,8 @@
 	"da-specialdaconfig-witnessconfiguration-smartcontractaddress-label": "Smart Contract Address:",
 	"da-specialdaconfig-witnessconfiguration-witnessnetwork-label": "Witness Network:",
 	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-mainnet": "Mainnet",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-ropsten": "Ropsten",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-kovan": "Kovan",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-rinkeby": "Rinkeby",
-	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-goerli": "Goerli",
+	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-sepolia": "Sepolia",
+	"da-specialdaconfig-witnessconfiguration-witnessnetwork-option-holesky": "Holesky",
 	"da-specialdaconfig-save-label": "Save",
 	"da-export-field-titles-label": "Pages to export (one per line)",
 	"da-export-field-transclusions-label": "Also export included resources",

diff --git a/includes/SpecialDataAccountingConfig.php b/includes/SpecialDataAccountingConfig.php
@@ -177,24 +177,14 @@ private function makeFrom( array $errors ): array {
 							'data' => 'mainnet'
 						], [
 							'label' => $this->msg(
-								'da-specialdaconfig-witnessconfiguration-witnessnetwork-option-ropsten'
+								'da-specialdaconfig-witnessconfiguration-witnessnetwork-option-holesky'
 							)->plain(),
-							'data' => 'ropsten'
+							'data' => 'holesky'
 						], [
 							'label' => $this->msg(
-								'da-specialdaconfig-witnessconfiguration-witnessnetwork-option-kovan'
+								'da-specialdaconfig-witnessconfiguration-witnessnetwork-option-sepolia'
 							)->plain(),
-							'data' => 'kovan'
-						], [
-							'label' => $this->msg(
-								'da-specialdaconfig-witnessconfiguration-witnessnetwork-option-rinkeby'
-							)->plain(),
-							'data' => 'rinkeby'
-						], [
-							'label' => $this->msg(
-								'da-specialdaconfig-witnessconfiguration-witnessnetwork-option-goerli'
-							)->plain(),
-							'data' => 'goerli'
+							'data' => 'sepolia'
 						],
 					],
 					'value' => $this->getConfig()->get( 'WitnessNetwork' ),

diff --git a/includes/SpecialWitnessPublisher.php b/includes/SpecialWitnessPublisher.php
@@ -79,10 +79,9 @@ public function execute( $sub ) {
 		$WitnessNetwork = $this->getConfig()->get( 'WitnessNetwork' );
 		$witnessNetworkMap = [
 			'mainnet' => 'https://etherscan.io/tx/',
-			'ropsten' => 'https://ropsten.etherscan.io/tx/',
-			'kovan' => 'https://kovan.etherscan.io/tx/',
-			'rinkeby' => 'https://rinkeby.etherscan.io/tx/',
-			'goerli' => 'https://goerli.etherscan.io/tx/',
+			'sepolia' => 'https://sepolia.etherscan.io/tx/',
+			'holesky' => 'https://holesky.etherscan.io/tx/',
+
 		];
 
 		foreach ( $res as $row ) {

diff --git a/modules/publishDomainSnapshot/index.js b/modules/publishDomainSnapshot/index.js
@@ -3,11 +3,8 @@
 
   var ethChainIdMap = {
     'mainnet': '0x1',
-    'ropsten': '0x3',
-    'rinkeby': '0x4',
-    'goerli': '0x5',
-    'kotti': '0x6',
-    'kovan': '0x42',
+    'sepolia': '0xaa36a7',
+    'holesky': '0x4268',
   }
 
   function storeWitnessTx(txhash, host, witnessEventID, ownAddress, witnessNetwork) {

diff --git a/tests/fixtures/PKC_Testfile_Pale_Blue_Dot.xml b/tests/fixtures/PKC_Testfile_Pale_Blue_Dot.xml
@@ -120,7 +120,7 @@
   <domain_snapshot_title>Data Accounting:DomainSnapshot:9df4198c20d31bb46f8ea97417346108b01ca13af20902e1755a1aad5bc3ba689f3731f653b4daa67ef657b96915fd7ac1035ab93938d9afde9c4c13cfd468c7</domain_snapshot_title>
   <witness_hash>c02ee814b4166d58440f3805c823659c0aaa8a75ed22cee60bf7b9ec114dbbbaf9cdac6b12d25f2d1622030b43455e089a79a2e04b9ce507e9f9e77637ca1424</witness_hash>
   <witness_event_verification_hash>54fb5fa9a01fb316c5f4d75886bb5830d227122c0d4e3c602d6379b4ba9601ba5ea7f398dbdddbb87d55e444349b3680275958272b2720931bcfe8103429519d</witness_event_verification_hash>
-  <witness_network>goerli</witness_network>
+  <witness_network>sepolia</witness_network>
   <smart_contract_address>0x45f59310ADD88E6d23ca58A0Fa7A55BEE6d2a611</smart_contract_address>
   <domain_snapshot_genesis_hash>9df4198c20d31bb46f8ea97417346108b01ca13af20902e1755a1aad5bc3ba689f3731f653b4daa67ef657b96915fd7ac1035ab93938d9afde9c4c13cfd468c7</domain_snapshot_genesis_hash>
   <merkle_root>bbc665767bac03f0a16321555c40b28bd6a6da9bc16f736c5680414b266a910d4ae436a091326a8ca6b71d2628326e42191d67214b65b87acf096c176f126447</merkle_root>

diff --git a/tests/phpunit/Integration/WitnessTest.php b/tests/phpunit/Integration/WitnessTest.php
@@ -46,7 +46,7 @@ public function setUp(): void {
 			'witness_event_id' => 1,
 			'account_address' => '0xa2026582b94feb9124231fbf7b052c39218954c2',
 			'transaction_hash' => '0x473b0b7b9ad818b9af02c0ab73cd9b186b28b6208c13f7d07554ace0915ca88e',
-			'witness_network' => "goerli",
+			'witness_network' => "sepolia",
 		] ) ] );
 		$this->requestData = $requestData;
 		$this->permissionManager = $this->getServiceContainer()->getPermissionManager();

diff --git a/tests/phpunit/Unit/HashingServiceTest.php b/tests/phpunit/Unit/HashingServiceTest.php
@@ -63,7 +63,7 @@ public function testCalculateSignatureHash(): void {
 	public function testCalculateWitnessHash(): void {
 		$domain_snapshot_genesis_hash = '9df4198c20d31bb46f8ea97417346108b01ca13af20902e1755a1aad5bc3ba689f3731f653b4daa67ef657b96915fd7ac1035ab93938d9afde9c4c13cfd468c7';
 		$merkle_root = 'bbc665767bac03f0a16321555c40b28bd6a6da9bc16f736c5680414b266a910d4ae436a091326a8ca6b71d2628326e42191d67214b65b87acf096c176f126447';
-		$witness_network = 'goerli';
+		$witness_network = 'sepolia';
 		$witness_tx_hash = '0x473b0b7b9ad818b9af02c0ab73cd9b186b28b6208c13f7d07554ace0915ca88e';
 		$wh = $this->verificationEngine->getHasher()->getHashSum(
 			$domain_snapshot_genesis_hash .