removed no longer necessary hack

AztecProtocol · Feb 1, 2024 · 15c0009 · 15c0009
1 parent 554d316
commit 15c0009
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/yarn-project/circuits.js/src/structs/tx_context.ts b/yarn-project/circuits.js/src/structs/tx_context.ts
@@ -2,16 +2,13 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { FieldsOf } from '@aztec/foundation/types';
 
 import { PublicKey } from '../index.js';
-import { AztecAddress, EthAddress, Fr, Point } from './index.js';
+import { EthAddress, Fr, Point } from './index.js';
 
 /**
  * Contract deployment data in a TxContext
  * Not to be confused with NewContractData.
  */
 export class ContractDeploymentData {
-  /** Ethereum address of the portal contract on L1. */
-  public portalContractAddress: EthAddress;
-
   constructor(
     /** Public key of the contract. */
     public publicKey: PublicKey,
@@ -21,14 +18,9 @@ export class ContractDeploymentData {
     public contractClassId: Fr,
     /** Contract address salt (used when deriving a contract address). */
     public contractAddressSalt: Fr,
-    /**
-     * Ethereum address of the portal contract on L1.
-     * TODO(AD): union type kludge due to cbind compiler having special needs
-     */
-    portalContractAddress: EthAddress | AztecAddress,
-  ) {
-    this.portalContractAddress = EthAddress.fromField(portalContractAddress.toField());
-  }
+    /** Ethereum address of the portal contract on L1. */
+    public portalContractAddress: EthAddress,
+  ) {}
 
   toBuffer() {
     return serializeToBuffer(

diff --git a/yarn-project/noir-protocol-circuits/src/type_conversion.test.ts b/yarn-project/noir-protocol-circuits/src/type_conversion.test.ts
@@ -59,7 +59,7 @@ describe('Noir<>Circuits.js type conversion test suite', () => {
       new Fr(29n),
       new Fr(30n),
       new Fr(31n),
-      AztecAddress.random(),
+      EthAddress.random(),
     );
 
     it('should map contract deployment data', () => {