@prosopo/provider 0.2.41 → 0.3.2
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/api/admin.d.ts.map +1 -1
- package/dist/api/admin.js.map +1 -1
- package/dist/api/authMiddleware.d.ts.map +1 -1
- package/dist/api/authMiddleware.js.map +1 -1
- package/dist/api/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +51 -3
- package/dist/api/captcha.js.map +1 -1
- package/dist/cjs/api/admin.cjs +1 -2
- package/dist/cjs/api/captcha.cjs +48 -3
- package/dist/cjs/tasks/tasks.cjs +111 -8
- package/dist/tasks/tasks.d.ts +4 -1
- package/dist/tasks/tasks.d.ts.map +1 -1
- package/dist/tasks/tasks.js +97 -3
- package/dist/tasks/tasks.js.map +1 -1
- package/dist/tests/contract/helpers.test.js +7 -7
- package/dist/tests/contract/helpers.test.js.map +1 -1
- package/dist/tests/tasks/tasks.test.d.ts +0 -1
- package/dist/tests/tasks/tasks.test.d.ts.map +1 -1
- package/dist/tests/tasks/tasks.test.js +142 -24
- package/dist/tests/tasks/tasks.test.js.map +1 -1
- package/dist/tests/util.test.js +12 -9
- package/dist/tests/util.test.js.map +1 -1
- package/package.json +16 -15
- package/typedoc.config.js +19 -0
- package/vite.cjs.config.ts +13 -0
- package/dist/tests/batch/commitments.test.d.ts +0 -6
- package/dist/tests/batch/commitments.test.d.ts.map +0 -1
- package/dist/tests/batch/commitments.test.js +0 -151
- package/dist/tests/batch/commitments.test.js.map +0 -1
package/dist/api/admin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAUhC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA4FnE"}
|
package/dist/api/admin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,eAAO,MAAM,cAAc,UAAW,KAAK,OAAO,mBAAmB,WAC9C,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAkBhE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAMxD,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAQzC,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA6O9D"}
|
package/dist/api/captcha.js
CHANGED
|
@@ -82,16 +82,64 @@ export function prosopoRouter(env) {
|
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
const isApproved = solution.status === CaptchaStatus.approved;
|
|
85
|
-
|
|
85
|
+
const response = {
|
|
86
86
|
status: req.t(isApproved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
|
|
87
|
-
solutionApproved: isApproved,
|
|
88
|
-
commitmentId: solution.id,
|
|
87
|
+
[ApiParams.solutionApproved]: isApproved,
|
|
88
|
+
[ApiParams.commitmentId]: solution.id.toString(),
|
|
89
|
+
[ApiParams.blockNumber]: solution.requestedAt,
|
|
90
|
+
};
|
|
91
|
+
return res.json(response);
|
|
92
|
+
}
|
|
93
|
+
catch (err) {
|
|
94
|
+
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { errorCode: 400, error: err } }));
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
router.get(ApiPaths.ServerPowCaptchaVerify, async (req, res, next) => {
|
|
98
|
+
try {
|
|
99
|
+
const { challenge, dappAccount } = req.body;
|
|
100
|
+
const approved = await tasks.serverVerifyPowCaptchaSolution(dappAccount, challenge);
|
|
101
|
+
return res.json({
|
|
102
|
+
status: req.t(approved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
|
|
103
|
+
[ApiParams.solutionApproved]: approved,
|
|
89
104
|
});
|
|
90
105
|
}
|
|
91
106
|
catch (err) {
|
|
92
107
|
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { errorCode: 400, error: err } }));
|
|
93
108
|
}
|
|
94
109
|
});
|
|
110
|
+
router.post(ApiPaths.GetPowCaptchaChallenge, async (req, res, next) => {
|
|
111
|
+
try {
|
|
112
|
+
const { userAccount, dappAccount } = req.body;
|
|
113
|
+
console.log(userAccount, dappAccount);
|
|
114
|
+
if (typeof userAccount !== 'string' || typeof dappAccount !== 'string') {
|
|
115
|
+
throw new ProsopoApiError('API.BAD_REQUEST', {
|
|
116
|
+
context: { errorCode: 400, error: 'userAccount and dappAccount must be strings' },
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
const origin = req.headers.origin;
|
|
120
|
+
if (!origin) {
|
|
121
|
+
throw new ProsopoApiError('API.BAD_REQUEST', {
|
|
122
|
+
context: { errorCode: 400, error: 'origin header not found' },
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
const challenge = await tasks.getPowCaptchaChallenge(userAccount, dappAccount, origin);
|
|
126
|
+
return res.json(challenge);
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
console.log(err);
|
|
130
|
+
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { errorCode: 400, error: err } }));
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
router.post(ApiPaths.SubmitPowCaptchaSolution, async (req, res, next) => {
|
|
134
|
+
try {
|
|
135
|
+
const { blocknumber, challenge, difficulty, signature, nonce } = req.body;
|
|
136
|
+
const verified = await tasks.verifyPowCaptchaSolution(blocknumber, challenge, difficulty, signature, nonce);
|
|
137
|
+
return res.json({ verified });
|
|
138
|
+
}
|
|
139
|
+
catch (err) {
|
|
140
|
+
return next(new ProsopoApiError('API.BAD_REQUEST', { context: { errorCode: 400, error: err } }));
|
|
141
|
+
}
|
|
142
|
+
});
|
|
95
143
|
router.post(ApiPaths.SubmitUserEvents, async (req, res, next) => {
|
|
96
144
|
try {
|
|
97
145
|
const { events, accountId } = req.body;
|
package/dist/api/captcha.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAaA,OAAO,EACH,SAAS,EACT,QAAQ,EAER,mBAAmB,EAGnB,kBAAkB,GACrB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAaA,OAAO,EACH,SAAS,EACT,QAAQ,EAER,mBAAmB,EAGnB,kBAAkB,GACrB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,OAAmB,MAAM,SAAS,CAAA;AAQzC,MAAM,UAAU,aAAa,CAAC,GAAwB;IAClD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;IAC/B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IAS5B,MAAM,CAAC,GAAG,CACN,GAAG,QAAQ,CAAC,mBAAmB,KAAK,SAAS,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW,EAAE,EACzH,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACrB,IAAI;YACA,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnF,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAA;YACnB,IAAI,GAAG,KAAK,SAAS,EAAE;gBACnB,MAAM,IAAI,eAAe,CAAC,kCAAkC,EAAE;oBAC1D,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE;iBAC3C,CAAC,CAAA;aACL;YACD,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YACpD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAEvD,MAAM,KAAK,CAAC,iCAAiC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAA;YAEvF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,+BAA+B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;YAC7E,MAAM,eAAe,GAAwB;gBACzC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAqB,EAAE,EAAE,CAAC,CAAC;oBACxD,GAAG,GAAG;oBACN,OAAO,EAAE;wBACL,GAAG,GAAG,CAAC,OAAO;wBACd,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;qBACvF;iBACJ,CAAC,CAAC;gBACH,WAAW,EAAE,QAAQ,CAAC,WAAW;aACpC,CAAA;YACD,OAAO,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;SACnC;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CACJ,CAAA;IAUD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjE,IAAI,MAA+B,CAAA;QACnC,IAAI;YACA,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SAC/C;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACvG;QAED,IAAI;YACA,MAAM,MAAM,GAA2B,MAAM,KAAK,CAAC,gBAAgB,CAC/D,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EACtB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EACtB,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,EAC7B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAC1B,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAC9B,CAAA;YACD,OAAO,GAAG,CAAC,IAAI,CAAC;gBACZ,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC;gBACzF,GAAG,MAAM;aACZ,CAAC,CAAA;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SAC/F;IACL,CAAC,CAAC,CAAA;IASF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjE,IAAI,MAA8B,CAAA;QAClC,IAAI;YACA,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SAC9C;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACvG;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY;gBACvC,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,MAAM,CAAC,YAAY,CAAC;gBACtD,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;YAExD,IAAI,CAAC,QAAQ,EAAE;gBACX,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAA;aACvF;YAED,IAAI,MAAM,CAAC,eAAe,EAAE;gBACxB,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,qBAAqB,EAAE,CAAA;gBAC9D,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;gBAChD,MAAM,mBAAmB,GAAG,CAAC,kBAAkB,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,WAAW,CAAA;gBAErF,IAAI,mBAAmB,GAAG,MAAM,CAAC,eAAe,EAAE;oBAC9C,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAA;iBACvF;aACJ;YAED,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,QAAQ,CAAA;YAC7D,MAAM,QAAQ,GAAyB;gBACnC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB,CAAC;gBACzE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,UAAU;gBACxC,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE;gBAChD,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,WAAW;aAChD,CAAA;YACD,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SAC5B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAQF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjE,IAAI;YACA,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;YAE3C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;YAEnF,OAAO,GAAG,CAAC,IAAI,CAAC;gBACZ,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB,CAAC;gBACvE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,QAAQ;aACzC,CAAC,CAAA;SACL;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAQF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAClE,IAAI;YACA,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;YAC7C,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;YAErC,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;gBACpE,MAAM,IAAI,eAAe,CAAC,iBAAiB,EAAE;oBACzC,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,6CAA6C,EAAE;iBACpF,CAAC,CAAA;aACL;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAA;YAEjC,IAAI,CAAC,MAAM,EAAE;gBACT,MAAM,IAAI,eAAe,CAAC,iBAAiB,EAAE;oBACzC,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE;iBAChE,CAAC,CAAA;aACL;YAED,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,sBAAsB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;YACtF,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SAC7B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAWF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpE,IAAI;YACA,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;YACzE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,wBAAwB,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;YAC3G,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAQF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC5D,IAAI;YACA,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;YACtC,MAAM,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;YAC/C,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;SACzC;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAKF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC5D,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAA;YAC3C,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAKF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC7D,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,kBAAkB,EAAE,CAAA;YAChD,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SAC3B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,IAAI,CAAC,IAAI,eAAe,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;SACnG;IACL,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACjB,CAAC"}
|
package/dist/cjs/api/admin.cjs
CHANGED
|
@@ -68,9 +68,8 @@ function prosopoAdminRouter(env) {
|
|
|
68
68
|
}
|
|
69
69
|
});
|
|
70
70
|
router.post(types.AdminApiPaths.ProviderDeregister, async (req, res, next) => {
|
|
71
|
-
var _a;
|
|
72
71
|
try {
|
|
73
|
-
const address =
|
|
72
|
+
const address = env.pair?.address;
|
|
74
73
|
if (!address) {
|
|
75
74
|
throw new common.ProsopoEnvError("DEVELOPER.MISSING_ENV_VARIABLE", { context: { error: "No address" } });
|
|
76
75
|
}
|
package/dist/cjs/api/captcha.cjs
CHANGED
|
@@ -86,15 +86,60 @@ function prosopoRouter(env) {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
const isApproved = solution.status === typesReturns.CaptchaStatus.approved;
|
|
89
|
-
|
|
89
|
+
const response = {
|
|
90
90
|
status: req.t(isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
|
|
91
|
-
solutionApproved: isApproved,
|
|
92
|
-
commitmentId: solution.id
|
|
91
|
+
[types.ApiParams.solutionApproved]: isApproved,
|
|
92
|
+
[types.ApiParams.commitmentId]: solution.id.toString(),
|
|
93
|
+
[types.ApiParams.blockNumber]: solution.requestedAt
|
|
94
|
+
};
|
|
95
|
+
return res.json(response);
|
|
96
|
+
} catch (err) {
|
|
97
|
+
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { errorCode: 400, error: err } }));
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
router.get(types.ApiPaths.ServerPowCaptchaVerify, async (req, res, next) => {
|
|
101
|
+
try {
|
|
102
|
+
const { challenge, dappAccount } = req.body;
|
|
103
|
+
const approved = await tasks$1.serverVerifyPowCaptchaSolution(dappAccount, challenge);
|
|
104
|
+
return res.json({
|
|
105
|
+
status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
|
|
106
|
+
[types.ApiParams.solutionApproved]: approved
|
|
93
107
|
});
|
|
94
108
|
} catch (err) {
|
|
95
109
|
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { errorCode: 400, error: err } }));
|
|
96
110
|
}
|
|
97
111
|
});
|
|
112
|
+
router.post(types.ApiPaths.GetPowCaptchaChallenge, async (req, res, next) => {
|
|
113
|
+
try {
|
|
114
|
+
const { userAccount, dappAccount } = req.body;
|
|
115
|
+
console.log(userAccount, dappAccount);
|
|
116
|
+
if (typeof userAccount !== "string" || typeof dappAccount !== "string") {
|
|
117
|
+
throw new common.ProsopoApiError("API.BAD_REQUEST", {
|
|
118
|
+
context: { errorCode: 400, error: "userAccount and dappAccount must be strings" }
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
const origin = req.headers.origin;
|
|
122
|
+
if (!origin) {
|
|
123
|
+
throw new common.ProsopoApiError("API.BAD_REQUEST", {
|
|
124
|
+
context: { errorCode: 400, error: "origin header not found" }
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
const challenge = await tasks$1.getPowCaptchaChallenge(userAccount, dappAccount, origin);
|
|
128
|
+
return res.json(challenge);
|
|
129
|
+
} catch (err) {
|
|
130
|
+
console.log(err);
|
|
131
|
+
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { errorCode: 400, error: err } }));
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
router.post(types.ApiPaths.SubmitPowCaptchaSolution, async (req, res, next) => {
|
|
135
|
+
try {
|
|
136
|
+
const { blocknumber, challenge, difficulty, signature, nonce } = req.body;
|
|
137
|
+
const verified = await tasks$1.verifyPowCaptchaSolution(blocknumber, challenge, difficulty, signature, nonce);
|
|
138
|
+
return res.json({ verified });
|
|
139
|
+
} catch (err) {
|
|
140
|
+
return next(new common.ProsopoApiError("API.BAD_REQUEST", { context: { errorCode: 400, error: err } }));
|
|
141
|
+
}
|
|
142
|
+
});
|
|
98
143
|
router.post(types.ApiPaths.SubmitUserEvents, async (req, res, next) => {
|
|
99
144
|
try {
|
|
100
145
|
const { events, accountId } = req.body;
|
package/dist/cjs/tasks/tasks.cjs
CHANGED
|
@@ -4,13 +4,15 @@ const datasets = require("@prosopo/datasets");
|
|
|
4
4
|
const typesReturns = require("@prosopo/captcha-contract/types-returns");
|
|
5
5
|
const common = require("@prosopo/common");
|
|
6
6
|
const contract = require("@prosopo/contract");
|
|
7
|
-
const util$
|
|
7
|
+
const util$2 = require("@prosopo/util");
|
|
8
8
|
const hex = require("@polkadot/util/hex");
|
|
9
9
|
const random = require("@polkadot/util-crypto/random");
|
|
10
10
|
const database = require("@prosopo/database");
|
|
11
|
+
const sha256 = require("@noble/hashes/sha256");
|
|
11
12
|
const util = require("../util.cjs");
|
|
12
13
|
const signature = require("@polkadot/util-crypto/signature");
|
|
13
14
|
const string = require("@polkadot/util/string");
|
|
15
|
+
const util$1 = require("@polkadot/util");
|
|
14
16
|
class Tasks {
|
|
15
17
|
constructor(env) {
|
|
16
18
|
if (!env.contractInterface) {
|
|
@@ -31,7 +33,6 @@ class Tasks {
|
|
|
31
33
|
return await this.providerSetDataset(datasetRaw);
|
|
32
34
|
}
|
|
33
35
|
async providerSetDataset(datasetRaw) {
|
|
34
|
-
var _a;
|
|
35
36
|
if (datasetRaw.captchas.length < this.config.captchas.solved.count + this.config.captchas.unsolved.count) {
|
|
36
37
|
throw new common.ProsopoEnvError("DATASET.CAPTCHAS_COUNT_LESS_THAN_CONFIGURED", {
|
|
37
38
|
context: { failedFuncName: this.providerSetDataset.name }
|
|
@@ -54,7 +55,7 @@ class Tasks {
|
|
|
54
55
|
context: { failedFuncName: this.providerSetDataset.name }
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
|
-
await
|
|
58
|
+
await this.db?.storeDataset(dataset);
|
|
58
59
|
await contract.wrapQuery(this.contract.query.providerSetDataset, this.contract.query)(
|
|
59
60
|
dataset.datasetId,
|
|
60
61
|
dataset.datasetContentId
|
|
@@ -92,6 +93,108 @@ class Tasks {
|
|
|
92
93
|
context: { failedFuncName: this.getCaptchaWithProof.name, datasetId, solved, size }
|
|
93
94
|
});
|
|
94
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* @description Generates a PoW Captcha for a given user and dapp
|
|
98
|
+
*
|
|
99
|
+
* @param {string} userAccount - Dapp User address
|
|
100
|
+
* @param {string} dappAccount - Dapp User address
|
|
101
|
+
*/
|
|
102
|
+
async getPowCaptchaChallenge(userAccount, dappAccount, origin) {
|
|
103
|
+
const difficulty = 4;
|
|
104
|
+
const latestHeader = await this.contract.api.rpc.chain.getHeader();
|
|
105
|
+
const latestBlockNumber = latestHeader.number.toNumber();
|
|
106
|
+
const challenge = `${latestBlockNumber}___${userAccount}___${dappAccount}`;
|
|
107
|
+
const signature2 = util$1.u8aToHex(this.contract.pair.sign(string.stringToHex(challenge)));
|
|
108
|
+
return { challenge, difficulty, signature: signature2 };
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* @description Generates a PoW Captcha for a given user and dapp
|
|
112
|
+
*
|
|
113
|
+
* @param {string} blocknumber - Dapp User address
|
|
114
|
+
* @param {string} challenge - Dapp User address
|
|
115
|
+
* @param {string} difficulty - Dapp User address
|
|
116
|
+
* @param {string} nonce - Dapp User address
|
|
117
|
+
*/
|
|
118
|
+
async verifyPowCaptchaSolution(blocknumber, challenge, difficulty, signature$1, nonce) {
|
|
119
|
+
const latestHeader = await this.contract.api.rpc.chain.getHeader();
|
|
120
|
+
const latestBlockNumber = latestHeader.number.toNumber();
|
|
121
|
+
if (latestBlockNumber > blocknumber - 5) {
|
|
122
|
+
throw new common.ProsopoContractError("CONTRACT.INVALID_BLOCKHASH", {
|
|
123
|
+
context: {
|
|
124
|
+
ERROR: "Blockhash must be from within last 5 blocks",
|
|
125
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
126
|
+
blocknumber
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
const signatureVerification = signature.signatureVerify(string.stringToHex(challenge), signature$1, this.contract.pair.address);
|
|
131
|
+
if (!signatureVerification.isValid) {
|
|
132
|
+
throw new common.ProsopoContractError("GENERAL.INVALID_SIGNATURE", {
|
|
133
|
+
context: {
|
|
134
|
+
ERROR: "Provider signature is invalid for this message",
|
|
135
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
136
|
+
signature: signature$1
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
const solutionValid = Array.from(sha256.sha256(new TextEncoder().encode(nonce + challenge))).map((byte) => byte.toString(16).padStart(2, "0")).join("").startsWith("0".repeat(difficulty));
|
|
141
|
+
if (!solutionValid) {
|
|
142
|
+
throw new common.ProsopoContractError("API.CAPTCHA_FAILED", {
|
|
143
|
+
context: {
|
|
144
|
+
ERROR: "Captcha solution is invalid",
|
|
145
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
146
|
+
nonce,
|
|
147
|
+
challenge,
|
|
148
|
+
difficulty
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
await this.db.storePowCaptchaRecord(challenge, false);
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
async serverVerifyPowCaptchaSolution(dappAccount, challenge) {
|
|
156
|
+
const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
|
|
157
|
+
if (!challengeRecord) {
|
|
158
|
+
throw new common.ProsopoEnvError("DATABASE.CAPTCHA_GET_FAILED", {
|
|
159
|
+
context: { failedFuncName: this.serverVerifyPowCaptchaSolution.name, challenge }
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
if (challengeRecord.checked) {
|
|
163
|
+
return false;
|
|
164
|
+
}
|
|
165
|
+
const [blocknumber, userAccount, challengeDappAccount] = challengeRecord.challenge.split("___");
|
|
166
|
+
if (dappAccount !== challengeDappAccount) {
|
|
167
|
+
throw new common.ProsopoEnvError("CAPTCHA.DAPP_USER_SOLUTION_NOT_FOUND", {
|
|
168
|
+
context: {
|
|
169
|
+
failedFuncName: this.serverVerifyPowCaptchaSolution.name,
|
|
170
|
+
dappAccount,
|
|
171
|
+
challengeDappAccount
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
const latestHeader = await this.contract.api.rpc.chain.getHeader();
|
|
176
|
+
const latestBlockNumber = latestHeader.number.toNumber();
|
|
177
|
+
if (!blocknumber) {
|
|
178
|
+
throw new common.ProsopoContractError("CONTRACT.INVALID_BLOCKHASH", {
|
|
179
|
+
context: {
|
|
180
|
+
ERROR: "Blockhash must be from within last 5 blocks",
|
|
181
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
182
|
+
blocknumber
|
|
183
|
+
}
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
if (latestBlockNumber > parseInt(blocknumber) + 5) {
|
|
187
|
+
throw new common.ProsopoContractError("CONTRACT.INVALID_BLOCKHASH", {
|
|
188
|
+
context: {
|
|
189
|
+
ERROR: "Blockhash must be from within last 5 blocks",
|
|
190
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
191
|
+
blocknumber
|
|
192
|
+
}
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
await this.db.updatePowCaptchaRecord(challengeRecord.challenge, true);
|
|
196
|
+
return true;
|
|
197
|
+
}
|
|
95
198
|
/**
|
|
96
199
|
* Validate and store the text captcha solution(s) from the Dapp User in a web2 environment
|
|
97
200
|
* @param {string} userAccount
|
|
@@ -203,7 +306,7 @@ class Tasks {
|
|
|
203
306
|
}
|
|
204
307
|
});
|
|
205
308
|
}
|
|
206
|
-
if (!storedCaptchas.every((captcha) => captcha.datasetId === util$
|
|
309
|
+
if (!storedCaptchas.every((captcha) => captcha.datasetId === util$2.at(storedCaptchas, 0).datasetId)) {
|
|
207
310
|
throw new common.ProsopoEnvError("CAPTCHA.DIFFERENT_DATASET_IDS", {
|
|
208
311
|
context: {
|
|
209
312
|
failedFuncName: this.validateReceivedCaptchasAgainstStoredCaptchas.name,
|
|
@@ -219,11 +322,10 @@ class Tasks {
|
|
|
219
322
|
* @returns {Promise<{ tree: CaptchaMerkleTree, commitment: CaptchaSolutionCommitment, commitmentId: string }>}
|
|
220
323
|
*/
|
|
221
324
|
async buildTreeAndGetCommitmentId(captchaSolutions) {
|
|
222
|
-
var _a;
|
|
223
325
|
const tree = new datasets.CaptchaMerkleTree();
|
|
224
326
|
const solutionsHashed = captchaSolutions.map((captcha) => datasets.computeCaptchaSolutionHash(captcha));
|
|
225
327
|
tree.build(solutionsHashed);
|
|
226
|
-
const commitmentId =
|
|
328
|
+
const commitmentId = tree.root?.hash;
|
|
227
329
|
if (!commitmentId) {
|
|
228
330
|
throw new common.ProsopoEnvError("CONTRACT.CAPTCHA_SOLUTION_COMMITMENT_DOES_NOT_EXIST", {
|
|
229
331
|
context: {
|
|
@@ -423,10 +525,11 @@ class Tasks {
|
|
|
423
525
|
return blockTime.toNumber();
|
|
424
526
|
}
|
|
425
527
|
async saveCaptchaEvent(events, accountId) {
|
|
426
|
-
if (!this.config.
|
|
528
|
+
if (!this.config.devOnlyWatchEvents || !this.config.mongoEventsUri) {
|
|
529
|
+
this.logger.info("Dev watch events not set to true, not saving events");
|
|
427
530
|
return;
|
|
428
531
|
}
|
|
429
|
-
await database.saveCaptchaEvent(events, accountId, this.config.
|
|
532
|
+
await database.saveCaptchaEvent(events, accountId, this.config.mongoEventsUri);
|
|
430
533
|
}
|
|
431
534
|
}
|
|
432
535
|
exports.Tasks = Tasks;
|
package/dist/tasks/tasks.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Header } from '@polkadot/types/interfaces';
|
|
2
|
-
import { Captcha, CaptchaConfig, CaptchaSolution, CaptchaSolutionConfig, CaptchaWithProof, DappUserSolutionResult, DatasetRaw, DatasetWithIds, Hash, PendingCaptchaRequest, ProsopoConfigOutput, ProviderDetails, ProviderRegistered, StoredEvents } from '@prosopo/types';
|
|
2
|
+
import { Captcha, CaptchaConfig, CaptchaSolution, CaptchaSolutionConfig, CaptchaWithProof, DappUserSolutionResult, DatasetRaw, DatasetWithIds, Hash, PendingCaptchaRequest, PoWCaptcha, ProsopoConfigOutput, ProviderDetails, ProviderRegistered, StoredEvents } from '@prosopo/types';
|
|
3
3
|
import { CaptchaMerkleTree } from '@prosopo/datasets';
|
|
4
4
|
import { ContractPromise } from '@polkadot/api-contract/promise';
|
|
5
5
|
import { Database, UserCommitmentRecord } from '@prosopo/types-database';
|
|
@@ -18,6 +18,9 @@ export declare class Tasks {
|
|
|
18
18
|
providerSetDatasetFromFile(file: JSON): Promise<SubmittableResult | undefined>;
|
|
19
19
|
providerSetDataset(datasetRaw: DatasetRaw): Promise<SubmittableResult | undefined>;
|
|
20
20
|
getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<CaptchaWithProof[]>;
|
|
21
|
+
getPowCaptchaChallenge(userAccount: string, dappAccount: string, origin: string): Promise<PoWCaptcha>;
|
|
22
|
+
verifyPowCaptchaSolution(blocknumber: number, challenge: string, difficulty: number, signature: string, nonce: number): Promise<boolean>;
|
|
23
|
+
serverVerifyPowCaptchaSolution(dappAccount: string, challenge: string): Promise<boolean>;
|
|
21
24
|
dappUserSolution(userAccount: string, dappAccount: string, requestHash: string, captchas: CaptchaSolution[], signature: string): Promise<DappUserSolutionResult>;
|
|
22
25
|
dappIsActive(dappAccount: string): Promise<boolean>;
|
|
23
26
|
providerStatus(): Promise<ProviderRegistered>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":"AAaA,OAAO,EAAa,MAAM,EAAsC,MAAM,4BAA4B,CAAA;AAClG,OAAO,EACH,OAAO,EACP,aAAa,EACb,eAAe,EACf,qBAAqB,EACrB,gBAAgB,EAChB,sBAAsB,EAEtB,UAAU,EACV,cAAc,EACd,IAAI,EACJ,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,YAAY,EACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACH,iBAAiB,EAOpB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":"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"}
|
package/dist/tasks/tasks.js
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { CaptchaMerkleTree, buildDataset, compareCaptchaSolutions, computeCaptchaSolutionHash, computePendingRequestHash, parseAndSortCaptchaSolutions, parseCaptchaDataset, } from '@prosopo/datasets';
|
|
2
2
|
import { CaptchaStatus } from '@prosopo/captcha-contract/types-returns';
|
|
3
|
-
import { ProsopoEnvError, getLogger } from '@prosopo/common';
|
|
3
|
+
import { ProsopoContractError, ProsopoEnvError, getLogger } from '@prosopo/common';
|
|
4
4
|
import { getBlockNumber, wrapQuery } from '@prosopo/contract';
|
|
5
5
|
import { at } from '@prosopo/util';
|
|
6
6
|
import { hexToU8a } from '@polkadot/util/hex';
|
|
7
7
|
import { randomAsHex } from '@polkadot/util-crypto/random';
|
|
8
8
|
import { saveCaptchaEvent } from '@prosopo/database';
|
|
9
|
+
import { sha256 } from '@noble/hashes/sha256';
|
|
9
10
|
import { shuffleArray } from '../util.js';
|
|
10
11
|
import { signatureVerify } from '@polkadot/util-crypto/signature';
|
|
11
12
|
import { stringToHex } from '@polkadot/util/string';
|
|
13
|
+
import { u8aToHex } from '@polkadot/util';
|
|
12
14
|
export class Tasks {
|
|
13
15
|
constructor(env) {
|
|
14
16
|
if (!env.contractInterface) {
|
|
@@ -81,6 +83,97 @@ export class Tasks {
|
|
|
81
83
|
context: { failedFuncName: this.getCaptchaWithProof.name, datasetId, solved, size },
|
|
82
84
|
});
|
|
83
85
|
}
|
|
86
|
+
async getPowCaptchaChallenge(userAccount, dappAccount, origin) {
|
|
87
|
+
const difficulty = 4;
|
|
88
|
+
const latestHeader = await this.contract.api.rpc.chain.getHeader();
|
|
89
|
+
const latestBlockNumber = latestHeader.number.toNumber();
|
|
90
|
+
const challenge = `${latestBlockNumber}___${userAccount}___${dappAccount}`;
|
|
91
|
+
const signature = u8aToHex(this.contract.pair.sign(stringToHex(challenge)));
|
|
92
|
+
return { challenge, difficulty, signature };
|
|
93
|
+
}
|
|
94
|
+
async verifyPowCaptchaSolution(blocknumber, challenge, difficulty, signature, nonce) {
|
|
95
|
+
const latestHeader = await this.contract.api.rpc.chain.getHeader();
|
|
96
|
+
const latestBlockNumber = latestHeader.number.toNumber();
|
|
97
|
+
if (latestBlockNumber > blocknumber - 5) {
|
|
98
|
+
throw new ProsopoContractError('CONTRACT.INVALID_BLOCKHASH', {
|
|
99
|
+
context: {
|
|
100
|
+
ERROR: 'Blockhash must be from within last 5 blocks',
|
|
101
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
102
|
+
blocknumber,
|
|
103
|
+
},
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
const signatureVerification = signatureVerify(stringToHex(challenge), signature, this.contract.pair.address);
|
|
107
|
+
if (!signatureVerification.isValid) {
|
|
108
|
+
throw new ProsopoContractError('GENERAL.INVALID_SIGNATURE', {
|
|
109
|
+
context: {
|
|
110
|
+
ERROR: 'Provider signature is invalid for this message',
|
|
111
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
112
|
+
signature,
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
const solutionValid = Array.from(sha256(new TextEncoder().encode(nonce + challenge)))
|
|
117
|
+
.map((byte) => byte.toString(16).padStart(2, '0'))
|
|
118
|
+
.join('')
|
|
119
|
+
.startsWith('0'.repeat(difficulty));
|
|
120
|
+
if (!solutionValid) {
|
|
121
|
+
throw new ProsopoContractError('API.CAPTCHA_FAILED', {
|
|
122
|
+
context: {
|
|
123
|
+
ERROR: 'Captcha solution is invalid',
|
|
124
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
125
|
+
nonce,
|
|
126
|
+
challenge,
|
|
127
|
+
difficulty,
|
|
128
|
+
},
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
await this.db.storePowCaptchaRecord(challenge, false);
|
|
132
|
+
return true;
|
|
133
|
+
}
|
|
134
|
+
async serverVerifyPowCaptchaSolution(dappAccount, challenge) {
|
|
135
|
+
const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
|
|
136
|
+
if (!challengeRecord) {
|
|
137
|
+
throw new ProsopoEnvError('DATABASE.CAPTCHA_GET_FAILED', {
|
|
138
|
+
context: { failedFuncName: this.serverVerifyPowCaptchaSolution.name, challenge },
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
if (challengeRecord.checked) {
|
|
142
|
+
return false;
|
|
143
|
+
}
|
|
144
|
+
const [blocknumber, userAccount, challengeDappAccount] = challengeRecord.challenge.split('___');
|
|
145
|
+
if (dappAccount !== challengeDappAccount) {
|
|
146
|
+
throw new ProsopoEnvError('CAPTCHA.DAPP_USER_SOLUTION_NOT_FOUND', {
|
|
147
|
+
context: {
|
|
148
|
+
failedFuncName: this.serverVerifyPowCaptchaSolution.name,
|
|
149
|
+
dappAccount,
|
|
150
|
+
challengeDappAccount,
|
|
151
|
+
},
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
const latestHeader = await this.contract.api.rpc.chain.getHeader();
|
|
155
|
+
const latestBlockNumber = latestHeader.number.toNumber();
|
|
156
|
+
if (!blocknumber) {
|
|
157
|
+
throw new ProsopoContractError('CONTRACT.INVALID_BLOCKHASH', {
|
|
158
|
+
context: {
|
|
159
|
+
ERROR: 'Blockhash must be from within last 5 blocks',
|
|
160
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
161
|
+
blocknumber,
|
|
162
|
+
},
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
if (latestBlockNumber > parseInt(blocknumber) + 5) {
|
|
166
|
+
throw new ProsopoContractError('CONTRACT.INVALID_BLOCKHASH', {
|
|
167
|
+
context: {
|
|
168
|
+
ERROR: 'Blockhash must be from within last 5 blocks',
|
|
169
|
+
failedFuncName: this.verifyPowCaptchaSolution.name,
|
|
170
|
+
blocknumber,
|
|
171
|
+
},
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
await this.db.updatePowCaptchaRecord(challengeRecord.challenge, true);
|
|
175
|
+
return true;
|
|
176
|
+
}
|
|
84
177
|
async dappUserSolution(userAccount, dappAccount, requestHash, captchas, signature) {
|
|
85
178
|
if (!(await this.dappIsActive(dappAccount))) {
|
|
86
179
|
throw new ProsopoEnvError('CONTRACT.DAPP_NOT_ACTIVE', {
|
|
@@ -329,10 +422,11 @@ export class Tasks {
|
|
|
329
422
|
return blockTime.toNumber();
|
|
330
423
|
}
|
|
331
424
|
async saveCaptchaEvent(events, accountId) {
|
|
332
|
-
if (!this.config.
|
|
425
|
+
if (!this.config.devOnlyWatchEvents || !this.config.mongoEventsUri) {
|
|
426
|
+
this.logger.info('Dev watch events not set to true, not saving events');
|
|
333
427
|
return;
|
|
334
428
|
}
|
|
335
|
-
await saveCaptchaEvent(events, accountId, this.config.
|
|
429
|
+
await saveCaptchaEvent(events, accountId, this.config.mongoEventsUri);
|
|
336
430
|
}
|
|
337
431
|
}
|
|
338
432
|
//# sourceMappingURL=tasks.js.map
|