fixes (#576)

Signed-off-by: turuslan <[email protected]>

Author: turuslan

core/api/full_node/make.cpp

@@ -1032,7 +1032,32 @@ namespace fc::api {
     };
     // TODO(artyom-yurin): FIL-165 implement method
     api->StateSectorPartition =
-        std::function<decltype(api->StateSectorPartition)::FunctionSignature>{};
+        [=](const Address &address,
+            SectorNumber sector,
+            const TipsetKey &tsk) -> outcome::result<SectorLocation> {
+      OUTCOME_TRY(context, tipsetContext(tsk, false));
+      OUTCOME_TRY(state, context.minerState(address));
+      OUTCOME_TRY(deadlines, state->deadlines.get());
+      uint64_t i_deadline{0};
+      for (const auto &_deadline : deadlines.due) {
+        boost::optional<SectorLocation> result;
+        OUTCOME_TRY(deadline, _deadline.get());
+        const auto visit{
+            [&](auto i_partition, auto &partition) -> outcome::result<void> {
+              if (partition->sectors.has(sector)) {
+                result = SectorLocation{i_deadline, i_partition};
+                return outcome::failure(adt::kStopError);
+              }
+              return outcome::success();
+            }};
+        CATCH_STOP(deadline->partitions.visit(visit));
+        if (result) {
+          return *result;
+        }
+        ++i_deadline;
+      }
+      return ERROR_TEXT("StateSectorPartition: not found");
+    };
 
     api->StateVerifiedClientStatus = [=](const Address &address,
                                          const TipsetKey &tipset_key)

core/api/rpc/ws.cpp

@@ -163,7 +163,14 @@ namespace fc::api {
         return std::nullopt;
       }
 
-      return static_cast<std::string>(auth_token.substr(perfix.size()));
+      return std::string{auth_token.substr(perfix.size())};
+    }
+    const std::string_view url{request.target().data(),
+                               request.target().size()};
+    constexpr std::string_view kParam{"?token="};
+    const auto pos{url.find(kParam)};
+    if (pos != url.npos) {
+      return std::string{url.substr(pos + kParam.size())};
     }
     return std::string();
   }

core/vm/actor/builtin/types/miner/sector_info.hpp

@@ -31,6 +31,8 @@ namespace fc::vm::actor::builtin::types::miner {
     TokenAmount init_pledge{};
     TokenAmount expected_day_reward{};
     TokenAmount expected_storage_pledge{};
+    ChainEpoch replaced_sector_age{};
+    TokenAmount replaced_day_reward;
     boost::optional<CID> sector_key_cid;
 
     inline bool operator==(const SectorOnChainInfo &other) const {
@@ -43,6 +45,8 @@ namespace fc::vm::actor::builtin::types::miner {
              && init_pledge == other.init_pledge
              && expected_day_reward == other.expected_day_reward
              && expected_storage_pledge == other.expected_storage_pledge
+             && replaced_sector_age == other.replaced_sector_age
+             && replaced_day_reward == other.replaced_day_reward
              && sector_key_cid == other.sector_key_cid;
     }
 

core/vm/actor/builtin/types/miner/v7/sector_info.hpp

@@ -22,6 +22,8 @@ namespace fc::vm::actor::builtin::v7::miner {
              init_pledge,
              expected_day_reward,
              expected_storage_pledge,
+             replaced_sector_age,
+             replaced_day_reward,
              sector_key_cid)
 
 }  // namespace fc::vm::actor::builtin::v7::miner

core/vm/actor/cgo/actors.cpp

@@ -39,6 +39,7 @@ namespace fc::vm::actor::cgo {
   using primitives::piece::PieceInfo;
   using primitives::sector::AggregateSealVerifyProofAndInfos;
   using primitives::sector::RegisteredSealProof;
+  using primitives::sector::ReplicaUpdateInfo;
   using primitives::sector::SealVerifyInfo;
   using primitives::sector::WindowPoStVerifyInfo;
   using toolchain::Toolchain;
@@ -230,6 +231,15 @@ namespace fc::vm::actor::cgo {
     }
   }
 
+  RUNTIME_METHOD(gocRtVerifyReplicaUpdate) {
+    const auto info{arg.get<ReplicaUpdateInfo>()};
+    if (charge(
+            ret, rt, rt->execution()->env->pricelist.onVerifyReplicaUpdate())) {
+      const auto r{proofs->verifyUpdateProof(info)};
+      ret << kOk << (r && r.value());
+    }
+  }
+
   RUNTIME_METHOD(gocRtActorId) {
     if (auto _id{
             rt->execution()->state_tree->tryLookupId(arg.get<Address>())}) {

core/vm/actor/cgo/c_actors.h

@@ -20,6 +20,7 @@ Raw gocRtBlake(Raw);
 Raw gocRtVerifyPost(Raw);
 Raw gocRtVerifySeals(Raw);
 Raw gocRtVerifyAggregateSeals(Raw);
+Raw gocRtVerifyReplicaUpdate(Raw);
 Raw gocRtActorId(Raw);
 Raw gocRtSend(Raw);
 Raw gocRtVerifySig(Raw);

core/vm/actor/cgo/go_actors.go

@@ -112,7 +112,8 @@ import (
 	reward7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/reward"
 	system7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/system"
 	verifreg7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/verifreg"
-	rt7 "github.com/filecoin-project/specs-actors/v6/actors/runtime"
+	rt7 "github.com/filecoin-project/specs-actors/v7/actors/runtime"
+	proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof"
 	"github.com/ipfs/go-cid"
 	"github.com/whyrusleeping/cbor-gen"
 )
@@ -543,6 +544,33 @@ func MarshalCBOR_WindowPoStVerifyInfo(out *cborOut, t *proof1.WindowPoStVerifyIn
 	return nil
 }
 
+func MarshalCBOR_ReplicaUpdateInfo(out *cborOut, t *proof7.ReplicaUpdateInfo) error {
+	w := out.w
+	if _, e := w.Write(cborArray5); e != nil {
+		return e
+	}
+	s := make([]byte, 9)
+	if e := typegen.WriteMajorTypeHeaderBuf(s, w, typegen.MajUnsignedInt, uint64(t.UpdateProofType)); e != nil {
+		return e
+	}
+	if e := typegen.WriteCid(w, t.OldSealedSectorCID); e != nil {
+		return e
+	}
+	if e := typegen.WriteCid(w, t.NewSealedSectorCID); e != nil {
+		return e
+	}
+	if e := typegen.WriteCid(w, t.NewUnsealedSectorCID); e != nil {
+		return e
+	}
+	if e := typegen.WriteMajorTypeHeaderBuf(s, w, typegen.MajByteString, uint64(len(t.Proof))); e != nil {
+		return e
+	}
+	if _, e := w.Write(t.Proof[:]); e != nil {
+		return e
+	}
+	return nil
+}
+
 func (rt *rt) VerifyPoSt(info proof1.WindowPoStVerifyInfo) error {
 	arg := rt.gocArg()
 	if e := MarshalCBOR_WindowPoStVerifyInfo(arg, &info); e != nil {
@@ -567,6 +595,18 @@ func (rt *rt) VerifyAggregateSeals(aggregate proof5.AggregateSealVerifyProofAndI
 	return exitcode.ErrIllegalArgument
 }
 
+func (rt *rt) VerifyReplicaUpdate(info proof7.ReplicaUpdateInfo) error {
+	arg := rt.gocArg()
+	if e := MarshalCBOR_ReplicaUpdateInfo(arg, &info); e != nil {
+		panic(cgoErrors("VerifyReplicaUpdate MarshalCBOR"))
+	}
+	ret := rt.gocRet(C.gocRtVerifyReplicaUpdate(arg.arg()))
+	if ret.bool() {
+		return nil
+	}
+	return exitcode.ErrIllegalArgument
+}
+
 func (rt *rt) VerifyConsensusFault(block1, block2, extra []byte) (*rt1.ConsensusFault, error) {
 	ret := rt.gocRet(C.gocRtVerifyConsensusFault(rt.gocArg().bytes(block1).bytes(block2).bytes(extra).arg()))
 	if ret.bool() {

core/vm/runtime/pricelist.hpp

@@ -135,6 +135,9 @@ namespace fc::vm::runtime {
                           ->second};
       return static_cast<GasAmount>(n) * (_64gib ? 359272 : 449900) + step;
     }
+    GasAmount onVerifyReplicaUpdate() {
+      return make(calico ? 36316136 : 0, 0);
+    }
     static inline GasAmount onVerifyConsensusFault() {
       return make(495422, 0);
     }