From 20e6e21acfa98ee412071795ba6105685d469dce Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Thu, 9 Jun 2022 16:28:26 +0200 Subject: [PATCH 1/2] Expose Key interface in Cardano.Api.Shelley Annoyingly I could not keep the explicit individual definitions + data instances exported so needed to reach for (..) and deduplicate exports. --- cardano-api/src/Cardano/Api.hs | 11 ++--------- cardano-api/src/Cardano/Api/Shelley.hs | 2 ++ cardano-cli/src/Cardano/CLI/Byron/Run.hs | 2 +- cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs index 820add43765..86aa035c136 100644 --- a/cardano-api/src/Cardano/Api.hs +++ b/cardano-api/src/Cardano/Api.hs @@ -42,18 +42,12 @@ module Cardano.Api ( AsType(..), -- * Cryptographic key interface -- $keys - Key, - VerificationKey, + Key(..), SigningKey(..), - getVerificationKey, - verificationKeyHash, + VerificationKey(..), castVerificationKey, castSigningKey, - - -- ** Generating keys generateSigningKey, - deterministicSigningKey, - deterministicSigningKeySeedSize, -- ** Hashes -- | In Cardano most keys are identified by their hash, and hashes are @@ -686,7 +680,6 @@ import Cardano.Api.IPC import Cardano.Api.IPC.Monad import Cardano.Api.Key import Cardano.Api.KeysByron -import Cardano.Api.KeysPraos import Cardano.Api.KeysShelley import Cardano.Api.LedgerEvent import Cardano.Api.LedgerState diff --git a/cardano-api/src/Cardano/Api/Shelley.hs b/cardano-api/src/Cardano/Api/Shelley.hs index 15d1bec4810..bcdf9b7e625 100644 --- a/cardano-api/src/Cardano/Api/Shelley.hs +++ b/cardano-api/src/Cardano/Api/Shelley.hs @@ -12,6 +12,7 @@ module Cardano.Api.Shelley -- * Cryptographic key interface -- $keys + Key(..), VerificationKey(..), SigningKey(..), @@ -230,6 +231,7 @@ import Cardano.Api.Eras import Cardano.Api.IPC import Cardano.Api.InMode import Cardano.Api.KeysPraos +import Cardano.Api.KeysByron import Cardano.Api.KeysShelley import Cardano.Api.LedgerState import Cardano.Api.NetworkId diff --git a/cardano-cli/src/Cardano/CLI/Byron/Run.hs b/cardano-cli/src/Cardano/CLI/Byron/Run.hs index a6d1296e010..a96846e02a3 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Run.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Run.hs @@ -21,7 +21,7 @@ import qualified Cardano.Crypto.Hashing as Crypto import qualified Cardano.Crypto.Signing as Crypto import Cardano.Api hiding (UpdateProposal, GenesisParameters) -import Cardano.Api.Byron (SomeByronSigningKey (..), Tx (..), VerificationKey (..)) +import Cardano.Api.Byron (SomeByronSigningKey (..), Tx (..)) import Ouroboros.Consensus.Byron.Ledger (ByronBlock) import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr) diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs index cf399e3dd68..606c79c97cc 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs @@ -31,7 +31,6 @@ import qualified Cardano.Crypto.Wallet as Crypto import qualified Cardano.Ledger.Keys as Shelley import Cardano.Api -import Cardano.Api.Byron hiding (SomeByronSigningKey (..)) import qualified Cardano.Api.Byron as ByronApi import Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes) import Cardano.Api.Shelley From 8f0a350ca100c2383326df31104fb22dcf453d34 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Tue, 5 Jul 2022 07:58:47 -0500 Subject: [PATCH 2/2] Give myself and John permission to merge any PR --- CODEOWNERS | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 2c36426a539..7ce4fbe3320 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,10 +1,10 @@ # Technical writers -doc @fsancheziohk @nahern @olgahryniuk -README.* @fsancheziohk @nahern @olgahryniuk -cardano-cli/README.md @fsancheziohk @nahern @olgahryniuk +doc @Jimbo4350 @newhoggy @fsancheziohk @nahern @olgahryniuk +README.* @Jimbo4350 @newhoggy @fsancheziohk @nahern @olgahryniuk +cardano-cli/README.md @Jimbo4350 @newhoggy @fsancheziohk @nahern @olgahryniuk # Release manager added for notification on dependency updates -cabal.project @LaurenceIO +cabal.project @Jimbo4350 @newhoggy @LaurenceIO # General reviewers per PR # Duncan Jordan Erik John Jared @@ -19,33 +19,33 @@ cabal.project @LaurenceIO doc @docs-access README.* @docs-access -bench/tx-generator @deepfire @MarcFontaine -bench @deepfire @denisshevchenko @jutaro @MarcFontaine @mgmeier @cleverca22 -cardano-tracer @deepfire @denisshevchenko -nix/workbench @deepfire @denisshevchenko @jutaro @MarcFontaine @mgmeier -trace-dispatcher @deepfire @denisshevchenko @jutaro @mgmeier -trace-forward @deepfire @denisshevchenko @jutaro @mgmeier -trace-resources @deepfire @denisshevchenko @jutaro @mgmeier -Makefile @deepfire @mgmeier -*.mk @deepfire @mgmeier - -.buildkite @devops -.github @devops -ci @devops -configuration @devops -nix @devops -*.nix @devops -flake.lock @devops -bors.toml @devops -docker-compose.yml @devops -cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs @devops @coot -cardano-node/src/Cardano/Node/Configuration/Logging.hs @devops -cardano-node/src/Cardano/Node/Configuration/Socket.hs @devops -cardano-node/src/Cardano/Node/Tracing @deepfire @denisshevchenko @jutaro -cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs @deepfire @denisshevchenko @jutaro @coot -cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToClient.hs @deepfire @denisshevchenko @jutaro @coot -cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToServer.hs @deepfire @denisshevchenko @jutaro @coot -cardano-node/src/Cardano/Node/Tracing/Tracers/NonP2P.hs @deepfire @denisshevchenko @jutaro @coot -cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @deepfire @denisshevchenko @jutaro @coot -cardano-node/src/Cardano/Node/Tracing/Tracers/Peer.hs @deepfire @denisshevchenko @jutaro @coot -cardano-node/src/Cardano/Node/Run.hs @devops +bench/tx-generator @Jimbo4350 @newhoggy @deepfire @MarcFontaine +bench @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @MarcFontaine @mgmeier @cleverca22 +cardano-tracer @Jimbo4350 @newhoggy @deepfire @denisshevchenko +nix/workbench @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @MarcFontaine @mgmeier +trace-dispatcher @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @mgmeier +trace-forward @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @mgmeier +trace-resources @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @mgmeier +Makefile @Jimbo4350 @newhoggy @deepfire @mgmeier +*.mk @Jimbo4350 @newhoggy @deepfire @mgmeier + +.buildkite @Jimbo4350 @newhoggy @devops +.github @Jimbo4350 @newhoggy @devops +ci @Jimbo4350 @newhoggy @devops +configuration @Jimbo4350 @newhoggy @devops +nix @Jimbo4350 @newhoggy @devops +*.nix @Jimbo4350 @newhoggy @devops +flake.lock @Jimbo4350 @newhoggy @devops +bors.toml @Jimbo4350 @newhoggy @devops +docker-compose.yml @Jimbo4350 @newhoggy @devops +cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs @Jimbo4350 @newhoggy @devops @coot +cardano-node/src/Cardano/Node/Configuration/Logging.hs @Jimbo4350 @newhoggy @devops +cardano-node/src/Cardano/Node/Configuration/Socket.hs @Jimbo4350 @newhoggy @devops +cardano-node/src/Cardano/Node/Tracing @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro +cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot +cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToClient.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot +cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToServer.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot +cardano-node/src/Cardano/Node/Tracing/Tracers/NonP2P.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot +cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot +cardano-node/src/Cardano/Node/Tracing/Tracers/Peer.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot +cardano-node/src/Cardano/Node/Run.hs @Jimbo4350 @newhoggy @devops