Merge branch 'master' into remix-encoding-fix

Author: CoveMB

.changeset/afraid-grapes-repeat.md

@@ -0,0 +1,5 @@
+---
+'@openzeppelin/wizard': patch
+---
+
+Updated community-contracts digest version

packages/core/solidity/package.json

@@ -22,7 +22,7 @@
     "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable"
   },
   "devDependencies": {
-    "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#2d607bd",
+    "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#269f9b5",
     "@openzeppelin/contracts": "^5.4.0",
     "@openzeppelin/contracts-upgradeable": "^5.4.0",
     "@types/node": "^20.0.0",

packages/core/solidity/src/stablecoin.test.ts.md

@@ -327,7 +327,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
+    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -362,7 +362,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
+    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -408,7 +408,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
+    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -588,7 +588,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
+    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊

packages/core/solidity/src/stablecoin.test.ts.snap

@@ -0,0 +1,17 @@
+import {
+  solidityERC20AIFunctionDefinition,
+  solidityERC721AIFunctionDefinition,
+  solidityERC1155AIFunctionDefinition,
+  solidityStablecoinAIFunctionDefinition,
+  solidityRealWorldAssetAIFunctionDefinition,
+  solidityGovernorAIFunctionDefinition,
+  solidityCustomAIFunctionDefinition,
+} from './solidity.ts';
+
+export const polkadotERC20AIFunctionDefinition = solidityERC20AIFunctionDefinition;
+export const polkadotERC721AIFunctionDefinition = solidityERC721AIFunctionDefinition;
+export const polkadotERC1155AIFunctionDefinition = solidityERC1155AIFunctionDefinition;
+export const polkadotStablecoinAIFunctionDefinition = solidityStablecoinAIFunctionDefinition;
+export const polkadotRealWorldAssetAIFunctionDefinition = solidityRealWorldAssetAIFunctionDefinition;
+export const polkadotGovernorAIFunctionDefinition = solidityGovernorAIFunctionDefinition;
+export const polkadotCustomAIFunctionDefinition = solidityCustomAIFunctionDefinition;

packages/ui/api/ai-assistant/function-definitions/polkadot.ts

@@ -20,16 +20,22 @@ import type { KindedOptions as StylusKindedOptions } from '../../../../core/styl
 import type { CommonContractOptions as StylusCommonContractOptionsBase } from '../../../../core/stylus/dist/common-options';
 export type StylusCommonContractOptions = Omit<StylusCommonContractOptionsBase, 'access'> & { access?: false };
 
+type SolidityContractsOptions = Omit<
+  SolidityKindedOptions,
+  'Stablecoin' | 'RealWorldAsset' | 'Account' | 'Governor'
+> & {
+  Stablecoin: Omit<SolidityKindedOptions['Stablecoin'], 'upgradeable'> & { upgradeable?: false };
+  RealWorldAsset: Omit<SolidityKindedOptions['RealWorldAsset'], 'upgradeable'> & { upgradeable?: false };
+  Account: Omit<SolidityKindedOptions['Account'], 'upgradeable' | 'access'> & { upgradeable?: false; access?: false };
+  Governor: Omit<SolidityKindedOptions['Governor'], 'access'> & { access?: false };
+};
+
 // Add supported language here
 export type LanguagesContractsOptions = {
-  solidity: Omit<SolidityKindedOptions, 'Stablecoin' | 'RealWorldAsset' | 'Account' | 'Governor'> & {
-    Stablecoin: Omit<SolidityKindedOptions['Stablecoin'], 'upgradeable'> & { upgradeable?: false };
-    RealWorldAsset: Omit<SolidityKindedOptions['RealWorldAsset'], 'upgradeable'> & { upgradeable?: false };
-    Account: Omit<SolidityKindedOptions['Account'], 'upgradeable' | 'access'> & { upgradeable?: false; access?: false };
-    Governor: Omit<SolidityKindedOptions['Governor'], 'access'> & { access?: false };
-  };
+  solidity: SolidityContractsOptions;
   cairo: CairoKindedOptions;
   cairoAlpha: CairoAlphaKindedOptions;
+  polkadot: Omit<SolidityContractsOptions, 'Account'>;
   stellar: Omit<StellarKindedOptions, 'Fungible' | 'NonFungible' | 'Stablecoin'> & {
     Fungible: StellarKindedOptions['Fungible'] & StellarCommonContractOptions;
     NonFungible: StellarKindedOptions['NonFungible'] & StellarCommonContractOptions;
@@ -45,6 +51,7 @@ export type LanguagesContractsOptions = {
 export type AllLanguagesContractsOptions = LanguagesContractsOptions['solidity'] &
   LanguagesContractsOptions['cairo'] &
   LanguagesContractsOptions['cairoAlpha'] &
+  LanguagesContractsOptions['polkadot'] &
   LanguagesContractsOptions['stellar'] &
   LanguagesContractsOptions['stylus'];
 //

packages/ui/api/ai-assistant/types/languages.ts

@@ -1,4 +1,5 @@
 import * as solidityFunctions from './ai-assistant/function-definitions/solidity.ts';
+import * as polkadotFunctions from './ai-assistant/function-definitions/polkadot.ts';
 import * as cairoFunctions from './ai-assistant/function-definitions/cairo.ts';
 import * as cairoAlphaFunctions from './ai-assistant/function-definitions/cairo-alpha.ts';
 import * as stellarFunctions from './ai-assistant/function-definitions/stellar.ts';
@@ -21,6 +22,7 @@ const getFunctionsContext = <TLanguage extends SupportedLanguage = SupportedLang
     solidity: solidityFunctions,
     cairo: cairoFunctions,
     cairoAlpha: cairoAlphaFunctions,
+    polkadot: polkadotFunctions,
     stellar: stellarFunctions,
     stylus: stylusFunctions,
   };
@@ -44,7 +46,7 @@ const buildAiChatMessages = (request: AiChatBodyRequest): ChatMessages => {
       content: `
       You are a smart contract assistant built by OpenZeppelin to help users using OpenZeppelin Contracts Wizard.
       The current options are ${JSON.stringify(request.currentOpts)}.
-      The current contract code is ${request.currentCode}, written in ${request.language}
+      The current contract code is ${request.currentCode}, written for the ${request.language} ecosystem.
       Please be kind and concise. Keep responses to <100 words.
     `.trim(),
     },

packages/ui/api/ai.ts

@@ -73,6 +73,7 @@
           <option value="alpha" />
         </select>
       </div>
+      <a class="switch switch-polkadot" href="/polkadot"><img src="/icons/polkadot.svg" alt="polkadot">Polkadot</a>
       <a class="switch switch-stellar" href="/stellar"><img src="/icons/stellar.svg" alt="stellar">Stellar</a>
       <a class="switch switch-stylus" href="/stylus"><img src="/icons/stylus.svg" alt="stylus">Stylus</a>
     </div>