Upgraded OpenGSN

pooltogether · Jul 31, 2020 · 152328d · 152328d
1 parent a7b19a4
commit 152328d
Show file tree

Hide file tree

Showing 6 changed files with 478 additions and 276 deletions.
diff --git a/contracts/prize-pool/PrizePool.sol b/contracts/prize-pool/PrizePool.sol
@@ -3,19 +3,19 @@ pragma solidity ^0.6.4;
 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/utils/ReentrancyGuard.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721.sol";
-import "@opengsn/gsn/contracts/BaseRelayRecipient.sol";
 import "@pooltogether/fixed-point/contracts/FixedPoint.sol";
 import "@nomiclabs/buidler/console.sol";
 
 import "./PrizeStrategyInterface.sol";
 import "../token/ControlledToken.sol";
 import "../token/TokenControllerInterface.sol";
 import "./MappedSinglyLinkedList.sol";
+import "../utils/RelayRecipient.sol";
 
 /// @title Base Prize Pool for managing escrowed assets
 /// @notice Manages depositing and withdrawing assets from the Prize Pool
 /// @dev Must be inherited to provide specific yield-bearing asset control, such as Compound cTokens
-abstract contract PrizePool is OwnableUpgradeSafe, BaseRelayRecipient, ReentrancyGuardUpgradeSafe, TokenControllerInterface {
+abstract contract PrizePool is OwnableUpgradeSafe, RelayRecipient, ReentrancyGuardUpgradeSafe, TokenControllerInterface {
   using SafeMath for uint256;
   using MappedSinglyLinkedList for MappedSinglyLinkedList.Mapping;
 

diff --git a/contracts/prize-strategy/PrizeStrategy.sol b/contracts/prize-strategy/PrizeStrategy.sol
@@ -7,7 +7,6 @@ import "@openzeppelin/contracts-ethereum-package/contracts/introspection/IERC182
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC777/IERC777Recipient.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/utils/ReentrancyGuard.sol";
-import "@opengsn/gsn/contracts/BaseRelayRecipient.sol";
 import "@pooltogether/fixed-point/contracts/FixedPoint.sol";
 import "@pooltogether/governor-contracts/contracts/GovernorInterface.sol";
 import "sortition-sum-tree-factory/contracts/SortitionSumTreeFactory.sol";
@@ -19,12 +18,13 @@ import "../token/ControlledToken.sol";
 import "../prize-pool/PrizeStrategyInterface.sol";
 import "../prize-pool/PrizePool.sol";
 import "../Constants.sol";
+import "../utils/RelayRecipient.sol";
 
 /* solium-disable security/no-block-members */
 contract PrizeStrategy is PrizeStrategyStorage,
                           Initializable,
                           OwnableUpgradeSafe,
-                          BaseRelayRecipient,
+                          RelayRecipient,
                           ReentrancyGuardUpgradeSafe,
                           PrizeStrategyInterface,
                           IERC777Recipient {

diff --git a/contracts/token/ControlledToken.sol b/contracts/token/ControlledToken.sol
@@ -1,13 +1,13 @@
 pragma solidity ^0.6.4;
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol";
-import "@opengsn/gsn/contracts/BaseRelayRecipient.sol";
 
+import "../utils/RelayRecipient.sol";
 import "./TokenControllerInterface.sol";
 
 /// @title Controlled ERC20 Token
 /// @notice ERC20 Tokens with a controller for minting & burning
-contract ControlledToken is ERC20UpgradeSafe, BaseRelayRecipient {
+contract ControlledToken is ERC20UpgradeSafe, RelayRecipient {
 
   /// @notice Interface to the contract responsible for controlling mint/burn
   TokenControllerInterface public controller;

diff --git a/contracts/utils/RelayRecipient.sol b/contracts/utils/RelayRecipient.sol
@@ -0,0 +1,9 @@
+pragma solidity ^0.6.4;
+
+import "@opengsn/gsn/contracts/BaseRelayRecipient.sol";
+
+contract RelayRecipient is BaseRelayRecipient {
+  function versionRecipient() external override view returns (string memory) {
+    return "2.0.0-beta.1+pooltogether.relay.recipient";
+  }
+}
diff --git a/package.json b/package.json
@@ -34,14 +34,15 @@
     "prepack": "rm -rf build cache && buidler compile && truffle-extract -b build -o abis",
     "postpublish": "PACKAGE_VERSION=$(./scripts/package-version.sh) && git tag -ae v$PACKAGE_VERSION && git push --tags"
   },
-  "dependencies": {},
+  "dependencies": {
+  },
   "devDependencies": {
     "@nomiclabs/buidler": "^1.3.5",
     "@nomiclabs/buidler-ethers": "^1.3.3",
     "@nomiclabs/buidler-etherscan": "^1.3.3",
     "@nomiclabs/buidler-waffle": "^1.3.4",
-    "@opengsn/gsn": "^0.9.0",
     "@openzeppelin/cli": "^2.8.2",
+    "@opengsn/gsn": "^0.10.0",
     "@openzeppelin/contracts-ethereum-package": "^3.0.0",
     "@pooltogether/fixed-point": "pooltogether/fixed-point.git#0.1.0-upgradeable.1",
     "@pooltogether/governor-contracts": "^0.1.1",