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

chore: merge release/v1.20.0 into master #10308

Merged
merged 34 commits into from
Feb 20, 2023
Merged

chore: merge release/v1.20.0 into master #10308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6a90d32
chore: add v1.20.0-rc1 changelog (#10273)
jennijuju Feb 15, 2023
4f259d8
Revert "Standardize path variable"
arajasek Feb 15, 2023
2dd2edc
Merge pull request #10280 from filecoin-project/asr/fix-shed
magik6k Feb 15, 2023
1d0a524
feat: EthAPI: Add EthAddressToFilecoinAddress
arajasek Feb 15, 2023
3e678f2
support network name overrides in pack to build releases
snissn Feb 16, 2023
16b7d45
lintfix
snissn Feb 16, 2023
a2b996e
Merge pull request #10286 from filecoin-project/asr/eth-address-api
arajasek Feb 16, 2023
ea03e1b
only override the correct version for bundle gen
snissn Feb 16, 2023
0f6cbf1
include the version that pack is running on for filtering the build g…
snissn Feb 16, 2023
5854d72
fix: eth: correctly decode EthGetStorageAt output (#10284)
Stebalien Feb 17, 2023
b2610be
change rpc types from uint to hash to match fevm implementation
snissn Feb 17, 2023
00b6d06
feat: eth: parse revert data (#10295)
Stebalien Feb 17, 2023
ccdb447
avoid actor not found
jennijuju Feb 17, 2023
f2648ad
fix import
jennijuju Feb 17, 2023
59db4ee
fix gen
jennijuju Feb 17, 2023
d589443
feat: EthApiTest: Confirm EthAddressToFilecoinAddress works without E…
arajasek Feb 17, 2023
2d3065a
chore: all: bump go-libipfs to replace go-block-format
Jorropo Jan 26, 2023
7a4205a
chore: node: migrate go-bitswap to go-libipfs/bitswap
Jorropo Jan 27, 2023
198217d
chore: all: bump go-libipfs to v0.4.1
Jorropo Feb 17, 2023
dbcf304
clean up comment remove print
snissn Feb 17, 2023
30615a4
feat: eth: return revert data on failed gas estimation (#10298)
Stebalien Feb 17, 2023
a3bc65b
fix: eth: return the correct nonce from EthGetTransactionCount
Stebalien Feb 17, 2023
4dedced
lintfix
snissn Feb 17, 2023
f41435d
feat: bundle: only write git tags for newly packed bundles
arajasek Feb 17, 2023
49cd428
nit: put evm case in a block
Stebalien Feb 17, 2023
6c0f4cb
nit: actually, don't use blocks
Stebalien Feb 17, 2023
7a35a73
Merge pull request #10294 from filecoin-project/mikers/buildReleaseOv…
arajasek Feb 17, 2023
258df76
Merge pull request #10305 from filecoin-project/asr/bump-go-libipfs-f…
arajasek Feb 17, 2023
efcdec6
Merge pull request #10300 from filecoin-project/steb/fix-eth-nonce
arajasek Feb 17, 2023
1050061
Merge pull request #10297 from filecoin-project/mikers/itests/flakyRP…
arajasek Feb 17, 2023
e17d4f1
Merge pull request #10299 from filecoin-project/jen/disappearedcode
arajasek Feb 17, 2023
bad41c2
fix: eth: cleanup error cases
Stebalien Feb 17, 2023
e3e78f1
Merge pull request #10306 from filecoin-project/steb/error-cleanup
arajasek Feb 17, 2023
984b4c7
Merge branch 'release/v1.20.0' into asr/merge-release-into-master
arajasek Feb 17, 2023
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
Prev Previous commit
Next Next commit
chore: node: migrate go-bitswap to go-libipfs/bitswap 
This was migrated in ipfs/boxo#63.

(cherry picked from commit d060df2)
  • Loading branch information
@Jorropo
Jorropo committed Feb 17, 2023
commit 7a4205ac36d4a4c963377f059f25b0dd8fa92402
5 changes: 2 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ require (
github.com/icza/backscanner v0.0.0-20210726202459-ac2ffc679f94
github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab
github.com/ipfs/bbloom v0.0.4
github.com/ipfs/go-bitswap v0.10.2
github.com/ipfs/go-blockservice v0.4.0
github.com/ipfs/go-cid v0.3.2
github.com/ipfs/go-cidutil v0.1.0
Expand All @@ -95,11 +94,11 @@ require (
github.com/ipfs/go-ipfs-exchange-offline v0.3.0
github.com/ipfs/go-ipfs-files v0.1.1
github.com/ipfs/go-ipfs-http-client v0.4.0
github.com/ipfs/go-ipfs-routing v0.2.1
github.com/ipfs/go-ipfs-routing v0.3.0
github.com/ipfs/go-ipfs-util v0.0.2
github.com/ipfs/go-ipld-cbor v0.0.6
github.com/ipfs/go-ipld-format v0.4.0
github.com/ipfs/go-libipfs v0.3.0
github.com/ipfs/go-libipfs v0.4.0
github.com/ipfs/go-log/v2 v2.5.1
github.com/ipfs/go-merkledag v0.8.1
github.com/ipfs/go-metrics-interface v0.0.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,6 @@ github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiL
github.com/ipfs/go-bitswap v0.5.1/go.mod h1:P+ckC87ri1xFLvk74NlXdP0Kj9RmWAh4+H78sC6Qopo=
github.com/ipfs/go-bitswap v0.6.0/go.mod h1:Hj3ZXdOC5wBJvENtdqsixmzzRukqd8EHLxZLZc3mzRA=
github.com/ipfs/go-bitswap v0.10.2 h1:B81RIwkTnIvSYT1ZCzxjYTeF0Ek88xa9r1AMpTfk+9Q=
github.com/ipfs/go-bitswap v0.10.2/go.mod h1:+fZEvycxviZ7c+5KlKwTzLm0M28g2ukCPqiuLfJk4KA=
github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
Expand Down Expand Up @@ -798,8 +797,9 @@ github.com/ipfs/go-ipfs-pq v0.0.2 h1:e1vOOW6MuOwG2lqxcLA+wEn93i/9laCY8sXAw76jFOY
github.com/ipfs/go-ipfs-pq v0.0.2/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY=
github.com/ipfs/go-ipfs-routing v0.2.1 h1:E+whHWhJkdN9YeoHZNj5itzc+OR292AJ2uE9FFiW0BY=
github.com/ipfs/go-ipfs-routing v0.2.1/go.mod h1:xiNNiwgjmLqPS1cimvAw6EyB9rkVDbiocA4yY+wRNLM=
github.com/ipfs/go-ipfs-routing v0.3.0 h1:9W/W3N+g+y4ZDeffSgqhgo7BsBSJwPMcyssET9OWevc=
github.com/ipfs/go-ipfs-routing v0.3.0/go.mod h1:dKqtTFIql7e1zYsEuWLyuOU+E0WJWW8JjbTPLParDWo=
github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
Expand All @@ -821,8 +821,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
github.com/ipfs/go-libipfs v0.3.0 h1:YvzFWGcl88eiz2tjOheNqaeQseH+dW3fUKrSaHOG/dU=
github.com/ipfs/go-libipfs v0.3.0/go.mod h1:pSUHZ5qPJTAidsxe9bAeHp3KIiw2ODEW2a2kM3v+iXI=
github.com/ipfs/go-libipfs v0.4.0 h1:TkUxJGjtPnSzAgkw7VjS0/DBay3MPjmTBa4dGdUQCDE=
github.com/ipfs/go-libipfs v0.4.0/go.mod h1:XsU2cP9jBhDrXoJDe0WxikB8XcVmD3k2MEZvB3dbYu8=
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
github.com/ipfs/go-log v1.0.0/go.mod h1:JO7RzlMK6rA+CIxFMLOuB6Wf5b81GDiKElL7UPSIKjA=
github.com/ipfs/go-log v1.0.1/go.mod h1:HuWlQttfN6FWNHRhlY5yMk/lW7evQC0HHGOxEwMRR8I=
Expand Down
4 changes: 2 additions & 2 deletions node/modules/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

"github.com/ipfs/go-bitswap"
"github.com/ipfs/go-bitswap/network"
"github.com/ipfs/go-blockservice"
"github.com/ipfs/go-libipfs/bitswap"
"github.com/ipfs/go-libipfs/bitswap/network"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/routing"
"go.uber.org/fx"
Expand Down