Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix priority calculation in CreateTransaction #215

Merged
merged 12 commits into from
Mar 2, 2015

Conversation

vertoe
Copy link

@vertoe vertoe commented Mar 1, 2015

From bitcoin 0.9
bitcoin#5675

morcos and others added 12 commits February 19, 2015 19:20
Make this projection of priority in 1 block match the calculation in the low priority reject code.

Rebased-From: 2d9b0b7
Github-Pull: dashpay#5675

Conflicts:
	src/wallet.cpp
At least Ubuntu >= 14.04 based distributions don't have automake installed by default.
Added automake to build requirements
9cd1dd9 Fix priority calculation in CreateTransaction (Alex Morcos)
eduffield222 pushed a commit that referenced this pull request Mar 2, 2015
Fix priority calculation in CreateTransaction
@eduffield222 eduffield222 merged commit 369ca60 into dashpay:v0.11.2.x Mar 2, 2015
@vertoe vertoe deleted the devel-0.9-upstr branch March 2, 2015 11:25
kwvg pushed a commit to kwvg/dash that referenced this pull request Dec 21, 2022
* Add javascript binding tests

* install emsdk

* separate install emsdk and test
kwvg added a commit to kwvg/dash that referenced this pull request Nov 2, 2024
df6ef46d97 Merge pull request dashpay#292 from alex-sparus/hash-size
48d559a9ac Support hash size that's not std::size_t
045c2b386a Run cmake-format on cmake file
ba8fecad6a Merge pull request dashpay#291 from tusooa/tusooa/explicit-except
69824a3d10 Allow users to explicitly enable or disable exceptions
6f8b3d4c78 Merge pull request dashpay#290 from arximboldi/fix-exception-detect
41308e28ba Fix exception detection code
efbbbf3629 Merge pull request dashpay#289 from alex-sparus/remove-cpp20-requirement
43f26a0236 cereal loading into containers must not append
3aa1ed326d Make persist compatible with C++17
ccb0a9147d Merge pull request dashpay#288 from alex-sparus/fix-typos
297b952488 Use an American spelling of "stabilizes"
a661b1a36c Fix typos in the documentation
9d44126a31 Ooopsie, last commit broke file references
395f288df8 Ooops, subfolders cause problems with images in the sidebar
12e95ccd7b Turn the persistence into multiple pages and...
73be573647 Wrap the text at 72 characters
d8d5e5dd68 Merge pull request dashpay#278 from alex-sparus/immer-archive
646315ee78 Fix missing include
8c511df851 Document that incompatible_hash_wrapper caches the container
c77ca3466e Split with_pools.hpp into save and load
6b47b150e4 Remove any mention of spdlog
864aafa212 Explain the purpose of values_save and values_load
6a8f10f471 Add option to pass parameters to cereal archive
6de86001e9 More compact maps format: pairs are lists of 2 elements
ece80df164 Support persisting immer::array
d3860a6783 After merge fixes
6541206661 Merge pull request dashpay#215 from arximboldi/box-recursive-type
abf10a4110 Merge branch 'master' into box-recursive-type
af857bd7c0 Try fix usage of distance with glm
b9fb6d7274 Merge pull request dashpay#229 from Adela0814/master
f0d279cbea Auto-format
3dd6df5c12 Rephrase the descriptions
0ff74b79f8 Document the missing public API parts
3a789e38c8 Transforming nested containers
b70c8cb7ff More on the hash-based containers
7a77d1d82b Describe more transformations
fce0d225a5 Move the persist docs
1b4b405dad Describe transforming into the same type
d03534b543 Comments for the archive wrappers
da5c02a47f Move more stuff into details
2af3b9db7b Simplify xx_hash definitions
51920562b3 Rename the cereal archive wrappers
4583fcc141 Custom policy
aee44c1af2 Renames
57c118be21 Map and vector cereal support is not part of persist
3e8541283e Separate details from public API
2c2dfb8ab2 Remove some functions from the API part
2ff4780cda Fix build
236048f2e2 WIP Splitting implementation details from public API
e3ed8c6e71 Move out non-API docs
4246339647 Rephrase the pool explanation. More implementation docs.
9c9999e2b3 Policies documented
28f21c6e5a More narration in the docs, less in the code
bfa4c1ad66 Start the docs for persist, document the policy concept
31ba6b4891 Start the docs for persist
71b8248e12 Rename to get_pools_for_hana_type to make it clear it expects a hana struct
60c0dd5338 Save B and BL in vector pools
28da3c2753 Policy returns the pool's name directly
6cb1789cc7 Remove wrapping functions from the policy
052bc1eb37 Reduce hana in the interface
930bfafab5 Add to_json streaming version
d81e4b17b4 Runtime detection of non-unique pool names
e528c0298a Fix types traversal
9eeff41008 Export hasName from previous
e43223b341 Policy controls how the final value is saved into the archive
8443292dc1 Define policies to control how pool types and names are defined
9d409196ec Remove loaders from the pools for the normal scenario
b38f8fa5e9 Less repetition with load_pools
063a0d65d0 Remove dead code
1097bdc917 Increase/preserve structural sharing with boxes by preferring the older ones
7cd40ec657 Demonstrate the problem with boxes and recursive types
76d7b4df0b Test XML and streamline output archive
4d30d309e5 Unified custom archives
b26f88dfe5 More generic custom archives implementation
d6149f81d5 Recursive traversal of types to generate required pools
bbb1efac64 Rename "archive" into "persist"
e472779193 Loading inside or outside of the archive preserves sharing
40ae864f13 Demonstrate the current problem with two loaders
a8e65dc463 Using defaulted equality operator where possible
d495a6095f Type-wrapping function is customizable
41b18df725 Avoid generating useless JSON string
255ed24cd4 Support converting hash-based containers even when transformation changes the hash
999293cba8 Hit a weird compile-time bug with hana::overload
3f2464ac45 boost::hana::value template is unnecessary
a3aa663a73 Fix building with Clang14
e008fa5680 Load once again with exceptions enabled to validate the archive's consistency
9489ff7da9 Fix loading a nested archive
456011cade Converting loaders handle exceptions without corrupting memory
61c7e52bbb Trying to reproduce the weird crash but failing
62827e7d36 set conversion
c7657e4e58 Convert table properly
23002d7a74 Conversion continues, map works
c3fdb4486b Conversion preserves internal structural sharing
2028af3481 Recursive transformation works, mostly
76011c511c Demonstrate the problem of circular dependency between archives
2171c9a2f8 Add missing traits for conversions
dd5aac6c05 Fix for when not all archive types are converted
3ef2ad85d4 Much better interface for the recursive archives transformation
8d1d37fbb9 Recursive transformation actually works
b9d5b2ba64 Explore the problem of conversion
1c60ad7527 Ran `pre-commit run --all-files`
e00461b532 Format cmake
e4efd32b39 Disable format around NONIUS_BENCHMARK calls
2be563c438 Do not format tools/include
de235cbb2d Manually fixed files because the include order matters
6fa9a4f24d Enable auto-format
0546f81699 Fix build for clang 14
f4e9a3f9f2 Try auto-archive with type conversion
186e3b09da Saving and loading with archives for immer-types without wrapping them in archivable
be07f01fa8 Remove the is_constructible check because it breaks the usecase with forward declared types
aa801c4cb8 Support loading from streams
c5e6e37f33 Add save_archives helper function for the app code
9e81f906b1 Test conversion with a special archive
01caabb80f Archive conversion for tables
59ee3102e1 Rename immer-archive into just archive
243d000738 Rename fix_leaf_nodes to to_load_archive, in line with champ
5526e0e6cc Champ archive conversion for a map
bcc6db3236 Test vectors archive conversion
5878b11d3f Make sure that the type names are unique
16a8fecb44 Test recursive map, no problems
e7268e9370 Recursive box seems to work
e79ba951ac Start testing recursive types, WIP
57e2244d3a Box archiving. Recursive type WIP
a461c95269 Comfortable shell in macOS and Linux with `nix develop`
27e6e7805b Integrate immer-archive
18b42d2e7b Merge pull request dashpay#285 from jj683/make-set-map-nothrow-move
577b3e47f2 set/map nothrow move constructible/assignable
bd9f3188c7 Merge pull request dashpay#284 from black-sat/fix/aligned_storage
69efb28c54 Include util.hpp
2f9dede179 Make `details::aligned_storage` trivially constructible
a17b768c5f Remove usage of `std::aligned_storage`
00cdcbf90a Merge pull request dashpay#282 from arximboldi/fix-box-fwd-declare
6d22844a30 Make immer::box work with forward declared types
701e125f48 Do not disable StrictHostKeyChecking
de5d6d57be Use standard ssh port and correct path for uploading docs
d8fd87fc21 Merge pull request dashpay#281 from black-sat/master
f9874f62d6 Fixes `difference_type` being mispelled as `diference_type`.
57a8c5ede6 Merge pull request dashpay#279 from alex-sparus/catch-2-3
0f24d396f3 Fuzzers do not require Catch2
f381e4988c Use Catch2 v3
fe0b6f816d Merge pull request dashpay#276 from patstew/ccache-fix
d7984f4bd1 Merge pull request dashpay#275 from tjaneczko/patch-1
72da7a668d cmake: Only use ccache for C++
e644569255 Fix portability of IMMER_THROW when exceptions are disabled
5875f7739a Merge pull request dashpay#269 from pinotree/cmake-current-dir
e0c4b1793d cmake: use ${CMAKE_CURRENT_SOURCE_DIR} where possible
d0b79d5cbd Merge pull request dashpay#268 from pinotree/drop-findguile
5612ec803d cmake: drop FindGuile.cmake
b60403ca83 Merge pull request dashpay#267 from pinotree/system-catch2
eec85078f2 Drop unused copy of Catch2
ac49b71e42 Switch to system Catch2
615ed31635 nix: disable tests & examples
b70f1c27f1 Merge pull request dashpay#266 from pinotree/drop-doctest
b133b774d4 Drop the unused doctest copy
168768c5de tests: port dvektor to catch2
8872e233c3 Merge pull request dashpay#257 from vector-of-bool/cxx20-ranges-fixes
0b3aaf699b Merge pull request dashpay#263 from colugomusic/fix-msvc-explicit-destructor-call
10cd1f3312 Merge pull request dashpay#262 from colugomusic/fix-msvc-c2975
daff65041c Trying to satisfy LLVM.
88076f7329 Remove unneeded include
4585522553 Merge branch 'fix-msvc-explicit-destructor-call' of https://github.com/colugomusic/immer into fix-msvc-explicit-destructor-call
5516624d67 Manual destroy_at for C++14
205180bb13 Add missing #include required by gcc
77c2f422fe Fix whitespace
6672e57e26 Remove unused capture default
30fb619ce7 Use destroy_at to call explicit destructor in make_inner_n
813e891e25 Fix MSVC compile error C2975
21cc60ef11 Merge pull request dashpay#261 from colugomusic/fix-msvc-c2059
5125b83afb Fix MSVC compile error C2059
9549696683 Merge pull request dashpay#260 from arximboldi/fmt-fixes
4871c7455a Merge pull request dashpay#256 from dhly-etc/robust-loading
8a165e7bd2 Upgrade Nix in Actions
1b66f4ad2a Fix includes
4513c2f80d Upgrade install-nix-action
5f96a39d0d Merge pull request dashpay#259 from tocic/fix/dark_theme_logo
04c7d90fc4 Use alternative logo in dark mode
ae8abe0ce0 Return a direct reference from iterator operator[]
5722567343 Merge pull request dashpay#258 from bobkocisko/master
e382feab06 Fixing annoying unused local variable warning
ffb051721b Fixes and tests for C++20 Range compatibility
a983d6fe1a Make pretty-printer loading more robust
d98a68cd6c Merge pull request dashpay#255 from dhly-etc/gdb-pretty-printers
7ff66e0934 Add .gdbinit file to autoload pretty printers
9b8e1b340e Add array printer
0220ba4389 Add table printer
17915a5881 Add GDB pretty-printing support
adbb4cd311 Merge pull request dashpay#253 from tocic/fix/typos
c69ad466a1 Fix typos
9dad616455 Merge pull request dashpay#250 from LilyWangLL/AddConfigVersion
3630ec4080 Add quotes
54ba35145b Add export CMake Config version file
3c527e434b Merge pull request dashpay#246 from maierlars/feature/nothrow-move-constructible-flex-vector
119f9d858a Merge pull request dashpay#247 from urbanwe/urbanwe-patch-1
ec81042a26 Fix wrong order in operator<(T2, box<T>)
b7756f5e85 Use lambda for initialization.
9c67e60b44 Fixing assertions.
38edbd8be4 Attempt to make flex_vector nothrow move constructible/assignable.
a5991efbe4 Merge pull request dashpay#243 from arximboldi/memory-usage
ffef2712f3 Lower constants for memory usage so CI does not timeout
20eb876b80 Add benchmarks for checking CHAMP memory usage
58036b4eae Merge pull request dashpay#239 from arximboldi/release-v0.8
a814bcd592 Do not install specific old version of Nix
6b05223054 Upgrade install-nix-action
ad5acab104 Upgrade cachix action
de91bdb28e Prepare release 0.8.0
459854dc80 Merge pull request dashpay#238 from arximboldi/add-identity-api
2c8ceb6160 Add identity API
ca78d685ad Merge pull request dashpay#236 from DavidKorczynski/cifuzz-int
e870de6c0b Add CIFuzz GitHub action
4100eff397 Merge pull request dashpay#235 from arximboldi/more-fuzz-conflict
6e8a4f8f83 Add fuzzers that produce more conflicts
53b1e37e38 Merge pull request dashpay#233 from asa/make_gcc_pragma_ignore_clang
75cc8984e2 make clang ignore gcc pragma warning for champ
93ab7151cd Merge pull request dashpay#231 from arximboldi/fuzz-move
d5b6bf6b45 Strengthen the fuzzers even further
35c94037d4 Fix issues in map/set erase() found by fuzzer
b43a1ca2ac Fix fuzzer was not doing what we thought it did
048891443c Add set fuzzer that can find if the tree is corrupted by moves
8f105e275c Add map fuzzer that can find if the tree is corrupted by moves
54f0d543dc Merge pull request dashpay#230 from Kraks/patch-1
8acee494ba Fix typo in comment
107a1b332f Add vcpkg installation instructions
006461c8ec Merge pull request dashpay#227 from arximboldi/fix-debug-stats
0e07630e22 Fix debug stats
d98e82d66a Merge pull request dashpay#226 from arximboldi/fix-dec-unsafe
ad759c4783 Remove dec_unsafe() from the policies
4a8fd59e35 Remove dec_unsafe() usage in HAMT data-structures
a7b0e23771 Remove usage of dec_unsafe() in RBTS data-structures
e02cbd795e Merge pull request dashpay#225 from arximboldi/fix-champ-move
db3ea447ad Fix sometimes HAMTs would move out values that it should not!
34deab8781 Fix iteration over data-structures would sometimes allow mutation!
e5d79ed80e Merge pull request dashpay#222 from arximboldi/more-meta-improvements
6b57f13664 Add update_if_exists method to map and table and related transients
f3cebc63a1 Fix table and table_transient update()
bd1f0c00c0 Improve debug stats API
ad73ea14bf Merge pull request dashpay#221 from arximboldi/champ-stats
893c08461a Add tools for printing statistics about trees
037b34afe3 Fix memory leak
79ebe07f31 Merge pull request dashpay#220 from arximboldi/map-leak
c4be744a49 Try something
c37693ac4a Remove vestige
1c780ba19b Fix memory leak
30ce53b4df Add test for memory leak found by oss-fuzz
2a32d5db4d Add update_move operation to map fuzzer
d22262967a Merge pull request dashpay#216 from arximboldi/hamt-transients-faster-rc-sub
1897252813 Remove vestige
f0defde7dd Ensure that champ update operations move the payload in the value
175c05fb3a Fix dashpay#219, ambiguous calls to destroy_n
c25a272ac7 Move objects whenever possible during champ erasure operations
95889a7aa2 Merge pull request dashpay#218 from cyrilRomain/master
898f7d8e82 Fix -fno-exceptions build (regression from 35147686)
1bbfb46bf3 Merge pull request dashpay#217 from arximboldi/hamt-transients-faster-rc
9caf11101a Fix ambiguities when compiling in C++17 mode
27132d5183 Mark a bunch of functions as noexcept
d004c6e4bf Fix implementation of unordered_copy
e3ddbb7a98 Optimize our own implementation of uninitialized_copy
778ad6718f Use std::copy when possible, our own uninitialized_copy elsewhere
265d79a5ba Our own implementations for uninitialied_... are better, use always
54ff4a21a7 Improve implementation of std shims
3514768617 Use standard library implementations of shims whenever possible
98d4f983cb Move values when node can be mutated but needs realloc (champ::update_mut)
a89f7c98c6 Move values when node can be mutated but needs realloc (champ::add_mut)
5e9fe0b347 Fix table documentation header
72be85b931 Merge pull request dashpay#214 from arximboldi/table-fixes
1f41bbf0ac Improve sequential initialization of HAMTs
4736697d3b Update the documentation of HAMT-based transients
efc91fe724 Make immer::table and table_transient use mutation when possible
00f9e49882 Add missing link table_transient in the documentation
b8dbc6ab96 Merge pull request dashpay#213 from arximboldi/sub-transients
359c3a4ddf Add example with variant, same issue
1c2f3a5cd3 Add test for case shown by @ajihyf
f5ebe48b13 Add benchmarks for HAMT erasure
9e62f8ccd5 Ensure that edit markers are set properly during transient updates
175edad908 Sketch mutable removal from HAMTs
815541445d Merge pull request dashpay#210 from deadb0d4/single_hash_index
6cc2b39159 Merge pull request dashpay#212 from arximboldi/more-transients
9985fc131e review: add  to docs/container & fix update docs
002f4e6ba5 Fix mutable HAMT insertion with conflicts
dd8a3ac8c5 Test more exception safety of mutable operations on vectors
0f72f261aa Style: clang-format
416f4c71c4 Implement transients for map update()
8f0b8a043f Merge branch 'master' into single_hash_index
3a38bd7662 add docs & run clang-format
dbc96d6fc4 add test stub for table_transient
db88f93ed5 cosmetics + table tests
70a3620c4e Merge pull request dashpay#211 from arximboldi/fix-map-leak
54037e1aaf Fix sanitizers were not properly enabled in CI
cf20d291e5 Fix memory leak when mutating inner nodes
88cf946cfc Merge pull request dashpay#209 from arximboldi/map-add-transience
cb76e80313 add headers + examples
8f01c1babe cosmetic fixes
982aa1f6dc Fix insertion benchmarks
5f42f9069d Mutate collision nodes in-place when possible
7fd0ec4d8d Mutate champ nodes values in place when possible
0c0d313c40 Fix potential destruction of uninitialized values
91d065c9bf Reuse same-sized inner nodes during HAMT insertions
3ea3ae9c45 Sketch implementation interface for transient insertion
e3744032a8 Merge pull request dashpay#208 from arximboldi/map-transients
22323150fb Add move and transient versions for the HAMT insertion benchmarks
a56e6f8007 Style: clang-format
a9a672bfb0 Add naive implementation of map and set transients
ca255452c3 Add move-based updates on immutable maps and sets
eb5056c4cb Add map and set range constructors
440f7519b2 Sketch map and set transient types
6b27170212 Fix compiling some tests would crash
b38c67b3a1 Merge pull request dashpay#206 from audulus/spm
b3139b4055 Immer is compatible with C++14
380dc52dfc Add spm job
9370c89597 Work on SPM support.
a1271fa712 Merge pull request dashpay#202 from philipcraig/patch-1
9af8724378 Update README.rst
9c7bb910a2 Update README.rst
88887fd9a5 Update README.rst
9da861dea5 Update memory.rst
fa61a3ed9d Update atom.hpp
d7dd8a729f Update transients.rst
3ceb4be6a1 Update map.hpp
e1d29d0dad Update vector.hpp
3d12e12cbb Update array.hpp
749035b5c9 Update array.hpp
1f9910eae1 fix typo
d2648aceea Merge pull request dashpay#201 from mvtec-richter/patch-1
70d6b6eb16 Fix typo in documentation of diff
0fcf66743e Tweak diff docs
ef80e6c5f7 Merge pull request dashpay#200 from arximboldi/diff-polish
7ba2196e4c Add missing header
36178a7aa6 Add the diffing algorithm to the fuzzers
af99b84519 Document diff algorithm
25b20e77c1 Simplify diff algorithm interface
3db544b73a Avoid passing Differ template param, use universal references
d372683b7a Merge pull request dashpay#199 from mvtec-richter/add-diff-method-to-map
f23dc6cdf7 Remove incorrect usage of std::forward
a4482d56e0 Introduce struct differ
f91922ec95 Add diff to set and avoid std::pair in champ
0f8eae238c Add diffing algorithm to maps
42e6beafed Merge pull request dashpay#197 from bollu/master
926098ccc8 Typo fix: frony -> front
24214158f5 Merge pull request dashpay#196 from arximboldi/nix-build-issues
9b770ec715 Do not try to use a build dir, because we have a BUILD file
98a8f1b7a5 Do not rely on git to fetch the code locally
2f12be4d65 Allow changing nixpkgs version
d6d27de64a Merge pull request dashpay#193 from arximboldi/fix-github-actions
6b299fc0a5 Upgrade Nix related actions
a3617d5f3b Disable ssh stuff when it's not me
5adcd67e55 Ignore Nix result links
36d1000deb Fix comment

git-subtree-dir: src/immer
git-subtree-split: df6ef46d97e1fe81f397015b9aeb32505cef653b
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.

7 participants