@prosopo/cli 0.3.41 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/commands/dappUpdate.cjs +1 -1
- package/dist/cjs/commands/providerAccounts.cjs +1 -1
- package/dist/cjs/index.cjs +2 -0
- package/dist/cjs/process.env.cjs +18 -0
- package/dist/cjs/prosopo.config.cjs +5 -5
- package/dist/cjs/start.cjs +1 -0
- package/dist/commands/dappUpdate.js +1 -1
- package/dist/commands/providerAccounts.js +1 -1
- package/dist/commands/providerAccounts.js.map +1 -1
- package/dist/process.env.d.ts +2 -0
- package/dist/process.env.d.ts.map +1 -1
- package/dist/process.env.js +18 -0
- package/dist/process.env.js.map +1 -1
- package/dist/prosopo.config.d.ts +1 -1
- package/dist/prosopo.config.d.ts.map +1 -1
- package/dist/prosopo.config.js +5 -5
- package/dist/prosopo.config.js.map +1 -1
- package/dist/start.d.ts.map +1 -1
- package/dist/start.js +2 -1
- package/dist/start.js.map +1 -1
- package/package.json +9 -9
|
@@ -49,7 +49,7 @@ const commandDappUpdate = (pair, config, cmdArgs) => {
|
|
|
49
49
|
util.get(typesReturns.DappPayee, z__namespace.string().parse(argv.payee)),
|
|
50
50
|
z__namespace.string().parse(argv.owner),
|
|
51
51
|
{
|
|
52
|
-
value: stakeThreshold.
|
|
52
|
+
value: stakeThreshold.toString()
|
|
53
53
|
}
|
|
54
54
|
];
|
|
55
55
|
await contract.wrapQuery(tasks.contract.query.dappUpdate, tasks.contract.query)(...dappRegisterArgs);
|
|
@@ -13,7 +13,7 @@ const commandProviderAccounts = (pair, config, cmdArgs) => {
|
|
|
13
13
|
const env$1 = new env.ProviderEnvironment(config, pair);
|
|
14
14
|
await env$1.isReady();
|
|
15
15
|
const tasks = new provider.Tasks(env$1);
|
|
16
|
-
const result = await tasks.contract.
|
|
16
|
+
const result = (await tasks.contract.query.getAllProviderAccounts()).value.unwrap().unwrap();
|
|
17
17
|
logger.info(JSON.stringify(result, null, 2));
|
|
18
18
|
} catch (err) {
|
|
19
19
|
logger.error(err);
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -9,8 +9,10 @@ const prosopo_config = require("./prosopo.config.cjs");
|
|
|
9
9
|
const env = require("./env.cjs");
|
|
10
10
|
exports.processArgs = argv.processArgs;
|
|
11
11
|
exports.start = start.start;
|
|
12
|
+
exports.getAddress = process_env.getAddress;
|
|
12
13
|
exports.getDB = process_env.getDB;
|
|
13
14
|
exports.getPairType = process_env.getPairType;
|
|
15
|
+
exports.getPassword = process_env.getPassword;
|
|
14
16
|
exports.getSecret = process_env.getSecret;
|
|
15
17
|
exports.getSs58Format = process_env.getSs58Format;
|
|
16
18
|
exports.loadJSONFile = files.loadJSONFile;
|
package/dist/cjs/process.env.cjs
CHANGED
|
@@ -7,6 +7,22 @@ function getSs58Format() {
|
|
|
7
7
|
function getPairType() {
|
|
8
8
|
return process.env.PROSOPO_PAIR_TYPE || "sr25519";
|
|
9
9
|
}
|
|
10
|
+
function getAddress(who) {
|
|
11
|
+
if (!who) {
|
|
12
|
+
who = "PROVIDER";
|
|
13
|
+
} else {
|
|
14
|
+
who = who.toUpperCase();
|
|
15
|
+
}
|
|
16
|
+
return process.env[`PROSOPO_${who}_ADDRESS`];
|
|
17
|
+
}
|
|
18
|
+
function getPassword(who) {
|
|
19
|
+
if (!who) {
|
|
20
|
+
who = "PROVIDER";
|
|
21
|
+
} else {
|
|
22
|
+
who = who.toUpperCase();
|
|
23
|
+
}
|
|
24
|
+
return process.env[`PROSOPO_${who}_ACCOUNT_PASSWORD`];
|
|
25
|
+
}
|
|
10
26
|
function getSecret(who) {
|
|
11
27
|
if (!who) {
|
|
12
28
|
who = "PROVIDER";
|
|
@@ -21,7 +37,9 @@ function getDB() {
|
|
|
21
37
|
}
|
|
22
38
|
return process.env.PROSOPO_DATABASE_HOST;
|
|
23
39
|
}
|
|
40
|
+
exports.getAddress = getAddress;
|
|
24
41
|
exports.getDB = getDB;
|
|
25
42
|
exports.getPairType = getPairType;
|
|
43
|
+
exports.getPassword = getPassword;
|
|
26
44
|
exports.getSecret = getSecret;
|
|
27
45
|
exports.getSs58Format = getSs58Format;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const types = require("@prosopo/types");
|
|
3
|
-
const common = require("@prosopo/common");
|
|
4
3
|
const process_env = require("./process.env.cjs");
|
|
4
|
+
const common = require("@prosopo/common");
|
|
5
5
|
function getMongoURI() {
|
|
6
6
|
const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || "mongodb";
|
|
7
7
|
const mongoSrv = protocol === "mongodb+srv";
|
|
@@ -12,15 +12,15 @@ function getMongoURI() {
|
|
|
12
12
|
const retries = mongoSrv ? "?retryWrites=true&w=majority" : "";
|
|
13
13
|
return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
|
|
14
14
|
}
|
|
15
|
-
function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig) {
|
|
15
|
+
function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig, who = "PROVIDER") {
|
|
16
16
|
return types.ProsopoConfigSchema.parse({
|
|
17
17
|
logLevel: common.getLogLevel(),
|
|
18
18
|
defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
|
|
19
19
|
defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK ? types.NetworkNamesSchema.parse(process.env.PROSOPO_DEFAULT_NETWORK) : types.NetworkNamesSchema.enum.development,
|
|
20
20
|
account: {
|
|
21
|
-
address:
|
|
22
|
-
password:
|
|
23
|
-
secret: process_env.getSecret()
|
|
21
|
+
address: process_env.getAddress(who),
|
|
22
|
+
password: process_env.getPassword(who),
|
|
23
|
+
secret: process_env.getSecret(who)
|
|
24
24
|
},
|
|
25
25
|
database: {
|
|
26
26
|
development: {
|
package/dist/cjs/start.cjs
CHANGED
|
@@ -17,6 +17,7 @@ function startApi(env2, admin = false) {
|
|
|
17
17
|
apiApp.use(express.json({ limit: "50mb" }));
|
|
18
18
|
apiApp.use(common.i18nMiddleware({}));
|
|
19
19
|
apiApp.use(provider.prosopoRouter(env2));
|
|
20
|
+
apiApp.use(provider.prosopoVerifyRouter(env2));
|
|
20
21
|
if (admin) {
|
|
21
22
|
apiApp.use(provider.prosopoAdminRouter(env2));
|
|
22
23
|
}
|
|
@@ -33,7 +33,7 @@ export default (pair, config, cmdArgs) => {
|
|
|
33
33
|
get(DappPayee, z.string().parse(argv.payee)),
|
|
34
34
|
z.string().parse(argv.owner),
|
|
35
35
|
{
|
|
36
|
-
value: stakeThreshold.
|
|
36
|
+
value: stakeThreshold.toString(),
|
|
37
37
|
},
|
|
38
38
|
];
|
|
39
39
|
await wrapQuery(tasks.contract.query.dappUpdate, tasks.contract.query)(...dappRegisterArgs);
|
|
@@ -12,7 +12,7 @@ export default (pair, config, cmdArgs) => {
|
|
|
12
12
|
const env = new ProviderEnvironment(config, pair);
|
|
13
13
|
await env.isReady();
|
|
14
14
|
const tasks = new Tasks(env);
|
|
15
|
-
const result = await tasks.contract.
|
|
15
|
+
const result = (await tasks.contract.query.getAllProviderAccounts()).value.unwrap().unwrap();
|
|
16
16
|
logger.info(JSON.stringify(result, null, 2));
|
|
17
17
|
}
|
|
18
18
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerAccounts.js","sourceRoot":"","sources":["../../src/commands/providerAccounts.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAiB,EAAE;IAC5G,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;IAExF,OAAO;QACH,OAAO,EAAE,mBAAmB;QAC5B,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK;QAC/B,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"providerAccounts.js","sourceRoot":"","sources":["../../src/commands/providerAccounts.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAiB,EAAE;IAC5G,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;IAExF,OAAO;QACH,OAAO,EAAE,mBAAmB;QAC5B,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,KAAK;QAC/B,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,IAAI;gBACA,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;gBAC5F,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;aAC/C;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpB;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
|
package/dist/process.env.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { KeypairType } from '@polkadot/util-crypto/types';
|
|
2
2
|
export declare function getSs58Format(): number;
|
|
3
3
|
export declare function getPairType(): KeypairType;
|
|
4
|
+
export declare function getAddress(who?: string): string | undefined;
|
|
5
|
+
export declare function getPassword(who?: string): string | undefined;
|
|
4
6
|
export declare function getSecret(who?: string): string | undefined;
|
|
5
7
|
export declare function getDB(): string;
|
|
6
8
|
//# sourceMappingURL=process.env.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.d.ts","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAGzD,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,WAAW,IAAI,WAAW,CAEzC;AAED,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY1D;AAED,wBAAgB,KAAK,IAAI,MAAM,CAK9B"}
|
|
1
|
+
{"version":3,"file":"process.env.d.ts","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAGzD,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,WAAW,IAAI,WAAW,CAEzC;AAED,wBAAgB,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO3D;AAED,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO5D;AAED,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY1D;AAED,wBAAgB,KAAK,IAAI,MAAM,CAK9B"}
|
package/dist/process.env.js
CHANGED
|
@@ -5,6 +5,24 @@ export function getSs58Format() {
|
|
|
5
5
|
export function getPairType() {
|
|
6
6
|
return process.env.PROSOPO_PAIR_TYPE || 'sr25519';
|
|
7
7
|
}
|
|
8
|
+
export function getAddress(who) {
|
|
9
|
+
if (!who) {
|
|
10
|
+
who = 'PROVIDER';
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
who = who.toUpperCase();
|
|
14
|
+
}
|
|
15
|
+
return process.env[`PROSOPO_${who}_ADDRESS`];
|
|
16
|
+
}
|
|
17
|
+
export function getPassword(who) {
|
|
18
|
+
if (!who) {
|
|
19
|
+
who = 'PROVIDER';
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
who = who.toUpperCase();
|
|
23
|
+
}
|
|
24
|
+
return process.env[`PROSOPO_${who}_ACCOUNT_PASSWORD`];
|
|
25
|
+
}
|
|
8
26
|
export function getSecret(who) {
|
|
9
27
|
if (!who) {
|
|
10
28
|
who = 'PROVIDER';
|
package/dist/process.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.js","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,UAAU,aAAa;IACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,OAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiC,IAAK,SAAyB,CAAA;AACvF,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY;IAClC,IAAI,CAAC,GAAG,EAAE;QACN,GAAG,GAAG,UAAU,CAAA;KACnB;SAAM;QACH,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;KAC1B;IACD,OAAO,CACH,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,CACrC,CAAA;AACL,CAAC;AAED,MAAM,UAAU,KAAK;IACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QACpC,MAAM,IAAI,eAAe,CAAC,kCAAkC,CAAC,CAAA;KAChE;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;AAC5C,CAAC"}
|
|
1
|
+
{"version":3,"file":"process.env.js","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,UAAU,aAAa;IACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,IAAI,EAAE,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,OAAQ,OAAO,CAAC,GAAG,CAAC,iBAAiC,IAAK,SAAyB,CAAA;AACvF,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAY;IACnC,IAAI,CAAC,GAAG,EAAE;QACN,GAAG,GAAG,UAAU,CAAA;KACnB;SAAM;QACH,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;KAC1B;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAY;IACpC,IAAI,CAAC,GAAG,EAAE;QACN,GAAG,GAAG,UAAU,CAAA;KACnB;SAAM;QACH,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;KAC1B;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,mBAAmB,CAAC,CAAA;AACzD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY;IAClC,IAAI,CAAC,GAAG,EAAE;QACN,GAAG,GAAG,UAAU,CAAA;KACnB;SAAM;QACH,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;KAC1B;IACD,OAAO,CACH,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,CACrC,CAAA;AACL,CAAC;AAED,MAAM,UAAU,KAAK;IACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QACpC,MAAM,IAAI,eAAe,CAAC,kCAAkC,CAAC,CAAA;KAChE;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;AAC5C,CAAC"}
|
package/dist/prosopo.config.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { BatchCommitConfigSchema, ProsopoCaptchaCountConfigSchemaInput, ProsopoCaptchaSolutionConfigSchema, ProsopoConfigOutput, ProsopoNetworksSchemaInput } from '@prosopo/types';
|
|
2
|
-
export default function getConfig(networksConfig?: ProsopoNetworksSchemaInput, captchaSolutionsConfig?: typeof ProsopoCaptchaSolutionConfigSchema, batchCommitConfig?: typeof BatchCommitConfigSchema, captchaServeConfig?: ProsopoCaptchaCountConfigSchemaInput): ProsopoConfigOutput;
|
|
2
|
+
export default function getConfig(networksConfig?: ProsopoNetworksSchemaInput, captchaSolutionsConfig?: typeof ProsopoCaptchaSolutionConfigSchema, batchCommitConfig?: typeof BatchCommitConfigSchema, captchaServeConfig?: ProsopoCaptchaCountConfigSchemaInput, who?: string): ProsopoConfigOutput;
|
|
3
3
|
//# sourceMappingURL=prosopo.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAcA,OAAO,EACH,uBAAuB,EAIvB,oCAAoC,EACpC,kCAAkC,EAElC,mBAAmB,EAEnB,0BAA0B,EAC7B,MAAM,gBAAgB,CAAA;AAevB,MAAM,CAAC,OAAO,UAAU,SAAS,CAC7B,cAAc,CAAC,EAAE,0BAA0B,EAC3C,sBAAsB,CAAC,EAAE,OAAO,kCAAkC,EAClE,iBAAiB,CAAC,EAAE,OAAO,uBAAuB,EAClD,kBAAkB,CAAC,EAAE,oCAAoC,
|
|
1
|
+
{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAcA,OAAO,EACH,uBAAuB,EAIvB,oCAAoC,EACpC,kCAAkC,EAElC,mBAAmB,EAEnB,0BAA0B,EAC7B,MAAM,gBAAgB,CAAA;AAevB,MAAM,CAAC,OAAO,UAAU,SAAS,CAC7B,cAAc,CAAC,EAAE,0BAA0B,EAC3C,sBAAsB,CAAC,EAAE,OAAO,kCAAkC,EAClE,iBAAiB,CAAC,EAAE,OAAO,uBAAuB,EAClD,kBAAkB,CAAC,EAAE,oCAAoC,EACzD,GAAG,SAAa,GACjB,mBAAmB,CAuCrB"}
|
package/dist/prosopo.config.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DatabaseTypes, EnvironmentTypesSchema, NetworkNamesSchema, ProsopoConfigSchema, } from '@prosopo/types';
|
|
2
|
+
import { getAddress, getPassword, getSecret } from './process.env.js';
|
|
2
3
|
import { getLogLevel } from '@prosopo/common';
|
|
3
|
-
import { getSecret } from './process.env.js';
|
|
4
4
|
function getMongoURI() {
|
|
5
5
|
const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || 'mongodb';
|
|
6
6
|
const mongoSrv = protocol === 'mongodb+srv';
|
|
@@ -11,7 +11,7 @@ function getMongoURI() {
|
|
|
11
11
|
const retries = mongoSrv ? '?retryWrites=true&w=majority' : '';
|
|
12
12
|
return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
|
|
13
13
|
}
|
|
14
|
-
export default function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig) {
|
|
14
|
+
export default function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig, who = 'PROVIDER') {
|
|
15
15
|
return ProsopoConfigSchema.parse({
|
|
16
16
|
logLevel: getLogLevel(),
|
|
17
17
|
defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT
|
|
@@ -21,9 +21,9 @@ export default function getConfig(networksConfig, captchaSolutionsConfig, batchC
|
|
|
21
21
|
? NetworkNamesSchema.parse(process.env.PROSOPO_DEFAULT_NETWORK)
|
|
22
22
|
: NetworkNamesSchema.enum.development,
|
|
23
23
|
account: {
|
|
24
|
-
address:
|
|
25
|
-
password:
|
|
26
|
-
secret: getSecret(),
|
|
24
|
+
address: getAddress(who),
|
|
25
|
+
password: getPassword(who),
|
|
26
|
+
secret: getSecret(who),
|
|
27
27
|
},
|
|
28
28
|
database: {
|
|
29
29
|
development: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAcA,OAAO,EAEH,aAAa,EACb,sBAAsB,EACtB,kBAAkB,EAKlB,mBAAmB,GAEtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"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"}
|
package/dist/start.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AA8BjC,wBAAsB,KAAK,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAkBrE"}
|
package/dist/start.js
CHANGED
|
@@ -3,7 +3,7 @@ import { getDB, getSecret } from './process.env.js';
|
|
|
3
3
|
import { getPairAsync } from '@prosopo/contract';
|
|
4
4
|
import { i18nMiddleware } from '@prosopo/common';
|
|
5
5
|
import { loadEnv } from './env.js';
|
|
6
|
-
import { prosopoAdminRouter, prosopoRouter } from '@prosopo/provider';
|
|
6
|
+
import { prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter } from '@prosopo/provider';
|
|
7
7
|
import cors from 'cors';
|
|
8
8
|
import express from 'express';
|
|
9
9
|
import getConfig from './prosopo.config.js';
|
|
@@ -15,6 +15,7 @@ function startApi(env, admin = false) {
|
|
|
15
15
|
apiApp.use(express.json({ limit: '50mb' }));
|
|
16
16
|
apiApp.use(i18nMiddleware({}));
|
|
17
17
|
apiApp.use(prosopoRouter(env));
|
|
18
|
+
apiApp.use(prosopoVerifyRouter(env));
|
|
18
19
|
if (admin) {
|
|
19
20
|
apiApp.use(prosopoAdminRouter(env));
|
|
20
21
|
}
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAC1F,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAE3C,SAAS,QAAQ,CAAC,GAAwB,EAAE,KAAK,GAAG,KAAK;IACrD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,OAAO,EAAE,CAAA;IACxB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAClB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAA;IAEpC,IAAI,KAAK,EAAE;QACP,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;KACtC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE;QAC/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAA;IAC3E,CAAC,CAAC,CAAA;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,GAAyB,EAAE,KAAe;IAClE,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,EAAE,CAAA;QAGT,KAAK,EAAE,CAAA;QAEP,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAC1B,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;YACtD,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;YACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;SACzB,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QACnF,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;KAC9C;IACD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;IACnB,OAAO,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AAC/B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "CLI for Prosopo Provider",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -35,13 +35,13 @@
|
|
|
35
35
|
"@polkadot/types": "10.13.1",
|
|
36
36
|
"@polkadot/util": "12.6.2",
|
|
37
37
|
"@polkadot/util-crypto": "12.6.2",
|
|
38
|
-
"@prosopo/captcha-contract": "0.
|
|
39
|
-
"@prosopo/common": "0.
|
|
40
|
-
"@prosopo/contract": "0.
|
|
41
|
-
"@prosopo/env": "0.
|
|
42
|
-
"@prosopo/provider": "0.
|
|
43
|
-
"@prosopo/types": "0.
|
|
44
|
-
"@prosopo/util": "0.
|
|
38
|
+
"@prosopo/captcha-contract": "1.0.1",
|
|
39
|
+
"@prosopo/common": "1.0.1",
|
|
40
|
+
"@prosopo/contract": "1.0.1",
|
|
41
|
+
"@prosopo/env": "1.0.1",
|
|
42
|
+
"@prosopo/provider": "1.0.1",
|
|
43
|
+
"@prosopo/types": "1.0.1",
|
|
44
|
+
"@prosopo/util": "1.0.1",
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"cron-parser": "^4.9.0",
|
|
47
47
|
"dotenv": "^16.0.1",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"express": "^4.18.2",
|
|
54
54
|
"vite": "^5.1.7",
|
|
55
55
|
"vitest": "^1.3.1",
|
|
56
|
-
"@prosopo/config": "0.
|
|
56
|
+
"@prosopo/config": "1.0.1",
|
|
57
57
|
"@types/cors": "^2.8.14",
|
|
58
58
|
"tslib": "2.6.2",
|
|
59
59
|
"typescript": "5.1.6"
|