Skip to content

Merge integration test repo into the Monorepo#43

Merged
masonforest merged 34 commits intomasterfrom
YAS-248/MigrateIntegrationTestIntoMonorepo
Mar 19, 2020
Merged

Merge integration test repo into the Monorepo#43
masonforest merged 34 commits intomasterfrom
YAS-248/MigrateIntegrationTestIntoMonorepo

Conversation

@masonforest
Copy link
Copy Markdown

@masonforest masonforest commented Mar 18, 2020

Description

Previously we moved the integration tests into their own repo to speed up testing and separate concerns. This proved to be less than optimal because every time we made a change to the monorepo we'd need to link and run the integration tests separately. Here we merge them back in.

Notes:

  • The ethereum-waffle version in test-ERC20-Truffle was pegged to 2.1.0

Metadata

Fixes

Contributing Agreement

@masonforest masonforest force-pushed the YAS-248/MigrateIntegrationTestIntoMonorepo branch from bcf88d8 to 99beb1f Compare March 18, 2020 14:24
@masonforest masonforest changed the title WIP [do not merge] Merge integration test repo into the Monorepo Merge integration test repo into the Monorepo Mar 18, 2020
Copy link
Copy Markdown

@willmeister willmeister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

Few suggestions to update package.json path stuff.

masonforest and others added 9 commits March 18, 2020 13:08
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
Co-Authored-By: Will Meister <william.k.meister@gmail.com>
@masonforest masonforest force-pushed the YAS-248/MigrateIntegrationTestIntoMonorepo branch from e1251aa to 3e6dcd3 Compare March 18, 2020 17:57
@masonforest masonforest force-pushed the YAS-248/MigrateIntegrationTestIntoMonorepo branch 2 times, most recently from 0f431df to 347e58e Compare March 18, 2020 18:10
`ignore-changes` didn't work as expected
 - @eth-optimism/core-db@0.0.1-alpha.22
 - @eth-optimism/core-utils@0.0.1-alpha.22
 - @eth-optimism/docs@0.0.1-alpha.22
 - @eth-optimism-test/integration-test-utils@0.0.1-alpha.22
 - @eth-optimism/optimistic-game-semantics@0.0.1-alpha.22
 - @eth-optimism/ovm-truffle-provider-wrapper@0.0.1-alpha.22
 - @eth-optimism/ovm@0.0.1-alpha.22
 - @eth-optimism/rollup-contracts@0.0.1-alpha.22
 - @eth-optimism/rollup-core@0.0.1-alpha.22
 - @eth-optimism/rollup-dev-tools@0.0.1-alpha.22
 - @eth-optimism/rollup-full-node@0.0.1-alpha.22
 - @eth-optimism/solc-transpiler@0.0.1-alpha.22
 - @eth-optimism-test/erc20-truffle@0.0.1-alpha.2
 - @eth-optimism-test/ERC20-Waffle@0.0.1-alpha.2
 - @eth-optimism-test/ovm-full-node-integration-tests@0.0.1-alpha.2
 - @eth-optimism-test/erc20-full@0.0.1-alpha.2
 - @eth-optimism/core-db@0.0.1-alpha.23
 - @eth-optimism/core-utils@0.0.1-alpha.23
 - @eth-optimism-test/integration-test-utils@0.0.1-alpha.23
 - @eth-optimism/optimistic-game-semantics@0.0.1-alpha.23
 - @eth-optimism/ovm-truffle-provider-wrapper@0.0.1-alpha.23
 - @eth-optimism/ovm@0.0.1-alpha.23
 - @eth-optimism/rollup-contracts@0.0.1-alpha.23
 - @eth-optimism/rollup-core@0.0.1-alpha.23
 - @eth-optimism/rollup-dev-tools@0.0.1-alpha.23
 - @eth-optimism/rollup-full-node@0.0.1-alpha.23
 - @eth-optimism/solc-transpiler@0.0.1-alpha.23
 - @eth-optimism-test/erc20-truffle@0.0.1-alpha.3
 - @eth-optimism-test/ERC20-Waffle@0.0.1-alpha.3
 - @eth-optimism-test/ovm-full-node-integration-tests@0.0.1-alpha.3
 - @eth-optimism-test/erc20-full@0.0.1-alpha.3
@masonforest masonforest merged commit b5a5258 into master Mar 19, 2020
@masonforest masonforest deleted the YAS-248/MigrateIntegrationTestIntoMonorepo branch March 23, 2020 13:21
gakonst added a commit that referenced this pull request Apr 12, 2021
* docs: update README.md

* docs: update README.md
InoMurko referenced this pull request in omgnetwork/optimism May 25, 2021
* docs: update README.md

* docs: update README.md
protolambda pushed a commit to protolambda/optimism that referenced this pull request May 1, 2022
github-merge-queue bot pushed a commit that referenced this pull request Dec 6, 2023
span-batches: encode bitlists as big-endian integers, use standard Go…
bap2pecs pushed a commit to babylonlabs-io/optimism that referenced this pull request Jul 31, 2024
cuiweixie pushed a commit to cuiweixie/optimism that referenced this pull request Oct 22, 2025
theochap pushed a commit that referenced this pull request Dec 10, 2025
* types: first pass

* cleanup

* lint

* Remove span batch for now

---------

Co-authored-by: clabby <ben@clab.by>
Zena-park added a commit to tokamak-network/optimism that referenced this pull request Dec 30, 2025
==== Work ========

- merge the 'apply-thanos-of-trh' branch
   -  fixes contracts and documents for applying TRH Thanos stack

- merge the 'guide-document-for-user' branch
   - readme
   - a user guide

===========================

commit 5e9b83ce594d84d97380efd58805bff9e9dc1ffe
Author: Zena-park <zena@tokamak.network>
Date:   Thu Jan 23 19:03:21 2025 +0900

    Squashed commit of the following:

    ==== work ==============

    merge the 'guide-document-for-user' branch
    - readme
    - a user guide

    =======================

    commit 8c6f459a86bd3e009339da9c45476a54c9fad312
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jan 15 14:25:49 2025 +0900

        ⚡️ doc: add an audit request branch

    commit 826972cb947e42e475c33914c8e614726c2cbe54
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jan 15 11:10:08 2025 +0900

        doc

    commit 4b5dbe8fbd28bf7af78e2641460e51a4dcf983ee
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jan 15 09:43:16 2025 +0900

        Update WTON.md

    commit 4d3f6f1d0f6b8144f0cc87f253101735be578132
    Author: Zena-park <zena@tokamak.network>
    Date:   Tue Jan 14 22:27:43 2025 +0900

        doc: add SwapProxy address

    commit 76019d2daae68713deaee4a6c7bd46ce53a04130
    Author: Zena-park <zena@tokamak.network>
    Date:   Mon Jan 13 21:20:35 2025 +0900

        doc

    commit ed0013eda8c96e80955a52b9ae4990be1ab6f4fb
    Author: Zena-park <zena@tokamak.network>
    Date:   Mon Jan 13 21:17:14 2025 +0900

        Update WTON.md

    commit f7cdb414184f9665fed8b9e8f694eee719e9a9bf
    Author: Zena-park <zena@tokamak.network>
    Date:   Mon Jan 13 21:15:00 2025 +0900

        doc: update

    commit 881c20416e63dd7ef8beb3cf43351359ba4041b7
    Author: Zena-park <zena@tokamak.network>
    Date:   Mon Jan 13 21:10:40 2025 +0900

        doc: update

    commit 1327a690783976131737609cdecdc3b311c5940c
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 10 14:27:03 2025 +0900

        docs: update

    commit 94133306c6f2164222279663686a54d3064619c7
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 10 14:18:37 2025 +0900

        docs: overview

    commit 5b593f1dc91bd42f20438a0a4885d07aa8a163f9
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 10 13:01:40 2025 +0900

        Update README.md

    commit 34dfab0c4725307d408c850125919e3cee1a6235
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 10 11:37:02 2025 +0900

        docs: update

    commit 06fa75aee20a9bb5aab56e73b65892bd93a30d82
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 10 11:25:58 2025 +0900

        docs: the contract description

    commit b4ce9bc56ea132275ad1690bc5c12a2d38500e0b
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jan 8 09:19:19 2025 +0900

        test

    commit ea46f840afc5525b67c1066ceb119937a483cc9e
    Author: Zena-park <zena@tokamak.network>
    Date:   Tue Jan 7 16:52:26 2025 +0900

        Update transaction-staking-functions.md

    commit fd00bd089c025e3adf802a5efc043c6bcab53bd7
    Author: Zena-park <zena@tokamak.network>
    Date:   Tue Jan 7 16:48:40 2025 +0900

        Update transaction-staking-functions.md

    commit d701d89faf5db05cc3f8fa1e4ed814670784efd5
    Author: Zena-park <zena@tokamak.network>
    Date:   Tue Jan 7 15:16:09 2025 +0900

        Update README.md

    commit ab7c91f9cd306668c8a1854de6ddbaaf3bcb988c
    Author: Zena-park <zena@tokamak.network>
    Date:   Tue Jan 7 13:57:10 2025 +0900

        doc: withdrawal

    commit 135a3e5d745427cb11604bd611bf4191bf654d0f
    Author: Zena-park <zena@tokamak.network>
    Date:   Tue Jan 7 09:29:27 2025 +0900

        doc: update

    commit f6ca4447bb249cbbf846542b56873f1c40d1a956
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 3 18:07:02 2025 +0900

        doc: layer address

    commit 8db03d7ce2c398de78b4bf8068016d88d46d27af
    Author: Zena-park <zena@tokamak.network>
    Date:   Fri Jan 3 17:47:04 2025 +0900

        doc: etherscan guide

    commit 4c38fe3e30103e10c681fbfa54112623684fc69b
    Author: Zena-park <zena@tokamak.network>
    Date:   Thu Jan 2 19:05:20 2025 +0900

        Update README.md

    commit 0bf83a711e15d9b46aee62bf351a47e7dfff26e0
    Author: Zena-park <zena@tokamak.network>
    Date:   Thu Jan 2 19:04:41 2025 +0900

        Update README.md

    commit e605b3ab7f0a3339472164e1601a35ee9cb0bedc
    Author: Zena-park <zena@tokamak.network>
    Date:   Thu Jan 2 19:02:42 2025 +0900

        doc: update readme

    commit 18328e6
    Author: Suah Kim <suahnkim@gmail.com>
    Date:   Tue Oct 29 22:06:00 2024 +0900

        Delete .github/ISSUE_TEMPLATE/1-contract.yml

        public test is finished, removing template

    commit 9a171c2
    Author: Suah Kim <suahnkim@gmail.com>
    Date:   Thu Oct 10 17:12:39 2024 +0900

        updated github issue template for contract bugs

    commit fb614fe
    Merge: 30f8038 78f3652
    Author: Zena-park <75723511+Zena-park@users.noreply.github.com>
    Date:   Mon Oct 7 11:11:56 2024 +0900

        Merge pull request ethereum-optimism#43 from tokamak-network/add_templante

        Create 2-contract.yml

    commit 78f3652
    Author: HyukSang <zzooppii@gmail.com>
    Date:   Mon Oct 7 10:50:04 2024 +0900

        Create 2-contract.yml

        Added template for DAO Contract code review

    commit 30f8038
    Author: Suah Kim <suahnkim@gmail.com>
    Date:   Fri Oct 4 15:56:58 2024 +0900

        update github issue for internal test

        removed code review and added internal test

    commit 2cc9016
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jul 31 13:31:10 2024 +0900

        Update hardhat.config.ts

    commit f9e330c
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jul 31 11:16:13 2024 +0900

        test: add ABI ethereum-optimism#33

    commit 07c6bef
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jul 31 10:54:28 2024 +0900

        feat: deploy ethereum-optimism#33

        https://sepolia.etherscan.io/address/0x7e459bc07736f735e3e758fbb740c385fb4d466b#code

    commit c55397c
    Author: Zena-park <zena@tokamak.network>
    Date:   Wed Jul 31 10:52:41 2024 +0900

        feat: DepositManager_setWithdrawalDelay ethereum-optimism#33

    commit 09ce354
    Merge: 6df0d76 cc43161
    Author: Zena-park <zena@tokamak.network>
    Date:   Sat Jun 29 21:02:50 2024 +0900

        Merge branch 'SeigManagerV1_2'

    commit 6df0d76
    Author: Zena-park <75723511+Zena-park@users.noreply.github.com>
    Date:   Fri Jun 28 15:04:20 2024 +0900

        Update issue templates

    commit fff38f2
    Author: Zena-park <75723511+Zena-park@users.noreply.github.com>
    Date:   Fri Jun 28 15:00:47 2024 +0900

        Update issue templates

commit 8879db7f767ab6a7acac47626e0a519a11c68094
Author: Zena-park <zena@tokamak.network>
Date:   Thu Jan 23 19:01:02 2025 +0900

    docs

commit b13b5b5e20fc3b1880b607f2051c8c47421d3944
Author: Zena-park <zena@tokamak.network>
Date:   Thu Jan 23 16:20:43 2025 +0900

    Update ton-staking-v2.md

commit 650b4f5b2eef14dcc192dcd0f3382d83262c0536
Author: Zena-park <zena@tokamak.network>
Date:   Thu Jan 23 13:33:31 2025 +0900

    test

commit 32f4459b1d0d3a26c54efdc8c26c012f08f8a4ba
Author: Zena-park <zena@tokamak.network>
Date:   Thu Jan 23 13:33:21 2025 +0900

    fix: MockSystemConfig

commit 86e9a2079131d107757f911a316c38fd5d82a0db
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 18:12:56 2025 +0900

    test SystemConfig

commit 946f002311bfe7ee4b2759e89a7c6daefb07d6e2
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:52:46 2025 +0900

    Delete 7.dao-staking-v2.5.mainnet.test.ts

commit cad1a8841f3b7db268582fb83fec3d40a47fa4fa
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:52:43 2025 +0900

    deployments

commit ed99604b4e5589bd6e26af7e5034633064c0c162
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:52:31 2025 +0900

    test to upgrade thanos-sepolia

commit c11bc7612ce89b1b016abb999fee29227d10c3f4
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:26:41 2025 +0900

    test

commit a06a9752539f6316807caf64718b5fe56ad39199
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:26:20 2025 +0900

    abi

commit 3975d5cbff1a286bc099b825460ff27aea2e02fa
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:26:12 2025 +0900

    config

commit 962f6206cc1e42ee43314f2a077fed7734961b7f
Author: Zena-park <zena@tokamak.network>
Date:   Wed Jan 22 16:26:01 2025 +0900

    add the seigniorageReceiver storage in SystemConfig
Zena-park added a commit to tokamak-network/optimism that referenced this pull request Dec 30, 2025
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.

2 participants