Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
20104e9
Make availability-store compile for WASM
tomaka Nov 28, 2019
6f97dbb
Use --manifest-path instead
tomaka Nov 28, 2019
db7eaa6
Merge branch 'master' into wasm-start
tomaka Nov 28, 2019
b45a95c
Merge remote-tracking branch 'tomaka/wasm-start' into HEAD
expenses Nov 29, 2019
cceb6b7
Make validation work on wasm!
expenses Nov 29, 2019
2ab282f
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Nov 29, 2019
aaf5e55
Switch to Spawn trait
expenses Nov 29, 2019
96f1a99
Migrate validation to std futures
expenses Nov 29, 2019
322cca5
Migrate network to std futures
expenses Nov 29, 2019
1c9cf04
Final changes to validation
expenses Nov 30, 2019
7356325
Tidy up network
expenses Nov 30, 2019
0c4fe83
Tidy up validation
expenses Nov 30, 2019
93fb642
Switch branch
expenses Dec 1, 2019
119f082
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 1, 2019
04ffe72
Migrate service
expenses Dec 1, 2019
408288b
Get polkadot to compile via wasm!
expenses Dec 1, 2019
e5e399c
Add browser-demo
expenses Dec 2, 2019
868f6e5
Add initial browser file
expenses Dec 2, 2019
5b33b7a
Add browser-demo
expenses Dec 2, 2019
31a88a9
Tidy
expenses Dec 2, 2019
a03a980
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 2, 2019
af88a87
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 2, 2019
4e1da88
Temp switch back to substrate/master
expenses Dec 3, 2019
832f805
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 4, 2019
da233a1
tidy
expenses Dec 4, 2019
c528dc6
Fix wasm build
expenses Dec 4, 2019
9767f83
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 4, 2019
fcc7f6e
Make use of `runtime_interface` for parachain externalities
bkchr Dec 5, 2019
a247258
Merge remote-tracking branch 'origin/master' into bkchr-parachain-swi…
bkchr Dec 5, 2019
3dd9df5
Merge remote-tracking branch 'origin/master' into bkchr-parachain-swi…
bkchr Dec 6, 2019
6adc1b6
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 6, 2019
2e2311e
Re-add release flag
expenses Dec 6, 2019
98fa4d1
Fix compilation for web
bkchr Dec 8, 2019
8028ef3
Propagate Substrate#4284 to Polkadot
tomaka Dec 9, 2019
d498193
service/src/lib.rs: Register network event stream for authority disc
mxinden Dec 10, 2019
e18795e
Fix tests
tomaka Dec 10, 2019
8083b82
Add the /ws bootnode to the chain specs
tomaka Dec 10, 2019
40fc9fe
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 10, 2019
52f01eb
Copy changes from master
expenses Dec 10, 2019
c092750
Merge remote-tracking branch 'upstream/master' into wip-4284
tomaka Dec 10, 2019
0b1cf02
Switch branch
expenses Dec 10, 2019
db572ae
Switch libp2p and add wasm-timer
expenses Dec 10, 2019
34b64d6
Merge remote-tracking branch 'tomaka/kusama-ws' into ashley-compile-t…
expenses Dec 10, 2019
c8a4721
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 10, 2019
f1213f1
Switch back libp2p and add rand
expenses Dec 11, 2019
7a20034
Fix bootnodes PeerIds
tomaka Dec 11, 2019
003965c
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 11, 2019
4c91384
Merge remote-tracking branch 'tomaka/fix-bootnodes-ids' into ashley-c…
expenses Dec 11, 2019
3322908
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 11, 2019
63e0b7b
use browser indexdb
expenses Dec 11, 2019
9ee1ebf
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 12, 2019
ccbf45d
Merge remote-tracking branch 'upstream/master' into wip-4284
tomaka Dec 12, 2019
5e9579b
Fixes
tomaka Dec 12, 2019
ca39c11
Switch to sc-browser!
expenses Dec 12, 2019
e57b7d6
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 13, 2019
52ff3a4
Merge remote-tracking branch 'parity/master' into HEAD
expenses Dec 13, 2019
e50247d
Use hash part of fund id as child unique id.
cheme Dec 2, 2019
8c7a548
Add comma
expenses Dec 16, 2019
a9e6f20
Switch branch
expenses Dec 16, 2019
179a973
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 17, 2019
3c1ba83
Update
expenses Dec 17, 2019
58eb423
run cargo update
expenses Dec 17, 2019
ac6a1d0
Update polkadot-master only
expenses Dec 17, 2019
73f6d7b
Merge cheme's changes
expenses Dec 17, 2019
ed16a7c
Fix collator
expenses Dec 17, 2019
f0de3a7
Merge branch 'ashley-tomaka-wip-4284' into ashley-compile-to-wasm
expenses Dec 17, 2019
1169157
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 17, 2019
f7508ed
Merge branch 'master' into HEAD
bkchr Dec 21, 2019
ac2d2f8
Update `Cargo.lock`
bkchr Dec 21, 2019
d2fdabb
Update substrate
expenses Dec 28, 2019
da1f33f
Merge remote-tracking branch 'parity/bkchr-parachain-switch-to-runtim…
expenses Dec 28, 2019
9323fd3
Fix tokio error in native
expenses Dec 28, 2019
194e10d
Merge remote-tracking branch 'paritytech/master' into authority-disco…
mxinden Jan 3, 2020
019a66d
service/src/lib.rs: Fix futures::stream imports
mxinden Jan 3, 2020
0c947b0
[TMP] *: Replace polkadot-upstream with feature branch
mxinden Jan 3, 2020
d7a305f
Switch branch
expenses Jan 6, 2020
0289a93
Merge remote-tracking branch 'mxinden/authority-discovery-register-ev…
expenses Jan 6, 2020
dd15791
Merge remote-tracking branch 'parity/master' into ashley-browser-utils
expenses Jan 6, 2020
7805886
Small change
expenses Jan 6, 2020
9b25087
Merge branch 'ashley-browser-utils' into ashley-compile-to-wasm
expenses Jan 7, 2020
928cbb9
Merge remote-tracking branch 'parity/master' into ashley-browser-utils
expenses Jan 7, 2020
612fde0
Companion PR to substrate#4542
tomaka Jan 7, 2020
17f00af
Merge remote-tracking branch 'tomaka/companion-4542' into ashley-brow…
expenses Jan 7, 2020
a5e01f5
Revert "Merge remote-tracking branch 'tomaka/companion-4542' into ash…
expenses Jan 7, 2020
0bf35cf
ashley-browser-utils -> ashley-browser-utils-polkadot
expenses Jan 7, 2020
6984d39
Switch branches back
expenses Jan 7, 2020
0a1a877
Merge remote-tracking branch 'parity/master' into ashley-browser-utils
expenses Jan 7, 2020
73380a4
Merge branch 'ashley-browser-utils' into ashley-compile-to-wasm
expenses Jan 7, 2020
a9dc7c2
Switch branch :^)
expenses Jan 7, 2020
30d6978
Re-add wasm-timer changes
expenses Jan 7, 2020
19735cf
Merge branch 'master' into ashley-compile-to-wasm
gavofyork Jan 9, 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
18 changes: 17 additions & 1 deletion Cargo.lock

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

1 change: 1 addition & 0 deletions network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ log = "0.4.8"
exit-future = "0.2.0"
sc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
wasm-timer = "0.2.4"

[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
Expand Down
3 changes: 2 additions & 1 deletion network/src/collator_pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ use sc_network::PeerId;
use futures::channel::oneshot;

use std::collections::hash_map::{HashMap, Entry};
use std::time::{Duration, Instant};
use std::time::Duration;
use wasm_timer::Instant;

const COLLATION_LIFETIME: Duration = Duration::from_secs(60 * 5);

Expand Down
3 changes: 2 additions & 1 deletion network/src/local_collations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
use polkadot_primitives::{Hash, parachain::{ValidatorId}};
use crate::collator_pool::Role;
use std::collections::{HashMap, HashSet};
use std::time::{Duration, Instant};
use std::time::Duration;
use wasm_timer::Instant;

const LIVE_FOR: Duration = Duration::from_secs(60 * 5);

Expand Down