Remove contract 2 + Code Split (#1610)

demos/client-example-server/src/controllers/auth.ts

@@ -16,7 +16,7 @@ import { blake2b } from "@noble/hashes/blake2b";
 import { u8aToHex } from "@polkadot/util";
 import { randomAsHex } from "@polkadot/util-crypto";
 import { ProsopoEnvError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
+import { getPairAsync } from "@prosopo/keyring";
 import { ProsopoServer } from "@prosopo/server";
 import {
 	ApiParams,

demos/client-example-server/tsconfig.json

@@ -10,9 +10,6 @@
 		{
 			"path": "../../packages/common"
 		},
-		{
-			"path": "../../packages/contract"
-		},
 		{
 			"path": "../../packages/dotenv"
 		},

demos/cypress-shared/cypress/e2e/captcha.cy.ts

@@ -15,8 +15,8 @@
 import "@cypress/xpath";
 import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
+import { getPairAsync } from "@prosopo/keyring";
 import {
 	AdminApiPaths,
 	type Captcha,

demos/cypress-shared/cypress/e2e/correct.captcha.cy.ts

@@ -15,8 +15,8 @@
 import "@cypress/xpath";
 import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
+import { getPairAsync } from "@prosopo/keyring";
 import {
 	AdminApiPaths,
 	type Captcha,

demos/cypress-shared/cypress/e2e/correct.captcha.signup.cy.ts

@@ -15,8 +15,8 @@
 import "@cypress/xpath";
 import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
+import { getPairAsync } from "@prosopo/keyring";
 import {
 	AdminApiPaths,
 	type Captcha,

dev/config/src/projectInfo.ts

@@ -57,8 +57,6 @@ export const getCliPkgDir = () => `${getPackagesDir()}/cli`;
 
 export const getCommonPkgDir = () => `${getPackagesDir()}/common`;
 
-export const getContractPkgDir = () => `${getPackagesDir()}/contract`;
-
 export const getDatabasePkgDir = () => `${getPackagesDir()}/database`;
 
 export const getDatasetsPkgDir = () => `${getPackagesDir()}/datasets`;
@@ -92,8 +90,6 @@ export const getProviderPkgDir = () => `${getPackagesDir()}/provider`;
 
 export const getServerPkgDir = () => `${getPackagesDir()}/server`;
 
-export const getTxPkgDir = () => `${getPackagesDir()}/tx`;
-
 export const getTypesPkgDir = () => `${getPackagesDir()}/types`;
 
 export const getTypesDatabasePkgDir = () =>

dev/scripts/package.json

@@ -26,13 +26,14 @@
 		"@polkadot/keyring": "12.6.2",
 		"@polkadot/util": "12.6.2",
 		"@polkadot/util-crypto": "12.6.2",
+		"@prosopo/account": "2.2.3",
 		"@prosopo/cli": "2.2.3",
 		"@prosopo/common": "2.2.3",
 		"@prosopo/config": "2.2.3",
-		"@prosopo/contract": "2.2.3",
 		"@prosopo/datasets": "2.2.3",
 		"@prosopo/dotenv": "2.2.3",
 		"@prosopo/env": "2.2.3",
+		"@prosopo/keyring": "2.2.3",
 		"@prosopo/provider": "2.2.3",
 		"@prosopo/types": "2.2.3",
 		"@prosopo/types-database": "2.2.3",

dev/scripts/src/scripts/generateMnemonic.ts

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { LogLevel, getLogger } from "@prosopo/common";
-import { generateMnemonic } from "@prosopo/contract";
 import { loadEnv } from "@prosopo/dotenv";
+import { generateMnemonic } from "@prosopo/keyring";
 import { updateEnvFile } from "../setup/index.js";
 
 loadEnv();

dev/scripts/src/scripts/sign.ts

@@ -13,7 +13,7 @@ import { stringToU8a, u8aToHex } from "@polkadot/util";
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import type { KeypairType } from "@polkadot/util-crypto/types";
-import { getPairAsync } from "@prosopo/contract";
+import { getPairAsync } from "@prosopo/keyring";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 

dev/scripts/src/setup/setup.ts

@@ -16,9 +16,9 @@ import path from "node:path";
 import { BN } from "@polkadot/util";
 import { defaultConfig, getSecret } from "@prosopo/cli";
 import { LogLevel, ProsopoEnvError, getLogger } from "@prosopo/common";
-import { generateMnemonic, getPairAsync } from "@prosopo/contract";
 import { getEnvFile } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
+import { generateMnemonic, getPairAsync } from "@prosopo/keyring";
 import {
 	type IDappAccount,
 	type IProviderAccount,

dev/scripts/tsconfig.json

@@ -8,13 +8,13 @@
 	"include": ["src", "src/**/*.json"],
 	"references": [
 		{
-			"path": "../../packages/cli"
+			"path": "../../packages/account"
 		},
 		{
-			"path": "../../packages/common"
+			"path": "../../packages/cli"
 		},
 		{
-			"path": "../../packages/contract"
+			"path": "../../packages/common"
 		},
 		{
 			"path": "../../packages/datasets"
@@ -25,6 +25,9 @@
 		{
 			"path": "../../packages/env"
 		},
+		{
+			"path": "../../packages/keyring"
+		},
 		{
 			"path": "../../packages/provider"
 		},