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.

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

dev to master - athens release #41

Merged
merged 206 commits into from
Apr 14, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
43376ab
adding membership module - storage
mnaamani Mar 13, 2019
216e694
use default implicit value for paid terms instead of initializing map
mnaamani Mar 13, 2019
a7d4aac
add migration
mnaamani Mar 14, 2019
6923186
renaming, adding handles map
mnaamani Mar 14, 2019
1237df8
membership: implement buy_membership
mnaamani Mar 14, 2019
918868e
make avatar_uri an Option instead of empty string to represent no uri
mnaamani Mar 14, 2019
cb1a3a7
add simple buy membership method
mnaamani Mar 14, 2019
6e202d9
burn fee when buying membership
mnaamani Mar 14, 2019
54738e7
keep extrinsic validation outside insert_new_paid_member
mnaamani Mar 14, 2019
e99cb53
update methods for profile
mnaamani Mar 14, 2019
6f46ad1
add method to change multiple profile user infos in one transaction
mnaamani Mar 14, 2019
ac0c928
check allowed new members before accepting new members
mnaamani Mar 14, 2019
f095b67
handle runtime uptime by using spec_version
mnaamani Mar 14, 2019
1d63f67
fix batch profile update
mnaamani Mar 14, 2019
7ae24d0
rename update profile method, and don't truncate avatar uri
mnaamani Mar 16, 2019
2d3329a
member sub accounts
mnaamani Mar 16, 2019
da0a072
add some notes on sub-accounts
mnaamani Mar 16, 2019
31fd1de
default min length of handle 5 chars
mnaamani Mar 16, 2019
95e4cd3
adjust avatar, handle and about text default max lengths
mnaamani Mar 16, 2019
478fbe0
reorg membership into a module directory
mnaamani Mar 19, 2019
a227fa3
add tests for membership
mnaamani Mar 19, 2019
27b7841
membership tests
mnaamani Mar 20, 2019
5ba5f86
membership: more tests
mnaamani Mar 20, 2019
74531d2
membership sub accounts, fix updating subaccounts
mnaamani Mar 20, 2019
3328650
membership tests
mnaamani Mar 20, 2019
bf2f5d5
introduce IsActiveMember trait
mnaamani Mar 20, 2019
c8b70cc
use IsActiveMember trait in election and runtime upgrade proposal mod…
mnaamani Mar 20, 2019
c7326e1
factor our migration to its own module
mnaamani Mar 20, 2019
53e54b6
additional comments on membership methods
mnaamani Mar 20, 2019
3fab73d
membership sub accounts - revert (move to staked roles)
mnaamani Mar 21, 2019
9f07751
add member through screener
mnaamani Mar 21, 2019
d09cfbc
refactor IsActiveMember trait to Members
mnaamani Mar 22, 2019
af58630
staked roles
mnaamani Mar 22, 2019
d46fc63
update Members and Roles traits
mnaamani Mar 22, 2019
14f7cf5
staked role accounts illiquid
mnaamani Mar 22, 2019
c1a0677
refactored staked roles
mnaamani Mar 22, 2019
e16cef9
admin methods for roles
mnaamani Mar 23, 2019
3896194
staked roles: clear entry requests every N blocks
mnaamani Mar 25, 2019
8e43956
staked roles: add expiery to entry requests
mnaamani Mar 25, 2019
a4c152f
For #7, implment simple Data Object Type registry
jfinkhaeuser Mar 25, 2019
8668f1b
Fix comment typo
jfinkhaeuser Mar 25, 2019
1e35b21
staked roles: admin remove actor function
mnaamani Mar 25, 2019
8d66c12
These extrinsics should be public
jfinkhaeuser Mar 25, 2019
79ef28c
staked roles: factor out deleting actor
mnaamani Mar 25, 2019
ff33136
Be explicit about requiring root. IMHO this is better style.
jfinkhaeuser Mar 25, 2019
8264345
staked roles: clear unbonded accounts
mnaamani Mar 25, 2019
ba3413d
Unit test setup for storage module
jfinkhaeuser Mar 25, 2019
913538b
Get unit tests to run
jfinkhaeuser Mar 25, 2019
6c14ac7
Make unit tests work, but still allow building wasm runtime.
jfinkhaeuser Mar 25, 2019
c928b88
Silence warning
jfinkhaeuser Mar 25, 2019
854378a
Cover extrinsics with unit tests
jfinkhaeuser Mar 25, 2019
0286059
Improve naming
jfinkhaeuser Mar 25, 2019
3e43d9e
refactor membership: renamed registry module to members
mnaamani Mar 25, 2019
37d82a4
Merge branch 'membership' into staked-roles
mnaamani Mar 25, 2019
85d1f33
remove unecessary use statement
mnaamani Mar 25, 2019
75d835d
members: refactor insert members method
mnaamani Mar 25, 2019
b592639
Merge pull request #3 from mnaamani/membership
siman Mar 25, 2019
24aa7fc
Merge branch 'development' into staked-roles
mnaamani Mar 25, 2019
a4b502e
staked role payouts
mnaamani Mar 25, 2019
4ef307e
MaybeDebug needed on trait
mnaamani Mar 26, 2019
cbab82b
staked roles: initialize runtime allowing Storage role
mnaamani Mar 26, 2019
61dfc3c
Fixes #14
jfinkhaeuser Mar 26, 2019
a695dd2
Respond to comment about consistent naming. I think the best compromise
jfinkhaeuser Mar 26, 2019
701e2b0
More renaming (debated in rocket chat); works for WASM build, but not
jfinkhaeuser Mar 26, 2019
32b659a
Adjust renaming to unit tests
jfinkhaeuser Mar 26, 2019
cb73509
Simplify ensure_data_object_type()
jfinkhaeuser Mar 26, 2019
f744032
Separate activate and deactivate functions for DO types
jfinkhaeuser Mar 26, 2019
b3e5ff2
Add comment about future field in DO types
jfinkhaeuser Mar 26, 2019
64b79d3
Merge branch 'development' into data-object-type-registry
jfinkhaeuser Mar 26, 2019
62f1b9c
Merge pull request #13 from jfinkhaeuser/data-object-type-registry
mnaamani Mar 26, 2019
8803114
Might as well make my life easier
jfinkhaeuser Mar 27, 2019
6f19e1c
Fix brace style
jfinkhaeuser Mar 27, 2019
0e26e9c
Change capitalization of ID to Id
jfinkhaeuser Mar 27, 2019
57a3428
DataObjectTypeAdded -> DataObjectTypeRegistered
jfinkhaeuser Mar 27, 2019
d81f8aa
fix spelling on_finalise, on_initialise
mnaamani Mar 27, 2019
b319370
Merge pull request #18 from jfinkhaeuser/data-object-type-registry-fixes
mnaamani Mar 27, 2019
0114658
Merge branch 'development' into staked-roles
mnaamani Mar 27, 2019
522c189
Proposal for not having Option<T::DataObjectTypeId> in the DO type
jfinkhaeuser Mar 27, 2019
f316733
error message when not enough balance to stake
mnaamani Mar 28, 2019
9c9a49a
burn role entry request fee
mnaamani Mar 28, 2019
baffb0b
rename role parameters field bonding_time -> bonding_period
mnaamani Mar 28, 2019
b5a49da
Looks like the data directory implementation we need.
jfinkhaeuser Mar 29, 2019
1dec598
Implement checks for parameters when adding content
jfinkhaeuser Mar 29, 2019
a2f0b11
Add data object storage relationship registry (WIP)
jfinkhaeuser Mar 29, 2019
fd30145
renaming storage values
mnaamani Mar 30, 2019
d800e17
Add DataObjectStorageRelationshipRegistry implementation
jfinkhaeuser Mar 30, 2019
8a22684
Fix passing on of results
jfinkhaeuser Mar 30, 2019
bf479ad
Silence warnings
jfinkhaeuser Mar 30, 2019
afc031b
Add more traits for storage
jfinkhaeuser Mar 30, 2019
ea54fea
Finish ContentIdExists implementation
jfinkhaeuser Mar 30, 2019
1c0b4ff
Add storage (and trait) for determining whether a storage relationship
jfinkhaeuser Mar 30, 2019
527d4e2
Add download sessions
jfinkhaeuser Mar 30, 2019
65d9492
Silence warnings
jfinkhaeuser Mar 30, 2019
4770deb
Silence warnings during 'cargo build' and 'cargo test'. Running
jfinkhaeuser Mar 30, 2019
0ccc36a
Move tests into main source file, so we can separate tests for
jfinkhaeuser Mar 30, 2019
16eeb5e
- Change requirement for ContentId to implement Clone, so we can use
jfinkhaeuser Mar 30, 2019
7bb551b
Simplify building of externalities for tests
jfinkhaeuser Mar 30, 2019
aa1f3aa
Add tests to data directory functions
jfinkhaeuser Mar 30, 2019
572b40f
Basic content directory for #9
jfinkhaeuser Apr 1, 2019
9b11ce5
adding tests for staked roles
mnaamani Apr 1, 2019
18fae5e
pay reward to member account
mnaamani Apr 1, 2019
c7940af
tests: staked roles
mnaamani Apr 1, 2019
6c5deff
add EntryRequested and Unstaked events
mnaamani Apr 1, 2019
710267f
Update src/storage/data_directory.rs
siman Apr 2, 2019
3f462b5
Update src/storage/data_directory.rs
siman Apr 2, 2019
9dadcdc
Update src/storage/downloads.rs
siman Apr 2, 2019
19ded2f
Update src/storage/downloads.rs
siman Apr 2, 2019
a981199
Update src/storage/downloads.rs
siman Apr 2, 2019
588c8a3
Update src/storage/downloads.rs
siman Apr 2, 2019
e126cb1
Update src/storage/downloads.rs
siman Apr 2, 2019
efb3e9d
Update src/storage/downloads.rs
siman Apr 2, 2019
060c9f3
Follow-on fixes from review suggestions
jfinkhaeuser Apr 2, 2019
d28e455
Fix typo
jfinkhaeuser Apr 2, 2019
4fd1bf9
Implement more review suggestions and fix some warnings
jfinkhaeuser Apr 2, 2019
7da887e
Simplify names and other style suggestions
jfinkhaeuser Apr 2, 2019
1033869
Also pass Liaison ID when they reject or accept content
jfinkhaeuser Apr 2, 2019
ee2acfc
Fix bug discovered during review by @mnaamani
jfinkhaeuser Apr 2, 2019
f985f5e
Change dispatch::Result -> Result for simplification
jfinkhaeuser Apr 2, 2019
75bcdb5
rustfmt
mnaamani Apr 2, 2019
dcc87b3
rustfmt for the storage directory
jfinkhaeuser Apr 2, 2019
40e1886
Storage traits don't need a default implementation here
jfinkhaeuser Apr 2, 2019
22fffb7
fix warnings in roles module
mnaamani Apr 2, 2019
c9162fe
Merge pull request #6 from mnaamani/staked-roles
siman Apr 2, 2019
7d9041b
Merge branch 'development' into data-directory
jfinkhaeuser Apr 2, 2019
1816a47
Merge branch 'data-directory' into silence-warnings
jfinkhaeuser Apr 2, 2019
2ea69b3
Silence more warnings (not all; some of them are going to be resolved in
jfinkhaeuser Apr 2, 2019
e51f7a5
Merge branch 'silence-warnings' into content-directory
jfinkhaeuser Apr 2, 2019
bce27bc
Merge pull request #19 from jfinkhaeuser/data-object-type-registry-st…
siman Apr 2, 2019
737fda9
Fix build after changes to membership traits
jfinkhaeuser Apr 2, 2019
79e62de
Implement suggestion to make the content ID an auto-incrementing
jfinkhaeuser Apr 2, 2019
bf39e42
Rerun rustfmt
jfinkhaeuser Apr 2, 2019
a03a392
substrate update: initial update
mnaamani Apr 2, 2019
fc6149b
Mock other storage in storage/ subdirectory
jfinkhaeuser Apr 2, 2019
a6e3e29
Thanks to @mnaamani, found a way to mock the data directory. That means
jfinkhaeuser Apr 2, 2019
b300c29
Simplify return (also test pre-commit hook)
jfinkhaeuser Apr 2, 2019
1534885
Merge branch 'development' into data-directory
jfinkhaeuser Apr 2, 2019
9ad7369
Merge branch 'data-directory' into silence-warnings
jfinkhaeuser Apr 2, 2019
05c2d78
Merge branch 'silence-warnings' into content-directory
jfinkhaeuser Apr 2, 2019
787aaed
substrate upgrade: fix runtime configuration
mnaamani Apr 2, 2019
02276fc
substrate upgrade: fix migration, build method doesn't need to return…
mnaamani Apr 2, 2019
29e52a2
substrate upgrade: fixes for changed balances module
mnaamani Apr 2, 2019
60a3a0b
Add tests to DOSR
jfinkhaeuser Apr 2, 2019
198485c
Add note to downloads module
jfinkhaeuser Apr 2, 2019
182e3ef
Merge branch 'data-directory' into silence-warnings
jfinkhaeuser Apr 2, 2019
5fb0bc3
Merge branch 'silence-warnings' into content-directory
jfinkhaeuser Apr 2, 2019
a7ed299
substrate upgrade: fix currency::reward -> currency::deposit_into_exi…
mnaamani Apr 2, 2019
3365015
- Rename Metadata -> ContentMetadata to avoid naming conflict
jfinkhaeuser Apr 2, 2019
070ee5b
@siman prefers quieter messages :)
jfinkhaeuser Apr 2, 2019
1f50bf1
substrate upgrade: add missing trait bound for proposals module
mnaamani Apr 2, 2019
2448c5d
- Fix unwrap() issues @mnaamani raised
jfinkhaeuser Apr 2, 2019
fedf55f
Merge branch 'data-directory' into silence-warnings
jfinkhaeuser Apr 2, 2019
3e7c070
Merge branch 'silence-warnings' into content-directory
jfinkhaeuser Apr 2, 2019
40be6a9
Content directory test & some changes from review
jfinkhaeuser Apr 2, 2019
471e96a
Fix typo
jfinkhaeuser Apr 2, 2019
e774594
Add issue comment
jfinkhaeuser Apr 2, 2019
e69a6da
Run rustfmt over everything.
jfinkhaeuser Apr 3, 2019
1c86595
Merge pull request #24 from jfinkhaeuser/data-directory
siman Apr 3, 2019
cd5bf5f
Merge pull request #26 from jfinkhaeuser/content-directory
siman Apr 3, 2019
e6926b5
Merge pull request #29 from jfinkhaeuser/rustfmt
siman Apr 3, 2019
d915101
substrate upgrade: export StakerStatus
mnaamani Apr 3, 2019
af64bbb
Merge branch 'development' into update-substrate
mnaamani Apr 3, 2019
514c5b1
rustfmt
mnaamani Apr 3, 2019
a60d625
fix warnings: keep no_std cfg attribute only in crate root
mnaamani Apr 3, 2019
66c78a4
substrate upgrade: fix warnings in test not handling return value
mnaamani Apr 3, 2019
dfc35d6
fix warning in migrations, cannot deal with error result
mnaamani Apr 3, 2019
f2f349f
fix additional warnings in tests
mnaamani Apr 3, 2019
f667a5b
substrate upgrade: bump runtime version
mnaamani Apr 3, 2019
64859e7
Cargo.lock to go along with version bump
mnaamani Apr 3, 2019
faf234a
warnings: remove unused imports
mnaamani Apr 3, 2019
3d7ff42
substrate upgrade: use substrate v1.0.0rc1
mnaamani Apr 3, 2019
044a9e5
substrate upgrade: fix english spelling of methods in impl_runtime_apis!
mnaamani Apr 3, 2019
9ecf2f4
substrate upgrade: use ReservableCurrency trait
mnaamani Apr 3, 2019
62b9d21
substrate upgrade: fix timestamp api
mnaamani Apr 3, 2019
ef428be
substrate upgrade: fix tests
mnaamani Apr 3, 2019
5ce1912
substrate upgrade: fix warnings about unused result values in tests
mnaamani Apr 3, 2019
147b06d
substrate upgrade: update impl_runtime_apis!
mnaamani Apr 3, 2019
1d75e1a
substrate upgrade: enable GRANDPA
mnaamani Apr 3, 2019
69ab23d
disable creation of account indices
mnaamani Apr 4, 2019
a2cc6f7
substrate upgrade: support both ed and sr signature schemes for accou…
mnaamani Apr 4, 2019
f96bf2e
Add use of staked storage provider roles to storage subsystem.
jfinkhaeuser Apr 4, 2019
4d67a7e
Nope, no issue with badly initialized storage, just an issue with my
jfinkhaeuser Apr 4, 2019
80d1b4f
After a discussion with Mokhtar, add a fix and a simplification.
jfinkhaeuser Apr 4, 2019
47f6729
add storage role at genesis with default params
mnaamani Apr 5, 2019
80bd88b
actors: give RequestLifeTime config a name
mnaamani Apr 5, 2019
2b2e463
More idiomatic rust
jfinkhaeuser Apr 5, 2019
afba5aa
Merge pull request #31 from jfinkhaeuser/staked-storage-provider
mnaamani Apr 5, 2019
9a6f5de
Merge branch 'development' into update-substrate
mnaamani Apr 5, 2019
e40dcfa
fix storage mocks for latest substrate
mnaamani Apr 6, 2019
5c37eee
roles: update bondage mechanism to use LockableCurrency trait
mnaamani Apr 6, 2019
2179066
substarte update: track upstream branch v1.0
mnaamani Apr 8, 2019
74c8e0a
WIP: Refactor a storage module and integrate it with UI
siman Apr 9, 2019
73e8916
substrate update: change UK spelling to US
mnaamani Apr 10, 2019
b551c6e
Merge remote-tracking branch 'siman/storage-ui-integration' into upda…
mnaamani Apr 10, 2019
cf69ffe
Merge pull request #28 from mnaamani/update-substrate
siman Apr 10, 2019
e860ddd
hookup OnSessionChange to grandpa::SyncedAuthorities<Runtime>
mnaamani Apr 10, 2019
eae109b
implement our own CurrencyToVoteHandler to better match our currency …
mnaamani Apr 11, 2019
d464e2f
fixing storage runtime tests
mnaamani Apr 11, 2019
e649d65
storage tests: update tests for ContentAdded event
mnaamani Apr 11, 2019
8c62ed1
fix uk spelling
mnaamani Apr 11, 2019
bf905e4
add configuration for fallback storage provider
mnaamani Apr 12, 2019
a172644
Merge pull request #35 from mnaamani/fix-session-runtime-configuration
mnaamani Apr 14, 2019
21c684b
Merge pull request #39 from mnaamani/storage-provider-config
mnaamani Apr 14, 2019
0aadcbf
Merge pull request #37 from mnaamani/fix-storage-tests
mnaamani Apr 14, 2019
a789a9c
set runtime and package version to v5.1.0
mnaamani Apr 14, 2019
e7b3b21
update to latest commit on substrate v1.0 branch
mnaamani Apr 14, 2019
bc82560
Merge pull request #40 from mnaamani/prepare-athens-release
mnaamani Apr 14, 2019
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
Prev Previous commit
Next Next commit
add configuration for fallback storage provider
  • Loading branch information
mnaamani committed Apr 12, 2019
commit bf905e42b03e3945d0127ff750f262e28cb719c9
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("joystream-node"),
impl_name: create_runtime_str!("joystream-node"),
authoring_version: 4,
spec_version: 1,
spec_version: 3,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
};
Expand Down
16 changes: 15 additions & 1 deletion src/storage/data_directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ decl_storage! {

MetadataByContentId get(metadata_by_content_id):
map T::ContentId => Option<ContentMetadata<T>>;

// Default storage provider address
pub StorageProviderAddress get(storage_provider_address): Vec<u8>;
// Default storage provider repository id
pub StorageProviderRepoId get(storage_provider_repo_id): Vec<u8>;
}
}

Expand Down Expand Up @@ -258,11 +263,20 @@ decl_module! {
<MetadataByContentId<T>>::insert(&content_id, meta);
Self::deposit_event(RawEvent::MetadataUpdated(content_id, who));
}

// Sudo methods

fn set_storage_provider_repo_id(repo_id: Vec<u8>) {
<StorageProviderRepoId<T>>::put(repo_id);
}

fn set_storage_provider_address(address: Vec<u8>) {
<StorageProviderAddress<T>>::put(address);
}
}
}

impl<T: Trait> ContentIdExists<T> for Module<T> {

fn has_content(content_id: &T::ContentId) -> bool {
Self::data_object_by_content_id(content_id.clone()).is_some()
}
Expand Down