Shelley address generation - proof of concept

app/frontend/wallet/helpers/mnemonicToWalletSecretDef.ts

@@ -3,8 +3,12 @@ import {decodePaperWalletMnemonic, mnemonicToRootKeypair} from 'cardano-crypto.j
 import {validateMnemonic, isMnemonicInPaperWalletFormat} from '../mnemonic'
 
 import derivationSchemes from './derivation-schemes'
+import {ADALITE_CONFIG} from '../../config'
 
 const guessDerivationSchemeFromMnemonic = (mnemonic) => {
+  if (ADALITE_CONFIG.ADALITE_CARDANO_VERSION === 'shelley') {
+    return derivationSchemes.v2 //TODO: v1 should have been abandoned in shelley (?)
+  }
   return mnemonic.split(' ').length === 12 ? derivationSchemes.v1 : derivationSchemes.v2
 }
 

app/frontend/wallet/shelley/helpers/addresses.ts

@@ -1,5 +1,6 @@
 import * as lib from '@emurgo/js-chain-libs'
 import bech32 from './bech32'
+import {deriveBaseAddress} from 'cardano-crypto.js'
 const {Address, Account, AddressDiscrimination, PublicKey, AddressKind} = lib
 
 const getDiscriminator = (network) => {
@@ -66,6 +67,16 @@ export const groupAddressFromXpub = (spendXpub: Xpub, stakeXpub: Xpub, network:
   return _addr.to_string('addr')
 }
 
+export const baseAddressFromXpub = (spendXpub: Xpub, stakeXpub: Xpub, account, networkId) => {
+  const addrBuffer = deriveBaseAddress(
+    spendXpub.slice(0, 32),
+    stakeXpub.slice(0, 32),
+    account,
+    networkId
+  )
+  return bech32.encode({prefix: 'addr', data: addrBuffer})
+}
+
 const getAddressKind = (address: string) => {
   // separate get_kind method since chain-libs throw error with legacy
   // addresses TODO: refactor

app/frontend/wallet/shelley/shelley-address-provider.ts

@@ -3,6 +3,7 @@ import {
   accountAddressFromXpub,
   singleAddressFromXpub,
   groupAddressFromXpub,
+  baseAddressFromXpub,
 } from './helpers/addresses'
 
 const shelleyPath = (account: number, isChange: boolean, addrIdx: number) => {
@@ -73,3 +74,20 @@ export const ShelleyGroupAddressProvider = (
     address: groupAddressFromXpub(spendXpub, stakeXpub, cryptoProvider.network),
   }
 }
+
+export const ShelleyBaseAddressProvider = (
+  cryptoProvider,
+  accountIndex: number,
+  isChange: boolean
+) => async (i: number) => {
+  const pathSpend = shelleyPath(accountIndex, isChange, i)
+  const spendXpub = await cryptoProvider.deriveXpub(pathSpend)
+
+  const pathStake = shelleyStakeAccountPath(accountIndex)
+  const stakeXpub = await cryptoProvider.deriveXpub(pathStake)
+
+  return {
+    path: pathSpend,
+    address: baseAddressFromXpub(spendXpub, stakeXpub, accountIndex, 0), //TODO: get network from crypto provider
+  }
+}

app/tests/src/shelley.js

@@ -3,7 +3,10 @@ import assert from 'assert'
 
 import ShelleyJsCryptoProvider from '../../frontend/wallet/shelley/shelley-js-crypto-provider'
 
-import {ShelleyGroupAddressProvider} from '../../frontend/wallet/shelley/shelley-address-provider'
+import {
+  ShelleyBaseAddressProvider,
+  ShelleyGroupAddressProvider,
+} from '../../frontend/wallet/shelley/shelley-address-provider'
 import {buildTransaction} from '../../frontend/wallet/shelley/helpers/chainlib-wrapper'
 import mnemonicToWalletSecretDef from '../../frontend/wallet/helpers/mnemonicToWalletSecretDef'
 import _ from 'lodash'
@@ -61,9 +64,21 @@ describe('shelley address derivation', () => {
 
     assert.equal(address, expected)
   })
+
+  const mnemonic3 = 'test walk nut penalty hip pave soap entry language right filter choice'
+  it('should derive base address from cardano shelley test vectors', async () => {
+    const cp = await getCryptoProvider(mnemonic3, 'testnet') //TODO: change discriminator to networkId for shelley
+    const addrGen = ShelleyBaseAddressProvider(cp, 0, false)
+
+    const {address} = await addrGen(0)
+    const expected =
+      'addr1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3jcu5d8ps7zex2k2xt3uqxgjqnnj83ws8lhrn648jjxtwqcyl47r'
+
+    assert.equal(address, expected)
+  })
 })
 
-describe('legacy utxo daedalus witness computation', () => {
+describe.skip('legacy utxo daedalus witness computation', () => {
   it('should sign legacy daedalus witness correctly', async () => {
     const buildData = {
       inputs: [