@prosopo/server 0.2.6 → 0.2.8

package/dist/cjs/index.cjs

@@ -1,114 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const api$1 = require("@polkadot/api");
-const types = require("@prosopo/types");
-const keyring = require("@polkadot/keyring");
-const common = require("@prosopo/common");
+const server = require("./server.cjs");
+const config = require("./config.cjs");
 const contract = require("@prosopo/contract");
-const api = require("@prosopo/api");
-const publicProsopoPair = require("./publicProsopoPair.cjs");
-require("./contracts/captcha/dist/index.cjs");
-const rpcProvider = require("@polkadot/rpc-provider");
-const util = require("@prosopo/util");
-const captcha = require("./contracts/captcha/dist/contract-info/captcha.cjs");
-class ProsopoServer {
-  constructor(pair, config) {
-    this.config = config;
-    this.pair = pair;
-    if (this.config.defaultEnvironment && Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultEnvironment)) {
-      this.defaultEnvironment = this.config.defaultEnvironment;
-      const networkName = types.NetworkNamesSchema.parse(this.defaultEnvironment);
-      this.network = util.get(this.config.networks, networkName);
-      this.wsProvider = new rpcProvider.WsProvider(this.network.endpoint);
-      this.prosopoContractAddress = this.network.contract.address;
-      this.dappContractAddress = this.config.account.address;
-      this.contractName = this.network.contract.name;
-      this.logger = common.getLogger(this.config.logLevel, "@prosopo/server");
-      this.keyring = new keyring.Keyring({
-        type: "sr25519"
-        // TODO get this from the chain
-      });
-      this.abi = JSON.parse(captcha.ContractAbi);
-    } else {
-      throw new common.ProsopoEnvError(
-        "CONFIG.UNKNOWN_ENVIRONMENT",
-        this.constructor.name,
-        {},
-        this.config.defaultEnvironment
-      );
-    }
-  }
-  async getProviderApi(providerUrl) {
-    return new api.ProviderApi(this.network, providerUrl, this.config.account.address);
-  }
-  async isReady() {
-    try {
-      this.api = await api$1.ApiPromise.create({ provider: this.wsProvider });
-      await this.getSigner();
-      await this.getContractApi();
-    } catch (err) {
-      throw new common.ProsopoEnvError(err, "GENERAL.ENVIRONMENT_NOT_READY");
-    }
-  }
-  async getSigner() {
-    if (!this.api) {
-      this.api = await api$1.ApiPromise.create({ provider: this.wsProvider });
-    }
-    await this.api.isReadyOrError;
-    try {
-      this.pair = this.keyring.addPair(this.pair);
-    } catch (err) {
-      throw new common.ProsopoEnvError("CONTRACT.SIGNER_UNDEFINED", this.getSigner.name, {}, err);
-    }
-  }
-  getApi() {
-    if (this.api === void 0) {
-      throw new common.ProsopoEnvError(new Error("api undefined"));
-    }
-    return this.api;
-  }
-  getContract() {
-    if (this.contract === void 0) {
-      throw new common.ProsopoEnvError(new Error("contract undefined"));
-    }
-    return this.contract;
-  }
-  async isVerified(payload) {
-    const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
-    const contractApi = await this.getContractApi();
-    const block = await this.getApi().rpc.chain.getBlockHash(blockNumber);
-    const getRandomProviderResponse = await this.getContract().queryAtBlock(
-      block,
-      "getRandomActiveProvider",
-      [user, dapp]
-    );
-    const providerUrlTrimmed = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
-    if (providerUrlTrimmed !== providerUrl) {
-      return false;
-    }
-    if (providerUrlTrimmed && commitmentId) {
-      const providerApi = await this.getProviderApi(providerUrl);
-      const result = await providerApi.verifyDappUser(user, commitmentId);
-      return result.solutionApproved;
-    } else {
-      return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
-    }
-  }
-  async getContractApi() {
-    this.contract = new contract.ProsopoCaptchaContract(
-      this.getApi(),
-      this.abi,
-      this.prosopoContractAddress,
-      this.pair,
-      this.contractName,
-      0
-    );
-    return this.contract;
-  }
-}
-const PublicProsopoServer = async (config, publicAccountNetwork) => {
-  const publicProsopoPair$1 = await publicProsopoPair.getPublicProsopoPair(publicAccountNetwork);
-  return new ProsopoServer(publicProsopoPair$1, config);
+const PublicProsopoServer = async (config2) => {
+  const pair = await contract.getPairAsync(config2.networks[config2.defaultNetwork], void 0, config2.account.address);
+  return new server.ProsopoServer(config2, pair);
 };
-exports.ProsopoServer = ProsopoServer;
+exports.ProsopoServer = server.ProsopoServer;
+exports.getServerConfig = config.getServerConfig;
 exports.PublicProsopoServer = PublicProsopoServer;

package/dist/cjs/server.cjs

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const api$1 = require("@polkadot/api");
+const types = require("@prosopo/types");
+const keyring = require("@polkadot/keyring");
+const common = require("@prosopo/common");
+const contract = require("@prosopo/contract");
+const api = require("@prosopo/api");
+require("./contracts/captcha/dist/index.cjs");
+const rpcProvider = require("@polkadot/rpc-provider");
+const util = require("@prosopo/util");
+const captcha = require("./contracts/captcha/dist/contract-info/captcha.cjs");
+class ProsopoServer {
+  constructor(config, pair) {
+    this.config = config;
+    this.pair = pair;
+    if (this.config.defaultEnvironment && Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultEnvironment)) {
+      this.defaultEnvironment = this.config.defaultEnvironment;
+      const networkName = types.NetworkNamesSchema.parse(this.config.defaultNetwork);
+      this.network = util.get(this.config.networks, networkName);
+      this.wsProvider = new rpcProvider.WsProvider(this.network.endpoint);
+      this.prosopoContractAddress = this.network.contract.address;
+      this.dappContractAddress = this.config.account.address || contract.getZeroAddress().toString();
+      this.contractName = this.network.contract.name;
+      this.logger = common.getLogger(this.config.logLevel, "@prosopo/server");
+      this.keyring = new keyring.Keyring({
+        type: "sr25519"
+        // TODO get this from the chain
+      });
+      this.abi = JSON.parse(captcha.ContractAbi);
+    } else {
+      throw new common.ProsopoEnvError(
+        "CONFIG.UNKNOWN_ENVIRONMENT",
+        this.constructor.name,
+        {},
+        this.config.defaultEnvironment
+      );
+    }
+  }
+  async getProviderApi(providerUrl) {
+    return new api.ProviderApi(this.network, providerUrl, this.dappContractAddress);
+  }
+  async isReady() {
+    try {
+      this.api = await api$1.ApiPromise.create({ provider: this.wsProvider });
+      await this.getSigner();
+      await this.getContractApi();
+    } catch (err) {
+      throw new common.ProsopoEnvError(err, "GENERAL.ENVIRONMENT_NOT_READY");
+    }
+  }
+  async getSigner() {
+    if (this.pair) {
+      if (!this.api) {
+        this.api = await api$1.ApiPromise.create({ provider: this.wsProvider });
+      }
+      await this.api.isReadyOrError;
+      try {
+        this.pair = this.keyring.addPair(this.pair);
+      } catch (err) {
+        throw new common.ProsopoEnvError("CONTRACT.SIGNER_UNDEFINED", this.getSigner.name, {}, err);
+      }
+    }
+  }
+  getApi() {
+    if (this.api === void 0) {
+      throw new common.ProsopoEnvError(new Error("api undefined"));
+    }
+    return this.api;
+  }
+  getContract() {
+    if (this.contract === void 0) {
+      throw new common.ProsopoEnvError(new Error("contract undefined"));
+    }
+    return this.contract;
+  }
+  async isVerified(payload) {
+    const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
+    const contractApi = await this.getContractApi();
+    const block = await this.getApi().rpc.chain.getBlockHash(blockNumber);
+    const getRandomProviderResponse = await this.getContract().queryAtBlock(
+      block,
+      "getRandomActiveProvider",
+      [user, dapp]
+    );
+    const providerUrlTrimmed = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
+    if (providerUrlTrimmed !== providerUrl) {
+      return false;
+    }
+    console.log("providerUrlTrimmed", providerUrlTrimmed, "commitmentId", commitmentId);
+    if (providerUrlTrimmed && commitmentId) {
+      const providerApi = await this.getProviderApi(providerUrl);
+      const result = await providerApi.verifyDappUser(user, commitmentId);
+      console.log(result);
+      return result.solutionApproved;
+    } else {
+      return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
+    }
+  }
+  async getContractApi() {
+    this.contract = new contract.ProsopoCaptchaContract(
+      this.getApi(),
+      this.abi,
+      this.prosopoContractAddress,
+      this.contractName,
+      0,
+      this.pair
+    );
+    return this.contract;
+  }
+}
+exports.ProsopoServer = ProsopoServer;

package/dist/config.d.ts

@@ -0,0 +1,31 @@
+export declare const getServerConfig: () => {
+    logLevel: "trace" | "debug" | "info" | "warn" | "error" | "fatal";
+    defaultEnvironment: "development" | "staging" | "production";
+    defaultNetwork: "development" | "rococo" | "shiden";
+    account: {
+        address?: string | undefined;
+        secret?: string | undefined;
+        password?: string | undefined;
+    };
+    networks: Record<"development" | "rococo" | "shiden", {
+        endpoint: string;
+        contract: {
+            address: string;
+            name: string;
+        };
+        pairType: "sr25519" | "ed25519" | "ecdsa" | "ethereum";
+        ss58Format: number;
+    }>;
+    web2: boolean;
+    solutionThreshold: number;
+    dappName: string;
+    serverUrl: string;
+    database?: Partial<Record<"development" | "staging" | "production", {
+        type: string;
+        endpoint: string;
+        dbname: string;
+        authSource: string;
+    }>> | undefined;
+    userAccountAddress?: string | undefined;
+};
+//# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CActB,CAAA"}

package/dist/config.js

@@ -0,0 +1,29 @@
+// Copyright 2021-2022 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { ProsopoServerConfigSchema } from '@prosopo/types';
+export const getServerConfig = () => ProsopoServerConfigSchema.parse({
+    defaultEnvironment: process.env.DEFAULT_ENVIRONMENT,
+    defaultNetwork: process.env.DEFAULT_NETWORK,
+    serverUrl: 
+    // https://github.com/prosopo/captcha/issues/701
+    process.env.REACT_APP_SERVER_URL && process.env.REACT_APP_SERVER_PORT
+        ? `${process.env.REACT_APP_SERVER_URL}:${process.env.REACT_APP_SERVER_PORT}`
+        : 'http://localhost:9228',
+    dappName: process.env.REACT_APP_DAPP_NAME || 'client-example-server',
+    account: {
+        password: '',
+        address: process.env.REACT_APP_SERVER_ACCOUNT_ADDRESS || '',
+    },
+});
+//# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAChC,yBAAyB,CAAC,KAAK,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IACnD,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC3C,SAAS;IACL,gDAAgD;IAChD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACjE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QAC5E,CAAC,CAAC,uBAAuB;IACjC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,uBAAuB;IACpE,OAAO,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;KAC9D;CACJ,CAAC,CAAA"}

package/dist/index.d.ts

@@ -1,35 +1,6 @@
-import { ApiPromise } from '@polkadot/api';
-import { ContractAbi, NetworkConfig, ProsopoServerConfig } from '@prosopo/types';
-import { Keyring } from '@polkadot/keyring';
-import { KeyringPair } from '@polkadot/keyring/types';
-import { Logger } from '@prosopo/common';
-import { ProcaptchaOutput } from '@prosopo/types';
-import { ProsopoCaptchaContract } from '@prosopo/contract';
-import { ProviderApi } from '@prosopo/api';
-import { PublicAccountNetwork } from './publicProsopoPair.js';
-import { WsProvider } from '@polkadot/rpc-provider';
-export declare class ProsopoServer {
-    config: ProsopoServerConfig;
-    contract: ProsopoCaptchaContract | undefined;
-    prosopoContractAddress: string;
-    dappContractAddress: string;
-    defaultEnvironment: string;
-    contractName: string;
-    abi: ContractAbi;
-    logger: Logger;
-    wsProvider: WsProvider;
-    keyring: Keyring;
-    pair: KeyringPair;
-    api: ApiPromise | undefined;
-    network: NetworkConfig;
-    constructor(pair: KeyringPair, config: ProsopoServerConfig);
-    getProviderApi(providerUrl: string): Promise<ProviderApi>;
-    isReady(): Promise<void>;
-    getSigner(): Promise<void>;
-    getApi(): ApiPromise;
-    getContract(): ProsopoCaptchaContract;
-    isVerified(payload: ProcaptchaOutput): Promise<boolean>;
-    getContractApi(): Promise<ProsopoCaptchaContract>;
-}
-export declare const PublicProsopoServer: (config: ProsopoServerConfig, publicAccountNetwork: PublicAccountNetwork) => Promise<ProsopoServer>;
+import { ProsopoServer } from './server.js';
+export { ProsopoServer } from './server.js';
+export { getServerConfig } from './config.js';
+import { ProsopoServerConfigOutput } from '@prosopo/types';
+export declare const PublicProsopoServer: (config: ProsopoServerConfigOutput) => Promise<ProsopoServer>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAsB,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AACpG,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAwB,MAAM,wBAAwB,CAAA;AAEnF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,qBAAa,aAAa;IACtB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB;IA6B7C,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAYhC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAOxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE;AAED,eAAO,MAAM,mBAAmB,WAAkB,mBAAmB,wBAAwB,oBAAoB,2BAIhH,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,eAAO,MAAM,mBAAmB,WAAkB,yBAAyB,2BAI1E,CAAA"}

package/dist/index.js

@@ -1,115 +1,10 @@
-// Copyright 2021-2023 Prosopo (UK) Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-import { ApiPromise } from '@polkadot/api';
-import { NetworkNamesSchema } from '@prosopo/types';
-import { Keyring } from '@polkadot/keyring';
-import { getLogger } from '@prosopo/common';
-import { ProsopoCaptchaContract } from '@prosopo/contract';
-import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
-import { ProviderApi } from '@prosopo/api';
-import { getPublicProsopoPair } from './publicProsopoPair.js';
-import { ContractAbi as abiJson } from '@prosopo/captcha-contract';
-import { WsProvider } from '@polkadot/rpc-provider';
-import { get } from '@prosopo/util';
-export class ProsopoServer {
-    constructor(pair, config) {
-        this.config = config;
-        this.pair = pair;
-        if (this.config.defaultEnvironment &&
-            Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultEnvironment)) {
-            this.defaultEnvironment = this.config.defaultEnvironment;
-            const networkName = NetworkNamesSchema.parse(this.defaultEnvironment);
-            this.network = get(this.config.networks, networkName);
-            this.wsProvider = new WsProvider(this.network.endpoint);
-            this.prosopoContractAddress = this.network.contract.address;
-            this.dappContractAddress = this.config.account.address;
-            this.contractName = this.network.contract.name;
-            this.logger = getLogger(this.config.logLevel, '@prosopo/server');
-            this.keyring = new Keyring({
-                type: 'sr25519', // TODO get this from the chain
-            });
-            this.abi = JSON.parse(abiJson);
-        }
-        else {
-            throw new ProsopoEnvError('CONFIG.UNKNOWN_ENVIRONMENT', this.constructor.name, {}, this.config.defaultEnvironment);
-        }
-    }
-    async getProviderApi(providerUrl) {
-        return new ProviderApi(this.network, providerUrl, this.config.account.address);
-    }
-    async isReady() {
-        try {
-            this.api = await ApiPromise.create({ provider: this.wsProvider });
-            await this.getSigner();
-            await this.getContractApi();
-        }
-        catch (err) {
-            throw new ProsopoEnvError(err, 'GENERAL.ENVIRONMENT_NOT_READY');
-        }
-    }
-    async getSigner() {
-        if (!this.api) {
-            this.api = await ApiPromise.create({ provider: this.wsProvider });
-        }
-        await this.api.isReadyOrError;
-        try {
-            this.pair = this.keyring.addPair(this.pair);
-        }
-        catch (err) {
-            throw new ProsopoEnvError('CONTRACT.SIGNER_UNDEFINED', this.getSigner.name, {}, err);
-        }
-    }
-    getApi() {
-        if (this.api === undefined) {
-            throw new ProsopoEnvError(new Error('api undefined'));
-        }
-        return this.api;
-    }
-    getContract() {
-        if (this.contract === undefined) {
-            throw new ProsopoEnvError(new Error('contract undefined'));
-        }
-        return this.contract;
-    }
-    async isVerified(payload) {
-        const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
-        // first check if the provider was actually chosen at blockNumber
-        const contractApi = await this.getContractApi();
-        const block = (await this.getApi().rpc.chain.getBlockHash(blockNumber));
-        const getRandomProviderResponse = await this.getContract().queryAtBlock(block, 'getRandomActiveProvider', [user, dapp]);
-        const providerUrlTrimmed = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
-        if (providerUrlTrimmed !== providerUrl) {
-            return false;
-        }
-        if (providerUrlTrimmed && commitmentId) {
-            const providerApi = await this.getProviderApi(providerUrl);
-            const result = await providerApi.verifyDappUser(user, commitmentId);
-            return result.solutionApproved;
-        }
-        else {
-            return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value
-                .unwrap()
-                .unwrap();
-        }
-    }
-    async getContractApi() {
-        this.contract = new ProsopoCaptchaContract(this.getApi(), this.abi, this.prosopoContractAddress, this.pair, this.contractName, 0);
-        return this.contract;
-    }
-}
-export const PublicProsopoServer = async (config, publicAccountNetwork) => {
-    const publicProsopoPair = await getPublicProsopoPair(publicAccountNetwork);
-    return new ProsopoServer(publicProsopoPair, config);
+import { ProsopoServer } from './server.js';
+export { ProsopoServer } from './server.js';
+export { getServerConfig } from './config.js';
+import { getPairAsync } from '@prosopo/contract';
+export const PublicProsopoServer = async (config) => {
+    // if site key is '' then it will burn address
+    const pair = await getPairAsync(config.networks[config.defaultNetwork], undefined, config.account.address);
+    return new ProsopoServer(config, pair);
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAiC,EAAE,EAAE;IAC3E,8CAA8C;IAC9C,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1G,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA"}

package/dist/server.d.ts

@@ -0,0 +1,33 @@
+import { ApiPromise } from '@polkadot/api';
+import { ContractAbi, NetworkConfig, ProsopoServerConfigOutput } from '@prosopo/types';
+import { Keyring } from '@polkadot/keyring';
+import { KeyringPair } from '@polkadot/keyring/types';
+import { Logger } from '@prosopo/common';
+import { ProcaptchaOutput } from '@prosopo/types';
+import { ProsopoCaptchaContract } from '@prosopo/contract';
+import { ProviderApi } from '@prosopo/api';
+import { WsProvider } from '@polkadot/rpc-provider';
+export declare class ProsopoServer {
+    config: ProsopoServerConfigOutput;
+    contract: ProsopoCaptchaContract | undefined;
+    prosopoContractAddress: string;
+    dappContractAddress: string;
+    defaultEnvironment: string;
+    contractName: string;
+    abi: ContractAbi;
+    logger: Logger;
+    wsProvider: WsProvider;
+    keyring: Keyring;
+    pair: KeyringPair | undefined;
+    api: ApiPromise | undefined;
+    network: NetworkConfig;
+    constructor(config: ProsopoServerConfigOutput, pair?: KeyringPair);
+    getProviderApi(providerUrl: string): Promise<ProviderApi>;
+    isReady(): Promise<void>;
+    getSigner(): Promise<void>;
+    getApi(): ApiPromise;
+    getContract(): ProsopoCaptchaContract;
+    isVerified(payload: ProcaptchaOutput): Promise<boolean>;
+    getContractApi(): Promise<ProsopoCaptchaContract>;
+}
+//# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAsB,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAC1G,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAkB,MAAM,mBAAmB,CAAA;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,qBAAa,aAAa;IACtB,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAA;IAC7B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IA6BpD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIzC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAOxB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}

package/dist/server.js

@@ -0,0 +1,114 @@
+// Copyright 2021-2023 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { ApiPromise } from '@polkadot/api';
+import { NetworkNamesSchema } from '@prosopo/types';
+import { Keyring } from '@polkadot/keyring';
+import { getLogger } from '@prosopo/common';
+import { ProsopoCaptchaContract, getZeroAddress } from '@prosopo/contract';
+import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
+import { ProviderApi } from '@prosopo/api';
+import { ContractAbi as abiJson } from '@prosopo/captcha-contract';
+import { WsProvider } from '@polkadot/rpc-provider';
+import { get } from '@prosopo/util';
+export class ProsopoServer {
+    constructor(config, pair) {
+        this.config = config;
+        this.pair = pair;
+        if (this.config.defaultEnvironment &&
+            Object.prototype.hasOwnProperty.call(this.config.networks, this.config.defaultEnvironment)) {
+            this.defaultEnvironment = this.config.defaultEnvironment;
+            const networkName = NetworkNamesSchema.parse(this.config.defaultNetwork);
+            this.network = get(this.config.networks, networkName);
+            this.wsProvider = new WsProvider(this.network.endpoint);
+            this.prosopoContractAddress = this.network.contract.address;
+            this.dappContractAddress = this.config.account.address || getZeroAddress().toString();
+            this.contractName = this.network.contract.name;
+            this.logger = getLogger(this.config.logLevel, '@prosopo/server');
+            this.keyring = new Keyring({
+                type: 'sr25519', // TODO get this from the chain
+            });
+            this.abi = JSON.parse(abiJson);
+        }
+        else {
+            throw new ProsopoEnvError('CONFIG.UNKNOWN_ENVIRONMENT', this.constructor.name, {}, this.config.defaultEnvironment);
+        }
+    }
+    async getProviderApi(providerUrl) {
+        return new ProviderApi(this.network, providerUrl, this.dappContractAddress);
+    }
+    async isReady() {
+        try {
+            this.api = await ApiPromise.create({ provider: this.wsProvider });
+            await this.getSigner();
+            await this.getContractApi();
+        }
+        catch (err) {
+            throw new ProsopoEnvError(err, 'GENERAL.ENVIRONMENT_NOT_READY');
+        }
+    }
+    async getSigner() {
+        if (this.pair) {
+            if (!this.api) {
+                this.api = await ApiPromise.create({ provider: this.wsProvider });
+            }
+            await this.api.isReadyOrError;
+            try {
+                this.pair = this.keyring.addPair(this.pair);
+            }
+            catch (err) {
+                throw new ProsopoEnvError('CONTRACT.SIGNER_UNDEFINED', this.getSigner.name, {}, err);
+            }
+        }
+    }
+    getApi() {
+        if (this.api === undefined) {
+            throw new ProsopoEnvError(new Error('api undefined'));
+        }
+        return this.api;
+    }
+    getContract() {
+        if (this.contract === undefined) {
+            throw new ProsopoEnvError(new Error('contract undefined'));
+        }
+        return this.contract;
+    }
+    async isVerified(payload) {
+        const { user, dapp, providerUrl, commitmentId, blockNumber } = payload;
+        // first check if the provider was actually chosen at blockNumber
+        const contractApi = await this.getContractApi();
+        const block = (await this.getApi().rpc.chain.getBlockHash(blockNumber));
+        const getRandomProviderResponse = await this.getContract().queryAtBlock(block, 'getRandomActiveProvider', [user, dapp]);
+        const providerUrlTrimmed = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
+        if (providerUrlTrimmed !== providerUrl) {
+            return false;
+        }
+        console.log('providerUrlTrimmed', providerUrlTrimmed, 'commitmentId', commitmentId);
+        if (providerUrlTrimmed && commitmentId) {
+            const providerApi = await this.getProviderApi(providerUrl);
+            const result = await providerApi.verifyDappUser(user, commitmentId);
+            console.log(result);
+            return result.solutionApproved;
+        }
+        else {
+            return (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value
+                .unwrap()
+                .unwrap();
+        }
+    }
+    async getContractApi() {
+        this.contract = new ProsopoCaptchaContract(this.getApi(), this.abi, this.prosopoContractAddress, this.contractName, 0, this.pair);
+        return this.contract;
+    }
+}
+//# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}