neo-project / neo

80%

master: 79%

LAST BUILD ON BRANCH fix-dev-conflicts

branch: fix-dev-conflicts

CHANGE BRANCH

x

Reset

• fix-dev-conflicts
• 3s-consensus
• CallFromNativeContractAsync
• Fix-rpcclient-command
• HF_Echidna
• IReadOnlyStore
• Neo.Json.Benchmarks
• Optimize.rpc-with-signers-witnesses
• Split-Snapshot-and-readOnly
• WhiteListedFeeUnitTests
• add-contribution-guidelines
• add-deepwiki-badge
• add-icon
• add-mempool-ut
• add-rpcException-helpers
• add-some-checks
• add.assert-committee
• add.mldsa65
• add.serilog
• add.serilog-n3
• add.sha3-512
• add/coding-rules
• add/docker-img-label
• add/extensions/contractstate
• add/extensions/gastoken
• add/extensions/neotoken
• add/neo-build-tasks
• add/optimizations-on-release
• add/plugins/rest-server
• add/random-ranage-contract
• addRocksDbToNeoCli
• allow-backlist-hash
• allow-mempool-remove
• autoinstall-storage-provier
• avoid-change-set-from-readonly
• avoid-duplicate-condition
• avoid-serialization-issues
• avoit-ut-parallel
• base58-patch
• bip-39
• bl12318
• block-interval
• blockAccount-callflags
• blockAccount-flags
• bloom-filter-hashset
• build-script
• cache-packages
• call-states-hf
• ceiling-bigint
• change-crypto-package
• check-nullable
• check-protected-methods
• clean-ci
• clean-crypto
• clean-json
• clean-plugins
• clear-votes
• code-style
• comments.numeric-ops
• comments.rpc-server
• coverage-exclude
• create-import-export-block-file
• crypto-sha512
• custom-contract-gas
• datacache-fix-lock
• dbft-fuzz
• dbft-plugin-tests
• dbft-timer-adjustment
• dev
• dev.neo-build
• dev/add/UInt160-type
• dev/add/addhex
• dev/add/block-builder
• dev/add/debuginfo
• dev/add/fix/internals-to
• dev/add/indexer-evaluation-stack
• dev/add/listblockedaccounts
• dev/add/memorysearch-tests
• dev/add/plugin-security
• dev/add/protected-applicationengine
• dev/add/random-update-biginteger
• dev/add/rest-server-plugin
• dev/add/test-results
• dev/add/try-one-liner
• dev/add/vulnerable-check
• dev/add/wallet-multisig
• dev/fix-plugins
• dev/fix/async-unit-tests
• dev/fix/ceiling-extension
• dev/fix/coverallsapp
• dev/fix/directory-layout
• dev/fix/docker-workflow-remove-dlls
• dev/fix/github-issues
• dev/fix/github-workflow-release
• dev/fix/plugin-settings
• dev/fix/random
• dev/fix/readme
• dev/fix/stackitem-equatable
• dev/fix/sync-threads-neosystem
• dev/fix/syscall-getrandom
• dev/fix/upnp
• dev/master
• dev/remove/RotateLeft
• dev/remove/gui
• dev/remove/replace-random
• disable-compression
• disallow-multiple-dynamic
• divideStateService
• doc.native-contracts-api
• doc.plugin-rpcserver
• doc.plugin-rpcserver-part2
• doc.plugin-signclient
• doc.pqc
• doc.rpcmethod-from-plugins
• doc.serialization-format
• ec-recover
• ec-recover-v2
• echidna-attr-fee
• ed25519
• ensure-native-id
• ensure-notary-attr
• exec-fee-4-decimals
• exec-fee-two-decimals
• exp-plugin
• extend-tests
• extensible-capabilities
• fast-resync
• fea.add-ut-for-LogStorageStore
• feat.ISigner-interface
• feat.ReadOnlyStoreView
• feat.add-some-ut-tests
• feat.bechmarks-switch
• feat.clear-array-for-IndexQueue
• feat.cli-indicator
• feat.const-storage-keys
• feat.make-bitcount-simple
• feat.more-exception-info
• feat.more-parameter-type-support-for-RpcMethod
• feat.murmur128-is-noncryptogrphic-hash
• feat.murmur3-non-cryptographic-hash
• feat.murmur32-appendable
• feat.optimize-cache-memory
• feat.optimize-hex-decode
• feat.optimize-nep6wallet-name
• feat.remove-private-key-from-dbft
• feat.remove-unnecessary-old-impls
• feat.scan-readonly-storeview
• feat.serilog
• feat.set-name-when-create-wallet
• feat.show-net-active-yet
• feat.signclient-vsock
• feat.start-with-signer
• feat.try-get-hash
• feat.upgrade-to-lang-version-13
• feat.use-IReadOnlyStoreView
• feat.use-ReadOnlyStore-canonical-TryGet
• feat.witness-empty
• feat/governance-blacklist-clean
• feat/native-bench-html
• feature/bls12-eth-aliases
• feature/bn254-curve-support
• feature/chaos-testing-framework
• feature/comprehensive-cli-testing
• feature/improve-stringextensions-exception-messages
• feature/invokeabi-command
• feature/network-ut-abnormal
• feature/opentelemetry
• feature/oracle-dns-protocol
• feature/plugin-alc-loader
• feature/plugin-sandbox-documentation
• feature/refactor-vote-cli
• feature/unicode-multisig-sign
• feature/vm-integer-optimization
• feature/vote-cli-clean
• fix-3006
• fix-3629
• fix-4316
• fix-big-decimal-hash-code
• fix-block-1465790
• fix-build-error
• fix-capability-validation
• fix-disable-compression-capability
• fix-ec-hashcode
• fix-hf-activation
• fix-interop-serialization
• fix-mac-ut
• fix-manifest
• fix-master
• fix-master-n3-publish
• fix-mem-bug
• fix-mgmt-callflags
• fix-name
• fix-native-contract-path
• fix-notnull-ref
• fix-null-header
• fix-obsolete
• fix-p2p
• fix-remove-candidates
• fix-remove-ut-check-zero
• fix-rpc-error-codes
• fix-rpc-issue
• fix-scripts
• fix-standard-scripts-verification
• fix-state
• fix-update-native-api
• fix-ut
• fix-ut-hf
• fix-ut-localnode
• fix-warnings
• fix-wf
• fix-whitelist-destroy
• fix.AddSignature-ok
• fix.ContractNameOrHashOrId-if-name
• fix.DataCache-Find-keyPrefix
• fix.FluentAssertions-in-notary-tests
• fix.InvokeContractVerify
• fix.Seek-with-empty-keyPrefix
• fix.UInt160-TryParse
• fix.account-not-found
• fix.add-log-stacktrace
• fix.assert-arguments-order
• fix.auto-label
• fix.avoid-datacopy-in-Keccak256
• fix.biginteger-modinverse
• fix.check-account-lock
• fix.check-more-parameter
• fix.check-witness-null
• fix.comment-on-DataCache.GetInternal
• fix.concurrent-conflicts-in-Cache
• fix.consistent-behavior-for-hash-methods
• fix.dir-of-datacache-ut
• fix.fluent-assertation-residual
• fix.getnativecontract-null
• fix.hash-size-value
• fix.key-default-value-for-help-cmd
• fix.lock-batch-for-rocksdb
• fix.no-interactive-in-mac-and-linux
• fix.null-reference
• fix.params-to-few-errcode
• fix.pinvoke-shouldnot-be-visible
• fix.random-next-bigint
• fix.reference-count-in-Map
• fix.return-NotNullIfNotNull
• fix.rpc-errcode-ifnull-with-RpcMethodWithParams
• fix.rpcserver-settings-default-values
• fix.seek-start-key
• fix.seek-with-null
• fix.settings-path
• fix.sign-specific-data
• fix.some-typos
• fix.the-only-warnings
• fix.tx-tojson-no-cosigners
• fix.ugly-unit-tests
• fix.unepxtec-log-source
• fix.unicode-escape
• fix.ut-out-of-bound
• fix.zero-can-be-modify
• fix/benchmark-native-fallback
• fix/byte-array-comparer
• fix/ci-builds
• fix/code
• fix/datacache-find-methods
• fix/datacache-store
• fix/ddos
• fix/devcontainer
• fix/dotnet-version
• fix/enforcement-style
• fix/faun-fee-scaling
• fix/filenames-lineendings
• fix/hotfixes-core
• fix/keybuilder-fast
• fix/leveldb-deps
• fix/macos-leveldb-error-message
• fix/memorystore-and-snapshot
• fix/neo-cli-docker
• fix/neo-projects
• fix/optimizeRpcClient
• fix/peer-bootstrap
• fix/peer-config-stash
• fix/plugins-loading-assembly
• fix/plugins-output
• fix/readme-new-badges
• fix/removes-xunit-for-good
• fix/rpcclient-rpcstack
• fix/signclient-arm64-macos
• fix/storage-caching
• fix/storageitem-fast-access
• fix/storagekey-fast-access
• fix/stuff
• fix/test-projects
• fix/workflow-crash
• fix/workflow-release-leveldbstore
• fix/workflows-vm
• fix_warnings
• flat-reward-init
• format-script
• fs-cfg-upd
• gas-tests
• gasreward-index-timestamp
• happy-new-year
• hf-faun
• hf-faun-auto-claim-gas
• hf-gorgon
• improve-calculate-network-fee
• improve-docker
• improve-exception-messages
• improve-high-mempool
• improve-log-exception-load-plugin
• improve-ripemd160
• improve-storage-dumper
• improve.remove-lock-in-Snapshot
• iserializable-span-extend
• isolate-log-event
• isolate-ut
• issue-metrics
• jimmy/p2p-quic-autoswitch-n3
• jobj-constructor
• json-clean
• json-fuzzer
• json-plus
• jtoken-decorator
• latest-plugins
• ledger-debugger
• length-attribute
• log-level
• map-constructor
• master
• master-2.x
• master-n3
• master.neo-build
• maxconditionnesting
• mem-fix-usage
• mem-pool-improve
• mempool-event-improve
• mempool-flooding
• merge/neo-build-into-dev
• more-2025
• move-gas
• move-memory-store
• move.rpcclient-tests
• mpt-clean
• mpt-style
• mtb-policy
• n3-allow-remove-tx
• n3-improve-io
• n3-null-interop
• n3-optimize-whitelist
• n3-sync-docs
• n3-unvote-blocked
• n4-cache-headers
• n4-optimize-key-builder
• n4-treasury-init
• n4-unwrap-key
• n4-verificable-snapshot-optional
• native-nep30
• neo-build.dev/add/build-utilities
• neo-build.dev/add/create-command
• neo-build.dev/add/current
• neo-build.dev/add/dbft-configuration2
• neo-build.dev/add/debug-sinks
• neo-build.dev/add/debugger-engine
• neo-build.dev/add/formatting-console
• neo-build.dev/add/jsonrpc
• neo-build.dev/add/neosystem-chain
• neo-build.dev/add/neosystem-chain2
• neo-build.dev/add/neosystem-chain3
• neo-build.dev/add/node-configurations-models
• neo-build.dev/add/node-tools
• neo-build.dev/add/token-classes
• neo-build.dev/add/transaction-debugging
• neo-build.dev/add/wallet-exceptions
• neo-build.dev/add/wallet-lock
• neo-build.dev/add/webhostbuilder
• neo-build.dev/fix/part6
• neo-build.dev/master
• neo-build/Neo.Build.Core/add/error-codes
• neo-build/Neo.Build.Core/add/exceptions/base
• neo-build/Neo.Build.Core/add/exceptions/file-access-denied
• neo-build/Neo.Build.Core/add/exceptions/general-module
• neo-build/Neo.Build.Core/add/exceptions/invalid-file-format
• neo-build/Neo.Build.Core/add/exceptions/path-not-found
• neo-build/add/appengine-logging
• neo-build/add/cli-cmds
• neo-build/add/exceptions
• neo-build/add/json-converters
• neo-build/add/json-models
• neo-build/add/neo-build-cli
• neo-build/add/protocol-load-process
• neo-build/add/settings-configuration
• neo-build/add/settings-protocol
• neo-build/add/test-applicationengine
• neo-build/add/toolset-commands
• neo-build/add/toolset-configurations
• neo-build/add/wallet-models
• neo-build/docs
• neo-build/init-project
• neo-build/protocol-settings
• neo-cli.dev/add/providers
• neo-cli.dev/add/services
• neo-cli.dev/add/setup-proj
• neo-express-v3.7.5
• neo-md
• neo-without-akka
• neo.master/fix/ci-release
• nep-25
• nep-25-extendedtype-validation
• nep-25-master
• nep27-neo
• nep27-registration
• net10
• new_show_state
• nft
• notary-assisted
• notary-contract
• notify
• nullable
• nullable-applogs
• nullable-bloom-merkle
• nullable-ecpoint
• nullable-io-plugins
• nullable-leveldb
• nullable-rocks-db
• nullable-storage
• nullable.MPT-Trie
• nullable.TokensTracker
• opcode-benchmark-suite
• optimize-KeyedCollectionSlim
• optimize-block-deserialize
• optimize-calculate-bonus
• optimize-check-contract
• optimize-get-sign-data
• optimize-hash
• optimize-import
• optimize-key-builder
• optimize-key-method
• optimize-mem
• optimize-mpt
• optimize-pr-4144
• optimize-pubKey
• optimize-remote-node
• optimize.HashSetCache
• optimize.NoEscapedChar
• optimize.TestBit-semantics
• optimize.TrailingZeroCount-if-available
• optimize.add-more-comments-for-context
• optimize.add-more-exception-info
• optimize.avoid-stackalloc
• optimize.cache-impl
• optimize.command-tokenizer
• optimize.common-prefix
• optimize.explicitly-types
• optimize.help-for-command
• optimize.install-sc
• optimize.keyed-collections
• optimize.main-service
• optimize.merge-RpcMethod-RpcMethodWithParams
• optimize.more-exception-info
• optimize.nullable-SQLiteWallet
• optimize.nullable-checking
• optimize.random-sample-peers
• optimize.read-line
• optimize.remove-AsParallel-in-cache
• optimize.remove-some-unsafes
• optimize.rpcserver-nullable
• optimize.sh-script
• optimize.state-service
• optimize.uint-hex-string
• optimize.uint-parse
• optimize.use-Property-instead-of-Method
• optimize.use-RpcMethod-instead
• optimize.use-RpcMethod-instead-part2
• optimize.use-SequnceCompareTo
• optimize.why-format-exception
• optimzie.show-state
• partial-fix-2346
• patch-1
• patch-2
• perf/array-based-evaluation-stack
• perf/instruction-caching
• perf/precompiled-jumptable
• persistence-doc
• pick.show-net-active-yet
• plugin.sign-client
• plugin.signclient-v2
• policy-blocktime
• policy-maxvub
• port-more-log
• pr-4043
• pr-4201
• public-cache
• public-invocation-tree
• publish-packages-n3
• rc-v2
• read-only-interops
• readme
• readonly-bigdecimal
• rebuild/the-split-10
• reduce_me_args
• remove-blame
• remove-bls12381
• remove-fluentassertions
• remove-handler-neo4
• remove-handlers-neo3
• remove-hardforks
• remove-multi-framework
• remove-neo-vm
• remove-neocli-and-plugins
• remove-netstandard-phase-one
• remove-obsolete
• remove-raw-read-only-store
• remove-ripemd160
• remove-some-api
• remove-trackable-key
• remove-upnp
• remove.AllowUnsafeBlocks
• remove.n3.unused-bigint-extensions
• remove.obsolete-AesGcm
• remove.unnecessary-ut-benchmark
• remove.unnecessary-warning-disable
• remove.unused-bigint-extensions
• remove.unused-json-rewrite
• remove/plugin-applicationlogs
• rename-hash
• request-blocked-funds
• resource-release
• restrict-notifications-count
• revert-3809-remove-multi-framework
• revert-4305-fix.consistent-behavior-for-hash-methods
• revert-pr-4225
• review-3782
• right-type
• rpc-client-md
• rpcserver-ut
• runtime-copy-local-lockfiles
• safe-clone-interop
• script.ps-instead-of-bat
• script.run-localnodes
• self-storage
• send-archival
• set-v4-version
• sha-pinning
• shargon-auto-label
• shargon-patch-1
• shargon-patch-2
• sign-data
• simplify-contract-method-attribute
• simplify-events
• simplify-fork-checks
• some-styles
• sql-wallet-nullable
• storage-add-log
• storage-cache
• storage-dumper-fix
• storage-interfaces
• storage-nullable
• style-neoSystem
• style-sqliwallet
• style.add-info-to-ArugmentException
• style.avoid-alloc-empty-array
• style.cache-clearer
• style.format-long-lines
• style.json-format
• style.move-bigint-extensions
• style.move-to-string-extensions
• style.mpt-benchmark
• style.neo-vm
• style.proper-assert
• style.remove-Unsafe
• style.remove-UnsafeData
• style.rpc-json-init
• style.state-plugin
• style.string-compare
• style.too-long-strings
• style.underline-var
• style.unify-json-init
• style.use-ThrowIfNull-instead
• style.user-proper-assert-methods
• style.user-proper-assert-methods-part2
• style.var-underscore
• syscall-hf
• telemetry
• telemetry-1
• telemetry-2
• telemetry-3
• telemetry-4
• test-missed-stateServiceTests
• test/bigdecimal-clean
• test/ut-oncommand
• test888-leveldb
• testing-improvements
• tests.intergration
• tests/neo-system
• token-management
• treasury-n4
• trie-ut
• ultra-docker
• unify-ext
• unify-storage-ut
• unify-verify-arg
• unittest.invalid-parameters-for-ecdsa
• update-build-dev
• update-doc
• update-dotnet-sdk-9.0.300
• update-nugets
• update-packages
• update-workflow
• use-date-utc
• use-header-cache
• use-key-builder
• ut-mpt
• ut.sqlite-wallet
• v3.7.5
• v3.8
• v3.8.0
• v3.8.1
• v3.8.1toMaster
• v3.8.2
• v3.8.2-draft
• validate-circular-reference
• vm-fuzzer
• vm-hotpath-benchmarks
• vncoelho-patch-1
• whitelist-n4
• whitelisted-fee-definition

Build # 18995754577

Build Type

Pull #4262

github

Committed by web-flow

Commit Message

Merge 039edb0a7 into 9b9be4735

Pull Request Pull Request #4262: Fix dev to master conflicts

Run Details

6518 of 9080 branches covered (71.78%)

Branch coverage included in aggregate %.

178 of 187 new or added lines in 12 files covered. (95.19%)

4 existing lines in 2 files now uncovered.

23077 of 27784 relevant lines covered (83.06%)

128181.11 hits per line