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

Jump to bottom

Merge FIP-0045 implementation branch into master #670

Merged
merged 36 commits into from
Sep 28, 2022
Merged

Merge FIP-0045 implementation branch into master #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
03dd778
Implements datacap token actor. Not yet integrated with anything. (#513)
anorth Aug 11, 2022
4af8c63
Fix token messanger to return receiver ID (#519)
anorth Aug 12, 2022
a1519ac
Implement could-be-standard token receiver hook in account and multis…
anorth Aug 17, 2022
7027f02
Allocations, Claims state and associated methods (#558)
ZenGround0 Aug 18, 2022
e9f4498
Upgrade fungible token library. Use standard exit codes. Use standard…
anorth Aug 28, 2022
4033db9
Integrates datacap token with verified registry actor (#514)
anorth Aug 30, 2022
bbc82b6
Fix RemoveExpiredAllocations to refund datacap to the client (#607)
anorth Sep 7, 2022
796338c
ClaimAllocations burns datacap that was claimed (#609)
anorth Sep 7, 2022
4899922
Merge branch 'master' into decouple-fil+
anorth Sep 8, 2022
b978d0d
Include datacap actor in build bundle (#613)
anorth Sep 8, 2022
653b01b
Automatically approve built-in market as operator for all minted data…
anorth Sep 9, 2022
5f944a6
Implemented verified registry token receiver hook (#601)
anorth Sep 9, 2022
989c3b4
Datacap mint method returns mint result (#625)
anorth Sep 11, 2022
34b132c
Verifreg uses a constant for datacap token actor addr, rather than st…
anorth Sep 11, 2022
ca16a34
Use ActorID rather than addresses in new verifreg state (#626)
anorth Sep 11, 2022
e528bc8
Raise market allowance infinite constant (#628)
ZenGround0 Sep 12, 2022
d5ce00b
Adapt sector info and weight calculation for fip 0045 (#637)
ZenGround0 Sep 14, 2022
9beef18
Update token library (#647)
anorth Sep 14, 2022
4a855fd
Verifreg GetClaims method (#655)
ZenGround0 Sep 14, 2022
968d4c0
Market actor transfers datacap and makes verified allocations for dea…
anorth Sep 15, 2022
16b923a
Delete deprecated UseBytes and RestoreBytes methods from verified reg…
anorth Sep 16, 2022
f8847e0
Implement verified claim term extension by client (#669)
anorth Sep 19, 2022
b9f6b74
Remove all expired allocations for a client when none specified (#671)
anorth Sep 20, 2022
46ee82a
Remove ineffective optimisation of HAMT writes in ExtendClaimTerms (#…
anorth Sep 20, 2022
4ee52d1
feat: replace usize with u32 (#699)
arajasek Sep 21, 2022
239c197
Expiration Extension for fip45 (#653)
ZenGround0 Sep 21, 2022
cabeaf4
Implement extension of claims by spending new datacap (#685)
anorth Sep 22, 2022
8060cf5
Merge branch 'master' into decouple-fil+
anorth Sep 22, 2022
1a8bbc3
fix: datacap actor: fix caller validation (#703)
geoff-vball Sep 22, 2022
1ee251d
Implement removal of expired claims. (#705)
anorth Sep 23, 2022
2a25e79
Update token libraries to v1.0.0 (#706)
anorth Sep 27, 2022
22c3256
Feat/drop claims (#718)
ZenGround0 Sep 28, 2022
5934421
Claim verifreg allocations from miner actor (#715)
ZenGround0 Sep 28, 2022
11cc69b
Merge fixing
ZenGround0 Sep 28, 2022
8c20a0d
Merge in latest master
ZenGround0 Sep 28, 2022
e48b356
Merge branch 'master' into decouple-fil+
ZenGround0 Sep 28, 2022
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
157 changes: 133 additions & 24 deletions Cargo.lock
View file
Open in desktop

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

7 changes: 4 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fil_actor_account = { version = "9.0.0-alpha.1", path = "./actors/account", features = ["fil-actor"] }
fil_actor_verifreg = { version = "9.0.0-alpha.1", path = "./actors/verifreg", features = ["fil-actor"] }
fil_actor_cron = { version = "9.0.0-alpha.1", path = "./actors/cron", features = ["fil-actor"] }
fil_actor_datacap = { version = "9.0.0-alpha.1", path = "./actors/datacap", features = ["fil-actor"] }
fil_actor_init = { version = "9.0.0-alpha.1", path = "./actors/init", features = ["fil-actor"] }
fil_actor_market = { version = "9.0.0-alpha.1", path = "./actors/market", features = ["fil-actor"] }
fil_actor_miner = { version = "9.0.0-alpha.1", path = "./actors/miner", features = ["fil-actor"] }
fil_actor_multisig = { version = "9.0.0-alpha.1", path = "./actors/multisig", features = ["fil-actor"] }
fil_actor_paych = { version = "9.0.0-alpha.1", path = "./actors/paych", features = ["fil-actor"] }
fil_actor_power = { version = "9.0.0-alpha.1", path = "./actors/power", features = ["fil-actor"] }
fil_actor_miner = { version = "9.0.0-alpha.1", path = "./actors/miner", features = ["fil-actor"] }
fil_actor_reward = { version = "9.0.0-alpha.1", path = "./actors/reward", features = ["fil-actor"] }
fil_actor_system = { version = "9.0.0-alpha.1", path = "./actors/system", features = ["fil-actor"] }
fil_actor_init = { version = "9.0.0-alpha.1", path = "./actors/init", features = ["fil-actor"] }
fil_actor_verifreg = { version = "9.0.0-alpha.1", path = "./actors/verifreg", features = ["fil-actor"] }

[build-dependencies]
fil_actor_bundler = "4.0.0"
Expand Down
1 change: 1 addition & 0 deletions actors/account/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "9.0.0-alpha.1", path = "../../runtime" }
frc42_dispatch = "1.0.0"
fvm_shared = { version = "2.0.0-alpha.2", default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
num-traits = "0.2.14"
Expand Down
Loading