-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Upgrade to Polkadot v1.6.0 #569
Conversation
…partially), stellar-relay-lib
8dd4977
to
b027527
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think for some dependencies there is now a mismatch of how the default-features were configured.
f61e104
to
8875c79
Compare
586ba8b
to
d3b5817
Compare
6db2462
to
c32f9ca
Compare
b936acb
to
b6184bf
Compare
09d24bd
to
85eeabf
Compare
85eeabf
to
000118d
Compare
"https://stellar-history-de-fra.satoshipay.io", | ||
"https://stellar-history-sg-sin.satoshipay.io", | ||
"https://stellar-history-us-iowa.satoshipay.io" | ||
"https://hercules-history.publicnode.org" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you change this due to the 'overloaded' issue or for a different reason? If so, you'd rather need to change the address
field in connection_info
to the host
you can also find in Stellarbeat. If not, I'll leave this comment as a reminder that we should change it back eventually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, although the only one used to reduce uncertainty is the "other" config. It seems to be okay for our main test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Back to original configs now.
@@ -202,8 +202,6 @@ pub struct TransactionResponse { | |||
#[serde(deserialize_with = "de_str_to_bytes")] | |||
pub result_xdr: Vec<u8>, | |||
#[serde(deserialize_with = "de_str_to_bytes")] | |||
pub result_meta_xdr: Vec<u8>, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Deprecated field (see here).
@@ -529,10 +529,15 @@ impl Asset { | |||
#[allow(clippy::unnecessary_cast)] | |||
pub enum CurrencyId { | |||
#[default] | |||
#[serde(rename = "Native")] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This changes may be significant. The particular reason I added these (and removed the camelCase
renaming above), is now due to the following panic:
Client(Storage("Invalid JSON blob: unknown variant `xCM`, expected one of `Native`, `XCM`, `Stellar`, `ZenlinkLPToken`, `Token` at line 1 column 2105"))
which appears when running the chain binary.
This comes from the changes in how the chain spec is defined now (first serialized in a json format).
I believe this error was also an issue for some extrinsics. @pendulum-chain/devs do you know if this renaming could impact some downstream services?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also remember that error you are referring to. I think changing it the way you did makes sense.
This could break some polkadot.js types as at least the XCM type seems to be sometimes referred to as Xcm
see here. Elsewhere it's used as XCM
though, see here, so maybe it's not a big deal. We'll see but can easily fix the problem by upgrading the types in pendulum.js.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. Why did the pendulum types worked as Xcm
and not xCM
is a mystery then. But this serialization is only relevant when compiled with std
. In any case, let's hope is not a big deal.
serde_json = "1.0.85" | ||
futures = "0.3.15" | ||
tokio = { version = "1.37", features = ["full", "tracing"] } | ||
clap = { version = "4.5.3", features = [ "derive" ] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Node requires a higher version of clap
compared to that used in the workspace.
@pendulum-chain/devs the CI may get stuck on the integration tests sometimes (with integration tests never ending, unknown reason. Example), yet locally I was able to run successfully all of them. I believe this does not have to do with the update itself. |
70beae6
to
8e7f637
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. I left only very minor comments.
testchain/node/Cargo.toml
Outdated
futures = "0.3.15" | ||
tokio = { version = "1.37", features = ["full", "tracing"] } | ||
clap = { version = "4.5.3", features = [ "derive" ] } | ||
codec = { workspace = true, default-features = true, version = "3.0.0" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How come we define workspace = true but still define a custom version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was not correct. Seems that it was ignored anyway.
zepter.yaml
Outdated
# Will be displayed when any workflow fails: | ||
help: | ||
text: | | ||
Polkadot-SDK uses the Zepter CLI to detect abnormalities in the feature configuration. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: we could change this message. Doesn't matter much.
@@ -5,9 +5,9 @@ authors = ["Interlay <[email protected]>"] | |||
edition = "2021" | |||
|
|||
[dependencies] | |||
codec = { package = "parity-scale-codec", version = "3.0.0" } | |||
codec = { workspace = true, default-features = true } | |||
jsonrpsee = { version = "0.16.0", features = ["client", "server", "macros"] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this custom version or would it also work with the one in workspace?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We probably don't "need" that version, but upgrading it involves making changes to each module's rpc code that we didn't have much time to go through.
|
||
substrate-stellar-sdk = { git = "https://github.com/pendulum-chain/substrate-stellar-sdk", branch = "polkadot-v1.1.0" } | ||
substrate-stellar-sdk = { workspace = true, default-features = true } | ||
|
||
# RPC dependencies | ||
jsonrpc-core = "18.0.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would the workspace dependencies not work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me try. It could be that I or zepter missed them for some reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar to this, or in fact the same. It will require more changes to the node.
Let's keep the branch for now, until we fully change every dependency to point to main. |
Closes #567.
Main changes
polkadot-sdk
dependencies to1.6.0
.chain_spec
due to deprecatedChainSpec::from_genesis(.....)
method.