Skip to content

Commit a0fdc5e

Browse files
learnforpracticelearnforpractice
committed
merge from eosio/master
2 parents 97a4397 + 0f6695c commit a0fdc5e

File tree

133 files changed

+5955
-3239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+5955
-3239
lines changed

‎.buildkite/pipeline.yml

Lines changed: 146 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ steps:
9696
echo "--- :m: Starting MongoDB" && \
9797
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
9898
echo "+++ :microscope: Running tests" && \
99-
ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -LE long_running_tests --output-on-failure
99+
ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
100100
retry:
101101
automatic:
102102
limit: 1
@@ -108,6 +108,26 @@ steps:
108108
- "build/genesis.json"
109109
- "build/config.ini"
110110
timeout: 60
111+
112+
- command: |
113+
echo "--- :arrow_down: Downloading build directory" && \
114+
buildkite-agent artifact download "build.tar.gz" . --step ":darwin: Build" && \
115+
tar -zxf build.tar.gz && \
116+
echo "--- :m: Starting MongoDB" && \
117+
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
118+
echo "+++ :microscope: Running tests" && \
119+
ln -s "$(pwd)" /data/job && cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
120+
retry:
121+
automatic:
122+
limit: 1
123+
label: ":darwin: NP Tests"
124+
agents:
125+
- "role=macos-tester"
126+
artifact_paths:
127+
- "mongod.log"
128+
- "build/genesis.json"
129+
- "build/config.ini"
130+
timeout: 60
111131
112132
- command: |
113133
echo "--- :arrow_down: Downloading build directory" && \
@@ -116,7 +136,7 @@ steps:
116136
echo "--- :m: Starting MongoDB" && \
117137
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
118138
echo "+++ :microscope: Running tests" && \
119-
cd /data/job/build && ctest -LE long_running_tests --output-on-failure
139+
cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
120140
retry:
121141
automatic:
122142
limit: 1
@@ -132,6 +152,30 @@ steps:
132152
image: "eosio/ci:ubuntu"
133153
workdir: /data/job
134154
timeout: 60
155+
156+
- command: |
157+
echo "--- :arrow_down: Downloading build directory" && \
158+
buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Build" && \
159+
tar -zxf build.tar.gz && \
160+
echo "--- :m: Starting MongoDB" && \
161+
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
162+
echo "+++ :microscope: Running tests" && \
163+
cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
164+
retry:
165+
automatic:
166+
limit: 1
167+
label: ":ubuntu: NP Tests"
168+
agents:
169+
- "role=linux-tester"
170+
artifact_paths:
171+
- "mongod.log"
172+
- "build/genesis.json"
173+
- "build/config.ini"
174+
plugins:
175+
docker#v1.4.0:
176+
image: "eosio/ci:ubuntu"
177+
workdir: /data/job
178+
timeout: 60
135179
136180
- command: |
137181
echo "--- :arrow_down: Downloading build directory" && \
@@ -140,7 +184,7 @@ steps:
140184
echo "--- :m: Starting MongoDB" && \
141185
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
142186
echo "+++ :microscope: Running tests" && \
143-
cd /data/job/build && ctest -LE long_running_tests --output-on-failure
187+
cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
144188
retry:
145189
automatic:
146190
limit: 1
@@ -157,14 +201,38 @@ steps:
157201
workdir: /data/job
158202
timeout: 60
159203
204+
- command: |
205+
echo "--- :arrow_down: Downloading build directory" && \
206+
buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: 18.04 Build" && \
207+
tar -zxf build.tar.gz && \
208+
echo "--- :m: Starting MongoDB" && \
209+
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
210+
echo "+++ :microscope: Running tests" && \
211+
cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
212+
retry:
213+
automatic:
214+
limit: 1
215+
label: ":ubuntu: 18.04 NP Tests"
216+
agents:
217+
- "role=linux-tester"
218+
artifact_paths:
219+
- "mongod.log"
220+
- "build/genesis.json"
221+
- "build/config.ini"
222+
plugins:
223+
docker#v1.4.0:
224+
image: "eosio/ci:ubuntu18"
225+
workdir: /data/job
226+
timeout: 60
227+
160228
- command: |
161229
echo "--- :arrow_down: Downloading build directory" && \
162230
buildkite-agent artifact download "build.tar.gz" . --step ":fedora: Build" && \
163231
tar -zxf build.tar.gz && \
164232
echo "--- :m: Starting MongoDB" && \
165233
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
166234
echo "+++ :microscope: Running tests" && \
167-
cd /data/job/build && ctest -LE long_running_tests --output-on-failure
235+
cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
168236
retry:
169237
automatic:
170238
limit: 1
@@ -181,14 +249,38 @@ steps:
181249
workdir: /data/job
182250
timeout: 60
183251
252+
- command: |
253+
echo "--- :arrow_down: Downloading build directory" && \
254+
buildkite-agent artifact download "build.tar.gz" . --step ":fedora: Build" && \
255+
tar -zxf build.tar.gz && \
256+
echo "--- :m: Starting MongoDB" && \
257+
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
258+
echo "+++ :microscope: Running tests" && \
259+
cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
260+
retry:
261+
automatic:
262+
limit: 1
263+
label: ":fedora: NP Tests"
264+
agents:
265+
- "role=linux-tester"
266+
artifact_paths:
267+
- "mongod.log"
268+
- "build/genesis.json"
269+
- "build/config.ini"
270+
plugins:
271+
docker#v1.4.0:
272+
image: "eosio/ci:fedora"
273+
workdir: /data/job
274+
timeout: 60
275+
184276
- command: |
185277
echo "--- :arrow_down: Downloading build directory" && \
186278
buildkite-agent artifact download "build.tar.gz" . --step ":centos: Build" && \
187279
tar -zxf build.tar.gz && \
188280
echo "--- :m: Starting MongoDB" && \
189281
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
190282
echo "+++ :microscope: Running tests" && \
191-
cd /data/job/build && ctest -LE long_running_tests --output-on-failure
283+
cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
192284
retry:
193285
automatic:
194286
limit: 1
@@ -205,14 +297,38 @@ steps:
205297
workdir: /data/job
206298
timeout: 60
207299
300+
- command: |
301+
echo "--- :arrow_down: Downloading build directory" && \
302+
buildkite-agent artifact download "build.tar.gz" . --step ":centos: Build" && \
303+
tar -zxf build.tar.gz && \
304+
echo "--- :m: Starting MongoDB" && \
305+
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
306+
echo "+++ :microscope: Running tests" && \
307+
cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
308+
retry:
309+
automatic:
310+
limit: 1
311+
label: ":centos: NP Tests"
312+
agents:
313+
- "role=linux-tester"
314+
artifact_paths:
315+
- "mongod.log"
316+
- "build/genesis.json"
317+
- "build/config.ini"
318+
plugins:
319+
docker#v1.4.0:
320+
image: "eosio/ci:centos"
321+
workdir: /data/job
322+
timeout: 60
323+
208324
- command: |
209325
echo "--- :arrow_down: Downloading build directory" && \
210326
buildkite-agent artifact download "build.tar.gz" . --step ":aws: Build" && \
211327
tar -zxf build.tar.gz && \
212328
echo "--- :m: Starting MongoDB" && \
213329
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
214330
echo "+++ :microscope: Running tests" && \
215-
cd /data/job/build && ctest -LE long_running_tests --output-on-failure
331+
cd /data/job/build && ctest -j8 -LE _tests --output-on-failure
216332
retry:
217333
automatic:
218334
limit: 1
@@ -228,3 +344,27 @@ steps:
228344
image: "eosio/ci:amazonlinux"
229345
workdir: /data/job
230346
timeout: 60
347+
348+
- command: |
349+
echo "--- :arrow_down: Downloading build directory" && \
350+
buildkite-agent artifact download "build.tar.gz" . --step ":aws: Build" && \
351+
tar -zxf build.tar.gz && \
352+
echo "--- :m: Starting MongoDB" && \
353+
$(which mongod) --fork --logpath "$(pwd)"/mongod.log && \
354+
echo "+++ :microscope: Running tests" && \
355+
cd /data/job/build && ctest -L nonparallelizable_tests --output-on-failure
356+
retry:
357+
automatic:
358+
limit: 1
359+
label: ":aws: NP Tests"
360+
agents:
361+
- "role=linux-tester"
362+
artifact_paths:
363+
- "mongod.log"
364+
- "build/genesis.json"
365+
- "build/config.ini"
366+
plugins:
367+
docker#v1.4.0:
368+
image: "eosio/ci:amazonlinux"
369+
workdir: /data/job
370+
timeout: 60

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@
5151
[submodule "externals/lua_sandbox"]
5252
path = externals/lua_sandbox
5353
url = https://github.com/learnforpractice/lua_sandbox.git
54+
[submodule "libraries/wabt"]
55+
path = libraries/wabt
56+
url = http://github.com/EOSIO/wabt

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ set( CMAKE_CXX_EXTENSIONS ON )
7171
set( CXX_STANDARD_REQUIRED ON)
7272

7373
set(VERSION_MAJOR 1)
74-
set(VERSION_MINOR 2)
75-
set(VERSION_PATCH 2)
74+
set(VERSION_MINOR 3)
75+
set(VERSION_PATCH 0)
7676

7777
set( CLI_CLIENT_EXECUTABLE_NAME cleos )
7878
set( NODE_EXECUTABLE_NAME nodeos )

‎CMakeModules/EosioTester.cmake.in

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ endif()
5050
find_library(libbinaryen binaryen @CMAKE_INSTALL_FULL_LIBDIR@)
5151
find_library(libwasm WASM @CMAKE_INSTALL_FULL_LIBDIR@)
5252
find_library(libwast WAST @CMAKE_INSTALL_FULL_LIBDIR@)
53+
find_library(libwabt wabt @CMAKE_INSTALL_FULL_LIBDIR@)
5354
find_library(libir IR @CMAKE_INSTALL_FULL_LIBDIR@)
5455
find_library(libplatform Platform @CMAKE_INSTALL_FULL_LIBDIR@)
5556
find_library(liblogging Logging @CMAKE_INSTALL_FULL_LIBDIR@)
@@ -59,7 +60,13 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
5960
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
6061
find_library(libchainbase chainbase @CMAKE_INSTALL_FULL_LIBDIR@)
6162
find_library(libbuiltins builtins @CMAKE_INSTALL_FULL_LIBDIR@)
62-
find_library(libsecp256k1 secp256k1 @Secp256k1_ROOT_DIR@/lib)
63+
find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_FULL_LIBDIR@)
64+
find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
65+
HINTS ENV GMP_LIB_DIR
66+
ENV GMP_DIR
67+
PATH_SUFFIXES lib
68+
DOC "Path to the GMP library"
69+
)
6370

6471
macro(add_eosio_test test_name)
6572
add_executable( ${test_name} ${ARGN} )
@@ -71,6 +78,7 @@ macro(add_eosio_test test_name)
7178
${libbinaryen}
7279
${libwast}
7380
${libwasm}
81+
${libwabt}
7482
${libruntime}
7583
${libplatform}
7684
${libir}
@@ -80,6 +88,7 @@ macro(add_eosio_test test_name)
8088
${liblogging}
8189
${libchainbase}
8290
${libbuiltins}
91+
${GMP_LIBRARIES}
8392
${libsecp256k1}
8493

8594
LLVMX86Disassembler

‎CMakeModules/EosioTesterBuild.cmake.in

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ find_library(libbinaryen binaryen @CMAKE_BINARY_DIR@/externals/binaryen/lib)
5151
find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM)
5252
find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST)
5353
find_library(libir IR @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR)
54+
find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt)
5455
find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform)
5556
find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging)
5657
find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime)
@@ -59,7 +60,13 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
5960
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
6061
find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase)
6162
find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins)
62-
find_library(libsecp256k1 secp256k1 @Secp256k1_ROOT_DIR@/lib)
63+
find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
64+
find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
65+
HINTS ENV GMP_LIB_DIR
66+
ENV GMP_DIR
67+
PATH_SUFFIXES lib
68+
DOC "Path to the GMP library"
69+
)
6370

6471
macro(add_eosio_test test_name)
6572
add_executable( ${test_name} ${ARGN} )
@@ -71,6 +78,7 @@ macro(add_eosio_test test_name)
7178
${libbinaryen}
7279
${libwast}
7380
${libwasm}
81+
${libwabt}
7482
${libruntime}
7583
${libplatform}
7684
${libir}
@@ -80,6 +88,7 @@ macro(add_eosio_test test_name)
8088
${liblogging}
8189
${libchainbase}
8290
${libbuiltins}
91+
${GMP_LIBRARIES}
8392
${libsecp256k1}
8493

8594
LLVMX86Disassembler

‎Docker/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG symbol=SYS
55
RUN git clone -b $branch https://github.com/EOSIO/eos.git --recursive \
66
&& cd eos && echo "$branch:$(git rev-parse HEAD)" > /etc/eosio-version \
77
&& cmake -H. -B"/tmp/build" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
8-
-DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build -DSecp256k1_ROOT_DIR=/usr/local -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
8+
-DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX=/tmp/build -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
99
&& cmake --build /tmp/build --target install && rm /tmp/build/bin/eosiocpp
1010

1111

@@ -21,5 +21,4 @@ COPY --from=builder /eos/Docker/nodeosd.sh /opt/eosio/bin/nodeosd.sh
2121
ENV EOSIO_ROOT=/opt/eosio
2222
RUN chmod +x /opt/eosio/bin/nodeosd.sh
2323
ENV LD_LIBRARY_PATH /usr/local/lib
24-
VOLUME /opt/eosio/bin/data-dir
2524
ENV PATH /opt/eosio/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

‎Docker/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ cd eos/Docker
2020
docker build . -t eosio/eos
2121
```
2222

23-
The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.2.2 tag, you could do the following:
23+
The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.3.0 tag, you could do the following:
2424

2525
```bash
26-
docker build -t eosio/eos:v1.2.2 --build-arg branch=v1.2.2 .
26+
docker build -t eosio/eos:v1.3.0 --build-arg branch=v1.3.0 .
2727
```
2828

2929
By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

‎Docker/builder/Dockerfile

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,9 @@ RUN git clone --depth 1 --single-branch --branch release_40 https://github.com/l
5050
&& cmake --build build --target install \
5151
&& cd .. && rm -rf llvm
5252

53-
RUN wget https://github.com/WebAssembly/binaryen/archive/1.37.21.tar.gz -O - | tar -xz \
54-
&& cd binaryen-1.37.21 \
55-
&& cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release \
56-
&& cmake --build build --target install \
57-
&& cd .. && rm -rf binaryen-1.37.21
58-
59-
RUN git clone --depth 1 https://github.com/cryptonomex/secp256k1-zkp \
60-
&& cd secp256k1-zkp \
61-
&& ./autogen.sh \
62-
&& ./configure --prefix=/usr/local \
63-
&& make -j$(nproc) install \
64-
&& cd .. && rm -rf secp256k1-zkp
65-
6653
RUN git clone --depth 1 -b releases/v3.3 https://github.com/mongodb/mongo-cxx-driver \
6754
&& cd mongo-cxx-driver/build \
6855
&& cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. \
6956
&& make -j$(nproc) \
7057
&& make install \
7158
&& cd ../../ && rm -rf mongo-cxx-driver
72-
73-
RUN git clone --depth 1 --single-branch --branch master https://github.com/ucb-bar/berkeley-softfloat-3.git \
74-
&& cd berkeley-softfloat-3/build/Linux-x86_64-GCC \
75-
&& make -j${nproc} SPECIALIZE_TYPE="8086-SSE" SOFTFLOAT_OPS="-DSOFTFLOAT_ROUND_EVEN -DINLINE_LEVEL=5 -DSOFTFLOAT_FAST_DIV32TO16 -DSOFTFLOAT_FAST_DIV64TO32" \
76-
&& mkdir -p /opt/berkeley-softfloat-3 && cp softfloat.a /opt/berkeley-softfloat-3/libsoftfloat.a \
77-
&& mv ../../source/include /opt/berkeley-softfloat-3/include && cd - && rm -rf berkeley-softfloat-3
78-
79-
ENV SOFTFLOAT_ROOT /opt/berkeley-softfloat-3

0 commit comments

Comments
 (0)