Removal of synths and some script fixes

Synthetixio · Jul 3, 2019 · 35f25ec · 35f25ec
1 parent 2b7d170
commit 35f25ec
Show file tree

Hide file tree

Showing 6 changed files with 1,170 additions and 239 deletions.
diff --git a/publish/deployed/mainnet/config.json b/publish/deployed/mainnet/config.json
@@ -62,27 +62,9 @@
 	"SynthsCNY": {
 		"deploy": false
 	},
-	"SynthsSGD": {
-		"deploy": false
-	},
-	"SynthsCAD": {
-		"deploy": false
-	},
-	"SynthsRUB": {
-		"deploy": false
-	},
 	"SynthsINR": {
 		"deploy": false
 	},
-	"SynthsBRL": {
-		"deploy": false
-	},
-	"SynthsNZD": {
-		"deploy": false
-	},
-	"SynthsPLN": {
-		"deploy": false
-	},
 	"SynthsXAU": {
 		"deploy": false
 	},
@@ -125,27 +107,9 @@
 	"ProxysCNY": {
 		"deploy": false
 	},
-	"ProxysSGD": {
-		"deploy": false
-	},
-	"ProxysCAD": {
-		"deploy": false
-	},
-	"ProxysRUB": {
-		"deploy": false
-	},
 	"ProxysINR": {
 		"deploy": false
 	},
-	"ProxysBRL": {
-		"deploy": false
-	},
-	"ProxysNZD": {
-		"deploy": false
-	},
-	"ProxysPLN": {
-		"deploy": false
-	},
 	"ProxysXAU": {
 		"deploy": false
 	},
@@ -188,27 +152,9 @@
 	"TokenStatesCNY": {
 		"deploy": false
 	},
-	"TokenStatesSGD": {
-		"deploy": false
-	},
-	"TokenStatesCAD": {
-		"deploy": false
-	},
-	"TokenStatesRUB": {
-		"deploy": false
-	},
 	"TokenStatesINR": {
 		"deploy": false
 	},
-	"TokenStatesBRL": {
-		"deploy": false
-	},
-	"TokenStatesNZD": {
-		"deploy": false
-	},
-	"TokenStatesPLN": {
-		"deploy": false
-	},
 	"TokenStatesXAU": {
 		"deploy": false
 	},

diff --git a/publish/deployed/mainnet/deployment.json b/publish/deployed/mainnet/deployment.json
diff --git a/publish/deployed/mainnet/owner-actions.json b/publish/deployed/mainnet/owner-actions.json
@@ -1,32 +1 @@
-{
-	"ProxyFeePool.setTarget(FeePool)": {
-		"target": "0xb440DD674e1243644791a4AdfE3A2AbB0A92d309",
-		"action": "setTarget(0x5e5F5542dAd3E06CC8E1cd2461E83f872835117B)",
-		"complete": true,
-		"link": "https://etherscan.io/address/0xb440DD674e1243644791a4AdfE3A2AbB0A92d309#writeContract"
-	},
-	"SynthXDR.setFeePool(FeePool)": {
-		"target": "0x2972705AF18c66c14CDd27AD412961E01944A9C3",
-		"action": "setFeePool(0x5e5F5542dAd3E06CC8E1cd2461E83f872835117B)",
-		"complete": true,
-		"link": "https://etherscan.io/address/0x2972705AF18c66c14CDd27AD412961E01944A9C3#writeContract"
-	},
-	"SynthsUSD.setFeePool(FeePool)": {
-		"target": "0x0cBE2dF57CA9191B64a7Af3baa3F946fa7Df2F25",
-		"action": "setFeePool(0x5e5F5542dAd3E06CC8E1cd2461E83f872835117B)",
-		"complete": true,
-		"link": "https://etherscan.io/address/0x0cBE2dF57CA9191B64a7Af3baa3F946fa7Df2F25#writeContract"
-	},
-	"SynthsBTC.setFeePool(FeePool)": {
-		"target": "0xf8AD89091B2724bdb7528c50B282B565Db4635bb",
-		"action": "setFeePool(0x5e5F5542dAd3E06CC8E1cd2461E83f872835117B)",
-		"complete": true,
-		"link": "https://etherscan.io/address/0xf8AD89091B2724bdb7528c50B282B565Db4635bb#writeContract"
-	},
-	"SynthsETH.setFeePool(FeePool)": {
-		"target": "0x42456D7084eacF4083f1140d3229471bbA2949A8",
-		"action": "setFeePool(0x5e5F5542dAd3E06CC8E1cd2461E83f872835117B)",
-		"complete": true,
-		"link": "https://etherscan.io/address/0x42456D7084eacF4083f1140d3229471bbA2949A8#writeContract"
-	}
-}
+{}
diff --git a/publish/deployed/mainnet/synths.json b/publish/deployed/mainnet/synths.json
@@ -6,38 +6,104 @@
 		"sign": "",
 		"desc": "Synthetix Drawing Rights"
 	},
-	{ "name": "sEUR", "asset": "EUR", "category": "forex", "sign": "€", "desc": "Euros" },
-	{ "name": "sJPY", "asset": "JPY", "category": "forex", "sign": "¥", "desc": "Japanese Yen" },
-	{ "name": "sUSD", "asset": "USD", "category": "forex", "sign": "$", "desc": "US Dollars" },
+	{
+		"name": "sEUR",
+		"asset": "EUR",
+		"category": "forex",
+		"sign": "€",
+		"desc": "Euros"
+	},
+	{
+		"name": "sJPY",
+		"asset": "JPY",
+		"category": "forex",
+		"sign": "¥",
+		"desc": "Japanese Yen"
+	},
+	{
+		"name": "sUSD",
+		"asset": "USD",
+		"category": "forex",
+		"sign": "$",
+		"desc": "US Dollars"
+	},
 	{
 		"name": "sAUD",
 		"asset": "AUD",
 		"category": "forex",
 		"sign": "$",
 		"desc": "Australian Dollars"
 	},
-	{ "name": "sKRW", "asset": "KRW", "category": "forex", "sign": "₩", "desc": "South Korean Won" },
-	{ "name": "sGBP", "asset": "GBP", "category": "forex", "sign": "£", "desc": "Pound Sterling" },
-	{ "name": "sCHF", "asset": "CHF", "category": "forex", "sign": "Fr", "desc": "Swiss Franc" },
-	{ "name": "sCNY", "asset": "CNY", "category": "forex", "sign": "¥", "desc": "Chinese Yuan" },
-	{ "name": "sSGD", "asset": "SGD", "category": "forex", "sign": "$", "desc": "Singapore Dollar" },
-	{ "name": "sCAD", "asset": "CAD", "category": "forex", "sign": "$", "desc": "Canadian Dollar" },
-	{ "name": "sRUB", "asset": "RUB", "category": "forex", "sign": "₽", "desc": "Russian Ruble" },
-	{ "name": "sINR", "asset": "INR", "category": "forex", "sign": "₹", "desc": "Indian Rupee" },
-	{ "name": "sBRL", "asset": "BRL", "category": "forex", "sign": "R$", "desc": "Brazilian Real" },
-	{
-		"name": "sNZD",
-		"asset": "NZD",
+	{
+		"name": "sKRW",
+		"asset": "KRW",
+		"category": "forex",
+		"sign": "₩",
+		"desc": "South Korean Won"
+	},
+	{
+		"name": "sGBP",
+		"asset": "GBP",
 		"category": "forex",
-		"sign": "$",
-		"desc": "New Zealand Dollar"
-	},
-	{ "name": "sPLN", "asset": "PLN", "category": "forex", "sign": "zł", "desc": "Poland Złoty" },
-	{ "name": "sXAU", "asset": "XAU", "category": "commodity", "sign": "oz", "desc": "Gold Ounce" },
-	{ "name": "sXAG", "asset": "XAG", "category": "commodity", "sign": "oz", "desc": "Silver Ounce" },
-	{ "name": "sBTC", "asset": "BTC", "category": "crypto", "sign": "₿", "desc": "Bitcoin" },
-	{ "name": "sETH", "asset": "ETH", "category": "crypto", "sign": "Ξ", "desc": "Ether" },
-	{ "name": "sBNB", "asset": "BNB", "category": "crypto", "sign": "", "desc": "Binance Coin" },
+		"sign": "£",
+		"desc": "Pound Sterling"
+	},
+	{
+		"name": "sCHF",
+		"asset": "CHF",
+		"category": "forex",
+		"sign": "Fr",
+		"desc": "Swiss Franc"
+	},
+	{
+		"name": "sCNY",
+		"asset": "CNY",
+		"category": "forex",
+		"sign": "¥",
+		"desc": "Chinese Yuan"
+	},
+	{
+		"name": "sINR",
+		"asset": "INR",
+		"category": "forex",
+		"sign": "₹",
+		"desc": "Indian Rupee"
+	},
+	{
+		"name": "sXAU",
+		"asset": "XAU",
+		"category": "commodity",
+		"sign": "oz",
+		"desc": "Gold Ounce"
+	},
+	{
+		"name": "sXAG",
+		"asset": "XAG",
+		"category": "commodity",
+		"sign": "oz",
+		"desc": "Silver Ounce"
+	},
+	{
+		"name": "sBTC",
+		"asset": "BTC",
+		"category": "crypto",
+		"sign": "₿",
+		"desc": "Bitcoin"
+	},
+	{
+		"name": "sETH",
+		"asset": "ETH",
+		"category": "crypto",
+		"sign": "Ξ",
+		"desc": "Ether"
+	},
+	{
+		"name": "sBNB",
+		"asset": "BNB",
+		"category": "crypto",
+		"sign": "",
+		"desc": "Binance Coin"
+	},
 	{
 		"name": "sMKR",
 		"asset": "MKR",

diff --git a/publish/src/commands/generate-token-list.js b/publish/src/commands/generate-token-list.js
@@ -9,7 +9,7 @@ const { stringify } = require('../util');
 const generateTokenList = async ({ deploymentPath }) => {
 	const deployment = JSON.parse(fs.readFileSync(path.join(deploymentPath, DEPLOYMENT_FILENAME)));
 
-	const output = Object.keys(deployment)
+	const output = Object.keys(deployment.targets)
 		.filter(key => /^Proxy(s[A-Z]{3,4}|Synthetix)$/.test(key))
 		.map(key => {
 			return {

diff --git a/publish/src/commands/purge-synths.js b/publish/src/commands/purge-synths.js
@@ -121,7 +121,7 @@ const purgeSynths = async ({
 		}
 
 		// step 1. fetch all holders via ethplorer api
-		if (network === 'mainnet' && addresses.length < 1) {
+		if (network === 'mainnet') {
 			const topTokenHoldersUrl = `http://api.ethplorer.io/getTopTokenHolders/${proxyAddress}`;
 			const response = await axios.get(topTokenHoldersUrl, {
 				params: {
@@ -130,7 +130,7 @@ const purgeSynths = async ({
 				},
 			});
 
-			const topTokenHolders = response.data.map(({ address }) => address);
+			const topTokenHolders = response.data.holders.map(({ address }) => address);
 			console.log(gray(`Found ${topTokenHolders.length} holders of ${currencyKey}`));
 			addresses = topTokenHolders;
 		}