Skip to content

Merge master to production #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericglau merged 2 commits into from
Sep 3, 2026
Merged

Merge master to production #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
251a26b
Update TRON Contracts dependencies to 5.6.0 (#865)
ericglau Sep 3, 2026
564928f
Prepare Release (#867)
github-actions[bot] Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/core/solidity/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
6 changes: 3 additions & 3 deletions packages/core/solidity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/solidity/src/environments/hardhat/tron/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/solidity/src/environments/hardhat/tron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 9 additions & 9 deletions packages/core/solidity/src/environments/hardhat/tron/upgradeable/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/core/solidity/src/environments/hardhat/tron/upgradeable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/solidity/src/environments/tronbox/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/solidity/src/environments/tronbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"tronbox": "^4.1.0"
},
"dependencies": {
"@openzeppelin/tron-contracts": "5.6.0-rc.2"
"@openzeppelin/tron-contracts": "^5.6.0"
}
}
18 changes: 9 additions & 9 deletions packages/core/solidity/src/environments/tronbox/upgradeable/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/core/solidity/src/environments/tronbox/upgradeable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
1 change: 1 addition & 0 deletions packages/core/solidity/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export { calculatePremint as calculateERC20Premint, scaleByPowerOfTen } from './
export {
tronPrintProfile,
sanitizeTronOptions,
compatibleTronContractsSemver,
TRON_DEFAULT_BLOCK_TIME,
TRON_SOLIDITY_VERSION,
TRON_CONTRACTS_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/solidity/src/utils/transform-tron.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ^'));
});
6 changes: 4 additions & 2 deletions packages/core/solidity/src/utils/transform-tron.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -87,7 +89,7 @@ export const tronPrintProfile: Options = {
{
name: 'OpenZeppelin TRON Contracts',
path: '@openzeppelin/tron-contracts',
version: TRON_CONTRACTS_VERSION,
version: compatibleTronContractsSemver,
},
],
};
Expand Down
34 changes: 17 additions & 17 deletions packages/core/solidity/src/zip-hardhat-tron.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down Expand Up @@ -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";␊
Expand Down Expand Up @@ -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",␊
Expand Down
Binary file modified packages/core/solidity/src/zip-hardhat-tron.test.ts.snap
View file
Open in desktop
Binary file not shown.
Loading
Loading