Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix: join context with proxy #955

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −5
Open

fix: join context with proxy #955

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a859301
fix: proxy contract selection
MatejVukosav Nov 8, 2024
77b33e0
fix: join context with proxy
MatejVukosav Nov 8, 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
17 changes: 12 additions & 5 deletions crates/context/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,10 @@ impl ContextManager {

let context_exists = handle.has(&ContextMetaKey::new(context_id))?;
let mut config = if !context_exists {
let proxy_contract = self.get_proxy_contract(context_id).await?;
let proxy_contract = self
.get_proxy_contract(context_id)
.await
.unwrap_or_else(|_| "".to_owned());
Comment on lines +357 to +360
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if there's an error, we should handle it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Error is that it does not exists.

Copy link
Member

@miraclx miraclx Nov 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it doesn't exist, then there's a deeper issue, the config contract didn't record the context, and if that's the case, we shouldn't be here at all (context creation should've failed).

Perhaps we need to tweak near tx submission to await cross contract calls, so we can appropriately determine if the whole chain succeeded.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It exists on owner side but it does not exists for invited peer

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It exists on owner side but it does not exists for invited peer

get_proxy_contract calls the contract, and it would only return that error if the context doesn't exist on the config contract

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It exists on owner side but it does not exists for invited peer

interesting that there's an invitation payload to begin with, add_member should've failed as well if the context doesn't exist.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Invited peer joined context but catchup failed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the error?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in description

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't explain why ignoring the error is the solution

the propose method wasn't found because it was calling the wrong contract, which this PR fixes

but this line, you said was because the context didn't exist, in which case, we shouldn't be ignoring the error but figuring out why that's the case.

but if the error no longer happens, then we don't need this line, and any errors that occur here should be handled.

Some(ContextConfigParams {
protocol: protocol.into(),
network_id: network_id.into(),
Expand Down Expand Up @@ -1083,9 +1086,13 @@ impl ContextManager {
.mutate::<ContextProxy>(
context_config.protocol.as_ref().into(),
context_config.network.as_ref().into(),
context_config.contract.as_ref().into(),
context_config.proxy_contract.as_ref().into(),
)
.propose(
proposal_id,
signer_id.rt().expect("infallible conversion"),
actions,
)
.propose(proposal_id, signer_id.rt().unwrap(), actions)
.send(signing_key)
.await?;

Expand Down Expand Up @@ -1116,9 +1123,9 @@ impl ContextManager {
.mutate::<ContextProxy>(
context_config.protocol.as_ref().into(),
context_config.network.as_ref().into(),
context_config.contract.as_ref().into(),
context_config.proxy_contract.as_ref().into(),
)
.approve(signer_id.rt().unwrap(), proposal_id)
.approve(signer_id.rt().expect("infallible conversion"), proposal_id)
.send(signing_key)
.await?;

Expand Down
Loading