From 7487c7885fdf4f47ba80c13c55166773c88f6074 Mon Sep 17 00:00:00 2001 From: kstdl Date: Wed, 24 Apr 2024 11:49:12 +0200 Subject: [PATCH] chore: update evm --- .../cli/include/cli/config_jsons/default/default_genesis.json | 2 +- submodules/CMakeLists.txt | 2 +- submodules/taraxa-evm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/cli/include/cli/config_jsons/default/default_genesis.json b/libraries/cli/include/cli/config_jsons/default/default_genesis.json index 729f22ebfc..0254d5e1cd 100644 --- a/libraries/cli/include/cli/config_jsons/default/default_genesis.json +++ b/libraries/cli/include/cli/config_jsons/default/default_genesis.json @@ -59,7 +59,7 @@ "initial_balances": { "2cd4da7d3b345e022ca7e997c2bb3276a4d3d2e9": "0x1027e72f1f12813088000000", "7e4aa664f71de4e9d0b4a6473d796372639bdcde": "0x27e72f1f12813088000000", - "fF310642f352E0b6b5266CE492e91D6af1241F41": "0x27e72f1f12813088000000с" + "fF310642f352E0b6b5266CE492e91D6af1241F41": "0x27e72f1f12813088000000" }, "gas_price": { "blocks": 200, diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt index 117cbcd879..0644a87a01 100644 --- a/submodules/CMakeLists.txt +++ b/submodules/CMakeLists.txt @@ -101,7 +101,7 @@ else() set(EVM_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}taraxaevm${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() ## go env settings -set(EVM_BUILD_ENV CGO_CFLAGS_ALLOW='.*' CGO_CXXFLAGS_ALLOW='.*' CGO_CXXFLAGS=\"-O3\" CGO_CFLAGS=\"${EVM_BUILD_CGO_CFLAGS}\" CGO_LDFLAGS=\"${EVM_BUILD_LD}\" CACHE INTERNAL "") +set(EVM_BUILD_ENV CGO_CFLAGS_ALLOW='.*' CGO_CXXFLAGS_ALLOW='.*' CGO_CXXFLAGS=\"-O3\" CGO_CFLAGS=\"${EVM_BUILD_CGO_CFLAGS}\" CGO_LDFLAGS=\"$CGO_LDFLAGS ${EVM_BUILD_LD}\" CACHE INTERNAL "") ## add build command set(EVM_BUILD_COMMAND cd taraxa/C && ${EVM_BUILD_ENV} go build -buildvcs=false -buildmode=c-archive -o ${EVM_BUILD_DIR}/${EVM_LIBRARY_NAME}) ## cp headers into `taraxa-evm/include` diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm index b3eef3a4f0..3654032aa9 160000 --- a/submodules/taraxa-evm +++ b/submodules/taraxa-evm @@ -1 +1 @@ -Subproject commit b3eef3a4f0356a69e99a04901a0bc8d5a4df7b05 +Subproject commit 3654032aa9c6733248763e367d0031d757a37eac