Skip to content

chore: sync main into develop#81

Merged
jonathunne merged 19 commits intodevelopfrom
chore/sync-main-into-develop
May 6, 2026
Merged

chore: sync main into develop#81
jonathunne merged 19 commits intodevelopfrom
chore/sync-main-into-develop

Conversation

@jonathunne
Copy link
Copy Markdown
Contributor

Summary

Brings develop up to date with main after extended drift since PR #65 (the last develop→main sync). Recent releases and improvements have gone directly to main; this PR catches develop up.

What's coming in

Conflict resolution

  • package.json: took main's wdk-wallet-evm: 1.0.0-beta.11
  • package-lock.json: regenerated via npm install against main's lockfile
  • src/wallet-account-read-only-evm-erc-4337.js: auto-merged cleanly (reuse-readonly fix coexists with develop's PR Cache quote fee #70 cache changes)
  • Dropped develop's .github/workflows/publish.yml in favor of main's public-publish.yml (the canonical release workflow used by recent releases Release: v1.0.0-beta.6 #73, Release: v1.0.0-beta.6 #75)

Heads-up for open PR authors

After this lands, the following PRs will need a rebase against fresh develop:

I'll comment on each PR after merge.

Test plan

  • Lint passes (modulo untracked local files not in this PR)
  • npm run build:types passes
  • CI build green

Made with Cursor

AlonzoRicardo and others added 19 commits February 25, 2026 12:43
chore: bump wdk-wallet-evm version, npm audit fix
docs: simplify README to Option A structure
Add Dependabot security monitoring
Bumps the security-minor-updates group with 1 update in the / directory: [follow-redirects](https://github.com/follow-redirects/follow-redirects).


Updates `follow-redirects` from 1.15.11 to 1.16.0
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.11...v1.16.0)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-version: 1.16.0
  dependency-type: indirect
  dependency-group: security-minor-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
…-minor-updates-85af2c71bb

chore(deps): bump follow-redirects from 1.15.11 to 1.16.0 in the security-minor-updates group across 1 directory
Brings develop up to date with main:
- dependabot security monitoring config (#76)
- README simplified to Option A structure (#68)
- public-publish.yml release workflow (replaces develop's older publish.yml)
- build.yml workflow permissions
- wdk-wallet-evm bumped to 1.0.0-beta.11 (#74)
- version bumped to 1.0.0-beta.6 (released)
- re-use read-only class fix (#72)
- follow-redirects security patch (#78)

Resolved conflicts:
- package.json: took main's wdk-wallet-evm 1.0.0-beta.11
- package-lock.json: regenerated via npm install
- src/wallet-account-read-only-evm-erc-4337.js: auto-merged cleanly

Dropped develop's .github/workflows/publish.yml in favor of main's
public-publish.yml (the canonical release workflow used by recent
releases #73, #75).

Co-authored-by: Cursor <cursoragent@cursor.com>
@jonathunne jonathunne merged commit 862abd9 into develop May 6, 2026
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants