Skip to content

Merge release/3.4.0.0.0 to master#7052

Merged
wileyj merged 189 commits intostacks-network:masterfrom
wileyj:chore/fix_3.4_master_merge_conflicts
Mar 30, 2026
Merged

Merge release/3.4.0.0.0 to master#7052
wileyj merged 189 commits intostacks-network:masterfrom
wileyj:chore/fix_3.4_master_merge_conflicts

Conversation

@wileyj
Copy link
Copy Markdown
Collaborator

@wileyj wileyj commented Mar 27, 2026

This is the release/3.4.0.0.0 changes with a conflict resolution for the issue template regarding changelog entries

brice-stacks and others added 30 commits February 10, 2026 15:32
- `Originator` mode: `deny` mode for origin account, `allow` mode for
  others
- `MaySend` condition code for NFTs: the asset may be sent, but it
  doesn't have to be
Signed-off-by: Jacinta Ferrant <236437600+jacinta-stacks@users.noreply.github.com>
…ck if is for a post condition aborted transaction

Signed-off-by: Jacinta Ferrant <236437600+jacinta-stacks@users.noreply.github.com>
`supports_sip040_post_conditions` is more clear and future-safe.
Modify tests to ensure they always pass through this function, just like
in real world execution.
… into chore/stop-emitting-failed-transaction-events
Signed-off-by: Jacinta Ferrant <236437600+jacinta-stacks@users.noreply.github.com>
Signed-off-by: Jacinta Ferrant <236437600+jacinta-stacks@users.noreply.github.com>
Signed-off-by: Jacinta Ferrant <236437600+jacinta-stacks@users.noreply.github.com>
brice-stacks and others added 11 commits March 24, 2026 23:19
This reduces the scope of the change.
…d-const-callable

Feat/improved const callable
* release/3.4.0.0.0: (128 commits)
  chore: bump versions toml for 3.4.0.0.0
  test: be more explicit in all cases in tests
  chore: update versions for `3.4.0.0.0-rc2`
  test: add missing `to-ascii?` test
  test: add `stx-transfer?` test with constant sender
  test: update tests for new implementation
  test: add and update constant contract tests
  feat: move deploy flag into `ContractContext`
  alternative const-callable implementation
  initial work on marking contract-deploy
  chore: update 3.4 activation height
  chore: update versions to include `-rc1`
  Add changelog version for 3.4.0.0.0.0
  chore: update testnet epoch 3.4 activation height sample configs
  fix: handle `CallableContract`s correctly in comparisons
  Updated CI to download code coverage artifacts that prior tests uploaded, aggregate them into a single file, and upload that file to Coveralls as a final step in our CI process. Added coverage badge to README. Upgraded checkout actions.
  Adding epoch 3.4 to sample testnet configs
  feat: validate `prev_tenure_consensus_hash` in tenure change
  fix: use a window of 4200 sortitions (2 reward cycles), since the Stacks tip and sortition tip cannot be further apart than this
  tst: update `secp256r1-verify` tests to handle epochs correctly
  ...
Comment thread .github/PULL_REQUEST_TEMPLATE.md Outdated
Co-authored-by: Brice <232827048+brice-stacks@users.noreply.github.com>
@wileyj wileyj added this pull request to the merge queue Mar 30, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 30, 2026
@wileyj wileyj added this pull request to the merge queue Mar 30, 2026
Merged via the queue into stacks-network:master with commit d42ab0f Mar 30, 2026
338 checks passed
@wileyj wileyj deleted the chore/fix_3.4_master_merge_conflicts branch March 30, 2026 20:51
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot added the locked label Apr 7, 2026
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 7, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.