From d7f8654b996fb866cf3f1e7969cd928467689230 Mon Sep 17 00:00:00 2001 From: tanlang Date: Fri, 14 Apr 2023 01:10:48 +0000 Subject: [PATCH 1/8] chore: update ffi --- extern/filecoin-ffi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index 1bc8bf8b..cec06a79 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit 1bc8bf8b482b2ef34cbce17bfc3a7ec68c047461 +Subproject commit cec06a79dc858f221f6542cff264b92b4f99c25d From cb2218311d9b832a19e53c965f51d825f788af60 Mon Sep 17 00:00:00 2001 From: tanlang Date: Fri, 14 Apr 2023 01:19:14 +0000 Subject: [PATCH 2/8] chore: improve makefile --- Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 99565bd9..ff184648 100644 --- a/Makefile +++ b/Makefile @@ -68,11 +68,19 @@ build: $(BUILD_DEPS) TAG:=test docker: $(BUILD_DEPS) - curl -O https://raw.githubusercontent.com/filecoin-project/venus-docs/master/script/docker/dockerfile - docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus-market -t venus-market . +ifdef PRIVATE_REGISTRY docker tag venus-market $(PRIVATE_REGISTRY)/filvenus/venus-market:$(TAG) - docker build --build-arg https_proxy=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=market-client -t market-client . docker tag market-client $(PRIVATE_REGISTRY)/filvenus/market-client:$(TAG) +endif + +ifdef DOCKERFILE + docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus-market -t venus-market -f $(DOCKERFILE) . + docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=market-client -t market-client -f $(DOCKERFILE) . +else + curl -O https://raw.githubusercontent.com/filecoin-project/venus-docs/master/script/docker/dockerfile + docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus-market -t venus-market . + docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=market-client -t market-client . +endif docker-push: docker docker push $(PRIVATE_REGISTRY)/filvenus/venus-market:$(TAG) From 3b7cf65a807d737ce0571f37cd13f447e3e91fea Mon Sep 17 00:00:00 2001 From: tanlang Date: Fri, 14 Apr 2023 02:02:54 +0000 Subject: [PATCH 3/8] chore: update venus --- go.mod | 4 ++-- go.sum | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index e59a3946..23cb3069 100644 --- a/go.mod +++ b/go.mod @@ -25,12 +25,12 @@ require ( github.com/filecoin-project/go-fil-markets v1.25.2 github.com/filecoin-project/go-jsonrpc v0.1.5 github.com/filecoin-project/go-padreader v0.0.1 - github.com/filecoin-project/go-state-types v0.10.0 + github.com/filecoin-project/go-state-types v0.11.0-rc1 github.com/filecoin-project/go-statemachine v1.0.2 github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/specs-actors/v2 v2.3.6 github.com/filecoin-project/specs-actors/v7 v7.0.1 - github.com/filecoin-project/venus v1.10.2-0.20230411091426-99fd1cec96ea + github.com/filecoin-project/venus v1.10.2-0.20230413064815-35fd02c85ce5 github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e github.com/filecoin-project/venus-messager v1.10.2-0.20230309071456-7cd8d49c6e9a github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 2bbffe68..56cca348 100644 --- a/go.sum +++ b/go.sum @@ -418,10 +418,9 @@ github.com/filecoin-project/go-state-types v0.1.1-0.20210810190654-139e0e79e69e/ github.com/filecoin-project/go-state-types v0.1.1/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.3/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= -github.com/filecoin-project/go-state-types v0.1.8/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= -github.com/filecoin-project/go-state-types v0.10.0 h1:vsSThZIaPmOxNGG59+8D/HnlWRtlbdOjduH6ye+v8f0= -github.com/filecoin-project/go-state-types v0.10.0/go.mod h1:aLIas+W8BWAfpLWEPUOGMPBdhcVwoCG4pIQSQk26024= +github.com/filecoin-project/go-state-types v0.11.0-rc1 h1:UvifFHZ+S/jbshCjRHgAUuZ1qAEyeItsNywh2tsSpY4= +github.com/filecoin-project/go-state-types v0.11.0-rc1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statemachine v1.0.1/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= @@ -468,8 +467,8 @@ github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893 github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893/go.mod h1:S7590oDimBvXMUtzWsBXoshu9HtYKwtXl47zAK9rcP8= github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E= github.com/filecoin-project/venus v1.2.4/go.mod h1:hJULXHGAnWuq5S5KRtPkwbT8DqgM9II7NwyNU7t59D0= -github.com/filecoin-project/venus v1.10.2-0.20230411091426-99fd1cec96ea h1:gp2B2xxGyM6G5FiYfcDL3vQyWtKeETOVm0afCZe5O68= -github.com/filecoin-project/venus v1.10.2-0.20230411091426-99fd1cec96ea/go.mod h1:eCV4+qsHdDg7FXB8xLn5w/ay+Uu5pG3oAlPsB1nb6qU= +github.com/filecoin-project/venus v1.10.2-0.20230413064815-35fd02c85ce5 h1:uH8y19VeXlZZrsQqkCxPFgoW455AOn8qAf8ouOZpj0A= +github.com/filecoin-project/venus v1.10.2-0.20230413064815-35fd02c85ce5/go.mod h1:MoRYoK+jQT2mRghN/br+RMf78hy+f8VYPtjFcHZg66k= github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU= github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e h1:Bxpt1AzPeNxmUnFT2Y8rpabr9x0wIC0Q87DeRmjL2co= github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs= @@ -680,6 +679,7 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -1106,6 +1106,7 @@ github.com/ipld/go-ipld-prime v0.14.3-0.20211207234443-319145880958/go.mod h1:Qc github.com/ipld/go-ipld-prime v0.14.4/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0= github.com/ipld/go-ipld-prime v0.16.0/go.mod h1:axSCuOCBPqrH+gvXr2w9uAOulJqBPhHPT2PjoiiU1qA= github.com/ipld/go-ipld-prime v0.17.0/go.mod h1:aYcKm5TIvGfY8P3QBKz/2gKcLxzJ1zDaD+o0bOowhgs= +github.com/ipld/go-ipld-prime v0.19.0/go.mod h1:Q9j3BaVXwaA3o5JUDNvptDDr/x8+F7FG6XJ8WI3ILg4= github.com/ipld/go-ipld-prime v0.20.0 h1:Ud3VwE9ClxpO2LkCYP7vWPc0Fo+dYdYzgxUJZ3uRG4g= github.com/ipld/go-ipld-prime v0.20.0/go.mod h1:PzqZ/ZR981eKbgdr3y2DJYeD/8bgMawdGVlJDE8kK+M= github.com/ipld/go-ipld-prime-proto v0.0.0-20191113031812-e32bd156a1e5/go.mod h1:gcvzoEDBjwycpXt3LBE061wT9f46szXGHAmj9uoP6fU= @@ -1797,6 +1798,7 @@ github.com/multiformats/go-multicodec v0.3.1-0.20211210143421-a526f306ed2c/go.mo github.com/multiformats/go-multicodec v0.4.0/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ= github.com/multiformats/go-multicodec v0.4.1/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ= github.com/multiformats/go-multicodec v0.5.0/go.mod h1:DiY2HFaEp5EhEXb/iYzVAunmyX/aSFMxq2KMKfWEues= +github.com/multiformats/go-multicodec v0.6.0/go.mod h1:GUC8upxSBE4oG+q3kWZRw/+6yC1BqO550bjhWsJbZlw= github.com/multiformats/go-multicodec v0.8.0 h1:evBmgkbSQux+Ds2IgfhkO38Dl2GDtRW8/Rp6YiSHX/Q= github.com/multiformats/go-multicodec v0.8.0/go.mod h1:GUC8upxSBE4oG+q3kWZRw/+6yC1BqO550bjhWsJbZlw= github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U= @@ -2399,6 +2401,7 @@ golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2534,6 +2537,7 @@ golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2713,12 +2717,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2730,6 +2736,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 811e011432d462a5f02e6d8b9a5a4ea6e113165d Mon Sep 17 00:00:00 2001 From: tanlang Date: Mon, 17 Apr 2023 03:30:09 +0000 Subject: [PATCH 4/8] feat: build docker from custom dockerfile --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ff184648..cf1ef3ad 100644 --- a/Makefile +++ b/Makefile @@ -68,20 +68,22 @@ build: $(BUILD_DEPS) TAG:=test docker: $(BUILD_DEPS) -ifdef PRIVATE_REGISTRY - docker tag venus-market $(PRIVATE_REGISTRY)/filvenus/venus-market:$(TAG) - docker tag market-client $(PRIVATE_REGISTRY)/filvenus/market-client:$(TAG) -endif - ifdef DOCKERFILE - docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus-market -t venus-market -f $(DOCKERFILE) . - docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=market-client -t market-client -f $(DOCKERFILE) . + cp $(DOCKERFILE) . else curl -O https://raw.githubusercontent.com/filecoin-project/venus-docs/master/script/docker/dockerfile +endif docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=venus-market -t venus-market . docker build --build-arg HTTPS_PROXY=$(BUILD_DOCKER_PROXY) --build-arg BUILD_TARGET=market-client -t market-client . + docker tag venus-market filvenus/venus-market:$(TAG) + docker tag market-client filvenus/market-client:$(TAG) +ifdef PRIVATE_REGISTRY + docker tag venus-market $(PRIVATE_REGISTRY)/filvenus/venus-market:$(TAG) + docker tag market-client $(PRIVATE_REGISTRY)/filvenus/market-client:$(TAG) endif + + docker-push: docker docker push $(PRIVATE_REGISTRY)/filvenus/venus-market:$(TAG) docker push $(PRIVATE_REGISTRY)/filvenus/market-client:$(TAG) From c1244326e720cf99d689867c5c1e5cd6574de88e Mon Sep 17 00:00:00 2001 From: tanlang Date: Tue, 18 Apr 2023 15:07:17 +0800 Subject: [PATCH 5/8] chore: bump up version --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index fac3d983..d1ea6e06 100644 --- a/version/version.go +++ b/version/version.go @@ -3,7 +3,7 @@ package version var ( CurrentCommit string - Version = "v2.6.0" + Version = "v2.7.0-rc1" ) func UserVersion() string { From 7e851402daeddbe048d7ab4ef342e402d47ee178 Mon Sep 17 00:00:00 2001 From: tanlang Date: Tue, 18 Apr 2023 15:36:26 +0800 Subject: [PATCH 6/8] chore: update change log --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eade1d25..fc670776 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # venus-market changelog +## v2.7.0 + +### New Features + +* feat: add status api to detect api ready by @hunjixin /添加状态检测接口 [[#282](https://github.com/filecoin-project/venus-market/pull/282)] +* feat: Add miner manager related commands @diwufeiwen /增加 miner manager 相关命令 [[#293](https://github.com/filecoin-project/venus-market/pull/293)] +* feat: add command to print signer deal detail by @simlecode /增加两个命令行用于输出单个存储订单和检索的详情 [[#298](https://github.com/filecoin-project/venus-market/pull/298)] +* feat: unsealed from sp through venus-gateway / 通过venus-gateway给SP下发unsealed请求 by @diwufeiwen [[#267](https://github.com/filecoin-project/venus-market/pull/267)] +* feat: opt deal list cmds by @simlecode / 订单查询优化 [[#301](https://github.com/filecoin-project/venus-market/pull/301)] +* feat: new api ReleaseDeals by @0x5459 /新增 ReleaseDeals 接口 [[#305](https://github.com/filecoin-project/venus-market/pull/305)] +* feat: add command to cancel data transfer by @simlecode / 根据条件取消检索订单 [[#307](https://github.com/filecoin-project/venus-market/pull/307)] +* feat: more time for query retrieval ask by @hunjixin /querytimeout从5秒改成5分钟[[#304](https://github.com/filecoin-project/venus-market/pull/304)] +* feat: destroy shards by @simlecode /添加DagstoreDestroyShard命令 [[#309](https://github.com/filecoin-project/venus-market/pull/309)] +* feat: update unseal api / 更新 unseal 的接口 by @LinZexiao [[#314](https://github.com/filecoin-project/venus-market/pull/314)] +* feat: add docker push by @hunjixin /增加推送到镜像仓库的功能 [[#316](https://github.com/filecoin-project/venus-market/pull/316)] +* feat: add command to expend claim term by @simlecode /添加续期命令 [[#315](https://github.com/filecoin-project/venus-market/pull/315)] + + +### Bug Fixes +* fix: add composite indexes by @simlecode / 添加联合索引 [[#294](https://github.com/filecoin-project/venus-market/pull/294)] +* fix: check deal state in ReleaseDeals by @0x5459 / ReleaseDeals 方法需要判断订单状态 [[#308](https://github.com/filecoin-project/venus-market/pull/308)] +* fix: add check for miner config by @simlecode / 未找到矿工配置时返回错误 [[#311](https://github.com/filecoin-project/venus-market/pull/311)] +* fix: Circular search for deals by @simlecode / 循环检索订单 [[#310](https://github.com/filecoin-project/venus-market/pull/310)] +* fix: PaymentAddress uses a fake address when retrieval data does not exist by @simlecode / 当检索数据不存在时，paymentaddress用个假地址 [[#312](https://github.com/filecoin-project/venus-market/pull/312)] + ## v2.6.0 * 增加列出 storage/retrieval asks 命令行 [[#272](https://github.com/filecoin-project/venus-market/pull/272)] From d8f22c5e09a05e1b0e27eaebf7c801a8968f9577 Mon Sep 17 00:00:00 2001 From: tanlang Date: Tue, 18 Apr 2023 16:37:28 +0800 Subject: [PATCH 7/8] chore: update go mod --- go.mod | 10 +++++----- go.sum | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 23cb3069..3a728f89 100644 --- a/go.mod +++ b/go.mod @@ -25,14 +25,14 @@ require ( github.com/filecoin-project/go-fil-markets v1.25.2 github.com/filecoin-project/go-jsonrpc v0.1.5 github.com/filecoin-project/go-padreader v0.0.1 - github.com/filecoin-project/go-state-types v0.11.0-rc1 + github.com/filecoin-project/go-state-types v0.11.0-rc2 github.com/filecoin-project/go-statemachine v1.0.2 github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/specs-actors/v2 v2.3.6 github.com/filecoin-project/specs-actors/v7 v7.0.1 - github.com/filecoin-project/venus v1.10.2-0.20230413064815-35fd02c85ce5 - github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e - github.com/filecoin-project/venus-messager v1.10.2-0.20230309071456-7cd8d49c6e9a + github.com/filecoin-project/venus v1.11.0-rc1 + github.com/filecoin-project/venus-auth v1.11.0-rc1 + github.com/filecoin-project/venus-messager v1.11.0-rc1 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 @@ -40,7 +40,7 @@ require ( github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef github.com/ipfs-force-community/metrics v1.0.1-0.20220824061112-ac916bacf2ea github.com/ipfs-force-community/venus-common-utils v0.0.0-20220217030526-e5e4c6bc14f7 - github.com/ipfs-force-community/venus-gateway v1.10.2-0.20230331030234-365136f176ef + github.com/ipfs-force-community/venus-gateway v1.11.0-rc1 github.com/ipfs/go-blockservice v0.5.0 github.com/ipfs/go-cid v0.3.2 github.com/ipfs/go-cidutil v0.1.0 diff --git a/go.sum b/go.sum index 56cca348..fd7882e4 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,9 @@ github.com/filecoin-project/go-state-types v0.1.1/go.mod h1:ezYnPf0bNkTsDibL/psS github.com/filecoin-project/go-state-types v0.1.3/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= -github.com/filecoin-project/go-state-types v0.11.0-rc1 h1:UvifFHZ+S/jbshCjRHgAUuZ1qAEyeItsNywh2tsSpY4= github.com/filecoin-project/go-state-types v0.11.0-rc1/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= +github.com/filecoin-project/go-state-types v0.11.0-rc2 h1:zUx7aRxEGn56n4A1RS2J8FZzpzAozEMsqF11aXjtmkc= +github.com/filecoin-project/go-state-types v0.11.0-rc2/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statemachine v1.0.1/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= github.com/filecoin-project/go-statemachine v1.0.2-0.20220322104818-27f8fbb86dfd/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= @@ -467,13 +468,13 @@ github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893 github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893/go.mod h1:S7590oDimBvXMUtzWsBXoshu9HtYKwtXl47zAK9rcP8= github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E= github.com/filecoin-project/venus v1.2.4/go.mod h1:hJULXHGAnWuq5S5KRtPkwbT8DqgM9II7NwyNU7t59D0= -github.com/filecoin-project/venus v1.10.2-0.20230413064815-35fd02c85ce5 h1:uH8y19VeXlZZrsQqkCxPFgoW455AOn8qAf8ouOZpj0A= -github.com/filecoin-project/venus v1.10.2-0.20230413064815-35fd02c85ce5/go.mod h1:MoRYoK+jQT2mRghN/br+RMf78hy+f8VYPtjFcHZg66k= +github.com/filecoin-project/venus v1.11.0-rc1 h1:qJmvXFJGhf6Rdke4FCkXI3+bWYw89aH0U0svO7oOo+I= +github.com/filecoin-project/venus v1.11.0-rc1/go.mod h1:g0C7MZJgZLpL4ZIv6TiPLXUXtDOrYsF6A/xMAbO3RxE= github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU= -github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e h1:Bxpt1AzPeNxmUnFT2Y8rpabr9x0wIC0Q87DeRmjL2co= -github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs= -github.com/filecoin-project/venus-messager v1.10.2-0.20230309071456-7cd8d49c6e9a h1:Rkn/ZF/sNCbApNYbSim1AbAeLV27Mgg2OD3tNN3vPdc= -github.com/filecoin-project/venus-messager v1.10.2-0.20230309071456-7cd8d49c6e9a/go.mod h1:JpzTem+6FeK8LHWCIC5a1RWusMQoe/b8z2/ZivlOKNs= +github.com/filecoin-project/venus-auth v1.11.0-rc1 h1:dV8F4xXMokmW1DKfK/F3KFysX19YuDDmS6fXPpCSnOI= +github.com/filecoin-project/venus-auth v1.11.0-rc1/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs= +github.com/filecoin-project/venus-messager v1.11.0-rc1 h1:blJYScuru35n0ljkp7Xu4/PYzQOqkgyH4gA1OI8BiBk= +github.com/filecoin-project/venus-messager v1.11.0-rc1/go.mod h1:HNzH5REsFfmcWVAhm0C5fwnsShFsQ2/v4Om3AkvGE6w= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= @@ -834,8 +835,8 @@ github.com/ipfs-force-community/metrics v1.0.1-0.20220824061112-ac916bacf2ea/go. github.com/ipfs-force-community/venus-common-utils v0.0.0-20210924063144-1d3a5b30de87/go.mod h1:RTVEOzM+hkpqmcEWpyLDkx1oGO5r9ZWCgYxG/CsXzJQ= github.com/ipfs-force-community/venus-common-utils v0.0.0-20220217030526-e5e4c6bc14f7 h1:v/1/INcqm3kHLauWQYB63MwWJRWGz+3WEuUPp0jzIl8= github.com/ipfs-force-community/venus-common-utils v0.0.0-20220217030526-e5e4c6bc14f7/go.mod h1:sSTUXgIu95tPHvgcYhdLuELmgPJWCP/pNMFtsrVtOyA= -github.com/ipfs-force-community/venus-gateway v1.10.2-0.20230331030234-365136f176ef h1:hDvFmxoriRcJS6YJxm04ME1Hjuv3eedoUxnuX/cWLPA= -github.com/ipfs-force-community/venus-gateway v1.10.2-0.20230331030234-365136f176ef/go.mod h1:s9bSNvoFlOWH99ofrSPMn9+vcSEQZG7Cq1hiaPFA11M= +github.com/ipfs-force-community/venus-gateway v1.11.0-rc1 h1:KxdCoN5uIe7B5rTNI4nSi7gQMJ4Zdm5Hx+3KW6WQBls= +github.com/ipfs-force-community/venus-gateway v1.11.0-rc1/go.mod h1:+5QqzahkTKuJN3sklyhExyn0mukpdPMnqVDK2kccSDw= github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI= github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0= From ecbaf377a477631542bbfd09662a0be1dc9dd3e5 Mon Sep 17 00:00:00 2001 From: tanlang Date: Tue, 18 Apr 2023 16:46:26 +0800 Subject: [PATCH 8/8] fix: correct version in change log --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc670776..83368d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # venus-market changelog -## v2.7.0 +## v2.7.0-rc1 ### New Features