Skip to content

Merge ETH - #2266

Merged
benbaley merged 131 commits into
PlatONnetwork:feature/bump-version-to-1.5.1from
niuxiaojie89:feature/bump-version-to-1.5.1
Jul 11, 2025
Merged

Merge ETH#2266
benbaley merged 131 commits into
PlatONnetwork:feature/bump-version-to-1.5.1from
niuxiaojie89:feature/bump-version-to-1.5.1

Conversation

@niuxiaojie81

Copy link
Copy Markdown
Contributor

No description provided.

benbaley and others added 30 commits April 10, 2024 17:37
Bumps [github.com/btcsuite/btcd](https://github.com/btcsuite/btcd) from 0.22.0-beta.0.20220111032746-97732e52810c to 0.24.0.
- [Release notes](https://github.com/btcsuite/btcd/releases)
- [Changelog](https://github.com/btcsuite/btcd/blob/master/CHANGES)
- [Commits](https://github.com/btcsuite/btcd/commits/v0.24.0)

---
updated-dependencies:
- dependency-name: github.com/btcsuite/btcd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
internal/web3ext: fix eth.call regression in console #26266
internal/web3ext: fix eth_call in console 2 #26268
niuxiaojie81 and others added 28 commits May 21, 2024 18:04
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.9+incompatible to 25.0.6+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v24.0.9...v25.0.6)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: mountdisk <mountdisk@icloud.com.>
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…o_modules/github.com/btcsuite/btcd-0.24.0

Bump github.com/btcsuite/btcd from 0.22.0-beta.0.20220111032746-97732e52810c to 0.24.0
…o_modules/github.com/docker/docker-25.0.6incompatible

Bump github.com/docker/docker from 24.0.9+incompatible to 25.0.6+incompatible
…ithub_actions/dot-github/workflows/actions/download-artifact-4.1.7

Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows
Remove duplicate write transaction types
Set chainid to config.chainid as default
all: rework trie committer #25320
Signed-off-by: binchengqu <bincheng@before.tech>
update gov param  max validators to 225
…ure/bump-version-to-1.5.1

# Conflicts:
#	core/vm/opcodes.go
#	eth/downloader/statesync.go
#	go.mod
#	go.sum
#	internal/debug/flags.go
#	x/xcom/common_config.go
…atONnetwork/PlatON-Go into feature/bump-version-to-1.5.1

# Conflicts:
#	build/ci.go
#	console/console.go
#	core/blockchain.go
#	core/blockchain_test.go
#	core/rawdb/schema.go
#	core/state/database.go
#	core/state/snapshot/generate.go
#	core/state/snapshot/generate_test.go
#	core/state/state_object.go
#	core/state/statedb.go
#	core/txpool/txpool.go
#	core/types/block.go
#	core/vm/opcodes.go
#	eth/downloader/queue.go
#	eth/filters/filter_system.go
#	eth/protocols/snap/sync_test.go
#	eth/tracers/internal/tracetest/calltrace_test.go
#	eth/tracers/internal/tracetest/util.go
#	eth/tracers/native/call.go
#	eth/tracers/native/gen_callframe_json.go
#	go.mod
#	go.sum
#	node/rpcstack_test.go
#	signer/core/signed_data_test.go
#	trie/secure_trie_test.go
#	trie/sync_test.go
#	trie/trie.go
#	trie/trie_test.go
@benbaley
benbaley merged commit 22d0eb9 into PlatONnetwork:feature/bump-version-to-1.5.1 Jul 11, 2025
1 of 4 checks passed
niuxiaojie81 added a commit to niuxiaojie89/PlatON-Go that referenced this pull request Jul 11, 2025
Merge pull request PlatONnetwork#2266 from niuxiaojie89/feature/bump-version-to-1.5.1
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.

5 participants