Skip to content

Commit 3134a27

Browse files
anatolseanatolse
committed
Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.0RC' into testnet
2 parents 2c7d050 + e7f3a64 commit 3134a27

File tree

106 files changed

+4523
-2119
lines changed

Some content is hidden

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

106 files changed

+4523
-2119
lines changed

‎.github/workflows/boost_build.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@ jobs:
5555
shell: bash
5656
if: matrix.os == 'ubuntu-16.04'
5757
run: |
58-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
59-
sudo update-alternatives --set gcc "/usr/bin/gcc-9"
58+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
59+
sudo apt-get update
60+
sudo apt-get install g++-7
61+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
62+
sudo update-alternatives --set gcc "/usr/bin/gcc-7"
6063
6164
- name: Download
6265
shell: bash

‎.github/workflows/build.yml‎

Lines changed: 47 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
17-
os: [macos-10.15, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-2019]
17+
os: [macos-10.15, ubuntu-16.04, windows-2019]
18+
#os: [macos-10.15, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-2019]
1819

1920
steps:
2021
- uses: actions/checkout@v2
@@ -42,8 +43,11 @@ jobs:
4243
shell: bash
4344
if: matrix.os == 'ubuntu-16.04'
4445
run: |
45-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
46-
sudo update-alternatives --set gcc "/usr/bin/gcc-9"
46+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
47+
sudo apt-get update
48+
sudo apt-get install g++-7
49+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
50+
sudo update-alternatives --set gcc "/usr/bin/gcc-7"
4751
4852
- name: Create Build Environment [windows]
4953
shell: bash
@@ -146,16 +150,35 @@ jobs:
146150
codesign --deep --force -v -s "${{secrets.MACOS_SIGN_IDENTITY}}" -o runtime --timestamp explorer/explorer-node${{env.BEAM_TARGET_SUFFIX}}
147151
codesign --deep --force -v -s "${{secrets.MACOS_SIGN_IDENTITY}}" -o runtime --timestamp wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}}
148152
153+
- name: Checksum [ubuntu]
154+
if: matrix.os == 'ubuntu-16.04' || matrix.os =='ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
155+
run: |
156+
sha256sum beam/beam-node${{env.BEAM_TARGET_SUFFIX}} > beam/beam-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
157+
sha256sum wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}} > wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
158+
sha256sum wallet/api/wallet-api${{env.BEAM_TARGET_SUFFIX}} > wallet/api/wallet-api${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
159+
sha256sum explorer/explorer-node${{env.BEAM_TARGET_SUFFIX}} > explorer/explorer-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
160+
sha256sum wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}} > wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
161+
162+
- name: Checksum [macos-10.15]
163+
if: matrix.os == 'macos-10.15'
164+
run: |
165+
shasum -a 256 beam/beam-node${{env.BEAM_TARGET_SUFFIX}} > beam/beam-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
166+
shasum -a 256 wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}} > wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
167+
shasum -a 256 wallet/api/wallet-api${{env.BEAM_TARGET_SUFFIX}} > wallet/api/wallet-api${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
168+
shasum -a 256 explorer/explorer-node${{env.BEAM_TARGET_SUFFIX}} > explorer/explorer-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
169+
shasum -a 256 wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}} > wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
170+
149171
- name: Collect [macos-10.15 && ununtu all]
150172
shell: bash
151173
if: matrix.os != 'windows-2019'
152174
run: |
153175
mkdir artifacts
154-
tar -cvf artifacts/beam-node.tar -C beam beam-node${{env.BEAM_TARGET_SUFFIX}} beam-node.cfg
155-
tar -cvf artifacts/beam-wallet.tar -C wallet/cli beam-wallet${{env.BEAM_TARGET_SUFFIX}} beam-wallet.cfg
156-
tar -cvf artifacts/wallet-api.tar -C wallet/api wallet-api${{env.BEAM_TARGET_SUFFIX}} wallet-api.cfg
157-
tar -cvf artifacts/explorer-node.tar -C explorer explorer-node${{env.BEAM_TARGET_SUFFIX}} explorer-node.cfg
158-
tar -cvf artifacts/broadcaster.tar -C wallet/broadcaster broadcaster${{env.BEAM_TARGET_SUFFIX}}
176+
tar -cvf artifacts/beam-node${{env.BEAM_TARGET_SUFFIX}}.tar -C beam beam-node${{env.BEAM_TARGET_SUFFIX}} beam-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt beam-node.cfg
177+
tar -cvf artifacts/beam-wallet${{env.BEAM_TARGET_SUFFIX}}.tar -C wallet/cli beam-wallet${{env.BEAM_TARGET_SUFFIX}} beam-wallet${{env.BEAM_TARGET_SUFFIX}}-checksum.txt beam-wallet.cfg
178+
tar -cvf artifacts/wallet-api${{env.BEAM_TARGET_SUFFIX}}.tar -C wallet/api wallet-api${{env.BEAM_TARGET_SUFFIX}} wallet-api${{env.BEAM_TARGET_SUFFIX}}-checksum.txt wallet-api.cfg
179+
tar -cvf artifacts/explorer-node${{env.BEAM_TARGET_SUFFIX}}.tar -C explorer explorer-node${{env.BEAM_TARGET_SUFFIX}} explorer-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt explorer-node.cfg
180+
tar -cvf artifacts/broadcaster${{env.BEAM_TARGET_SUFFIX}}.tar -C wallet/broadcaster broadcaster${{env.BEAM_TARGET_SUFFIX}} broadcaster${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
181+
159182
160183
- name: Collect [windows]
161184
shell: bash
@@ -183,130 +206,62 @@ jobs:
183206
cp explorer/${{env.BUILD_CONFIG}}/explorer-node${{env.BEAM_TARGET_SUFFIX}}.pdb pdb/explorer-node${{env.BEAM_TARGET_SUFFIX}}.pdb
184207
cp wallet/broadcaster/${{env.BUILD_CONFIG}}/broadcaster${{env.BEAM_TARGET_SUFFIX}}.pdb pdb/broadcaster${{env.BEAM_TARGET_SUFFIX}}.pdb
185208
186-
# - name: Checksum [macos-10.15]
187-
# if: matrix.os == 'macos-10.15'
188-
# run: |
189-
# shasum -a 256 artifacts/beam-node${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-beam-node${{env.BEAM_TARGET_SUFFIX}}.txt
190-
# shasum -a 256 artifacts/beam-wallet${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-beam-wallet${{env.BEAM_TARGET_SUFFIX}}.txt
191-
# shasum -a 256 artifacts/wallet-api${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-wallet-api${{env.BEAM_TARGET_SUFFIX}}.txt
192-
# shasum -a 256 artifacts/explorer-node${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-explorer-node${{env.BEAM_TARGET_SUFFIX}}.txt
193-
# shasum -a 256 artifacts/broadcaster${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-broadcaster${{env.BEAM_TARGET_SUFFIX}}.txt
194-
195-
# - name: Checksum [ubuntu]
196-
# if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
197-
# run: |
198-
# sha256sum artifacts/beam-node${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-beam-node${{env.BEAM_TARGET_SUFFIX}}.txt
199-
# sha256sum artifacts/beam-wallet${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-beam-wallet${{env.BEAM_TARGET_SUFFIX}}.txt
200-
# sha256sum artifacts/wallet-api${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-wallet-api${{env.BEAM_TARGET_SUFFIX}}.txt
201-
# sha256sum artifacts/explorer-node${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-explorer-node${{env.BEAM_TARGET_SUFFIX}}.txt
202-
# sha256sum artifacts/broadcaster${{env.BEAM_TARGET_SUFFIX}} > artifacts/checksum-broadcaster${{env.BEAM_TARGET_SUFFIX}}.txt
203-
204-
# - name: Checksum [windows]
205-
# if: matrix.os == 'windows-2019'
206-
# run: |
207-
# certUtil -hashfile artifacts/beam-node${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/checksum-beam-node${{env.BEAM_TARGET_SUFFIX}}.txt
208-
# certUtil -hashfile artifacts/beam-wallet${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/checksum-beam-wallet${{env.BEAM_TARGET_SUFFIX}}.txt
209-
# certUtil -hashfile artifacts/wallet-api${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/checksum-wallet-api${{env.BEAM_TARGET_SUFFIX}}.txt
210-
# certUtil -hashfile artifacts/explorer-node${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/checksum-explorer-node${{env.BEAM_TARGET_SUFFIX}}.txt
211-
# certUtil -hashfile artifacts/broadcaster${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/checksum-broadcaster${{env.BEAM_TARGET_SUFFIX}}.txt
209+
- name: Checksum [windows]
210+
if: matrix.os == 'windows-2019'
211+
run: |
212+
certUtil -hashfile artifacts/beam-node${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/beam-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
213+
certUtil -hashfile artifacts/beam-wallet${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/beam-wallet${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
214+
certUtil -hashfile artifacts/wallet-api${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/wallet-api${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
215+
certUtil -hashfile artifacts/explorer-node${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/explorer-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
216+
certUtil -hashfile artifacts/broadcaster${{env.BEAM_TARGET_SUFFIX}}.exe SHA256 > artifacts/broadcaster${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
212217
213218
- name: OS name [macos-10.15]
214219
if: matrix.os == 'macos-10.15'
215-
run: echo "OS_NAME=mac" >> $GITHUB_ENV
220+
run: echo "PLATFORM_NAME=mac" >> $GITHUB_ENV
216221

217222
- name: OS name [ununtu all]
218223
shell: bash
219224
if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
220-
run: echo "OS_NAME=${{matrix.os}}" >> $GITHUB_ENV
225+
run: echo "PLATFORM_NAME=linux" >> $GITHUB_ENV
221226

222227
- name: OS name [windows]
223228
shell: bash
224229
if: matrix.os == 'windows-2019'
225-
run: echo "OS_NAME=win" >> $GITHUB_ENV
230+
run: echo "PLATFORM_NAME=win" >> $GITHUB_ENV
226231

227232
###############################################################################
228233
# Upload
229234
###############################################################################
230235
- uses: actions/upload-artifact@v2
231236
with:
232-
name: ${{env.OS_NAME}}-beam-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
233-
path: artifacts/beam-node*
234-
if-no-files-found: error
235-
236-
- uses: actions/upload-artifact@v2
237-
with:
238-
name: ${{env.OS_NAME}}-beam-wallet-cli${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
239-
path: artifacts/beam-wallet*
240-
if-no-files-found: error
241-
242-
- uses: actions/upload-artifact@v2
243-
with:
244-
name: ${{env.OS_NAME}}-wallet-api${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
245-
path: artifacts/wallet-api*
246-
if-no-files-found: error
247-
248-
- uses: actions/upload-artifact@v2
249-
with:
250-
name: ${{env.OS_NAME}}-explorer-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
251-
path: artifacts/explorer-node*
252-
if-no-files-found: error
253-
254-
- uses: actions/upload-artifact@v2
255-
with:
256-
name: ${{env.OS_NAME}}-broadcaster${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
257-
path: artifacts/broadcaster*
258-
if-no-files-found: error
259-
260-
# - uses: actions/upload-artifact@v2
261-
# with:
262-
# name: ${{env.OS_NAME}}-checksums${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
263-
# path: artifacts/checksum*
264-
# if-no-files-found: error
265-
266-
###############################################################################
267-
# Upload linux-prefix
268-
###############################################################################
269-
- uses: actions/upload-artifact@v2
270-
if: matrix.os == 'ubuntu-16.04'
271-
with:
272-
name: linux-beam-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
237+
name: ${{env.PLATFORM_NAME}}-beam-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
273238
path: artifacts/beam-node*
274239
if-no-files-found: error
275240

276241
- uses: actions/upload-artifact@v2
277-
if: matrix.os == 'ubuntu-16.04'
278242
with:
279-
name: linux-beam-wallet-cli${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
243+
name: ${{env.PLATFORM_NAME}}-beam-wallet-cli${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
280244
path: artifacts/beam-wallet*
281245
if-no-files-found: error
282246

283247
- uses: actions/upload-artifact@v2
284-
if: matrix.os == 'ubuntu-16.04'
285248
with:
286-
name: linux-wallet-api${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
249+
name: ${{env.PLATFORM_NAME}}-wallet-api${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
287250
path: artifacts/wallet-api*
288251
if-no-files-found: error
289252

290253
- uses: actions/upload-artifact@v2
291-
if: matrix.os == 'ubuntu-16.04'
292254
with:
293-
name: linux-explorer-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
255+
name: ${{env.PLATFORM_NAME}}-explorer-node${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
294256
path: artifacts/explorer-node*
295257
if-no-files-found: error
296258

297259
- uses: actions/upload-artifact@v2
298-
if: matrix.os == 'ubuntu-16.04'
299260
with:
300-
name: linux-broadcaster${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
261+
name: ${{env.PLATFORM_NAME}}-broadcaster${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
301262
path: artifacts/broadcaster*
302263
if-no-files-found: error
303264

304-
# - uses: actions/upload-artifact@v2
305-
# with:
306-
# name: linux-checksums${{env.BEAM_TARGET_SUFFIX}}-${{env.BEAM_VERSION}}
307-
# path: artifacts/checksum*
308-
# if-no-files-found: error
309-
310265
###############################################################################
311266
# Upload windows pdb
312267
###############################################################################

‎3rdparty/ethash/include/ethash/ethash.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ const struct ethash_epoch_context* ethash_get_global_epoch_context(int epoch_num
114114
const struct ethash_epoch_context_full* ethash_get_global_epoch_context_full(
115115
int epoch_number) NOEXCEPT;
116116

117+
void ethash_get_MixHash(union ethash_hash256* pRes, const struct ethash_epoch_context* context, const union ethash_hash512* seed) NOEXCEPT;
118+
void ethash_get_MixHash2(union ethash_hash256* pRes, uint32_t* pSolIndices, union ethash_hash1024* pSolItems, const struct ethash_epoch_context* context, const union ethash_hash512* seed) NOEXCEPT;
119+
void ethash_get_MixHash3(union ethash_hash256* pRes, uint32_t* pSolIndices, const union ethash_hash1024* pSolItems, const struct ethash_epoch_context* context, const union ethash_hash512* seed) NOEXCEPT;
117120

118121
struct ethash_result ethash_hash(const struct ethash_epoch_context* context,
119122
const union ethash_hash256* header_hash, uint64_t nonce) NOEXCEPT;

‎3rdparty/ethash/lib/ethash/ethash.cpp‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,55 @@ void ethash_destroy_epoch_context(epoch_context* context) noexcept
413413
std::free(context);
414414
}
415415

416+
void ethash_get_MixHash(ethash_hash256* pRes, const epoch_context* context, const ethash_hash512* seed) noexcept
417+
{
418+
*pRes = hash_kernel(*context, *seed, calculate_dataset_item_1024);
419+
}
420+
421+
void ethash_get_MixHash2(ethash_hash256* pRes, uint32_t* pSolIndices, ethash_hash1024* pSolItems, const epoch_context* context, const ethash_hash512* seed) noexcept
422+
{
423+
struct ContextPlus
424+
{
425+
epoch_context m_Ctx;
426+
uint32_t* m_pResIndices;
427+
ethash_hash1024* m_pResItems;
428+
429+
static hash1024 Func(const epoch_context& context, uint32_t index) noexcept
430+
{
431+
auto& ctxPlus = (ContextPlus&) (reinterpret_cast<const ContextPlus&>(context));
432+
*ctxPlus.m_pResIndices++ = index;
433+
434+
*ctxPlus.m_pResItems = calculate_dataset_item_1024(context, index);
435+
return *ctxPlus.m_pResItems++;
436+
}
437+
438+
};
439+
440+
ContextPlus cplus = { *context, pSolIndices, pSolItems };
441+
*pRes = hash_kernel(cplus.m_Ctx, *seed, ContextPlus::Func);
442+
}
443+
444+
void ethash_get_MixHash3(ethash_hash256* pRes, uint32_t* pSolIndices, const ethash_hash1024* pSolItems, const epoch_context* context, const ethash_hash512* seed) noexcept
445+
{
446+
struct ContextPlus
447+
{
448+
epoch_context m_Ctx;
449+
uint32_t* m_pResIndices;
450+
const ethash_hash1024* m_pResItems;
451+
452+
static hash1024 Func(const epoch_context& context, uint32_t index) noexcept
453+
{
454+
auto& ctxPlus = (ContextPlus&) (reinterpret_cast<const ContextPlus&>(context));
455+
*ctxPlus.m_pResIndices++ = index;
456+
return *ctxPlus.m_pResItems++;
457+
}
458+
459+
};
460+
461+
ContextPlus cplus = { *context, pSolIndices, pSolItems };
462+
*pRes = hash_kernel(cplus.m_Ctx, *seed, ContextPlus::Func);
463+
}
464+
416465
ethash_result ethash_hash(
417466
const epoch_context* context, const hash256* header_hash, uint64_t nonce) noexcept
418467
{

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ option(BEAM_WALLET_CLIENT_LIBRARY "Build only binaries required for client app"
161161
add_definitions(-DDEBUG_MESSAGES_IN_RELEASE_MODE)
162162
#endif()
163163
#it's enabled by default for testnet
164-
#add_definitions(-DLOG_VERBOSE_ENABLED=1)
164+
add_definitions(-DLOG_VERBOSE_ENABLED=1)
165165

166166
if(SHOW_CODE_LOCATION)
167167
target_compile_definitions(beam INTERFACE -DSHOW_CODE_LOCATION=1)
@@ -278,6 +278,7 @@ else()
278278

279279
if (EMSCRIPTEN)
280280
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_PTHREADS=1 -s DISABLE_EXCEPTION_CATCHING=0 -s USE_BOOST_HEADERS=1")
281+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument") # mostly in 3rd-party libs
281282
endif()
282283

283284
# disable some warnings

‎android/jni.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ JNIEXPORT void JNICALL BEAM_JAVA_WALLET_INTERFACE(sendTransaction)(JNIEnv *env,
673673
params.SetParameter(TxParameterID::OriginalToken, address);
674674
}
675675
params.SetParameter(TxParameterID::OriginalToken, JString(env, receiverAddr).value());
676-
// params.SetParameter(TxParameterID::SavePeerAddress, false);
676+
// params.SetParameter(TxParameterID::SavePeerAddress, false);
677677

678678
walletModel->getAsync()->startTransaction(std::move(params));
679679
}

‎beam/cli.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ int main_impl(int argc, char* argv[])
406406
{
407407
if (!addr.port())
408408
{
409+
LOG_WARNING() << "No port is specified for \"" << vPeers[i] << "\", the default value is " << port;
409410
addr.port(port);
410411
}
411412

‎bvm/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ target_link_libraries(bvm
1313
PUBLIC
1414
core
1515
keccak
16+
ethash
1617
)
1718

1819
if(BEAM_TESTS_ENABLED)

0 commit comments

Comments
 (0)