[pull] master from MyEtherWallet:master

checkDirectory.js

@@ -32,7 +32,8 @@ const whitelist = [
   'validateObject.js',
   '.vscode',
   'utils.js',
-  'checkMissingLinks.js'
+  'checkMissingLinks.js',
+  'generateFromCoingecko.js'
 ];
 
 function checkDirectory() {

checkMasterFile.js

@@ -10,9 +10,11 @@ const constraints = {
     },
     inclusion: {
       within: [
+        'arb',
         'akroma',
         'ath',
         'bsc',
+        'base',
         'clo',
         'egem',
         'ella',
@@ -27,6 +29,8 @@ const constraints = {
         'iolite',
         'kov',
         'mix',
+        'pol',
+        'op',
         'matic',
         'music',
         'pirl',
@@ -40,7 +44,13 @@ const constraints = {
         'tt',
         'ubq',
         'web',
-        'wtc'
+        'wtc',
+        'aa',
+        'aat',
+        'amoy',
+        'coti',
+        'holesky',
+        'xdc'
       ]
     },
     type: 'string'

checkMissingLinks.js

@@ -7,7 +7,7 @@ const {
 const masterFile = fs.readFileSync('./dist/master-file.json');
 const iconsDir = fs.readdirSync('./src/icons', { encoding: 'utf-8' });
 const master = JSON.parse(masterFile);
-const nets = ['eth', 'matic', 'bsc'];
+const nets = ['eth', 'pol', 'bsc', 'base'];
 
 console.log('Missing Links:');
 master.forEach(i => {

createTokens.js

@@ -6,8 +6,10 @@ const notInListPath = './notinlist.json';
 const notInList = JSON.parse(fs.readFileSync(notInListPath));
 const networks = {
   eth: 'ethTokens.json',
-  matic: 'maticTokens.json',
-  bsc: 'bscTokens.json'
+  pol: 'polTokens.json',
+  bsc: 'bscTokens.json',
+  base: 'baseTokens.json',
+  op: 'opTokens.json'
 };
 
 const cache = {};
@@ -16,7 +18,7 @@ let tokenCount = 0;
 function createToken(obj) {
   if (!cache.eth) {
     console.log('Caching tokens');
-    let nets = ['eth', 'matic', 'bsc'];
+    let nets = ['eth', 'pol', 'bsc', 'base', 'op'];
     nets.forEach(network => {
       const tokens = JSON.parse(fs.readFileSync(networks[network]));
       tokens.forEach(token => {
@@ -26,7 +28,7 @@ function createToken(obj) {
           ...cache[network]
         };
       });
-      console.log('%s cashed', network);
+      console.log('%s cached', network);
     });
   }
   const address = utils.toChecksumAddress(obj.address);

dist/contracts/aa/contract-abi-aa.json

@@ -0,0 +1,215 @@
+[
+  {
+    "name": "TEST",
+    "address": "0x0000000000000000000000000000000000000000",
+    "comment": "",
+    "abi": [
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "sale",
+        "outputs": [
+          { "name": "", "type": "uint256" },
+          { "name": "", "type": "uint256" },
+          { "name": "", "type": "uint256" },
+          { "name": "", "type": "address" },
+          { "name": "", "type": "uint256" },
+          { "name": "", "type": "uint256" }
+        ],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "invalidate",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "cancel",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [],
+        "name": "registrar",
+        "outputs": [{ "name": "", "type": "address" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "auctionStarted",
+        "outputs": [{ "name": "", "type": "bool" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "finish",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [],
+        "name": "withdraw",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "minimumBid",
+        "outputs": [{ "name": "", "type": "uint256" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [
+          { "name": "_name", "type": "string" },
+          { "name": "bidReferrer", "type": "address" }
+        ],
+        "name": "bid",
+        "outputs": [],
+        "payable": true,
+        "stateMutability": "payable",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "auctionEnds",
+        "outputs": [{ "name": "", "type": "uint256" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "isBuyable",
+        "outputs": [{ "name": "", "type": "bool" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "isAuction",
+        "outputs": [{ "name": "", "type": "bool" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [
+          { "name": "_name", "type": "string" },
+          { "name": "_price", "type": "uint256" },
+          { "name": "reserve", "type": "uint256" },
+          { "name": "referrer", "type": "address" }
+        ],
+        "name": "offer",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [
+          { "name": "_name", "type": "string" },
+          { "name": "bidReferrer", "type": "address" }
+        ],
+        "name": "buy",
+        "outputs": [],
+        "payable": true,
+        "stateMutability": "payable",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "addr", "type": "address" }],
+        "name": "balance",
+        "outputs": [{ "name": "", "type": "uint256" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [{ "name": "_name", "type": "string" }],
+        "name": "price",
+        "outputs": [{ "name": "", "type": "uint256" }],
+        "payable": false,
+        "stateMutability": "view",
+        "type": "function"
+      },
+      {
+        "inputs": [{ "name": "_registry", "type": "address" }],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+      },
+      {
+        "anonymous": false,
+        "inputs": [
+          { "indexed": true, "name": "seller", "type": "address" },
+          { "indexed": false, "name": "name", "type": "string" },
+          { "indexed": false, "name": "price", "type": "uint256" },
+          { "indexed": false, "name": "reserve", "type": "uint256" }
+        ],
+        "name": "Offer",
+        "type": "event"
+      },
+      {
+        "anonymous": false,
+        "inputs": [
+          { "indexed": true, "name": "bidder", "type": "address" },
+          { "indexed": false, "name": "name", "type": "string" },
+          { "indexed": false, "name": "bid", "type": "uint256" }
+        ],
+        "name": "Bid",
+        "type": "event"
+      },
+      {
+        "anonymous": false,
+        "inputs": [
+          { "indexed": true, "name": "seller", "type": "address" },
+          { "indexed": true, "name": "buyer", "type": "address" },
+          { "indexed": false, "name": "name", "type": "string" },
+          { "indexed": false, "name": "value", "type": "uint256" }
+        ],
+        "name": "Transfer",
+        "type": "event"
+      },
+      {
+        "anonymous": false,
+        "inputs": [{ "indexed": false, "name": "name", "type": "string" }],
+        "name": "Cancel",
+        "type": "event"
+      }
+    ]
+  }
+]

dist/contracts/aa/contract-abi-aa.min.json

@@ -0,0 +1 @@
+[{"name":"TEST","address":"0x0000000000000000000000000000000000000000","comment":"","abi":[{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"sale","outputs":[{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"address"},{"name":"","type":"uint256"},{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"invalidate","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"cancel","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"registrar","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"auctionStarted","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"finish","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"withdraw","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"minimumBid","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"bidReferrer","type":"address"}],"name":"bid","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"auctionEnds","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"isBuyable","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"isAuction","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"_price","type":"uint256"},{"name":"reserve","type":"uint256"},{"name":"referrer","type":"address"}],"name":"offer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"string"},{"name":"bidReferrer","type":"address"}],"name":"buy","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[{"name":"addr","type":"address"}],"name":"balance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"price","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_registry","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"name","type":"string"},{"indexed":false,"name":"price","type":"uint256"},{"indexed":false,"name":"reserve","type":"uint256"}],"name":"Offer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"bidder","type":"address"},{"indexed":false,"name":"name","type":"string"},{"indexed":false,"name":"bid","type":"uint256"}],"name":"Bid","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"name","type":"string"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"name","type":"string"}],"name":"Cancel","type":"event"}]}]