Skip to content
This repository has been archived by the owner on Nov 29, 2023. It is now read-only.

fix: fvm_ipld_encoding, forest_db, and ethers dependencies #448

Merged
merged 4 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ bytes = "1.3.0"
clap = { version = "4.0.29", features = ["derive"] }
console-subscriber = "0.1.8"
ctrlc = "3.2.4"
db = { package = "forest_db", git = "https://github.com/ChainSafe/forest", features = ["rocksdb"] }
db = { package = "forest_db", git = "https://github.com/ChainSafe/forest", rev = "3e682310482718182cb2495fbaec5e575e5884e5", features = ["rocksdb"] }
dirs = "4"
dotenv = "0.15.0"
ethers = { git = "https://github.com/gakonst/ethers-rs" }
ethers = "1.0.2"
integer-encoding = "3.0.4"
ipld_traversal = { git = "https://github.com/kckeiks/rs-graphsync.git", rev = "b8728c7ad02aa42cc11954192e95875f14fc6380" }
fastmurmur3 = "0.1.2"
Expand All @@ -49,7 +49,7 @@ futures = "0.3.25"
futures-util = "0.3.25"
fvm_ipld_blockstore = "0.1"
fvm_ipld_car = "0.6"
fvm_ipld_encoding = "=0.3.2"
fvm_ipld_encoding = "0.3.3"
geoutils = "0.5"
graphsync = { git = "https://github.com/kckeiks/rs-graphsync.git", rev = "b8728c7ad02aa42cc11954192e95875f14fc6380" }
hyper = { version = "0.14.23", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/ursa-application/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ toml.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
tracing-error.workspace = true
ethers.workspace = true

abci-rs = { version = "0.11.3", features = ["async-api"] }
ethers = { git = "https://github.com/gakonst/ethers-rs" }
revm = { version = "3.0.0", features = [
"serde",
] }
Expand Down
3 changes: 3 additions & 0 deletions crates/ursa-index-provider/src/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use axum::{
response::{IntoResponse, Response},
};
use fvm_ipld_blockstore::Blockstore;
#[allow(deprecated)]
ozwaldorf marked this conversation as resolved.
Show resolved Hide resolved
use fvm_ipld_encoding::Cbor;
use libipld::{codec::Encode, multihash::Code, Cid};
use libipld_cbor::DagCborCodec;
Expand Down Expand Up @@ -183,6 +184,7 @@ where
};

info!("Announcing the advertisement with the message {message:?}");
#[allow(deprecated)]
Ok(message.marshal_cbor().unwrap())
} else {
Err(anyhow!("No head found for announcement!"))
Expand All @@ -198,6 +200,7 @@ pub struct Message {
pub ExtraData: [u8; 0],
}

#[allow(deprecated)]
impl Cbor for Message {
fn marshal_cbor(&self) -> Result<Vec<u8>, fvm_ipld_encoding::Error> {
const MESSAGE_BUFFER_LENGTH: [u8; 1] = [131];
Expand Down