Merge pull request #1121 from Emurgo/merge-from-shelley-3

Merge shellet -> snapshot
Emurgo · Nov 13, 2019 · 6801a8a · 6801a8a
2 parents 3be9797 + 39d92b9
commit 6801a8a
Show file tree

Hide file tree

Showing 56 changed files with 988 additions and 1,226 deletions.
diff --git a/app/api/ada/lib/storage/bridge/walletBuilder/builder.js b/app/api/ada/lib/storage/bridge/walletBuilder/builder.js
@@ -38,10 +38,10 @@ import {
 } from '../../database/utils';
 import type {
   IDerivePublicFromPrivateRequest,
-} from '../../models/Bip44Wallet/interfaces';
+} from '../../models/common/wrapper/interfaces';
 import {
   derivePublicDeriver,
-} from '../../models/Bip44Wallet/wrapper';
+} from '../../models/common/wrapper/traits';
 import type { AddDerivationRequest } from '../../database/primitives/api/write';
 import type { TreeInsertStart } from '../../database/walletTypes/common/utils';
 

diff --git a/app/api/ada/lib/storage/models/Bip44Wallet/interfaces.js b/app/api/ada/lib/storage/models/Bip44Wallet/interfaces.js
@@ -58,85 +58,9 @@ export interface IBip44Wallet {
   getWrapperId(): number;
   getPublicDeriverLevel(): number;
   getSigningLevel(): number | null;
-  getPrivateDeriverLevel(): number | null;
-  getPrivateDeriverKeyDerivationId(): number | null;
   getProtocolMagic(): number;
 }
 
-export type IDerivePublicFromPrivateRequest = {|
-  publicDeriverMeta: {|
-    name: string,
-  |},
-  decryptPrivateDeriverPassword: null | string,
-  /**
-   * void -> do not store key
-   * null -> store as unencrypted
-   * string  -> store and encrypt
-   */
-  encryptPublicDeriverPassword?: null | string,
-  initialDerivations: TreeInsert<any>,
-  path: Array<number>,
-|};
-export type IDerivePublicFromPrivateResponse<Row> = AddPublicDeriverResponse<Row>;
-export type IDerivePublicFromPrivateFunc<Row> = (
-  body: IDerivePublicFromPrivateRequest
-) => Promise<IDerivePublicFromPrivateResponse<Row>>;
-export interface IDerivePublicFromPrivate {
-  +rawDerivePublicDeriverFromPrivate: RawTableVariation<
-    IDerivePublicFromPrivateFunc<mixed>,
-    {|
-      DerivePublicDeriverFromKey: Class<DerivePublicDeriverFromKey>,
-    |},
-    IDerivePublicFromPrivateRequest
-  >;
-  +derivePublicDeriverFromPrivate: IDerivePublicFromPrivateFunc<mixed>;
-}
-
-export type IGetPrivateDeriverKeyRequest = void;
-export type IGetPrivateDeriverKeyResponse = {
-  keyRow: $ReadOnly<KeyRow>,
-  keyDerivation: $ReadOnly<KeyDerivationRow>,
-};
-export type IGetPrivateDeriverKeyFunc = (
-  body: IGetPrivateDeriverKeyRequest
-) => Promise<IGetPrivateDeriverKeyResponse>;
-export interface IGetPrivateDeriverKey {
-  +rawGetPrivateDeriverKey: RawVariation<
-    IGetPrivateDeriverKeyFunc,
-    {|
-      GetKeyForDerivation: Class<GetKeyForDerivation>,
-    |},
-    IGetPrivateDeriverKeyRequest
-  >;
-  +getPrivateDeriverKey: IGetPrivateDeriverKeyFunc;
-
-  +rawChangePrivateDeriverPassword: RawVariation<
-    IChangePasswordRequestFunc,
-    {|
-      GetKeyForDerivation: Class<GetKeyForDerivation>,
-      UpdateGet: Class<UpdateGet>,
-    |},
-    IChangePasswordRequest
-  >;
-  +changePrivateDeriverPassword: IChangePasswordRequestFunc,
-}
-
-export type IAddAdhocPublicDeriverRequest<Insert> = AddAdhocPublicDeriverRequest<Insert>;
-export type IAddAdhocPublicDeriverResponse<Row> = AddAdhocPublicDeriverResponse<Row>;
-export type IAddAdhocPublicDeriverFunc<Insert, Row> = (
-  body: IAddAdhocPublicDeriverRequest<Insert>
-) => Promise<IAddAdhocPublicDeriverResponse<Row>>;
-export interface IAdhocPublicDeriver {
-  +rawAddAdhocPubicDeriver: RawTableVariation<
-    IAddAdhocPublicDeriverFunc<mixed, mixed>,
-    {|
-      AddAdhocPublicDeriver: Class<AddAdhocPublicDeriver>,
-    |},
-    IAddAdhocPublicDeriverRequest<mixed>,
-  >;
-  +addAdhocPubicDeriver: IAddAdhocPublicDeriverFunc<mixed, mixed>;
-}
-
 // =====================
 //   For PublicDeriver
 // =====================