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: market #301

Draft
wants to merge 45 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
e2e0411
feat: Implement Boost equivalent deal market in Curio (#135)
LexLuthr Sep 17, 2024
dbec7a0
Merge branch 'main' into feat/market
LexLuthr Sep 17, 2024
839e185
feat: index provider (#182)
LexLuthr Sep 17, 2024
4c80e37
feat: create http server (#194)
LexLuthr Sep 20, 2024
799e5e9
feat: retrievals (#208)
LexLuthr Sep 24, 2024
6f4a3ad
feat: Simpler IPNI (#206)
magik6k Sep 25, 2024
486a5b6
remove offline from legacy
LexLuthr Sep 26, 2024
8272e64
add ddo table (#214)
LexLuthr Sep 26, 2024
369569d
fix: ipni issues (#215)
LexLuthr Sep 30, 2024
75ee9ee
Merge branch 'main' into feat/market
LexLuthr Sep 30, 2024
59c53e4
psd wallet, move funds to escrow command
LexLuthr Sep 30, 2024
dcff819
fix: Set cuda library path correctly (#226)
magik6k Sep 30, 2024
782bc20
fix: DealPublishControl address usage (#225)
LexLuthr Sep 30, 2024
201069c
fix: remove MarketAddBalance (#233)
LexLuthr Oct 1, 2024
b9d1c93
fix ipni task column name (#248)
LexLuthr Oct 4, 2024
b4cb763
cleanup import-data remanent
LexLuthr Oct 4, 2024
244a92f
fix do not create ad if not indexed (#265)
LexLuthr Oct 9, 2024
9a4ce29
fix: libp2p migration and generation (#254)
LexLuthr Oct 10, 2024
1d03bf7
market: Backport fixes from the PDP branch (#275)
magik6k Oct 14, 2024
9647b1d
Merge remote-tracking branch 'origin/main' into feat/market
magik6k Oct 14, 2024
684d591
fix market circleci (#278)
LexLuthr Oct 14, 2024
6017897
fix: ipni: Correctly handle URL formats (#277)
magik6k Oct 15, 2024
d97e21d
Market LibP2P improvements (#280)
magik6k Oct 16, 2024
6297fc2
Make market deals work (#289)
magik6k Oct 18, 2024
dd3ecf1
controlled indexing after migration (#288)
LexLuthr Oct 18, 2024
59ed960
feat: deal list page, deal detail page (#290)
LexLuthr Oct 21, 2024
60f72cf
feat: ipni ui (#293)
LexLuthr Oct 22, 2024
3ae919c
Merge remote-tracking branch 'origin/main' into feat/market
magik6k Oct 23, 2024
0f7d9d1
fix migration indexing job sql function (#299)
LexLuthr Oct 24, 2024
17bb627
Add MoveEscrow to UI (#308)
LexLuthr Oct 30, 2024
f776a57
fix deal label storage in DB (#310)
LexLuthr Oct 30, 2024
7b1678f
add piece info page (#309)
LexLuthr Oct 30, 2024
c6aa8a2
add back pressure to mk12 deals (#307)
LexLuthr Oct 31, 2024
6677875
Merge branch 'main' into feat/market
LexLuthr Oct 31, 2024
c9c84eb
fix go mod
LexLuthr Oct 31, 2024
90857d7
fix: rearrange pieces in sector for no padding (#306)
LexLuthr Nov 2, 2024
f4aa135
feat: deal filters (#314)
LexLuthr Nov 4, 2024
3cb363a
piece summary (#315)
LexLuthr Nov 5, 2024
14597e1
remove test page link
LexLuthr Nov 5, 2024
fb97ecd
minor fixes (#318)
LexLuthr Nov 6, 2024
c55bf0d
Merge branch 'main' into feat/market
LexLuthr Nov 6, 2024
990d2ea
fix indexing loop (#320)
LexLuthr Nov 6, 2024
f7afb13
fix IPNI insert
LexLuthr Nov 6, 2024
f715c11
Merge remote-tracking branch 'origin/main' into feat/market
magik6k Nov 17, 2024
4fd7c38
mod tidy
magik6k Nov 17, 2024
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
11 changes: 9 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ jobs:
- run: git submodule update --init
- install-ubuntu-deps
- run: go install golang.org/x/tools/cmd/goimports
- run: go install github.com/hannahhoward/cbor-gen-for
- run: make deps gen
- run: git --no-pager diff && git --no-pager diff --quiet

Expand Down Expand Up @@ -315,8 +316,8 @@ workflows:
resource_class: 2xlarge
- test:
name: test-all
target: "`go list ./... | grep -v curio/itests | grep -v market/indexstore`"
suite: test-all
target: "`go list ./... | grep -v curio/itests`"
resource_class: 2xlarge
- test:
name: test-itest-harmonyDB
Expand All @@ -327,4 +328,10 @@ workflows:
name: test-itest-alertnow
suite: test-itest-alertnow
target: "./itests/alertnow_test.go"
resource_class: 2xlarge
resource_class: 2xlarge
- test:
name: test-idxStore
suite: test-idxStore
target: "./market/indexstore"
get-params: true
resource_class: 2xlarge
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,14 @@ build/.update-modules:

# end git modules

## CUDA Library Path
CUDA_PATH := $(shell dirname $$(dirname $$(which nvcc)))
CUDA_LIB_PATH := $(CUDA_PATH)/lib64
LIBRARY_PATH ?= $(CUDA_LIB_PATH)
export LIBRARY_PATH
# CUDA Library Path
# Conditional execution block for Linux
OS := $(shell uname)
ifeq ($(OS), Linux)
$(eval CUDA_PATH := $(shell dirname $$(dirname $$(which nvcc))))
$(eval CUDA_LIB_PATH := $(CUDA_PATH)/lib64)
export LIBRARY_PATH := $(LIBRARY_PATH):$(CUDA_LIB_PATH)
endif

## MAIN BINARIES

Expand Down Expand Up @@ -103,7 +106,7 @@ ifeq ($(shell uname),Linux)

batchdep: build/.supraseal-install
batchdep: $(BUILD_DEPS)
,PHONY: batchdep
.PHONY: batchdep

batch: CURIO_TAGS+= supraseal
batch: CGO_LDFLAGS_ALLOW='.*'
Expand Down
2 changes: 2 additions & 0 deletions api/api_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ type CurioChainRPC interface {
StateVerifiedClientStatus(context.Context, address.Address, types.TipSetKey) (*abi.StoragePower, error)
StateMinerSectorCount(context.Context, address.Address, types.TipSetKey) (api.MinerSectors, error)
StateCirculatingSupply(context.Context, types.TipSetKey) (big.Int, error)
StateCall(context.Context, *types.Message, types.TipSetKey) (*api.InvocResult, error)
MarketAddBalance(ctx context.Context, wallet, addr address.Address, amt types.BigInt) (cid.Cid, error)
}

var _ CurioChainRPC = api.FullNode(nil)
26 changes: 26 additions & 0 deletions api/proxy_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions build/openrpc/curio.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L311"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L317"
}
},
{
Expand Down Expand Up @@ -348,7 +348,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L322"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L328"
}
},
{
Expand Down Expand Up @@ -402,7 +402,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L333"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L339"
}
},
{
Expand All @@ -425,7 +425,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L344"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L350"
}
},
{
Expand Down Expand Up @@ -464,7 +464,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L355"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L361"
}
},
{
Expand Down Expand Up @@ -503,7 +503,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L366"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L372"
}
},
{
Expand Down Expand Up @@ -697,7 +697,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L377"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L383"
}
},
{
Expand Down Expand Up @@ -829,7 +829,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L388"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L394"
}
},
{
Expand Down Expand Up @@ -963,7 +963,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L399"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L405"
}
},
{
Expand Down Expand Up @@ -1017,7 +1017,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L410"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L416"
}
},
{
Expand Down Expand Up @@ -1051,7 +1051,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L421"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L427"
}
},
{
Expand Down Expand Up @@ -1128,7 +1128,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L432"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L438"
}
},
{
Expand Down Expand Up @@ -1166,7 +1166,7 @@
"deprecated": false,
"externalDocs": {
"description": "Github remote link",
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L443"
"url": "https://github.com/filecoin-project/curio/blob/master/api/proxy_gen.go#L449"
}
}
]
Expand Down
Loading