input-output-hk / cardano-ledger-specs

69%

master: 51%

LAST BUILD ON BRANCH mhuesch/fix_merge_mess

branch: mhuesch/fix_merge_mess

CHANGE BRANCH

x

Reset

• mhuesch/fix_merge_mess
• 790-update-bib-entry-in-blockchain-spec
• HEAD
• SRE-36_haskell_overhaul
• add-cbor-diag-and-cddl
• address_binary_format
• andre/mc-spec-changes
• apache-licensing
• bors/staging
• cddl-serialize-tests
• cddl_feedback
• codeowners-update
• coot/shelley-header-size
• coot/windows
• csoroz/first-slot
• csoroz/fix-ppup
• csoroz/fix_approx_versions
• csoroz/missing_terms
• csoroz/non-integral_fixes
• csoroz/non_integer-test_code
• csoroz/parens-in-deposits-function
• csoroz_fix_typo
• dcoutts/address-serialisation-stubs
• dcoutts/export-predicatefailures
• dcoutts/fix-sdist
• dcoutts/metadata-proposal
• dcoutts/metadata-proposal-2
• dcoutts/native-multisig
• dcoutts/script-addresses
• dcoutts/update-deps
• dnadales/284-utxo-and-txouts-must-be-disjoint
• dnadales/297-add-coverage-for-deleg-traces
• dnadales/458-update-prose-pbft-header-processing
• dnadales/465-fix-adoption-threshold-rules
• dnadales/476-check-money-is-constant
• dnadales/482-remove-sigcnt-from-bhead
• dnadales/493-remove-travis
• dnadales/494-integrate-coveralls
• dnadales/511-test-dcerts-cannot-be-replayed
• dnadales/535-time-traveling-property-byron
• dnadales/536-fix-pvbump
• dnadales/538-create-stylish-haskell-configuration-and-instructions
• dnadales/549-upireg-traces-generator
• dnadales/550-align-upivotes-exec-spec
• dnadales/550-write-upivotes-generators
• dnadales/551-upiend-trace-generators
• dnadales/604-add-support-for-mutated-traces
• dnadales/617-initial-environment-from-trace-length
• dnadales/621-add-update-payload-to-chain-traces
• dnadales/657-increase-alreadyproposedsv-coverage
• dnadales/675-implement-sdeleg-verify
• dnadales/679-fix-add-votes-discrepancy
• dnadales/711-initial-scaffolding-invalid-chain-conformance-tests
• dnadales/752-faster-trace-generators-using-edskos-ideas
• dnadales/764-check-coverage-of-delegation-errors
• dnadales/787-additional-operators-needed-for-max-sizes-conformance-tests
• dnadales/787-change-hash-type-to-maybe-in
• dnadales/790-remove-pvbump-properties-and-tests
• dnadales/add-abstract-size-instance-for-mockdsign
• dnadales/add-badges
• dnadales/add-missing-changes-to-time-travel-prop
• dnadales/build-and-publish-isabelle-artifacts
• dnadales/qc-trace-generators
• dnadales/remove-stability-check-when-bumping-avs
• dnadales/specify-numbers-of-cores-to-be-used
• dnadales/to-cbor-instances
• dndales/771-generate-invalid-upiregs
• edsko/deps-20191120
• erikd/Werror
• erikd/deps-20190916
• erikd/deps-20190923
• erikd/deps-20190930
• erikd/deps-20191009
• erikd/deps-20200217
• erikd/deps-20200218
• erikd/deps-20200415
• erikd/expose
• erikd/fix-homepage
• erikd/index-state
• erikd/nfdata
• erikd/non-integer-warnings
• erikd/rankntypes
• erikd/roundtrip
• erikd/unused-imports
• erikd/update-deps
• erikd/update-deps-20190911
• erikd/updates
• erikd/version-update
• erikd/view-patterns
• exec_spec/shelley/STS_rules_second_part
• exec_spec/shelley/app-version-update-examples
• exec_spec/shelley/avup-sync
• exec_spec/shelley/better-chain-unit-test
• exec_spec/shelley/cbor-cert-tests
• exec_spec/shelley/converge_STS_newepoch
• exec_spec/shelley/fix-deregistration
• exec_spec/shelley/fix-pointer-addresses
• exec_spec/shelley/genesis-delegation-example
• exec_spec/shelley/genesis_delegation_map_stability
• exec_spec/shelley/getting-stylish
• exec_spec/shelley/metadata
• exec_spec/shelley/mir_apply_example
• exec_spec/shelley/mir_example_v2
• exec_spec/shelley/new-epoch-example
• exec_spec/shelley/non-trivial-rewards
• exec_spec/shelley/pool-refends-deducted-from-deposits
• exec_spec/shelley/ppup-predicates
• exec_spec/shelley/relational_operators
• exec_spec/shelley/remove-map-map-set-set
• exec_spec/shelley/remove-tuples
• exec_spec/shelley/small-chain-sts-test
• exec_spec/shelley/sum-type-prev-header-hash
• exec_spec/shelley/update-examples
• exec_spec/shelley/update-proposal-and-cleanup-nonces
• exec_spec/shelley/update_mechanism
• exec_spec/shelley/vrf-keys
• exec_specs/shelley/mir-example
• fix/cabal_dev_option
• ignore-pdfs
• intricate/bimap-0.4.0
• intricate/fix-subtractFees
• intricate/get-entire-utxo
• intricate/shelley-keys-nfdata
• intricate/vkey-complete-pragmas
• jc/active_slot_coeff_a_constant
• jc/add-bytes-to-fee-examples
• jc/adopt_gen_delegs_in_tick
• jc/align-pool-params-with-stake-snapshot
• jc/cbor-rationals-with-tag
• jc/explain_hkd_in_protocol_parameters
• jc/fee-examples
• jc/fix-cddl-group-tests
• jc/fix-empty-genesis-keys-bug
• jc/fix-examples
• jc/fix_cabal_dependency_for_test_lib
• jc/fix_total_stake
• jc/from-origin
• jc/generate-nonneg-coins
• jc/lasik
• jc/lte-for-max-size-checks
• jc/new-addr-types
• jc/no-pool-reg-last-stability-window
• jc/non-myopic-api
• jc/non-myopic-calc
• jc/pool-relays
• jc/redo-network-ids
• jc/remove-application-versions
• jc/remove-redundant-vkey-in-header
• jc/remove_serialiseAddr_comments_re_unfinished
• jc/rename-byron-packages-and-modules
• jc/rename_stability_constants
• jc/report_keys_invalid_sig_better
• jc/safety-zone
• jc/spec/cryptographic-specifications
• jc/spec/from-origin
• jc/spec/header-only-validation
• jc/spec/make-prtcl-block-independent
• jc/spec/remove-app-versions
• jc/spec/unpack-nes-in-newepoch-rules
• jc/split-qc-and-hh
• jc/store-prev-proto-params
• jc/total_stake_is_max_minus_reserves
• jc/txid-is-function-of-txbody
• jc/utxo_deposits
• jc/utxow-better-errors
• jc/vertical_stylish_imports
• jdiaz/constant-money-proof
• jdiaz/isabelle-proofs-transfer
• jdiaz/no-double-spending-proof
• jdiaz/utxo-diff-proof
• jordan/expose-prtlseqfailure-constructors
• jordan/fix-op-cert-transition-info
• jordan/remove-undefined
• khedits
• master
• mdimjasevic/263-utxo-properties
• mdimjasevic/473-pvbump-prop
• mdimjasevic/505-hedgehog-1.0
• mdimjasevic/512-upiec-prop
• mdimjasevic/517-mv-keyhash
• mdimjasevic/548-upi-init-rules
• mdimjasevic/551-upiend-tr-gen
• mdimjasevic/556-k-in-env
• mdimjasevic/623-merge-upd-thresholds
• mdimjasevic/628-tags-upsvv
• mdimjasevic/646-utxo-generators
• mdimjasevic/655-utxo-tx-order
• mhuesch/806
• mhuesch/869
• mhuesch/870
• mhuesch/870_cont
• mhuesch/870_follow_on_rereg
• mhuesch/871_RetirePool
• mhuesch/950
• mhuesch/document_STS_PFs_structural_throwable
• mhuesch/fix-stylish-haskell
• mhuesch/gitignore
• mhuesch/goblins_v7_decode_only
• mhuesch/integrate-goblins
• michal/example-1-comments
• michal/example-1-comments-really-signed
• michal/example-1-comments-signed
• michal/example-2
• michal/example-2c
• milestone-2019-06-14
• mrBliss/compact-overlay-schedule-encoding
• mrBliss/fix-bprotvert-typo
• mrBliss/fix-decoder-bug
• mrBliss/fix-haddock-parse-errors
• mrBliss/fix-thunks
• mrBliss/nounexpectedthunks-chain
• mrBliss/nounexpectedthunks-globals
• mrBliss/prtcl-block-independent
• mrBliss/remove-left-over-debug-trace
• mrBliss/shelley-spec-ledger-test-package
• mrBliss/txFullBytes
• multi-sig-fix
• nc/api
• nc/bump-deps
• nc/callStack
• nc/callstack
• nc/constants
• nc/crypto
• nc/deps
• nc/filtered-utxo
• nc/fix-nightly
• nc/fix-nix
• nc/genesisStake
• nc/ipv6-encode
• nc/issue-743
• nc/key-ord
• nc/keys
• nc/orm2
• nc/orm3
• nc/ormolu
• nc/praos
• nc/praos-int
• nc/retire-certs
• nc/shelley
• nc/sss-fix
• nc/test-fix
• nc/tick
• nc/truncateUnitInterval
• nc/txgen
• nc/word16
• nfrisby/add-cabal-install-shellnix
• nfrisby/clarification
• nfrisby/minor-edits
• nfrisby/more-minor-typos
• nfrisby/remove-unused-ctors
• nfrisby/typos
• nfrisby/typos-stale-varnames
• partial_functions
• paweljakubas/add-realistic-goldentests-for-serialiseAddr
• philipp/minor-fixes
• philipp/multi-sig-delegation
• polina/epoch-prop
• polina/fixbib
• polina/james-nick-corrections
• polina/move-scripts
• polina/plutus
• polina/plutus-formal-corrections
• polina/plutus-mc-formal
• polina/plutusperscript
• polina/properties
• polina/props
• polina/updateprose
• polina/updateprose2
• redxaxder/1312
• redxaxder/ann
• redxaxder/cddl
• redxaxder/nightly
• redxaxder/revertann
• ruhatch/chain-utxo
• ruhatch/crypto-abstraction
• ruhatch/extract-epoch
• ruhatch/gen-trace
• ruhatch/reenable-cross-comp
• ruhatch/utxo-fees
• serialize-full-txns
• shelley/demo/multi-sig
• shelley/exec_spec/addresses
• shelley/exec_spec/cleanup_some_functions
• shelley/exec_spec/converge_STS_spec_first_set
• shelley/exec_spec/delegation_properties
• shelley/exec_spec/evolve_ledger_state_in_chain
• shelley/exec_spec/examples_multi-sig
• shelley/exec_spec/examples_multisig
• shelley/exec_spec/generated_pparams
• shelley/exec_spec/generators_remove_constraints
• shelley/exec_spec/mir_redesign
• shelley/exec_spec/multi-signature
• shelley/exec_spec/non_zero_leader_election_value
• shelley/exec_spec/pool_properties
• shelley/exec_spec/property_poolreap
• shelley/exec_spec/recursive_STS_rules
• shelley/exec_spec/refund_calculation
• shelley/exec_spec/remove_duplicate_functionality
• shelley/exec_spec/remove_explict_pool_keys
• shelley/exec_spec/simple_fee_calculation
• shelley/exec_spec/test_native_multisig
• shelley/exec_spec/utxow_properties
• shelley/executable_spec/instantaneous_rewards
• shelley/non_integral/reference/PoC_linear_approx
• shelley/spec/adapt_properties
• shelley/spec/audit-20190804
• shelley/spec/exec_spec/native_multi-sig
• shelley/spec/merge_multi-sig
• shelley/spec/multi-sig/audit_29_7
• shelley/spec/multi-sig_audit
• shelley/spec/multi-sig_remove_appendix
• shelley/spec/redesign_mir
• shelley/spec/rewards_transfer_prose
• shelley/spec/sts_failures
• shelley/spec/transfer_rewards
• shelley/spec/vkey_to_hashkey
• shelley/specs/correct_nonint_table_overview
• shelley/specs/correction_ptrs_map_type
• shelley/specs/make_parentheses_consistent
• shelley/specs/multi-sig-staking
• shelley/tests/deleg_rewards_balance
• shelley/tests/delegs_test
• shelley/tests/poolreap_properties
• shelley/tests/refactor_utils
• shelley/tests/test_ledger
• shelley/tests/test_newepoch
• shelley/tests/utxo_rule
• sign_txbody_hash
• simplified_txsize
• spec/consensus-integration
• spec/consensus-integration-kh
• spec/coverpage-kh
• spec/incentives-cleanup-kh
• spec/incentives-kh
• spec/incentives-kh3
• spec/khedits/multi-sig
• spec/khedits/non-integral
• spec/properties
• spec/shelley/audit-review-14
• spec/shelley/initial-gen-operational-cert-counters
• spec/shelley/non-neg-deposits
• spec/shelley/pres-of-value
• spec/shelley/properties
• spec/shelley/typos-and-small-fixes
• spec/shelley/typos-issue-749
• spec/shelley/var-renames
• specs/byron/upstags-typo
• specs/shelley/adjustments-from-mir-changes
• specs/shelley/audit-11042019
• specs/shelley/audit-review-8-9-10
• specs/shelley/multi-sig-comments
• specs/shelley/multi-sig-update-script-type
• specs/shelley/refactor_multi-sig-spec
• specs/shelley/remove-stake-key-reg-wits
• specs/shelley/script-witness-transaction
• specs/shelley/shelley-genesis-key-map
• specs/shelley/small-edits
• specs/shelley/tt-gen-deleg
• specs/shelley/update-mechanism
• specs/shelley/version-checks
• specs/shelley/vrf-keys
• staging
• topic/deps-20190114
• txin_list
• txsize_do_not_reserialize
• update-codeowners
• uroboros/1114/generate_tx_updates
• uroboros/1215/classify_trace_epoch_boundaries
• uroboros/1351/removed_after_poolreap_prop
• uroboros/1352/gen_multiple_certs_per_tx
• uroboros/466/remove-dms
• uroboros/477/missing-init-state
• uroboros/479/add-size-costs
• uroboros/523/test-tx-wits-hastypereps
• uroboros/536/test-relation-instances
• uroboros/546/chain-trace-coverage
• uroboros/547/utxo-trace-coverage
• uroboros/563/test-abstractsize-block-header-body
• uroboros/733/sync_shelley_deleg_sts
• uroboros/734/sync_shelley_pool_sts
• uroboros/735/sync_shelley_delegs_sts
• uroboros/737/sync_shelley_snap_sts
• uroboros/738/sync_shelley_newpp_sts
• uroboros/740/sync_updn_sts
• uroboros/741/sync_shelley_newepoch_sts
• uroboros/743_744/sync_bhead_ocert_sts
• uroboros/747/sync_bbody_sts
• uroboros/823/sync_poolreap_sts
• uroboros/844/ledger_sts_trace_generator
• uroboros/867/generate_pparams
• uroboros/925/only_valid_signals
• uroboros/926/invalid_trace_profiles
• uroboros/remove_circulation_deposits_invariant_prop
• uroboros/revert_to_single_cert_gen
• weeder/reduce_weeder_warnings

Fix kind-mismatch due to outdated branch being merged