Github Action: Update contract

Author: catmcgee

tutorials/token-bridge-e2e/packages/l1-contracts/contracts/TokenPortal.sol

@@ -14,165 +14,70 @@ contract TokenPortal {
 
   IRegistry public registry;
   IERC20 public underlying;
-  bytes32 public l2TokenAddress;
+  bytes32 public l2Bridge;
 
-  function initialize(address _registry, address _underlying, bytes32 _l2TokenAddress) external {
+  function initialize(address _registry, address _underlying, bytes32 _l2Bridge) external {
     registry = IRegistry(_registry);
     underlying = IERC20(_underlying);
-    l2TokenAddress = _l2TokenAddress;
+    l2Bridge = _l2Bridge;
   }
 
   /**
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed publicly on Aztec
    * @param _to - The aztec address of the recipient
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHash - The hash of the secret consumable message. The hash should be 254 bits (so it can fit in a Field element)
    * @return The key of the entry in the Inbox
    */
-  function depositToAztecPublic(
-    bytes32 _to,
-    uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
-    bytes32 _secretHash
-  ) external payable returns (bytes32) {
+  function depositToAztecPublic(bytes32 _to, uint256 _amount, bytes32 _secretHash)
+    external
+    returns (bytes32)
+  {
     // Preamble
     IInbox inbox = registry.getInbox();
-    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
+    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2Bridge, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
-    bytes32 contentHash = Hash.sha256ToField(
-      abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, _canceller)
-    );
+    bytes32 contentHash =
+      Hash.sha256ToField(abi.encodeWithSignature("mint_public(bytes32,uint256)", _to, _amount));
 
     // Hold the tokens in the portal
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(actor, _deadline, contentHash, _secretHash);
+    return inbox.sendL2Message(actor, contentHash, _secretHash);
   }
 
   /**
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed privately on Aztec
    * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec. The hash should be 254 bits (so it can fit in a Field element)
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHashForL2MessageConsumption - The hash of the secret consumable L1 to L2 message. The hash should be 254 bits (so it can fit in a Field element)
    * @return The key of the entry in the Inbox
    */
   function depositToAztecPrivate(
     bytes32 _secretHashForRedeemingMintedNotes,
     uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
     bytes32 _secretHashForL2MessageConsumption
-  ) external payable returns (bytes32) {
+  ) external returns (bytes32) {
     // Preamble
     IInbox inbox = registry.getInbox();
-    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
+    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2Bridge, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
     bytes32 contentHash = Hash.sha256ToField(
       abi.encodeWithSignature(
-        "mint_private(bytes32,uint256,address)",
-        _secretHashForRedeemingMintedNotes,
-        _amount,
-        _canceller
+        "mint_private(bytes32,uint256)", _secretHashForRedeemingMintedNotes, _amount
       )
     );
 
     // Hold the tokens in the portal
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(
-      actor, _deadline, contentHash, _secretHashForL2MessageConsumption
-    );
+    return inbox.sendL2Message(actor, contentHash, _secretHashForL2MessageConsumption);
   }
 
-  /**
-   * @notice Cancel a public depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _to - The aztec address of the recipient in the original message
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHash - The hash of the secret consumable message in the original message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePublic(
-    bytes32 _to,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHash,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, msg.sender)
-        ),
-      secretHash: _secretHash,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& entry key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
-  }
-
-  /**
-   * @notice Cancel a private depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHashForL2MessageConsumption - The hash of the secret consumable L1 to L2 message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePrivate(
-    bytes32 _secretHashForRedeemingMintedNotes,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHashForL2MessageConsumption,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature(
-          "mint_private(bytes32,uint256,address)",
-          _secretHashForRedeemingMintedNotes,
-          _amount,
-          msg.sender
-        )
-        ),
-      secretHash: _secretHashForL2MessageConsumption,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& entry key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
-  }
-
-
   /**
    * @notice Withdraw funds from the portal
    * @dev Second part of withdraw, must be initiated from L2 first as it will consume a message from outbox
@@ -187,7 +92,7 @@ contract TokenPortal {
     returns (bytes32)
   {
     DataStructures.L2ToL1Msg memory message = DataStructures.L2ToL1Msg({
-      sender: DataStructures.L2Actor(l2TokenAddress, 1),
+      sender: DataStructures.L2Actor(l2Bridge, 1),
       recipient: DataStructures.L1Actor(address(this), block.chainid),
       content: Hash.sha256ToField(
         abi.encodeWithSignature(

tutorials/uniswap-integration-e2e/packages/l1-contracts/contracts/TokenPortal.sol

@@ -14,165 +14,70 @@ contract TokenPortal {
 
   IRegistry public registry;
   IERC20 public underlying;
-  bytes32 public l2TokenAddress;
+  bytes32 public l2Bridge;
 
-  function initialize(address _registry, address _underlying, bytes32 _l2TokenAddress) external {
+  function initialize(address _registry, address _underlying, bytes32 _l2Bridge) external {
     registry = IRegistry(_registry);
     underlying = IERC20(_underlying);
-    l2TokenAddress = _l2TokenAddress;
+    l2Bridge = _l2Bridge;
   }
 
   /**
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed publicly on Aztec
    * @param _to - The aztec address of the recipient
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHash - The hash of the secret consumable message. The hash should be 254 bits (so it can fit in a Field element)
    * @return The key of the entry in the Inbox
    */
-  function depositToAztecPublic(
-    bytes32 _to,
-    uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
-    bytes32 _secretHash
-  ) external payable returns (bytes32) {
+  function depositToAztecPublic(bytes32 _to, uint256 _amount, bytes32 _secretHash)
+    external
+    returns (bytes32)
+  {
     // Preamble
     IInbox inbox = registry.getInbox();
-    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
+    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2Bridge, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
-    bytes32 contentHash = Hash.sha256ToField(
-      abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, _canceller)
-    );
+    bytes32 contentHash =
+      Hash.sha256ToField(abi.encodeWithSignature("mint_public(bytes32,uint256)", _to, _amount));
 
     // Hold the tokens in the portal
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(actor, _deadline, contentHash, _secretHash);
+    return inbox.sendL2Message(actor, contentHash, _secretHash);
   }
 
   /**
    * @notice Deposit funds into the portal and adds an L2 message which can only be consumed privately on Aztec
    * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec. The hash should be 254 bits (so it can fit in a Field element)
    * @param _amount - The amount to deposit
-   * @param _canceller - The address that can cancel the L1 to L2 message
-   * @param _deadline - The timestamp after which the entry can be cancelled
    * @param _secretHashForL2MessageConsumption - The hash of the secret consumable L1 to L2 message. The hash should be 254 bits (so it can fit in a Field element)
    * @return The key of the entry in the Inbox
    */
   function depositToAztecPrivate(
     bytes32 _secretHashForRedeemingMintedNotes,
     uint256 _amount,
-    address _canceller,
-    uint32 _deadline,
     bytes32 _secretHashForL2MessageConsumption
-  ) external payable returns (bytes32) {
+  ) external returns (bytes32) {
     // Preamble
     IInbox inbox = registry.getInbox();
-    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2TokenAddress, 1);
+    DataStructures.L2Actor memory actor = DataStructures.L2Actor(l2Bridge, 1);
 
     // Hash the message content to be reconstructed in the receiving contract
     bytes32 contentHash = Hash.sha256ToField(
       abi.encodeWithSignature(
-        "mint_private(bytes32,uint256,address)",
-        _secretHashForRedeemingMintedNotes,
-        _amount,
-        _canceller
+        "mint_private(bytes32,uint256)", _secretHashForRedeemingMintedNotes, _amount
       )
     );
 
     // Hold the tokens in the portal
     underlying.safeTransferFrom(msg.sender, address(this), _amount);
 
     // Send message to rollup
-    return inbox.sendL2Message{value: msg.value}(
-      actor, _deadline, contentHash, _secretHashForL2MessageConsumption
-    );
+    return inbox.sendL2Message(actor, contentHash, _secretHashForL2MessageConsumption);
   }
 
-  /**
-   * @notice Cancel a public depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _to - The aztec address of the recipient in the original message
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHash - The hash of the secret consumable message in the original message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePublic(
-    bytes32 _to,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHash,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature("mint_public(bytes32,uint256,address)", _to, _amount, msg.sender)
-        ),
-      secretHash: _secretHash,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& entry key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
-  }
-
-  /**
-   * @notice Cancel a private depositToAztec L1 to L2 message
-   * @dev only callable by the `canceller` of the message
-   * @param _secretHashForRedeemingMintedNotes - The hash of the secret to redeem minted notes privately on Aztec
-   * @param _amount - The amount to deposit per the original message
-   * @param _deadline - The timestamp after which the entry can be cancelled
-   * @param _secretHashForL2MessageConsumption - The hash of the secret consumable L1 to L2 message
-   * @param _fee - The fee paid to the sequencer
-   * @return The key of the entry in the Inbox
-   */
-  function cancelL1ToAztecMessagePrivate(
-    bytes32 _secretHashForRedeemingMintedNotes,
-    uint256 _amount,
-    uint32 _deadline,
-    bytes32 _secretHashForL2MessageConsumption,
-    uint64 _fee
-  ) external returns (bytes32) {
-    IInbox inbox = registry.getInbox();
-    DataStructures.L1Actor memory l1Actor = DataStructures.L1Actor(address(this), block.chainid);
-    DataStructures.L2Actor memory l2Actor = DataStructures.L2Actor(l2TokenAddress, 1);
-    DataStructures.L1ToL2Msg memory message = DataStructures.L1ToL2Msg({
-      sender: l1Actor,
-      recipient: l2Actor,
-      content: Hash.sha256ToField(
-        abi.encodeWithSignature(
-          "mint_private(bytes32,uint256,address)",
-          _secretHashForRedeemingMintedNotes,
-          _amount,
-          msg.sender
-        )
-        ),
-      secretHash: _secretHashForL2MessageConsumption,
-      deadline: _deadline,
-      fee: _fee
-    });
-    bytes32 entryKey = inbox.cancelL2Message(message, address(this));
-    // release the funds to msg.sender (since the content hash (& entry key) is derived by hashing the caller,
-    // we confirm that msg.sender is same as `_canceller` supplied when creating the message)
-    underlying.transfer(msg.sender, _amount);
-    return entryKey;
-  }
-
-
   /**
    * @notice Withdraw funds from the portal
    * @dev Second part of withdraw, must be initiated from L2 first as it will consume a message from outbox
@@ -187,7 +92,7 @@ contract TokenPortal {
     returns (bytes32)
   {
     DataStructures.L2ToL1Msg memory message = DataStructures.L2ToL1Msg({
-      sender: DataStructures.L2Actor(l2TokenAddress, 1),
+      sender: DataStructures.L2Actor(l2Bridge, 1),
       recipient: DataStructures.L1Actor(address(this), block.chainid),
       content: Hash.sha256ToField(
         abi.encodeWithSignature(