Bump Teleporter submodule to v0.2.0

ava-labs · Feb 14, 2024 · c008b4a · c008b4a
1 parent d519116
commit c008b4a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/contracts/lib/teleporter b/contracts/lib/teleporter
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
@@ -1,4 +1,4 @@
 @chainlink/=lib/chainlink/
-@openzeppelin/=lib/openzeppelin-contracts/
+@openzeppelin/[email protected]/=lib/openzeppelin-contracts/contracts/
 @teleporter/=lib/teleporter/
-@subnet-evm-contracts/=lib/teleporter/contracts/lib/subnet-evm/contracts/contracts/
+@avalabs/subnet-evm-contracts@1.2.0/=lib/teleporter/contracts/lib/subnet-evm/contracts/
diff --git a/contracts/src/SimpleBettingGame.sol b/contracts/src/SimpleBettingGame.sol
@@ -6,7 +6,7 @@ pragma solidity 0.8.18;
 
 import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol";
 import {IVRFProxy} from "./IVRFProxy.sol";
-import {ReentrancyGuard} from "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+import {ReentrancyGuard} from "@openzeppelin/contracts@4.8.1/security/ReentrancyGuard.sol";
 
 /**
  * THIS IS AN EXAMPLE CONTRACT THAT USES UNAUDITED CODE.

diff --git a/contracts/src/VRFProvider.sol b/contracts/src/VRFProvider.sol
@@ -9,7 +9,6 @@ import {
     TeleporterMessageInput, TeleporterFeeInfo
 } from "@teleporter/contracts/src/Teleporter/ITeleporterMessenger.sol";
 import {TeleporterOwnerUpgradeable} from "@teleporter/contracts/src/Teleporter/upgrades/TeleporterOwnerUpgradeable.sol";
-import {ReentrancyGuard} from "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol";
 import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/vrf/interfaces/VRFCoordinatorV2Interface.sol";
 
@@ -30,7 +29,7 @@ import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/vrf/inter
  * to pay for the request. The partner VRFProxy contract and all of its allowed consumers are able to use any
  * subscription ID the VRFProvider has access to.
  */
-contract VRFProvider is VRFConsumerBaseV2, TeleporterOwnerUpgradeable, ReentrancyGuard {
+contract VRFProvider is VRFConsumerBaseV2, TeleporterOwnerUpgradeable {
     /**
      * @dev  The components of VRFRequestInfo that need to be persisted when requesting
      * random values from the Chainlink VRF coordinator. These values will be sent
@@ -96,7 +95,10 @@ contract VRFProvider is VRFConsumerBaseV2, TeleporterOwnerUpgradeable, Reentranc
         address chainlinkVRFCoordinatorAddress_,
         bytes32 vrfProxyBlockchainID_,
         address vrfProxyAddress_
-    ) TeleporterOwnerUpgradeable(teleporterRegistryAddress_) VRFConsumerBaseV2(chainlinkVRFCoordinatorAddress_) {
+    )
+        TeleporterOwnerUpgradeable(teleporterRegistryAddress_, msg.sender)
+        VRFConsumerBaseV2(chainlinkVRFCoordinatorAddress_)
+    {
         require(vrfProxyAddress_ != address(0), "VRFProvider: zero VRF proxy address");
         _chainlinkVRFCoordinator = VRFCoordinatorV2Interface(chainlinkVRFCoordinatorAddress_);
         vrfProxyBlockchainID = vrfProxyBlockchainID_;
@@ -155,7 +157,6 @@ contract VRFProvider is VRFConsumerBaseV2, TeleporterOwnerUpgradeable, Reentranc
     function _receiveTeleporterMessage(bytes32 sourceBlockchainID, address originSenderAddress, bytes memory message)
         internal
         override
-        nonReentrant
     {
         // Verify the sender.
         require(sourceBlockchainID == vrfProxyBlockchainID, "VRFProvider: invalid source blockchain ID");

diff --git a/contracts/src/VRFProxy.sol b/contracts/src/VRFProxy.sol
@@ -9,7 +9,6 @@ import {
     TeleporterMessageInput, TeleporterFeeInfo
 } from "@teleporter/contracts/src/Teleporter/ITeleporterMessenger.sol";
 import {TeleporterOwnerUpgradeable} from "@teleporter/contracts/src/Teleporter/upgrades/TeleporterOwnerUpgradeable.sol";
-import {ReentrancyGuard} from "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol";
 import {GasUtils} from "./GasUtils.sol";
 
@@ -30,7 +29,7 @@ import {GasUtils} from "./GasUtils.sol";
  * random values from a Chainlink VRF coordinator on that blockchain. All allowed consumers of the VRFProxy are
  * capable of using VRF subscriptions available to the VRFProvider contract on the partner chain.
  */
-contract VRFProxy is IVRFProxy, ReentrancyGuard, TeleporterOwnerUpgradeable {
+contract VRFProxy is IVRFProxy, TeleporterOwnerUpgradeable {
     using GasUtils for *;
 
     /**
@@ -114,7 +113,7 @@ contract VRFProxy is IVRFProxy, ReentrancyGuard, TeleporterOwnerUpgradeable {
     event RandomWordsFulfilled(uint256 indexed requestID, bool success);
 
     constructor(address teleporterRegistryAddress_, bytes32 vrfProviderBlockchainID_, address vrfProviderAddress_)
-        TeleporterOwnerUpgradeable(teleporterRegistryAddress_)
+        TeleporterOwnerUpgradeable(teleporterRegistryAddress_, msg.sender)
     {
         require(vrfProviderAddress_ != address(0), "VRFProxy: zero VRF provider address");
         vrfProviderBlockchainID = vrfProviderBlockchainID_;
@@ -219,7 +218,6 @@ contract VRFProxy is IVRFProxy, ReentrancyGuard, TeleporterOwnerUpgradeable {
     function _receiveTeleporterMessage(bytes32 sourceBlockchainID, address originSenderAddress, bytes memory message)
         internal
         override
-        nonReentrant
     {
         // Verify the sender.
         require(sourceBlockchainID == vrfProviderBlockchainID, "VRFProxy: invalid source blockchain ID");