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.

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

feat: Über Migration (and Boxo rename) #220

Merged
merged 4,206 commits into from
Mar 27, 2023
Merged

feat: Über Migration (and Boxo rename) #220

merged 4,206 commits into from
Mar 27, 2023

Conversation

Jorropo
Copy link
Contributor

@Jorropo Jorropo commented Mar 22, 2023

feat: Über Migration (and Boxo rename)

Include rename from:
github.com/ipfs/go-libipfs => github.com/ipfs/boxo

This migration was reverted:
./blocks => github.com/ipfs/go-block-format

Migrated repos:

  • github.com/ipfs/interface-go-ipfs-core => ./coreiface
  • github.com/ipfs/go-pinning-service-http-client => ./pinning/remote/client
  • github.com/ipfs/go-path => ./path
  • github.com/ipfs/go-namesys => ./namesys
  • github.com/ipfs/go-mfs => ./mfs
  • github.com/ipfs/go-ipfs-provider => ./provider
  • github.com/ipfs/go-ipfs-pinner => ./pinning/pinner
  • github.com/ipfs/go-ipfs-keystore => ./keystore
  • github.com/ipfs/go-filestore => ./filestore
  • github.com/ipfs/go-ipns => ./ipns
  • github.com/ipfs/go-blockservice => ./blockservice
  • github.com/ipfs/go-ipfs-chunker => ./chunker
  • github.com/ipfs/go-fetcher => ./fetcher
  • github.com/ipfs/go-ipfs-blockstore => ./blockstore
  • github.com/ipfs/go-ipfs-posinfo => ./filestore/posinfo
  • github.com/ipfs/go-ipfs-util => ./util
  • github.com/ipfs/go-ipfs-ds-help => ./datastore/dshelp
  • github.com/ipfs/go-verifcid => ./verifcid
  • github.com/ipfs/go-ipfs-exchange-offline => ./exchange/offline
  • github.com/ipfs/go-ipfs-routing => ./routing
  • github.com/ipfs/go-ipfs-exchange-interface => ./exchange
  • github.com/ipfs/go-unixfs => ./ipld/unixfs
  • github.com/ipfs/go-merkledag => ./ipld/merkledag
  • github.com/ipld/go-car => ./ipld/car

Fixes #215
Updates #202

whyrusleeping and others added 30 commits October 21, 2021 10:16
…sion

add a fetcher constructor for the case where we already have a session

This commit was moved from ipfs/go-fetcher@204874a
This reverts commit b7dfe90.


This commit was moved from ipfs/go-path@bda72a4
* creation of car from file / directory

Co-authored-by: Daniel Martí <mvdan@mvdan.cc>
Co-authored-by: Rod Vagg <rod@vagg.org>

This commit was moved from ipld/go-car@9bd7416
* support extraction of unixfs content stored in car files


This commit was moved from ipld/go-car@6d94b7b
* Renamed UpgradeableDirectory to DynamicDirectory to indicate that we can switch between Basic and HAMT Directories
* Transition between HAMT directory and Basic Directory based on the global sharding threshold
* Unexported BasicDirectory.SwitchToSharding as an unnecessary exposure point until requested
* NewDirectoryFromNode always returns a DynamicDirectory instead of an UpgradeableDirectory or HAMTDirectory

* Added Swap and Take functions to HAMT Shards
* Fix for the size estimation logic where we were not tracking that replacing an entry with a differently sized CID could trigger switching between being a Basic or HAMT directory
* Use custom parallel DAG traversal to the EnumLinksAsync for HAMTs that is closer to DFS than BFS

* Added lots of comments to the HAMT code
* Exported LogTwo function to make it more accessible within the package

Co-authored-by: Lucas Molas <schomatis@gmail.com>
Co-authored-by: Adin Schmahmann <adin.schmahmann@gmail.com>

This commit was moved from ipfs/go-unixfs@bd53b6a
…ies (#88)

* feat: update go-unixfs and use built in automatic sharding and unsharding
* chore: update deps

Co-authored-by: Adin Schmahmann <adin.schmahmann@gmail.com>
Co-authored-by: Gus Eggert <gus@gus.dev>

This commit was moved from ipfs/go-mfs@e61420f
…-staticcheck

Fix go vet and staticcheck

This commit was moved from ipfs/go-ipfs-provider@49b7fe2
The blockstore reads the version of the given CAR payload to determine
whether to generate an index for the given payload or not. When the
payload represents a CARv1 and no index is specified, the backing reader
is passed on for index generation. But the version is already read from
the stream. Seek to the beginning of the backing reader before
generating the index so that the index generation mechanism receives the
complete CARv1.

Fixes #265


This commit was moved from ipld/go-car@fa995b9
This is so that v0 and v1 have identical interfaces, which is required
to avoid massive pain for consumers like estuary. Since we have
already plumbed v0 all the way through, it's easiest to just remove
the probably-unnecessary context from HashOnRead.


This commit was moved from ipfs/go-ipfs-blockstore@fbe708e
Add a writing/creation API in the car v2 package. Allows creation of file and streaming car files in a selector order.

This commit was moved from ipld/go-car@c35591a
@codecov
Copy link

codecov bot commented Mar 23, 2023

Codecov Report

Merging #220 (038bdd2) into main (b3c7bf1) will increase coverage by 18.08%.
The diff coverage is 28.96%.

Impacted file tree graph

@@             Coverage Diff             @@
##             main     #220       +/-   ##
===========================================
+ Coverage   30.09%   48.18%   +18.08%     
===========================================
  Files         101      267      +166     
  Lines       11319    32583    +21264     
===========================================
+ Hits         3407    15699    +12292     
- Misses       7545    15224     +7679     
- Partials      367     1660     +1293     
Impacted Files Coverage Δ
bitswap/bitswap.go 37.20% <ø> (+37.20%) ⬆️
bitswap/client/client.go 82.21% <ø> (+82.21%) ⬆️
bitswap/client/internal/getter/getter.go 64.10% <ø> (+64.10%) ⬆️
...tswap/client/internal/messagequeue/messagequeue.go 65.74% <ø> (+65.74%) ⬆️
...wap/client/internal/notifications/notifications.go 72.15% <ø> (+72.15%) ⬆️
bitswap/client/internal/session/session.go 82.18% <ø> (+82.18%) ⬆️
...tswap/client/internal/session/sessionwantsender.go 80.94% <ø> (+80.94%) ⬆️
...l/sessioninterestmanager/sessioninterestmanager.go 82.01% <ø> (+82.01%) ⬆️
...p/client/internal/sessionmanager/sessionmanager.go 90.62% <ø> (+90.62%) ⬆️
bitswap/client/wantlist/wantlist.go 69.86% <ø> (+69.86%) ⬆️
... and 124 more

... and 89 files with indirect coverage changes

@guseggert
Copy link
Contributor

This needs to be tested on Kubo and Lotus before merging right?

@Jorropo
Copy link
Contributor Author

Jorropo commented Mar 23, 2023

@guseggert this is being tested in Kubo.
I've looked at lotus it should be fine after the fact given we can build go-ipld-prime already without even trying (it will require some manual inteligence to put the cut point).

@BigLep
Copy link
Contributor

BigLep commented Mar 23, 2023

Per verbal maintainer conversation on 2023-03-23, this will be vetted on Lotus as well before merge.

@Jorropo Jorropo force-pushed the uber-migration branch 2 times, most recently from 5a2677f to a4f8611 Compare March 24, 2023 16:36
@guseggert
Copy link
Contributor

Let me know when this is ready for another review. We need to see what it looks like for Kubo and Lotus to upgrade, so bubbling latest changes up to the Kubo PR, and opening a PR w/ Lotus (or in a forked repo) seems like a prereq.

@Jorropo
Copy link
Contributor Author

Jorropo commented Mar 25, 2023

This works in Lotus and Kubo (CI failures are flaky tests and docs gen), builds and non broken tests:

Imo this is RFM @guseggert

Include rename from:
  github.com/ipfs/go-libipfs => github.com/ipfs/boxo

This migration was reverted:
  ./blocks => github.com/ipfs/go-block-format

Migrated repos:
- github.com/ipfs/interface-go-ipfs-core         => ./coreiface
- github.com/ipfs/go-pinning-service-http-client => ./pinning/remote/client
- github.com/ipfs/go-path                        => ./path
- github.com/ipfs/go-namesys                     => ./namesys
- github.com/ipfs/go-mfs                         => ./mfs
- github.com/ipfs/go-ipfs-provider               => ./provider
- github.com/ipfs/go-ipfs-pinner                 => ./pinning/pinner
- github.com/ipfs/go-ipfs-keystore               => ./keystore
- github.com/ipfs/go-filestore                   => ./filestore
- github.com/ipfs/go-ipns                        => ./ipns
- github.com/ipfs/go-blockservice                => ./blockservice
- github.com/ipfs/go-ipfs-chunker                => ./chunker
- github.com/ipfs/go-fetcher                     => ./fetcher
- github.com/ipfs/go-ipfs-blockstore             => ./blockstore
- github.com/ipfs/go-ipfs-posinfo                => ./filestore/posinfo
- github.com/ipfs/go-ipfs-util                   => ./util
- github.com/ipfs/go-ipfs-ds-help                => ./datastore/dshelp
- github.com/ipfs/go-verifcid                    => ./verifcid
- github.com/ipfs/go-ipfs-exchange-offline       => ./exchange/offline
- github.com/ipfs/go-ipfs-routing                => ./routing
- github.com/ipfs/go-ipfs-exchange-interface     => ./exchange
- github.com/ipfs/go-unixfs                      => ./ipld/unixfs
- github.com/ipfs/go-merkledag                   => ./ipld/merkledag
- github.com/ipld/go-car                         => ./ipld/car

Fixes #215
Updates #202
@guseggert
Copy link
Contributor

guseggert commented Mar 27, 2023

Removed cmd/car because it was forcing a newer version of urfave/cli/v2 which was causing Lotus tests to fail (just some diff tests on CLI output, because that newer version included --help in each command output...not a big deal but nice to avoid if we can). We can add it back later if we want and either downgrade the lib in boxo or make it a separate module so that the lib is not included in the main boxo module.

@guseggert
Copy link
Contributor

guseggert commented Mar 27, 2023

I spot-checked w/ ipfs-lite (required for ipfs-cluster) and tests fail with a runtime error in go-libp2p-kad-dht due to go-libp2p-kad-dht not being updated yet, the error is from this line: https://github.com/libp2p/go-libp2p-kad-dht/blob/3f53669165720238fdd7a5bb71d60966c0785ef7/internal/config/config.go#L158

So we should probably merge libp2p/go-libp2p-kad-dht#832 first and release it. I think it's already covered by the migration tool because the issue occurs when go-ipns is in your dependency graph which is already covered by the check-dependencies command of the migration tool:

$ ~/git/boxo/cmd/migrate/migrate check-dependencies
You still have dependencies on repos which have migrated to go-libipfs.
You should consider not having these dependencies to avoid multiple versions of the same code.
You can use 'go mod why' or 'go mod graph' to find the reason for these dependencies.

Dependent module versions:

github.com/ipfs/go-unixfs v0.4.5
github.com/ipfs/go-ipns v0.3.0
github.com/ipfs/go-ipfs-chunker v0.0.5
github.com/ipfs/go-ipfs-blockstore v1.3.0
github.com/ipfs/go-ipfs-util v0.0.2
github.com/ipfs/go-ipfs-ds-help v1.1.0

go mod why answers this question directly:

$ go mod why github.com/ipfs/go-ipns
# github.com/ipfs/go-ipns
github.com/hsanjuan/ipfs-lite
github.com/libp2p/go-libp2p-kad-dht
github.com/libp2p/go-libp2p-kad-dht/internal/config
github.com/ipfs/go-ipns

@guseggert
Copy link
Contributor

Okay I worked through ipfs-cluster and it builds and CI passes for it too, we're going to need to update github.com/libp2p/go-libp2p-kad-dht and github.com/ipfs/go-ds-crdt in order to unblock ipfs-cluster, so we'll do that after the boxo release.

@Jorropo Jorropo merged commit 143876a into main Mar 27, 2023
@Jorropo Jorropo deleted the uber-migration branch March 27, 2023 20:08
@BigLep BigLep mentioned this pull request Mar 27, 2023
10 tasks
@hsanjuan
Copy link
Contributor

Thank you @guseggert , I really appreciate that you worried about ipfs-cluster in advance ❤️ Send me the PRs, or just let me know when we can upgrade.

@Kubuxu
Copy link
Member

Kubuxu commented Jun 6, 2023

@Jorropo Kudos to you for preserving the history of migrated repos! Thank you!

@Jorropo
Copy link
Contributor Author

Jorropo commented Jun 6, 2023

@Kubuxu ❤️ you can thx @guseggert too.
My first plan was to do a dumb-ish git merge --allow-unrelated-histories and gus made a git-filter-branch based python tool which add links and do the tree filtering.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Rename go-libipfs to boxo