Feature/sift tokens

packages/browserExtension/src/app/Content/components/App/App.tsx

@@ -121,7 +121,7 @@ const App = () => {
 
     ResultUtils.combine([
       coreGateway.getScamFilterSettings(),
-      coreGateway.checkURL(url as DomainName),
+      coreGateway.checkEntity(url as DomainName),
     ]).andThen(([scamSettings, scamStatus]) => {
       if (scamSettings.isScamFilterActive) {
         if (scamSettings.showMessageEveryTime) {

packages/browserExtension/src/app/Content/components/ScamFilterComponent/ScamFilterComponent.tsx

@@ -10,9 +10,9 @@ export interface IScamFilterComponentProps {
 }
 
 export enum EScamFilterStatus {
+  NOT_VERIFIED = "NOT VERIFIED",
   VERIFIED = "VERIFIED",
   MALICIOUS = "MALICIOUS",
-  NOT_VERIFIED = "NOT VERIFIED",
 }
 export interface IScamFilterPreferences {
   isScamFilterActive: boolean;

packages/browserExtension/src/app/coreGateways/ExternalCoreGateway.ts

@@ -30,6 +30,7 @@ import {
   SiteVisit,
   URLString,
   MarketplaceListing,
+  SiftEntity,
 } from "@snickerdoodlelabs/objects";
 import { JsonRpcEngine, JsonRpcError } from "json-rpc-engine";
 import { ResultAsync } from "neverthrow";
@@ -363,7 +364,7 @@ export class ExternalCoreGateway {
   > {
     return this._handler.call(EExternalActions.GET_DATA_WALLET_ADDRESS);
   }
-  public checkURL(domain: DomainName): ResultAsync<string, JsonRpcError> {
+  public checkEntity(domain: DomainName): ResultAsync<string, JsonRpcError> {
     return this._handler.call(EExternalActions.CHECK_URL, {
       domain,
     } as ICheckURLParams);

packages/browserExtension/src/extensionCore/implementations/ExtensionCore.module.ts

@@ -1,3 +1,18 @@
+import {
+  AxiosAjaxUtils,
+  CryptoUtils,
+  IAxiosAjaxUtils,
+  IAxiosAjaxUtilsType,
+  TimeUtils,
+  ITimeUtils,
+  ITimeUtilsType,
+  ICryptoUtils,
+  ICryptoUtilsType,
+} from "@snickerdoodlelabs/common-utils";
+import { ContainerModule, interfaces } from "inversify";
+
+import { ScamFilterSettingsUtils } from "./utilities/ScamFilterSettingsUtils";
+
 import {
   BrowserTabListener,
   CoreListener,
@@ -59,26 +74,10 @@ import {
   IUserSiteInteractionService,
   IUserSiteInteractionServiceType,
 } from "@interfaces/business";
-
-import {
-  AxiosAjaxUtils,
-  CryptoUtils,
-  IAxiosAjaxUtils,
-  IAxiosAjaxUtilsType,
-  TimeUtils,
-  ITimeUtils,
-  ITimeUtilsType,
-  ICryptoUtils,
-  ICryptoUtilsType,
-} from "@snickerdoodlelabs/common-utils";
-
 import {
   IScamFilterService,
   IScamFilterServiceType,
 } from "@interfaces/business/IScamFilterService";
-
-import { ContainerModule, interfaces } from "inversify";
-
 import {
   IAccountRepository,
   IAccountRepositoryType,
@@ -119,9 +118,6 @@ import {
   IConfigProvider,
   IConfigProviderType,
 } from "@shared/interfaces/configProvider";
-
-import { ScamFilterSettingsUtils } from "./utilities/ScamFilterSettingsUtils";
-
 import configProvider from "@shared/utils/ConfigProvider";
 
 export const extensionCoreModule = new ContainerModule(

packages/browserExtension/src/extensionCore/implementations/api/RpcCallHandler.ts

@@ -474,7 +474,7 @@ export class RpcCallHandler implements IRpcCallHandler {
       }
       case EExternalActions.CHECK_URL: {
         const { domain } = params as ICheckURLParams;
-        return new AsyncRpcResponseSender(this.checkURL(domain), res).call();
+        return new AsyncRpcResponseSender(this.checkEntity(domain), res).call();
       }
       case EExternalActions.CLOSE_TAB: {
         sender?.tab?.id && ExtensionUtils.closeTab(sender.tab.id);
@@ -708,10 +708,10 @@ export class RpcCallHandler implements IRpcCallHandler {
     const invitation = this.contextProvider.getInvitation(id) as Invitation;
     return this.invitationService.rejectInvitation(invitation);
   }
-  private checkURL(
+  private checkEntity(
     domain: DomainName,
   ): ResultAsync<EScamFilterStatus, SnickerDoodleCoreError> {
-    return this.scamFilterService.checkURL(domain);
+    return this.scamFilterService.checkEntity(domain);
   }
 
   private unlock(

packages/browserExtension/src/extensionCore/implementations/business/ScamFilterService.ts

@@ -16,9 +16,9 @@ export class ScamFilterService implements IScamFilterService {
     protected scamFilterRepository: IScamFilterRepository,
   ) {}
 
-  public checkURL(
+  public checkEntity(
     domain: DomainName,
   ): ResultAsync<EScamFilterStatus, SnickerDoodleCoreError> {
-    return this.scamFilterRepository.checkURL(domain);
+    return this.scamFilterRepository.checkEntity(domain);
   }
 }

packages/browserExtension/src/extensionCore/implementations/data/ScamFilterRepository.ts

@@ -18,10 +18,10 @@ export class ScamFilterRepository implements IScamFilterRepository {
     @inject(IErrorUtilsType) protected errorUtils: IErrorUtils,
   ) {}
 
-  public checkURL(
+  public checkEntity(
     domain: DomainName,
   ): ResultAsync<EScamFilterStatus, SnickerDoodleCoreError> {
-    return this.core.checkURL(domain).mapErr((error) => {
+    return this.core.checkEntity(domain).mapErr((error) => {
       this.errorUtils.emit(error);
       return new SnickerDoodleCoreError((error as Error).message, error);
     });

packages/browserExtension/src/extensionCore/interfaces/business/IScamFilterService.ts

@@ -4,7 +4,7 @@ import { ResultAsync } from "neverthrow";
 import { SnickerDoodleCoreError } from "@shared/objects/errors";
 
 export interface IScamFilterService {
-  checkURL(
+  checkEntity(
     domain: DomainName,
   ): ResultAsync<EScamFilterStatus, SnickerDoodleCoreError>;
 }

packages/browserExtension/src/extensionCore/interfaces/data/IScamFilterRepository.ts

@@ -4,7 +4,7 @@ import { ResultAsync } from "neverthrow";
 import { SnickerDoodleCoreError } from "@shared/objects/errors";
 
 export interface IScamFilterRepository {
-  checkURL(
+  checkEntity(
     domain: DomainName,
   ): ResultAsync<EScamFilterStatus, SnickerDoodleCoreError>;
 }

packages/contracts-sdk/src/implementations/SiftContract.ts

@@ -8,6 +8,7 @@ import {
   HexString,
   BaseURI,
   DomainName,
+  SiftEntity,
 } from "@snickerdoodlelabs/objects";
 import { ethers } from "ethers";
 import { injectable } from "inversify";
@@ -33,34 +34,40 @@ export class SiftContract implements ISiftContract {
       ContractsAbis.SiftAbi.abi,
       providerOrSigner,
     );
+    console.log("this.contract: ", this.contract);
+    console.log("contractAddress: ", contractAddress);
+    console.log("ContractsAbis.SiftAbi.abi: ", ContractsAbis.SiftAbi.abi);
+    console.log("providerOrSigner: ", providerOrSigner);
   }
 
-  public checkURL(
+  public checkEntity(
     domain: DomainName,
-  ): ResultAsync<TokenUri, SiftContractError> {
+  ): ResultAsync<string, SiftContractError> {
     // Returns the tokenURI or string
     // eg. 'www.sift.com/VERIFIED', 'www.sift.com/MALICIOUS' or 'NOT VERIFIED'
     return ResultAsync.fromPromise(
-      this.contract.checkURL(domain) as Promise<TokenUri>,
+      this.contract.checkEntity(domain) as Promise<TokenUri>,
       (e) => {
         return new SiftContractError(
-          "Unable to call checkURL()",
+          "Unable to call checkEntity()",
           (e as IBlockchainError).reason,
           e,
         );
       },
     );
   }
 
-  public verifyURL(domain: DomainName): ResultAsync<void, SiftContractError> {
+  public verifyEntity(
+    domain: DomainName,
+  ): ResultAsync<void, SiftContractError> {
     return ResultAsync.fromPromise(
-      this.contract.verifyURL(
+      this.contract.verifyEntity(
         domain,
       ) as Promise<ethers.providers.TransactionResponse>,
       (e) => {
         // No error handling needed, any reverts from function call should return the reason
         return new SiftContractError(
-          "Unable to call verifyURL()",
+          "Unable to call verifyEntity()",
           (e as IBlockchainError).reason,
           e,
         );
@@ -69,7 +76,7 @@ export class SiftContract implements ISiftContract {
       .andThen((tx) => {
         return ResultAsync.fromPromise(tx.wait(), (e) => {
           return new SiftContractError(
-            "Wait for verifyURL() failed",
+            "Wait for verifyEntity() failed",
             "Unknown",
             e,
           );
@@ -78,17 +85,17 @@ export class SiftContract implements ISiftContract {
       .map(() => {});
   }
 
-  public maliciousURL(
+  public maliciousEntity(
     domain: DomainName,
   ): ResultAsync<void, SiftContractError> {
     return ResultAsync.fromPromise(
-      this.contract.maliciousURL(
+      this.contract.maliciousEntity(
         domain,
       ) as Promise<ethers.providers.TransactionResponse>,
       (e) => {
         // No error handling needed, any reverts from function call should return the reason
         return new SiftContractError(
-          "Unable to call maliciousURL()",
+          "Unable to call maliciousEntity()",
           (e as IBlockchainError).reason,
           e,
         );
@@ -97,7 +104,7 @@ export class SiftContract implements ISiftContract {
       .andThen((tx) => {
         return ResultAsync.fromPromise(tx.wait(), (e) => {
           return new SiftContractError(
-            "Wait for maliciousURL() failed",
+            "Wait for maliciousEntity() failed",
             "Unknown",
             e,
           );

packages/contracts-sdk/src/interfaces/ISiftContract.ts

@@ -9,6 +9,7 @@ import {
   BlockNumber,
   DomainName,
   BaseURI,
+  SiftEntity,
 } from "@snickerdoodlelabs/objects";
 import { EventFilter, Event } from "ethers";
 import { ResultAsync } from "neverthrow";
@@ -21,22 +22,22 @@ export interface ISiftContract {
    * Marks the domain tokenURI value as VERIFIED
    * @param domain Domain name to verify
    */
-  verifyURL(domain: DomainName): ResultAsync<void, SiftContractError>;
+  verifyEntity(domain: DomainName): ResultAsync<void, SiftContractError>;
 
   /**
    * Sets a URL as malicious
    * Marks the domain tokenURI value as MALICIOUS
    * @param domain Domain name to set as malicious
    */
-  maliciousURL(domain: DomainName): ResultAsync<void, SiftContractError>;
+  maliciousEntity(domain: DomainName): ResultAsync<void, SiftContractError>;
 
   /**
    * Checks a URL
    * Returns tokenURI or NOT VERIFIED
    * eg. 'www.sift.com/VERIFIED', 'www.sift.com/MALICIOUS' or 'NOT VERIFIED
    * @param domain Domain name to check
    */
-  checkURL(domain: DomainName): ResultAsync<TokenUri, SiftContractError>;
+  checkEntity(domain: DomainName): ResultAsync<string, SiftContractError>;
 
   /**
    * Sets a new base uri for the contract