fixed linting for vyper and walletconnect

apps/vyper/project.json

@@ -42,8 +42,8 @@
       "executor": "@nrwl/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["libs/vyper/**/*.ts"],
+        "lintFilePatterns": ["apps/vyper/**/*.ts"],
-        "eslintConfig": "libs/vyper/.eslintrc"
+        "eslintConfig": "apps/vyper/.eslintrc"
       }
     },
     "serve": {

apps/vyper/src/app/utils/types.ts

@@ -1,4 +1,4 @@
-import {CompilationResult, ABIDescription} from '@remixproject/plugin-api'
+import { CompilationResult, ABIDescription } from '@remixproject/plugin-api'
 
 export interface VyperCompilationResult {
   status: 'success'
@@ -18,7 +18,6 @@ export interface VyperCompilationError {
   message: string
 }
 
-
 export type VyperCompilationResultType = {
   buildDependencies: any
   compilers: [
@@ -85,68 +84,68 @@ export type VyperCompilationResultType = {
 }
 
 export interface PackageManifest {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  version:     string;
+  version: string;
-  properties:  PackageManifestProperties;
+  properties: PackageManifestProperties;
   definitions: Definitions;
 }
 
 export interface Definitions {
-  packageMeta:                 ByteString;
+  packageMeta: ByteString;
-  contractType:                ByteString;
+  contractType: ByteString;
-  contractInstance:            ContractInstance;
+  contractInstance: ContractInstance;
-  byteString:                  ByteString;
+  byteString: ByteString;
-  bytecodeObject:              BytecodeObject;
+  bytecodeObject: BytecodeObject;
-  linkReference:               LinkReference;
+  linkReference: LinkReference;
-  linkValue:                   LinkValue;
+  linkValue: LinkValue;
-  identifier:                  ByteString;
+  identifier: ByteString;
-  contractInstanceName:        ByteString;
+  contractInstanceName: ByteString;
-  deployment:                  Deployment;
+  deployment: Deployment;
   packageContractInstanceName: ByteString;
-  compilerInformation:         CompilerInformation;
+  compilerInformation: CompilerInformation;
-  address:                     Address;
+  address: Address;
-  transactionHash:             Address;
+  transactionHash: Address;
-  blockHash:                   Address;
+  blockHash: Address;
-  contentURI:                  ByteString;
+  contentURI: ByteString;
 }
 
 export interface Address {
-  title:       string;
+  title: string;
   description: string;
-  allOf:       AllOf[];
+  allOf: AllOf[];
 }
 
 export interface AllOf {
-  ref?:       string;
+  ref?: string;
   minLength?: number;
   maxLength?: number;
 }
 
 export interface ByteStringProperties {
-  contractName?:       ByteString;
+  contractName?: ByteString;
   deploymentBytecode?: Meta;
-  runtimeBytecode?:    Meta;
+  runtimeBytecode?: Meta;
-  abi?:                ByteString;
+  abi?: ByteString;
-  natspec?:            ByteString;
+  natspec?: ByteString;
-  compiler?:           Meta;
+  compiler?: Meta;
-  authors?:            ByteString;
+  authors?: ByteString;
-  license?:            ByteString;
+  license?: ByteString;
-  description?:        ByteString;
+  description?: ByteString;
-  keywords?:           ByteString;
+  keywords?: ByteString;
-  links?:              Links;
+  links?: Links;
 }
 
 export interface ByteString {
-  title:              string;
+  title: string;
-  description?:       string;
+  description?: string;
-  type:               TypeEnum;
+  type: TypeEnum;
-  pattern?:           string;
+  pattern?: string;
-  format?:            string;
+  format?: string;
-  items?:             Items;
+  items?: Items;
-  properties?:        ByteStringProperties;
+  properties?: ByteStringProperties;
   patternProperties?: { [key: string]: Meta };
 }
 
@@ -155,29 +154,29 @@ export interface Meta {
 }
 
 export interface Links {
-  title:                string;
+  title: string;
-  descriptions:         string;
+  descriptions: string;
-  type:                 TypeEnum;
+  type: TypeEnum;
   additionalProperties: AdditionalProperties;
 }
 
 export interface AdditionalProperties {
-  type:   TypeEnum;
+  type: TypeEnum;
   format: string;
 }
 
 export type TypeEnum = "string" | "array" | "object";
 
 export interface Items {
-  ref?:  string;
+  ref?: string;
   type?: TypeEnum;
 }
 
 export interface BytecodeObject {
-  title:      string
+  title: string
-  type:       TypeEnum
+  type: TypeEnum
   offsets: number[]
-  anyOf:      BytecodeObjectAnyOf[]
+  anyOf: BytecodeObjectAnyOf[]
   properties: BytecodeObjectProperties
   bytecode: string
   linkReferences?: { offset?: any; length?: number; name?: string}[]
@@ -188,56 +187,56 @@ export interface BytecodeObjectAnyOf {
 }
 
 export interface BytecodeObjectProperties {
-  bytecode:         Meta;
+  bytecode: Meta;
-  linkReferences:   Link;
+  linkReferences: Link;
   linkDependencies: Link;
 }
 
 export interface Link {
-  type:  TypeEnum;
+  type: TypeEnum;
   items: Meta;
 }
 
 export interface CompilerInformation {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  CompilerInformationProperties;
+  properties: CompilerInformationProperties;
 }
 
 export interface CompilerInformationProperties {
-  name:     Name;
+  name: Name;
-  version:  Name;
+  version: Name;
   settings: Name;
 }
 
 export interface Name {
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
 }
 
 export interface ContractInstance {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  ContractInstanceProperties;
+  properties: ContractInstanceProperties;
 }
 
 export interface ContractInstanceProperties {
-  contractType:     ByteString;
+  contractType: ByteString;
-  address:          Meta;
+  address: Meta;
-  transaction:      Meta;
+  transaction: Meta;
-  block:            Meta;
+  block: Meta;
-  runtimeBytecode:  Meta;
+  runtimeBytecode: Meta;
-  compiler:         Meta;
+  compiler: Meta;
   linkDependencies: ByteString;
 }
 
 export interface Deployment {
-  title:             string;
+  title: string;
-  type:              TypeEnum;
+  type: TypeEnum;
   patternProperties: DeploymentPatternProperties;
 }
 
@@ -246,36 +245,36 @@ export interface DeploymentPatternProperties {
 }
 
 export interface LinkReference {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  LinkReferenceProperties;
+  properties: LinkReferenceProperties;
 }
 
 export interface LinkReferenceProperties {
   offsets: Offsets;
-  length:  Length;
+  length: Length;
-  name:    Meta;
+  name: Meta;
 }
 
 export interface Length {
-  type:    string;
+  type: string;
   minimum: number;
 }
 
 export interface Offsets {
-  type:  TypeEnum;
+  type: TypeEnum;
   items: Length;
 }
 
 export interface LinkValue {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  LinkValueProperties;
+  properties: LinkValueProperties;
-  oneOf:       OneOf[];
+  oneOf: OneOf[];
 }
 
 export interface OneOf {
@@ -283,7 +282,7 @@ export interface OneOf {
 }
 
 export interface OneOfProperties {
-  type:  TypeClass;
+  type: TypeClass;
   value: PurpleValue;
 }
 
@@ -292,14 +291,14 @@ export interface TypeClass {
 }
 
 export interface PurpleValue {
-  ref?:   string;
+  ref?: string;
   anyOf?: Meta[];
 }
 
 export interface LinkValueProperties {
   offsets: Offsets;
-  type:    Name;
+  type: Name;
-  value:   FluffyValue;
+  value: FluffyValue;
 }
 
 export interface FluffyValue {
@@ -307,19 +306,19 @@ export interface FluffyValue {
 }
 
 export interface PackageManifestProperties {
-  manifestVersion:   ManifestVersion;
+  manifestVersion: ManifestVersion;
-  packageName:       ByteString;
+  packageName: ByteString;
-  meta:              Meta;
+  meta: Meta;
-  version:           Version;
+  version: Version;
-  sources:           Sources;
+  sources: Sources;
-  contractTypes:     ByteString;
+  contractTypes: ByteString;
-  deployments:       ByteString;
+  deployments: ByteString;
   buildDependencies: BuildDependencies;
 }
 
 export interface BuildDependencies {
-  title:             string;
+  title: string;
-  type:              TypeEnum;
+  type: TypeEnum;
   patternProperties: BuildDependenciesPatternProperties;
 }
 
@@ -328,16 +327,16 @@ export interface BuildDependenciesPatternProperties {
 }
 
 export interface ManifestVersion {
-  type:        TypeEnum;
+  type: TypeEnum;
-  title:       string;
+  title: string;
   description: string;
-  default:     string;
+  default: string;
-  enum:        string[];
+  enum: string[];
 }
 
 export interface Sources {
-  title:             string;
+  title: string;
-  type:              TypeEnum;
+  type: TypeEnum;
   patternProperties: SourcesPatternProperties;
 }
 
@@ -351,13 +350,13 @@ export interface Empty {
 
 export interface AnyOf {
   title?: string;
-  type?:  TypeEnum;
+  type?: TypeEnum;
-  ref?:   string;
+  ref?: string;
 }
 
 export interface Version {
   title: string;
-  type:  TypeEnum;
+  type: TypeEnum;
 }
 
 export type CompileFormat = {
@@ -448,7 +447,6 @@ deployments: {
   [contractName: string]: ContractInstanceObject
 }
 
-
 }
 
 export type CompilerInformationObject = {
@@ -496,45 +494,45 @@ export type ContractInstanceObject = {
 
 export type ASTSrc = {
   jumpCode: string;
-  length:   number;
+  length: number;
 }
 
 export type Child = {
-  astType:        string;
+  astType: string;
-  children:       Child[];
+  children: Child[];
   classification: number;
-  colOffset:      number;
+  colOffset: number;
-  endColOffset:   number;
+  endColOffset: number;
-  endLineno:      number;
+  endLineno: number;
-  lineno:         number;
+  lineno: number;
-  name?:          string;
+  name?: string;
-  src:            ChildSrc;
+  src: ChildSrc;
-  docStr?:        Child;
+  docStr?: Child;
 }
 
 export type ChildSrc = {
   jumpCode: string;
-  length:   number;
+  length: number;
-  start:    number;
+  start: number;
 }
 
 export type AST = {
-  astType:        string;
+  astType: string;
-  children:       Child[];
+  children: Child[];
   classification: number;
-  colOffset:      number;
+  colOffset: number;
-  endColOffset:   number;
+  endColOffset: number;
-  endLineno:      number;
+  endLineno: number;
-  lineno:         number;
+  lineno: number;
-  name:           string;
+  name: string;
-  src:            ASTSrc;
+  src: ASTSrc;
 }
 
 export type ABI = {
-  anonymous?:       boolean;
+  anonymous?: boolean;
-  inputs:           any[];
+  inputs: any[];
-  name?:            string;
+  name?: string;
-  type:             any
+  type: any
   stateMutability?: any;
-  outputs?:         any[];
+  outputs?: any[];
 }

apps/walletconnect/project.json

@@ -39,8 +39,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/walletconnect/**/*.ts"],
+          "lintFilePatterns": ["apps/walletconnect/**/*.ts"],
-          "eslintConfig": "libs/walletconnect/.eslintrc"
+          "eslintConfig": "apps/walletconnect/.eslintrc"
         }
       },
       "serve": {

apps/walletconnect/src/services/WalletConnectRemixClient.ts

@@ -1,9 +1,9 @@
-import {PluginClient} from '@remixproject/plugin'
+import { PluginClient } from '@remixproject/plugin'
-import {createClient} from '@remixproject/plugin-webview'
+import { createClient } from '@remixproject/plugin-webview'
 import { createWeb3Modal, defaultConfig } from '@web3modal/ethers5/react'
 import { constants } from '../utils/constants'
 import EventManager from 'events'
-import {PROJECT_ID as projectId, METADATA as metadata} from './constant'
+import { PROJECT_ID as projectId, METADATA as metadata } from './constant'
 import { Chain, RequestArguments } from '../types'
 
 export class WalletConnectRemixClient extends PluginClient {
@@ -39,7 +39,7 @@ export class WalletConnectRemixClient extends PluginClient {
         metadata,
         rpcUrl: 'https://cloudflare-eth.com'
       })
-      
+
       this.web3modal = createWeb3Modal({ projectId, chains: constants.chains, metadata, ethersConfig })
       this.ethersConfig = ethersConfig
       this.chains = constants.chains
@@ -50,16 +50,16 @@ export class WalletConnectRemixClient extends PluginClient {
 
   subscribeToEvents() {
     this.web3modal.subscribeProvider(({ address, isConnected, chainId })=>{
-      if(isConnected){
+      if (isConnected){
         if (address !== this.currentAccount) {
           this.currentAccount = address
-          this.emit('accountsChanged', [address])          
+          this.emit('accountsChanged', [address])
         }
         if (this.currentChain !== chainId) {
           this.currentChain = chainId
           this.emit('chainChanged', chainId)
         }
-      }else{
+      } else {
         this.emit('accountsChanged', [])
         this.currentAccount = ''
         this.emit('chainChanged', 0)
@@ -106,7 +106,7 @@ export class WalletConnectRemixClient extends PluginClient {
                     error,
                     id: data.id
                   })
-                }                
+                }
               }
               return resolve(response)
             })
@@ -114,16 +114,16 @@ export class WalletConnectRemixClient extends PluginClient {
         } else {
           try {
             const message = await provider.request(data)
-            return {jsonrpc: '2.0', result: message, id: data.id}
+            return { jsonrpc: '2.0', result: message, id: data.id }
           } catch (e) {
-            return {jsonrpc: '2.0', error: { message: e.message, code: -32603 }, id: data.id}
+            return { jsonrpc: '2.0', error: { message: e.message, code: -32603 }, id: data.id }
           }
         }
       }
     } else {
       const err = `Cannot make ${data.method} request. Remix client is not connected to walletconnect client`
       console.error(err)
-      return {jsonrpc: '2.0', error: { message: err, code: -32603 }, id: data.id}
+      return { jsonrpc: '2.0', error: { message: err, code: -32603 }, id: data.id }
     }
   }