Skip to content

Commit

Permalink
feat: fee model updates + 1.4.1 stage upgrade (#897)
Browse files Browse the repository at this point in the history
## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.

---------

Co-authored-by: Stanislav Breadless <stanislavbezkor@gmail.com>
Co-authored-by: perekopskiy <53865202+perekopskiy@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 26, 2024
1 parent 860f6f1 commit fa48c13
Show file tree
Hide file tree
Showing 9 changed files with 659 additions and 6 deletions.
5 changes: 5 additions & 0 deletions etc/upgrades/1705556759-fee-model-and-1.4.1/common.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "fee-model-and-1.4.1",
"creationTimestamp": 1705556759,
"protocolVersion": "20"
}
11 changes: 11 additions & 0 deletions etc/upgrades/1705556759-fee-model-and-1.4.1/stage2/crypto.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"verifier": {
"address": "0x3390051435eCB25a9610A1cF17d1BA0a228A0560",
"txHash": "0x2c3b8915e8ebc617cc13e462df334f4197d48b19b302538a519f55acbda285cb"
},
"keys": {
"recursionNodeLevelVkHash": "0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080",
"recursionLeafLevelVkHash": "0x062362cb3eaf1f631406cbe19bf2a2c5d0d9ea69d069309a6003addae9f387be",
"recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
}
165 changes: 165 additions & 0 deletions etc/upgrades/1705556759-fee-model-and-1.4.1/stage2/facetCuts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
[
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0x0e18b681",
"0xe58bb639",
"0xa9f6d941",
"0x27ae4c16",
"0x4dd18bf5",
"0xf235757f",
"0x1cc5d103",
"0xbe6f11cf",
"0x4623c91d",
"0x17338945"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0xcdffacc6",
"0x52ef6b2c",
"0xadfca15e",
"0x7a0ed627",
"0x79823c9a",
"0x4fc07d75",
"0xd86970d8",
"0xfd791f3c",
"0xe5355c75",
"0x9d1b5a81",
"0x7b30c8da",
"0x8665b150",
"0x631f4bac",
"0x0ec6b0b7",
"0x33ce93fe",
"0xdb1f0bf9",
"0xb8c2f66f",
"0xef3f0bae",
"0xfe26699e",
"0x39607382",
"0xaf6a2dcd",
"0xa1954fc5",
"0x46657fe9",
"0x18e3a941",
"0x29b98c67",
"0xbd7c5412",
"0xc3bbd2d7",
"0xe81e0ba1",
"0xfacd743b",
"0x9cd939e4",
"0x56142d7a",
"0xb22dd78e",
"0x74f4d30d"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0x6c0960f9",
"0xb473318e",
"0x042901c7",
"0x263b7f8e",
"0xe4948f43",
"0xeb672419"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0x701f58c5",
"0xc3d93e7c",
"0x7f61885c",
"0x97c09d34"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0xE6426c725cB507168369c10284390E59d91eC821",
"selectors": [
"0x0e18b681",
"0xe58bb639",
"0x64bf8d66",
"0xa9f6d941",
"0x27ae4c16",
"0x4dd18bf5",
"0xf235757f",
"0x1cc5d103",
"0xbe6f11cf",
"0x4623c91d",
"0x17338945"
],
"action": 0,
"isFreezable": false
},
{
"facet": "0xc4a5e861df9DD9495f8Dba1c260913d1A9b8Ec2B",
"selectors": [
"0xcdffacc6",
"0x52ef6b2c",
"0xadfca15e",
"0x7a0ed627",
"0x79823c9a",
"0x4fc07d75",
"0xd86970d8",
"0xfd791f3c",
"0xe5355c75",
"0x9d1b5a81",
"0x7b30c8da",
"0x8665b150",
"0x631f4bac",
"0x0ec6b0b7",
"0x33ce93fe",
"0xdb1f0bf9",
"0xb8c2f66f",
"0xef3f0bae",
"0xfe26699e",
"0x39607382",
"0xaf6a2dcd",
"0xa1954fc5",
"0x46657fe9",
"0x18e3a941",
"0x29b98c67",
"0xbd7c5412",
"0xc3bbd2d7",
"0xe81e0ba1",
"0xfacd743b",
"0x9cd939e4",
"0x56142d7a",
"0xb22dd78e",
"0x74f4d30d"
],
"action": 0,
"isFreezable": false
},
{
"facet": "0x0f58Fd6c9Ed966e09C1dFFBc8E6FF600ec65f6eB",
"selectors": [
"0x6c0960f9",
"0xb473318e",
"0x042901c7",
"0x263b7f8e",
"0xe4948f43",
"0xeb672419"
],
"action": 0,
"isFreezable": true
},
{
"facet": "0x5b86821c1B4B55deF404c9551EC2d2Cc0aE70f5C",
"selectors": [
"0x701f58c5",
"0xc3d93e7c",
"0x7f61885c",
"0x97c09d34"
],
"action": 0,
"isFreezable": true
}
]
18 changes: 18 additions & 0 deletions etc/upgrades/1705556759-fee-model-and-1.4.1/stage2/facets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"ExecutorFacet": {
"address": "0x5b86821c1B4B55deF404c9551EC2d2Cc0aE70f5C",
"txHash": "0x27598585a0471d1d95358bb93ade96fc4729d4531b08daf47f6d09e1fa3a82a2"
},
"AdminFacet": {
"address": "0xE6426c725cB507168369c10284390E59d91eC821",
"txHash": "0x016a39f72fdd7245ebfbc07581823756d11b0638c27f32b1bc07794928b0abbb"
},
"GettersFacet": {
"address": "0xc4a5e861df9DD9495f8Dba1c260913d1A9b8Ec2B",
"txHash": "0xbfa6c2995d7cc5c4502a3966f6c6c133dd5b45b15bd117acf2ca8413639da671"
},
"MailboxFacet": {
"address": "0x0f58Fd6c9Ed966e09C1dFFBc8E6FF600ec65f6eB",
"txHash": "0xce16a8f2d210ee4b57159ca3f2a760af0c249234193fcf983a5a3050b29c8a5d"
}
}
Loading

0 comments on commit fa48c13

Please sign in to comment.