Skip to content

Conversation

mfw78
Copy link
Contributor

@mfw78 mfw78 commented Oct 7, 2024

Description

This PR is to close out the milestone of migrating tests to foundry. As all E2E tests have been migrated into the e2e-migration branch for staging purposes, this PR then merges (through use of rebase / fast-forward) these tests to the main branch.

Test Plan

  1. Verify CI/CD green and that all related tests have been migrated.

Related Issues

Fixes #130

## Description

Base test contract for forked tests in e2e tests

## Test Plan

CI

## Related Issues
## Description

Migrate nonStandardErc20 e2e test to foundry. Depends on
`FoundryTest.sol` introduced in #215

## Test Plan

CI

## Related Issues

Closes #138
## Description

Migrate the internalBalances e2e test to foundry. Depends on #215.

## Test Plan

CI

## Related Issues

Closes #137
## Description

Migrate the 0xTrade e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #131 #132
@mfw78 mfw78 requested a review from fedgiac October 7, 2024 11:26
@mfw78 mfw78 self-assigned this Oct 7, 2024
mfw78 and others added 14 commits October 7, 2024 11:44
## Description

This PR replaces llamarpc with merkle.io for the RPC as there are higher
RPS.

## Test Plan

1. Ensure CI/CD remains green for fork tests.

## Related Issues

N/A
## Description

Migrate wineOilMarket e2e test to foundry. Depends on #215 for the
`ForkedTest.t.sol`.

## Test Plan

CI

## Related Issues

Closes #143
## Description

Migrate the upgradeAuthenticator e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #142
## Description

In order to make use of cache, and to convey to testers / developers
what the assumptions of fork tests are, the fork block number is
established as a constant within the `Helper.sol`.

## Test Plan

1. Verify that CI/CD passes.

## Related Issues

N/A
## Description

Migrate the burnFees e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #134
## Description

This PR sets the `FORK_URL` environment variable to a mainnet archive
node with sufficient RPS / capacity to facilitate the fork tests.

## Test Plan

1. Verify CI/CD green.

## Related Issues

N/A
## Description

Migrate buyEth e2e test to foundry. Depends on
#215

## Test Plan

CI

## Related Issues
Closes #135
<!-- List related issues here -->
<!-- Closes #issue (optional) -->

---------

Co-authored-by: mfw78 <53399572+mfw78@users.noreply.github.com>
## Description

Migrate the offchainAllowances e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #139
## Description

Migrate the smartOrder e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Issue doesn't exist
## Description

Migrate the uniswapTrade e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #141
## Description

Migrate the contractOrdersWithGnosisSafe e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #136
## Description

Migrate the deployment e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #149
## Description

This PR addresses the environment setup that was used for fork tests.
Now, the `FORK_URL` is set by a secret, and the `FORK_BLOCK_NUMBER` is
hard coded within the `e2e` Helper as a constant so that assumptions are
visible for auditors / developers.

## Test Plan

1. Confirm CI/CD green

## Related Issues

N/A
## Description

Migrate the balancerSwap e2e test to foundry. Depends on
#215.

## Test Plan

CI

## Related Issues

Closes #133
@mfw78 mfw78 changed the title E2E test migration chore: E2E test migration Oct 9, 2024
## Description

This PR removes extraneous TypeScript that has been left over as a
result of the E2E tests.

## Test Plan

1. Confirm CI/CD green.

## Related Issues

#130
@mfw78 mfw78 marked this pull request as ready for review October 9, 2024 08:05
@mfw78 mfw78 requested a review from a team as a code owner October 9, 2024 08:05
Copy link

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@jridgewell/resolve-uri@3.1.2 None 0 53.2 kB jridgewell
npm/@jridgewell/sourcemap-codec@1.5.0 None 0 113 kB jridgewell
npm/@sindresorhus/is@0.14.0 None 0 40.2 kB sindresorhus
npm/@szmarczak/http-timer@1.1.2 None 0 6.3 kB szmarczak
npm/@tsconfig/node10@1.0.11 None 0 2.31 kB typescript-deploys
npm/@tsconfig/node12@1.0.11 None 0 2.5 kB typescript-deploys
npm/@tsconfig/node14@1.0.3 None 0 2.39 kB typescript-deploys
npm/@tsconfig/node16@1.0.4 None 0 2.45 kB typescript-deploys
npm/@types/bn.js@4.11.6 None 0 13.9 kB types
npm/acorn-walk@8.3.4 None 0 52.3 kB adrianheine, marijn, rreverser
npm/asn1.js@5.4.1 None 0 49.8 kB indutny
npm/at-least-node@1.0.0 None 0 2.63 kB ryanzim
npm/axios@0.21.4 environment, network 0 375 kB jasonsaayman
npm/browserify-cipher@1.0.1 None 0 6.45 kB cwmma
npm/browserify-des@1.0.2 None 0 6.27 kB cwmma
npm/browserify-rsa@4.1.0 None 0 3.68 kB cwmma
npm/browserify-sign@4.2.1 None 0 14.5 kB cwmma
npm/cacheable-request@6.1.0 network 0 16.8 kB lukechilds
npm/cookiejar@2.1.4 None 0 14.5 kB andyburke
npm/core-util-is@1.0.3 None 0 4.98 kB isaacs
npm/create-ecdh@4.0.4 None 0 5.4 kB cwmma
npm/cross-fetch@2.2.6 network 0 68.1 kB lquixada
npm/crypto-browserify@3.12.0 None 0 53.5 kB cwmma
npm/decompress-response@3.3.0 None 0 3.54 kB sindresorhus
npm/defer-to-connect@1.1.3 network 0 5.45 kB szmarczak
npm/des.js@1.0.1 None 0 38.6 kB indutny
npm/diffie-hellman@5.0.3 None 0 17.3 kB cwmma
npm/duplexer3@0.1.5 None 0 5.69 kB sindresorhus
npm/ethereumjs-util@6.2.1 None 0 131 kB holgerd77
npm/follow-redirects@1.14.7 network 0 26.5 kB rubenverborgh
npm/form-data@4.0.0 filesystem, network 0 43.4 kB niftylettuce
npm/fs-extra@9.1.0 filesystem 0 130 kB ryanzim
npm/globby@11.1.0 filesystem 0 21.8 kB sindresorhus
npm/got@9.6.0 filesystem, network 0 85.4 kB sindresorhus
npm/graceful-fs@4.2.6 environment, filesystem 0 28.6 kB isaacs
npm/is-typed-array@1.1.10 None 0 18.4 kB ljharb
npm/isarray@1.0.0 None 0 3.89 kB juliangruber
npm/json-buffer@3.0.0 None 0 5.44 kB dominictarr
npm/jsonfile@6.1.0 filesystem 0 19.8 kB ryanzim
npm/keccak@3.0.1 None 0 754 kB fanatid
npm/keyv@3.1.0 None 0 14.7 kB lukechilds
npm/node-fetch@2.6.9 network 0 162 kB node-fetch-bot
npm/normalize-url@4.5.1 None 0 18.1 kB sindresorhus
npm/oboe@2.1.4 network 0 7.5 MB juancaicedo
npm/p-cancelable@1.1.0 None 0 12.5 kB sindresorhus
npm/parse-asn1@5.1.6 None 0 13 kB cwmma
npm/prepend-http@2.0.0 None 0 2.98 kB sindresorhus
npm/process-nextick-args@2.0.1 None 0 3.17 kB cwmma
npm/public-encrypt@4.0.3 None 0 27.8 kB cwmma
npm/qs@6.10.1 None 0 204 kB ljharb
npm/randomfill@1.0.4 None 0 6.84 kB cwmma
npm/readable-stream@2.3.8 environment 0 88.1 kB matteo.collina
npm/responselike@1.0.2 None 0 4.63 kB lukechilds
npm/string_decoder@1.1.1 None 0 15.3 kB matteo.collina
npm/to-readable-stream@1.0.0 None 0 2.79 kB sindresorhus
npm/ts-node@10.9.2 environment, filesystem, unsafe 0 757 kB blakeembrey
npm/tweetnacl@1.0.3 None 0 175 kB dchest
npm/underscore@1.9.1 None 0 111 kB jashkenas
npm/universalify@2.0.0 None 0 4.64 kB ryanzim
npm/url-parse-lax@3.0.0 None 0 4.23 kB sindresorhus
npm/uuid@3.4.0 None 0 34.3 kB ctavan
npm/web3-bzz@1.2.11 None 0 8.62 kB ralxz
npm/web3-core-helpers@1.2.11 None 0 36.8 kB ralxz
npm/web3-core-method@1.2.11 None 0 38 kB ralxz
npm/web3-core-promievent@1.2.11 None 0 4.77 kB ralxz
npm/web3-core-requestmanager@1.2.11 None 0 20.2 kB ralxz
npm/web3-core-subscriptions@1.2.11 None 0 20.4 kB ralxz
npm/web3-core@1.2.11 None 0 19.2 kB ralxz
npm/web3-eth-abi@1.2.11 None 0 35.9 kB ralxz
npm/web3-eth-accounts@1.2.11 None 0 32.7 kB ralxz
npm/web3-eth-contract@1.2.11 None 0 46.4 kB ralxz
npm/web3-eth-ens@1.2.11 None 0 87.9 kB ralxz
npm/web3-eth-iban@1.2.11 None 0 15.1 kB ralxz
npm/web3-eth-personal@1.2.11 None 0 15.3 kB ralxz
npm/web3-eth@1.2.11 None 0 60.4 kB ralxz
npm/web3-net@1.2.11 None 0 7.68 kB ralxz
npm/web3-providers-http@1.2.11 network 0 10.9 kB ralxz
npm/web3-providers-ipc@1.2.11 None 0 14.2 kB ralxz
npm/web3-providers-ws@1.2.11 None 0 19.6 kB ralxz
npm/web3-shh@1.2.11 None 0 20.8 kB ralxz
npm/web3-utils@1.2.11 None 0 122 kB ralxz
npm/web3@1.2.11 filesystem 0 8.52 MB ralxz
npm/websocket@1.0.32 network 0 153 kB theturtle32
npm/whatwg-fetch@2.0.4 None 0 23.1 kB mislav
npm/which-typed-array@1.1.9 None 0 32 kB ljharb
npm/ws@7.4.6 network 0 113 kB lpinca
npm/xhr2-cookies@1.1.0 network 0 54.6 kB souldreamer

🚮 Removed packages: npm/@0x/contract-artifacts@2.2.2, npm/@ethereumjs/common@2.5.0, npm/@ethereumjs/tx@3.3.2, npm/@gnosis.pm/safe-contracts@1.3.0, npm/@jridgewell/resolve-uri@3.1.1, npm/@jridgewell/sourcemap-codec@1.4.15, npm/@safe-global/api-kit@1.3.0, npm/@safe-global/protocol-kit@1.2.0, npm/@safe-global/safe-core-sdk-types@2.2.0, npm/@safe-global/safe-deployments@1.26.0, npm/@sindresorhus/is@4.6.0, npm/@slack/logger@3.0.0, npm/@slack/types@2.8.0, npm/@slack/web-api@6.9.0, npm/@szmarczak/http-timer@5.0.1, npm/@tsconfig/node10@1.0.8, npm/@tsconfig/node12@1.0.9, npm/@tsconfig/node14@1.0.1, npm/@tsconfig/node16@1.0.2, npm/@types/bn.js@5.1.1, npm/@types/cacheable-request@6.0.3, npm/@types/http-cache-semantics@4.0.1, npm/@types/is-stream@1.1.0, npm/@types/keyv@3.1.4, npm/@types/responselike@1.0.0, npm/@types/retry@0.12.0, npm/abortcontroller-polyfill@1.7.5, npm/acorn-walk@8.2.0, npm/async-limiter@1.0.1, npm/axios@1.3.5, npm/cacheable-lookup@6.1.0, npm/cacheable-request@7.0.2, npm/core-util-is@1.0.2, npm/cross-fetch@3.1.8, npm/decompress-response@6.0.0, npm/defer-to-connect@2.0.1, npm/es6-promise@4.2.8, npm/ethereumjs-util@7.1.5, npm/follow-redirects@1.15.2, npm/form-data-encoder@1.7.1, npm/form-data@2.3.3, npm/fs-extra@4.0.3, npm/globby@11.0.4, npm/got@12.1.0, npm/graceful-fs@4.2.11, npm/http2-wrapper@2.2.0, npm/is-electron@2.2.2, npm/is-generator-function@1.0.10, npm/is-stream@1.1.0, npm/is-typed-array@1.1.12, npm/json-buffer@3.0.1, npm/jsonfile@4.0.0, npm/keccak@3.0.3, npm/keyv@4.5.2, npm/node-fetch@2.6.12, npm/normalize-url@6.1.0, npm/oboe@2.1.5, npm/p-cancelable@3.0.0, npm/p-finally@1.0.0, npm/p-queue@6.6.2, npm/p-retry@4.6.2, npm/p-timeout@3.2.0, npm/proxy-from-env@1.1.0, npm/qs@6.5.3, npm/quick-lru@5.1.1, npm/readable-stream@3.6.2, npm/resolve-alpn@1.2.1, npm/responselike@2.0.1, npm/retry@0.13.1, npm/string_decoder@1.3.0, npm/ts-node@10.9.1, npm/tweetnacl@0.14.5, npm/ultron@1.1.1, npm/universalify@0.1.2, npm/util@0.12.5, npm/uuid@9.0.0, npm/web3-bzz@1.10.0, npm/web3-core-helpers@1.10.0, npm/web3-core-method@1.10.0, npm/web3-core-promievent@1.10.0, npm/web3-core-requestmanager@1.10.0, npm/web3-core-subscriptions@1.10.0, npm/web3-core@1.10.0, npm/web3-eth-abi@1.10.0, npm/web3-eth-accounts@1.10.0, npm/web3-eth-contract@1.10.0, npm/web3-eth-ens@1.10.0, npm/web3-eth-iban@1.10.0, npm/web3-eth-personal@1.10.0, npm/web3-eth@1.10.0, npm/web3-net@1.10.0, npm/web3-providers-http@1.10.0, npm/web3-providers-ipc@1.10.0, npm/web3-providers-ws@1.10.0, npm/web3-shh@1.10.0, npm/web3-utils@1.10.0, npm/web3@1.10.0, npm/websocket@1.0.34, npm/which-typed-array@1.1.11, npm/ws@3.3.3

View full report↗︎

Copy link

🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎

To accept the risk, merge this PR and you will not be notified again.

Alert Package NoteSourceCI
Critical CVE npm/underscore@1.9.1 ⚠︎

View full report↗︎

Next steps

What is a critical CVE?

Contains a Critical Common Vulnerability and Exposure (CVE).

Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies.

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of ecosystem/package-name@version specifiers. e.g. @SocketSecurity ignore npm/foo@1.0.0 or ignore all packages with @SocketSecurity ignore-all

  • @SocketSecurity ignore npm/underscore@1.9.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

tests(core): e2e tests

2 participants