bd10bdf99a
* build: Bump version to v1.17.3-dev * build: set version to v1.18.0-dev * chore: actors: Allow builtin-actors to return a map of methods (#9342) * Allow builtin-actors to return a map of methods * go mod * Fix tests * Fix tests, check carefully please * Delete lotus-pond (#9352) * feat: add StateNetworkVersion to mpool API * chore: refactor: rename NewestNetworkVersion * feat: actors: Integrate datacap actor into lotus (#9348) * Integrate datacap actor * Implement datacap actor in chain/builtin * feat: support typed errors over RPC * chore: deps: update to go-jsonrpc 0.1.8 * remove duplicate import * fix: itest: check for closed connection * chore: refactor: move retry test to API * address magik supernit * Add ability to only have single partition per msg for partitions with recovery sectors * doc gen * Address comments * Return beneficiary info from miner state Info() * Update builtin-actors to dev/20220922-v9 which includes FIP-0045 changes in progress * Integrate verifreg changes to lotus * Setup datacap actor * Update builtin-actors to dev/20220922-v9-1 * Update datacap actor to query datacap instead of verifreg * update gst * update markets * update actors with hamt fix * update gst * Update datacap to parse tokens * Update bundles * datacap and verifreg actors use ID addresses without protocol byte * update builtin-actors to rc1 * update go-fil-markets * Update bundles to rc2 * Integrate the v9 migration * Add api for getting allocation * Add upgrade epoch for butterfly * Tweak PreSeal struct to be infra-friendly * docsgen * More tweaking of PreSeal for genesis * review fixes * Use fake cid for test * add butterfly artifacts for oct 5 upgrade * check datacaps for v8 verifreg match v9 datacap actor * Remove print statements * Update to go-state-types master * Update to go-state-types v0.9.0-rc1 * review fixes * use go-fil-markets v1.24.0-v17 * Add accessors for allocations and claims maps * fix: missing permissions tag * butterfly * update butterfly artifacts * sealing pipeline: Prepare deal assigning logic for FIP-45 * sealing pipeline: Get allocationId with StateApi * use NoAllocationID instead of nil AllocationId * address review * Add datacap actor to registry.go * Add cli for listing allocations and removing expired allocations * Update to go-state-types master * deps: upgrade go-merkledag to 0.8.0 * shark params * Update cli/filplus.go Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * revert change to verifreg util * docsgen-cli * miss the stuff * Update FFI * Update go-state-types to v0.9.0 * Update builtin-actors to v9.0.0 * add calib upgrade epcoh * update the upgrade envvar * kill shark * Remove fvm splash banner from nv17 upgrade * check invariance for pending deals and allocations * check pending verified deal proposal migrated to allocation * Add check for unsealed CID in precommit sectors * Fix counting of allocations in nv17 migration test * make gen * pass state trees as pointers * Add assertion that migrations with & without cache are the same * compare allocation to verified deal proposal * Fix miner state precommit info * fix migration test tool * add changelog * Update to go-state-types v0.9.1 * Integrate builtin-actors v9.0.1 * chore: ver: bump version for rc3 (#9512) * Bump version to 1.18.0-rc3 * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Migration: Use autobatch bs * Fix autobatch Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> * Invoker: Use MethodMeta from go-state-types * Add a second premigration for nv17 * Add more shed tools for migration checking * address review * Lotus release v1.18.0-rc4 * fix: ci: fix app-image build on ci (#9527) * Remove old go version first * Add GO_VERSION file * Use GO_VERSION to set / verify go version * mv GO_VERSION GO_VERSION_MIN * Use GO_VERSION_MIN in Makefile check Co-authored-by: Ian Davis <jungziege@gmail.com> * Update to latest go-state-types for migration fixes * go mod tidy * fix: use api.ErrActorNotFound instead of types.ErrActorNotFound * fix: add fields to ForkUpgradeParams * docs: update actors_version_checklist.md * chore: fix lint * update to go state type v0.9.6 with market migration fix (#9545) * update go-state-types to v-0.9.7 * Add invariant checks to migration * fix invariant check: number of entries in datacap actor should include verifreg * Invariant checks: Only include not-activated deals * test: nv17 migration * Address review * add lotus-shed invariance method * Migration cli takes a stateroot cid and a height * make gen * Update to builtin-actors v9.0.2 * Failing test that shows that notaries can remove datacap from the verifreg actor * Test that should pass when the problem is solved * make gen * Review fixes * statemanager call function will return call information even if call errors * update go-state-types * update builtin-actors * bubble up errors properly from ApplyImplicitMessage * bump to rc5 * set new upgrade heights for calibnet * set new upgrade height for butterfly * tweak calibnet upgrade schedule * clarify changelog note about calibnet * butterfly * update calibnet artifacts * Allow setting local bundles for Debug FVM for av 9+ * fix: autobatch: remove potential deadlock when a block is missing Check the _underlying_ blockstore instead of recursing. Also, drop the lock before we do that. * fix imports * build: set shark mainnet epoch (#9640) * chore: build: Lotus release v1.18.0 (#9641) * Lotus release v1.18.0 * add changelog * address review * changelog improvement Co-authored-by: Jennifer Wang <jiayingw703@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Łukasz Magiera <magik6k@gmail.com> Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com> Co-authored-by: Aayush <arajasek94@gmail.com> Co-authored-by: Geoff Stuart <geoff.vball@gmail.com> Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai> Co-authored-by: simlecode <69969590+simlecode@users.noreply.github.com> Co-authored-by: Rod Vagg <rod@vagg.org> Co-authored-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Ian Davis <jungziege@gmail.com> Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com> Co-authored-by: Steven Allen <steven@stebalien.com>
255 lines
6.2 KiB
Go
255 lines
6.2 KiB
Go
package paychmgr
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"sync"
|
|
|
|
"github.com/ipfs/go-cid"
|
|
|
|
"github.com/filecoin-project/go-address"
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
"github.com/filecoin-project/go-state-types/crypto"
|
|
"github.com/filecoin-project/go-state-types/network"
|
|
|
|
"github.com/filecoin-project/lotus/api"
|
|
"github.com/filecoin-project/lotus/build"
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/paych"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
"github.com/filecoin-project/lotus/lib/sigs"
|
|
)
|
|
|
|
type mockManagerAPI struct {
|
|
*mockStateManager
|
|
*mockPaychAPI
|
|
}
|
|
|
|
func newMockManagerAPI() *mockManagerAPI {
|
|
return &mockManagerAPI{
|
|
mockStateManager: newMockStateManager(),
|
|
mockPaychAPI: newMockPaychAPI(),
|
|
}
|
|
}
|
|
|
|
type mockPchState struct {
|
|
actor *types.Actor
|
|
state paych.State
|
|
}
|
|
|
|
type mockStateManager struct {
|
|
lk sync.Mutex
|
|
accountState map[address.Address]address.Address
|
|
paychState map[address.Address]mockPchState
|
|
response *api.InvocResult
|
|
lastCall *types.Message
|
|
}
|
|
|
|
func newMockStateManager() *mockStateManager {
|
|
return &mockStateManager{
|
|
accountState: make(map[address.Address]address.Address),
|
|
paychState: make(map[address.Address]mockPchState),
|
|
}
|
|
}
|
|
|
|
func (sm *mockStateManager) setAccountAddress(a address.Address, lookup address.Address) {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
sm.accountState[a] = lookup
|
|
}
|
|
|
|
func (sm *mockStateManager) setPaychState(a address.Address, actor *types.Actor, state paych.State) {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
sm.paychState[a] = mockPchState{actor, state}
|
|
}
|
|
|
|
func (sm *mockStateManager) ResolveToKeyAddress(ctx context.Context, addr address.Address, ts *types.TipSet) (address.Address, error) {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
keyAddr, ok := sm.accountState[addr]
|
|
if !ok {
|
|
return address.Undef, errors.New("not found")
|
|
}
|
|
return keyAddr, nil
|
|
}
|
|
|
|
func (sm *mockStateManager) GetPaychState(ctx context.Context, addr address.Address, ts *types.TipSet) (*types.Actor, paych.State, error) {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
info, ok := sm.paychState[addr]
|
|
if !ok {
|
|
return nil, nil, errors.New("not found")
|
|
}
|
|
return info.actor, info.state, nil
|
|
}
|
|
|
|
func (sm *mockStateManager) setCallResponse(response *api.InvocResult) {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
|
|
sm.response = response
|
|
}
|
|
|
|
func (sm *mockStateManager) getLastCall() *types.Message {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
|
|
return sm.lastCall
|
|
}
|
|
|
|
func (sm *mockStateManager) Call(ctx context.Context, msg *types.Message, ts *types.TipSet) (*api.InvocResult, error) {
|
|
sm.lk.Lock()
|
|
defer sm.lk.Unlock()
|
|
|
|
sm.lastCall = msg
|
|
|
|
return sm.response, nil
|
|
}
|
|
|
|
type waitingCall struct {
|
|
response chan types.MessageReceipt
|
|
}
|
|
|
|
type waitingResponse struct {
|
|
receipt types.MessageReceipt
|
|
done chan struct{}
|
|
}
|
|
|
|
type mockPaychAPI struct {
|
|
lk sync.Mutex
|
|
messages map[cid.Cid]*types.SignedMessage
|
|
waitingCalls map[cid.Cid]*waitingCall
|
|
waitingResponses map[cid.Cid]*waitingResponse
|
|
wallet map[address.Address]struct{}
|
|
signingKey []byte
|
|
}
|
|
|
|
func newMockPaychAPI() *mockPaychAPI {
|
|
return &mockPaychAPI{
|
|
messages: make(map[cid.Cid]*types.SignedMessage),
|
|
waitingCalls: make(map[cid.Cid]*waitingCall),
|
|
waitingResponses: make(map[cid.Cid]*waitingResponse),
|
|
wallet: make(map[address.Address]struct{}),
|
|
}
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) StateWaitMsg(ctx context.Context, mcid cid.Cid, confidence uint64, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error) {
|
|
pchapi.lk.Lock()
|
|
|
|
response := make(chan types.MessageReceipt, 1)
|
|
|
|
if response, ok := pchapi.waitingResponses[mcid]; ok {
|
|
defer pchapi.lk.Unlock()
|
|
defer func() {
|
|
go close(response.done)
|
|
}()
|
|
|
|
delete(pchapi.waitingResponses, mcid)
|
|
return &api.MsgLookup{Receipt: response.receipt}, nil
|
|
}
|
|
|
|
pchapi.waitingCalls[mcid] = &waitingCall{response: response}
|
|
pchapi.lk.Unlock()
|
|
|
|
select {
|
|
case receipt := <-response:
|
|
return &api.MsgLookup{Receipt: receipt}, nil
|
|
case <-ctx.Done():
|
|
return nil, ctx.Err()
|
|
}
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) receiveMsgResponse(mcid cid.Cid, receipt types.MessageReceipt) {
|
|
pchapi.lk.Lock()
|
|
|
|
if call, ok := pchapi.waitingCalls[mcid]; ok {
|
|
defer pchapi.lk.Unlock()
|
|
|
|
delete(pchapi.waitingCalls, mcid)
|
|
call.response <- receipt
|
|
return
|
|
}
|
|
|
|
done := make(chan struct{})
|
|
pchapi.waitingResponses[mcid] = &waitingResponse{receipt: receipt, done: done}
|
|
|
|
pchapi.lk.Unlock()
|
|
|
|
<-done
|
|
}
|
|
|
|
// Send success response for any waiting calls
|
|
func (pchapi *mockPaychAPI) close() {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
success := types.MessageReceipt{
|
|
ExitCode: 0,
|
|
Return: []byte{},
|
|
}
|
|
for mcid, call := range pchapi.waitingCalls {
|
|
delete(pchapi.waitingCalls, mcid)
|
|
call.response <- success
|
|
}
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) MpoolPushMessage(ctx context.Context, msg *types.Message, spec *api.MessageSendSpec) (*types.SignedMessage, error) {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
smsg := &types.SignedMessage{Message: *msg}
|
|
pchapi.messages[smsg.Cid()] = smsg
|
|
return smsg, nil
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) pushedMessages(c cid.Cid) *types.SignedMessage {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
return pchapi.messages[c]
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) pushedMessageCount() int {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
return len(pchapi.messages)
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) StateAccountKey(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error) {
|
|
return addr, nil
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) WalletHas(ctx context.Context, addr address.Address) (bool, error) {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
_, ok := pchapi.wallet[addr]
|
|
return ok, nil
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) addWalletAddress(addr address.Address) {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
pchapi.wallet[addr] = struct{}{}
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) WalletSign(ctx context.Context, k address.Address, msg []byte) (*crypto.Signature, error) {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
return sigs.Sign(crypto.SigTypeSecp256k1, pchapi.signingKey, msg)
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) addSigningKey(key []byte) {
|
|
pchapi.lk.Lock()
|
|
defer pchapi.lk.Unlock()
|
|
|
|
pchapi.signingKey = key
|
|
}
|
|
|
|
func (pchapi *mockPaychAPI) StateNetworkVersion(ctx context.Context, tsk types.TipSetKey) (network.Version, error) {
|
|
return build.TestNetworkVersion, nil
|
|
}
|