Skip to content
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

Ensures only registered providers can submit preconfs #77

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Ensures only registered providers can submit preconfs #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5373496
Updates contracts to ensure only registered providers can make commit…
ckartik Jan 23, 2024
f1ac0d4
Remove log.
ckartik Jan 23, 2024
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
12 changes: 7 additions & 5 deletions contracts/PreConfirmations.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ contract PreConfCommitmentStore is Ownable {
* @dev Makes sure transaction sender is oracle
*/
modifier onlyOracle() {
require(msg.sender == oracle, "Only the oracle can call this function");
require(msg.sender == oracle, "only the oracle can call this function");
_;
}

Expand Down Expand Up @@ -222,7 +222,7 @@ contract PreConfCommitmentStore is Ownable {
messageDigest = getBidHash(txnHash, bid, blockNumber);
recoveredAddress = messageDigest.recover(bidSignature);
stake = bidderRegistry.getAllowance(recoveredAddress);
require(stake > (10 * bid), "Invalid bid");
require(stake > (10 * bid), "invalid bid");
}

/**
Expand Down Expand Up @@ -286,14 +286,16 @@ contract PreConfCommitmentStore is Ownable {
bytes calldata bidSignature,
bytes memory commitmentSignature
) public returns (bytes32 commitmentIndex) {
(bytes32 bHash, address bidderAddress, uint256 stake) = verifyBid(
(bytes32 bHash, address bidderAddress, uint256 allowance) = verifyBid(
bid,
blockNumber,
txnHash,
bidSignature
);
// This helps in avoiding stack too deep
{
require(allowance > (10 * bid), "prepaid allowance too low from bidder");

bytes32 preConfHash = getPreConfHash(
txnHash,
bid,
Expand All @@ -303,8 +305,8 @@ contract PreConfCommitmentStore is Ownable {
);

address commiterAddress = preConfHash.recover(commitmentSignature);

require(stake > (10 * bid), "Stake too low");
uint256 providerStake = providerRegistry.checkStake(commiterAddress);
require(providerStake > (10*bid), "provider stake is not sufficent to cover the bid.");

PreConfCommitment memory newCommitment = PreConfCommitment(
false,
Expand Down
20 changes: 10 additions & 10 deletions contracts/ProviderRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ contract ProviderRegistry is IProviderRegistry, Ownable, ReentrancyGuard {
* @dev Register and stake function for providers.
*/
function registerAndStake() public payable {
require(!providerRegistered[msg.sender], "Provider already registered");
require(msg.value >= minStake, "Insufficient stake");
require(!providerRegistered[msg.sender], "provider already registered");
require(msg.value >= minStake, "insufficient stake");

providerStakes[msg.sender] = msg.value;
providerRegistered[msg.sender] = true;
Expand All @@ -135,7 +135,7 @@ contract ProviderRegistry is IProviderRegistry, Ownable, ReentrancyGuard {
* @dev Deposit more funds into the provider's stake.
*/
function depositFunds() external payable {
require(providerRegistered[msg.sender], "Provider not registered");
require(providerRegistered[msg.sender], "provider not registered");
providerStakes[msg.sender] += msg.value;
emit FundsDeposited(msg.sender, msg.value);
}
Expand Down Expand Up @@ -188,28 +188,28 @@ contract ProviderRegistry is IProviderRegistry, Ownable, ReentrancyGuard {
function withdrawFeeRecipientAmount() external nonReentrant {
feeRecipientAmount = 0;
(bool successFee, ) = feeRecipient.call{value: feeRecipientAmount}("");
require(successFee, "Couldn't transfer to fee Recipient");
require(successFee, "couldn't transfer to fee Recipient");
}

function withdrawBidderAmount(address bidder) external nonReentrant {
require(bidderAmount[bidder] > 0, "Bidder Amount is zero");
require(bidderAmount[bidder] > 0, "bidder Amount is zero");

bidderAmount[bidder] = 0;

(bool success, ) = bidder.call{value: bidderAmount[bidder]}("");
require(success, "Couldn't transfer to bidder");
require(success, "couldn't transfer to bidder");
}

function withdrawStakedAmount(
address payable provider
) external nonReentrant {
require(msg.sender == provider, "Only provider can unstake");
require(msg.sender == provider, "only provider can unstake");
uint256 stake = providerStakes[provider];
providerStakes[provider] = 0;
require(stake > 0, "Provider Staked Amount is zero");
require(stake > 0, "provider Staked Amount is zero");
require(
preConfirmationsContract != address(0),
"Pre Confirmations Contract not set"
"preConfirmations Contract not set"
);

uint256 providerPendingCommitmentsCount = PreConfCommitmentStore(
Expand All @@ -222,6 +222,6 @@ contract ProviderRegistry is IProviderRegistry, Ownable, ReentrancyGuard {
);

(bool success, ) = provider.call{value: stake}("");
require(success, "Couldn't transfer stake to provider");
require(success, "couldn't transfer stake to provider");
}
}
27 changes: 16 additions & 11 deletions test/PreConfirmationConfTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,10 @@ contract TestPreConfCommitmentStore is Test {
vm.prank(bidder);
bidderRegistry.prepay{value: 1e18 wei}();
(bytes32 digest, address recoveredAddress, uint256 stake) = preConfCommitmentStore.verifyBid(200 wei, 3000, "0xkartik", signature);

assertEq(stake, 1e18 wei);
assertEq(bidder, recoveredAddress);
assertEq(digest, bidHash);

preConfCommitmentStore.storeCommitment(200 wei, 3000, "0xkartik", signature, signature);

}

function test_UpdateOracle() public {
Expand Down Expand Up @@ -154,6 +151,10 @@ contract TestPreConfCommitmentStore is Test {
bytes memory bidSignature = bytes(
hex"c10688ea554c1dae605619fa7f75103fb483ab6b5ad424e4e232f5da4449503a27ef6aed49b85bfd0e598650831c861a55a5eb197d9279d6a5667efaa46ab8831c"
);
address commiter = 0x6d503Fd50142C7C469C7c6B64794B55bfa6883f3;
vm.deal(commiter, 30 ether);
vm.prank(commiter);
providerRegistry.registerAndStake{value:20 ether}();
bytes
memory commitmentSignature = hex"ff7e00cf5c2d0fa9ef7c5efdca68b285a664a3aab927eb779b464207f537551f4ff81b085acf78b58ecb8c96c9a4efcb2172a0287f5bf5819b49190f6e2d2d1e1b";

Expand Down Expand Up @@ -287,6 +288,7 @@ contract TestPreConfCommitmentStore is Test {
vm.deal(signer, 5 ether);
vm.prank(signer);
bidderRegistry.prepay{value: 2 ether}();

string memory txnHash = "0xkartik";
bytes
memory signature = "0xb170d082db1bf77fa0b589b9438444010dcb1e6dd326b661b02eb92abe4c066e243bb0d214b01667750ba2c53ff1ab445fd784b441dbc1f30280c379f002cc571c";
Expand All @@ -295,6 +297,10 @@ contract TestPreConfCommitmentStore is Test {
bytes memory bidSignature = bytes(
hex"c10688ea554c1dae605619fa7f75103fb483ab6b5ad424e4e232f5da4449503a27ef6aed49b85bfd0e598650831c861a55a5eb197d9279d6a5667efaa46ab8831c"
);
address commiter = 0x6d503Fd50142C7C469C7c6B64794B55bfa6883f3;
vm.deal(commiter, 30 ether);
vm.prank(commiter);
providerRegistry.registerAndStake{value:20 ether}();
bytes
memory commitmentSignature = hex"ff7e00cf5c2d0fa9ef7c5efdca68b285a664a3aab927eb779b464207f537551f4ff81b085acf78b58ecb8c96c9a4efcb2172a0287f5bf5819b49190f6e2d2d1e1b";

Expand Down Expand Up @@ -336,6 +342,9 @@ contract TestPreConfCommitmentStore is Test {
hex"c10688ea554c1dae605619fa7f75103fb483ab6b5ad424e4e232f5da4449503a27ef6aed49b85bfd0e598650831c861a55a5eb197d9279d6a5667efaa46ab8831c"
);
address commiter = 0xE3E9cc6677B1b7f05C483168bf25B4D9604c6763;
vm.deal(commiter, 25 ether);
vm.prank(commiter);
providerRegistry.registerAndStake{value: 20 ether}();
bytes
memory commitmentSignature = hex"306eb646b8882c8cd918d4aff61cbf6814a152becbc84b52abb4aad963dbaa2465c0c27837b5f8c943cb1c523f54961c0c8775c48d9dbf7ae9883b14925794941c";

Expand All @@ -354,7 +363,6 @@ contract TestPreConfCommitmentStore is Test {
bidHash,
_bytesToHexString(bidSignature)
);

// Verify that the commitment has not been used before
(bool commitmentUsed, , , , , , , , , ) = preConfCommitmentStore
.commitments(preConfHash);
Expand All @@ -370,9 +378,6 @@ contract TestPreConfCommitmentStore is Test {
address(preConfCommitmentStore)
);

vm.deal(commiter, 5 ether);
vm.prank(commiter);
providerRegistry.registerAndStake{value: 4 ether}();
vm.prank(feeRecipient);
preConfCommitmentStore.initiateSlash(index);

Expand Down Expand Up @@ -400,6 +405,9 @@ contract TestPreConfCommitmentStore is Test {
hex"c10688ea554c1dae605619fa7f75103fb483ab6b5ad424e4e232f5da4449503a27ef6aed49b85bfd0e598650831c861a55a5eb197d9279d6a5667efaa46ab8831c"
);
address commiter = 0xE3E9cc6677B1b7f05C483168bf25B4D9604c6763;
vm.deal(commiter, 30 ether);
vm.prank(commiter);
providerRegistry.registerAndStake{value:20 ether}();
bytes
memory commitmentSignature = hex"306eb646b8882c8cd918d4aff61cbf6814a152becbc84b52abb4aad963dbaa2465c0c27837b5f8c943cb1c523f54961c0c8775c48d9dbf7ae9883b14925794941c";

Expand Down Expand Up @@ -434,9 +442,6 @@ contract TestPreConfCommitmentStore is Test {
bidderRegistry.setPreconfirmationsContract(
address(preConfCommitmentStore)
);
vm.deal(commiter, 5 ether);
vm.prank(commiter);
providerRegistry.registerAndStake{value: 4 ether}();
vm.prank(feeRecipient);
preConfCommitmentStore.initateReward(index);

Expand Down