Skip to content

Commit

Permalink
chore: published typechain
Browse files Browse the repository at this point in the history
  • Loading branch information
spicysquid168 committed May 18, 2023
1 parent da6d10b commit ab30a33
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 39 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ yarn-error.log/
broadcast/

deployedAddresses.json

yarn-error.log
6 changes: 3 additions & 3 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ module.exports = {
// },
},
solidity: {
version: "0.8.13",
version: "0.8.19",
settings: {
optimizer: {
enabled: true,
runs: 200,
runs: 1,
},
evmVersion: "istanbul",
},
},
paths: {
sources: "./contracts",
sources: "./solidity/contracts",
tests: "./test",
cache: "./cache",
artifacts: "./artifacts",
Expand Down
2 changes: 1 addition & 1 deletion script/deployments/MiniFL/config/SetAlpacaPerSecond.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ contract SetAlpacaPerSecondScript is BaseScript {
Check all variables below before execute the deployment script
*/

uint256 _newAlpacaPerSecond = 33068783068783070;
uint256 _newAlpacaPerSecond = 0.1421957671957672 ether;
bool _withUpdate = true;

//---- execution ----//
Expand Down
12 changes: 1 addition & 11 deletions solidity/contracts/upgradable/AdminUpgradeabilityProxy.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
// File: MasterChef/contracts-proxy/Proxy.sol

pragma solidity ^0.6.0;
pragma solidity 0.8.19;

/**
* @title Proxy
Expand Down Expand Up @@ -82,8 +82,6 @@ abstract contract Proxy {

// File: @openzeppelin/contracts/utils/Address.sol

pragma solidity >=0.6.2 <0.8.0;

/**
* @dev Collection of functions related to the address type
*/
Expand Down Expand Up @@ -269,10 +267,6 @@ library Address {
}
}

// File: MasterChef/contracts-proxy/UpgradeabilityProxy.sol

pragma solidity ^0.6.0;

/**
* @title UpgradeabilityProxy
* @dev This contract implements a proxy that allows to change the
Expand Down Expand Up @@ -345,10 +339,6 @@ contract UpgradeabilityProxy is Proxy {
}
}

// File: MasterChef/contracts-proxy/AdminUpgradeabilityProxy.sol

pragma solidity ^0.6.0;

/**
* @title AdminUpgradeabilityProxy
* @dev This contract combines an upgradeability proxy with an authorization
Expand Down
26 changes: 2 additions & 24 deletions solidity/contracts/upgradable/ProxyAdmin.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
// File: @openzeppelin/contracts/GSN/Context.sol

pragma solidity >=0.6.0 <0.8.0;
pragma solidity 0.8.19;

/*
* @dev Provides information about the current execution context, including the
Expand All @@ -15,7 +15,7 @@ pragma solidity >=0.6.0 <0.8.0;
*/
abstract contract Context {
function _msgSender() internal view virtual returns (address payable) {
return msg.sender;
return payable(msg.sender);
}

function _msgData() internal view virtual returns (bytes memory) {
Expand All @@ -26,8 +26,6 @@ abstract contract Context {

// File: @openzeppelin/contracts/access/Ownable.sol

pragma solidity >=0.6.0 <0.8.0;

/**
* @dev Contract module which provides a basic access control mechanism, where
* there is an account (an owner) that can be granted exclusive access to
Expand Down Expand Up @@ -92,10 +90,6 @@ abstract contract Ownable is Context {
}
}

// File: MasterChef/contracts-proxy/Proxy.sol

pragma solidity ^0.6.0;

/**
* @title Proxy
* @dev Implements delegation of calls to other contracts, with proper
Expand Down Expand Up @@ -173,10 +167,6 @@ abstract contract Proxy {
}
}

// File: @openzeppelin/contracts/utils/Address.sol

pragma solidity >=0.6.2 <0.8.0;

/**
* @dev Collection of functions related to the address type
*/
Expand Down Expand Up @@ -362,10 +352,6 @@ library Address {
}
}

// File: MasterChef/contracts-proxy/UpgradeabilityProxy.sol

pragma solidity ^0.6.0;

/**
* @title UpgradeabilityProxy
* @dev This contract implements a proxy that allows to change the
Expand Down Expand Up @@ -438,10 +424,6 @@ contract UpgradeabilityProxy is Proxy {
}
}

// File: MasterChef/contracts-proxy/AdminUpgradeabilityProxy.sol

pragma solidity ^0.6.0;

/**
* @title AdminUpgradeabilityProxy
* @dev This contract combines an upgradeability proxy with an authorization
Expand Down Expand Up @@ -577,10 +559,6 @@ contract AdminUpgradeabilityProxy is UpgradeabilityProxy {
}
}

// File: MasterChef/contracts-proxy/ProxyAdmin.sol

pragma solidity ^0.6.0;

/**
* @title ProxyAdmin
* @dev This contract is the admin of a proxy, and is in charge
Expand Down
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,14 @@
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==

"@typechain/ethers-v5@^10.2.0":
version "10.2.0"
resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-10.2.0.tgz#68f5963efb5214cb2d881477228e4b5b315473e1"
integrity sha512-ikaq0N/w9fABM+G01OFmU3U3dNnyRwEahkdvi9mqy1a3XwKiPZaF/lu54OcNaEWnpvEYyhhS0N7buCtLQqC92w==
dependencies:
lodash "^4.17.15"
ts-essentials "^7.0.1"

"@typechain/hardhat@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-5.0.0.tgz#3a4fa36aa7a11e6a59ff2ac729e2cb4f8be3270a"
Expand Down

0 comments on commit ab30a33

Please sign in to comment.