Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/add-account-contract.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@openzeppelin/wizard': patch
---

Add `account` contract types for ERC-4337. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
- **Potentially breaking changes**:
- Update pragma versions to 0.8.27. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
19 changes: 19 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": [
"@changesets/changelog-github",
{
"repo": "OpenZeppelin/contracts-wizard"
}
],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "master",
"updateInternalDependencies": "patch",
"ignore": [
"@openzeppelin/wizard-cairo-alpha",
"ui"
]
}
5 changes: 5 additions & 0 deletions .changeset/remove-redundant-overrides.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openzeppelin/wizard': patch
---

Remove redundant overrides in Governor. ([#522](https://github.com/OpenZeppelin/contracts-wizard/pull/522))
13 changes: 13 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Setup

runs:
using: composite
steps:
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 #v4.4.0
with:
node-version: 20.x
cache: yarn

- name: Install dependencies
run: yarn --frozen-lockfile --prefer-offline
shell: bash
28 changes: 28 additions & 0 deletions .github/workflows/changeset.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Changeset

on:
pull_request:
branches:
- master
types:
- opened
- synchronize
- labeled
- unlabeled

concurrency:
group: changeset-${{ github.ref }}
cancel-in-progress: true

jobs:
check:
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ignore-changeset') }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
fetch-depth: 0 # Include history so Changesets finds merge-base
- name: Set up environment
uses: ./.github/actions/setup
- name: Check changeset
run: npx changeset status --since=origin/${{ github.base_ref }}
6 changes: 3 additions & 3 deletions .github/workflows/compile-cairo-alpha-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: You can probably combine cairo-alpha-project and cairo-project into single composite action and use inputs to differentiate? Something to improve upon later

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2

- name: Setup node
uses: actions/setup-node@v4
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 #v4.4.0
with:
node-version: 20.x
cache: 'yarn'
Expand All @@ -34,7 +34,7 @@ jobs:
echo "SCARB_VERSION=$SCARB_VERSION" >> "$GITHUB_ENV"

- name: Setup Scarb
uses: software-mansion/setup-scarb@v1
uses: software-mansion/setup-scarb@f6ad35129872f897bdea556c09e11af8fb3293c0 #v1.5.1
with:
scarb-version: ${{ env.SCARB_VERSION }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/compile-cairo-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2

- name: Setup node
uses: actions/setup-node@v4
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 #v4.4.0
with:
node-version: 20.x
cache: 'yarn'
Expand All @@ -34,7 +34,7 @@ jobs:
echo "SCARB_VERSION=$SCARB_VERSION" >> "$GITHUB_ENV"

- name: Setup Scarb
uses: software-mansion/setup-scarb@v1
uses: software-mansion/setup-scarb@f6ad35129872f897bdea556c09e11af8fb3293c0 #v1.5.1
with:
scarb-version: ${{ env.SCARB_VERSION }}

Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Publish Packages

on:
workflow_dispatch:

concurrency: version-or-publish-${{ github.ref }}

jobs:
publish:
name: Publish Packages
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
environment: publish
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
fetch-depth: 0 # To get all tags
ref: ${{ github.ref }}
- name: Set up environment
uses: ./.github/actions/setup
- name: Create Prepare Release PR or Publish
id: changesets
uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc #v1.4.10
with:
title: Prepare Release
commit: Prepare Release
version: npm run version
publish: npm run publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually for improvements we can pass in provenance uploads using NPM_CONFIG_PROVENANCE: true

- name: Check changesets status
if: steps.changesets.outputs.hasChangesets == 'true'
run: |
echo "Changesets found. Merge Prepare Release PR before publishing."
exit 1
- name: Check publish status
if: steps.changesets.outputs.published == 'false'
run: |
echo "Publish failed. Check the logs for more details."
exit 1
34 changes: 11 additions & 23 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,9 @@ jobs:
format-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: 'yarn'
- name: Install dependencies
run: yarn install --network-concurrency 1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
- name: Set up environment
uses: ./.github/actions/setup
- name: Check formatting
run: yarn format:check
- name: Run linter
Expand All @@ -24,17 +20,13 @@ jobs:
deno-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
- name: Set up Deno 1.46.3 (matching Netlify edge function environment)
uses: denoland/setup-deno@v2
uses: denoland/setup-deno@909cc5acb0fdd60627fb858598759246509fa755 #v2.0.2
with:
deno-version: '1.46.3'
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: 'yarn'
- name: Install dependencies and build wizard packages
run: yarn install --frozen-lockfile
- name: Set up environment
uses: ./.github/actions/setup
- name: Deno check API
run: yarn type:check:api

Expand All @@ -49,16 +41,12 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x
cache: 'yarn'
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
- name: Set up environment
uses: ./.github/actions/setup
- name: Install Foundry
if: matrix.package == 'solidity'
uses: foundry-rs/foundry-toolchain@v1
- name: Install dependencies
run: yarn install
uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de #v1.4.0
- name: Compile TypeScript
run: yarn tsc
working-directory: packages/core/${{matrix.package}}
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Version Packages

on:
push:
branches:
- master

concurrency: version-or-publish-${{ github.ref }}

jobs:
version:
name: Prepare Release PR
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
fetch-depth: 0 # To get all tags
ref: ${{ github.ref }}
- name: Set up environment
uses: ./.github/actions/setup
- name: Create Prepare Release PR
uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc #v1.4.10
with:
title: Prepare Release
commit: Prepare Release
version: npm run version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ Then from the `packages/ui` directory:
## Creating Pull Requests (PRs)

As a contributor, we ask that you fork this repository, work on your own fork and then submit pull requests. The pull requests will be reviewed and eventually merged into the main repo. See ["Fork-a-Repo"](https://help.github.com/articles/fork-a-repo/) for how this works.

### Adding Changesets
If your PR modifies code generation logic under `packages/core`, you will need to add changesets for the relevant packages to summarize the changes. The PR's `Changeset` GitHub check will give an error if this condition is not satisfied.
- To add a changeset: from the root directory, run `yarn changeset`
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "root",
"private": true,
"type": "module",
"scripts": {
"prepare": "wsrun -m prepare",
"lint": "eslint",
Expand All @@ -10,7 +11,9 @@
"dev:ui": "yarn --cwd ./packages/ui dev",
"dev:api": "yarn --cwd ./packages/ui dev:api",
"dev": "concurrently --kill-others-on-fail --names \"UI,API\" --prefix-colors \"magenta.bold,green.bold\" \"yarn dev:ui\" \"yarn dev:api\"",
"run:core": "node ./scripts/run-command.mjs"
"run:core": "node ./scripts/run-command.mjs",
"version": "bash scripts/release/version.sh",
"publish": "bash scripts/release/publish.sh"
},
"workspaces": {
"packages": [
Expand All @@ -33,6 +36,8 @@
"prettier-plugin-svelte": "^3.3.3",
"typescript": "^5.7.3",
"typescript-eslint": "^8.29.0",
"wsrun": "^5.2.4"
"wsrun": "^5.2.4",
"@changesets/cli": "^2.29.2",
"@changesets/changelog-github": "^0.5.1"
}
}
3 changes: 1 addition & 2 deletions packages/core/cairo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"prepublish": "rimraf dist *.tsbuildinfo",
"test": "ava",
"test:update-snapshots": "ava --update-snapshots",
"test:watch": "ava --watch",
"version": "node ../../../scripts/bump-changelog.js"
"test:watch": "ava --watch"
},
"devDependencies": {
"@types/node": "^20.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/core/cairo_alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"prepublish": "rimraf dist *.tsbuildinfo",
"test": "ava",
"test:update-snapshots": "ava --update-snapshots",
"test:watch": "ava --watch",
"version": "node ../../../scripts/bump-changelog.js"
"test:watch": "ava --watch"
},
"devDependencies": {
"@types/node": "^20.0.0",
Expand Down
14 changes: 4 additions & 10 deletions packages/core/solidity/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# Changelog

## Unreleased

- Add `account` contract types for ERC-4337. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
- Remove redundant overrides in Governor. ([#522](https://github.com/OpenZeppelin/contracts-wizard/pull/522))

- **Potentially breaking changes**:
- Update pragma versions to 0.8.27. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))

## 0.5.4 (2025-04-01)

- Add validation for ERC20 premint field. ([#488](https://github.com/OpenZeppelin/contracts-wizard/pull/488))
Expand All @@ -16,7 +8,7 @@
## 0.5.3 (2025-03-13)

- Add ERC20 Cross-Chain Bridging, SuperchainERC20. ([#436](https://github.com/OpenZeppelin/contracts-wizard/pull/436))
**Note:** Cross-Chain Bridging is experimental and may be subject to change.
**Note:** Cross-Chain Bridging is experimental and may be subject to change.

- **Potentially breaking changes**:
- Change order of constructor argument `recipient` when using `premint`.
Expand Down Expand Up @@ -46,11 +38,12 @@
## 0.4.5 (2024-11-18)

- Add `stablecoin` and `realWorldAsset` contract types. ([#404](https://github.com/OpenZeppelin/contracts-wizard/pull/404))
**Note:** `stablecoin` and `realWorldAsset` are experimental and may be subject to change.
**Note:** `stablecoin` and `realWorldAsset` are experimental and may be subject to change.

## 0.4.4 (2024-10-23)

### Potentially breaking changes

- Update pragma versions to 0.8.22. ([#401](https://github.com/OpenZeppelin/contracts-wizard/pull/401))

## 0.4.3 (2024-04-08)
Expand All @@ -68,6 +61,7 @@
## 0.4.0 (2023-10-05)

### Breaking changes

- Update to OpenZeppelin Contracts 5.0. ([#284](https://github.com/OpenZeppelin/contracts-wizard/pull/284))
- Require constructor or initializer arguments for initial owner or role assignments if using access control.
- Use token-specific pausable extensions.
Expand Down
1 change: 0 additions & 1 deletion packages/core/solidity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"test": "ava",
"test:update-snapshots": "ava --update-snapshots",
"test:watch": "ava --watch",
"version": "node ../../../scripts/bump-changelog.js",
"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": {
Expand Down
3 changes: 1 addition & 2 deletions packages/core/stellar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"prepublish": "rimraf dist *.tsbuildinfo",
"test": "ava",
"test:update-snapshots": "ava --update-snapshots",
"test:watch": "ava --watch",
"version": "node ../../../scripts/bump-changelog.js"
"test:watch": "ava --watch"
},
"devDependencies": {
"@types/node": "^20.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/core/stylus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"prepare": "tsc",
"prepublish": "rimraf dist *.tsbuildinfo",
"test": "ava",
"test:watch": "ava --watch",
"version": "node ../../../scripts/bump-changelog.js"
"test:watch": "ava --watch"
},
"devDependencies": {
"@types/node": "^20.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/deno.lock

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

Loading
Loading