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.

Sign up for GitHub

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

Jump to bottom

Allow multiple credentials for Cardano testnets #2832

Merged
merged 2 commits into from
Dec 22, 2020
Merged

Allow multiple credentials for Cardano testnets #2832

merged 2 commits into from
Dec 22, 2020

Conversation

mrBliss
Copy link
Contributor

@mrBliss mrBliss commented Dec 22, 2020

Allow multiple Shelley-based credentials for Cardano, but only for testnets, not for mainnnet.

@mrBliss mrBliss added the consensus issues related to ouroboros-consensus label Dec 22, 2020
@mrBliss mrBliss requested review from edsko and nfrisby December 22, 2020 10:51
@mrBliss mrBliss force-pushed the mrBliss/cardano-multiple-credentials branch from 652ea4e to ede003e Compare December 22, 2020 10:56
@mrBliss
Allow multiple Shelley-based credentials for testnets
88326b0 
Now that the benchmarking team will use cardano-mode, they need to be able to
test with multiple Shelley-based credentials.

Allow multiple credentials for testnets, but not for mainnet.
@mrBliss
Remove obsolete ProtocolMary
bd97820 
`ProtocolCardano` can now be used by the benchmarking team instead, after the
last commit and #2811.
@mrBliss mrBliss force-pushed the mrBliss/cardano-multiple-credentials branch from ede003e to bd97820 Compare December 22, 2020 11:27
@mrBliss
Copy link
Contributor Author

mrBliss commented Dec 22, 2020

bors merge

@mrBliss
Copy link
Contributor Author

mrBliss commented Dec 22, 2020

@nfrisby Edsko and I thought we should review this with you, but @deepfire is blocked on this.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 22, 2020

Build succeeded:

@iohk-bors iohk-bors bot merged commit bae0207 into master Dec 22, 2020
@iohk-bors iohk-bors bot deleted the mrBliss/cardano-multiple-credentials branch December 22, 2020 11:49
mrBliss added a commit to IntersectMBO/cardano-node that referenced this pull request Jan 12, 2021
@mrBliss
Update dependencies
6352143 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832
@mrBliss mrBliss mentioned this pull request Jan 12, 2021
Merged
mrBliss added a commit to IntersectMBO/cardano-node that referenced this pull request Jan 12, 2021
@mrBliss
Update dependencies
893bb17 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832
coot pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 13, 2021
@mrBliss @coot
Update dependencies
0e54113 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 17, 2021
@mrBliss @erikd
Update dependencies
0f77fe5 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 17, 2021
@mrBliss @erikd
Update dependencies
d186d40 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 17, 2021
@mrBliss @erikd
Update dependencies
a93e019 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 17, 2021
@mrBliss @erikd
Update dependencies
c6d2751 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
a671a72 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
7373b12 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
acfd583 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
995f40d 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
3897f02 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
53d1694 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
4b332f5 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
c689acf 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
erikd pushed a commit to IntersectMBO/cardano-node that referenced this pull request Jan 18, 2021
@mrBliss @erikd
Update dependencies
18b99fa 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
iohk-bors bot added a commit to IntersectMBO/cardano-node that referenced this pull request Jan 19, 2021
@iohk-bors @mrBliss @hamishmack
Merge #2274
8ad47ce 
2274: Update dependencies r=kderme a=mrBliss

Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

Co-authored-by: Thomas Winant <thomas@well-typed.com>
Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
newhoggy pushed a commit to IntersectMBO/cardano-api that referenced this pull request May 23, 2023
@mrBliss @erikd
Update dependencies
b480f0b 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
newhoggy pushed a commit to IntersectMBO/cardano-cli that referenced this pull request May 24, 2023
@mrBliss @erikd
Update dependencies
56b637f 
Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

network tracers: moved ToObject TxSubmission instance

network tracers: added ToObjcet TxSubmission2 instance

Update cabal.project index-state value
newhoggy pushed a commit to IntersectMBO/cardano-cli that referenced this pull request May 24, 2023
@iohk-bors @mrBliss @hamishmack
Merge #2274
3f2b8f0 
2274: Update dependencies r=kderme a=mrBliss

Note that this does not incorporate the latest changes in cardano-ledger-specs.

Notable changes:
* IntersectMBO/ouroboros-network#2807
* IntersectMBO/ouroboros-network#2811
* IntersectMBO/ouroboros-network#2832

Co-authored-by: Thomas Winant <thomas@well-typed.com>
Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edsko edsko edsko approved these changes

@nfrisby nfrisby Awaiting requested review from nfrisby

Assignees
No one assigned
Labels
consensus issues related to ouroboros-consensus
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mrBliss @edsko