diff --git a/packages/core/solidity/CHANGELOG.md b/packages/core/solidity/CHANGELOG.md index 472717bec..7609fa9c0 100644 --- a/packages/core/solidity/CHANGELOG.md +++ b/packages/core/solidity/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog +## 0.10.15 (2026-09-03) + +- Update `@openzeppelin/tron-contracts` and `@openzeppelin/tron-contracts-upgradeable` dependencies to 5.6.0. ([#865](https://github.com/OpenZeppelin/contracts-wizard/pull/865)) + ## 0.10.14 (2026-08-25) - Add support for TRON Contracts. ([#806](https://github.com/OpenZeppelin/contracts-wizard/pull/806)) diff --git a/packages/core/solidity/package.json b/packages/core/solidity/package.json index a71c303b3..24eee9912 100644 --- a/packages/core/solidity/package.json +++ b/packages/core/solidity/package.json @@ -1,6 +1,6 @@ { "name": "@openzeppelin/wizard", - "version": "0.10.14", + "version": "0.10.15", "description": "A boilerplate generator to get started with OpenZeppelin Contracts", "license": "AGPL-3.0-only", "repository": "https://github.com/OpenZeppelin/contracts-wizard", @@ -30,8 +30,8 @@ "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#b0ddd27", "@openzeppelin/contracts": "^5.7.0", "@openzeppelin/contracts-upgradeable": "^5.7.0", - "@openzeppelin/tron-contracts": "5.6.0-rc.2", - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2", + "@openzeppelin/tron-contracts": "^5.6.0", + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0", "@types/node": "^20.0.0", "@types/semver": "^7.5.7", "ava": "^6.0.0", diff --git a/packages/core/solidity/src/environments/hardhat/tron/package-lock.json b/packages/core/solidity/src/environments/hardhat/tron/package-lock.json index fb38b17c2..3025307ed 100644 --- a/packages/core/solidity/src/environments/hardhat/tron/package-lock.json +++ b/packages/core/solidity/src/environments/hardhat/tron/package-lock.json @@ -12,7 +12,7 @@ "@nomicfoundation/hardhat-chai-matchers": "^2.0.6", "@nomicfoundation/hardhat-ethers": "^3.0.9", "@openzeppelin/hardhat-tron": "^0.1.0", - "@openzeppelin/tron-contracts": "5.6.0-rc.2", + "@openzeppelin/tron-contracts": "^5.6.0", "ethers": "^6.14.0", "hardhat": "^2.26.0", "ts-node": "^10.9.2", @@ -964,9 +964,9 @@ } }, "node_modules/@openzeppelin/tron-contracts": { - "version": "5.6.0-rc.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0-rc.2.tgz", - "integrity": "sha512-3cv6WH18Rl0+tRfKUHHzfURFJE18g8oqubwxj5MFnFVrL8TuM4Nx7qhfCuVxSX2AB1EPCgggrG1wMTMv8NfWjA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0.tgz", + "integrity": "sha512-hkgVIsvxn1qJDlg5spxRH9YYSupgk4EW9axTLu+xHjrJyVgnQ8GMztmn/lHVQYLiSFeJ7t8Mmvp1lCDUg9adsQ==", "dev": true, "license": "MIT" }, diff --git a/packages/core/solidity/src/environments/hardhat/tron/package.json b/packages/core/solidity/src/environments/hardhat/tron/package.json index add6e5d1f..c7198ac65 100644 --- a/packages/core/solidity/src/environments/hardhat/tron/package.json +++ b/packages/core/solidity/src/environments/hardhat/tron/package.json @@ -12,7 +12,7 @@ "@nomicfoundation/hardhat-chai-matchers": "^2.0.6", "@nomicfoundation/hardhat-ethers": "^3.0.9", "@openzeppelin/hardhat-tron": "^0.1.0", - "@openzeppelin/tron-contracts": "5.6.0-rc.2", + "@openzeppelin/tron-contracts": "^5.6.0", "ethers": "^6.14.0", "hardhat": "^2.26.0", "ts-node": "^10.9.2", diff --git a/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package-lock.json b/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package-lock.json index d8d707a2b..376b259fb 100644 --- a/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package-lock.json +++ b/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package-lock.json @@ -13,8 +13,8 @@ "@nomicfoundation/hardhat-ethers": "^3.0.9", "@openzeppelin/hardhat-tron": "^0.1.0", "@openzeppelin/hardhat-tron-upgrades": "^0.1.0", - "@openzeppelin/tron-contracts": "5.6.0-rc.2", - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2", + "@openzeppelin/tron-contracts": "^5.6.0", + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0", "ethers": "^6.14.0", "hardhat": "^2.26.0", "ts-node": "^10.9.2", @@ -970,20 +970,20 @@ } }, "node_modules/@openzeppelin/tron-contracts": { - "version": "5.6.0-rc.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0-rc.2.tgz", - "integrity": "sha512-3cv6WH18Rl0+tRfKUHHzfURFJE18g8oqubwxj5MFnFVrL8TuM4Nx7qhfCuVxSX2AB1EPCgggrG1wMTMv8NfWjA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0.tgz", + "integrity": "sha512-hkgVIsvxn1qJDlg5spxRH9YYSupgk4EW9axTLu+xHjrJyVgnQ8GMztmn/lHVQYLiSFeJ7t8Mmvp1lCDUg9adsQ==", "dev": true, "license": "MIT" }, "node_modules/@openzeppelin/tron-contracts-upgradeable": { - "version": "5.6.0-rc.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts-upgradeable/-/tron-contracts-upgradeable-5.6.0-rc.2.tgz", - "integrity": "sha512-znkpn2Veit8R+SDV4xOks36Kygfqexkxf/gu62fRB//tAxF5PDmqAuxe950iiwjOvaUen4ijddQreTgSS5M7Cg==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts-upgradeable/-/tron-contracts-upgradeable-5.6.0.tgz", + "integrity": "sha512-hzOaCx5Blju8zKv0P0c7ybBwbD/KM+LSeo3thEBitlp0DSC9bYCOE9ueJZt5SjBxmHKJoPaeBlQUakNOV1poQw==", "dev": true, "license": "MIT", "peerDependencies": { - "@openzeppelin/tron-contracts": "5.6.0-rc.2" + "@openzeppelin/tron-contracts": "5.6.0" } }, "node_modules/@openzeppelin/tron-runtime": { diff --git a/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package.json b/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package.json index 29a88face..40b9fc892 100644 --- a/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package.json +++ b/packages/core/solidity/src/environments/hardhat/tron/upgradeable/package.json @@ -13,8 +13,8 @@ "@nomicfoundation/hardhat-ethers": "^3.0.9", "@openzeppelin/hardhat-tron": "^0.1.0", "@openzeppelin/hardhat-tron-upgrades": "^0.1.0", - "@openzeppelin/tron-contracts": "5.6.0-rc.2", - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2", + "@openzeppelin/tron-contracts": "^5.6.0", + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0", "ethers": "^6.14.0", "hardhat": "^2.26.0", "ts-node": "^10.9.2", diff --git a/packages/core/solidity/src/environments/tronbox/package-lock.json b/packages/core/solidity/src/environments/tronbox/package-lock.json index bfef95d54..a28d3fcee 100644 --- a/packages/core/solidity/src/environments/tronbox/package-lock.json +++ b/packages/core/solidity/src/environments/tronbox/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "@openzeppelin/tron-contracts": "5.6.0-rc.2" + "@openzeppelin/tron-contracts": "^5.6.0" }, "devDependencies": { "tronbox": "^4.1.0" @@ -109,9 +109,9 @@ } }, "node_modules/@openzeppelin/tron-contracts": { - "version": "5.6.0-rc.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0-rc.2.tgz", - "integrity": "sha512-3cv6WH18Rl0+tRfKUHHzfURFJE18g8oqubwxj5MFnFVrL8TuM4Nx7qhfCuVxSX2AB1EPCgggrG1wMTMv8NfWjA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0.tgz", + "integrity": "sha512-hkgVIsvxn1qJDlg5spxRH9YYSupgk4EW9axTLu+xHjrJyVgnQ8GMztmn/lHVQYLiSFeJ7t8Mmvp1lCDUg9adsQ==", "license": "MIT" }, "node_modules/@pkgjs/parseargs": { diff --git a/packages/core/solidity/src/environments/tronbox/package.json b/packages/core/solidity/src/environments/tronbox/package.json index 8cd48286b..dd1a2a4f9 100644 --- a/packages/core/solidity/src/environments/tronbox/package.json +++ b/packages/core/solidity/src/environments/tronbox/package.json @@ -13,6 +13,6 @@ "tronbox": "^4.1.0" }, "dependencies": { - "@openzeppelin/tron-contracts": "5.6.0-rc.2" + "@openzeppelin/tron-contracts": "^5.6.0" } } diff --git a/packages/core/solidity/src/environments/tronbox/upgradeable/package-lock.json b/packages/core/solidity/src/environments/tronbox/upgradeable/package-lock.json index b5a73a4f2..bb4c6accc 100644 --- a/packages/core/solidity/src/environments/tronbox/upgradeable/package-lock.json +++ b/packages/core/solidity/src/environments/tronbox/upgradeable/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "@openzeppelin/tron-contracts": "5.6.0-rc.2", - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2" + "@openzeppelin/tron-contracts": "^5.6.0", + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0" }, "devDependencies": { "@openzeppelin/tronbox-upgrades": "^0.1.0", @@ -130,18 +130,18 @@ } }, "node_modules/@openzeppelin/tron-contracts": { - "version": "5.6.0-rc.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0-rc.2.tgz", - "integrity": "sha512-3cv6WH18Rl0+tRfKUHHzfURFJE18g8oqubwxj5MFnFVrL8TuM4Nx7qhfCuVxSX2AB1EPCgggrG1wMTMv8NfWjA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0.tgz", + "integrity": "sha512-hkgVIsvxn1qJDlg5spxRH9YYSupgk4EW9axTLu+xHjrJyVgnQ8GMztmn/lHVQYLiSFeJ7t8Mmvp1lCDUg9adsQ==", "license": "MIT" }, "node_modules/@openzeppelin/tron-contracts-upgradeable": { - "version": "5.6.0-rc.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts-upgradeable/-/tron-contracts-upgradeable-5.6.0-rc.2.tgz", - "integrity": "sha512-znkpn2Veit8R+SDV4xOks36Kygfqexkxf/gu62fRB//tAxF5PDmqAuxe950iiwjOvaUen4ijddQreTgSS5M7Cg==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/tron-contracts-upgradeable/-/tron-contracts-upgradeable-5.6.0.tgz", + "integrity": "sha512-hzOaCx5Blju8zKv0P0c7ybBwbD/KM+LSeo3thEBitlp0DSC9bYCOE9ueJZt5SjBxmHKJoPaeBlQUakNOV1poQw==", "license": "MIT", "peerDependencies": { - "@openzeppelin/tron-contracts": "5.6.0-rc.2" + "@openzeppelin/tron-contracts": "5.6.0" } }, "node_modules/@openzeppelin/tronbox-upgrades": { diff --git a/packages/core/solidity/src/environments/tronbox/upgradeable/package.json b/packages/core/solidity/src/environments/tronbox/upgradeable/package.json index 0d704ce1e..b543a8f20 100644 --- a/packages/core/solidity/src/environments/tronbox/upgradeable/package.json +++ b/packages/core/solidity/src/environments/tronbox/upgradeable/package.json @@ -16,7 +16,7 @@ "tronweb": "^6.0.0" }, "dependencies": { - "@openzeppelin/tron-contracts": "5.6.0-rc.2", - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2" + "@openzeppelin/tron-contracts": "^5.6.0", + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0" } } diff --git a/packages/core/solidity/src/index.ts b/packages/core/solidity/src/index.ts index d31fbb13a..e9ac4f09d 100644 --- a/packages/core/solidity/src/index.ts +++ b/packages/core/solidity/src/index.ts @@ -58,6 +58,7 @@ export { calculatePremint as calculateERC20Premint, scaleByPowerOfTen } from './ export { tronPrintProfile, sanitizeTronOptions, + compatibleTronContractsSemver, TRON_DEFAULT_BLOCK_TIME, TRON_SOLIDITY_VERSION, TRON_CONTRACTS_VERSION, diff --git a/packages/core/solidity/src/utils/transform-tron.test.ts b/packages/core/solidity/src/utils/transform-tron.test.ts index bdca5df34..a7246c4ab 100644 --- a/packages/core/solidity/src/utils/transform-tron.test.ts +++ b/packages/core/solidity/src/utils/transform-tron.test.ts @@ -114,6 +114,6 @@ test('uses erc7201 namespaced storage annotations to match tron-contracts-upgrad test('compatibility banner names TRON Contracts at the pinned version', t => { const source = printContract(buildERC20({ name: 'T', symbol: 'T' }), tronPrintProfile); - t.regex(source, /\/\/ Compatible with OpenZeppelin TRON Contracts 5\.6\.0-rc\.2/); + t.regex(source, /\/\/ Compatible with OpenZeppelin TRON Contracts \^5\.6\.0/); t.false(source.includes('OpenZeppelin Contracts ^')); }); diff --git a/packages/core/solidity/src/utils/transform-tron.ts b/packages/core/solidity/src/utils/transform-tron.ts index 02cb7df3f..ccda9dc8e 100644 --- a/packages/core/solidity/src/utils/transform-tron.ts +++ b/packages/core/solidity/src/utils/transform-tron.ts @@ -35,7 +35,9 @@ const TRON_SOLC_MAX_PATCH = 26; export const TRON_SOLIDITY_VERSION = capTronSolidityVersion(SOLIDITY_VERSION); /** Published `@openzeppelin/tron-contracts` / `-upgradeable` version the Wizard targets. */ -export const TRON_CONTRACTS_VERSION = '5.6.0-rc.2'; +export const TRON_CONTRACTS_VERSION = '5.6.0'; +/** Semver range shown in compatibility checks and generated contract banners. */ +export const compatibleTronContractsSemver = '^5.6.0'; function capTronSolidityVersion(version: string): string { const [major, minor, patch] = version.split('.').map(part => parseInt(part, 10)); @@ -87,7 +89,7 @@ export const tronPrintProfile: Options = { { name: 'OpenZeppelin TRON Contracts', path: '@openzeppelin/tron-contracts', - version: TRON_CONTRACTS_VERSION, + version: compatibleTronContractsSemver, }, ], }; diff --git a/packages/core/solidity/src/zip-hardhat-tron.test.ts.md b/packages/core/solidity/src/zip-hardhat-tron.test.ts.md index f0ebd3d65..d5e1cf088 100644 --- a/packages/core/solidity/src/zip-hardhat-tron.test.ts.md +++ b/packages/core/solidity/src/zip-hardhat-tron.test.ts.md @@ -11,7 +11,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {TRC20} from "@openzeppelin/tron-contracts/token/TRC20/TRC20.sol";␊ @@ -72,7 +72,7 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",␊ "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ @@ -170,7 +170,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {AccessControl} from "@openzeppelin/tron-contracts/access/AccessControl.sol";␊ @@ -278,7 +278,7 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",␊ "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ @@ -381,7 +381,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyNFT.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {TRC721} from "@openzeppelin/tron-contracts/token/TRC721/TRC721.sol";␊ @@ -441,7 +441,7 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",␊ "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ @@ -539,7 +539,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyMulti.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {Ownable} from "@openzeppelin/tron-contracts/access/Ownable.sol";␊ @@ -607,7 +607,7 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",␊ "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ @@ -707,7 +707,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {OwnableUpgradeable} from "@openzeppelin/tron-contracts-upgradeable/access/OwnableUpgradeable.sol";␊ @@ -801,8 +801,8 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ "@openzeppelin/hardhat-tron-upgrades": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ @@ -907,7 +907,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {OwnableUpgradeable} from "@openzeppelin/tron-contracts-upgradeable/access/OwnableUpgradeable.sol";␊ @@ -994,8 +994,8 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ "@openzeppelin/hardhat-tron-upgrades": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ @@ -1104,7 +1104,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyGovernor.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {GovernorUpgradeable} from "@openzeppelin/tron-contracts-upgradeable/governance/GovernorUpgradeable.sol";␊ @@ -1266,8 +1266,8 @@ Generated by [AVA](https://avajs.dev). "@nomicfoundation/hardhat-ethers": "^3.0.9",␊ "@openzeppelin/hardhat-tron": "^0.1.0",␊ "@openzeppelin/hardhat-tron-upgrades": "^0.1.0",␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2",␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0",␊ "ethers": "^6.14.0",␊ "hardhat": "^2.26.0",␊ "ts-node": "^10.9.2",␊ diff --git a/packages/core/solidity/src/zip-hardhat-tron.test.ts.snap b/packages/core/solidity/src/zip-hardhat-tron.test.ts.snap index 949f0f4f2..e1d87b703 100644 Binary files a/packages/core/solidity/src/zip-hardhat-tron.test.ts.snap and b/packages/core/solidity/src/zip-hardhat-tron.test.ts.snap differ diff --git a/packages/core/solidity/src/zip-tronbox.test.ts.md b/packages/core/solidity/src/zip-tronbox.test.ts.md index ee117a7db..a6fcd7b97 100644 --- a/packages/core/solidity/src/zip-tronbox.test.ts.md +++ b/packages/core/solidity/src/zip-tronbox.test.ts.md @@ -11,7 +11,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {TRC20} from "@openzeppelin/tron-contracts/token/TRC20/TRC20.sol";␊ @@ -148,7 +148,7 @@ Generated by [AVA](https://avajs.dev). "tronbox": "^4.1.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0"␊ }␊ }`, `README.md:␊ @@ -212,7 +212,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {Ownable} from "@openzeppelin/tron-contracts/access/Ownable.sol";␊ @@ -368,7 +368,7 @@ Generated by [AVA](https://avajs.dev). "tronbox": "^4.1.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0"␊ }␊ }`, `README.md:␊ @@ -432,7 +432,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyNFT.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {TRC721} from "@openzeppelin/tron-contracts/token/TRC721/TRC721.sol";␊ @@ -568,7 +568,7 @@ Generated by [AVA](https://avajs.dev). "tronbox": "^4.1.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0"␊ }␊ }`, `README.md:␊ @@ -632,7 +632,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyMulti.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {Ownable} from "@openzeppelin/tron-contracts/access/Ownable.sol";␊ @@ -781,7 +781,7 @@ Generated by [AVA](https://avajs.dev). "tronbox": "^4.1.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0"␊ }␊ }`, `README.md:␊ @@ -845,7 +845,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {OwnableUpgradeable} from "@openzeppelin/tron-contracts-upgradeable/access/OwnableUpgradeable.sol";␊ @@ -1030,8 +1030,8 @@ Generated by [AVA](https://avajs.dev). "tronweb": "^6.0.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0"␊ }␊ }`, `README.md:␊ @@ -1097,7 +1097,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyToken.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {OwnableUpgradeable} from "@openzeppelin/tron-contracts-upgradeable/access/OwnableUpgradeable.sol";␊ @@ -1278,8 +1278,8 @@ Generated by [AVA](https://avajs.dev). "tronweb": "^6.0.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0"␊ }␊ }`, `README.md:␊ @@ -1345,7 +1345,7 @@ Generated by [AVA](https://avajs.dev). [ `contracts/MyGovernor.sol:␊ // SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin TRON Contracts 5.6.0-rc.2␊ + // Compatible with OpenZeppelin TRON Contracts ^5.6.0␊ pragma solidity ^0.8.26;␊ ␊ import {GovernorUpgradeable} from "@openzeppelin/tron-contracts-upgradeable/governance/GovernorUpgradeable.sol";␊ @@ -1593,8 +1593,8 @@ Generated by [AVA](https://avajs.dev). "tronweb": "^6.0.0"␊ },␊ "dependencies": {␊ - "@openzeppelin/tron-contracts": "5.6.0-rc.2",␊ - "@openzeppelin/tron-contracts-upgradeable": "5.6.0-rc.2"␊ + "@openzeppelin/tron-contracts": "^5.6.0",␊ + "@openzeppelin/tron-contracts-upgradeable": "^5.6.0"␊ }␊ }`, `README.md:␊ diff --git a/packages/core/solidity/src/zip-tronbox.test.ts.snap b/packages/core/solidity/src/zip-tronbox.test.ts.snap index 6f86783ad..07bfe6cb1 100644 Binary files a/packages/core/solidity/src/zip-tronbox.test.ts.snap and b/packages/core/solidity/src/zip-tronbox.test.ts.snap differ diff --git a/packages/ui/src/main.ts b/packages/ui/src/main.ts index e44c1ae06..e92e5632e 100644 --- a/packages/ui/src/main.ts +++ b/packages/ui/src/main.ts @@ -13,7 +13,7 @@ import VersionedApp from './common/VersionedApp.svelte'; import { postMessage } from './common/post-message'; import UnsupportedVersion from './common/UnsupportedVersion.svelte'; import semver from 'semver'; -import { compatibleContractsSemver as soliditySemver, TRON_CONTRACTS_VERSION } from '@openzeppelin/wizard'; +import { compatibleContractsSemver as soliditySemver, compatibleTronContractsSemver } from '@openzeppelin/wizard'; import { compatibleContractsSemver as cairoSemver, contractsVersion as cairoVersion } from '@openzeppelin/wizard-cairo'; import { compatibleContractsSemver as cairoAlphaSemver, @@ -111,10 +111,10 @@ function evaluateSelection( } } case 'tron': { - if (requestedVersion === undefined || semver.satisfies(requestedVersion, TRON_CONTRACTS_VERSION)) { + if (requestedVersion === undefined || semver.satisfies(requestedVersion, compatibleTronContractsSemver)) { return { compatible: true, appType: 'tron' }; } else { - return { compatible: false, compatibleVersionsSemver: TRON_CONTRACTS_VERSION }; + return { compatible: false, compatibleVersionsSemver: compatibleTronContractsSemver }; } } case 'stellar': { diff --git a/packages/ui/src/solidity/tron-ide.test.ts b/packages/ui/src/solidity/tron-ide.test.ts index b7d5f45e0..ddf0f680f 100644 --- a/packages/ui/src/solidity/tron-ide.test.ts +++ b/packages/ui/src/solidity/tron-ide.test.ts @@ -63,8 +63,8 @@ test('tronIdeURL does not set remaps when remappings is empty', t => { test('tronIdeURL encodes remappings into remaps hash param', t => { const remappings = [ - '@openzeppelin/tron-contracts-upgradeable/=@openzeppelin/tron-contracts-upgradeable@5.6.0-rc.2/', - '@openzeppelin/tron-contracts/=@openzeppelin/tron-contracts@5.6.0-rc.2/', + '@openzeppelin/tron-contracts-upgradeable/=@openzeppelin/tron-contracts-upgradeable@5.6.0/', + '@openzeppelin/tron-contracts/=@openzeppelin/tron-contracts@5.6.0/', ]; const url = tronIdeURL('contract A{}', remappings, true); diff --git a/yarn.lock b/yarn.lock index 088389f60..44a1ffb17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -913,15 +913,15 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.7.0.tgz#3b13b3e6fe8d426c2af247975ddf6ab2a5bf148e" integrity sha512-IL2AZpI+7THMzt1u6Cxmc1zLwVnudtUGvrqXQ/HnbLKfQ/8dIWMMQPDwPIjRQzNrlAo4cxZaCGRB/XvwPo9ILA== -"@openzeppelin/tron-contracts-upgradeable@5.6.0-rc.2": - version "5.6.0-rc.2" - resolved "https://registry.yarnpkg.com/@openzeppelin/tron-contracts-upgradeable/-/tron-contracts-upgradeable-5.6.0-rc.2.tgz#29070638d1f246e245eb8ec588e3dbc7b2f27218" - integrity sha512-znkpn2Veit8R+SDV4xOks36Kygfqexkxf/gu62fRB//tAxF5PDmqAuxe950iiwjOvaUen4ijddQreTgSS5M7Cg== - -"@openzeppelin/tron-contracts@5.6.0-rc.2": - version "5.6.0-rc.2" - resolved "https://registry.yarnpkg.com/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0-rc.2.tgz#dc0703c436c051de0db3808c51f1dbfc8d3d243b" - integrity sha512-3cv6WH18Rl0+tRfKUHHzfURFJE18g8oqubwxj5MFnFVrL8TuM4Nx7qhfCuVxSX2AB1EPCgggrG1wMTMv8NfWjA== +"@openzeppelin/tron-contracts-upgradeable@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/tron-contracts-upgradeable/-/tron-contracts-upgradeable-5.6.0.tgz#a3b666e8c76d1045c6ff16d6455838ecb1422f2e" + integrity sha512-hzOaCx5Blju8zKv0P0c7ybBwbD/KM+LSeo3thEBitlp0DSC9bYCOE9ueJZt5SjBxmHKJoPaeBlQUakNOV1poQw== + +"@openzeppelin/tron-contracts@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/tron-contracts/-/tron-contracts-5.6.0.tgz#d348d41285fd112e9e37f6a9e723f09ee2aba33c" + integrity sha512-hkgVIsvxn1qJDlg5spxRH9YYSupgk4EW9axTLu+xHjrJyVgnQ8GMztmn/lHVQYLiSFeJ7t8Mmvp1lCDUg9adsQ== "@openzeppelin/uniswap-hooks@^1.2.1": version "1.2.1"