Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .config/husky/pre-commit

This file was deleted.

File renamed without changes.
68 changes: 1 addition & 67 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,69 +1,3 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 8,
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true,
"experimentalObjectRestSpread": true
},
"allowImportExportEverywhere": true
},
"plugins": ["@typescript-eslint", "import"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:prettier/recommended",
"prettier"
],
"rules": {
"import/order": [
"error",
{
"groups": ["external", "internal"],
"newlines-between": "always-and-inside-groups"
}
],
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/consistent-type-imports": "warn",
"sort-imports": [
"warn",
{
"ignoreDeclarationSort": true
}
],
"spaced-comment": [
"error",
"always",
{
"block": {
"markers": ["*"],
"balanced": true
}
}
]
},
"ignorePatterns": ["node_modules", "dist", "CHANGELOG.md"],
"settings": {
"import/parsers": {
"@typescript-eslint/parser": [".ts", ".tsx", ".d.ts"]
},
"import/resolver": {
"typescript": {
"alwaysTryTypes": true
}
}
},
"env": {
"es6": true,
"browser": true,
"node": true,
"mocha": true
}
"extends": ["evmcrispr"]
}
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,8 @@ act.secrets
tsconfig.tsbuildinfo

# typedocs
docs
docs

.turbo

chain-manager.log
18 changes: 12 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "hardhat test",
"skipFiles": ["<node_internals>/**"],
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/hardhat",
"args": ["test"],
"cwd": "${workspaceFolder}/packages/evmcrispr/"
"name": "Launch Program",
"skipFiles": [
"<node_internals>/**"
],
"program": "${file}",
"outFiles": [
"${workspaceFolder}/**/*.js"
]
}
]
}
}
7 changes: 1 addition & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,5 @@
"solidity.packageDefaultDependenciesContractsDirectory": "",
"solidity.packageDefaultDependenciesDirectory": "packages/hardhat/node_modules",
"solidity.enabledAsYouTypeCompilationErrorCheck": true,
"solidity.validationDelay": 1500,
"mochaExplorer.env": {
"HARDHAT_CONFIG": "hardhat.config.ts",
"HARDHAT_COMPILE": "true"
},
"mochaExplorer.require": ["ts-node/register/transpile-only"]
"solidity.validationDelay": 1500
}
10 changes: 0 additions & 10 deletions babel.config.js

This file was deleted.

72 changes: 72 additions & 0 deletions common/eslint-config-evmcrispr/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 8,
sourceType: 'module',
ecmaFeatures: {
impliedStrict: true,
experimentalObjectRestSpread: true,
},
allowImportExportEverywhere: true,
},
plugins: ['@typescript-eslint', 'import', 'turbo'],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'plugin:prettier/recommended',
'prettier',
'turbo',
],
rules: {
'import/order': [
'error',
{
groups: ['external', 'internal'],
'newlines-between': 'always-and-inside-groups',
alphabetize: { order: 'asc' },
},
],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/consistent-type-imports': 'warn',
'sort-imports': [
'warn',
{
ignoreDeclarationSort: true,
},
],
'spaced-comment': [
'error',
'always',
{
block: {
markers: ['*'],
balanced: true,
},
},
],
'turbo/no-undeclared-env-vars': 'warn',
},
ignorePatterns: ['node_modules', 'dist', 'CHANGELOG.md'],
settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx', '.d.ts'],
},
'import/resolver': {
typescript: {
alwaysTryTypes: true,
},
},
},
env: {
es6: true,
browser: true,
node: true,
mocha: true,
},
};
4 changes: 4 additions & 0 deletions common/eslint-config-evmcrispr/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// eslint-disable-next-line @typescript-eslint/no-var-requires
const eslintrc = require('./.eslintrc');

module.exports = eslintrc;
27 changes: 27 additions & 0 deletions common/eslint-config-evmcrispr/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "eslint-config-evmcrispr",
"private": true,
"main": "index.js",
"description": "Test helpers for the EVMcrispr library",
"author": "Blossom Labs",
"license": "GPL-3.0",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-turbo": "^0.0.7",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-turbo": "^0.0.7",
"prettier": "^2.6.2",
"typescript": "4.7.4"
},
"peerDependencies": {
"eslint": "^7.32.0",
"typescript": "4.7.4"
}
}
4 changes: 4 additions & 0 deletions common/test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"root": true,
"extends": ["evmcrispr"]
}
15 changes: 15 additions & 0 deletions common/test/hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { HardhatUserConfig } from 'hardhat/config';

const FORK_CHAIN_ID = parseInt(process.env.FORK_CHAIN_ID ?? '100');

if (!FORK_CHAIN_ID) {
throw new Error('Missing FORK_CHAIN_ID env variable');
}

export const config: HardhatUserConfig = {
networks: {
hardhat: {
chainId: FORK_CHAIN_ID,
},
},
};
32 changes: 32 additions & 0 deletions common/test/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "@1hive/evmcrispr-test-common",
"private": true,
"main": "src/index.ts",
"description": "Test helpers for the EVMcrispr library",
"scripts": {
"lint": "tsc --noEmit && eslint",
"create-fixtures": "ts-node scripts/create-fixtures.ts"
},
"exports": {
".": "./src/index.ts",
"./setups/file": "./setups/file.ts",
"./setups/global": "./setups/global.ts",
"./hardhat.config": "./hardhat.config.ts",
"./vite.config": "./vite.config.ts"
},
"author": "Blossom Labs",
"license": "GPL-3.0",
"devDependencies": {
"@1hive/evmcrispr": "workspace:^0.9.0",
"@types/express": "^4.17.15",
"arcsecond": "^4.1.0",
"eslint-config-evmcrispr": "workspace:*",
"tsconfig-evmcrispr": "workspace:*",
"express": "^4.18.2",
"is-port-reachable": "^4.0.0",
"isomorphic-fetch": "^3.0.0",
"msw": "^0.47.3",
"ora": "^6.1.2",
"winston": "^3.8.2"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import ora from 'ora';

import fs from 'fs';

import { IPFSResolver } from '@1hive/evmcrispr';
import {
fetchAppArtifact,
parseContentUri,
} from '../src/modules/aragonos/utils';
} from '@1hive/evmcrispr-aragonos-module/src/utils';
import ora from 'ora';

import {
basePath,
fetchOrganizationApps,
Expand All @@ -14,7 +13,7 @@ import {
generateMockDAOFile,
generateSubgraphDataIndexFile,
} from './helpers/fixtures';
import { IPFSResolver } from '../src/IPFSResolver';
import fs from 'fs';

// // Rinkeby
// const CHAIN_ID = 4;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import fs from 'fs';
import { subgraphUrlFromChainId } from '../../src/modules/aragonos/Connector';
import { subgraphUrlFromChainId } from '@1hive/evmcrispr-aragonos-module/src/Connector';
import {
ORGANIZATION_APPS,
REPO,
getSystemApp,
parseRegistry,
} from '../../src/modules/aragonos/utils';
} from '@1hive/evmcrispr-aragonos-module/src/utils';

import fs from 'fs';

export const basePath = (relativePath: string): string =>
`test/fixtures/${relativePath}`;
Expand Down
Loading