Skip to content

Commit

Permalink
GSN v3.0.0-beta.2 (#903)
Browse files Browse the repository at this point in the history
* Change versions strings in Solidity code

* v3.0.0-beta.2

Co-authored-by: Dror Tirosh <[email protected]>
  • Loading branch information
forshtat and drortirosh authored Sep 19, 2022
1 parent ba78fa3 commit 13b69a6
Show file tree
Hide file tree
Showing 24 changed files with 60 additions and 62 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.0.0-beta.1",
"version": "3.0.0-beta.2",
"npmClient": "yarn",
"useWorkspaces": true
}
20 changes: 10 additions & 10 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/Version.ts
Original file line number Diff line number Diff line change
@@ -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'
8 changes: 4 additions & 4 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -24,10 +24,10 @@
"web3-eth-contract": "^1.7.4"
},
"devDependencies": {
"solc-0.8": "npm:[email protected]",
"ts-node": "8.6.2",
"bn.js": "^5.2.1",
"solc-0.8": "npm:[email protected]",
"solhint": "^3.3.2",
"solidity-docgen": "^0.5.16"
"solidity-docgen": "^0.5.16",
"ts-node": "8.6.2"
}
}
2 changes: 1 addition & 1 deletion packages/contracts/src/Penalizer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/src/RelayHub.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/src/StakeManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/src/arbitrum/ArbRelayHub.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions packages/deployer/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions packages/dev/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions packages/logger/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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": {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion packages/paymasters/contracts/HashcashPaymaster.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
2 changes: 1 addition & 1 deletion packages/paymasters/contracts/TokenPaymaster.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}


Expand Down
2 changes: 1 addition & 1 deletion packages/paymasters/contracts/VerifyingPaymaster.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/paymasters/contracts/WhitelistPaymaster.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
16 changes: 8 additions & 8 deletions packages/paymasters/package.json
Original file line number Diff line number Diff line change
@@ -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'",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/provider/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions packages/relay/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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",
Expand Down

0 comments on commit 13b69a6

Please sign in to comment.