@prosopo/procaptcha-frictionless 0.3.3 → 0.3.5

package/dist/cjs/account/dist/extension/ExtensionWeb2.cjs

@@ -58,7 +58,7 @@ class ExtensionWeb2 extends Extension.Extension {
         }
       },
       name: "procaptcha-web2",
-      version: "0.1.11",
+      version: "0.3.x",
       signer
     };
   }
@@ -77,7 +77,7 @@ class ExtensionWeb2 extends Extension.Extension {
     const entropy = common.hexHash([canvasEntropy, browserEntropy].join(""), 128).slice(2);
     const u8Entropy = string.stringToU8a(entropy);
     const mnemonic = bip39.entropyToMnemonic(u8Entropy);
-    const api = await Api.ApiPromise.create({ provider: wsProvider, initWasm: false });
+    const api = await Api.ApiPromise.create({ provider: wsProvider, initWasm: false, noInitWarn: true });
     const type = "ed25519";
     const keyring$1 = new keyring.Keyring({ type, ss58Format: api.registry.chainSS58 });
     const keypair = keyring$1.addFromMnemonic(mnemonic);

package/dist/cjs/procaptcha-pow/dist/Services/Manager.cjs

@@ -48,7 +48,11 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
   };
   const loadContract = async () => {
     const network = getNetwork(getConfig());
-    const api2 = await Api.ApiPromise.create({ provider: new ws.WsProvider(network.endpoint), initWasm: false });
+    const api2 = await Api.ApiPromise.create({
+      provider: new ws.WsProvider(network.endpoint),
+      initWasm: false,
+      noInitWarn: true
+    });
     const type = "sr25519";
     const keyring$1 = new keyring.Keyring({ type, ss58Format: api2.registry.chainSS58 });
     return new contract.ProsopoCaptchaContract(api2, JSON.parse(contractInfo.ContractAbi), network.contract.address, "prosopo", 0, keyring$1.addFromAddress(getConfig().account.address || ""));
@@ -87,8 +91,13 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
       return;
     }
     resetState();
-    updateState({ loading: true });
     const config = getConfig();
+    const ext = new ExtensionWeb2.ExtensionWeb2();
+    const userAccount = config.userAccountAddress || (await ext.getAccount(config)).account.address;
+    updateState({
+      loading: true,
+      account: { account: { address: userAccount } }
+    });
     updateState({ dappAccount: config.account.address });
     await procaptcha.sleep(100);
     if (!config.web2 && !config.userAccountAddress) {
@@ -96,23 +105,25 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
         context: { error: "Account address has not been set for web3 mode" }
       });
     }
-    const ext = new ExtensionWeb2.ExtensionWeb2();
-    const account = await ext.getAccount(config);
     const contract$1 = await loadContract();
     const events = procaptchaCommon.getDefaultEvents(onStateUpdate, state, callbacks);
-    const getRandomProviderResponse = await contract.wrapQuery(contract$1.query.getRandomActiveProvider, contract$1.query)(account.account.address, getDappAccount());
+    const getRandomProviderResponse = await contract.wrapQuery(contract$1.query.getRandomActiveProvider, contract$1.query)(userAccount, getDappAccount());
     const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
     const providerApi = new api.ProviderApi(getNetwork(getConfig()), providerUrl, getDappAccount());
-    const challenge = await providerApi.getPowCaptchaChallenge(account.account.address, getDappAccount());
+    const challenge = await providerApi.getPowCaptchaChallenge(userAccount, getDappAccount());
     const solution = SolverService.solvePoW(challenge.challenge, challenge.difficulty);
-    await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.address, getDappAccount(), getRandomProviderResponse, solution);
-    if (state.isHuman) {
+    const verifiedSolution = await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.address, getDappAccount(), getRandomProviderResponse, solution);
+    if (verifiedSolution[types.ApiParams.verified]) {
+      updateState({
+        isHuman: true,
+        loading: false
+      });
       events.onHuman({
         providerUrl,
         [types.ApiParams.user]: getAccount().account.address,
         [types.ApiParams.dapp]: getDappAccount(),
-        [types.ApiParams.challengeId]: challenge.challenge,
-        [types.ApiParams.blockNumber]: getBlockNumber()
+        [types.ApiParams.challenge]: challenge.challenge,
+        [types.ApiParams.blockNumber]: getRandomProviderResponse.blockNumber
       });
     }
   };

package/dist/cjs/procaptcha-pow/dist/components/Captcha.cjs

@@ -19,11 +19,11 @@ const Procaptcha = (props) => {
   const updateState = procaptchaCommon.buildUpdateState(state, _updateState);
   const manager = Manager.Manager(config, state, updateState, callbacks);
   return jsxRuntime.jsx("div", { children: jsxRuntime.jsx("div", { style: { maxWidth: "100%", maxHeight: "100%", overflowX: "auto" }, children: jsxRuntime.jsx(Containers.ContainerDiv, { children: jsxRuntime.jsx(Containers.WidthBasedStylesDiv, { children: jsxRuntime.jsxs("div", { style: WidgetConstants.WIDGET_DIMENSIONS, "data-cy": "button-human", children: [" ", jsxRuntime.jsxs("div", { style: {
-    padding: "2px",
-    border: "1px solid",
+    padding: WidgetConstants.WIDGET_PADDING,
+    border: WidgetConstants.WIDGET_BORDER,
     backgroundColor: theme$1.palette.background.default,
     borderColor: theme$1.palette.grey[300],
-    borderRadius: "4px",
+    borderRadius: WidgetConstants.WIDGET_BORDER_RADIUS,
     display: "flex",
     alignItems: "center",
     flexWrap: "wrap",

package/dist/cjs/web-components/dist/CaptchaPlaceholder.cjs

@@ -10,11 +10,11 @@ const ProcaptchaPlaceholder = (props) => {
   const themeColor = props.darkMode === "light" ? "light" : "dark";
   const theme$1 = props.darkMode === "light" ? theme.lightTheme : theme.darkTheme;
   return jsxRuntime.jsx("div", { children: jsxRuntime.jsx("div", { style: { maxWidth: "100%", maxHeight: "100%", overflowX: "auto" }, children: jsxRuntime.jsx(Containers.ContainerDiv, { children: jsxRuntime.jsx(Containers.WidthBasedStylesDiv, { children: jsxRuntime.jsxs("div", { style: WidgetConstants.WIDGET_DIMENSIONS, "data-cy": "button-human", children: [" ", jsxRuntime.jsxs("div", { style: {
-    padding: "2px",
-    border: "1px solid",
+    padding: WidgetConstants.WIDGET_PADDING,
+    border: WidgetConstants.WIDGET_BORDER,
     backgroundColor: theme$1.palette.background.default,
     borderColor: theme$1.palette.grey[300],
-    borderRadius: "8px",
+    borderRadius: WidgetConstants.WIDGET_BORDER_RADIUS,
     display: "flex",
     alignItems: "center",
     flexWrap: "wrap",

package/dist/cjs/web-components/dist/WidgetConstants.cjs

@@ -5,8 +5,14 @@ const WIDGET_URL_TEXT = "Visit prosopo.io to learn more about the service and it
 const WIDGET_INNER_HEIGHT = 74;
 const WIDGET_OUTER_HEIGHT = 80;
 const WIDGET_DIMENSIONS = { maxWidth: "400px", minWidth: "200px", minHeight: `${WIDGET_OUTER_HEIGHT}px` };
+const WIDGET_BORDER_RADIUS = "8px";
+const WIDGET_PADDING = "2px";
+const WIDGET_BORDER = "1px solid";
+exports.WIDGET_BORDER = WIDGET_BORDER;
+exports.WIDGET_BORDER_RADIUS = WIDGET_BORDER_RADIUS;
 exports.WIDGET_DIMENSIONS = WIDGET_DIMENSIONS;
 exports.WIDGET_INNER_HEIGHT = WIDGET_INNER_HEIGHT;
 exports.WIDGET_OUTER_HEIGHT = WIDGET_OUTER_HEIGHT;
+exports.WIDGET_PADDING = WIDGET_PADDING;
 exports.WIDGET_URL = WIDGET_URL;
 exports.WIDGET_URL_TEXT = WIDGET_URL_TEXT;

package/dist/cjs/web-components/dist/index.cjs

@@ -15,8 +15,11 @@ exports.Checkbox = Checkbox.Checkbox;
 exports.Logo = Logo;
 exports.ContainerDiv = Containers.ContainerDiv;
 exports.WidthBasedStylesDiv = Containers.WidthBasedStylesDiv;
+exports.WIDGET_BORDER = WidgetConstants.WIDGET_BORDER;
+exports.WIDGET_BORDER_RADIUS = WidgetConstants.WIDGET_BORDER_RADIUS;
 exports.WIDGET_DIMENSIONS = WidgetConstants.WIDGET_DIMENSIONS;
 exports.WIDGET_INNER_HEIGHT = WidgetConstants.WIDGET_INNER_HEIGHT;
 exports.WIDGET_OUTER_HEIGHT = WidgetConstants.WIDGET_OUTER_HEIGHT;
+exports.WIDGET_PADDING = WidgetConstants.WIDGET_PADDING;
 exports.WIDGET_URL = WidgetConstants.WIDGET_URL;
 exports.WIDGET_URL_TEXT = WidgetConstants.WIDGET_URL_TEXT;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/procaptcha-frictionless",
-    "version": "0.3.3",
+    "version": "0.3.5",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
@@ -34,9 +34,9 @@
     ],
     "dependencies": {
         "@fingerprintjs/botd": "^1.9.0",
-        "@prosopo/procaptcha-pow": "0.3.3",
-        "@prosopo/procaptcha-react": "0.3.3",
-        "@prosopo/web-components": "0.3.3",
+        "@prosopo/procaptcha-pow": "0.3.5",
+        "@prosopo/procaptcha-react": "0.3.5",
+        "@prosopo/web-components": "0.3.5",
         "react": "^18.2.0"
     },
     "devDependencies": {