From 13b69a6804e12c7f670ae0c88d90396bb6aed651 Mon Sep 17 00:00:00 2001 From: Alex Forshtat Date: Mon, 19 Sep 2022 13:39:19 +0200 Subject: [PATCH] GSN v3.0.0-beta.2 (#903) * Change versions strings in Solidity code * v3.0.0-beta.2 Co-authored-by: Dror Tirosh --- lerna.json | 2 +- packages/cli/package.json | 20 +++++++++---------- packages/common/package.json | 8 ++++---- packages/common/src/Version.ts | 2 +- packages/contracts/package.json | 8 ++++---- packages/contracts/src/Penalizer.sol | 2 +- packages/contracts/src/RelayHub.sol | 2 +- packages/contracts/src/StakeManager.sol | 2 +- .../contracts/src/arbitrum/ArbRelayHub.sol | 2 +- .../test/TestPaymasterEverythingAccepted.sol | 2 +- .../test/TestPaymasterVariableGasLimits.sol | 2 +- packages/deployer/package.json | 6 +++--- packages/dev/package.json | 14 ++++++------- packages/logger/package.json | 6 ++---- .../contracts/AcceptEverythingPaymaster.sol | 2 +- .../contracts/HashcashPaymaster.sol | 2 +- .../PermitERC20UniswapV3Paymaster.sol | 2 +- .../paymasters/contracts/TokenPaymaster.sol | 2 +- .../contracts/VerifyingPaymaster.sol | 2 +- .../contracts/WhitelistPaymaster.sol | 2 +- .../deployproxy/ProxyDeployingPaymaster.sol | 2 +- packages/paymasters/package.json | 16 +++++++-------- packages/provider/package.json | 4 ++-- packages/relay/package.json | 10 +++++----- 24 files changed, 60 insertions(+), 62 deletions(-) diff --git a/lerna.json b/lerna.json index f3d83cfeb..f00e978df 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/cli/package.json b/packages/cli/package.json index 4e8a1f095..819fadf61 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/cli", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "GPL-3.0-only", "main": "dist/index.js", "bin": { @@ -25,10 +25,10 @@ }, "dependencies": { "@ethereumjs/tx": "^3.2.0", - "@opengsn/common": "^3.0.0-beta.1", - "@opengsn/logger": "^3.0.0-beta.1", - "@opengsn/provider": "^3.0.0-beta.1", - "@opengsn/relay": "^3.0.0-beta.1", + "@opengsn/common": "^3.0.0-beta.2", + "@opengsn/logger": "^3.0.0-beta.2", + "@opengsn/provider": "^3.0.0-beta.2", + "@opengsn/relay": "^3.0.0-beta.2", "@truffle/hdwallet-provider": "^2.0.10", "@types/asciichart": "^1.5.4", "@types/clear": "^0.1.1", @@ -37,19 +37,19 @@ "@types/web3": "1.0.20", "@types/web3-provider-engine": "^14.0.1", "asciichart": "^1.5.25", - "bn.js" : "^5.2.1", + "bn.js": "^5.2.1", "clear": "^0.1.0", "cli-table": "^0.3.4", "colors": "1.4.0", "commander": "^6.1.0", "console-read-write": "^0.1.1", - "ethereum-cryptography" : "^1.1.2", - "ethereum-protocol" : "^1.0.1", + "ethereum-cryptography": "^1.1.2", + "ethereum-protocol": "^1.0.1", "ethereumjs-util": "^7.1.0", "ethereumjs-wallet": "^1.0.2", - "ethval" : "^2.1.1", + "ethval": "^2.1.1", "moment": "^2.29.1", - "ow" : "^0.28.1", + "ow": "^0.28.1", "terminal-link": "^2.1.1", "web3": "^1.7.3", "web3-provider-engine": "^16.0.4" diff --git a/packages/common/package.json b/packages/common/package.json index 44bedb462..5ac8604c7 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/common", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "Apache-2.0", "main": "dist/index.js", "scripts": { @@ -18,15 +18,15 @@ "access": "public" }, "dependencies": { - "@ethereumjs/tx": "^3.2.0", "@ethereumjs/common": "^2.6.5", - "@opengsn/contracts": "^3.0.0-beta.1", + "@ethereumjs/tx": "^3.2.0", "@metamask/eth-sig-util": "^4.0.1", + "@opengsn/contracts": "^3.0.0-beta.2", "@types/bn.js": "^5.1.0", "@types/semver": "^7.3.4", "axios": "^0.21.1", - "bn.js": "^5.2.0", "bignumber.js": "^9.0.2", + "bn.js": "^5.2.0", "chalk": "^4.1.2", "ethereumjs-util": "^7.1.0", "ow": "^0.28.1", diff --git a/packages/common/src/Version.ts b/packages/common/src/Version.ts index 3fefef012..cfefa1891 100644 --- a/packages/common/src/Version.ts +++ b/packages/common/src/Version.ts @@ -1,2 +1,2 @@ export const gsnRuntimeVersion: string = require('../package.json').version -export const gsnRequiredVersion = '^3.0.0-beta.0' +export const gsnRequiredVersion = '^3.0.0-beta.2' diff --git a/packages/contracts/package.json b/packages/contracts/package.json index e2f909cc9..76f6caf4a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@opengsn/contracts", "license": "GPL-3.0-only", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "main": "types/truffle-contracts/index.d.ts", "scripts": { "solpp": "yarn --cwd=\"../..\" solpp", @@ -24,10 +24,10 @@ "web3-eth-contract": "^1.7.4" }, "devDependencies": { - "solc-0.8": "npm:solc@0.8.11", - "ts-node": "8.6.2", "bn.js": "^5.2.1", + "solc-0.8": "npm:solc@0.8.11", "solhint": "^3.3.2", - "solidity-docgen": "^0.5.16" + "solidity-docgen": "^0.5.16", + "ts-node": "8.6.2" } } diff --git a/packages/contracts/src/Penalizer.sol b/packages/contracts/src/Penalizer.sol index 0d4294dd1..92af740cb 100644 --- a/packages/contracts/src/Penalizer.sol +++ b/packages/contracts/src/Penalizer.sol @@ -19,7 +19,7 @@ contract Penalizer is IPenalizer, ERC165 { using ECDSA for bytes32; /// @inheritdoc IPenalizer - string public override versionPenalizer = "3.0.0-beta.0+opengsn.penalizer.ipenalizer"; + string public override versionPenalizer = "3.0.0-beta.2+opengsn.penalizer.ipenalizer"; uint256 internal immutable penalizeBlockDelay; uint256 internal immutable penalizeBlockExpiration; diff --git a/packages/contracts/src/RelayHub.sol b/packages/contracts/src/RelayHub.sol index 3bdb07e70..ae41831ea 100644 --- a/packages/contracts/src/RelayHub.sol +++ b/packages/contracts/src/RelayHub.sol @@ -42,7 +42,7 @@ contract RelayHub is IRelayHub, Ownable, ERC165 { /// @inheritdoc IRelayHub function versionHub() override virtual public pure returns (string memory){ - return "3.0.0-beta.0+opengsn.hub.irelayhub"; + return "3.0.0-beta.2+opengsn.hub.irelayhub"; } IStakeManager internal immutable stakeManager; diff --git a/packages/contracts/src/StakeManager.sol b/packages/contracts/src/StakeManager.sol index 07ca4cc91..ce1abd306 100644 --- a/packages/contracts/src/StakeManager.sol +++ b/packages/contracts/src/StakeManager.sol @@ -20,7 +20,7 @@ import "./interfaces/IStakeManager.sol"; contract StakeManager is IStakeManager, Ownable, ERC165 { using SafeERC20 for IERC20; - string public override versionSM = "3.0.0-beta.0+opengsn.stakemanager.istakemanager"; + string public override versionSM = "3.0.0-beta.2+opengsn.stakemanager.istakemanager"; uint256 internal immutable maxUnstakeDelay; AbandonedRelayServerConfig internal abandonedRelayServerConfig; diff --git a/packages/contracts/src/arbitrum/ArbRelayHub.sol b/packages/contracts/src/arbitrum/ArbRelayHub.sol index 3a0a6d6f2..ea86a05c8 100644 --- a/packages/contracts/src/arbitrum/ArbRelayHub.sol +++ b/packages/contracts/src/arbitrum/ArbRelayHub.sol @@ -15,7 +15,7 @@ contract ArbRelayHub is RelayHub { /// @inheritdoc IRelayHub function versionHub() override public pure returns (string memory){ - return "3.0.0-beta.0+opengsn.arbhub.irelayhub"; + return "3.0.0-beta.2+opengsn.arbhub.irelayhub"; } ArbSys public immutable arbsys; diff --git a/packages/contracts/src/test/TestPaymasterEverythingAccepted.sol b/packages/contracts/src/test/TestPaymasterEverythingAccepted.sol index 2b0051eeb..55ed1fb37 100644 --- a/packages/contracts/src/test/TestPaymasterEverythingAccepted.sol +++ b/packages/contracts/src/test/TestPaymasterEverythingAccepted.sol @@ -8,7 +8,7 @@ import "../BasePaymaster.sol"; contract TestPaymasterEverythingAccepted is BasePaymaster { function versionPaymaster() external view override virtual returns (string memory){ - return "3.0.0-beta.0+opengsn.test-pea.ipaymaster"; + return "3.0.0-beta.2+opengsn.test-pea.ipaymaster"; } event SampleRecipientPreCall(); diff --git a/packages/contracts/src/test/TestPaymasterVariableGasLimits.sol b/packages/contracts/src/test/TestPaymasterVariableGasLimits.sol index 0524828d0..5431e4512 100644 --- a/packages/contracts/src/test/TestPaymasterVariableGasLimits.sol +++ b/packages/contracts/src/test/TestPaymasterVariableGasLimits.sol @@ -6,7 +6,7 @@ import "./TestPaymasterEverythingAccepted.sol"; contract TestPaymasterVariableGasLimits is TestPaymasterEverythingAccepted { - string public override versionPaymaster = "3.0.0-beta.0+opengsn.test-vgl.ipaymaster"; + string public override versionPaymaster = "3.0.0-beta.2+opengsn.test-vgl.ipaymaster"; event SampleRecipientPreCallWithValues( uint256 gasleft, diff --git a/packages/deployer/package.json b/packages/deployer/package.json index d757271eb..299d79ab4 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/deployer", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "private": true, "author": "Dror Tirosh", "license": "MIT", @@ -18,8 +18,8 @@ "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers", "@nomiclabs/hardhat-etherscan": "^2.1.8", "@nomiclabs/hardhat-web3": "^2.0.0", - "@opengsn/common": "^3.0.0-beta.1", - "@opengsn/provider": "^3.0.0-beta.1", + "@opengsn/common": "^3.0.0-beta.2", + "@opengsn/provider": "^3.0.0-beta.2", "axios": "^0.27.2", "chai": "^4.3.6", "chalk": "^4.1.2", diff --git a/packages/dev/package.json b/packages/dev/package.json index 4a024db91..5736f5d88 100644 --- a/packages/dev/package.json +++ b/packages/dev/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/dev", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "GPL-3.0-only", "main": "dist/src/index.js", "files": [ @@ -24,12 +24,12 @@ "rm-dist": "rm -rf tsconfig.tsbuildinfo dist build" }, "dependencies": { - "@opengsn/cli": "^3.0.0-beta.1", - "@opengsn/contracts": "^3.0.0-beta.1", - "@opengsn/provider": "^3.0.0-beta.1", - "@opengsn/relay": "^3.0.0-beta.1", - "@opengsn/common": "^3.0.0-beta.1", - "@opengsn/logger": "^3.0.0-beta.1" + "@opengsn/cli": "^3.0.0-beta.2", + "@opengsn/common": "^3.0.0-beta.2", + "@opengsn/contracts": "^3.0.0-beta.2", + "@opengsn/logger": "^3.0.0-beta.2", + "@opengsn/provider": "^3.0.0-beta.2", + "@opengsn/relay": "^3.0.0-beta.2" }, "devDependencies": { "@ethereumjs/common": "^2.6.5", diff --git a/packages/logger/package.json b/packages/logger/package.json index 373a16529..212c5150e 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/logger", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "GPL-3.0-only", "main": "dist/index.js", "files": [ @@ -18,10 +18,8 @@ "rm-dist": "rm -rf tsconfig.tsbuildinfo dist build" }, "dependencies": { - "@opengsn/common": "3.0.0-beta.1", + "@opengsn/common": "^3.0.0-beta.2", "loglevel": "^1.8.0", "winston": "^3.3.3" - }, - "devDependencies": { } } diff --git a/packages/paymasters/contracts/AcceptEverythingPaymaster.sol b/packages/paymasters/contracts/AcceptEverythingPaymaster.sol index 0a595c9bc..3b84786bd 100644 --- a/packages/paymasters/contracts/AcceptEverythingPaymaster.sol +++ b/packages/paymasters/contracts/AcceptEverythingPaymaster.sol @@ -12,7 +12,7 @@ import "@opengsn/contracts/src/BasePaymaster.sol"; contract AcceptEverythingPaymaster is BasePaymaster { function versionPaymaster() external view override virtual returns (string memory){ - return "3.0.0-beta.0+opengsn.accepteverything.ipaymaster"; + return "3.0.0-beta.2+opengsn.accepteverything.ipaymaster"; } function _preRelayedCall( diff --git a/packages/paymasters/contracts/HashcashPaymaster.sol b/packages/paymasters/contracts/HashcashPaymaster.sol index 1f1140785..285c0728f 100644 --- a/packages/paymasters/contracts/HashcashPaymaster.sol +++ b/packages/paymasters/contracts/HashcashPaymaster.sol @@ -16,7 +16,7 @@ import "./AcceptEverythingPaymaster.sol"; contract HashcashPaymaster is AcceptEverythingPaymaster { function versionPaymaster() external view override virtual returns (string memory){ - return "3.0.0-beta.0+opengsn.hashcash.ipaymaster"; + return "3.0.0-beta.2+opengsn.hashcash.ipaymaster"; } uint8 public difficulty; diff --git a/packages/paymasters/contracts/PermitERC20UniswapV3Paymaster.sol b/packages/paymasters/contracts/PermitERC20UniswapV3Paymaster.sol index 419284d12..1d6f80435 100644 --- a/packages/paymasters/contracts/PermitERC20UniswapV3Paymaster.sol +++ b/packages/paymasters/contracts/PermitERC20UniswapV3Paymaster.sol @@ -322,7 +322,7 @@ contract PermitERC20UniswapV3Paymaster is BasePaymaster, ERC2771Recipient { } function versionPaymaster() external override virtual view returns (string memory){ - return "3.0.0-beta.0+opengsn.permit-erc20-uniswap-v3.ipaymaster"; + return "3.0.0-beta.2+opengsn.permit-erc20-uniswap-v3.ipaymaster"; } function getTrustedForwarder() override(BasePaymaster, ERC2771Recipient) public view returns (address forwarder){ diff --git a/packages/paymasters/contracts/TokenPaymaster.sol b/packages/paymasters/contracts/TokenPaymaster.sol index e2600eae4..cf1dd411f 100644 --- a/packages/paymasters/contracts/TokenPaymaster.sol +++ b/packages/paymasters/contracts/TokenPaymaster.sol @@ -20,7 +20,7 @@ import "./interfaces/IUniswapV3.sol"; contract TokenPaymaster is BasePaymaster { function versionPaymaster() external override virtual view returns (string memory){ - return "3.0.0-beta.0+opengsn.token.ipaymaster"; + return "3.0.0-beta.2+opengsn.token.ipaymaster"; } diff --git a/packages/paymasters/contracts/VerifyingPaymaster.sol b/packages/paymasters/contracts/VerifyingPaymaster.sol index 19a9eb220..85e2f6663 100644 --- a/packages/paymasters/contracts/VerifyingPaymaster.sol +++ b/packages/paymasters/contracts/VerifyingPaymaster.sol @@ -78,7 +78,7 @@ contract VerifyingPaymaster is Ownable, BasePaymaster { } function versionPaymaster() external view override virtual returns (string memory){ - return "3.0.0-beta.0+opengsn.vpm.ipaymaster"; + return "3.0.0-beta.2+opengsn.vpm.ipaymaster"; } function setSigner(address _signer) public onlyOwner { diff --git a/packages/paymasters/contracts/WhitelistPaymaster.sol b/packages/paymasters/contracts/WhitelistPaymaster.sol index 9bdc78912..c4c739e2f 100644 --- a/packages/paymasters/contracts/WhitelistPaymaster.sol +++ b/packages/paymasters/contracts/WhitelistPaymaster.sol @@ -18,7 +18,7 @@ contract WhitelistPaymaster is BasePaymaster { mapping(address => mapping(bytes4 => bool)) public methodWhitelist; function versionPaymaster() external view override virtual returns (string memory){ - return "3.0.0-beta.0+opengsn.whitelist.ipaymaster"; + return "3.0.0-beta.2+opengsn.whitelist.ipaymaster"; } function whitelistSender(address sender, bool isAllowed) public onlyOwner { diff --git a/packages/paymasters/contracts/deployproxy/ProxyDeployingPaymaster.sol b/packages/paymasters/contracts/deployproxy/ProxyDeployingPaymaster.sol index 322b497ce..bd3f547b5 100644 --- a/packages/paymasters/contracts/deployproxy/ProxyDeployingPaymaster.sol +++ b/packages/paymasters/contracts/deployproxy/ProxyDeployingPaymaster.sol @@ -10,7 +10,7 @@ import "./ProxyFactory.sol"; contract ProxyDeployingPaymaster is TokenPaymaster { using Address for address; - string public override versionPaymaster = "3.0.0-beta.0+opengsn.proxydeploying.ipaymaster"; + string public override versionPaymaster = "3.0.0-beta.2+opengsn.proxydeploying.ipaymaster"; ProxyFactory public proxyFactory; diff --git a/packages/paymasters/package.json b/packages/paymasters/package.json index df3031eb0..a6994cf5c 100644 --- a/packages/paymasters/package.json +++ b/packages/paymasters/package.json @@ -1,7 +1,7 @@ { "name": "@opengsn/paymasters", "license": "GPL-3.0-only", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "scripts": { "truffle-compile": "truffle compile --compile-all", "typechain-generate": "yarn truffle-compile && typechain --target truffle-v5 './build/contracts/**/*.json'", @@ -30,10 +30,10 @@ }, "dependencies": { "@metamask/eth-sig-util": "^4.0.1", - "@opengsn/common": "^3.0.0-beta.1", - "@opengsn/contracts": "^3.0.0-beta.1", - "@opengsn/dev": "^3.0.0-beta.1", - "@opengsn/provider": "^3.0.0-beta.1", + "@opengsn/common": "^3.0.0-beta.2", + "@opengsn/contracts": "^3.0.0-beta.2", + "@opengsn/dev": "^3.0.0-beta.2", + "@opengsn/provider": "^3.0.0-beta.2", "@openzeppelin/contracts": "^4.2.0", "@uniswap/v3-periphery": "^1.1.1", "ethereumjs-util": "^7.1.0", @@ -47,17 +47,17 @@ "@ethersproject/abstract-signer": "^5.6.2", "@ethersproject/experimental": "^5.6.3", "@ethersproject/providers": "^5.6.5", - "@opengsn/cli": "^3.0.0-beta.1", + "@opengsn/cli": "^3.0.0-beta.2", "@openzeppelin/test-helpers": "^0.5.15", + "@types/chai-as-promised": "^7.1.3", "@types/ethereumjs-util": "^6.1.0", "@types/web3": "1.2.2", - "@types/chai-as-promised": "^7.1.3", "bn.js": "^5.2.1", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "ethers": "^5.6.5", - "ts-node": "8.6.2", "solhint": "^3.3.2", + "ts-node": "8.6.2", "web3-core": "^1.7.4" } } diff --git a/packages/provider/package.json b/packages/provider/package.json index e021bce44..e9aa763c8 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/provider", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "Apache-2.0", "main": "dist/index.js", "scripts": { @@ -24,7 +24,7 @@ "@ethersproject/experimental": "^5.6.3", "@ethersproject/providers": "^5.6.5", "@metamask/eth-sig-util": "^4.0.1", - "@opengsn/common": "^3.0.0-beta.1", + "@opengsn/common": "^3.0.0-beta.2", "abi-decoder": "^2.4.0", "ethereumjs-util": "^7.1.0", "ethereumjs-wallet": "^1.0.2", diff --git a/packages/relay/package.json b/packages/relay/package.json index 6d49fbbfd..a80b7883a 100644 --- a/packages/relay/package.json +++ b/packages/relay/package.json @@ -1,6 +1,6 @@ { "name": "@opengsn/relay", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "license": "GPL-3.0-only", "main": "dist/runServer.js", "files": [ @@ -19,10 +19,10 @@ }, "dependencies": { "@ethereumjs/tx": "^3.2.0", - "@opengsn/common": "^3.0.0-beta.1", - "@opengsn/contracts": "^3.0.0-beta.1", - "@opengsn/logger": "^3.0.0-beta.1", - "@seald-io/nedb" : "^3.0.0", + "@opengsn/common": "^3.0.0-beta.2", + "@opengsn/contracts": "^3.0.0-beta.2", + "@opengsn/logger": "^3.0.0-beta.2", + "@seald-io/nedb": "^3.0.0", "@types/cors": "^2.8.12", "@types/express": "^4.17.13", "@types/minimist": "^1.2.0",