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.

Sign up for GitHub

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

Updates market actor #496

Merged
merged 12 commits into from
Jun 18, 2020
Merged

Updates market actor #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8113bb7
initial market actor updates
dutterbutter Jun 10, 2020
6a4eead
fix market actor errs
dutterbutter Jun 11, 2020
0838503
Merge branch 'master' into dustin/market-updates
dutterbutter Jun 11, 2020
9b6ed4b
fix linting issue
dutterbutter Jun 11, 2020
59094b1
Merge branch 'master' of github.com:ChainSafe/forest into dustin/mark…
dutterbutter Jun 11, 2020
8049122
made requested changes
dutterbutter Jun 12, 2020
1c8a031
update error msg
dutterbutter Jun 15, 2020
089730b
added verifreg to internal send and mockrt
dutterbutter Jun 15, 2020
3f222f4
Merge branch 'master' of github.com:ChainSafe/forest into dustin/mark…
dutterbutter Jun 17, 2020
148bc6c
Merge branch 'master' into dustin/market-updates
dutterbutter Jun 17, 2020
6bf0af4
updated multimap error handling
dutterbutter Jun 18, 2020
5ddc37d
Merge branch 'dustin/market-updates' of github.com:ChainSafe/forest i…
dutterbutter Jun 18, 2020
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
1 change: 1 addition & 0 deletions vm/actor/src/builtin/codes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ lazy_static! {
pub static ref PAYCH_ACTOR_CODE_ID: Cid = make_builtin(b"fil/1/paymentchannel");
pub static ref MULTISIG_ACTOR_CODE_ID: Cid = make_builtin(b"fil/1/multisig");
pub static ref REWARD_ACTOR_CODE_ID: Cid = make_builtin(b"fil/1/reward");
pub static ref VERIFIED_ACTOR_CODE_ID: Cid = make_builtin(b"fil/1/verifiedregistry");
dutterbutter marked this conversation as resolved.
Show resolved Hide resolved

// Set of actor code types that can represent external signing parties.
pub static ref CALLER_TYPES_SIGNABLE: [Cid; 2] =
Expand Down
3 changes: 3 additions & 0 deletions vm/actor/src/builtin/market/deal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use cid::Cid;
use clock::ChainEpoch;
use crypto::Signature;
use encoding::tuple::*;
use encoding::Cbor;
use fil_types::PaddedPieceSize;
use num_bigint::biguint_ser;
use vm::TokenAmount;
Expand Down Expand Up @@ -42,6 +43,8 @@ pub struct DealProposal {
pub client_collateral: TokenAmount,
}

impl Cbor for DealProposal {}

impl DealProposal {
pub fn duration(&self) -> ChainEpoch {
self.end_epoch - self.start_epoch
Expand Down
Loading