Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: use proxy bin with storage slots in a namespace #6429

Merged
merged 3 commits into from
Aug 19, 2024
Merged

fix: use proxy bin with storage slots in a namespace #6429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8688866
fix: use proxy bin with storage slots in a namespace
kayagokalp Aug 16, 2024
bb35025
update proxy contract address
kayagokalp Aug 16, 2024
3ac6d41
Merge branch 'master' into kayagokalp/move-namespaced-storage
kayagokalp Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions forc-plugins/forc-client/proxy_abi/proxy_contract-abi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
{
"name": "doc-comment",
"arguments": [
" * When `storage.proxy_owner` is not [State::Uninitialized]."
" * When `storage::SRC14.proxy_owner` is not [State::Uninitialized]."
]
},
{
Expand Down Expand Up @@ -713,12 +713,12 @@
{
"name": "INITIAL_TARGET",
"concreteTypeId": "0d79387ad3bacdc3b7aad9da3a96f4ce60d9a1b6002df254069ad95a3931d5c8",
"offset": 13272
"offset": 13616
},
{
"name": "INITIAL_OWNER",
"concreteTypeId": "192bc7098e2fe60635a9918afb563e4e5419d386da2bdbf0d716b4bc8549802c",
"offset": 13224
"offset": 13568
}
]
}
6 changes: 3 additions & 3 deletions forc-plugins/forc-client/proxy_abi/proxy_contract-storage_slots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[
{
"key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe7",
"key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3e",
"value": "0000000000000000000000000000000000000000000000000000000000000000"
},
{
"key": "72fc5f2af3af1d5912212382d8323bd34e899429c427791cee5428ab6d77afe8",
"key": "35fa5b7532d53cf687e13e3db014eaf208c5b8c534ab693dd7090d5e02675f3f",
"value": "0000000000000000000000000000000000000000000000000000000000000000"
},
{
Expand All @@ -15,4 +15,4 @@
"key": "7bb458adc1d118713319a5baa00a2d049dd64d2916477d2688d76970c898cd56",
"value": "0000000000000000000000000000000000000000000000000000000000000000"
}
]
]
Binary file modified forc-plugins/forc-client/proxy_abi/proxy_contract.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion forc-plugins/forc-client/tests/deploy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ async fn test_deploy_fresh_proxy() {
.unwrap(),
proxy: Some(
ContractId::from_str(
"ca196e29217545f6e676d93bbd03219aef6ee4adf96ce960b5005a67aa04fb5d",
"f2d67efbd6038c85ddaffdcdc859770d8bd20eeec8e3909911f1446b2ec9f764",
)
.unwrap(),
),
Expand Down
Loading