making a mess here

pyth-network · Nov 24, 2023 · 210d753 · 210d753
1 parent 2b118c1
commit 210d753
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/target_chains/ethereum/contracts/contracts/entropy/Entropy.sol b/target_chains/ethereum/contracts/contracts/entropy/Entropy.sol
@@ -82,9 +82,10 @@ import "./EntropyState.sol";
 // - off-chain data ERC support?
 contract Entropy is IEntropy, EntropyState {
     // TODO: Use an upgradeable proxy
-    constructor(uint pythFeeInWei) {
+    constructor(uint pythFeeInWei, address defaultProvider) {
         _state.accruedPythFeesInWei = 0;
         _state.pythFeeInWei = pythFeeInWei;
+        _state.defaultProvider = defaultProvider;
     }
 
     // Register msg.sender as a randomness provider. The arguments are the provider's configuration parameters
@@ -195,6 +196,17 @@ contract Entropy is IEntropy, EntropyState {
         emit Requested(req);
     }
 
+    function request(
+        bytes32 userCommitment,
+        bool useBlockHash
+    ) external payable override returns (uint64 assignedSequenceNumber) {
+        assignedSequenceNumber = request(
+            getDefaultProvider(),
+            userCommitment,
+            useBlockHash
+        );
+    }
+
     // Fulfill a request for a random number. This method validates the provided userRandomness and provider's proof
     // against the corresponding commitments in the in-flight request. If both values are validated, this function returns
     // the corresponding random number.
@@ -257,12 +269,34 @@ contract Entropy is IEntropy, EntropyState {
         }
     }
 
+    function reveal(
+        uint64 sequenceNumber,
+        bytes32 userRandomness,
+        bytes32 providerRevelation
+    ) external override returns (bytes32 randomNumber) {
+        randomNumber = reveal(
+            getDefaultProvider(),
+            sequenceNumber,
+            userRandomness,
+            providerRevelation
+        );
+    }
+
     function getProviderInfo(
         address provider
     ) public view override returns (EntropyStructs.ProviderInfo memory info) {
         info = _state.providers[provider];
     }
 
+    function getDefaultProvider()
+        public
+        view
+        override
+        returns (address provider)
+    {
+        provider = _state.defaultProvider;
+    }
+
     function getRequest(
         address provider,
         uint64 sequenceNumber

diff --git a/target_chains/ethereum/contracts/contracts/entropy/EntropyState.sol b/target_chains/ethereum/contracts/contracts/entropy/EntropyState.sol
@@ -8,6 +8,7 @@ contract EntropyInternalStructs {
     struct State {
         uint pythFeeInWei;
         uint accruedPythFeesInWei;
+        address defaultProvider;
         mapping(address => EntropyStructs.ProviderInfo) providers;
         mapping(bytes32 => EntropyStructs.Request) requests;
     }

diff --git a/target_chains/ethereum/contracts/forge-test/Entropy.t.sol b/target_chains/ethereum/contracts/forge-test/Entropy.t.sol
@@ -32,7 +32,7 @@ contract EntropyTest is Test {
     bytes32 ALL_ZEROS = bytes32(uint256(0));
 
     function setUp() public {
-        random = new Entropy(pythFeeInWei);
+        random = new Entropy(pythFeeInWei, provider1);
 
         bytes32[] memory hashChain1 = generateHashChain(
             provider1,
@@ -486,4 +486,8 @@ contract EntropyTest is Test {
         vm.expectRevert();
         random.withdraw(providerOneBalance);
     }
+
+    function testDefaultProvider() {
+        assert()
+    }
 }
diff --git a/target_chains/ethereum/entropy_sdk/solidity/IEntropy.sol b/target_chains/ethereum/entropy_sdk/solidity/IEntropy.sol
@@ -37,6 +37,12 @@ interface IEntropy is EntropyEvents {
         bool useBlockHash
     ) external payable returns (uint64 assignedSequenceNumber);
 
+    // Same as `request` above using the default randomness provider configured in the contract.
+    function request(
+        bytes32 userCommitment,
+        bool useBlockHash
+    ) external payable returns (uint64 assignedSequenceNumber);
+
     // Fulfill a request for a random number. This method validates the provided userRandomness and provider's proof
     // against the corresponding commitments in the in-flight request. If both values are validated, this function returns
     // the corresponding random number.
@@ -51,10 +57,19 @@ interface IEntropy is EntropyEvents {
         bytes32 providerRevelation
     ) external returns (bytes32 randomNumber);
 
+    // Same as `reveal` above using the default randomness provider configured in the contract.
+    function reveal(
+        uint64 sequenceNumber,
+        bytes32 userRandomness,
+        bytes32 providerRevelation
+    ) external returns (bytes32 randomNumber);
+
     function getProviderInfo(
         address provider
     ) external view returns (EntropyStructs.ProviderInfo memory info);
 
+    function getDefaultProvider() external view returns (address provider);
+
     function getRequest(
         address provider,
         uint64 sequenceNumber