From nobody Sat Dec 02 13:00:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj95M23PGz53Ns2; Sat, 2 Dec 2023 13:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sj95M1s65z4f72; Sat, 2 Dec 2023 13:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701522023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugZ+NeIv+MT39n1PGAUSYDl2rUbXCqoA/RPEGdz+xe4=; b=x52XO4qSZUhJq9brBK0R+2EcQS/+tTep78KmZMJ49NKYhZCg7iY2UBXUIpq01TnNHoKgSx Vw6wmulWBCtnrZIZaiLDiM9WTuU0R2x78R3DYGM3Xs4c8vs+wkdCWPZ6HU1pleSSLAqGqL m0Z4/CNEaN4SLDhuXyhfX89U+rSHo/Hzcmc/Wk8Gyn32bMHPrfZi3cLsHmePkDoRKpF75p qDxx/8MLvdqVeP7hOU5yinmRXF/Sk4CQjwCqSJnhpzxOcSyNPgfsXGoIlZEGcLQYgoREM5 94QKYlONbbHFe+phf5VqQFaylZQ45anc18NyqtD32PIhNurGeoSEfz5KG90bQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701522023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugZ+NeIv+MT39n1PGAUSYDl2rUbXCqoA/RPEGdz+xe4=; b=mVPSpwQovnwVjtu0htqUu1sxheRtgFGF6bm5ym/M6DYhoyHtCCBu+jzVQEw22b7VBskX3q qM2IvYEiKZ67iVaefszvtKlZEgBAvLhlFhy568Mmg1c0wImofpOygAy6V8jSKa6ugKGXRi cttMTjuUmhKymmBx23Zv75cCSS5Gts/IMc6ba80/58cbiJl/2asd73GCZbAdzqFCgwVPy9 TPmHOD+/dhFrQTYMPVGkosv6AHEAudSMVWcmZwyxVftFM5udD27LU+S0xvDl1U2XCnLTW/ O8dyPPTJblvZT84zz6py05sRLFxvC6fvDf1zYF7YAEi+1H7K4stYARF4o+P8iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701522023; a=rsa-sha256; cv=none; b=JWn05m0tX8xaYXAHDBln1MF937eXEoS/gId6zIHxAyd9woHq93chTDsRXj9+f86XsgIfOT Crt7jZXZS9uHSpwOUCLyaTguhDCEdKZQM8AcuUm3xsgs/tgrsl1UBW995xH2HtSHkVCOQA ZBpuNLq8G49Z+/WDzSyNyZHfcjiPhW6xko0zRJEGJKDfCS2kUbXNaiQoF6hc85yaoUaR3H a0cGHdvtrdjpKRQoAWIovQybegxe7PDoHx4/I13xWMdLnjVCYIBZyukVD+SOh0gOydXhQy x68eqWjrQV7j5LBsiDEZQsEXbr4uxlfEZGGyJw9A3P0Xyq5j+sG2pXbOCxMLog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj95M0vvjz2mS; Sat, 2 Dec 2023 13:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B2D0NwN042684; Sat, 2 Dec 2023 13:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2D0N8u042681; Sat, 2 Dec 2023 13:00:23 GMT (envelope-from git) Date: Sat, 2 Dec 2023 13:00:23 GMT Message-Id: <202312021300.3B2D0N8u042681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 626010047a8a - main - net-p2p/arbitrum-avm: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 626010047a8a21b2a96b9fd9c913b0ca14d7fd6f Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=626010047a8a21b2a96b9fd9c913b0ca14d7fd6f commit 626010047a8a21b2a96b9fd9c913b0ca14d7fd6f Author: Rene Ladan AuthorDate: 2023-12-02 13:00:07 +0000 Commit: Rene Ladan CommitDate: 2023-12-02 13:00:07 +0000 net-p2p/arbitrum-avm: Remove expired port 2023-11-30 net-p2p/arbitrum-avm: BROKEN for more than an year --- MOVED | 1 + net-p2p/Makefile | 1 - net-p2p/arbitrum-avm/Makefile | 51 ----- net-p2p/arbitrum-avm/distinfo | 3 - .../patch-packages_arb-avm-cpp_CMakeLists.txt | 12 - ...-cpp_avm__values_include_avm__values_bigint.hpp | 17 -- ...packages_arb-avm-cpp_avm__values_src_bigint.cpp | 10 - ...h-packages_arb-avm-cpp_avm_src_inboxmessage.cpp | 19 -- .../patch-packages_arb-avm-cpp_avm_src_machine.cpp | 17 -- ...m-cpp_avm_src_machinestate_machineoperation.cpp | 254 --------------------- .../patch-packages_arb-avm-cpp_cavm_carbcore.cpp | 56 ----- .../patch-packages_arb-avm-cpp_cavm_cmachine.cpp | 20 -- ...rage_include_data__storage_value_valuecache.hpp | 11 - ...kages_arb-avm-cpp_data__storage_src_arbcore.cpp | 11 - ...ch-packages_arb-avm-cpp_external_CMakeLists.txt | 29 --- net-p2p/arbitrum-avm/pkg-descr | 5 - 16 files changed, 1 insertion(+), 516 deletions(-) diff --git a/MOVED b/MOVED index 0389cd5d82d3..cce67700694c 100644 --- a/MOVED +++ b/MOVED @@ -8142,3 +8142,4 @@ games/abstreet||2023-12-02|Has expired: BROKEN for more than a year and issue do security/tor-devel||2023-12-02|Has expired: Ignored for more than a year and security/tor is more recent than this java/wildfly12||2023-12-02|Has expired: End of life upstream java/wildfly11||2023-12-02|Has expired: End of life upstream +net-p2p/arbitrum-avm||2023-12-02|Has expired: BROKEN for more than an year diff --git a/net-p2p/Makefile b/net-p2p/Makefile index a91244de8cfc..c74f19ec13b2 100644 --- a/net-p2p/Makefile +++ b/net-p2p/Makefile @@ -1,7 +1,6 @@ COMMENT = Peer-to-peer network applications SUBDIR += amule - SUBDIR += arbitrum-avm SUBDIR += autoscan SUBDIR += awgg SUBDIR += bazarr diff --git a/net-p2p/arbitrum-avm/Makefile b/net-p2p/arbitrum-avm/Makefile deleted file mode 100644 index 7f510d0aae9c..000000000000 --- a/net-p2p/arbitrum-avm/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -PORTNAME= arbitrum-avm -PORTVERSION= 1.2.0 -PORTREVISION= 2 -DISTVERSIONPREFIX= v -CATEGORIES= net-p2p -MASTER_SITES= LOCAL/nc/mirror/ \ - https://neel.my.to/mirror/arbitrum/ -DISTNAME= arbitrum-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Arbitrum Virtual Machine -WWW= https://arbitrum.io/ - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= BROKEN for more than an year -EXPIRATION_DATE= 2023-11-30 - -BUILD_DEPENDS= ethash>0:net-p2p/ethash \ - git:devel/git \ - intx>0:math/intx \ - microsoft-gsl>0:devel/microsoft-gsl -LIB_DEPENDS= libbenchmark.so:devel/benchmark \ - libboost_system.so:devel/boost-libs \ - libgtest.so:devel/googletest \ - librocksdb.so:databases/rocksdb \ - libsecp256k1.so:math/secp256k1 -RUN_DEPENDS= ethash>0:net-p2p/ethash \ - intx>0:math/intx - -BROKEN= Fails to compile: Cannot find GMP module - -USES= cmake - -CMAKE_OFF= HUNTER_ENABLED -CMAKE_SOURCE_PATH= ${WRKSRC}/packages/arb-avm-cpp - -PLIST_FILES= bin/arbcore_runner \ - bin/avm_runner \ - bin/avm_tests - -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/arbcore_runner \ - ${STAGEDIR}${PREFIX}/bin/arbcore_runner - ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/avm_runner \ - ${STAGEDIR}${PREFIX}/bin/avm_runner - ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/avm_tests \ - ${STAGEDIR}${PREFIX}/bin/avm_tests - -.include diff --git a/net-p2p/arbitrum-avm/distinfo b/net-p2p/arbitrum-avm/distinfo deleted file mode 100644 index 8f71fad15956..000000000000 --- a/net-p2p/arbitrum-avm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1642530329 -SHA256 (arbitrum-1.2.0.tar.gz) = 7572b3ebf2239a4998cef47ced4389be4b3254dbbc7ff234aed3bdc70bc77363 -SIZE (arbitrum-1.2.0.tar.gz) = 78457864 diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_CMakeLists.txt b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_CMakeLists.txt deleted file mode 100644 index bee7f7b43ad4..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- packages/arb-avm-cpp/CMakeLists.txt.orig 2022-01-14 20:16:55 UTC -+++ packages/arb-avm-cpp/CMakeLists.txt -@@ -204,6 +204,9 @@ find_package(ethash CONFIG REQUIRED) - hunter_add_package(intx) - find_package(intx CONFIG REQUIRED) - -+find_package(Microsoft.GSL CONFIG REQUIRED) -+pkg_search_module(ZSTD QUIET libzstd) -+ - get_target_property(ETHASH_LIB ethash::keccak "LOCATION_Release") - get_filename_component(ETHASH_LIB_FOLDER "${ETHASH_LIB}" DIRECTORY) - diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm__values_include_avm__values_bigint.hpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm__values_include_avm__values_bigint.hpp deleted file mode 100644 index 65b9f5655b0c..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm__values_include_avm__values_bigint.hpp +++ /dev/null @@ -1,17 +0,0 @@ ---- packages/arb-avm-cpp/avm_values/include/avm_values/bigint.hpp.orig 2022-01-14 20:18:32 UTC -+++ packages/arb-avm-cpp/avm_values/include/avm_values/bigint.hpp -@@ -17,9 +17,14 @@ - #ifndef bigint_hpp - #define bigint_hpp - -+#include -+ - #include - -+#include - #include -+ -+using namespace gsl; - - using uint256_t = intx::uint256; - using uint512_t = intx::uint512; diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm__values_src_bigint.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm__values_src_bigint.cpp deleted file mode 100644 index 4b3abcc5a39c..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm__values_src_bigint.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- packages/arb-avm-cpp/avm_values/src/bigint.cpp.orig 2022-01-14 20:19:00 UTC -+++ packages/arb-avm-cpp/avm_values/src/bigint.cpp -@@ -18,6 +18,7 @@ - - #include - -+#include - #include - #include - diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_inboxmessage.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_inboxmessage.cpp deleted file mode 100644 index 4cf290b73e32..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_inboxmessage.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- packages/arb-avm-cpp/avm/src/inboxmessage.cpp.orig 2022-01-14 20:17:14 UTC -+++ packages/arb-avm-cpp/avm/src/inboxmessage.cpp -@@ -154,14 +154,14 @@ InboxMessage InboxMessage::fromTuple(const Tuple& tup) - throw std::runtime_error("wrong tup size"); - } - auto kind = -- intx::narrow_cast(get(tup.get_element_unsafe(0))); -+ narrow_cast(get(tup.get_element_unsafe(0))); - auto block_number = get(tup.get_element_unsafe(1)); - auto timestamp = get(tup.get_element_unsafe(2)); - auto sender_int = get(tup.get_element_unsafe(3)); - auto inbox_sequence_number = get(tup.get_element_unsafe(4)); - auto gas_price_l1 = get(tup.get_element_unsafe(5)); - auto data_size = -- intx::narrow_cast(get(tup.get_element_unsafe(6))); -+ narrow_cast(get(tup.get_element_unsafe(6))); - auto data_buf = get(tup.get_element_unsafe(7)); - - uint8_t raw_sender[32]; diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_machine.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_machine.cpp deleted file mode 100644 index 16e34a85962d..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_machine.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- packages/arb-avm-cpp/avm/src/machine.cpp.orig 2022-01-18 18:44:56 UTC -+++ packages/arb-avm-cpp/avm/src/machine.cpp -@@ -95,11 +95,11 @@ Assertion Machine::run() { - if (auto sideload_blocked = std::get_if(&block_reason)) { - sideload_block_number = sideload_blocked->block_number; - } -- return {intx::narrow_cast(machine_state.output.total_steps - -+ return {narrow_cast(machine_state.output.total_steps - - start_steps), -- intx::narrow_cast(machine_state.output.arb_gas_used - -+ narrow_cast(machine_state.output.arb_gas_used - - start_gas), -- intx::narrow_cast(machine_state.getTotalMessagesRead() - -+ narrow_cast(machine_state.getTotalMessagesRead() - - initialConsumed), - std::move(machine_state.context.sends), - std::move(machine_state.context.logs), diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_machinestate_machineoperation.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_machinestate_machineoperation.cpp deleted file mode 100644 index 25a842a23333..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_avm_src_machinestate_machineoperation.cpp +++ /dev/null @@ -1,254 +0,0 @@ ---- packages/arb-avm-cpp/avm/src/machinestate/machineoperation.cpp.orig 2021-12-14 20:02:23 UTC -+++ packages/arb-avm-cpp/avm/src/machinestate/machineoperation.cpp -@@ -465,6 +465,251 @@ Tuple decodeKeccakState(const uint64_t* state) { - } - } // namespace internal - -+static inline uint64_t rol(uint64_t x, unsigned s) -+{ -+ return (x << s) | (x >> (64 - s)); -+} -+ -+static const uint64_t round_constants[24] = { -+ 0x0000000000000001, -+ 0x0000000000008082, -+ 0x800000000000808a, -+ 0x8000000080008000, -+ 0x000000000000808b, -+ 0x0000000080000001, -+ 0x8000000080008081, -+ 0x8000000000008009, -+ 0x000000000000008a, -+ 0x0000000000000088, -+ 0x0000000080008009, -+ 0x000000008000000a, -+ 0x000000008000808b, -+ 0x800000000000008b, -+ 0x8000000000008089, -+ 0x8000000000008003, -+ 0x8000000000008002, -+ 0x8000000000000080, -+ 0x000000000000800a, -+ 0x800000008000000a, -+ 0x8000000080008081, -+ 0x8000000000008080, -+ 0x0000000080000001, -+ 0x8000000080008008, -+}; -+ -+void ethash_keccakf1600(uint64_t state[25]) -+{ -+ uint64_t Aba, Abe, Abi, Abo, Abu; -+ uint64_t Aga, Age, Agi, Ago, Agu; -+ uint64_t Aka, Ake, Aki, Ako, Aku; -+ uint64_t Ama, Ame, Ami, Amo, Amu; -+ uint64_t Asa, Ase, Asi, Aso, Asu; -+ -+ uint64_t Eba, Ebe, Ebi, Ebo, Ebu; -+ uint64_t Ega, Ege, Egi, Ego, Egu; -+ uint64_t Eka, Eke, Eki, Eko, Eku; -+ uint64_t Ema, Eme, Emi, Emo, Emu; -+ uint64_t Esa, Ese, Esi, Eso, Esu; -+ -+ uint64_t Ba, Be, Bi, Bo, Bu; -+ -+ uint64_t Da, De, Di, Do, Du; -+ -+ Aba = state[0]; -+ Abe = state[1]; -+ Abi = state[2]; -+ Abo = state[3]; -+ Abu = state[4]; -+ Aga = state[5]; -+ Age = state[6]; -+ Agi = state[7]; -+ Ago = state[8]; -+ Agu = state[9]; -+ Aka = state[10]; -+ Ake = state[11]; -+ Aki = state[12]; -+ Ako = state[13]; -+ Aku = state[14]; -+ Ama = state[15]; -+ Ame = state[16]; -+ Ami = state[17]; -+ Amo = state[18]; -+ Amu = state[19]; -+ Asa = state[20]; -+ Ase = state[21]; -+ Asi = state[22]; -+ Aso = state[23]; -+ Asu = state[24]; -+ -+ for (int round = 0; round < 24; round += 2) -+ { -+ /* Round (round + 0): Axx -> Exx */ -+ -+ Ba = Aba ^ Aga ^ Aka ^ Ama ^ Asa; -+ Be = Abe ^ Age ^ Ake ^ Ame ^ Ase; -+ Bi = Abi ^ Agi ^ Aki ^ Ami ^ Asi; -+ Bo = Abo ^ Ago ^ Ako ^ Amo ^ Aso; -+ Bu = Abu ^ Agu ^ Aku ^ Amu ^ Asu; -+ -+ Da = Bu ^ rol(Be, 1); -+ De = Ba ^ rol(Bi, 1); -+ Di = Be ^ rol(Bo, 1); -+ Do = Bi ^ rol(Bu, 1); -+ Du = Bo ^ rol(Ba, 1); -+ -+ Ba = Aba ^ Da; -+ Be = rol(Age ^ De, 44); -+ Bi = rol(Aki ^ Di, 43); -+ Bo = rol(Amo ^ Do, 21); -+ Bu = rol(Asu ^ Du, 14); -+ Eba = Ba ^ (~Be & Bi) ^ round_constants[round]; -+ Ebe = Be ^ (~Bi & Bo); -+ Ebi = Bi ^ (~Bo & Bu); -+ Ebo = Bo ^ (~Bu & Ba); -+ Ebu = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Abo ^ Do, 28); -+ Be = rol(Agu ^ Du, 20); -+ Bi = rol(Aka ^ Da, 3); -+ Bo = rol(Ame ^ De, 45); -+ Bu = rol(Asi ^ Di, 61); -+ Ega = Ba ^ (~Be & Bi); -+ Ege = Be ^ (~Bi & Bo); -+ Egi = Bi ^ (~Bo & Bu); -+ Ego = Bo ^ (~Bu & Ba); -+ Egu = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Abe ^ De, 1); -+ Be = rol(Agi ^ Di, 6); -+ Bi = rol(Ako ^ Do, 25); -+ Bo = rol(Amu ^ Du, 8); -+ Bu = rol(Asa ^ Da, 18); -+ Eka = Ba ^ (~Be & Bi); -+ Eke = Be ^ (~Bi & Bo); -+ Eki = Bi ^ (~Bo & Bu); -+ Eko = Bo ^ (~Bu & Ba); -+ Eku = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Abu ^ Du, 27); -+ Be = rol(Aga ^ Da, 36); -+ Bi = rol(Ake ^ De, 10); -+ Bo = rol(Ami ^ Di, 15); -+ Bu = rol(Aso ^ Do, 56); -+ Ema = Ba ^ (~Be & Bi); -+ Eme = Be ^ (~Bi & Bo); -+ Emi = Bi ^ (~Bo & Bu); -+ Emo = Bo ^ (~Bu & Ba); -+ Emu = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Abi ^ Di, 62); -+ Be = rol(Ago ^ Do, 55); -+ Bi = rol(Aku ^ Du, 39); -+ Bo = rol(Ama ^ Da, 41); -+ Bu = rol(Ase ^ De, 2); -+ Esa = Ba ^ (~Be & Bi); -+ Ese = Be ^ (~Bi & Bo); -+ Esi = Bi ^ (~Bo & Bu); -+ Eso = Bo ^ (~Bu & Ba); -+ Esu = Bu ^ (~Ba & Be); -+ -+ -+ /* Round (round + 1): Exx -> Axx */ -+ -+ Ba = Eba ^ Ega ^ Eka ^ Ema ^ Esa; -+ Be = Ebe ^ Ege ^ Eke ^ Eme ^ Ese; -+ Bi = Ebi ^ Egi ^ Eki ^ Emi ^ Esi; -+ Bo = Ebo ^ Ego ^ Eko ^ Emo ^ Eso; -+ Bu = Ebu ^ Egu ^ Eku ^ Emu ^ Esu; -+ -+ Da = Bu ^ rol(Be, 1); -+ De = Ba ^ rol(Bi, 1); -+ Di = Be ^ rol(Bo, 1); -+ Do = Bi ^ rol(Bu, 1); -+ Du = Bo ^ rol(Ba, 1); -+ -+ Ba = Eba ^ Da; -+ Be = rol(Ege ^ De, 44); -+ Bi = rol(Eki ^ Di, 43); -+ Bo = rol(Emo ^ Do, 21); -+ Bu = rol(Esu ^ Du, 14); -+ Aba = Ba ^ (~Be & Bi) ^ round_constants[round + 1]; -+ Abe = Be ^ (~Bi & Bo); -+ Abi = Bi ^ (~Bo & Bu); -+ Abo = Bo ^ (~Bu & Ba); -+ Abu = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Ebo ^ Do, 28); -+ Be = rol(Egu ^ Du, 20); -+ Bi = rol(Eka ^ Da, 3); -+ Bo = rol(Eme ^ De, 45); -+ Bu = rol(Esi ^ Di, 61); -+ Aga = Ba ^ (~Be & Bi); -+ Age = Be ^ (~Bi & Bo); -+ Agi = Bi ^ (~Bo & Bu); -+ Ago = Bo ^ (~Bu & Ba); -+ Agu = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Ebe ^ De, 1); -+ Be = rol(Egi ^ Di, 6); -+ Bi = rol(Eko ^ Do, 25); -+ Bo = rol(Emu ^ Du, 8); -+ Bu = rol(Esa ^ Da, 18); -+ Aka = Ba ^ (~Be & Bi); -+ Ake = Be ^ (~Bi & Bo); -+ Aki = Bi ^ (~Bo & Bu); -+ Ako = Bo ^ (~Bu & Ba); -+ Aku = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Ebu ^ Du, 27); -+ Be = rol(Ega ^ Da, 36); -+ Bi = rol(Eke ^ De, 10); -+ Bo = rol(Emi ^ Di, 15); -+ Bu = rol(Eso ^ Do, 56); -+ Ama = Ba ^ (~Be & Bi); -+ Ame = Be ^ (~Bi & Bo); -+ Ami = Bi ^ (~Bo & Bu); -+ Amo = Bo ^ (~Bu & Ba); -+ Amu = Bu ^ (~Ba & Be); -+ -+ Ba = rol(Ebi ^ Di, 62); -+ Be = rol(Ego ^ Do, 55); -+ Bi = rol(Eku ^ Du, 39); -+ Bo = rol(Ema ^ Da, 41); -+ Bu = rol(Ese ^ De, 2); -+ Asa = Ba ^ (~Be & Bi); -+ Ase = Be ^ (~Bi & Bo); -+ Asi = Bi ^ (~Bo & Bu); -+ Aso = Bo ^ (~Bu & Ba); -+ Asu = Bu ^ (~Ba & Be); -+ } -+ -+ state[0] = Aba; -+ state[1] = Abe; -+ state[2] = Abi; -+ state[3] = Abo; -+ state[4] = Abu; -+ state[5] = Aga; -+ state[6] = Age; -+ state[7] = Agi; -+ state[8] = Ago; -+ state[9] = Agu; -+ state[10] = Aka; -+ state[11] = Ake; -+ state[12] = Aki; -+ state[13] = Ako; -+ state[14] = Aku; -+ state[15] = Ama; -+ state[16] = Ame; -+ state[17] = Ami; -+ state[18] = Amo; -+ state[19] = Amu; -+ state[20] = Asa; -+ state[21] = Ase; -+ state[22] = Asi; -+ state[23] = Aso; -+ state[24] = Asu; -+} -+ - void keccakF(MachineState& m) { - m.stack.prepForMod(1); - auto tup = assumeTuple(m, m.stack[0]); diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_cavm_carbcore.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_cavm_carbcore.cpp deleted file mode 100644 index e2af00bacedf..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_cavm_carbcore.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- packages/arb-avm-cpp/cavm/carbcore.cpp.orig 2022-01-14 20:19:18 UTC -+++ packages/arb-avm-cpp/cavm/carbcore.cpp -@@ -362,7 +362,7 @@ Uint256Result arbCoreLogsCursorGetPosition(CArbCore* a - auto cursor_index = receiveUint256(index_ptr); - try { - auto count_result = arb_core->logsCursorPosition( -- intx::narrow_cast(cursor_index)); -+ narrow_cast(cursor_index)); - if (!count_result.status.ok()) { - return {{}, false}; - } -@@ -381,7 +381,7 @@ int arbCoreLogsCursorRequest(CArbCore* arbcore_ptr, - - try { - auto status = arbcore->logsCursorRequest( -- intx::narrow_cast(cursor_index), count); -+ narrow_cast(cursor_index), count); - - return status; - } catch (const std::exception& e) { -@@ -399,7 +399,7 @@ IndexedDoubleByteSliceArrayResult arbCoreLogsCursorGet - - try { - auto result = -- arbcore->logsCursorGetLogs(intx::narrow_cast(cursor_index)); -+ arbcore->logsCursorGetLogs(narrow_cast(cursor_index)); - if (!result.status.ok()) { - if (!result.status.IsTryAgain()) { - std::cerr << "Error getting logs from logs cursor: " -@@ -450,7 +450,7 @@ int arbCoreLogsCursorConfirmReceived(CArbCore* arbcore - - try { - auto status = arbcore->logsCursorConfirmReceived( -- intx::narrow_cast(cursor_index)); -+ narrow_cast(cursor_index)); - - return status; - } catch (const std::exception& e) { -@@ -466,7 +466,7 @@ int arbCoreLogsCursorCheckError(CArbCore* arbcore_ptr, - - try { - return arbcore->logsCursorCheckError( -- intx::narrow_cast(cursor_index)); -+ narrow_cast(cursor_index)); - } catch (const std::exception& e) { - std::cerr << "Exception while checking error for logscursor " - << e.what() << std::endl; -@@ -482,7 +482,7 @@ char* arbCoreLogsCursorClearError(CArbCore* arbcore_pt - - try { - auto str = arbcore->logsCursorClearError( -- intx::narrow_cast(cursor_index)); -+ narrow_cast(cursor_index)); - - if (str.empty()) { - return nullptr; diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_cavm_cmachine.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_cavm_cmachine.cpp deleted file mode 100644 index df7932d6f219..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_cavm_cmachine.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- packages/arb-avm-cpp/cavm/cmachine.cpp.orig 2022-01-14 20:19:39 UTC -+++ packages/arb-avm-cpp/cavm/cmachine.cpp -@@ -230,14 +230,14 @@ RawAssertionResult executeAssertion(CMachine* m, - - // TODO extend usage of uint256 - return { -- {intx::narrow_cast(assertion.inbox_messages_consumed), -+ {narrow_cast(assertion.inbox_messages_consumed), - returnCharVector(sendData), - static_cast(assertion.sends.size()), - returnCharVector(logData), static_cast(assertion.logs.size()), - returnCharVector(debugPrintData), - static_cast(assertion.debug_prints.size()), -- intx::narrow_cast(assertion.step_count), -- intx::narrow_cast(assertion.gas_count)}, -+ narrow_cast(assertion.step_count), -+ narrow_cast(assertion.gas_count)}, - false}; - } catch (const DataStorage::shutting_down_exception& e) { - return {makeEmptyAssertion(), true}; diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_data__storage_include_data__storage_value_valuecache.hpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_data__storage_include_data__storage_value_valuecache.hpp deleted file mode 100644 index 95479ee93f76..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_data__storage_include_data__storage_value_valuecache.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- packages/arb-avm-cpp/data_storage/include/data_storage/value/valuecache.hpp.orig 2021-12-14 20:02:23 UTC -+++ packages/arb-avm-cpp/data_storage/include/data_storage/value/valuecache.hpp -@@ -30,7 +30,7 @@ class ValueCache { - private: - struct ValueCacheHasher { - std::size_t operator()(const uint256_t& hash) const noexcept { -- return intx::narrow_cast(hash); -+ return narrow_cast(hash); - } - }; - diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_data__storage_src_arbcore.cpp b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_data__storage_src_arbcore.cpp deleted file mode 100644 index a3b1f1bc3dd4..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_data__storage_src_arbcore.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- packages/arb-avm-cpp/data_storage/src/arbcore.cpp.orig 2022-01-14 20:20:15 UTC -+++ packages/arb-avm-cpp/data_storage/src/arbcore.cpp -@@ -3063,7 +3063,7 @@ rocksdb::Status ArbCore::handleLogsCursorReorg(size_t - log_count) { - // Only part of the data needs to be removed - auto logs_to_keep = -- intx::narrow_cast(log_count - current_count_result.data); -+ narrow_cast(log_count - current_count_result.data); - logs_cursors[cursor_index].data.erase( - logs_cursors[cursor_index].data.begin() + logs_to_keep, - logs_cursors[cursor_index].data.end()); diff --git a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_external_CMakeLists.txt b/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_external_CMakeLists.txt deleted file mode 100644 index 0fdc6bab902b..000000000000 --- a/net-p2p/arbitrum-avm/files/patch-packages_arb-avm-cpp_external_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- packages/arb-avm-cpp/external/CMakeLists.txt.orig 2022-01-18 18:15:08 UTC -+++ packages/arb-avm-cpp/external/CMakeLists.txt -@@ -1,23 +1,12 @@ - include(ExternalProject) - --ExternalProject_Add(secp256k1_ext -- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/secp256k1" -- INSTALL_DIR "${CMAKE_BINARY_DIR}" -- CONFIGURE_COMMAND ./autogen.sh COMMAND /configure --enable-module-recovery --prefix -- BUILD_COMMAND make -- UPDATE_COMMAND "" -- BUILD_IN_SOURCE 1 --) -- - add_library(secp256k1 IMPORTED STATIC GLOBAL) --add_dependencies (secp256k1 secp256k1_ext) --ExternalProject_Get_Property(secp256k1_ext install_dir) - --file(MAKE_DIRECTORY ${install_dir}/include) -+file(MAKE_DIRECTORY /usr/local/include) - - set_target_properties(secp256k1 PROPERTIES -- "IMPORTED_LOCATION" "${install_dir}/lib/libsecp256k1.a" -- "INTERFACE_INCLUDE_DIRECTORIES" "${install_dir}/include" -+ "IMPORTED_LOCATION" "/usr/local/lib/libsecp256k1.a" -+ "INTERFACE_INCLUDE_DIRECTORIES" "/usr/local/include" - - ) - diff --git a/net-p2p/arbitrum-avm/pkg-descr b/net-p2p/arbitrum-avm/pkg-descr deleted file mode 100644 index 00356d4634dd..000000000000 --- a/net-p2p/arbitrum-avm/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Arbitrum is a Layer 2 cryptocurrency platform that makes smart contracts -scalable, fast, and private. Arbitrum interoperates closely with Ethereum, -so Ethereum developers can easily cross-compile their contracts to run on -Arbitrum. Arbitrum achieves these goals through a unique combination of -incentives, network protocol design, and virtual machine architecture.