Skip to content

Commit

Permalink
remove core repo as gh package due to conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
tjcloa committed Mar 19, 2024
1 parent 2465705 commit 488d559
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
11 changes: 5 additions & 6 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ import "hardhat-contract-sizer";
import "@openzeppelin/hardhat-upgrades";
import "@nomiclabs/hardhat-solhint";

import {
HardhatRuntimeEnvironment,
HttpNetworkUserConfig,
} from "hardhat/types";

import "./tasks";
import "node_modules/sovrynsmartcontracts/hardhat/tasks/multisig";

//@todo - resolve conflicts in "sovrynsmartcontracts": "git+https://github.com/DistributedCollective/Sovryn-smart-contracts.git"
// install the package
// uncomment the line below to use multisig scripts from the core repo
// import "node_modules/sovrynsmartcontracts/hardhat/tasks/multisig";

/*
* Test hardhat forking with patched hardhat
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
"prettier-plugin-solidity": "^1.1.3",
"solc": "^0.8.17",
"solhint-plugin-prettier": "^0.0.5",
"sovrynsmartcontracts": "git+https://github.com/DistributedCollective/Sovryn-smart-contracts.git",
"typechain": "^8.1.1",
"types-ethereumjs-util": "^0.0.8",
"typescript": "^4.9.3",
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10773,10 +10773,6 @@ source-map@~0.2.0:
dependencies:
amdefine ">=0.0.4"

"sovrynsmartcontracts@git+https://github.com/DistributedCollective/Sovryn-smart-contracts.git":
version "1.0.0"
resolved "git+https://github.com/DistributedCollective/Sovryn-smart-contracts.git#422222087c11e79d47fa1431bd461e6c4bba13b5"

spdx-correct@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
Expand Down

0 comments on commit 488d559

Please sign in to comment.