diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index f2cd6dc01b..7dfbd991e6 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -41,6 +41,10 @@ { "note": "Redeploy `KyberBridge` on Mainnet", "pr": 2683 + }, + { + "note": "Update transformer deployer and transformers for champagne-problems deployment", + "pr": 2693 } ] }, diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index 224a8237fb..8ef15002c0 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -38,15 +38,15 @@ "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb", - "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da", + "exchangeProxyTransformerDeployer": "0x81c0ab53a7352d2e97f682a37cba44e54647eefb", "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18", "mStableBridge": "0x2bf04fcea05f0989a14d9afa37aa376baca6b2b3", "mooniswapBridge": "0x02b7eca484ad960fca3f7709e0b2ac81eec3069c", "transformers": { - "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8", - "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841", - "fillQuoteTransformer": "0xa8c8cf29699f223766f47fe79e2b7eb1a90e08c8", - "affiliateFeeTransformer": "0x9d7174f55b50dad2e417bd567ad2da1ae4eef76d" + "wethTransformer": "0x9fbacfe5cf2ee08a3f7c71c638603b6d5961bfeb", + "payTakerTransformer": "0xc9406e3ec8c4005951e0d9430a2981ca720d76c9", + "affiliateFeeTransformer": "0x2cfdacce1dcf97950a7dd0adad278a1077fa4224", + "fillQuoteTransformer": "0x3ae59e53ea6a2e364ba68e584c8db95134a0021a" } }, "3": { @@ -88,15 +88,15 @@ "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb", - "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da", + "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb", "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18", "mStableBridge": "0x0000000000000000000000000000000000000000", "mooniswapBridge": "0x0000000000000000000000000000000000000000", "transformers": { - "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8", - "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841", - "fillQuoteTransformer": "0x58faf8e7bad3131d00d4deacb7488744818b9570", - "affiliateFeeTransformer": "0x9d7174f55b50dad2e417bd567ad2da1ae4eef76d" + "wethTransformer": "0x68c0bb685099dc7cb5c5ce2b26185945b357383e", + "payTakerTransformer": "0x49b9df2c58491764cf40cb052dd4243df63622c7", + "affiliateFeeTransformer": "0x4581b59a05ba373b9f67676f66bdb5fcd67e7567", + "fillQuoteTransformer": "0xaaeb683b35a36876bd44aea6b704f58614889228" } }, "4": { @@ -138,15 +138,15 @@ "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb", - "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da", + "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb", "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18", "mStableBridge": "0x0000000000000000000000000000000000000000", "mooniswapBridge": "0x0000000000000000000000000000000000000000", "transformers": { - "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8", - "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841", - "fillQuoteTransformer": "0x2ebe42dab6c6dec58ba494d111d1464836216c2a", - "affiliateFeeTransformer": "0x9d7174f55b50dad2e417bd567ad2da1ae4eef76d" + "wethTransformer": "0x68c0bb685099dc7cb5c5ce2b26185945b357383e", + "payTakerTransformer": "0x49b9df2c58491764cf40cb052dd4243df63622c7", + "affiliateFeeTransformer": "0x4581b59a05ba373b9f67676f66bdb5fcd67e7567", + "fillQuoteTransformer": "0xaaeb683b35a36876bd44aea6b704f58614889228" } }, "42": { @@ -188,15 +188,15 @@ "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb", - "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da", + "exchangeProxyTransformerDeployer": "0x1c9a27658dd303a31205a3b245e8993b92d4d502", "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18", "mStableBridge": "0x0000000000000000000000000000000000000000", "mooniswapBridge": "0x0000000000000000000000000000000000000000", "transformers": { - "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8", - "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841", - "fillQuoteTransformer": "0x10c394406d2b15fb8e67b9a7a0dd03fa4d3e8099", - "affiliateFeeTransformer": "0x9d7174f55b50dad2e417bd567ad2da1ae4eef76d" + "wethTransformer": "0x8d822fe2b42f60531203e288f5f357fa79474437", + "payTakerTransformer": "0x150652244723102faeaefa4c79597d097ffa26c6", + "affiliateFeeTransformer": "0xa39b40642e8e00435857a0fe7d0655e08cc2217e", + "fillQuoteTransformer": "0xaf77ff7b00ff528abdcac3f1dcf072de702b758e", } }, "1337": { @@ -243,10 +243,10 @@ "mStableBridge": "0x0000000000000000000000000000000000000000", "mooniswapBridge": "0x0000000000000000000000000000000000000000", "transformers": { - "wethTransformer": "0x3f16ca81691dab9184cb4606c361d73c4fd2510a", + "wethTransformer": "0xc6b0d3c45a6b5092808196cb00df5c357d55e1d5", "payTakerTransformer": "0x7209185959d7227fb77274e1e88151d7c4c368d3", - "fillQuoteTransformer": "0xc6b0d3c45a6b5092808196cb00df5c357d55e1d5", - "affiliateFeeTransformer": "0x99356167edba8fbdc36959e3f5d0c43d1ba9c6db" + "affiliateFeeTransformer": "0x3f16ca81691dab9184cb4606c361d73c4fd2510a", + "fillQuoteTransformer": "0x99356167edba8fbdc36959e3f5d0c43d1ba9c6db" } } } diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index bc08fc0844..25a4266ec0 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -21,6 +21,10 @@ { "note": "Add mooniswap addresses to `BridgeAdapter` deployment", "pr": 2692 + }, + { + "note": "Reorder transformer deployments", + "pr": 2693 } ] }, diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index 56285a5f4d..1589defc31 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -334,20 +334,6 @@ export async function runMigrationsAsync( const exchangeProxyFlashWalletAddress = await exchangeProxy.getTransformWallet().callAsync(); // Deploy transformers. - const fillQuoteTransformer = await FillQuoteTransformerContract.deployFrom0xArtifactAsync( - exchangeProxyArtifacts.FillQuoteTransformer, - provider, - txDefaults, - allArtifacts, - exchange.address, - bridgeAdapter.address, - ); - const payTakerTransformer = await PayTakerTransformerContract.deployFrom0xArtifactAsync( - exchangeProxyArtifacts.PayTakerTransformer, - provider, - txDefaults, - allArtifacts, - ); const wethTransformer = await WethTransformerContract.deployFrom0xArtifactAsync( exchangeProxyArtifacts.WethTransformer, provider, @@ -355,12 +341,26 @@ export async function runMigrationsAsync( allArtifacts, etherToken.address, ); + const payTakerTransformer = await PayTakerTransformerContract.deployFrom0xArtifactAsync( + exchangeProxyArtifacts.PayTakerTransformer, + provider, + txDefaults, + allArtifacts, + ); const affiliateFeeTransformer = await AffiliateFeeTransformerContract.deployFrom0xArtifactAsync( exchangeProxyArtifacts.AffiliateFeeTransformer, provider, txDefaults, allArtifacts, ); + const fillQuoteTransformer = await FillQuoteTransformerContract.deployFrom0xArtifactAsync( + exchangeProxyArtifacts.FillQuoteTransformer, + provider, + txDefaults, + allArtifacts, + exchange.address, + bridgeAdapter.address, + ); const contractAddresses = { erc20Proxy: erc20Proxy.address,