From d57e01492566185a9739084562cdec8b95e01560 Mon Sep 17 00:00:00 2001 From: Daniel Beal Date: Mon, 22 Nov 2021 09:11:57 -0800 Subject: [PATCH 1/4] use issuer with liquidations --- hardhat/tasks/task-status/statusActions.js | 2 +- publish/src/commands/deploy/deploy-core.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hardhat/tasks/task-status/statusActions.js b/hardhat/tasks/task-status/statusActions.js index 11a0d31630..a43f14e70c 100644 --- a/hardhat/tasks/task-status/statusActions.js +++ b/hardhat/tasks/task-status/statusActions.js @@ -318,7 +318,7 @@ const actions = { const Issuer = getContract({ contract: 'Issuer', - source: useOvm ? 'IssuerWithoutLiquidations' : 'Issuer', + source: 'Issuer', network, useOvm, provider, diff --git a/publish/src/commands/deploy/deploy-core.js b/publish/src/commands/deploy/deploy-core.js index 4199e8cac6..fc3b3c43e5 100644 --- a/publish/src/commands/deploy/deploy-core.js +++ b/publish/src/commands/deploy/deploy-core.js @@ -201,7 +201,7 @@ module.exports = async ({ await deployer.deployContract({ name: 'Issuer', - source: useOvm ? 'IssuerWithoutLiquidations' : 'Issuer', + source: useOvm ? 'Issuer', deps: ['AddressResolver'], args: [account, addressOf(readProxyForResolver)], }); From db61041b831e6a2c0d2c2a247b070bc64902c5a1 Mon Sep 17 00:00:00 2001 From: Daniel Beal Date: Mon, 22 Nov 2021 09:15:17 -0800 Subject: [PATCH 2/4] remove issuance without liquidations --- .solcover.js | 1 - contracts/IssuerWithoutLiquidations.sol | 15 --------------- publish/releases.json | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 contracts/IssuerWithoutLiquidations.sol diff --git a/.solcover.js b/.solcover.js index 761b772076..601fba49d1 100644 --- a/.solcover.js +++ b/.solcover.js @@ -10,7 +10,6 @@ module.exports = { 'legacy', 'EscrowChecker.sol', 'ExchangeRatesWithoutInvPricing.sol', - 'IssuerWithoutLiquidations.sol', 'EmptyEtherWrapper.sol', ], providerOptions: { diff --git a/contracts/IssuerWithoutLiquidations.sol b/contracts/IssuerWithoutLiquidations.sol deleted file mode 100644 index 7953fea75b..0000000000 --- a/contracts/IssuerWithoutLiquidations.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.5.16; - -// Internal references -import "./Issuer.sol"; - -// https://docs.synthetix.io/contracts/source/contracts/issuerwithoutliquidations -contract IssuerWithoutLiquidations is Issuer { - constructor(address _owner, address _resolver) public Issuer(_owner, _resolver) {} - - function liquidateDelinquentAccount( - address account, - uint susdAmount, - address liquidator - ) external onlySynthetix returns (uint totalRedeemed, uint amountToLiquidate) {} -} diff --git a/publish/releases.json b/publish/releases.json index e4c97524f3..e30bbb1f06 100644 --- a/publish/releases.json +++ b/publish/releases.json @@ -363,7 +363,7 @@ "sip": 167, "layer": "both", "sources": { - "base": ["SystemSettings", "OwnerRelayOnEthereum"], + "base": ["SystemSettings", "OwnerRelayOnEthereum", "Issuer"], "ovm": ["OwnerRelayOnOptimism"] } }, From a5fac001ff1ed0861e88b4240eb6414f6ea8d770 Mon Sep 17 00:00:00 2001 From: Daniel Beal Date: Mon, 22 Nov 2021 10:18:15 -0800 Subject: [PATCH 3/4] fix oopses --- publish/releases.json | 4 ++-- publish/src/commands/deploy/deploy-core.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/publish/releases.json b/publish/releases.json index e30bbb1f06..037b91482a 100644 --- a/publish/releases.json +++ b/publish/releases.json @@ -363,8 +363,8 @@ "sip": 167, "layer": "both", "sources": { - "base": ["SystemSettings", "OwnerRelayOnEthereum", "Issuer"], - "ovm": ["OwnerRelayOnOptimism"] + "base": ["SystemSettings", "OwnerRelayOnEthereum"], + "ovm": ["OwnerRelayOnOptimism", "Issuer"] } }, { diff --git a/publish/src/commands/deploy/deploy-core.js b/publish/src/commands/deploy/deploy-core.js index fc3b3c43e5..b5a8a44ee9 100644 --- a/publish/src/commands/deploy/deploy-core.js +++ b/publish/src/commands/deploy/deploy-core.js @@ -201,7 +201,7 @@ module.exports = async ({ await deployer.deployContract({ name: 'Issuer', - source: useOvm ? 'Issuer', + source: 'Issuer', deps: ['AddressResolver'], args: [account, addressOf(readProxyForResolver)], }); From 8a79531a5af847ed2a1942c6ad6626406fa1875c Mon Sep 17 00:00:00 2001 From: Daniel Beal Date: Mon, 22 Nov 2021 10:18:53 -0800 Subject: [PATCH 4/4] remove full source line --- hardhat/tasks/task-status/statusActions.js | 1 - publish/src/commands/deploy/deploy-core.js | 1 - 2 files changed, 2 deletions(-) diff --git a/hardhat/tasks/task-status/statusActions.js b/hardhat/tasks/task-status/statusActions.js index a43f14e70c..954a095807 100644 --- a/hardhat/tasks/task-status/statusActions.js +++ b/hardhat/tasks/task-status/statusActions.js @@ -318,7 +318,6 @@ const actions = { const Issuer = getContract({ contract: 'Issuer', - source: 'Issuer', network, useOvm, provider, diff --git a/publish/src/commands/deploy/deploy-core.js b/publish/src/commands/deploy/deploy-core.js index b5a8a44ee9..dfd6a6ce02 100644 --- a/publish/src/commands/deploy/deploy-core.js +++ b/publish/src/commands/deploy/deploy-core.js @@ -201,7 +201,6 @@ module.exports = async ({ await deployer.deployContract({ name: 'Issuer', - source: 'Issuer', deps: ['AddressResolver'], args: [account, addressOf(readProxyForResolver)], });