Skip to content

replaced pkgs from @artman325/* into @intercoin/* #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artman325 merged 1 commit into from
Aug 19, 2024
Merged

replaced pkgs from @artman325/* into @intercoin/* #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions contracts/EscrowContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";

import "./interfaces/IEscrowContract.sol";
import "@artman325/releasemanager/contracts/CostManagerHelper.sol";
import "@intercoin/releasemanager/contracts/CostManagerHelper.sol";

/**
*****************
Expand Down Expand Up @@ -164,8 +164,7 @@ contract EscrowContract is Initializable, /*OwnableUpgradeable,*/ ReentrancyGuar
override
initializer
{
__CostManagerHelper_init(msg.sender);
_setCostManager(costManager);
__CostManagerHelper_init(msg.sender, costManager);
//__Ownable_init();
__ReentrancyGuard_init();

Expand Down
4 changes: 2 additions & 2 deletions contracts/EscrowFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pragma solidity ^0.8.11;

import "@openzeppelin/contracts/proxy/Clones.sol";
import "./interfaces/IEscrowContract.sol";
import "@artman325/releasemanager/contracts/CostManagerFactoryHelper.sol";
import "@artman325/releasemanager/contracts/ReleaseManagerHelper.sol";
import "@intercoin/releasemanager/contracts/CostManagerFactoryHelper.sol";
import "@intercoin/releasemanager/contracts/ReleaseManagerHelper.sol";

/**
****************
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MockReleaseManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.11;

import "@artman325/releasemanager/contracts/ReleaseManager.sol";
import "@intercoin/releasemanager/contracts/ReleaseManager.sol";

contract MockReleaseManager is ReleaseManager {

Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/MockReleaseManagerFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.11;

import "@artman325/releasemanager/contracts/ReleaseManagerFactory.sol";
import "@intercoin/releasemanager/contracts/ReleaseManagerFactory.sol";

contract MockReleaseManagerFactory is ReleaseManagerFactory {
constructor(address _implementation) ReleaseManagerFactory(_implementation) {
Expand Down
12 changes: 7 additions & 5 deletions hardhat.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ module.exports = {
networks: {
hardhat: {
allowUnlimitedContractSize: false,
gasPrice: "auto",
//gasPrice: "auto",
chainId: 137,
forking: {
url: mainnetURL
url: maticURL
}
},
kovan: {
Expand Down Expand Up @@ -83,7 +84,7 @@ module.exports = {
mainnet: {
url: mainnetURL,
chainId: 1,
gasPrice: 20000000000,
//gasPrice: 20000000000,
accounts: [process.env.private_key],
saveDeployments: true
}
Expand All @@ -100,9 +101,10 @@ module.exports = {
currency: "USD"
},
etherscan: {
apiKey: process.env.MATIC_API_KEY
//apiKey: process.env.ETHERSCAN_API_KEY
//apiKey: process.env.MATIC_API_KEY
apiKey: process.env.ETHERSCAN_API_KEY
//apiKey: process.env.BSCSCAN_API_KEY

},
solidity: {
compilers: [
Expand Down
77 changes: 39 additions & 38 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ts-node": "^10.4.0"
},
"dependencies": {
"@artman325/releasemanager": "^2.0.0",
"@intercoin/releasemanager": "^2.0.0",
"@openzeppelin/contracts": "^4.7.3",
"@openzeppelin/contracts-upgradeable": "^4.7.3"
},
Expand Down