From de2f962fb154e9d24c0815e585e32f6030d2b347 Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Fri, 27 Sep 2024 14:36:14 +0200 Subject: [PATCH] fix(package): update scripts --- .gitignore | 9 +++++++++ README.md | 6 +++--- package.json | 3 +-- packages/ethers/hardhat.config.ts | 2 +- packages/ethers/tsconfig.json | 2 +- hardhat.config.ts => packages/hardhat.config.ts | 0 tsconfig.json => packages/tsconfig.json | 0 yarn.lock | 12 ++++++------ 8 files changed, 21 insertions(+), 13 deletions(-) rename hardhat.config.ts => packages/hardhat.config.ts (100%) rename tsconfig.json => packages/tsconfig.json (100%) diff --git a/.gitignore b/.gitignore index b9f2db94..fc1832ae 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,13 @@ node_modules/ /cache_hardhat /artifacts +# yarn +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions + *.log diff --git a/README.md b/README.md index 473b0412..710d0283 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ ![bundler-3](https://github.com/morpho-org/morpho-blue-bundlers/assets/74971347/827630e1-7abc-4f9d-a494-fe3fa7aa7053) -Each Bundler is a domain-specific abstract layer of contract that implements some functions that can be bundled in a single call by EOAs to a single contract. They all inherit from [`BaseBundler`](./contracts/BaseBundler.sol) that enables bundling multiple function calls into a single `multicall(bytes[] calldata data)` call to the end bundler contract. Each chain-specific bundler is available under their chain-specific folder (e.g. [`ethereum`](./contracts/ethereum/)). +Each Bundler is a domain-specific abstract layer of contract that implements some functions that can be bundled in a single call by EOAs to a single contract. They all inherit from [`BaseBundler`](./src/BaseBundler.sol) that enables bundling multiple function calls into a single `multicall(bytes[] calldata data)` call to the end bundler contract. Each chain-specific bundler is available under their chain-specific folder (e.g. [`ethereum`](./src/ethereum/)). -Some chain-specific domains are also scoped to the chain-specific folder, because they are not expected to be used on any other chain (e.g. DAI and its specific `permit` function is only available on Ethereum - see [`EthereumPermitBundler`](./contracts/ethereum/EthereumPermitBundler.sol)). +Some chain-specific domains are also scoped to the chain-specific folder, because they are not expected to be used on any other chain (e.g. DAI and its specific `permit` function is only available on Ethereum - see [`EthereumPermitBundler`](./src/ethereum/EthereumPermitBundler.sol)). -User-end bundlers are provided in each chain-specific folder, instantiating all the intermediary domain-specific bundlers and associated parameters (such as chain-specific protocol addresses, e.g. [`EthereumBundlerV2`](./contracts/ethereum/EthereumBundlerV2.sol)). +User-end bundlers are provided in each chain-specific folder, instantiating all the intermediary domain-specific bundlers and associated parameters (such as chain-specific protocol addresses, e.g. [`EthereumBundlerV2`](./src/ethereum/EthereumBundlerV2.sol)). ## Deployments diff --git a/package.json b/package.json index 9c8aa2a5..4701ae05 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "scripts": { "prepare": "husky && forge install", "build": "FOUNDRY_PROFILE=build forge build", - "typecheck": "tsc --noEmit", "test": "FOUNDRY_PROFILE=test forge test", "test:local": "FOUNDRY_MATCH_CONTRACT=LocalTest yarn test", "test:fork": "FOUNDRY_MATCH_CONTRACT=ForkTest yarn test", @@ -45,7 +44,7 @@ "@lerna-lite/publish": "3.8.0", "@lerna-lite/version": "^3.7.1", "@types/node": "^20.8.6", - "husky": "^8.0.3", + "husky": "^9.1.6", "lint-staged": "^14.0.1", "ts-node": "^10.9.1", "typescript": "^5.2.2" diff --git a/packages/ethers/hardhat.config.ts b/packages/ethers/hardhat.config.ts index 05adaefb..bc465940 100644 --- a/packages/ethers/hardhat.config.ts +++ b/packages/ethers/hardhat.config.ts @@ -7,7 +7,7 @@ import "@nomicfoundation/hardhat-chai-matchers"; import "@nomicfoundation/hardhat-ethers"; import "@typechain/hardhat"; -import config from "../../hardhat.config"; +import config from "../hardhat.config"; config.typechain = { outDir: "src/types/", diff --git a/packages/ethers/tsconfig.json b/packages/ethers/tsconfig.json index 751f119e..4cc07cc5 100644 --- a/packages/ethers/tsconfig.json +++ b/packages/ethers/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../tsconfig.json", "compilerOptions": { "outDir": "dist", "baseUrl": "." diff --git a/hardhat.config.ts b/packages/hardhat.config.ts similarity index 100% rename from hardhat.config.ts rename to packages/hardhat.config.ts diff --git a/tsconfig.json b/packages/tsconfig.json similarity index 100% rename from tsconfig.json rename to packages/tsconfig.json diff --git a/yarn.lock b/yarn.lock index 63f8e83b..2443407f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1395,7 +1395,7 @@ __metadata: "@lerna-lite/publish": "npm:3.8.0" "@lerna-lite/version": "npm:^3.7.1" "@types/node": "npm:^20.8.6" - husky: "npm:^8.0.3" + husky: "npm:^9.1.6" lint-staged: "npm:^14.0.1" ts-node: "npm:^10.9.1" typescript: "npm:^5.2.2" @@ -5616,12 +5616,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^8.0.3": - version: 8.0.3 - resolution: "husky@npm:8.0.3" +"husky@npm:^9.1.6": + version: 9.1.6 + resolution: "husky@npm:9.1.6" bin: - husky: lib/bin.js - checksum: 10c0/6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668 + husky: bin.js + checksum: 10c0/705673db4a247c1febd9c5df5f6a3519106cf0335845027bb50a15fba9b1f542cb2610932ede96fd08008f6d9f49db0f15560509861808b0031cdc0e7c798bac languageName: node linkType: hard