Fix Gen Blocks (#201)

kohlivarun5 · web-flow · commit 8cf09810cf42 · 2021-09-19T13:56:17.000-04:00
diff --git a/NFTRanking/CreateAttributeScores/main.swift b/NFTRanking/CreateAttributeScores/main.swift
@@ -7,11 +7,11 @@
 
 import Foundation
 
-let collectionName = "Bombs"
+let collectionName = "GenesisBlocks"
 
 let isFull = true
-let firstIndex = 0
-let lastIndex = isFull ? 10000 : 100
+let firstIndex = 1
+let lastIndex = isFull ? 2500 : 100
 
 // STAGES
 let doCalculatePercentiles = true
diff --git a/NFTRanking/DownloadCollection/main.swift b/NFTRanking/DownloadCollection/main.swift
@@ -60,9 +60,9 @@ let downloaders = [
    */
   Downloader(
     collection:IpfsDownloader(
-      name:"Bombs",baseUri:"ipfs://QmZXtTrxAzs8cnKi39hATCk9Czy7xshWQPUkoTAzoRbocr"),
-    firstIndex:0,
-    lastIndex:24998
+      name:"GenesisBlocks",baseUri:"https://genesisblocks.art/api/tokens"),
+    firstIndex:1,
+    lastIndex:2500
   )
 ]
 
@@ -142,7 +142,7 @@ try? downloaders.forEach { downloader in
     let attr = try fileManager.attributesOfItem(atPath: path)
     if (minFileSize > attr[FileAttributeKey.size] as! UInt64) {
       print("Token=\(index) is empty")
-      try fileManager.removeItem(atPath: path)
+      // try fileManager.removeItem(atPath: path)
     }
     
   }
diff --git a/NFTRanking/NFTRankingUtils.swift b/NFTRanking/NFTRankingUtils.swift
@@ -12,6 +12,21 @@ typealias TokenDistance = [Float]
 struct Erc721TokenAttribute : Codable {
   let trait_type : String
   let value : String
+  
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    trait_type = try container.decode(String.self, forKey: .trait_type)
+    do {
+      value = try String(container.decode(Int.self, forKey: .value))
+    } catch {
+      do {
+        value = try String(container.decode(Double.self, forKey: .value))
+      } catch {
+        value = try container.decode(String.self, forKey: .value)
+      }
+    }
+    
+  }
 }
 
 struct Erc721TokenUriData : Codable {
diff --git a/NFTY.xcodeproj/project.pbxproj b/NFTY.xcodeproj/project.pbxproj
@@ -146,6 +146,8 @@
 		4FB9A811262B508700C58AF9 /* UsdText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FB9A810262B508700C58AF9 /* UsdText.swift */; };
 		4FB9A81E262B53DE00C58AF9 /* NftDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FB9A81D262B53DE00C58AF9 /* NftDetail.swift */; };
 		4FBD029626F6860F00BF58F0 /* GenesisBlockContract.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FBD029526F6860F00BF58F0 /* GenesisBlockContract.swift */; };
+		4FBD029926F7AAF400BF58F0 /* GenesisBlocks_attributeScores.json in Resources */ = {isa = PBXBuildFile; fileRef = 4FBD029726F7AAF400BF58F0 /* GenesisBlocks_attributeScores.json */; };
+		4FBD029A26F7AAF400BF58F0 /* GenesisBlocks_attributeRanks.json in Resources */ = {isa = PBXBuildFile; fileRef = 4FBD029826F7AAF400BF58F0 /* GenesisBlocks_attributeRanks.json */; };
 		4FBD449126B4B56F0045DCD5 /* OpenSeaApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FBD449026B4B56E0045DCD5 /* OpenSeaApi.swift */; };
 		4FBF8AF8264E079D00569DCA /* CryptoPunks_rarityRanks.json in Resources */ = {isa = PBXBuildFile; fileRef = 4FBF8AF6264E079D00569DCA /* CryptoPunks_rarityRanks.json */; };
 		4FBF8AF9264E079D00569DCA /* AsciiPunks_rarityRanks.json in Resources */ = {isa = PBXBuildFile; fileRef = 4FBF8AF7264E079D00569DCA /* AsciiPunks_rarityRanks.json */; };
@@ -364,6 +366,8 @@
 		4FB9A810262B508700C58AF9 /* UsdText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsdText.swift; sourceTree = "<group>"; };
 		4FB9A81D262B53DE00C58AF9 /* NftDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NftDetail.swift; sourceTree = "<group>"; };
 		4FBD029526F6860F00BF58F0 /* GenesisBlockContract.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenesisBlockContract.swift; sourceTree = "<group>"; };
+		4FBD029726F7AAF400BF58F0 /* GenesisBlocks_attributeScores.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = GenesisBlocks_attributeScores.json; sourceTree = "<group>"; };
+		4FBD029826F7AAF400BF58F0 /* GenesisBlocks_attributeRanks.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = GenesisBlocks_attributeRanks.json; sourceTree = "<group>"; };
 		4FBD449026B4B56E0045DCD5 /* OpenSeaApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenSeaApi.swift; sourceTree = "<group>"; };
 		4FBF8AF6264E079D00569DCA /* CryptoPunks_rarityRanks.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = CryptoPunks_rarityRanks.json; sourceTree = "<group>"; };
 		4FBF8AF7264E079D00569DCA /* AsciiPunks_rarityRanks.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AsciiPunks_rarityRanks.json; sourceTree = "<group>"; };
@@ -673,6 +677,8 @@
 		4FB9A7F9262B3B3000C58AF9 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				4FBD029826F7AAF400BF58F0 /* GenesisBlocks_attributeRanks.json */,
+				4FBD029726F7AAF400BF58F0 /* GenesisBlocks_attributeScores.json */,
 				4F12715E26EDDD5C007E6A7B /* Bombs_nearestTokens.json */,
 				4F12715F26EDDD5C007E6A7B /* Bombs_rarityRanks.json */,
 				4F12715A26EDD43D007E6A7B /* Bombs_attributeRanks.json */,
@@ -968,6 +974,7 @@
 				4F0FB83526A49C8E00AD5165 /* FameLadySquad_nearestTokens.json in Resources */,
 				4F9A85A426C88EF900A9B52B /* CryptoCannabisClub_attributeScores.json in Resources */,
 				4FCB358F26E1A7390044BD84 /* MutantApes_attributeScores.json in Resources */,
+				4FBD029A26F7AAF400BF58F0 /* GenesisBlocks_attributeRanks.json in Resources */,
 				4FCB496826D1900E00696F91 /* FameLadySquad_attributeRanks.json in Resources */,
 				4FAB56CD26DADF71007076BE /* Craniums_attributeScores.json in Resources */,
 				4FCB496326D1892A00696F91 /* AsciiPunks_attributeRanks.json in Resources */,
@@ -1000,6 +1007,7 @@
 				4FF5E10826C9913A00D0B1E9 /* BirdHouse_attributeRanks.json in Resources */,
 				4FAB56D226DB49E6007076BE /* Craniums_nearestTokens.json in Resources */,
 				4FA0B2B126C0BADF00821413 /* CryptoCannabisClub_rarityRanks.json in Resources */,
+				4FBD029926F7AAF400BF58F0 /* GenesisBlocks_attributeScores.json in Resources */,
 				4FAB56D426DB49E6007076BE /* DJENERATES_rarityRanks.json in Resources */,
 				4FCB496F26D1925C00696F91 /* CypherCity_attributeScores.json in Resources */,
 				4FCB359B26E1C2E40044BD84 /* Killaz_rarityRanks.json in Resources */,
@@ -1378,7 +1386,7 @@
 				CODE_SIGN_ENTITLEMENTS = NFTY/NFTY.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_ASSET_PATHS = "NFTY/Preview\\ Content";
 				DEVELOPMENT_TEAM = C28QWE5379;
 				ENABLE_PREVIEWS = YES;
@@ -1405,7 +1413,7 @@
 				CODE_SIGN_ENTITLEMENTS = NFTY/NFTY.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_ASSET_PATHS = "NFTY/Preview\\ Content";
 				DEVELOPMENT_TEAM = C28QWE5379;
 				ENABLE_PREVIEWS = YES;
diff --git a/NFTY.xcodeproj/xcuserdata/vkohli.xcuserdatad/xcschemes/xcschememanagement.plist b/NFTY.xcodeproj/xcuserdata/vkohli.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>CreateRankingFiles.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Demo (Playground) 1.xcscheme</key>
 		<dict>
@@ -38,7 +38,7 @@
 		<key>DownloadCollection.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>DownloadCryptoPunks.xcscheme_^#shared#^_</key>
 		<dict>
diff --git a/NFTY/Model/CollectionContracts/GenesisBlockContract.swift b/NFTY/Model/CollectionContracts/GenesisBlockContract.swift
@@ -113,9 +113,9 @@ class GenesisBlockContract : ContractInterface {
     return ObservablePromise(promise: Promise { seal in
       DispatchQueue.global(qos:.userInteractive).async {
         switch(try? self.imageCache.object(forKey:tokenId)) {
-        case .some(let image):
+        /* case .some(let image):
           seal.fulfill(Media.IpfsImage(image: image))
-        case .none:
+         case .none: */ default:
           self.ethContract.image(tokenId)
             .done(on:DispatchQueue.global(qos: .background)) {
               let image = EthContract.imageOfData($0)
diff --git a/NFTY/Resources/GenesisBlocks_attributeRanks.json b/NFTY/Resources/GenesisBlocks_attributeRanks.json
@@ -0,0 +1 @@
+[2501,245,1471,1178,2479,1311,2167,972,160,452,1042,458,629,973,1354,1797,1940,1834,1670,1898,1436,1612,1613,953,1497,893,1941,1179,630,2010,2030,894,1,658,2313,1614,180,673,1712,1783,152,63,1942,1416,533,49,886,267,2448,2259,1498,715,711,1884,1943,1218,2216,453,1355,2419,1671,932,1944,681,1209,1861,171,1180,153,912,1562,804,1945,1815,1251,957,218,1417,1181,1816,2335,459,203,1148,1563,1728,2336,860,1851,204,2120,1343,1667,558,670,47,1792,1885,870,1437,1499,763,1081,2260,2168,109,1390,199,1917,682,36,1886,303,1026,2031,3,1817,559,1356,1798,496,1899,2449,1946,2480,955,2337,792,1111,793,631,560,580,1252,9,2121,581,499,1781,605,64,582,1149,2392,2420,1322,1672,1182,1835,2169,1836,2069,485,2481,1564,1472,1043,1016,515,2170,846,232,2211,1086,1981,1087,1729,2393,1245,376,1657,716,2011,1713,1323,766,1438,1730,1900,1982,2012,717,1253,1088,1565,1391,71,933,1254,1947,1634,470,2261,738,25,561,718,1799,1439,1246,1837,2032,349,719,1784,2114,529,1901,863,847,805,1500,1440,1473,2394,765,940,583,606,534,2285,435,2217,901,500,671,432,1044,2171,405,2450,2338,2013,1615,2218,2122,1543,1727,1418,86,974,1255,2286,288,632,2395,113,449,41,2219,268,626,1441,683,1256,778,1442,127,2396,1731,1324,1983,2220,1083,486,433,2314,176,1214,1501,428,2397,2221,1219,1257,1764,379,1818,247,6,1933,975,1918,1804,1984,579,965,1502,1838,1852,2339,1258,2222,2398,1566,335,1259,2115,599,1144,1567,320,1357,902,1220,516,2101,72,1358,814,1720,976,1392,997,794,2340,219,1084,740,1503,1948,2341,289,1985,806,181,1150,1443,380,1986,2172,1023,607,2262,1359,2440,1568,1635,2342,1444,1819,28,562,1424,1151,501,1474,779,381,1475,871,2027,136,1152,922,1673,1425,977,2014,633,1636,1153,2315,1504,1637,770,1027,200,2399,1325,600,387,1089,1360,161,465,2421,1260,2263,659,410,872,1393,248,720,966,2451,1326,2422,124,1774,1221,2223,2015,2066,1732,361,228,1173,2287,1839,684,1045,535,1771,790,2316,1569,1840,911,1466,29,2400,743,1919,1887,2070,2452,2264,807,2224,939,448,1658,1760,1674,2116,1853,2071,413,1659,13,10,1183,2033,1616,1733,831,2482,2034,1570,1571,11,1675,422,1676,358,1934,261,1734,144,1261,2265,826,217,362,923,1112,363,1987,321,110,502,998,1426,887,930,1467,1505,431,2072,336,1777,1785,2423,563,430,2035,2123,1262,780,1263,1264,1638,418,441,369,77,536,2401,967,1265,1046,475,1506,604,1544,1805,685,1806,753,371,2225,198,35,2124,1361,679,182,183,2402,1920,517,184,269,249,1854,657,2125,1266,584,2173,735,1312,1184,471,1507,1090,1862,1145,767,1047,354,497,2317,372,531,1327,674,2226,1749,1267,2266,177,2483,1113,32,2318,67,1902,2067,686,1979,1863,585,1328,1222,1268,1362,945,586,1786,1247,331,178,2227,103,1677,1949,233,2288,660,2453,2036,771,1154,162,73,608,2343,1678,920,661,895,1048,978,1028,2267,896,434,1903,2424,2126,979,530,1921,873,2068,960,2268,193,2319,421,795,848,308,772,1445,1922,304,2344,854,609,1269,832,2345,744,1508,1820,1679,2127,2128,687,2484,1394,874,62,1888,337,2403,1419,234,961,1509,1114,1476,688,1363,990,2441,1477,1115,2212,118,385,2346,1106,689,1561,411,1468,2347,2348,1680,2349,1778,1617,2269,1049,145,634,2037,1864,2485,1950,1223,2129,2486,2174,1770,476,322,65,1618,2130,150,1510,377,1185,1395,149,1639,1832,564,80,1050,2228,1270,1271,1319,2038,1329,2131,270,394,2350,1249,2132,1051,1396,1038,2320,1889,2073,2487,194,1602,1364,2229,2351,271,1865,205,999,1750,808,690,1841,1224,226,128,1446,2270,1779,206,1447,1365,1397,1344,875,635,483,142,1272,1448,565,815,364,1186,2175,1398,494,2133,1273,2271,1511,1807,764,1681,472,30,903,1110,1572,119,1187,2176,1988,1660,1052,1951,1545,537,39,1000,1116,332,2177,1091,386,2016,1274,1345,52,2074,2075,1188,587,1952,1320,1989,1022,1275,855,1117,636,1546,1721,538,921,864,2352,22,1053,791,1512,48,2425,1775,235,1821,100,721,2039,1668,2178,980,1682,2426,858,566,250,1449,163,2117,1330,1276,1366,1054,1155,2134,637,2454,2076,2289,1399,981,1241,338,1640,1367,412,1189,2455,2179,638,2017,2180,833,982,1866,2427,1092,1190,1470,417,1029,588,1156,796,42,2181,26,1055,1573,754,1450,2135,539,1400,487,74,842,389,350,1953,1331,2004,809,610,2136,2018,2137,1855,2488,16,2138,1513,2456,425,2489,1157,323,236,1574,2353,1765,1683,816,1787,722,2442,408,2354,1661,2290,1751,466,454,488,482,1368,589,1684,540,1277,53,1685,78,541,129,1575,827,897,1856,1225,691,1793,2077,216,1469,931,692,2182,639,640,755,849,2056,2078,324,79,1788,898,1278,272,2457,994,464,1017,1980,1752,1662,1226,2079,2183,2404,309,424,207,1857,1279,2184,2355,1250,2272,910,2040,1954,745,1001,1158,1478,1842,2019,675,2057,1776,2080,2458,797,477,2230,473,2185,43,1955,1822,1867,1633,1451,1956,1619,1093,164,1686,1280,1514,611,532,2186,1346,850,802,1281,2081,1641,1452,1642,1794,305,382,2041,159,1321,360,1735,251,2356,756,1118,2139,1923,2140,542,803,1056,1057,2459,1547,393,112,1369,1094,817,1024,1095,1687,1159,2321,1515,1643,68,423,641,33,2291,1669,273,95,518,1370,1313,1924,680,259,1058,1119,519,746,23,2020,90,1401,2231,1479,781,388,2187,723,1002,89,2188,1059,2213,1620,1576,1402,1120,445,1176,7,146,2082,325,856,237,455,768,1480,513,2273,503,147,2000,2189,2141,2292,2058,1688,1808,2190,1516,274,339,834,1722,590,2232,888,2083,2357,1025,612,835,1904,1282,1957,1736,1030,93,810,880,1577,865,1481,292,2021,2233,1060,567,1420,1823,81,1085,2322,395,1548,1644,2142,172,1925,1578,672,818,819,252,2358,543,1105,1146,2359,1958,1061,1579,2042,114,340,1926,1540,1580,87,843,1191,1283,2084,478,1689,1621,2360,1772,220,208,2428,1160,2361,94,1517,1518,642,983,1622,227,1121,2293,2043,881,275,693,253,1519,165,1690,229,2059,1868,1753,1645,310,1990,861,54,306,1403,1520,568,1122,919,398,1809,1427,951,1824,1192,1210,1062,2044,1761,577,757,1737,262,844,185,1869,1959,1193,60,676,2234,643,2460,104,484,2429,1314,1194,1795,2490,1371,1351,2362,311,1521,1843,741,1063,2274,2001,1039,1646,2060,1315,995,913,1691,941,1800,1581,209,591,390,158,569,2143,2144,2085,221,825,1692,914,105,2028,662,479,1430,1801,1096,1905,1003,959,66,820,2294,1738,2461,82,1582,1754,828,1755,1870,504,1927,1960,351,882,869,2323,312,2295,570,166,1522,1332,1147,2191,106,230,942,925,505,2086,839,1453,1161,1961,2491,2296,935,1962,2462,489,1333,1871,2363,1872,1004,2022,1284,2364,1404,154,467,798,2405,1991,313,2102,1372,2492,520,210,694,1005,876,2365,1405,1285,1766,2145,2023,1482,173,1286,2005,2192,2146,1334,1928,2061,1287,544,1006,373,224,1623,1195,480,1064,773,1992,851,1523,1549,2235,1693,120,601,2147,545,1162,2148,327,1739,1040,1428,137,2297,1007,1524,460,1349,290,1373,663,2275,121,947,37,125,1107,1227,1174,1065,1694,1963,1897,1603,2193,1541,1695,1163,1825,1647,2236,175,1648,2463,2002,2324,1031,1454,1844,1604,774,1873,1890,1858,1455,1649,506,1288,1406,2103,2298,915,2087,2464,2465,968,1874,231,1289,211,1650,276,1123,468,1624,2045,904,1316,984,1483,695,909,359,1228,17,736,962,2366,1583,1789,1494,1097,2062,1124,2299,357,2325,557,521,696,2006,883,2149,1935,1066,111,1211,747,370,1125,20,277,399,664,522,101,314,782,697,859,18,644,592,1525,546,613,1826,2430,2466,1964,352,2237,278,724,905,1484,2194,1164,215,1584,341,279,2406,783,857,614,1767,130,811,225,838,174,593,1229,1126,1833,2431,1165,2432,1663,1407,2300,1550,254,2467,547,889,2367,1965,2024,293,2407,342,333,948,1432,840,1875,985,1993,1127,2238,2408,1994,1605,436,1810,784,969,69,2468,294,315,131,2301,1651,2104,295,1290,2105,507,698,1408,1966,2276,1291,2469,2088,328,316,890,645,2470,84,212,508,296,1166,906,1128,192,437,1292,442,1915,1876,1433,1585,627,934,1967,1456,2150,1748,2195,615,2106,713,2493,836,490,785,2302,1891,1906,2368,725,2239,1230,926,775,1723,2089,2151,96,1756,594,1374,956,1551,1625,1067,877,15,1586,1845,884,2240,2152,1526,1129,297,1929,1811,1293,186,595,2326,446,1587,1757,57,61,2327,726,523,927,1294,1527,343,244,1664,1375,107,1068,348,1008,2443,2409,1069,699,1626,646,187,116,222,748,602,878,524,1773,2241,1386,799,365,1248,298,1387,392,1588,1812,964,1212,2242,2494,400,749,2471,1652,1130,317,24,1167,195,1892,647,2090,1893,51,1376,2153,1589,1131,426,1714,2303,1070,1196,1653,1859,302,1071,1377,1378,2243,299,2369,616,2196,2370,2154,2197,213,1379,2,1082,1968,2155,2410,1724,991,2025,1098,949,648,617,2371,416,280,700,821,1696,1877,1590,1421,899,151,2244,1907,548,1878,2328,618,549,550,1485,986,907,786,1215,1908,2372,122,2198,1969,92,987,1762,837,2373,1846,1009,419,1847,1108,1197,891,1782,1198,2374,2495,2411,509,44,1591,551,943,852,2304,1109,2091,2156,1177,2433,2472,1970,1592,571,1216,2063,2245,2412,1909,1388,2107,255,2046,2473,1758,525,1099,334,256,201,1389,2246,1697,286,1715,1295,1971,1296,383,1242,2247,750,649,1457,1552,1458,2434,1930,223,665,1199,2474,1335,1297,1894,1698,650,2435,2305,108,2026,1217,1740,102,1553,263,58,167,155,1243,2496,1072,148,344,355,414,1336,701,1699,1352,2199,407,1700,1317,702,2375,281,1665,1132,619,138,1741,85,1701,474,1200,988,34,714,1827,2007,132,1298,1073,1938,1813,1459,1528,1213,1529,2376,1486,238,514,2008,572,491,498,2047,2092,2048,239,526,1074,2200,1168,1201,1702,758,2306,677,2248,2201,970,2003,2377,1299,2093,2029,1560,1075,139,188,1802,1041,1895,2277,1995,1076,1530,2278,1554,2378,27,703,727,1100,678,1703,2279,620,1231,1879,2094,728,1101,329,2475,651,133,656,214,21,1910,954,14,202,1010,2249,1848,429,2436,50,346,1790,552,2476,1460,438,1972,2157,621,1606,769,447,829,1169,652,1936,2444,1429,908,2379,2413,2329,1828,2380,2250,196,1300,2158,1973,1829,729,1796,1409,300,1380,2095,318,1742,1337,1607,2307,443,1018,126,1301,1011,1716,1102,1202,1830,2414,2159,1133,704,83,2437,1318,742,282,1302,1410,1019,1350,1717,1974,916,1608,134,2381,450,1203,1880,2497,2308,406,1860,1411,996,2498,1911,469,879,1303,1134,892,1718,1627,2108,1244,117,439,4,751,481,1849,1347,1912,2330,1012,1170,822,946,2251,1032,396,2009,2331,527,260,301,451,257,823,2477,666,1628,378,1434,2202,2382,2438,1743,2215,1555,1232,91,326,1881,2499,628,189,845,143,168,38,1233,2203,2064,1135,622,492,1175,5,1013,1803,463,1338,812,1931,1704,1381,787,1020,705,2280,730,1705,862,929,1719,246,1204,2252,123,866,1706,1531,2253,1975,867,384,1382,1033,1882,1556,1707,1780,1996,788,553,596,2415,1234,1461,2281,1708,135,427,1532,2109,75,1746,2383,2160,1916,667,2254,1487,653,319,258,2065,420,706,45,944,397,2416,1462,2384,2110,56,1205,712,403,2111,1077,2049,1593,1136,1304,1831,2118,1709,1744,2255,2385,495,391,1533,307,1534,2386,597,1305,140,1609,1725,1535,1235,264,2050,1850,598,1594,1629,1997,1939,1383,1710,2204,2282,1306,374,917,1488,1595,2417,2309,936,2418,440,1137,1596,2161,1339,1307,1489,2445,31,1557,2332,1998,830,1999,1769,1495,510,1236,958,950,1103,1308,1422,444,752,992,1763,554,461,2051,1431,2446,1976,98,1309,2439,1340,345,1237,2310,2256,1630,759,88,240,1034,375,800,868,737,1412,1490,1384,573,623,511,2096,2447,1035,928,169,2205,2097,55,603,347,989,841,404,707,2162,2052,1536,1597,1238,1759,415,1542,708,1747,900,918,1491,197,709,555,1537,2283,1206,853,1207,366,1654,2053,2119,1435,668,1078,1598,1492,2163,179,59,1913,1599,1138,1139,330,1014,70,512,401,1726,353,654,824,402,2206,574,1413,1791,2387,456,287,1937,1015,575,115,1558,356,731,76,2333,1348,241,1140,2164,462,367,1341,1932,1600,971,2165,493,624,1171,789,2388,1814,2257,938,1655,1631,1141,760,625,2389,556,1423,1239,732,1656,1172,1496,1768,40,1711,1601,265,2054,242,1353,1142,578,2478,2311,1745,368,266,801,1559,2098,190,2207,1914,170,2284,2312,1463,924,1896,739,1143,733,2099,776,1104,2208,1036,669,1493,1021,1414,1632,1464,291,2390,2055,283,409,1208,2209,1538,46,2500,655,1883,8,97,99,141,885,1240,19,284,1079,576,12,1610,1977,1415,963,285,952,191,1539,813,2112,2391,243,1666,761,2100,1385,1465,2214,777,710,734,1611,762,1310,156,2166,457,1080,937,1342,157,528,2113,2210,2334,1037,2258,993,1978]
diff --git a/NFTY/Resources/GenesisBlocks_attributeScores.json b/NFTY/Resources/GenesisBlocks_attributeScores.json
diff --git a/NFTY/ViewModel/CoreCollections.swift b/NFTY/ViewModel/CoreCollections.swift
@@ -273,11 +273,11 @@ let CompositeCollection = CompositeRecentTradesObject([
       themeColor:Color.gunmetal,
       themeLabelColor:Color.white,
       disableRecentTrades:false,
-      similarTokens : nil, /* SimilarTokensGetter(
+      similarTokens : SimilarTokensGetter(
         label:"Blocks",
-        nearestTokensFileName:"Dads_nearestTokens.json",
-        propertiesJsonFileName:"Dads_attributeScores.json"
-      ), */
+        nearestTokensFileName:nil,
+        propertiesJsonFileName:"GenesisBlocks_attributeScores.json"
+      ),
       rarityRanking : nil//RarityRankingImpl(load("Dads_rarityRanks.json"))
     ),
     contract:GBLOCKS_Contract),

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ let downloaders = [`
`60`	`60`	`*/`
`61`	`61`	`Downloader(`
`62`	`62`	`collection:IpfsDownloader(`
`63`		`- name:"Bombs",baseUri:"ipfs://QmZXtTrxAzs8cnKi39hATCk9Czy7xshWQPUkoTAzoRbocr"),`
`64`		`- firstIndex:0,`
`65`		`- lastIndex:24998`
	`63`	`+ name:"GenesisBlocks",baseUri:"https://genesisblocks.art/api/tokens"),`
	`64`	`+ firstIndex:1,`
	`65`	`+ lastIndex:2500`
`66`	`66`	`)`
`67`	`67`	`]`
`68`	`68`
`@@ -142,7 +142,7 @@ try? downloaders.forEach { downloader in`
`142`	`142`	`let attr = try fileManager.attributesOfItem(atPath: path)`
`143`	`143`	`if (minFileSize > attr[FileAttributeKey.size] as! UInt64) {`
`144`	`144`	`print("Token=\(index) is empty")`
`145`		`- try fileManager.removeItem(atPath: path)`
	`145`	`+ // try fileManager.removeItem(atPath: path)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+[2501,245,1471,1178,2479,1311,2167,972,160,452,1042,458,629,973,1354,1797,1940,1834,1670,1898,1436,1612,1613,953,1497,893,1941,1179,630,2010,2030,894,1,658,2313,1614,180,673,1712,1783,152,63,1942,1416,533,49,886,267,2448,2259,1498,715,711,1884,1943,1218,2216,453,1355,2419,1671,932,1944,681,1209,1861,171,1180,153,912,1562,804,1945,1815,1251,957,218,1417,1181,1816,2335,459,203,1148,1563,1728,2336,860,1851,204,2120,1343,1667,558,670,47,1792,1885,870,1437,1499,763,1081,2260,2168,109,1390,199,1917,682,36,1886,303,1026,2031,3,1817,559,1356,1798,496,1899,2449,1946,2480,955,2337,792,1111,793,631,560,580,1252,9,2121,581,499,1781,605,64,582,1149,2392,2420,1322,1672,1182,1835,2169,1836,2069,485,2481,1564,1472,1043,1016,515,2170,846,232,2211,1086,1981,1087,1729,2393,1245,376,1657,716,2011,1713,1323,766,1438,1730,1900,1982,2012,717,1253,1088,1565,1391,71,933,1254,1947,1634,470,2261,738,25,561,718,1799,1439,1246,1837,2032,349,719,1784,2114,529,1901,863,847,805,1500,1440,1473,2394,765,940,583,606,534,2285,435,2217,901,500,671,432,1044,2171,405,2450,2338,2013,1615,2218,2122,1543,1727,1418,86,974,1255,2286,288,632,2395,113,449,41,2219,268,626,1441,683,1256,778,1442,127,2396,1731,1324,1983,2220,1083,486,433,2314,176,1214,1501,428,2397,2221,1219,1257,1764,379,1818,247,6,1933,975,1918,1804,1984,579,965,1502,1838,1852,2339,1258,2222,2398,1566,335,1259,2115,599,1144,1567,320,1357,902,1220,516,2101,72,1358,814,1720,976,1392,997,794,2340,219,1084,740,1503,1948,2341,289,1985,806,181,1150,1443,380,1986,2172,1023,607,2262,1359,2440,1568,1635,2342,1444,1819,28,562,1424,1151,501,1474,779,381,1475,871,2027,136,1152,922,1673,1425,977,2014,633,1636,1153,2315,1504,1637,770,1027,200,2399,1325,600,387,1089,1360,161,465,2421,1260,2263,659,410,872,1393,248,720,966,2451,1326,2422,124,1774,1221,2223,2015,2066,1732,361,228,1173,2287,1839,684,1045,535,1771,790,2316,1569,1840,911,1466,29,2400,743,1919,1887,2070,2452,2264,807,2224,939,448,1658,1760,1674,2116,1853,2071,413,1659,13,10,1183,2033,1616,1733,831,2482,2034,1570,1571,11,1675,422,1676,358,1934,261,1734,144,1261,2265,826,217,362,923,1112,363,1987,321,110,502,998,1426,887,930,1467,1505,431,2072,336,1777,1785,2423,563,430,2035,2123,1262,780,1263,1264,1638,418,441,369,77,536,2401,967,1265,1046,475,1506,604,1544,1805,685,1806,753,371,2225,198,35,2124,1361,679,182,183,2402,1920,517,184,269,249,1854,657,2125,1266,584,2173,735,1312,1184,471,1507,1090,1862,1145,767,1047,354,497,2317,372,531,1327,674,2226,1749,1267,2266,177,2483,1113,32,2318,67,1902,2067,686,1979,1863,585,1328,1222,1268,1362,945,586,1786,1247,331,178,2227,103,1677,1949,233,2288,660,2453,2036,771,1154,162,73,608,2343,1678,920,661,895,1048,978,1028,2267,896,434,1903,2424,2126,979,530,1921,873,2068,960,2268,193,2319,421,795,848,308,772,1445,1922,304,2344,854,609,1269,832,2345,744,1508,1820,1679,2127,2128,687,2484,1394,874,62,1888,337,2403,1419,234,961,1509,1114,1476,688,1363,990,2441,1477,1115,2212,118,385,2346,1106,689,1561,411,1468,2347,2348,1680,2349,1778,1617,2269,1049,145,634,2037,1864,2485,1950,1223,2129,2486,2174,1770,476,322,65,1618,2130,150,1510,377,1185,1395,149,1639,1832,564,80,1050,2228,1270,1271,1319,2038,1329,2131,270,394,2350,1249,2132,1051,1396,1038,2320,1889,2073,2487,194,1602,1364,2229,2351,271,1865,205,999,1750,808,690,1841,1224,226,128,1446,2270,1779,206,1447,1365,1397,1344,875,635,483,142,1272,1448,565,815,364,1186,2175,1398,494,2133,1273,2271,1511,1807,764,1681,472,30,903,1110,1572,119,1187,2176,1988,1660,1052,1951,1545,537,39,1000,1116,332,2177,1091,386,2016,1274,1345,52,2074,2075,1188,587,1952,1320,1989,1022,1275,855,1117,636,1546,1721,538,921,864,2352,22,1053,791,1512,48,2425,1775,235,1821,100,721,2039,1668,2178,980,1682,2426,858,566,250,1449,163,2117,1330,1276,1366,1054,1155,2134,637,2454,2076,2289,1399,981,1241,338,1640,1367,412,1189,2455,2179,638,2017,2180,833,982,1866,2427,1092,1190,1470,417,1029,588,1156,796,42,2181,26,1055,1573,754,1450,2135,539,1400,487,74,842,389,350,1953,1331,2004,809,610,2136,2018,2137,1855,2488,16,2138,1513,2456,425,2489,1157,323,236,1574,2353,1765,1683,816,1787,722,2442,408,2354,1661,2290,1751,466,454,488,482,1368,589,1684,540,1277,53,1685,78,541,129,1575,827,897,1856,1225,691,1793,2077,216,1469,931,692,2182,639,640,755,849,2056,2078,324,79,1788,898,1278,272,2457,994,464,1017,1980,1752,1662,1226,2079,2183,2404,309,424,207,1857,1279,2184,2355,1250,2272,910,2040,1954,745,1001,1158,1478,1842,2019,675,2057,1776,2080,2458,797,477,2230,473,2185,43,1955,1822,1867,1633,1451,1956,1619,1093,164,1686,1280,1514,611,532,2186,1346,850,802,1281,2081,1641,1452,1642,1794,305,382,2041,159,1321,360,1735,251,2356,756,1118,2139,1923,2140,542,803,1056,1057,2459,1547,393,112,1369,1094,817,1024,1095,1687,1159,2321,1515,1643,68,423,641,33,2291,1669,273,95,518,1370,1313,1924,680,259,1058,1119,519,746,23,2020,90,1401,2231,1479,781,388,2187,723,1002,89,2188,1059,2213,1620,1576,1402,1120,445,1176,7,146,2082,325,856,237,455,768,1480,513,2273,503,147,2000,2189,2141,2292,2058,1688,1808,2190,1516,274,339,834,1722,590,2232,888,2083,2357,1025,612,835,1904,1282,1957,1736,1030,93,810,880,1577,865,1481,292,2021,2233,1060,567,1420,1823,81,1085,2322,395,1548,1644,2142,172,1925,1578,672,818,819,252,2358,543,1105,1146,2359,1958,1061,1579,2042,114,340,1926,1540,1580,87,843,1191,1283,2084,478,1689,1621,2360,1772,220,208,2428,1160,2361,94,1517,1518,642,983,1622,227,1121,2293,2043,881,275,693,253,1519,165,1690,229,2059,1868,1753,1645,310,1990,861,54,306,1403,1520,568,1122,919,398,1809,1427,951,1824,1192,1210,1062,2044,1761,577,757,1737,262,844,185,1869,1959,1193,60,676,2234,643,2460,104,484,2429,1314,1194,1795,2490,1371,1351,2362,311,1521,1843,741,1063,2274,2001,1039,1646,2060,1315,995,913,1691,941,1800,1581,209,591,390,158,569,2143,2144,2085,221,825,1692,914,105,2028,662,479,1430,1801,1096,1905,1003,959,66,820,2294,1738,2461,82,1582,1754,828,1755,1870,504,1927,1960,351,882,869,2323,312,2295,570,166,1522,1332,1147,2191,106,230,942,925,505,2086,839,1453,1161,1961,2491,2296,935,1962,2462,489,1333,1871,2363,1872,1004,2022,1284,2364,1404,154,467,798,2405,1991,313,2102,1372,2492,520,210,694,1005,876,2365,1405,1285,1766,2145,2023,1482,173,1286,2005,2192,2146,1334,1928,2061,1287,544,1006,373,224,1623,1195,480,1064,773,1992,851,1523,1549,2235,1693,120,601,2147,545,1162,2148,327,1739,1040,1428,137,2297,1007,1524,460,1349,290,1373,663,2275,121,947,37,125,1107,1227,1174,1065,1694,1963,1897,1603,2193,1541,1695,1163,1825,1647,2236,175,1648,2463,2002,2324,1031,1454,1844,1604,774,1873,1890,1858,1455,1649,506,1288,1406,2103,2298,915,2087,2464,2465,968,1874,231,1289,211,1650,276,1123,468,1624,2045,904,1316,984,1483,695,909,359,1228,17,736,962,2366,1583,1789,1494,1097,2062,1124,2299,357,2325,557,521,696,2006,883,2149,1935,1066,111,1211,747,370,1125,20,277,399,664,522,101,314,782,697,859,18,644,592,1525,546,613,1826,2430,2466,1964,352,2237,278,724,905,1484,2194,1164,215,1584,341,279,2406,783,857,614,1767,130,811,225,838,174,593,1229,1126,1833,2431,1165,2432,1663,1407,2300,1550,254,2467,547,889,2367,1965,2024,293,2407,342,333,948,1432,840,1875,985,1993,1127,2238,2408,1994,1605,436,1810,784,969,69,2468,294,315,131,2301,1651,2104,295,1290,2105,507,698,1408,1966,2276,1291,2469,2088,328,316,890,645,2470,84,212,508,296,1166,906,1128,192,437,1292,442,1915,1876,1433,1585,627,934,1967,1456,2150,1748,2195,615,2106,713,2493,836,490,785,2302,1891,1906,2368,725,2239,1230,926,775,1723,2089,2151,96,1756,594,1374,956,1551,1625,1067,877,15,1586,1845,884,2240,2152,1526,1129,297,1929,1811,1293,186,595,2326,446,1587,1757,57,61,2327,726,523,927,1294,1527,343,244,1664,1375,107,1068,348,1008,2443,2409,1069,699,1626,646,187,116,222,748,602,878,524,1773,2241,1386,799,365,1248,298,1387,392,1588,1812,964,1212,2242,2494,400,749,2471,1652,1130,317,24,1167,195,1892,647,2090,1893,51,1376,2153,1589,1131,426,1714,2303,1070,1196,1653,1859,302,1071,1377,1378,2243,299,2369,616,2196,2370,2154,2197,213,1379,2,1082,1968,2155,2410,1724,991,2025,1098,949,648,617,2371,416,280,700,821,1696,1877,1590,1421,899,151,2244,1907,548,1878,2328,618,549,550,1485,986,907,786,1215,1908,2372,122,2198,1969,92,987,1762,837,2373,1846,1009,419,1847,1108,1197,891,1782,1198,2374,2495,2411,509,44,1591,551,943,852,2304,1109,2091,2156,1177,2433,2472,1970,1592,571,1216,2063,2245,2412,1909,1388,2107,255,2046,2473,1758,525,1099,334,256,201,1389,2246,1697,286,1715,1295,1971,1296,383,1242,2247,750,649,1457,1552,1458,2434,1930,223,665,1199,2474,1335,1297,1894,1698,650,2435,2305,108,2026,1217,1740,102,1553,263,58,167,155,1243,2496,1072,148,344,355,414,1336,701,1699,1352,2199,407,1700,1317,702,2375,281,1665,1132,619,138,1741,85,1701,474,1200,988,34,714,1827,2007,132,1298,1073,1938,1813,1459,1528,1213,1529,2376,1486,238,514,2008,572,491,498,2047,2092,2048,239,526,1074,2200,1168,1201,1702,758,2306,677,2248,2201,970,2003,2377,1299,2093,2029,1560,1075,139,188,1802,1041,1895,2277,1995,1076,1530,2278,1554,2378,27,703,727,1100,678,1703,2279,620,1231,1879,2094,728,1101,329,2475,651,133,656,214,21,1910,954,14,202,1010,2249,1848,429,2436,50,346,1790,552,2476,1460,438,1972,2157,621,1606,769,447,829,1169,652,1936,2444,1429,908,2379,2413,2329,1828,2380,2250,196,1300,2158,1973,1829,729,1796,1409,300,1380,2095,318,1742,1337,1607,2307,443,1018,126,1301,1011,1716,1102,1202,1830,2414,2159,1133,704,83,2437,1318,742,282,1302,1410,1019,1350,1717,1974,916,1608,134,2381,450,1203,1880,2497,2308,406,1860,1411,996,2498,1911,469,879,1303,1134,892,1718,1627,2108,1244,117,439,4,751,481,1849,1347,1912,2330,1012,1170,822,946,2251,1032,396,2009,2331,527,260,301,451,257,823,2477,666,1628,378,1434,2202,2382,2438,1743,2215,1555,1232,91,326,1881,2499,628,189,845,143,168,38,1233,2203,2064,1135,622,492,1175,5,1013,1803,463,1338,812,1931,1704,1381,787,1020,705,2280,730,1705,862,929,1719,246,1204,2252,123,866,1706,1531,2253,1975,867,384,1382,1033,1882,1556,1707,1780,1996,788,553,596,2415,1234,1461,2281,1708,135,427,1532,2109,75,1746,2383,2160,1916,667,2254,1487,653,319,258,2065,420,706,45,944,397,2416,1462,2384,2110,56,1205,712,403,2111,1077,2049,1593,1136,1304,1831,2118,1709,1744,2255,2385,495,391,1533,307,1534,2386,597,1305,140,1609,1725,1535,1235,264,2050,1850,598,1594,1629,1997,1939,1383,1710,2204,2282,1306,374,917,1488,1595,2417,2309,936,2418,440,1137,1596,2161,1339,1307,1489,2445,31,1557,2332,1998,830,1999,1769,1495,510,1236,958,950,1103,1308,1422,444,752,992,1763,554,461,2051,1431,2446,1976,98,1309,2439,1340,345,1237,2310,2256,1630,759,88,240,1034,375,800,868,737,1412,1490,1384,573,623,511,2096,2447,1035,928,169,2205,2097,55,603,347,989,841,404,707,2162,2052,1536,1597,1238,1759,415,1542,708,1747,900,918,1491,197,709,555,1537,2283,1206,853,1207,366,1654,2053,2119,1435,668,1078,1598,1492,2163,179,59,1913,1599,1138,1139,330,1014,70,512,401,1726,353,654,824,402,2206,574,1413,1791,2387,456,287,1937,1015,575,115,1558,356,731,76,2333,1348,241,1140,2164,462,367,1341,1932,1600,971,2165,493,624,1171,789,2388,1814,2257,938,1655,1631,1141,760,625,2389,556,1423,1239,732,1656,1172,1496,1768,40,1711,1601,265,2054,242,1353,1142,578,2478,2311,1745,368,266,801,1559,2098,190,2207,1914,170,2284,2312,1463,924,1896,739,1143,733,2099,776,1104,2208,1036,669,1493,1021,1414,1632,1464,291,2390,2055,283,409,1208,2209,1538,46,2500,655,1883,8,97,99,141,885,1240,19,284,1079,576,12,1610,1977,1415,963,285,952,191,1539,813,2112,2391,243,1666,761,2100,1385,1465,2214,777,710,734,1611,762,1310,156,2166,457,1080,937,1342,157,528,2113,2210,2334,1037,2258,993,1978]