✨ exa: add crosschain mint and burn support

Author: itofarina

.changeset/silent-chefs-marry.md

@@ -0,0 +1,5 @@
+---
+"@exactly/protocol": minor
+---
+
+✨ exa: add crosschain mint and burn support

.gas-snapshot

@@ -49,7 +49,7 @@ DebtManagerTest:testFloatingToFixedRollHigherThanAvailableLiquidityWithSlippage(
 DebtManagerTest:testFloatingToFixedRollHigherThanAvailableLiquidityWithSlippageWithThreePools() (gas: 2818426)
 DebtManagerTest:testFloatingToFixedRollWithAccurateSlippage() (gas: 1732739)
 DebtManagerTest:testFloatingToFixedRollWithAccurateSlippageWithPreviousPosition() (gas: 1954939)
-DebtManagerTest:testFuzzRolls(uint8[4],uint8[4],uint256[4],uint40[4],uint8[4]) (runs: 256, μ: 8020203, ~: 8068563)
+DebtManagerTest:testFuzzRolls(uint8[4],uint8[4],uint256[4],uint40[4],uint8[4]) (runs: 256, μ: 8002773, ~: 8075362)
 DebtManagerTest:testLateFixedRoll() (gas: 1454770)
 DebtManagerTest:testLateFixedRollWithThreeLoops() (gas: 2043936)
 DebtManagerTest:testLateFixedToFloatingRoll() (gas: 1449634)
@@ -99,39 +99,54 @@ DebtRollerTest:test_rollFixed_reverts_whenInvalidOperation() (gas: 51027)
 DebtRollerTest:test_rollFixed_reverts_whenNotMarket() (gas: 49047)
 DebtRollerTest:test_rollFixed_rolls() (gas: 1100854)
 DebtRollerTest:test_rollFixed_rolls_partial() (gas: 1140051)
-EscrowedEXATest:testCancelExternalStreams() (gas: 383574)
+EXATest:test_burn_burnsAndEmitsCrosschainBurn() (gas: 143092)
+EXATest:test_burn_reverts_whenCallerLacksBridgeRole() (gas: 67534)
+EXATest:test_crosschainBurn_burnsAndEmitsCrosschainBurn() (gas: 143113)
+EXATest:test_crosschainBurn_reverts_whenCallerLacksBridgeRole() (gas: 67481)
+EXATest:test_crosschainMint_mintsAndEmitsCrosschainMint() (gas: 98776)
+EXATest:test_crosschainMint_reverts_whenCallerLacksBridgeRole() (gas: 67490)
+EXATest:test_initializeV2_grantsAdminRole() (gas: 25887)
+EXATest:test_initializeV2_reverts_whenCalledTwice() (gas: 39159)
+EXATest:test_initialize_setsNameSymbolAndSupply() (gas: 48893)
+EXATest:test_mint_mintsAndEmitsCrosschainMint() (gas: 98821)
+EXATest:test_mint_reverts_whenCallerLacksBridgeRole() (gas: 67533)
+EXATest:test_supportsInterface_returnsFalse_forInvalidInterface() (gas: 13533)
+EXATest:test_supportsInterface_returnsTrue_forIAccessControl() (gas: 13542)
+EXATest:test_supportsInterface_returnsTrue_forIERC165() (gas: 13509)
+EXATest:test_supportsInterface_returnsTrue_forIERC7802() (gas: 13410)
+EscrowedEXATest:testCancelExternalStreams() (gas: 398267)
 EscrowedEXATest:testCancelExternalStreamsWithesEXACancel() (gas: 1137424)
-EscrowedEXATest:testCancelShouldDeleteReserves() (gas: 774852)
-EscrowedEXATest:testCancelShouldGiveReservesBack() (gas: 1185805)
-EscrowedEXATest:testCancelTwiceShouldRevert() (gas: 731099)
-EscrowedEXATest:testCancelWithInvalidAccount() (gas: 552511)
+EscrowedEXATest:testCancelShouldDeleteReserves() (gas: 801977)
+EscrowedEXATest:testCancelShouldGiveReservesBack() (gas: 1229121)
+EscrowedEXATest:testCancelTwiceShouldRevert() (gas: 748504)
+EscrowedEXATest:testCancelWithInvalidAccount() (gas: 573278)
 EscrowedEXATest:testFakeTokenWithesEXARecipient() (gas: 1203505)
 EscrowedEXATest:testGrantTransferrerRoleAsAdmin() (gas: 74807)
-EscrowedEXATest:testMint() (gas: 187548)
-EscrowedEXATest:testMintMoreThanBalance() (gas: 41491)
-EscrowedEXATest:testMintToAnother() (gas: 189756)
+EscrowedEXATest:testMint() (gas: 192860)
+EscrowedEXATest:testMintMoreThanBalance() (gas: 46423)
+EscrowedEXATest:testMintToAnother() (gas: 195068)
 EscrowedEXATest:testMintZero() (gas: 35366)
-EscrowedEXATest:testRedeemAsNotRedeemer() (gas: 329073)
-EscrowedEXATest:testRedeemAsRedeemer() (gas: 256283)
-EscrowedEXATest:testRedeemAsRedeemerToAnother() (gas: 271558)
+EscrowedEXATest:testRedeemAsNotRedeemer() (gas: 344155)
+EscrowedEXATest:testRedeemAsRedeemer() (gas: 271700)
+EscrowedEXATest:testRedeemAsRedeemerToAnother() (gas: 291835)
 EscrowedEXATest:testSetReserveRatioAsAdmin() (gas: 54918)
 EscrowedEXATest:testSetReserveRatioAsNotAdmin() (gas: 67189)
 EscrowedEXATest:testSetReserveRatioAsZero() (gas: 37264)
 EscrowedEXATest:testSetVestingPeriodAsAdmin() (gas: 55030)
 EscrowedEXATest:testSetVestingPeriodAsNotAdmin() (gas: 67179)
-EscrowedEXATest:testTransferToNotTransferrer() (gas: 213681)
-EscrowedEXATest:testTransferToTransferrer() (gas: 302944)
-EscrowedEXATest:testVest() (gas: 519779)
-EscrowedEXATest:testVestDisagreement() (gas: 300084)
-EscrowedEXATest:testVestToAnother() (gas: 657280)
-EscrowedEXATest:testVestToAnotherAndCancel() (gas: 749929)
-EscrowedEXATest:testVestWithPermitReserve() (gas: 738759)
+EscrowedEXATest:testTransferToNotTransferrer() (gas: 218993)
+EscrowedEXATest:testTransferToTransferrer() (gas: 308256)
+EscrowedEXATest:testVest() (gas: 545406)
+EscrowedEXATest:testVestDisagreement() (gas: 305396)
+EscrowedEXATest:testVestToAnother() (gas: 692635)
+EscrowedEXATest:testVestToAnotherAndCancel() (gas: 772194)
+EscrowedEXATest:testVestWithPermitReserve() (gas: 789988)
 EscrowedEXATest:testVestZero() (gas: 60469)
-EscrowedEXATest:testWithdrawFromStreamAndGetReserveBack() (gas: 648887)
+EscrowedEXATest:testWithdrawFromStreamAndGetReserveBack() (gas: 684250)
 EscrowedEXATest:testWithdrawFromUnknownStream() (gas: 1111375)
-EscrowedEXATest:testWithdrawMaxFromMultipleStreams() (gas: 1736065)
-EscrowedEXATest:testWithdrawMaxShouldGiveReserveBackWhenDepleted() (gas: 587458)
-EscrowedEXATest:testWithdrawMaxWithInvalidSender() (gas: 517048)
+EscrowedEXATest:testWithdrawMaxFromMultipleStreams() (gas: 1781140)
+EscrowedEXATest:testWithdrawMaxShouldGiveReserveBackWhenDepleted() (gas: 613461)
+EscrowedEXATest:testWithdrawMaxWithInvalidSender() (gas: 528095)
 FirewallTest:test_allow_allows_whenAllower() (gas: 69731)
 FirewallTest:test_allow_allows_whenDisallowedAndNotOriginalAllower() (gas: 227184)
 FirewallTest:test_allow_disallows_whenAllower() (gas: 112510)
@@ -171,18 +186,18 @@ IntegrationPreviewerTest:test_fixedRepayPosition_beforeMaturity() (gas: 579991)
 IntegrationPreviewerTest:test_fixedRepayPosition_maxUint() (gas: 79468)
 IntegrationPreviewerTest:test_fixedRepayPosition_saturatedFallback() (gas: 63069)
 IntegrationPreviewerTest:test_healthFactor() (gas: 463879)
-IntegrationPreviewerTest:test_previewDeposit_(uint256) (runs: 256, μ: 1590498, ~: 1594531)
+IntegrationPreviewerTest:test_previewDeposit_(uint256) (runs: 256, μ: 1590522, ~: 1594531)
 IntegrationPreviewerTest:test_previewHealthFactor() (gas: 5805369)
-IntegrationPreviewerTest:test_previewWithdraw_(uint256) (runs: 256, μ: 1649878, ~: 1654116)
+IntegrationPreviewerTest:test_previewWithdraw_(uint256) (runs: 256, μ: 1649866, ~: 1654116)
 InterestRateModelTest:testFixedBorrowRate() (gas: 2088868)
 InterestRateModelTest:testFixedRateRevertAlreadyMatured() (gas: 2083135)
 InterestRateModelTest:testFixedRateRevertUtilizationExceeded() (gas: 2097203)
 InterestRateModelTest:testFloatingBorrowRate() (gas: 2082456)
-InterestRateModelTest:testFuzzFixedRateGrowth(uint256,uint256,uint256,uint256) (runs: 256, μ: 2109190, ~: 2105195)
-InterestRateModelTest:testFuzzFixedRateTimeSensitivity(uint256,uint256,uint256) (runs: 256, μ: 2117000, ~: 2117161)
-InterestRateModelTest:testFuzzReferenceLegacyRateFixed(uint32,uint256,uint256[2],uint256[2],uint256,uint256,uint256) (runs: 256, μ: 12923635, ~: 13133097)
-InterestRateModelTest:testFuzzReferenceRateFixed(uint256,uint256,uint256,uint256,uint256,uint256,(uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,int256,uint256,uint256)) (runs: 256, μ: 2384745, ~: 2386875)
-InterestRateModelTest:testFuzzReferenceRateFloating(uint256,uint256,(uint256,uint256,uint256,uint256,uint256,uint256,uint256)) (runs: 256, μ: 2324314, ~: 2325007)
+InterestRateModelTest:testFuzzFixedRateGrowth(uint256,uint256,uint256,uint256) (runs: 256, μ: 2109504, ~: 2112742)
+InterestRateModelTest:testFuzzFixedRateTimeSensitivity(uint256,uint256,uint256) (runs: 256, μ: 2117003, ~: 2117161)
+InterestRateModelTest:testFuzzReferenceLegacyRateFixed(uint32,uint256,uint256[2],uint256[2],uint256,uint256,uint256) (runs: 256, μ: 12893486, ~: 13132915)
+InterestRateModelTest:testFuzzReferenceRateFixed(uint256,uint256,uint256,uint256,uint256,uint256,(uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,int256,uint256,uint256)) (runs: 256, μ: 2384344, ~: 2386613)
+InterestRateModelTest:testFuzzReferenceRateFloating(uint256,uint256,(uint256,uint256,uint256,uint256,uint256,uint256,uint256)) (runs: 256, μ: 2324315, ~: 2324948)
 InterestRateModelTest:testMinTimeToMaturity() (gas: 2107232)
 InterestRateModelTest:testRevertMaxUtilizationLowerThanWad() (gas: 268402)
 MarketTest:testAccountLiquidityAdjustedDebt() (gas: 654335)
@@ -337,7 +352,7 @@ PoolLibTest:testAtomicDepositBorrowRepayWithdraw() (gas: 45922)
 PoolLibTest:testBackupBorrow() (gas: 33624)
 PoolLibTest:testEarningsAccrual() (gas: 38952)
 PoolLibTest:testEarningsDistribution() (gas: 32679)
-PoolLibTest:testFuzzAddRemoveAll(uint8[12]) (runs: 256, μ: 104449, ~: 105534)
+PoolLibTest:testFuzzAddRemoveAll(uint8[12]) (runs: 256, μ: 106488, ~: 107653)
 PoolLibTest:testMaturityRangeLimit() (gas: 7866)
 PoolLibTest:testMaturityRangeTooWide() (gas: 11656)
 PreviewerTest:testAccountsReturningAccurateAmounts() (gas: 1686539)
@@ -516,8 +531,8 @@ StakedEXATest:invariantNoDuplicatedReward() (runs: 10, calls: 5000, reverts: 0)
 StakedEXATest:invariantRewardsUpOnly() (runs: 10, calls: 5000, reverts: 0)
 StakedEXATest:invariantShareValueIsOne() (runs: 10, calls: 5000, reverts: 0)
 StakedEXATest:testAlreadyListedError() (gas: 43677)
-StakedEXATest:testAvgIndex(uint256[3],uint256[2]) (runs: 256, μ: 1313851, ~: 1370678)
-StakedEXATest:testAvgStartTime(uint256[3],uint256[2]) (runs: 256, μ: 1241917, ~: 1298744)
+StakedEXATest:testAvgIndex(uint256[3],uint256[2]) (runs: 256, μ: 1317429, ~: 1370678)
+StakedEXATest:testAvgStartTime(uint256[3],uint256[2]) (runs: 256, μ: 1245495, ~: 1298744)
 StakedEXATest:testBalanceOfDeposit(uint80) (runs: 256, μ: 331886, ~: 339807)
 StakedEXATest:testBalanceOfWithdraw(uint256) (runs: 256, μ: 82393, ~: 82407)
 StakedEXATest:testCanChangeRewardsDurationWhenDisabled() (gas: 176331)
@@ -526,12 +541,12 @@ StakedEXATest:testClaimAndUnstake() (gas: 1622618)
 StakedEXATest:testClaimAndWithdrawAfterRefTime() (gas: 1029325)
 StakedEXATest:testClaimBeforeFirstHarvest() (gas: 527334)
 StakedEXATest:testDepositClaimsRewardsToReceiver() (gas: 1121108)
-StakedEXATest:testDepositEvent(uint256) (runs: 256, μ: 335227, ~: 334966)
-StakedEXATest:testDepositShouldClaim(uint256[2],uint32) (runs: 256, μ: 815891, ~: 754868)
+StakedEXATest:testDepositEvent(uint256) (runs: 256, μ: 335238, ~: 334966)
+StakedEXATest:testDepositShouldClaim(uint256[2],uint32) (runs: 256, μ: 832846, ~: 755532)
 StakedEXATest:testDepositToAnotherWithAllowance() (gas: 375284)
 StakedEXATest:testDepositToAnotherWithoutAllowanceShouldFail() (gas: 121959)
-StakedEXATest:testDepositWithdrawAvgStartTimeAndIndex(uint256[3],uint256,uint256[5]) (runs: 256, μ: 1881512, ~: 1904719)
-StakedEXATest:testEarnedWithTime(uint256) (runs: 256, μ: 86098, ~: 86314)
+StakedEXATest:testDepositWithdrawAvgStartTimeAndIndex(uint256[3],uint256,uint256[5]) (runs: 256, μ: 1887155, ~: 1906094)
+StakedEXATest:testEarnedWithTime(uint256) (runs: 256, μ: 86112, ~: 86314)
 StakedEXATest:testEmergencyAdminCanPauseNotUnpause() (gas: 175029)
 StakedEXATest:testFinishDistributionEmitEvent() (gas: 240752)
 StakedEXATest:testFinishDistributionLetsClaimUnclaimed() (gas: 1784865)
@@ -542,9 +557,9 @@ StakedEXATest:testGrantRevokeEmergencyAdmin() (gas: 117824)
 StakedEXATest:testGrantRevokePauser() (gas: 117836)
 StakedEXATest:testHandlerClaim(uint8) (runs: 256, μ: 485340, ~: 485340)
 StakedEXATest:testHandlerDeposit(uint80) (runs: 256, μ: 1231152, ~: 1263054)
-StakedEXATest:testHandlerHarvest(uint64) (runs: 256, μ: 403155, ~: 411143)
-StakedEXATest:testHandlerNotifyRewardAmount(uint64) (runs: 256, μ: 143611, ~: 136610)
-StakedEXATest:testHandlerSetDuration(uint32) (runs: 256, μ: 189027, ~: 218699)
+StakedEXATest:testHandlerHarvest(uint64) (runs: 256, μ: 403144, ~: 411143)
+StakedEXATest:testHandlerNotifyRewardAmount(uint64) (runs: 256, μ: 142888, ~: 136565)
+StakedEXATest:testHandlerSetDuration(uint32) (runs: 256, μ: 193976, ~: 218711)
 StakedEXATest:testHandlerSetMarket() (gas: 144553)
 StakedEXATest:testHandlerWithdraw(uint256) (runs: 256, μ: 102852, ~: 102866)
 StakedEXATest:testHarvestAmountWithReducedAllowance() (gas: 184605)
@@ -555,13 +570,13 @@ StakedEXATest:testHarvestWhenFinished() (gas: 326352)
 StakedEXATest:testHarvestX() (gas: 180952)
 StakedEXATest:testHarvestZero() (gas: 255436)
 StakedEXATest:testInitialValues() (gas: 196483)
-StakedEXATest:testInsufficientBalanceError(uint256) (runs: 256, μ: 63949, ~: 64151)
+StakedEXATest:testInsufficientBalanceError(uint256) (runs: 256, μ: 63948, ~: 64151)
 StakedEXATest:testMaxRewardsGasConsumption() (gas: 144674963)
 StakedEXATest:testMultipleClaimsVsOne() (gas: 21936440)
 StakedEXATest:testMultipleHarvests() (gas: 284083)
-StakedEXATest:testNoRewardsAfterPeriod(uint256) (runs: 256, μ: 1809808, ~: 1804391)
+StakedEXATest:testNoRewardsAfterPeriod(uint256) (runs: 256, μ: 1810574, ~: 1816281)
 StakedEXATest:testNotPausingRoleError() (gas: 39124)
-StakedEXATest:testNotifyRewardAmount(uint256,uint256) (runs: 256, μ: 155584, ~: 155564)
+StakedEXATest:testNotifyRewardAmount(uint256,uint256) (runs: 256, μ: 155609, ~: 155564)
 StakedEXATest:testNotifyRewardWithUnderlyingAsset() (gas: 460608)
 StakedEXATest:testOnlyAdminEnableReward() (gas: 1297302)
 StakedEXATest:testOnlyAdminFinishDistribution() (gas: 213640)
@@ -579,13 +594,13 @@ StakedEXATest:testPenaltyThresholdRange() (gas: 36989)
 StakedEXATest:testPermitAndDeposit() (gas: 452146)
 StakedEXATest:testPermitFailKeepsFlow() (gas: 484480)
 StakedEXATest:testRemoveDepositAllowance() (gas: 466913)
-StakedEXATest:testResetDepositAfterRefTime(uint256) (runs: 256, μ: 1033237, ~: 1032994)
-StakedEXATest:testRewardAmountNotifiedEvent(uint256) (runs: 256, μ: 105539, ~: 105269)
+StakedEXATest:testResetDepositAfterRefTime(uint256) (runs: 256, μ: 1033250, ~: 1032994)
+StakedEXATest:testRewardAmountNotifiedEvent(uint256) (runs: 256, μ: 105542, ~: 105269)
 StakedEXATest:testRewardNotListedError() (gas: 1177184)
-StakedEXATest:testRewardPaidEvent(uint256,uint256) (runs: 256, μ: 809095, ~: 854321)
-StakedEXATest:testRewardsAmounts(uint256) (runs: 256, μ: 1707492, ~: 1707275)
+StakedEXATest:testRewardPaidEvent(uint256,uint256) (runs: 256, μ: 807482, ~: 854316)
+StakedEXATest:testRewardsAmounts(uint256) (runs: 256, μ: 1707508, ~: 1707275)
 StakedEXATest:testRewardsDurationSetEvent(uint40) (runs: 256, μ: 52170, ~: 52149)
-StakedEXATest:testSetDuration(uint256,uint40) (runs: 256, μ: 65967, ~: 64453)
+StakedEXATest:testSetDuration(uint256,uint40) (runs: 256, μ: 65856, ~: 64453)
 StakedEXATest:testSetMarketAddressZero() (gas: 36979)
 StakedEXATest:testSetMarketOnlyAdmin() (gas: 1345554)
 StakedEXATest:testSetMaxRewardsTokensExceeded() (gas: 111958823)
@@ -597,12 +612,12 @@ StakedEXATest:testSetSavingsZeroAddressError() (gas: 37006)
 StakedEXATest:testTotalSupplyDeposit(uint80) (runs: 256, μ: 331272, ~: 339193)
 StakedEXATest:testTotalSupplyWithdraw(uint256) (runs: 256, μ: 81753, ~: 81767)
 StakedEXATest:testUntransferable(uint80) (runs: 256, μ: 339593, ~: 348672)
-StakedEXATest:testWithdrawEvent(uint256) (runs: 256, μ: 483392, ~: 483140)
+StakedEXATest:testWithdrawEvent(uint256) (runs: 256, μ: 483404, ~: 483140)
 StakedEXATest:testWithdrawRewardUnderlyingAsset() (gas: 456617)
 StakedEXATest:testWithdrawRewardsOnlyAdmin() (gas: 242200)
 StakedEXATest:testWithdrawRewardsOnlyReward() (gas: 1177174)
-StakedEXATest:testWithdrawSameAmountRewardsShouldEqual(uint256,uint256) (runs: 256, μ: 1064622, ~: 1107874)
-StakedEXATest:testWithdrawWithRewards(uint256) (runs: 256, μ: 895610, ~: 895358)
+StakedEXATest:testWithdrawSameAmountRewardsShouldEqual(uint256,uint256) (runs: 256, μ: 1062756, ~: 1107874)
+StakedEXATest:testWithdrawWithRewards(uint256) (runs: 256, μ: 895622, ~: 895358)
 StakedEXATest:testZeroRateError() (gas: 58274)
 StakingPreviewerTest:testAllClaimable() (gas: 769205)
 StakingPreviewerTest:testAllClaimed() (gas: 818952)

contracts/periphery/EXA.sol

@@ -1,18 +1,53 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.17;
 
+import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable-v4/access/AccessControlUpgradeable.sol";
 import {
   ERC20VotesUpgradeable
 } from "@openzeppelin/contracts-upgradeable-v4/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
+import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import { IERC7802 } from "@openzeppelin/contracts/interfaces/draft-IERC7802.sol";
+
+contract EXA is ERC20VotesUpgradeable, AccessControlUpgradeable, IERC7802 {
+  bytes32 public constant BRIDGE_ROLE = keccak256("BRIDGE_ROLE");
+
+  /// @custom:oz-upgrades-unsafe-allow constructor
+  constructor() {
+    _disableInitializers();
+  }
 
-contract EXA is ERC20VotesUpgradeable {
   function initialize() external initializer {
     __ERC20_init("exactly", "EXA");
     __ERC20Permit_init("exactly");
     __ERC20Votes_init();
     _mint(msg.sender, 10_000_000e18);
   }
 
+  function initializeV2(address admin_) external reinitializer(2) {
+    __AccessControl_init();
+    _grantRole(DEFAULT_ADMIN_ROLE, admin_);
+  }
+
+  function mint(address to, uint256 amount) external {
+    crosschainMint(to, amount);
+  }
+
+  function burn(address from, uint256 amount) external {
+    crosschainBurn(from, amount);
+  }
+
+  /// @inheritdoc IERC7802
+  function crosschainMint(address to, uint256 amount) public onlyRole(BRIDGE_ROLE) {
+    _mint(to, amount);
+    emit CrosschainMint(to, amount, msg.sender);
+  }
+
+  /// @inheritdoc IERC7802
+  function crosschainBurn(address from, uint256 amount) public onlyRole(BRIDGE_ROLE) {
+    _burn(from, amount);
+    emit CrosschainBurn(from, amount, msg.sender);
+  }
+
   function clock() public view override returns (uint48) {
     return uint48(block.timestamp);
   }
@@ -21,4 +56,10 @@ contract EXA is ERC20VotesUpgradeable {
   function CLOCK_MODE() public pure override returns (string memory) {
     return "mode=timestamp";
   }
+
+  function supportsInterface(
+    bytes4 interfaceId
+  ) public view override(AccessControlUpgradeable, IERC165) returns (bool) {
+    return interfaceId == type(IERC7802).interfaceId || super.supportsInterface(interfaceId);
+  }
 }