Instadapp/yield-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/yield-contract.git synced 2024-07-29 21:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from InstaDApp/flusher-changes

Browse Source 
Flusher changes
This commit is contained in:
Sowmay Jain 2020-09-12 14:36:51 +10:00 committed by GitHub
commit 92dec372d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/deployer.sol
View File

@ -10,7 +10,7 @@ contract Deployer {
// deploy create2 + minimal proxy
function deployLogic(address owner, address logic) public returns (address proxy) {
require(!(isFlusherDeployed(getAddress(owner, logic))), "flusher-already-deployed");
bytes32 salt = keccak256(abi.encodePacked(owner));
bytes32 salt = keccak256(abi.encodePacked(owner, proxy));
bytes20 targetBytes = bytes20(logic);
// solium-disable-next-line security/no-inline-assembly
assembly {
@ -41,7 +41,7 @@ contract Deployer {
// compute create2 + minimal proxy address
function getAddress(address owner, address logic) public view returns (address) {
bytes32 codeHash = keccak256(getCreationCode(logic));
bytes32 salt = keccak256(abi.encodePacked(owner));
bytes32 salt = keccak256(abi.encodePacked(owner, logic));
bytes32 rawAddress = keccak256(
abi.encodePacked(
bytes1(0xff),

1
contracts/flusher.sol
View File

@ -12,7 +12,6 @@ contract Flusher {
event LogCast(address indexed sender, uint value);
string constant public name = "Flusher-v1";
uint constant version = 1;
RegistryInterface public constant registry = RegistryInterface(address(0)); // TODO - Change while deploying