v2.0.0 release diff against v1.5.0 #2011
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat: rest in peace * fix: fix e2e wasm test * fix: fix justfile and deplyo-wasm * fix: update localnet * feat: rest in peace * fix(localnet.sh): change order of operations in genesis config * fix(localnet.sh): change order of operations in genesis config * rm unused file --------- Co-authored-by: Unique-Divine <realuniquedivine@gmail.com> Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com>
* chore(deps): Bump golang.org/x/net from 0.20.0 to 0.23.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.20.0 to 0.23.0. - [Commits](golang/net@v0.20.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Unique-Divine <Unique-Divine@users.noreply.github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20210921155107-089bfa567519 to 0.17.0. - [Commits](https://github.com/golang/crypto/commits/v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production ... Signed-off-by: Unique Divine <realuniquedivine@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com>
…001d to 0.23.0 in /geth (#1849) * chore(deps): Bump golang.org/x/crypto in /geth Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20210921155107-089bfa567519 to 0.17.0. - [Commits](https://github.com/golang/crypto/commits/v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): Bump golang.org/x/net in /geth Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220607020251-c690dde0001d to 0.23.0. - [Commits](https://github.com/golang/net/commits/v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: Unique-Divine <Unique-Divine@users.noreply.github.com> Co-authored-by: Unique-Divine <realuniquedivine@gmail.com>
…154634-513d2456b344 to 0.3.11 in /geth (#1851) * chore(deps): Bump github.com/supranational/blst in /geth Bumps [github.com/supranational/blst](https://github.com/supranational/blst) from 0.3.8-0.20220526154634-513d2456b344 to 0.3.11. - [Release notes](https://github.com/supranational/blst/releases) - [Commits](https://github.com/supranational/blst/commits/v0.3.11) --- updated-dependencies: - dependency-name: github.com/supranational/blst dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: Unique-Divine <Unique-Divine@users.noreply.github.com>
* chore(deps): Bump robinraju/release-downloader from 1.9 to 1.10 Bumps [robinraju/release-downloader](https://github.com/robinraju/release-downloader) from 1.9 to 1.10. - [Release notes](https://github.com/robinraju/release-downloader/releases) - [Commits](robinraju/release-downloader@v1.9...v1.10) --- updated-dependencies: - dependency-name: robinraju/release-downloader dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: Unique-Divine <Unique-Divine@users.noreply.github.com>
* ICA Host / Controller integration. Added upgrade constants. Added make format command * Fixed required message URLs * Code import fix * Fixed upgrade name * Fixed upgrade target * Changed version number * Update CHANGELOG.md --------- Co-authored-by: Jonathan Gimeno <jgimeno@gmail.com> Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com>
…4 to 5 (#1854) * chore(deps): Bump golangci/golangci-lint-action from 4 to 5 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4...v5) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * ci: add CODECOV_TOKEN env var to secrets * ci settings * Updated changelog - dependabot * refactor: run just fmt --------- Signed-off-by: Unique-Divine <Unique-Divine@users.noreply.github.com> Co-authored-by: Unique-Divine <realuniquedivine@gmail.com> Co-authored-by: dependabot[bot] <support@github.com>
…nagement and event distribution (#1855)
…1858) * chore(deps): bump github.com/hashicorp/go-getter from 1.7.1 to 1.7.4 Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: Unique-Divine <Unique-Divine@users.noreply.github.com>
* refactor(oracle): add oracle slashing events * Update CHANGELOG.md
…d blocks and Tendermint ones. (#1856) * feat(eth-pubsub): Implement in-memory EventBus for real-time topic management and event distribution * feat(eth-rpc): Conversion types and functions between Ethereum txs and blocks and Tendermint ones. * chore: linter * test(eth-rpc): more tests for types dir * ci: add CODECOV_TOKEN env var to secrets * test,refactor(eth): remove unnecessary nesting + more tests * refactor(eth): rpc/types -> rpc * refactor(eth): evm/types -> evm * refactor(eth): ethtypes -> eth * test(eth): eip712 more tests * test(eth): more tests * test(eth-rpc): more tests
…#1861) * Squashed commit of the following: commit 045cf6d Merge: db03210 ffcea96 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun May 5 15:21:16 2024 -0500 Merge branch 'main' into ud/evm-rpc commit db03210 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun May 5 15:18:59 2024 -0500 test(eth-rpc): more tests commit 14f8a2c Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun Apr 28 17:21:18 2024 -0500 test(eth): more tests commit 433780d Merge: 4f28f8f 29e2acd Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun Apr 28 14:53:34 2024 -0500 Merge branch 'main' into ud/evm-rpc commit 4f28f8f Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun Apr 28 14:51:54 2024 -0500 test(eth): eip712 more tests commit bfac1e8 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun Apr 28 14:29:27 2024 -0500 refactor(eth): ethtypes -> eth commit b32d385 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sun Apr 28 14:24:26 2024 -0500 refactor(eth): evm/types -> evm commit a336983 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sat Apr 27 15:58:05 2024 -0500 refactor(eth): rpc/types -> rpc commit c3a6215 Merge: fe913dc 31bb3bb Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sat Apr 27 13:13:37 2024 -0500 Merge branch 'ud/evm' into ud/evm-rpc commit 31bb3bb Merge: 1a05061 072de03 Author: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Date: Sat Apr 27 20:12:14 2024 +0200 Merge branch 'main' into ud/evm commit fe913dc Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sat Apr 27 09:10:03 2024 -0500 test,refactor(eth): remove unnecessary nesting + more tests commit 372df12 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sat Apr 27 07:41:04 2024 -0500 ci: add CODECOV_TOKEN env var to secrets commit ac0701a Author: Unique-Divine <realuniquedivine@gmail.com> Date: Sat Apr 27 07:26:57 2024 -0500 test(eth-rpc): more tests for types dir commit 176b6c6 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Fri Apr 26 20:54:04 2024 -0500 chore: linter commit 36730c5 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Fri Apr 26 20:48:58 2024 -0500 feat(eth-rpc): Conversion types and functions between Ethereum txs and blocks and Tendermint ones. commit 1a05061 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Fri Apr 26 08:11:57 2024 +0200 feat(eth-pubsub): Implement in-memory EventBus for real-time topic management and event distribution * feat(eth-rpc): RPC backend, Ethereum tracer, KV indexer, and RPC APIs * fix(indexer): register eth and evm types during test setup
* fix(ica): add controller stack * chore: update changelog * fix: linter issues * Update CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* feat: update dec and int to use cosmossdk.io/math * chore: changelog
…biruAccount (#1873) * feat(evm): module wiring * quicksave wip! * chore(deps): use collections v0.5 * eth: query type validation * fix(deps): remove local collections replace statement * query Balance * linter + changelog * fix test * test(evm): QueryEthAccount tests * chore: linter * changelog
* fix: remove all stringer for proto types * chore: changelog
…e tracking with upstream (#1895) * wip! submodule init * wip! try tagged version
* feat(gosdk): migrate golang sdk into nibiru * changelog PR number * add gh ticket to TODO comment
…t bytecode, EthCall, and Ethereum JSON-RPC coverage (#1883) * Squashed commit of the following: commit 1fe82fe Merge: 4e323da fac6492 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 23:48:32 2024 -0500 Merge branch 'main' into on/evm-json-rpc commit 4e323da Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 22:34:36 2024 +0400 feat: implemented evm grpc_query params commit ec64f33 Merge: eed9f8c 6e38c19 Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 21:12:33 2024 +0400 chore: resolve conflicts commit eed9f8c Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 21:09:44 2024 +0400 chore: changelog commit e0ec526 Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 21:08:07 2024 +0400 chore: changelog commit 6b5191b Merge: 518e89f 69865ec Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 21:04:30 2024 +0400 Merge branch 'ud/eth-2' into on/evm-json-rpc commit 69865ec Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 12:01:32 2024 -0500 linter + changelog commit 518e89f Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 21:00:30 2024 +0400 fix: hacked eth chain id commit f874b87 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 11:54:19 2024 -0500 query Balance commit 289b1d7 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 11:30:15 2024 -0500 fix(deps): remove local collections replace statement commit 2215a9a Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 20:16:58 2024 +0400 chore: cleanup commit 71d5179 Author: Oleg Nikonychev <oleg.nikonychev@gmail.com> Date: Tue May 14 20:15:12 2024 +0400 feat: evm app config and json-rpc commit fc5f463 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 10:55:30 2024 -0500 eth: query type validation commit a6437fd Merge: 0c5cffb 40a0a9a Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 10:53:50 2024 -0500 Merge branch 'ud/eth' into ud/eth-2 commit 0c5cffb Author: Unique-Divine <realuniquedivine@gmail.com> Date: Tue May 14 10:53:46 2024 -0500 chore(deps): use collections v0.5 commit 40a0a9a Merge: 0dbba9e 2342254 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Mon May 13 11:12:53 2024 -0500 Merge branch 'main' into ud/eth commit 0dbba9e Author: Unique-Divine <realuniquedivine@gmail.com> Date: Mon May 13 11:12:42 2024 -0500 quicksave wip! commit 820f50e Merge: 3159973 e7ed442 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Fri May 10 02:42:51 2024 -0500 Merge branch 'main' into ud/eth commit 3159973 Author: Unique-Divine <realuniquedivine@gmail.com> Date: Fri May 10 02:41:42 2024 -0500 feat(evm): module wiring * feat(evm): grpc query ValidatorAccount * test: QueryStorage * wip! upstream tests * evm: wip! checkpoint * test(evm): TestQueryParams * feat(evm): MsgServer fns for MsgEthereumTx * feat(evm): ante handlers * fix,test(evmtest): deploy contract + fix ante handler * fix,test(evm): EthereumTx happy paths * fix(evm): Chain info fix and gRPC queries * feat(evm-query): impl EthCAll * fix(eip712): test case changed and const usage * test(evm): ante handler test * refactor(evm-ante) * feat: implemented basic evm tx methods (#1889) * feat: implemented basic evm tx methods * chore: lint * chore: extracted evm chain_id to appconst * fix: tests * fix: tests * fix: lint * chore: cleanup * refactor: merge upstream * chore(evm-keeper): remove unused code --------- Co-authored-by: Unique-Divine <realuniquedivine@gmail.com> * test(eth): gas limit tests * test(evm): utils for loading Eth contracts + test EthCall * docs(evm): eth call comment * test(evm): eth api integration test suite (#1887) * test(evm): eth api integration test suite * test(evm): more integration tests for eth api * feat: implemented basic evm tx methods * chore: lint * chore: lint * chore: lint * chore: extracted evm chain_id to appconst * fix: tests * fix: tests * fix: lint * chore: cleanup * refactor: merge * fix: eth chain ID test * fix(eth): chain ID * linter fix * test(evm): integration tests for tx and smart contract * chore(evm): disabled json rpc by default * refactor: merge conflicts * test(rpcapi): make fixtures consistent * fix(evm): integration test fixture setup * chore: linter --------- Co-authored-by: Unique-Divine <realuniquedivine@gmail.com> * test(evm): ethers.js tests for evm (#1896) * test(evm): eth api integration test suite * test(evm): more integration tests for eth api * feat: implemented basic evm tx methods * chore: lint * chore: lint * chore: lint * chore: extracted evm chain_id to appconst * fix: tests * fix: tests * fix: lint * chore: cleanup * refactor: merge * fix: eth chain ID test * fix(eth): chain ID * linter fix * test(evm): integration tests for tx and smart contract * chore(evm): disabled json rpc by default * test(evm): ethers.js tests for evm * test(evm): github workflow * fix: gh actions evm tests npm instead of yarn * fix: evm gh tests * fix: evm gh tests * fix: evm gh tests * chore: cleanup * chore: renamed evm job * refactor: merge conflict rever * refactor(e2e): consistent path * chore: cleanup unused * wip!: try removing chain ID hacks * wip!: try removing chain ID hacks * chore: linter --------- Co-authored-by: Unique-Divine <realuniquedivine@gmail.com> * ci: rename e2e-evm suite --------- Co-authored-by: Oleg Nikonychev <oleg.nikonychev@gmail.com>
* fix: added tx logs emitting to the funtoken related txs * chore: changelog update * chore: lint * chore: debug failing integration test * fix: removed tx index updating for non eth txs * fix: tests --------- Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com>
* chore: close iterator in IterateEpochInfo * chore: add a line in changelog
* chore: Remove allowUnprotectedTxs * chore: add a line in changelog
…t send MsgEthereumTx (#2159) * chore(evm): Augment the Wasm msg handler so that wasm contracts cannot send MsgEthereumTx * cleanup * cleanup * partial refactor * fix: compilation errors * refactor: remove CallContract completely * refactor: mintOrUnescrowERC20 * refactor: use simpler evmObj creation pattern * fix: empty gas price in gethcore Message * fix: contract address collision error * fix: TestPrecompileSelfCallRevert * fix: unnecessary stateDB creation * fix: ensure stateDB singleton * fix: balance check * fix: balance transfer check had wrong direction * fix: deploy contract args * fix: use a new StateDB before CallContractWithInput * Update CHANGELOG.md * fix: clear StateDB between txs * Update account_info_test.go * Update account_info_test.go * Update app/evmante/evmante_can_transfer.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix base fee wei * refactor: funtoken tests * refactor: simplify NewEVM() object creation in tests * fix: stateDB should not commit on ERC20 calls * fix: commit after minting funtokens * fix: erc20 burn was committing when it shouldn't be * fix: linter * refactor: TestCreateFunTokenFromCoin * test(app-wasmext): add happy path DispatchMsg example to test --------- Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* fix(evm): ensure stateDB is nil after tx execution * Update CHANGELOG.md * test: add smart contract test (precompile sendToBank then ERC20 transfer)
* chore(deps): bump golang.org/x/net from 0.23.0 to 0.33.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.23.0 to 0.33.0. - [Commits](golang/net@v0.23.0...v0.33.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Unique-Divine <51418232+Unique-Divine@users.noreply.github.com>
* chore(deps): bump undici from 5.28.4 to 5.28.5 in /x/evm/embeds Bumps [undici](https://github.com/nodejs/undici) from 5.28.4 to 5.28.5. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.4...v5.28.5) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Updated changelog - dependabot --------- Signed-off-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Unique Divine <51418232+Unique-Divine@users.noreply.github.com>
k-yang
force-pushed
the
releases/v2.0.0
branch
from
19db354 to
a58899e
Compare
* chore: cleanup funtoken test * Update funtoken_test.go * refactor: update wasm tests * Update export.go * Update debug.go * fix: TestJournalReversion * test(evm): add dirty state attack tests * Update wasm_test.go * test: add TestWasmPrecompileDirtyStateAttack4 * Update wasm_test.go * Update CHANGELOG.md * test(evm): add wasm precompile staking test * fix: total supply calc in tests * test(evm): remove dirty state attacks 1-3 due to being duplicates * refactor: variable names
* fix(evm): consume gas in CallContractWithInput * Update CHANGELOG.md * fix: gas consumption in ApplyEvmMsg * fix: move commit after gas refund calculation so that we can return a valid evmResp * refactor: GasToRefund * fix: proper checking of err pointer nil Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix: remove fullRefundLeftoverGas * test: add gas assertions * Update gas_fees.go --------- Co-authored-by: Oleg Nikonychev <oleg.nikonychev@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* fix: force gas invariant gas meter type * Update bank_extension.go * Update CHANGELOG.md
* chore: update chain IDs * fix: changelog * chore: fix test * chore: reset chain id changes --------- Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com>
* chore: changelog * chore: cleanup * chore: formatting
* fix: add extra case of converting straight from bytes to string * fix: eip55 encoding * Update CHANGELOG.md
* fix(oracle): correctly handle misscount * Update changelog
…2188) * remove unused protos * remove unnecessary functions * rename eth_tx_failed to vmError * Update CHANGELOG.md * refactor(proto): remove reserved field --------- Co-authored-by: Oleg Nikonychev <oleg.nikonychev@gmail.com>
* fix(test): evm e2e oracle test fixed pair name * fix(test): fixed pair name in localnet * chore: changelog
#2197) * refactor: Move simapp -> app/simapp * chore: changelog * refactor: automic solidity LSP formatting * ignore MKR.sol ABIs in the generation export * docs: more comprehensive docs for @nibiruchain/solidity * gitignore for evm-core * source code for @nibiruchain/evm-core package
* feat(evm-core-ts): Add ERC20 caller to the ethers export. * chore: changelog * uncommit toy project
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT MERGE. For illustration purposes only.