Skip to content
Open

Aura #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f77efda
move to alpha.6
Apr 15, 2020
12eec5c
move testing to alpha.6
Apr 15, 2020
fd0dfc9
push to dev
Apr 16, 2020
25f2878
working with api client
Apr 16, 2020
d99d846
bump version
Apr 16, 2020
0eafdab
update to latest breaking substrate changes
Apr 16, 2020
4ec0005
bump to 0.5.4
Apr 16, 2020
c6ab14b
update Cargo.lock
Apr 16, 2020
3f08b5e
Deps: lock all dependencies on commit hash
Apr 21, 2020
9cf3613
move babe to aura
Apr 27, 2020
593a490
modify gitignore
Apr 27, 2020
339a272
add init script
Apr 27, 2020
d53bfbe
modify pull request hook
Apr 27, 2020
1c16b18
change syracuse testnet config
Apr 27, 2020
c886fb2
fix types and native name
Apr 29, 2020
385f435
fix json lib
Apr 29, 2020
87f8e82
change DAI price source
Apr 29, 2020
770a55e
bump spec version
Apr 30, 2020
3b76ceb
remove log from spec
Apr 30, 2020
2229191
change chain_spec structure
Apr 30, 2020
1eec3b1
bump node version
Apr 30, 2020
f0be086
add parsing tests for oracle
Apr 30, 2020
89905d8
add logs for json value
Apr 30, 2020
e6d02d3
add logs for json value2
Apr 30, 2020
ea5e408
add logs before json parsing
May 1, 2020
1be5a30
rename testnet
May 1, 2020
d457516
bump to 0.5.7
May 1, 2020
fb203d0
bump spec version
May 1, 2020
5c75bad
seems legit bad BadProof offchain worker is gotta go
May 5, 2020
93abdf6
remove offchain worker
May 5, 2020
f89a727
remove lock files for binary
May 5, 2020
35b2d28
devhub like dailing build
May 6, 2020
23ae731
rebased to substrate-developer-template bacause of .lock issues (alph…
May 12, 2020
4529369
add lock file and help scripts
May 12, 2020
e41b9e3
add script to populate keys
May 12, 2020
3c9523d
freeze scripts
May 12, 2020
1f247e3
fix marketplace store getter
May 12, 2020
3138fb1
update to alpha.7
May 14, 2020
16f4da5
fix ExhaustedResource error
May 14, 2020
584355a
bump spec version
May 14, 2020
b1be156
change weight to 0
May 14, 2020
1fd66ca
bump node to 3.10 and runtime to 0.5.12
May 14, 2020
e10514f
add lockfile
May 14, 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
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v1
- name: Install latest nightly and wasm utils
run: sh scripts/init.sh
- name: Build runtime
run: cargo build --verbose
- name: Build node
run: cd node && cargo build --verbose
- name: Runtime tests
run: cargo test -p akropolisos-runtime
run: cd runtime && cargo test
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@

# These are backup files generated by rustfmt
**/*.rs.bk

res/
# Ignore swap files
*.swp

# Bridge frontend
/bridge/frontend/.cache
/bridge/frontend/node_modules
/bridge/frontend/dist

# Code editors
.vscode

Expand Down
8,910 changes: 3,341 additions & 5,569 deletions Cargo.lock

Large diffs are not rendered by default.

186 changes: 12 additions & 174 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,175 +1,13 @@
[package]
authors = ['Akropolis <admin@akropolis.io>']
edition = '2018'
name = 'akropolisos-node'
version = '0.3.3'

[dependencies]
error-chain = '0.12'
exit-future = '0.1'
futures = '0.3.1'
hex-literal = "0.2.1"
log = '0.4.8'
parity-codec = '3.2'
parking_lot = '0.9.0'
tokio = '0.1.22'
jsonrpc-core = "14.0.3"
trie-root = '0.15.2'
js-sys = '0.3.35'
chrono = '0.4.7'
#dotenv = "0.15.0"
structopt = { version = "0.3.8", optional = true }
serde = { version = "1.0.102", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false }
node-cli = { path = "./cli", features = ["cli"] }
akropolisos-runtime = { path = 'runtime' }

[profile.release]
panic = 'unwind'

[build-dependencies]
vergen = '3.0.4'
chrono = '0.4.10'

[dependencies.benchmarking]
git = 'https://github.com/paritytech/substrate.git'
package = 'frame-benchmarking-cli'
version = '2.0.0-alpha.5'
optional = true

[dependencies.grandpa-primitives]
git = 'https://github.com/paritytech/substrate.git'
package = 'sp-finality-grandpa'
version = '2.0.0-alpha.5'

[dependencies.sp-core]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-runtime]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-transaction-pool]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-timestamp]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-finality-tracker]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-inherents]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-keyring]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-io]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sp-consensus]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.grandpa]
git = 'https://github.com/paritytech/substrate.git'
package = 'sc-finality-grandpa'
version = '0.8.0-alpha.5'

[dependencies.sc-authority-discovery]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-basic-authorship]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-consensus-babe]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-client-db]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-client-api]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sc-offchain]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sc-rpc]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sc-cli]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-client]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-chain-spec]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.sc-executor]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-network]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-service]
git = 'https://github.com/paritytech/substrate.git'
version = '0.8.0-alpha.5'

[dependencies.sc-transaction-pool]
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.telemetry]
git = 'https://github.com/paritytech/substrate.git'
package = 'sc-telemetry'
version = '2.0.0-alpha.5'

[dependencies.pallet-contracts]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.pallet-transaction-payment]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.pallet-im-online]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '2.0.0-alpha.5'

[dependencies.system]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'frame-system'
version = '2.0.0-alpha.5'

[dependencies.node-transaction-factory]
git = 'https://github.com/paritytech/substrate.git'
version = "0.8.0-alpha.5"

[workspace]
members = ['runtime', 'cli', 'rpc', 'executor']
members = [
'node',
# 'pallets/bridge',
# 'pallets/dao',
# 'pallets/marketplace',
# 'pallets/oracle',
# 'pallets/token',
# 'pallets/types',
'runtime',
]
[profile.release]
panic = 'unwind'
37 changes: 20 additions & 17 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
MIT License
This is free and unencumbered software released into the public domain.

Copyright (c) 2019 Akropolis.io
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
For more information, please refer to <http://unlicense.org>
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,13 @@ This guide will walk you through how to create account and how to connect to Akr
```bash

{
"Address": "AccountId",
"LookupSource": "AccountId",
"Weight": "u32",
"Count": "u64",
"DaoId": "u64",
"MemberId": "u64",
"ProposalId": "u64",
"TokenBalance": "u128",
"VotesCount": "MemberId",
"TokenId": "u32",
"Days": "u32",
Expand Down Expand Up @@ -169,11 +171,12 @@ This guide will walk you through how to create account and how to connect to Akr
},
"TransferMessage": {
"message_id": "H256",
"token": "TokenId",
"eth_address": "H160",
"substrate_address": "AccountId",
"amount": "TokenBalance",
"amount": "Balance",
"status": "Status",
"direction": "Status"
"action": "Status"
},
"LimitMessage": {
"id": "H256",
Expand Down
3 changes: 0 additions & 3 deletions bridge/dai-home/.babelrc

This file was deleted.

3 changes: 0 additions & 3 deletions bridge/dai-home/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions bridge/dai-home/LICENSE

This file was deleted.

2 changes: 0 additions & 2 deletions bridge/dai-home/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions bridge/dai-home/contracts/Migrations.sol

This file was deleted.

Loading