Skip to content

Commit 426be98

Browse files
Alain Brenzikoferbrenzi
Alain Brenzikofer
authored andcommitted
migrating substraTEE-node to v2.0.0-alpha.6, based on fresh node-template. builds. error "unknown version" when starting
1 parent 6aa91b6 commit 426be98

31 files changed

+2008
-273
lines changed

Cargo.lock

+219-135
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[workspace]
22
members = [
33
'node',
4-
'pallets/template',
4+
'pallets/substratee-registry',
5+
'pallets/substratee-registry/host-calls',
56
'runtime',
67
]
78
[profile.release]

Jenkinsfile

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
pipeline {
2+
agent {
3+
node {
4+
label 'rust&&sgx'
5+
}
6+
}
7+
options {
8+
timeout(time: 2, unit: 'HOURS')
9+
buildDiscarder(logRotator(numToKeepStr: '14'))
10+
}
11+
stages {
12+
stage('Environment') {
13+
steps {
14+
sh './ci/install_rust.sh'
15+
}
16+
}
17+
stage('Build') {
18+
steps {
19+
sh 'cargo build | tee build.log'
20+
}
21+
}
22+
stage('Test') {
23+
steps {
24+
echo 'Stage TEST'
25+
sh 'cargo test --all'
26+
}
27+
}
28+
stage('Clippy') {
29+
steps {
30+
sh 'cargo clean'
31+
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
32+
sh 'cargo +nightly-2019-11-25 clippy 2>&1 | tee clippy.log'
33+
}
34+
}
35+
}
36+
stage('Formatter') {
37+
steps {
38+
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
39+
sh 'cargo fmt -- --check > ${WORKSPACE}/fmt.log'
40+
}
41+
}
42+
}
43+
stage('Results') {
44+
steps {
45+
recordIssues(
46+
aggregatingResults: true,
47+
enabledForFailure: true,
48+
qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
49+
tools: [
50+
cargo(
51+
pattern: 'build.log',
52+
reportEncoding: 'UTF-8'
53+
),
54+
groovyScript(
55+
parserId:'clippy-warnings',
56+
pattern: 'clippy.log',
57+
reportEncoding: 'UTF-8'
58+
),
59+
groovyScript(
60+
parserId:'clippy-errors',
61+
pattern: 'clippy.log',
62+
reportEncoding: 'UTF-8'
63+
)
64+
]
65+
)
66+
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
67+
sh './ci/check_fmt_log.sh'
68+
}
69+
}
70+
}
71+
stage('Archive build output') {
72+
steps {
73+
archiveArtifacts artifacts: '*.log'
74+
}
75+
}
76+
}
77+
post {
78+
unsuccessful {
79+
emailext (
80+
subject: "Jenkins Build '${env.JOB_NAME} [${env.BUILD_NUMBER}]' is ${currentBuild.currentResult}",
81+
body: "${env.JOB_NAME} build ${env.BUILD_NUMBER} is ${currentBuild.currentResult}\n\nMore info at: ${env.BUILD_URL}",
82+
to: "${env.RECIPIENTS_SUBSTRATEE}"
83+
)
84+
}
85+
always {
86+
cleanWs()
87+
}
88+
}
89+
}

LICENSE

+201-24
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,201 @@
1-
This is free and unencumbered software released into the public domain.
2-
3-
Anyone is free to copy, modify, publish, use, compile, sell, or
4-
distribute this software, either in source code form or as a compiled
5-
binary, for any purpose, commercial or non-commercial, and by any
6-
means.
7-
8-
In jurisdictions that recognize copyright laws, the author or authors
9-
of this software dedicate any and all copyright interest in the
10-
software to the public domain. We make this dedication for the benefit
11-
of the public at large and to the detriment of our heirs and
12-
successors. We intend this dedication to be an overt act of
13-
relinquishment in perpetuity of all present and future rights to this
14-
software under copyright law.
15-
16-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19-
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22-
OTHER DEALINGS IN THE SOFTWARE.
23-
24-
For more information, please refer to <http://unlicense.org>
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

README.md

+5-33
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# Substrate Node Template
1+
# substraTEE-node
22

3-
A new Substrate node, ready for hacking. This node includes:
3+
This repository belongs to the [substraTEE project](https://github.com/scs/substraTEE).
44

5-
* A FRAME-based runtime
6-
* A template pallet
7-
* Aura block authoring
8-
* Grandpa finality gadget
5+
A substrate-based node that maintains a registry of remote attested substraTEE-worker enclaves. The node also acts as a proxy for encrypted requests which are forwarded to the substraTEE-worker.
96

107
## Build
118

@@ -34,13 +31,13 @@ cargo build --release
3431
Purge any existing developer chain state:
3532

3633
```bash
37-
./target/release/node-template purge-chain --dev
34+
./target/release/substratee-node purge-chain --dev
3835
```
3936

4037
Start a development chain with:
4138

4239
```bash
43-
./target/release/node-template --dev
40+
./target/release/substratee-node --dev
4441
```
4542

4643
Detailed logs may be shown by running the node with the following environment variables set: `RUST_LOG=debug RUST_BACKTRACE=1 cargo run -- --dev`.
@@ -80,28 +77,3 @@ cargo run -- \
8077

8178
Additional CLI usage options are available and may be shown by running `cargo run -- --help`.
8279

83-
## Advanced: Generate Your Own Substrate Node Template
84-
85-
A substrate node template is always based on a certain version of Substrate. You can inspect it by
86-
opening [Cargo.toml](Cargo.toml) and see the template referred to a specific Substrate commit(
87-
`rev` field), branch, or version.
88-
89-
You can generate your own Substrate node-template based on a particular Substrate
90-
version/commit by running following commands:
91-
92-
```bash
93-
# git clone from the main Substrate repo
94-
git clone https://github.com/paritytech/substrate.git
95-
cd substrate
96-
97-
# Switch to a particular branch or commit of the Substrate repo your node-template based on
98-
git checkout <branch/tag/sha1>
99-
100-
# Run the helper script to generate a node template.
101-
# This script compiles Substrate and takes a while to complete. It takes a relative file path
102-
# from the current dir. to output the compressed node template.
103-
.maintain/node-template-release.sh ../node-template.tar.gz
104-
```
105-
106-
Noted though you will likely get faster and more thorough support if you stick with the releases
107-
provided in this repository.

0 commit comments

Comments
 (0)