simplify

Author: spypsy

yarn-project/ethereum/src/contracts/registry.ts

@@ -84,7 +84,7 @@ export class RegistryContract {
     client: ViemClient,
     registryAddress: Hex | EthAddress,
     rollupVersion: number | bigint | 'canonical',
-  ): Promise<L1ContractAddresses & { feeAssetOwnerAddress: EthAddress }> {
+  ): Promise<L1ContractAddresses> {
     const registry = new RegistryContract(client, registryAddress);
     const governanceAddresses = await registry.getGovernanceAddresses();
     const rollupAddress = await registry.getRollupAddress(rollupVersion);
@@ -100,13 +100,12 @@ export class RegistryContract {
       abi: TestERC20Abi,
       client,
     });
-    const feeAssetOwner = EthAddress.fromString(await feeAsset.read.owner());
+    const feeAssetOwner = await feeAsset.read.owner();
     return {
       registryAddress: registry.address,
       ...governanceAddresses,
       ...addresses,
-      coinIssuerAddress: feeAssetOwner,
-      feeAssetOwnerAddress: feeAssetOwner,
+      coinIssuerAddress: EthAddress.fromString(feeAssetOwner),
     };
   }
 

yarn-project/ethereum/src/deploy_l1_contracts.ts

@@ -1057,7 +1057,7 @@ export const deployL1Contracts = async (
       zkPassportVerifierAddress,
       coinIssuerAddress,
     },
-    feeAssetOwnerAddress: l1Contracts.feeAssetOwnerAddress,
+    feeAssetOwnerAddress: l1Contracts.coinIssuerAddress,
   };
 };