Move the address classes from Key module to Core module

examples/create-account-with-secret.js

@@ -4,5 +4,5 @@ var secret = SDK.util.generatePrivateKey();
 console.log("Your secret:", secret);
 
 var account = SDK.util.getAccountIdFromPrivate(secret);
-var address = SDK.Key.classes.PlatformAddress.fromAccountId(account);
+var address = SDK.Core.classes.PlatformAddress.fromAccountId(account);
 console.log("Your CodeChain address:", address.toString());

examples/set-regular-key.js

@@ -11,7 +11,7 @@ var ACCOUNT_SECRET =
 
 const masterSecret = ACCOUNT_SECRET;
 const masterAccountId = SDK.util.getAccountIdFromPrivate(masterSecret);
-const masterAddress = sdk.key.classes.PlatformAddress.fromAccountId(
+const masterAddress = sdk.core.classes.PlatformAddress.fromAccountId(
     masterAccountId
 );
 

integration_tests/Rpc.spec.ts

@@ -7,9 +7,9 @@ import {
     H256,
     Invoice,
     Parcel,
+    PlatformAddress,
     SignedParcel
 } from "../lib/core/classes";
-import { PlatformAddress } from "../lib/key/classes";
 import {
     generatePrivateKey,
     getAccountIdFromPrivate,
@@ -110,7 +110,7 @@ describe("rpc", () => {
 
     test("PlatformAddress", () => {
         expect(
-            sdk.key.classes.PlatformAddress.fromAccountId(signerAccount).value
+            sdk.core.classes.PlatformAddress.fromAccountId(signerAccount).value
         ).toEqual(signerAddress);
     });
 
@@ -162,7 +162,8 @@ describe("rpc", () => {
 
             test("PlatformAddress", () => {
                 expect(
-                    sdk.key.classes.PlatformAddress.fromAccountId(account).value
+                    sdk.core.classes.PlatformAddress.fromAccountId(account)
+                        .value
                 ).toEqual(address);
             });
 

integration_tests/helper.ts

@@ -17,7 +17,7 @@ export const ACCOUNT_ID =
     sdk.util.getAccountIdFromPrivate(ACCOUNT_SECRET).toString(); // "0xa6594b7196808d161b6fb137e781abbc251385d9"
 export const ACCOUNT_ADDRESS =
     process.env.ACCOUNT_ADDRESS ||
-    sdk.key.classes.PlatformAddress.fromAccountId(ACCOUNT_ID).toString(); // "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78"
+    sdk.core.classes.PlatformAddress.fromAccountId(ACCOUNT_ID).toString(); // "tccqzn9jjm3j6qg69smd7cn0eup4w7z2yu9my9a2k78"
 export const ACCOUNT_PASSPHRASE = process.env.ACCOUNT_PASSPHRASE || "satoshi";
 
 export const sendTransactions = async ({ transactions }: any) => {
@@ -48,7 +48,7 @@ export const mintAsset = async ({
         amount,
         registrar
     });
-    const assetAddress = sdk.key.classes.AssetTransferAddress.fromTypeAndPayload(
+    const assetAddress = sdk.core.classes.AssetTransferAddress.fromTypeAndPayload(
         0,
         lockScriptHash
     );

integration_tests/useRegistrar.spec.ts

@@ -18,7 +18,7 @@ const masterAddress = ACCOUNT_ADDRESS;
 const otherSecret =
     "0000000000000000000000000000000000000000000000000000000000000001";
 const otherAccountId = SDK.util.getAccountIdFromPrivate(otherSecret);
-const otherAddress = sdk.key.classes.PlatformAddress.fromAccountId(
+const otherAddress = sdk.core.classes.PlatformAddress.fromAccountId(
     otherAccountId
 );
 

src/core/Asset.ts

@@ -1,6 +1,5 @@
 import { Buffer } from "buffer";
-
-import { AssetTransferAddress } from "../key/AssetTransferAddress";
+import { AssetTransferAddress } from "codechain-primitives";
 
 import { H256 } from "./H256";
 import { AssetOutPoint } from "./transaction/AssetOutPoint";

src/core/AssetScheme.ts

@@ -1,6 +1,4 @@
-// FIXME: Use interface instead of importing key class.
-import { AssetTransferAddress } from "../key/AssetTransferAddress";
-import { PlatformAddress } from "../key/classes";
+import { AssetTransferAddress, PlatformAddress } from "codechain-primitives";
 
 import { AssetMintTransaction } from "./transaction/AssetMintTransaction";
 import { NetworkId } from "./types";

src/core/Block.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { H256 } from "./H256";
 import { SignedParcel } from "./SignedParcel";
 import { U256 } from "./U256";

src/core/Parcel.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { blake256, signEcdsa } from "../utils";
 import { Action, getActionFromJSON } from "./action/Action";
 import { AssetTransactionGroup } from "./action/AssetTransactionGroup";

src/core/SignedParcel.ts

@@ -1,6 +1,6 @@
+import { PlatformAddress } from "codechain-primitives";
 import * as _ from "lodash";
 
-import { PlatformAddress } from "../key/classes";
 import { blake256, recoverEcdsa, ripemd160 } from "../utils";
 
 import { H160 } from "./H160";

src/core/__test__/Block.spec.ts

@@ -1,8 +1,9 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { Block } from "../Block";
 import { H256 } from "../H256";
 import { U256 } from "../U256";
 import { Parcel } from "../Parcel";
-import { PlatformAddress } from "../../key/PlatformAddress";
 import { getAccountIdFromPrivate } from "../../utils";
 
 test("toJSON", () => {

src/core/__test__/Parcel.spec.ts

@@ -1,7 +1,8 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { H256 } from "../H256";
 import { U256 } from "../U256";
 import { Parcel } from "../Parcel";
-import { PlatformAddress } from "../../key/PlatformAddress";
 
 test("rlp", () => {
     const t = Parcel.transactions("tc");

src/core/__test__/SignedParcel.spec.ts

@@ -1,4 +1,4 @@
-import { PlatformAddress } from "../../key/classes";
+import { PlatformAddress } from "codechain-primitives";
 
 import { H256 } from "../H256";
 import { U256 } from "../U256";

src/core/action/Action.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { H512 } from "../H512";
 import { getTransactionFromJSON } from "../transaction/Transaction";
 import { U256 } from "../U256";

src/core/action/Payment.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { U256 } from "../U256";
 
 export class Payment {

src/core/action/SetShardOwners.ts

@@ -1,4 +1,4 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
 
 export class SetShardOwners {
     public readonly shardId: number;

src/core/action/SetShardUsers.ts

@@ -1,4 +1,4 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
 
 export class SetShardUsers {
     public readonly shardId: number;

src/core/action/__test__/SetShardOwners.spec.ts

@@ -1,5 +1,6 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { SetShardOwners } from "../SetShardOwners";
-import { PlatformAddress } from "../../../key/PlatformAddress";
 import { getActionFromJSON } from "../Action";
 
 describe("SetShardOwners", () => {

src/core/action/__test__/SetShardUsers.spec.ts

@@ -1,5 +1,6 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { SetShardUsers } from "../SetShardUsers";
-import { PlatformAddress } from "../../../key/PlatformAddress";
 import { getActionFromJSON } from "../Action";
 
 describe("SetShardUsers", () => {

src/core/classes.ts

@@ -36,3 +36,5 @@ export { Asset } from "./Asset";
 export { AssetScheme } from "./AssetScheme";
 
 export { Script } from "./Script";
+
+export { PlatformAddress, AssetTransferAddress } from "codechain-primitives";

src/core/index.ts

@@ -1,5 +1,4 @@
-// FIXME: Use interface instead of importing key class.
-import { AssetTransferAddress, PlatformAddress } from "../key/classes";
+import { AssetTransferAddress, PlatformAddress } from "codechain-primitives";
 
 import { AssetTransactionGroup } from "./action/AssetTransactionGroup";
 import { CreateShard } from "./action/CreateShard";
@@ -64,7 +63,10 @@ export class Core {
         Asset,
         AssetScheme,
         // Script
-        Script
+        Script,
+        // Addresses
+        PlatformAddress,
+        AssetTransferAddress
     };
 
     public classes = Core.classes;

src/core/transaction/AssetMintTransaction.ts

@@ -1,6 +1,6 @@
 import { Buffer } from "buffer";
+import { AssetTransferAddress, PlatformAddress } from "codechain-primitives";
 
-import { AssetTransferAddress, PlatformAddress } from "../../key/classes";
 import { P2PKH } from "../../key/P2PKH";
 import { P2PKHBurn } from "../../key/P2PKHBurn";
 

src/core/transaction/AssetTransferOutput.ts

@@ -1,6 +1,6 @@
 import { Buffer } from "buffer";
+import { AssetTransferAddress } from "codechain-primitives";
 
-import { AssetTransferAddress } from "../../key/classes";
 import { P2PKH } from "../../key/P2PKH";
 import { P2PKHBurn } from "../../key/P2PKHBurn";
 

src/core/transaction/AssetTransferTransaction.ts

@@ -1,7 +1,6 @@
+import { AssetTransferAddress } from "codechain-primitives";
 import * as _ from "lodash";
 
-import { AssetTransferAddress } from "../../key/classes";
-
 import { blake256, blake256WithKey } from "../../utils";
 import { Asset } from "../Asset";
 import { H256 } from "../H256";

src/core/transaction/CreateWorldTransaction.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { blake256 } from "../../utils";
 import { H256 } from "../H256";
 import { NetworkId } from "../types";

src/core/transaction/SetWorldOwnersTransaction.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { blake256 } from "../../utils";
 import { H256 } from "../H256";
 import { NetworkId } from "../types";

src/core/transaction/SetWorldUsersTransaction.ts

@@ -1,4 +1,5 @@
-import { PlatformAddress } from "../../key/PlatformAddress";
+import { PlatformAddress } from "codechain-primitives";
+
 import { blake256 } from "../../utils";
 import { H256 } from "../H256";
 import { NetworkId } from "../types";

src/core/transaction/__test__/CreateWorldTransaction.spec.ts

@@ -1,6 +1,7 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { CreateWorldTransaction } from "../CreateWorldTransaction";
 import { getTransactionFromJSON } from "../Transaction";
-import { PlatformAddress } from "../../../key/classes";
 
 describe("CreateWorldTransaction", () => {
     test("toJSON", () => {

src/core/transaction/__test__/SetWorldOwnersTransaction.spec.ts

@@ -1,6 +1,7 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { SetWorldOwnersTransaction } from "../SetWorldOwnersTransaction";
 import { getTransactionFromJSON } from "../Transaction";
-import { PlatformAddress } from "../../../key/classes";
 
 describe("SetWorldOwnersTransaction", () => {
     test("toJSON", () => {

src/core/transaction/__test__/SetWorldUsersTransaction.spec.ts

@@ -1,6 +1,7 @@
+import { PlatformAddress } from "codechain-primitives";
+
 import { SetWorldUsersTransaction } from "../SetWorldUsersTransaction";
 import { getTransactionFromJSON } from "../Transaction";
-import { PlatformAddress } from "../../../key/classes";
 
 describe("SetWorldUsersTransaction", () => {
     test("toJSON", () => {

src/key/P2PKH.ts

@@ -1,4 +1,5 @@
 import { Buffer } from "buffer";
+import { AssetTransferAddress } from "codechain-primitives";
 
 import { H256 } from "../core/H256";
 import { Script } from "../core/Script";
@@ -8,7 +9,6 @@ import {
 } from "../core/transaction/AssetTransferTransaction";
 import { NetworkId } from "../core/types";
 
-import { AssetTransferAddress } from "./AssetTransferAddress";
 import { KeyStore } from "./KeyStore";
 
 /**

src/key/P2PKHBurn.ts

@@ -1,4 +1,5 @@
 import { Buffer } from "buffer";
+import { AssetTransferAddress } from "codechain-primitives";
 
 import { H256 } from "../core/H256";
 import { Script } from "../core/Script";
@@ -8,7 +9,6 @@ import {
 } from "../core/transaction/AssetTransferTransaction";
 import { NetworkId } from "../core/types";
 
-import { AssetTransferAddress } from "./AssetTransferAddress";
 import { KeyStore } from "./KeyStore";
 
 export class P2PKHBurn implements TransactionBurnSigner {