From a2aacfa3d776ac43b7ec9768b2406f1fd31f5cad Mon Sep 17 00:00:00 2001 From: Dima Stebaev Date: Thu, 4 Jan 2024 17:33:41 +0200 Subject: [PATCH 1/6] Beta release (#72) From a8a2555d60b89a3867de094ced5139f9910dbb37 Mon Sep 17 00:00:00 2001 From: Dmytro Stebaiev Date: Thu, 22 Aug 2024 17:00:41 +0300 Subject: [PATCH 2/6] Add release-candidate branch --- .github/workflows/publish.yml | 3 ++- scripts/calculate_version.sh | 31 ++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a2e05a..3b3959c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,10 +5,11 @@ on: pull_request: types: [closed] branches: + - 'v*.*.*' - develop - beta + - release-candidate - stable - - 'v*.*.*' push: tags: - 'custom-release-*' diff --git a/scripts/calculate_version.sh b/scripts/calculate_version.sh index 0070948..c46ba00 100755 --- a/scripts/calculate_version.sh +++ b/scripts/calculate_version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e @@ -18,20 +18,29 @@ if [ -z "$VERSION" ]; then exit 1 fi -LABEL="develop" -for known in "beta" "stable" -do - if [ "$BRANCH" = "$known" ] - then - LABEL="$BRANCH" - fi -done - git fetch --tags > /dev/null +KNOWN_BRANCHES=('stable' 'release-candidate' 'beta') +# Everything else will be marked as 'develop' + +declare -A SUFFIXES=( + ['release-candidate']='rc' +) + +if [[ ! "${KNOWN_BRANCHES[@]}" =~ "$BRANCH" ]] +then + BRANCH='develop' +fi + +SUFFIX=$BRANCH +if [[ -n "${SUFFIXES[$BRANCH]}" ]] +then + SUFFIX="${SUFFIXES[$BRANCH]}" +fi + for (( NUMBER=0; ; NUMBER++ )) do - FULL_VERSION="$VERSION-$LABEL.$NUMBER" + FULL_VERSION="$VERSION-$SUFFIX.$NUMBER" TAG="$FULL_VERSION" if ! [[ $(git tag -l | grep "$TAG") ]]; then echo "$FULL_VERSION" | tr / - From 9655b755a715ef57283c74b0fce6e130d8f9ab6c Mon Sep 17 00:00:00 2001 From: Dima Stebaev Date: Thu, 12 Sep 2024 18:08:42 +0300 Subject: [PATCH 3/6] Add proxy v5 support (#163) * Add proxy v5 support * Update upgrade-tools --- migrations/upgrade.ts | 4 ++-- package.json | 2 +- scripts/test_upgrade.sh | 2 +- yarn.lock | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/migrations/upgrade.ts b/migrations/upgrade.ts index 5837a41..1403416 100644 --- a/migrations/upgrade.ts +++ b/migrations/upgrade.ts @@ -1,5 +1,5 @@ -import {AutoSubmitter, Upgrader} from "@skalenetwork/upgrade-tools"; import {Instance, skaleContracts} from "@skalenetwork/skale-contracts-ethers-v6"; +import {Submitter, Upgrader} from "@skalenetwork/upgrade-tools"; import {Paymaster} from "../typechain-types"; import {Transaction} from "ethers"; import chalk from "chalk"; @@ -35,7 +35,7 @@ interface UpgradeContext { class PaymasterUpgrader extends Upgrader { constructor( context: UpgradeContext, - submitter = new AutoSubmitter() + submitter?: Submitter ) { super( { diff --git a/package.json b/package.json index 8bd6890..8431a7a 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@quant-finance/solidity-datetime": "^2.2.0", "@skalenetwork/paymaster-interfaces": "main", "@skalenetwork/skale-contracts-ethers-v6": "^1.0.2-develop.0", - "@skalenetwork/upgrade-tools": "3.0.0-develop.13", + "@skalenetwork/upgrade-tools": "3.0.0-develop.21", "chalk": "^4", "dotenv": "^16.4.5" } diff --git a/scripts/test_upgrade.sh b/scripts/test_upgrade.sh index bad523c..7c23f4e 100755 --- a/scripts/test_upgrade.sh +++ b/scripts/test_upgrade.sh @@ -37,7 +37,7 @@ echo "Deploy previous version" DEPLOY_OUTPUT_FILE="$GITHUB_WORKSPACE/data/deploy.txt" VERSION=$DEPLOYED_VERSION yarn exec hardhat run migrations/deploy.ts --network localhost > $DEPLOY_OUTPUT_FILE rm $GITHUB_WORKSPACE/.openzeppelin/unknown-*.json || true -cp .openzeppelin/unknown-*.json $GITHUB_WORKSPACE/.openzeppelin +cp .openzeppelin/unknown-*.json "$GITHUB_WORKSPACE/.openzeppelin/" PAYMASTER_ADDRESS=$(cat $DEPLOY_OUTPUT_FILE | grep "Paymaster address" | awk '{print $NF}') cd $GITHUB_WORKSPACE diff --git a/yarn.lock b/yarn.lock index e76251c..ee64365 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1904,9 +1904,9 @@ __metadata: languageName: node linkType: hard -"@skalenetwork/upgrade-tools@npm:3.0.0-develop.13": - version: 3.0.0-develop.13 - resolution: "@skalenetwork/upgrade-tools@npm:3.0.0-develop.13" +"@skalenetwork/upgrade-tools@npm:3.0.0-develop.21": + version: 3.0.0-develop.21 + resolution: "@skalenetwork/upgrade-tools@npm:3.0.0-develop.21" dependencies: "@safe-global/api-kit": ^2.4.1 "@safe-global/protocol-kit": ^4.0.1 @@ -1923,7 +1923,7 @@ __metadata: "@types/mocha": ^9.1.0 ethers: ^6.7.1 hardhat: ^2.9.9 - checksum: a9fc5a674ad69975bbaedd6f4116b5e05e8ba9250f0b6d4283921461abc3949a82900371ac6ca495d06288cb6e734df4a8e938a07ab19da45d2342f0bba2b128 + checksum: a50d0ff7acfb9c7e940ee59217733dfad3721a6aeabd2b6427a4cda8a46f3c79ef389227690e156b62d59ede84205cb7f040e04d1b1de85013f05da12037b616 languageName: node linkType: hard @@ -7064,7 +7064,7 @@ __metadata: "@quant-finance/solidity-datetime": ^2.2.0 "@skalenetwork/paymaster-interfaces": main "@skalenetwork/skale-contracts-ethers-v6": ^1.0.2-develop.0 - "@skalenetwork/upgrade-tools": 3.0.0-develop.13 + "@skalenetwork/upgrade-tools": 3.0.0-develop.21 "@typechain/ethers-v6": ^0.5.1 "@typechain/hardhat": ^9.1.0 "@types/chai": ^4.3.11 From 4e389c5b49b46a56138836ee94be1af6f5f31557 Mon Sep 17 00:00:00 2001 From: Dmytro Stebaiev Date: Thu, 24 Oct 2024 17:58:45 +0300 Subject: [PATCH 4/6] Fix release commit --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b22cfe3..9214447 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -65,6 +65,7 @@ jobs: uses: ncipollo/release-action@v1 with: tag: ${{ env.VERSION }} + commit: ${{ github.sha }} prerelease: ${{ env.PRERELEASE }} artifacts: "data/*-abi.json" From 28d57976e9c7b02c2481734d72f8e6f0796e764c Mon Sep 17 00:00:00 2001 From: Dmytro Stebaiev Date: Tue, 29 Oct 2024 15:33:09 +0200 Subject: [PATCH 5/6] Update manifest --- .openzeppelin/unknown-2046399126.json | 1081 ++++++++++++++++++++++++- cspell.json | 1 + package.json | 2 +- yarn.lock | 10 +- 4 files changed, 1067 insertions(+), 27 deletions(-) diff --git a/.openzeppelin/unknown-2046399126.json b/.openzeppelin/unknown-2046399126.json index 25a674a..0c3ba9e 100644 --- a/.openzeppelin/unknown-2046399126.json +++ b/.openzeppelin/unknown-2046399126.json @@ -317,7 +317,7 @@ "label": "schainPricePerMonth", "offset": 0, "slot": "10", - "type": "t_userDefinedValueType(USD)18473", + "type": "t_userDefinedValueType(USD)18539", "contract": "Paymaster", "src": "contracts/Paymaster.sol:115" }, @@ -325,7 +325,7 @@ "label": "oneSklPrice", "offset": 0, "slot": "11", - "type": "t_userDefinedValueType(USD)18473", + "type": "t_userDefinedValueType(USD)18539", "contract": "Paymaster", "src": "contracts/Paymaster.sol:116" }, @@ -459,7 +459,7 @@ "label": "uint256[]", "numberOfBytes": "32" }, - "t_array(t_userDefinedValueType(Value)17245)dyn_storage": { + "t_array(t_userDefinedValueType(Value)17261)dyn_storage": { "label": "PriorityQueueLibrary.Value[]", "numberOfBytes": "32" }, @@ -483,7 +483,7 @@ "label": "mapping(uint128 => bytes32)", "numberOfBytes": "32" }, - "t_mapping(t_uint256,t_array(t_userDefinedValueType(Value)17245)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_userDefinedValueType(Value)17261)dyn_storage)": { "label": "mapping(uint256 => PriorityQueueLibrary.Value[])", "numberOfBytes": "32" }, @@ -527,7 +527,7 @@ ], "numberOfBytes": "96" }, - "t_struct(AddressToValidatorIdMap)17900_storage": { + "t_struct(AddressToValidatorIdMap)17916_storage": { "label": "struct TypedMap.AddressToValidatorIdMap", "members": [ { @@ -617,19 +617,19 @@ ], "numberOfBytes": "96" }, - "t_struct(ChangeIdPriorityQueue)17997_storage": { + "t_struct(ChangeIdPriorityQueue)18013_storage": { "label": "struct TypedPriorityQueue.ChangeIdPriorityQueue", "members": [ { "label": "inner", - "type": "t_struct(PriorityQueue)17255_storage", + "type": "t_struct(PriorityQueue)17271_storage", "offset": 0, "slot": "0" } ], "numberOfBytes": "64" }, - "t_struct(Heap)16456_storage": { + "t_struct(Heap)16472_storage": { "label": "struct HeapLibrary.Heap", "members": [ { @@ -659,7 +659,7 @@ ], "numberOfBytes": "64" }, - "t_struct(NodeIdDeque)17647_storage": { + "t_struct(NodeIdDeque)17663_storage": { "label": "struct TypedDoubleEndedQueue.NodeIdDeque", "members": [ { @@ -688,25 +688,25 @@ }, { "label": "amount", - "type": "t_userDefinedValueType(SKL)18414", + "type": "t_userDefinedValueType(SKL)18480", "offset": 0, "slot": "2" } ], "numberOfBytes": "96" }, - "t_struct(PriorityQueue)17255_storage": { + "t_struct(PriorityQueue)17271_storage": { "label": "struct PriorityQueueLibrary.PriorityQueue", "members": [ { "label": "priorities", - "type": "t_struct(Heap)16456_storage", + "type": "t_struct(Heap)16472_storage", "offset": 0, "slot": "0" }, { "label": "values", - "type": "t_mapping(t_uint256,t_array(t_userDefinedValueType(Value)17245)dyn_storage)", + "type": "t_mapping(t_uint256,t_array(t_userDefinedValueType(Value)17261)dyn_storage)", "offset": 0, "slot": "1" } @@ -748,7 +748,7 @@ }, { "label": "ids", - "type": "t_struct(NodeIdDeque)17647_storage", + "type": "t_struct(NodeIdDeque)17663_storage", "offset": 0, "slot": "1" }, @@ -802,7 +802,7 @@ }, { "label": "changesQueue", - "type": "t_struct(ChangeIdPriorityQueue)17997_storage", + "type": "t_struct(ChangeIdPriorityQueue)18013_storage", "offset": 0, "slot": "3" }, @@ -820,7 +820,7 @@ }, { "label": "valuesQueue", - "type": "t_struct(ValueIdDeque)17651_storage", + "type": "t_struct(ValueIdDeque)17667_storage", "offset": 0, "slot": "7" } @@ -910,7 +910,7 @@ }, { "label": "addressToValidatorId", - "type": "t_struct(AddressToValidatorIdMap)17900_storage", + "type": "t_struct(AddressToValidatorIdMap)17916_storage", "offset": 0, "slot": "3" } @@ -935,7 +935,7 @@ ], "numberOfBytes": "64" }, - "t_struct(ValueIdDeque)17651_storage": { + "t_struct(ValueIdDeque)17667_storage": { "label": "struct TypedDoubleEndedQueue.ValueIdDeque", "members": [ { @@ -975,7 +975,7 @@ "numberOfBytes": "32", "underlying": "t_uint256" }, - "t_userDefinedValueType(SKL)18414": { + "t_userDefinedValueType(SKL)18480": { "label": "SKL", "numberOfBytes": "32", "underlying": "t_uint256" @@ -995,7 +995,7 @@ "numberOfBytes": "32", "underlying": "t_uint256" }, - "t_userDefinedValueType(USD)18473": { + "t_userDefinedValueType(USD)18539": { "label": "USD", "numberOfBytes": "32", "underlying": "t_uint256" @@ -1005,7 +1005,7 @@ "numberOfBytes": "32", "underlying": "t_uint256" }, - "t_userDefinedValueType(Value)17245": { + "t_userDefinedValueType(Value)17261": { "label": "PriorityQueueLibrary.Value", "numberOfBytes": "32", "underlying": "t_uint256" @@ -1055,6 +1055,1045 @@ ] } } + }, + "4fe935da45ca45a9f71f9a19770f975b733f51c870f11f78af406013c64350ec": { + "address": "0x0031946065f64FE4098b86142f875FCf333b3e9b", + "txHash": "0xbe3dba1bdf961c9c2e31604ece1067f97137d98bd6576008a393b6ee73f229f0", + "layout": { + "solcVersion": "0.8.20", + "storage": [ + { + "label": "schains", + "offset": 0, + "slot": "0", + "type": "t_mapping(t_userDefinedValueType(SchainHash)10928,t_struct(Schain)11459_storage)", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:97" + }, + { + "label": "_schainHashes", + "offset": 0, + "slot": "1", + "type": "t_struct(Bytes32Set)8128_storage", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:98" + }, + { + "label": "_validatorData", + "offset": 0, + "slot": "3", + "type": "t_struct(ValidatorData)11494_storage", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:100" + }, + { + "label": "maxReplenishmentPeriod", + "offset": 0, + "slot": "9", + "type": "t_userDefinedValueType(Months)10328", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:102" + }, + { + "label": "schainPricePerMonth", + "offset": 0, + "slot": "10", + "type": "t_userDefinedValueType(USD)11256", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:103" + }, + { + "label": "oneSklPrice", + "offset": 0, + "slot": "11", + "type": "t_userDefinedValueType(USD)11256", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:104" + }, + { + "label": "sklPriceTimestamp", + "offset": 0, + "slot": "12", + "type": "t_userDefinedValueType(Timestamp)10332", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:105" + }, + { + "label": "allowedSklPriceLag", + "offset": 0, + "slot": "13", + "type": "t_userDefinedValueType(Seconds)10322", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:106" + }, + { + "label": "skaleToken", + "offset": 0, + "slot": "14", + "type": "t_contract(IERC20)3412", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:107" + }, + { + "label": "_totalRewards", + "offset": 0, + "slot": "15", + "type": "t_struct(Timeline)14799_storage", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:109" + }, + { + "label": "_totalNodesHistory", + "offset": 0, + "slot": "24", + "type": "t_struct(Sequence)14064_storage", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:110" + }, + { + "label": "debts", + "offset": 0, + "slot": "28", + "type": "t_mapping(t_userDefinedValueType(DebtId)11440,t_struct(Payment)11450_storage)", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:112" + }, + { + "label": "debtsBegin", + "offset": 0, + "slot": "29", + "type": "t_userDefinedValueType(DebtId)11440", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:113" + }, + { + "label": "debtsEnd", + "offset": 0, + "slot": "30", + "type": "t_userDefinedValueType(DebtId)11440", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:114" + }, + { + "label": "version", + "offset": 0, + "slot": "31", + "type": "t_string_storage", + "contract": "Paymaster", + "src": "contracts/Paymaster.sol:116" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_struct(AccessManagedStorage)25_storage": { + "label": "struct AccessManagedUpgradeable.AccessManagedStorage", + "members": [ + { + "label": "_authority", + "type": "t_address", + "offset": 0, + "slot": "0" + }, + { + "label": "_consumingSchedule", + "type": "t_bool", + "offset": 20, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(InitializableStorage)649_storage": { + "label": "struct Initializable.InitializableStorage", + "members": [ + { + "label": "_initialized", + "type": "t_uint64", + "offset": 0, + "slot": "0" + }, + { + "label": "_initializing", + "type": "t_bool", + "offset": 8, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)dyn_storage": { + "label": "uint256[]", + "numberOfBytes": "32" + }, + "t_array(t_userDefinedValueType(Value)16951)dyn_storage": { + "label": "PriorityQueueLibrary.Value[]", + "numberOfBytes": "32" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IERC20)3412": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_mapping(t_bytes32,t_bytes32)": { + "label": "mapping(bytes32 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint128,t_bytes32)": { + "label": "mapping(uint128 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_array(t_userDefinedValueType(Value)16951)dyn_storage)": { + "label": "mapping(uint256 => PriorityQueueLibrary.Value[])", + "numberOfBytes": "32" + }, + "t_mapping(t_userDefinedValueType(ChangeId)14745,t_struct(Change)14807_storage)": { + "label": "mapping(TimelineLibrary.ChangeId => struct TimelineLibrary.Change)", + "numberOfBytes": "32" + }, + "t_mapping(t_userDefinedValueType(DebtId)11440,t_struct(Payment)11450_storage)": { + "label": "mapping(Paymaster.DebtId => struct Paymaster.Payment)", + "numberOfBytes": "32" + }, + "t_mapping(t_userDefinedValueType(NodeId)14032,t_struct(Node)14051_storage)": { + "label": "mapping(SequenceLibrary.NodeId => struct SequenceLibrary.Node)", + "numberOfBytes": "32" + }, + "t_mapping(t_userDefinedValueType(SchainHash)10928,t_struct(Schain)11459_storage)": { + "label": "mapping(SchainHash => struct Paymaster.Schain)", + "numberOfBytes": "32" + }, + "t_mapping(t_userDefinedValueType(ValidatorId)10930,t_struct(Validator)11481_storage)": { + "label": "mapping(ValidatorId => struct Paymaster.Validator)", + "numberOfBytes": "32" + }, + "t_mapping(t_userDefinedValueType(ValueId)14747,t_struct(Value)14813_storage)": { + "label": "mapping(TimelineLibrary.ValueId => struct TimelineLibrary.Value)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(AddressToUintMap)7488_storage": { + "label": "struct EnumerableMap.AddressToUintMap", + "members": [ + { + "label": "_inner", + "type": "t_struct(Bytes32ToBytes32Map)6830_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(AddressToValidatorIdMap)17606_storage": { + "label": "struct TypedMap.AddressToValidatorIdMap", + "members": [ + { + "label": "inner", + "type": "t_struct(AddressToUintMap)7488_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Bytes32Deque)6496_storage": { + "label": "struct DoubleEndedQueue.Bytes32Deque", + "members": [ + { + "label": "_begin", + "type": "t_uint128", + "offset": 0, + "slot": "0" + }, + { + "label": "_end", + "type": "t_uint128", + "offset": 16, + "slot": "0" + }, + { + "label": "_data", + "type": "t_mapping(t_uint128,t_bytes32)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32Set)8128_storage": { + "label": "struct EnumerableSet.Bytes32Set", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)7934_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32ToBytes32Map)6830_storage": { + "label": "struct EnumerableMap.Bytes32ToBytes32Map", + "members": [ + { + "label": "_keys", + "type": "t_struct(Bytes32Set)8128_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_values", + "type": "t_mapping(t_bytes32,t_bytes32)", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Change)14807_storage": { + "label": "struct TimelineLibrary.Change", + "members": [ + { + "label": "timestamp", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "0" + }, + { + "label": "add", + "type": "t_uint256", + "offset": 0, + "slot": "1" + }, + { + "label": "subtract", + "type": "t_uint256", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(ChangeIdPriorityQueue)17703_storage": { + "label": "struct TypedPriorityQueue.ChangeIdPriorityQueue", + "members": [ + { + "label": "inner", + "type": "t_struct(PriorityQueue)16961_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Heap)16158_storage": { + "label": "struct HeapLibrary.Heap", + "members": [ + { + "label": "values", + "type": "t_array(t_uint256)dyn_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Node)14051_storage": { + "label": "struct SequenceLibrary.Node", + "members": [ + { + "label": "timestamp", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "0" + }, + { + "label": "value", + "type": "t_uint256", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(NodeIdDeque)17353_storage": { + "label": "struct TypedDoubleEndedQueue.NodeIdDeque", + "members": [ + { + "label": "inner", + "type": "t_struct(Bytes32Deque)6496_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Payment)11450_storage": { + "label": "struct Paymaster.Payment", + "members": [ + { + "label": "from", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "0" + }, + { + "label": "to", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "1" + }, + { + "label": "amount", + "type": "t_userDefinedValueType(SKL)11145", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(PriorityQueue)16961_storage": { + "label": "struct PriorityQueueLibrary.PriorityQueue", + "members": [ + { + "label": "priorities", + "type": "t_struct(Heap)16158_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "values", + "type": "t_mapping(t_uint256,t_array(t_userDefinedValueType(Value)16951)dyn_storage)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Schain)11459_storage": { + "label": "struct Paymaster.Schain", + "members": [ + { + "label": "hash", + "type": "t_userDefinedValueType(SchainHash)10928", + "offset": 0, + "slot": "0" + }, + { + "label": "name", + "type": "t_string_storage", + "offset": 0, + "slot": "1" + }, + { + "label": "paidUntil", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Sequence)14064_storage": { + "label": "struct SequenceLibrary.Sequence", + "members": [ + { + "label": "nodes", + "type": "t_mapping(t_userDefinedValueType(NodeId)14032,t_struct(Node)14051_storage)", + "offset": 0, + "slot": "0" + }, + { + "label": "ids", + "type": "t_struct(NodeIdDeque)17353_storage", + "offset": 0, + "slot": "1" + }, + { + "label": "freeNodeId", + "type": "t_userDefinedValueType(NodeId)14032", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(Set)7934_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_positions", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Timeline)14799_storage": { + "label": "struct TimelineLibrary.Timeline", + "members": [ + { + "label": "processedUntil", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "0" + }, + { + "label": "changesEnd", + "type": "t_userDefinedValueType(ChangeId)14745", + "offset": 0, + "slot": "1" + }, + { + "label": "futureChanges", + "type": "t_mapping(t_userDefinedValueType(ChangeId)14745,t_struct(Change)14807_storage)", + "offset": 0, + "slot": "2" + }, + { + "label": "changesQueue", + "type": "t_struct(ChangeIdPriorityQueue)17703_storage", + "offset": 0, + "slot": "3" + }, + { + "label": "valuesEnd", + "type": "t_userDefinedValueType(ValueId)14747", + "offset": 0, + "slot": "5" + }, + { + "label": "values", + "type": "t_mapping(t_userDefinedValueType(ValueId)14747,t_struct(Value)14813_storage)", + "offset": 0, + "slot": "6" + }, + { + "label": "valuesQueue", + "type": "t_struct(ValueIdDeque)17357_storage", + "offset": 0, + "slot": "7" + } + ], + "numberOfBytes": "288" + }, + "t_struct(UintSet)8406_storage": { + "label": "struct EnumerableSet.UintSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)7934_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Validator)11481_storage": { + "label": "struct Paymaster.Validator", + "members": [ + { + "label": "id", + "type": "t_userDefinedValueType(ValidatorId)10930", + "offset": 0, + "slot": "0" + }, + { + "label": "validatorAddress", + "type": "t_address", + "offset": 0, + "slot": "1" + }, + { + "label": "nodesAmount", + "type": "t_uint256", + "offset": 0, + "slot": "2" + }, + { + "label": "activeNodesAmount", + "type": "t_uint256", + "offset": 0, + "slot": "3" + }, + { + "label": "nodesHistory", + "type": "t_struct(Sequence)14064_storage", + "offset": 0, + "slot": "4" + }, + { + "label": "claimedUntil", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "8" + }, + { + "label": "firstUnpaidDebt", + "type": "t_userDefinedValueType(DebtId)11440", + "offset": 0, + "slot": "9" + }, + { + "label": "deleted", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "10" + } + ], + "numberOfBytes": "352" + }, + "t_struct(ValidatorData)11494_storage": { + "label": "struct Paymaster.ValidatorData", + "members": [ + { + "label": "validators", + "type": "t_mapping(t_userDefinedValueType(ValidatorId)10930,t_struct(Validator)11481_storage)", + "offset": 0, + "slot": "0" + }, + { + "label": "validatorIds", + "type": "t_struct(UintSet)8406_storage", + "offset": 0, + "slot": "1" + }, + { + "label": "addressToValidatorId", + "type": "t_struct(AddressToValidatorIdMap)17606_storage", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "192" + }, + "t_struct(Value)14813_storage": { + "label": "struct TimelineLibrary.Value", + "members": [ + { + "label": "timestamp", + "type": "t_userDefinedValueType(Timestamp)10332", + "offset": 0, + "slot": "0" + }, + { + "label": "value", + "type": "t_uint256", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(ValueIdDeque)17357_storage": { + "label": "struct TypedDoubleEndedQueue.ValueIdDeque", + "members": [ + { + "label": "inner", + "type": "t_struct(Bytes32Deque)6496_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_uint128": { + "label": "uint128", + "numberOfBytes": "16" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_userDefinedValueType(ChangeId)14745": { + "label": "TimelineLibrary.ChangeId", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(DebtId)11440": { + "label": "Paymaster.DebtId", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(Months)10328": { + "label": "Months", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(NodeId)14032": { + "label": "SequenceLibrary.NodeId", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(SKL)11145": { + "label": "SKL", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(SchainHash)10928": { + "label": "SchainHash", + "numberOfBytes": "32", + "underlying": "t_bytes32" + }, + "t_userDefinedValueType(Seconds)10322": { + "label": "Seconds", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(Timestamp)10332": { + "label": "Timestamp", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(USD)11256": { + "label": "USD", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(ValidatorId)10930": { + "label": "ValidatorId", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(Value)16951": { + "label": "PriorityQueueLibrary.Value", + "numberOfBytes": "32", + "underlying": "t_uint256" + }, + "t_userDefinedValueType(ValueId)14747": { + "label": "TimelineLibrary.ValueId", + "numberOfBytes": "32", + "underlying": "t_bytes32" + } + }, + "namespaces": { + "erc7201:openzeppelin.storage.AccessManaged": [ + { + "contract": "AccessManagedUpgradeable", + "label": "_authority", + "type": "t_address", + "src": "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol:24", + "offset": 0, + "slot": "0" + }, + { + "contract": "AccessManagedUpgradeable", + "label": "_consumingSchedule", + "type": "t_bool", + "src": "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol:26", + "offset": 20, + "slot": "0" + } + ], + "erc7201:openzeppelin.storage.Initializable": [ + { + "contract": "Initializable", + "label": "_initialized", + "type": "t_uint64", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69", + "offset": 0, + "slot": "0" + }, + { + "contract": "Initializable", + "label": "_initializing", + "type": "t_bool", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73", + "offset": 8, + "slot": "0" + } + ] + } + } + }, + "3d42b9c95b7c8f205dc2c2e09e483275e82d3929a6e4d497db60f8566bb6bded": { + "address": "0xB0aa3B36912f8E4E574293EBe8eFD22d30eF9Dea", + "txHash": "0x790bdf2e98d50a93427dd0a92585d11aaa125a9548a503469887ad81737be191", + "layout": { + "solcVersion": "0.8.20", + "storage": [], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_bytes4": { + "label": "bytes4", + "numberOfBytes": "4" + }, + "t_mapping(t_address,t_struct(Access)128_storage)": { + "label": "mapping(address => struct AccessManagerUpgradeable.Access)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(TargetConfig)122_storage)": { + "label": "mapping(address => struct AccessManagerUpgradeable.TargetConfig)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(Schedule)146_storage)": { + "label": "mapping(bytes32 => struct AccessManagerUpgradeable.Schedule)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes4,t_uint64)": { + "label": "mapping(bytes4 => uint64)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint64,t_struct(Role)141_storage)": { + "label": "mapping(uint64 => struct AccessManagerUpgradeable.Role)", + "numberOfBytes": "32" + }, + "t_struct(Access)128_storage": { + "label": "struct AccessManagerUpgradeable.Access", + "members": [ + { + "label": "since", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "delay", + "type": "t_userDefinedValueType(Delay)2891", + "offset": 6, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(AccessManagerStorage)179_storage": { + "label": "struct AccessManagerUpgradeable.AccessManagerStorage", + "members": [ + { + "label": "_targets", + "type": "t_mapping(t_address,t_struct(TargetConfig)122_storage)", + "offset": 0, + "slot": "0" + }, + { + "label": "_roles", + "type": "t_mapping(t_uint64,t_struct(Role)141_storage)", + "offset": 0, + "slot": "1" + }, + { + "label": "_schedules", + "type": "t_mapping(t_bytes32,t_struct(Schedule)146_storage)", + "offset": 0, + "slot": "2" + }, + { + "label": "_executionId", + "type": "t_bytes32", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(InitializableStorage)649_storage": { + "label": "struct Initializable.InitializableStorage", + "members": [ + { + "label": "_initialized", + "type": "t_uint64", + "offset": 0, + "slot": "0" + }, + { + "label": "_initializing", + "type": "t_bool", + "offset": 8, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Role)141_storage": { + "label": "struct AccessManagerUpgradeable.Role", + "members": [ + { + "label": "members", + "type": "t_mapping(t_address,t_struct(Access)128_storage)", + "offset": 0, + "slot": "0" + }, + { + "label": "admin", + "type": "t_uint64", + "offset": 0, + "slot": "1" + }, + { + "label": "guardian", + "type": "t_uint64", + "offset": 8, + "slot": "1" + }, + { + "label": "grantDelay", + "type": "t_userDefinedValueType(Delay)2891", + "offset": 16, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Schedule)146_storage": { + "label": "struct AccessManagerUpgradeable.Schedule", + "members": [ + { + "label": "timepoint", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "nonce", + "type": "t_uint32", + "offset": 6, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(TargetConfig)122_storage": { + "label": "struct AccessManagerUpgradeable.TargetConfig", + "members": [ + { + "label": "allowedRoles", + "type": "t_mapping(t_bytes4,t_uint64)", + "offset": 0, + "slot": "0" + }, + { + "label": "adminDelay", + "type": "t_userDefinedValueType(Delay)2891", + "offset": 0, + "slot": "1" + }, + { + "label": "closed", + "type": "t_bool", + "offset": 14, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint32": { + "label": "uint32", + "numberOfBytes": "4" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_userDefinedValueType(Delay)2891": { + "label": "Time.Delay", + "numberOfBytes": "14", + "underlying": "t_uint112" + }, + "t_uint112": { + "label": "uint112" + } + }, + "namespaces": { + "erc7201:openzeppelin.storage.AccessManager": [ + { + "contract": "AccessManagerUpgradeable", + "label": "_targets", + "type": "t_mapping(t_address,t_struct(TargetConfig)122_storage)", + "src": "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol:106", + "offset": 0, + "slot": "0" + }, + { + "contract": "AccessManagerUpgradeable", + "label": "_roles", + "type": "t_mapping(t_uint64,t_struct(Role)141_storage)", + "src": "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol:107", + "offset": 0, + "slot": "1" + }, + { + "contract": "AccessManagerUpgradeable", + "label": "_schedules", + "type": "t_mapping(t_bytes32,t_struct(Schedule)146_storage)", + "src": "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol:108", + "offset": 0, + "slot": "2" + }, + { + "contract": "AccessManagerUpgradeable", + "label": "_executionId", + "type": "t_bytes32", + "src": "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol:112", + "offset": 0, + "slot": "3" + } + ], + "erc7201:openzeppelin.storage.Initializable": [ + { + "contract": "Initializable", + "label": "_initialized", + "type": "t_uint64", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:69", + "offset": 0, + "slot": "0" + }, + { + "contract": "Initializable", + "label": "_initializing", + "type": "t_bool", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:73", + "offset": 8, + "slot": "0" + } + ] + } + } } } } diff --git a/cspell.json b/cspell.json index bb83896..a7c53c6 100644 --- a/cspell.json +++ b/cspell.json @@ -3,6 +3,7 @@ "language": "en", "ignorePaths": [ ".gitignore", + ".openzeppelin/**", "artifacts/**", "cache/**", "coverage/**", diff --git a/package.json b/package.json index 8431a7a..98e9311 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@openzeppelin/contracts-upgradeable": "^5.0.2", "@openzeppelin/upgrades-core": "^1.35.1", "@quant-finance/solidity-datetime": "^2.2.0", - "@skalenetwork/paymaster-interfaces": "main", + "@skalenetwork/paymaster-interfaces": "1.0.1", "@skalenetwork/skale-contracts-ethers-v6": "^1.0.2-develop.0", "@skalenetwork/upgrade-tools": "3.0.0-develop.21", "chalk": "^4", diff --git a/yarn.lock b/yarn.lock index ee64365..0583b55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1874,12 +1874,12 @@ __metadata: languageName: node linkType: hard -"@skalenetwork/paymaster-interfaces@npm:main": - version: 1.0.0-main.13 - resolution: "@skalenetwork/paymaster-interfaces@npm:1.0.0-main.13" +"@skalenetwork/paymaster-interfaces@npm:1.0.1": + version: 1.0.1 + resolution: "@skalenetwork/paymaster-interfaces@npm:1.0.1" dependencies: "@quant-finance/solidity-datetime": ^2.2.0 - checksum: bb62d0c0ac191073ab78f8a74e97cbe890bccc8864fb060d1ece37f6d62500fb9349f777b50b253b02785bfbcf84ce6830b601bf1bf28885f82600358bed46fe + checksum: ae2f854abc074fb8574b1b82347b5dd65eaf8b18fe53211feacbcaa135b2901831a8836d914d3207717cac4ecc0654553f643b59bb6e94f1121cdbd3c5575eda languageName: node linkType: hard @@ -7062,7 +7062,7 @@ __metadata: "@openzeppelin/hardhat-upgrades": ^3.2.1 "@openzeppelin/upgrades-core": ^1.35.1 "@quant-finance/solidity-datetime": ^2.2.0 - "@skalenetwork/paymaster-interfaces": main + "@skalenetwork/paymaster-interfaces": 1.0.1 "@skalenetwork/skale-contracts-ethers-v6": ^1.0.2-develop.0 "@skalenetwork/upgrade-tools": 3.0.0-develop.21 "@typechain/ethers-v6": ^0.5.1 From 38f8d161ab151089c2004df2fa9da2470920dd14 Mon Sep 17 00:00:00 2001 From: Dmytro Stebaiev Date: Thu, 31 Oct 2024 16:01:05 +0200 Subject: [PATCH 6/6] Update deployed version --- DEPLOYED | 2 +- migrations/upgrade.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPLOYED b/DEPLOYED index 296aaaa..5618a3e 100644 --- a/DEPLOYED +++ b/DEPLOYED @@ -1 +1 @@ -1.0.0-develop.7 +1.0.1-stable.0 diff --git a/migrations/upgrade.ts b/migrations/upgrade.ts index 1403416..bc7bca1 100644 --- a/migrations/upgrade.ts +++ b/migrations/upgrade.ts @@ -75,7 +75,7 @@ const main = async () => { const upgrader = new PaymasterUpgrader({ contractNamesToUpgrade: contracts, instance: paymaster, - targetVersion: "1.0.0-develop.7" + targetVersion: "1.0.1" }); await upgrader.upgrade(); }