chore(common): sync with parent branch

Author: isaacdecoded

gateway-contracts/.env.example

@@ -8,8 +8,8 @@ CHAIN_ID_GATEWAY="31337" # (uint256)
 MNEMONIC="adapt mosquito move limb mobile illegal tree voyage juice mosquito burger raise father hope layer" # (string)
 
 # Private keys
-DEPLOYER_PRIVATE_KEY=0xe746bc71f6bee141a954e6a49bc9384d334e393a7ea1e70b50241cb2e78e9e4c # test-suite
-# DEPLOYER_PRIVATE_KEY="0x7136d8dc72f873124f4eded25f3525a20f6cee4296564c76b44f1d582c57640f" # accounts[1], private key (bytes32)
+# DEPLOYER_PRIVATE_KEY=0xe746bc71f6bee141a954e6a49bc9384d334e393a7ea1e70b50241cb2e78e9e4c # test-suite
+DEPLOYER_PRIVATE_KEY="0x7136d8dc72f873124f4eded25f3525a20f6cee4296564c76b44f1d582c57640f" # accounts[1], private key (bytes32)
 
 # RPC URL
 RPC_URL="http://127.0.0.1:8757" # (string)

gateway-contracts/test/utils/contracts.ts

@@ -171,12 +171,9 @@ export async function loadTestVariablesFixture() {
   // Load the Decryption contract
   const decryption = await hre.ethers.getContractAt("Decryption", getRequiredEnvVar("DECRYPTION_ADDRESS"));
 
-<<<<<<< HEAD
   // Load the PauserSet contract
   const pauserSet = await hre.ethers.getContractAt("PauserSet", getRequiredEnvVar("PAUSER_SET_ADDRESS"));
 
-=======
->>>>>>> 1160d001 (feat(gateway-contracts): implement single keygen)
   return {
     ...fixtureData,
     gatewayConfig,
@@ -189,9 +186,6 @@ export async function loadTestVariablesFixture() {
     nKmsNodes,
     nCoprocessors,
     nCustodians,
-<<<<<<< HEAD
     pauserSet,
-=======
->>>>>>> 1160d001 (feat(gateway-contracts): implement single keygen)
   };
 }