Add ERC-20 option for embedding ERC-7786 based crosschain bridge

packages/common/src/ai/descriptions/solidity.ts

@@ -31,7 +31,7 @@ export const solidityERC20Descriptions = {
   flashmint:
     "Whether to include built-in flash loans to allow lending tokens without requiring collateral as long as they're returned in the same transaction.",
   crossChainBridging:
-    'Whether to allow authorized bridge contracts to mint and burn tokens for cross-chain transfers. Options are to use custom bridges on any chain, or the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.',
+    'Whether to allow authorized bridge contracts to mint and burn tokens for cross-chain transfers. Options are to use custom bridges on any chain, to embed an ERC-7786 based bridge directly in the token contract, or to use the SuperchainERC20 standard with the predeployed SuperchainTokenBridge. The SuperchainERC20 feature is only available on chains in the Superchain, and requires deploying your contract to the same address on every chain in the Superchain.',
   premintChainId: 'The chain ID of the network on which to premint tokens.',
   callback:
     'Whether to include support for code execution after transfers and approvals on recipient contracts in a single transaction.',

packages/core/solidity/hardhat.config.js

@@ -66,6 +66,7 @@ module.exports = {
         enabled: true,
         runs: 200,
       },
+      viaIR: true,
     },
   },
 };

packages/core/solidity/package.json

@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#b0ddd27",
-    "@openzeppelin/contracts": "^5.5.0",
+    "@openzeppelin/contracts": "git+https://github.com/OpenZeppelin/openzeppelin-contracts.git#master",
     "@openzeppelin/contracts-upgradeable": "^5.5.0",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.5.7",
@@ -41,4 +41,4 @@
     "ts-node": "^10.4.0",
     "typescript": "^5.0.0"
   }
-}
+}

packages/core/solidity/remappings.txt

@@ -1,2 +1,3 @@
 @openzeppelin/community-contracts/=node_modules/@openzeppelin/community-contracts/contracts/
 @openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/

packages/core/solidity/src/environments/hardhat/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "@nomicfoundation/hardhat-toolbox": "^6.1.0",
     "@openzeppelin/contracts": "^5.5.0",
+    "@openzeppelin/contracts-unreleased": "git+https://github.com/OpenZeppelin/openzeppelin-contracts.git#master",
     "hardhat": "^2.22.0"
   }
 }

packages/core/solidity/src/environments/hardhat/upgradeable/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "@nomicfoundation/hardhat-toolbox": "^6.1.0",
     "@openzeppelin/contracts": "^5.5.0",
+    "@openzeppelin/contracts-unreleased": "git+https://github.com/OpenZeppelin/openzeppelin-contracts.git#master",
     "@openzeppelin/contracts-upgradeable": "^5.5.0",
     "@openzeppelin/hardhat-upgrades": "^3.0.0",
     "hardhat": "^2.22.0"

packages/core/solidity/src/erc20.test.ts

@@ -168,6 +168,37 @@ testERC20('erc20 crossChainBridging custom managed', {
   access: 'managed',
 });
 
+testERC20('erc20 crossChainBridging embedded', {
+  crossChainBridging: 'embedded',
+});
+
+testERC20('erc20 crossChainBridging embedded ownable', {
+  crossChainBridging: 'embedded',
+  access: 'ownable',
+});
+
+testERC20('erc20 crossChainBridging embedded ownable mintable burnable', {
+  crossChainBridging: 'embedded',
+  access: 'ownable',
+  mintable: true,
+  burnable: true,
+});
+
+testERC20('erc20 crossChainBridging embedded roles', {
+  crossChainBridging: 'embedded',
+  access: 'roles',
+});
+
+testERC20('erc20 crossChainBridging embedded managed', {
+  crossChainBridging: 'embedded',
+  access: 'managed',
+});
+
+testERC20('erc20 crossChainBridging embedded upgradeable', {
+  crossChainBridging: 'embedded',
+  upgradeable: 'transparent',
+});
+
 testERC20('erc20 crossChainBridging superchain', {
   crossChainBridging: 'superchain',
 });