Skip to content

Commit

Permalink
Merge pull request #50 from JackalLabs/marston/ipfs-fix
Browse files Browse the repository at this point in the history
fixing ipfs domains
  • Loading branch information
TheMarstonConnell authored Jun 27, 2024
2 parents 74294dd + 884baf0 commit 3028a38
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion file_system/file_system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func TestWriteFileWithDomain(t *testing.T) {

err = db.DropAll()
require.NoError(t, err)
f := NewFileSystem(context.Background(), db, 4005, "/dns4/ipfs.marston.dev/tcp/4001")
f := NewFileSystem(context.Background(), db, 4005, "dns4/jackal-testnet-v4-storage.p2p.brocha.in/tcp/30506")
defer db.Close()

data, err := hex.DecodeString("303030303030383597631df147918b77139b132d44798cef96879280a4b1e1309f699875c6bf57798d17bbbbe75273ba4343da20d25bbca6729ccf9b1456d0b25a08f9616a7bf414de0e15ed29f0a74378789bc7510a7d1f76348aadd93030303030383032976304f845b5c40413ec580e446491ee9bd7c780e4f2e52cb774995dcd9f10278d5ea5c5b00c2eac37039b7a844fa4a82780d9a4061a99dd1d06e130696afd07dd0e59ec275af66319a71dd53dd89f3bd6381aef3262b1bab5f8115522dbbe67411c87e827fd93d220c9d5bc60f0d55ba12df0ee3ff46ee63ecb1edf540c2aedf9c3fcf42c0310e5f7a5e69df89a0e7961e371c9f1499ccc520e283513b1e5eace184dde615078996ea67d0566b102b6f72baa9c9c76a4cc920d667f82cb55aab33c593538d636a8f1c59aa609f50eb6c20bb52c5885a7cb15cb8a3ada30a53f45ba2a3ad5c321114ffdcb8974eca8f56af3d70956af556165659b9427e078015a4fc55d6ed50a00b3aba89cd00dfdd360b5a82f631eab1be3b7c1d7eceb312733c4b21baa6640e8e5ef683a569625d8f6815858bd24a5e39f2c716862ad3cb77503e131d015f5cb615deb1974b787f85f78e85e14c92b7c8ee217a1cc997ebbb0ed3690d57a01a796692d32bb2c3c6f80af3fb104b1b506e52f94826ed6faed82df260710bb9971d1368724a7fa48c394be60d7435080dc76981c789e458a42dce0f6fe29f4e956768e0eddfff6f512a1a2e64689f82132094249df464c5286014b1835ace7b83dddea38e65e55f818ebc53d929ed38fc0997afb145c036bb1fdc7f1a2813840c69ddc1dc284d18e25b3c9b22619f0a97bcf1f36864ff0ed551e7a7249001b1f909a45b132e6de3585537240dd25941de1e4b66065626f0a2297b5c4328e6b672004e4f16aa4d742bb5b7548c4cc6756d7f2bc0de8df4fe1a21921233dd76785eb319db7bc567f2dbce5be42fdbe853edbdcf36dfbc0996874e096ea4954e4b5afb9751b0bf055778863231b4eb7a0f0839190e26db5cdd2c10f5841edc4cc85b6edf328909886d18b75e4e06210e1020fbb73b51bafdef5cd9a1bd70f52388b00a2bb555bc5e6a06bc88eeb35094a2851f3460305a83b893be857a5452b0728dae28dcd09e8e25a714cf014b557107e911fa16fa1dc6c36e4b1399cd96eca0685dc3746fa19ede15f9c0a14c5b00500b95fba05b8cb29d9c5ee6d2e164ac430e9fe56e59e10681a6f2a647c7ddf0f30ae1308035282c615c8368e")
Expand Down
10 changes: 8 additions & 2 deletions ipfs/ipfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,14 @@ func MakeIPFS(ctx context.Context, db *badger.DB, port int, customDomain string)
m := []multiaddr.Multiaddr{listen}

if !strings.Contains(customDomain, "example.com") && len(customDomain) > 2 {
domainListener, _ := multiaddr.NewMultiaddr(customDomain)
m = []multiaddr.Multiaddr{listen, domainListener}
if !strings.HasPrefix(customDomain, "/") {
customDomain = fmt.Sprintf("/%s", customDomain)
}
domainListener, err := multiaddr.NewMultiaddr(customDomain)
if err != nil {
return nil, err
}
m = append(m, domainListener)
}

h, dht, err := ipfslite.SetupLibp2p(
Expand Down

0 comments on commit 3028a38

Please sign in to comment.