feat: honey pot #1

md0x · 2023-10-23T14:27:52Z

Changes proposed in this PR:

Add Honey pot and OEVShare honey pot contracts
Add tests
Add readme

UMA-1900

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x · 2023-10-24T09:13:58Z

.gitmodules

 [submodule "lib/oev-contracts"]
 	path = lib/oev-contracts
-	url = git@github.com:UMAprotocol/oev-contracts.git
+	url = https://github.com/UMAprotocol/oev-contracts.git


Failing for now in CI as this repo doesn't have access

@md0x we should be able to give github ci access to private repos. Do you know how to do this?

I can add keys to the ci environment if needed!

chrismaree · 2023-10-24T12:51:00Z

src/HoneyPot.sol

+            "Liquidation price reached"
+        );
+        payable(msg.sender).transfer(address(this).balance);
+    }


should we not set the liquidation price back to 0 when the emptyHoneyPot is called enabling someone to create a new honey pot right after the previous one is liquidated?

Agree @chrismaree. Fixed!

chrismaree · 2023-10-24T12:52:03Z

src/HoneyPot.sol

+        oracle = _oracle;
+    }
+
+    function createHoneyPot(uint _liquidationPrice) external payable {


this design means there can only be one honey pot at a time. this might not be ideal. we might want to enable multiple to exist simultaneously enabling multiple people to demo the app at the same time. this would require us to have a mapping, rather than this relationship.

thoughts?

Yes, I think that's easy to implement and will be very helpful during the demo. I've updated the contract and tests accordingly. Thanks you!

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

mrice32

Looks great! Mostly minor nits

mrice32 · 2023-10-24T14:31:09Z

README.md

+To test the demo run the following commands:
+```
+forge install
+export RPC_MAINNET=https://mainnet.infura.io/v3/<YOUR_INFURA_KEY>


nit: for consistency with other repos, can we use NODE_URL_1?

This is not consistent with oev-contracts repo ;)

Well, it should be consistent across all of our repos if possible!! Seems easier to change these two than the rest :).

I chatted with @md0x offline, and I think we'll decide on this and make a change in a separate PR.

mrice32 · 2023-10-24T14:36:13Z

src/HoneyPot.sol

+    }
+
+    mapping(address => HoneyPotDetails) public honeyPots;
+    HoneyPotOEVShare public oracle;


nit: to better demonstrate that this contract is talking to something that looks like chainlink (or some other oracle type), what do you think about changing this to AggregatorV3Source (and we can add a comment that notes that this is the OEVShareContract).

mrice32 · 2023-10-24T14:42:04Z

src/HoneyPot.sol

+        emit OracleUpdated(address(_oracle)); // Emit event
+    }
+
+    function createHoneyPot(uint _liquidationPrice) external payable {


nit: why not make this an int256 (since this is what the oracle returns)?

mrice32 · 2023-10-24T14:44:19Z

src/HoneyPot.sol

+        uint256 amount = userPot.balance;
+        userPot.balance = 0; // reset the balance
+        userPot.liquidationPrice = 0; // reset the liquidation price. There was a mistake in the original, missing the assignment.
+        payable(msg.sender).transfer(amount);


nit: prefer OZ's sendValue function (safer if gas costs change in the future or a contract is the recipient): https://github.com/OpenZeppelin/openzeppelin-contracts/blob/7c8b7a27284f503ce8ae23d63ac9403096dcf6fe/contracts/utils/Address.sol#L41

Thanks. Updated

mrice32 · 2023-10-24T14:45:31Z

src/HoneyPot.sol

+        emit HoneyPotEmptied(honeyPotCreator, msg.sender, amount); // Emit event
+    }
+
+    function resetPot() external onlyOwner {


Does this mean the owner can only empty their own honeypot? What about the other addresses that deposit funds?

I think there are probably two setups that make sense:

Any creator can withdraw their own honeypot.

The owner can withdraw anyone's honeypot.

Thoughts?

Right! I forgot to remove the onlyOwner there so creators can withdraw their pots.
Updated.

mrice32 · 2023-10-24T14:50:41Z

.gitmodules

 [submodule "lib/oev-contracts"]
 	path = lib/oev-contracts
-	url = git@github.com:UMAprotocol/oev-contracts.git
+	url = https://github.com/UMAprotocol/oev-contracts.git


@md0x we should be able to give github ci access to private repos. Do you know how to do this?

I can add keys to the ci environment if needed!

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

chrismaree · 2023-10-25T11:18:28Z

src/HoneyPot.sol

+        emit HoneyPotEmptied(honeyPotCreator, msg.sender, amount);
+    }
+
+    function resetPot() external {


the logic in here is repeated directly within the emptyHoneyPot function. let's pull out the common logic into an internal function that both can call.

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

mrice32 · 2023-10-25T23:12:04Z

@md0x I'm going to merge this and we'll ask @evaldofelipe to deal with the ci issues since it will require a token that can read repos across the entire org to be added.

md0x added 4 commits October 23, 2023 16:27

feat: honey pot

8aa89d6

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: update submodules

d058c92

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: honey pot test

6ff0c90

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: readme

4d8b85f

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x requested review from chrismaree, mrice32 and daywiss October 24, 2023 09:12

md0x commented Oct 24, 2023

View reviewed changes

chrismaree reviewed Oct 24, 2023

View reviewed changes

feat: multiple honey pots and events

b24a376

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x requested a review from chrismaree October 24, 2023 14:30

mrice32 reviewed Oct 24, 2023

View reviewed changes

feat: updates

954fe9c

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x requested a review from mrice32 October 24, 2023 16:07

chrismaree reviewed Oct 25, 2023

View reviewed changes

feat: code duplication

2a9674f

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x requested a review from chrismaree October 25, 2023 15:18

chrismaree approved these changes Oct 25, 2023

View reviewed changes

mrice32 merged commit efa0ae5 into master Oct 25, 2023
1 check failed

mrice32 deleted the pablo/honey-pot branch October 25, 2023 23:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: honey pot #1

feat: honey pot #1

md0x commented Oct 23, 2023 •

edited

Loading

md0x Oct 24, 2023

mrice32 Oct 24, 2023

chrismaree Oct 24, 2023

md0x Oct 24, 2023

chrismaree Oct 24, 2023

md0x Oct 24, 2023

mrice32 left a comment

mrice32 Oct 24, 2023

chrismaree Oct 25, 2023

mrice32 Oct 25, 2023

mrice32 Oct 24, 2023

md0x Oct 24, 2023

mrice32 Oct 24, 2023

md0x Oct 24, 2023

mrice32 Oct 24, 2023

md0x Oct 24, 2023

mrice32 Oct 24, 2023

md0x Oct 24, 2023

mrice32 Oct 24, 2023

chrismaree Oct 25, 2023

mrice32 commented Oct 25, 2023

feat: honey pot #1

feat: honey pot #1

Conversation

md0x commented Oct 23, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mrice32 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mrice32 commented Oct 25, 2023

md0x commented Oct 23, 2023 •

edited

Loading