Skip to content

Commit

Permalink
Merge pull request #9 from cloudwalk/project-reorgs
Browse files Browse the repository at this point in the history
Project reorganization
  • Loading branch information
igorsenych-cw authored Jan 15, 2024
2 parents f9e5039 + f0c6111 commit 08fdf0a
Show file tree
Hide file tree
Showing 20 changed files with 4,413 additions and 9,632 deletions.
25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"env": {
"es2021": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint"],
"rules": {
"prettier/prettier": [
"warn",
{
"endOfLine": "lf"
}
]
}
}
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @igorsenych-cw
* @igorsenych-cw
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.9]
node-version: [20.10]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
Expand All @@ -30,7 +30,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
node-version: [20.9]
node-version: [20.10]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
node-version: [20.9]
node-version: [20.10]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.9]
node-version: [20.10]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
Expand All @@ -30,7 +30,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
node-version: [20.9]
node-version: [20.10]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
node-version: [20.9]
node-version: [20.10]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
Expand Down
28 changes: 19 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
# Project dependencies
node_modules
.env
coverage
coverage.json
typechain
typechain-types

#Hardhat files
cache
artifacts
# TypeChain files
/typechain
/typechain-types

# Hardhat files
/cache
/artifacts

# solidity-coverage files
/coverage
/coverage.json

#IDE-specific files
# IDE-specific files
.idea

# Version manager files
.tool-versions

# Environment variables
.env
16 changes: 15 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,24 @@
"options": {
"printWidth": 120,
"tabWidth": 4,
"semi": true,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": true
}
},
{
"files": "*.ts",
"options": {
"printWidth": 120,
"tabWidth": 2,
"semi": true,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": true,
"explicitTypes": "always"
"trailingComma": "none",
"arrowParens": "avoid",
"endOfLine": "lf"
}
}
]
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This repository contains [Compound protocol](https://github.com/cloudwalk/compou

## Build and test

``` sh
```sh
# Install all dependencies
npm install

Expand All @@ -24,7 +24,9 @@ npx hardhat test
```

## Networks and deployments

Information about deployed contracts across all the networks can be found [here](./docs/deployed-contracts.md).

## Licensing

This project is released under the MIT License, see [LICENSE](./LICENSE).
4 changes: 1 addition & 3 deletions contracts/CompoundAgentStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,4 @@ abstract contract CompoundAgentStorageV2 {
* e.g. CompoundAgentStorage<versionNumber>, so finally it would look like
* "contract CompoundAgentStorage is CompoundAgentStorageV1, CompoundAgentStorageV2".
*/
abstract contract CompoundAgentStorage is CompoundAgentStorageV1, CompoundAgentStorageV2 {

}
abstract contract CompoundAgentStorage is CompoundAgentStorageV1, CompoundAgentStorageV2 {}
34 changes: 0 additions & 34 deletions docs/deployed-contracts.md

This file was deleted.

25 changes: 8 additions & 17 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,31 @@
import { HardhatUserConfig } from "hardhat/config";
import "@nomicfoundation/hardhat-toolbox";
import "@openzeppelin/hardhat-upgrades";
import "hardhat-contract-sizer";

const config: HardhatUserConfig = {
solidity: {
version: "0.8.16",
settings: {
optimizer: {
enabled: true,
runs: 1000,
},
},
runs: 1000
}
}
},
networks: {
hardhat: {
accounts: {
mnemonic: "test test test test test test test test test test test junk",
},
mnemonic: "test test test test test test test test test test test junk"
}
},
ganache: {
url: "http://127.0.0.1:7545",
accounts: {
mnemonic: "test test test test test test test test test test test junk"
}
},
substrate: {
url: "http://127.0.0.1:9933",
accounts: {
mnemonic: "test test test test test test test test test test test junk",
},
gas: "auto"
},
},
mocha: {
timeout: 120000
},
}
}
};

export default config;
Loading

0 comments on commit 08fdf0a

Please sign in to comment.