From 11e13f5a41febc061fb1a89bbebced577250ddce Mon Sep 17 00:00:00 2001 From: "Rodrigo Q. Saramago" Date: Thu, 20 Oct 2022 20:32:36 -0300 Subject: [PATCH 1/3] Replace npm by yarn --- test/externalTests/gp2.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh index 1676d2b78..13b8bed3e 100755 --- a/test/externalTests/gp2.sh +++ b/test/externalTests/gp2.sh @@ -31,12 +31,12 @@ BINARY_TYPE="$1" BINARY_PATH="$(realpath "$2")" SELECTED_PRESETS="$3" -function compile_fn { npm run build; } -function test_fn { npm test; } +function compile_fn { yarn run build; } +function test_fn { yarn test; } function gp2_test { - local repo="https://github.com/gnosis/gp-v2-contracts.git" + local repo="https://github.com/cowprotocol/contracts.git" local ref_type=branch local ref=main local config_file="hardhat.config.ts" @@ -67,11 +67,11 @@ function gp2_test force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var" force_hardhat_unlimited_contract_size "$config_file" "$config_var" - npm install + yarn # New hardhat release breaks GP2 tests, and since GP2 repository has been archived, we are pinning hardhat # to the previous stable version. See https://github.com/ethereum/solidity/pull/13485 - npm install hardhat@2.10.2 + yarn add hardhat@2.10.2 # Some dependencies come with pre-built artifacts. We want to build from scratch. rm -r node_modules/@gnosis.pm/safe-contracts/build/ From be0f6339666c5b32de2adf24c49f98bd561482c0 Mon Sep 17 00:00:00 2001 From: "Rodrigo Q. Saramago" Date: Fri, 21 Oct 2022 16:59:50 -0300 Subject: [PATCH 2/3] Update gp2 fork --- scripts/externalTests/update_external_repos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh index 2270691ec..3093c1a08 100755 --- a/scripts/externalTests/update_external_repos.sh +++ b/scripts/externalTests/update_external_repos.sh @@ -83,7 +83,7 @@ clone_repo element-fi elf-contracts clone_repo ensdomains ens clone_repo ensdomains ens-contracts clone_repo euler-xyz euler-contracts -clone_repo gnosis gp-v2-contracts +clone_repo cowprotocol contracts gp2-contracts clone_repo gnosis mock-contract clone_repo gnosis util-contracts clone_repo JoinColony colonyNetwork @@ -105,7 +105,7 @@ sync_branch elf-contracts main sync_branch ens master sync_branch ens-contracts master sync_branch euler-contracts master -sync_branch gp-v2-contracts main +sync_branch gp2-contracts main sync_branch mock-contract master sync_branch util-contracts main sync_branch colonyNetwork develop From bc7567244a4ad4fe383935a0c7e29d0ece36dd62 Mon Sep 17 00:00:00 2001 From: "Rodrigo Q. Saramago" Date: Sun, 23 Oct 2022 17:58:13 -0300 Subject: [PATCH 3/3] Remove ens fork --- scripts/externalTests/update_external_repos.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh index 3093c1a08..8a25f3790 100755 --- a/scripts/externalTests/update_external_repos.sh +++ b/scripts/externalTests/update_external_repos.sh @@ -80,7 +80,6 @@ cd "$target_dir" clone_repo brinktrade brink-core clone_repo dapphub dappsys-monolithic clone_repo element-fi elf-contracts -clone_repo ensdomains ens clone_repo ensdomains ens-contracts clone_repo euler-xyz euler-contracts clone_repo cowprotocol contracts gp2-contracts @@ -102,7 +101,6 @@ clone_repo yieldprotocol yield-liquidator-v2 sync_branch brink-core master sync_branch dappsys-monolithic master sync_branch elf-contracts main -sync_branch ens master sync_branch ens-contracts master sync_branch euler-contracts master sync_branch gp2-contracts main