cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13643 from ethereum/ext-gp2-bug-fix

Browse Source 
Fix gp2 ext test failing to build, not being able to resolve the the keyv dependency
This commit is contained in:
Kamil Śliwak 2022-10-24 13:06:21 +02:00 committed by GitHub
commit fb3d0a874e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/externalTests/update_external_repos.sh
View File

@ -80,10 +80,9 @@ cd "$target_dir"
clone_repo brinktrade brink-core clone_repo brinktrade brink-core
clone_repo dapphub dappsys-monolithic clone_repo dapphub dappsys-monolithic
clone_repo element-fi elf-contracts clone_repo element-fi elf-contracts
clone_repo ensdomains ens
clone_repo ensdomains ens-contracts clone_repo ensdomains ens-contracts
clone_repo euler-xyz euler-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 mock-contract
clone_repo gnosis util-contracts clone_repo gnosis util-contracts
clone_repo JoinColony colonyNetwork clone_repo JoinColony colonyNetwork
@ -102,10 +101,9 @@ clone_repo yieldprotocol yield-liquidator-v2
sync_branch brink-core master sync_branch brink-core master
sync_branch dappsys-monolithic master sync_branch dappsys-monolithic master
sync_branch elf-contracts main sync_branch elf-contracts main
sync_branch ens master
sync_branch ens-contracts master sync_branch ens-contracts master
sync_branch euler-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 mock-contract master
sync_branch util-contracts main sync_branch util-contracts main
sync_branch colonyNetwork develop sync_branch colonyNetwork develop

10
test/externalTests/gp2.sh
View File

@ -31,12 +31,12 @@ BINARY_TYPE="$1"
BINARY_PATH="$(realpath "$2")" BINARY_PATH="$(realpath "$2")"
SELECTED_PRESETS="$3" SELECTED_PRESETS="$3"
function compile_fn { npm run build; } function compile_fn { yarn run build; }
function test_fn { npm test; } function test_fn { yarn test; }
function gp2_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_type=branch
local ref=main local ref=main
local config_file="hardhat.config.ts" 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_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var" force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
force_hardhat_unlimited_contract_size "$config_file" "$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 # 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 # 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. # Some dependencies come with pre-built artifacts. We want to build from scratch.
rm -r node_modules/@gnosis.pm/safe-contracts/build/ rm -r node_modules/@gnosis.pm/safe-contracts/build/