Skip to content

Commit

Permalink
rename key paths from WALLET to ORDINARY
Browse files Browse the repository at this point in the history
  • Loading branch information
@janmazak
janmazak committed Jul 23, 2021
1 parent 6126b8e commit be420b3
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions src/bip44.c
View file
Expand Up @@ -263,19 +263,19 @@ static bip44_path_type_t bip44_classifyOrdinaryWalletPath(const bip44_path_t* pa

switch (pathSpec->length) {
case 3: {
return PATH_WALLET_ACCOUNT;
return PATH_ORDINARY_ACCOUNT;
}
case 5: {
const uint8_t chainType = bip44_getChainTypeValue(pathSpec);
switch (chainType) {

case CARDANO_CHAIN_INTERNAL:
case CARDANO_CHAIN_EXTERNAL:
return PATH_WALLET_SPENDING_KEY;
return PATH_ORDINARY_SPENDING_KEY;

case CARDANO_CHAIN_STAKING_KEY:
if (bip44_isOrdinaryStakingKeyPath(pathSpec)) {
return PATH_WALLET_STAKING_KEY;
return PATH_ORDINARY_STAKING_KEY;
} else {
return PATH_INVALID;
}
Expand Down Expand Up @@ -344,15 +344,15 @@ bool bip44_isPathReasonable(const bip44_path_t* pathSpec)
{
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_ACCOUNT:
case PATH_ORDINARY_ACCOUNT:
case PATH_MULTISIG_ACCOUNT:
return bip44_hasReasonableAccount(pathSpec);

case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
return bip44_hasReasonableAccount(pathSpec) && bip44_hasReasonableAddress(pathSpec);

case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
return bip44_hasReasonableAccount(pathSpec);

Expand Down
6 changes: 3 additions & 3 deletions src/bip44.h
View file
Expand Up @@ -76,15 +76,15 @@ size_t bip44_printToStr(const bip44_path_t*, char* out, size_t outSize);

typedef enum {
// hd wallet account
PATH_WALLET_ACCOUNT,
PATH_ORDINARY_ACCOUNT,
PATH_MULTISIG_ACCOUNT,

// hd wallet address
PATH_WALLET_SPENDING_KEY,
PATH_ORDINARY_SPENDING_KEY,
PATH_MULTISIG_SPENDING_KEY,

// hd wallet reward adress, withdrawal witness, pool owner
PATH_WALLET_STAKING_KEY,
PATH_ORDINARY_STAKING_KEY,
PATH_MULTISIG_STAKING_KEY,

// pool cold key in pool registrations and retirements
Expand Down
6 changes: 3 additions & 3 deletions src/keyDerivation.c
View file
Expand Up @@ -16,11 +16,11 @@ static bool _isPathAllowed(const bip44_path_t* pathSpec)
{
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_ACCOUNT:
case PATH_ORDINARY_ACCOUNT:
case PATH_MULTISIG_ACCOUNT:
case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
case PATH_POOL_COLD_KEY:
return true;
Expand Down
34 changes: 17 additions & 17 deletions src/securityPolicy.c
View file
Expand Up @@ -16,10 +16,10 @@ static inline bool is_standard_base_address(const addressParams_t* addressParams
CHECK(addressParams->type == BASE_PAYMENT_KEY_STAKE_KEY);
CHECK(addressParams->stakingDataSource == STAKING_KEY_PATH);

CHECK(bip44_classifyPath(&addressParams->spendingKeyPath) == PATH_WALLET_SPENDING_KEY);
CHECK(bip44_classifyPath(&addressParams->spendingKeyPath) == PATH_ORDINARY_SPENDING_KEY);
CHECK(bip44_isPathReasonable(&addressParams->spendingKeyPath));

CHECK(bip44_classifyPath(&addressParams->stakingKeyPath) == PATH_WALLET_STAKING_KEY);
CHECK(bip44_classifyPath(&addressParams->stakingKeyPath) == PATH_ORDINARY_STAKING_KEY);
CHECK(bip44_isPathReasonable(&addressParams->stakingKeyPath));

CHECK(
Expand Down Expand Up @@ -91,11 +91,11 @@ security_policy_t policyForGetExtendedPublicKey(const bip44_path_t* pathSpec)
{
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_ACCOUNT:
case PATH_ORDINARY_ACCOUNT:
case PATH_MULTISIG_ACCOUNT:
case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
case PATH_POOL_COLD_KEY:
if (bip44_isPathReasonable(pathSpec)) {
Expand All @@ -119,11 +119,11 @@ security_policy_t policyForGetExtendedPublicKeyBulkExport(const bip44_path_t* pa
{
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_ACCOUNT:
case PATH_ORDINARY_ACCOUNT:
case PATH_MULTISIG_ACCOUNT:
case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
if (bip44_isPathReasonable(pathSpec)) {
ALLOW();
Expand Down Expand Up @@ -162,9 +162,9 @@ security_policy_t policyForReturnDeriveAddress(const addressParams_t* addressPar
case BYRON:
switch (bip44_classifyPath(&addressParams->spendingKeyPath)) {

case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
if (bip44_isPathReasonable(&addressParams->spendingKeyPath)) {
PROMPT();
Expand Down Expand Up @@ -206,9 +206,9 @@ security_policy_t policyForShowDeriveAddress(const addressParams_t* addressParam
if (SPENDING_PATH == determineSpendingChoice(addressParams->type)) {
switch (bip44_classifyPath(&addressParams->spendingKeyPath)) {

case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
if (bip44_isPathReasonable(&addressParams->spendingKeyPath)) {
SHOW();
Expand Down Expand Up @@ -328,7 +328,7 @@ security_policy_t policyForSignTxOutputAddressParams(
case SIGN_TX_USECASE_MULTISIG: {
switch (bip44_classifyPath(&params->spendingKeyPath)) {

case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
SHOW_UNLESS(bip44_isPathReasonable(&params->spendingKeyPath));
SHOW_UNLESS(is_standard_base_address(params));
ALLOW();
Expand Down Expand Up @@ -639,9 +639,9 @@ security_policy_t policyForSignTxWitness(
case SIGN_TX_USECASE_MULTISIG: {
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_MULTISIG_SPENDING_KEY:
case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
case PATH_MULTISIG_STAKING_KEY:
case PATH_POOL_COLD_KEY:
if (bip44_isPathReasonable(pathSpec)) {
Expand All @@ -662,7 +662,7 @@ security_policy_t policyForSignTxWitness(
case SIGN_TX_USECASE_POOL_REGISTRATION_OWNER: {
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_STAKING_KEY:
case PATH_ORDINARY_STAKING_KEY:
if (bip44_isPathReasonable(pathSpec)) {
ALLOW();
} else {
Expand All @@ -681,7 +681,7 @@ security_policy_t policyForSignTxWitness(
case SIGN_TX_USECASE_POOL_REGISTRATION_OPERATOR: {
switch (bip44_classifyPath(pathSpec)) {

case PATH_WALLET_SPENDING_KEY:
case PATH_ORDINARY_SPENDING_KEY:
case PATH_POOL_COLD_KEY:
if (bip44_isPathReasonable(pathSpec)) {
ALLOW();
Expand Down
2 changes: 1 addition & 1 deletion src/uiScreens.c
View file
Expand Up @@ -161,7 +161,7 @@ void ui_displayGetPublicKeyPathScreen(
return;
}

case PATH_WALLET_ACCOUNT: {
case PATH_ORDINARY_ACCOUNT: {
_ui_displayAccountWithDescriptionScreen("Export public key", path, true, callback);
return;
}
Expand Down

0 comments on commit be420b3

Please sign in to comment.