From d98ca3fd1cf07e9a72ad38493832b25ff33864c4 Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 25 Feb 2024 21:47:43 -0400 Subject: [PATCH] chainInfo no longer has mockenv coins. use metadata.json. --- chain.js | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/chain.js b/chain.js index ee12fbb..de6fe7d 100644 --- a/chain.js +++ b/chain.js @@ -1,7 +1,5 @@ import fs from "fs"; -import {ethers, keccak256} from "ethers"; -import {getProvider} from "./blockchain.js"; -import {getAbi} from "./abi.js"; +import {keccak256} from "ethers"; const vaultCode = JSON.parse(fs.readFileSync('../contract/out/Vault.sol/Vault.json').toString()) export const VAULT_INIT_CODE_HASH = keccak256(vaultCode.bytecode.object) @@ -15,11 +13,6 @@ const _chains = [ {id:1337, name:'Dexorder Alpha'}, ] -function _setChainInfo(c, k, v) { - c.update(v) - chainInfo[c][k] = v -} - for (const chain of _chains) { const path = `../contract/broadcast/Deploy.sol/${chain.id}/run-${process.env['DEXORDER_DEPLOYMENT_' + chain.id]}.json`; let deployment @@ -55,40 +48,5 @@ for (const chain of _chains) { throw Error(`No QueryHelper deployment found for chainId ${chain.id} ${path}`) console.log('Factory', chain.factory) console.log('QueryHelper', chain.helper) - - if(chain.id === 31337 || chain.id === 1337) { - const mockpath = `../contract/broadcast/DeployMock.sol/${chain.id}/run-${process.env['DEXORDER_DEPLOYMENT_' + chain.id]}.json` - try { - deployment = JSON.parse(fs.readFileSync(mockpath, 'utf8')) //null synchronous is ok we only do this once on init - for (const tx of deployment.transactions) { - if (tx.contractName === 'MockEnv') { - // set up mock coins, etc - const mock = new ethers.Contract(tx.contractAddress, await getAbi('MockEnv'), getProvider(chain.id)) - const coinAddr = await mock.COIN() - const usdAddr = await mock.USD() - chain.mockenv = tx.contractAddress - chain.mockCoins = [coinAddr, usdAddr] - chain.tokens = [ - { - name: 'Mock Ethereum Hardfork', - symbol: 'MEH', - decimals: 18, - image: null, - address: coinAddr, - }, - { - name: 'Joke Currency XD', - symbol: 'USXD', - decimals: 6, - image: null, - address: usdAddr, - }, - ] - console.log('Detected MockEnv at', chain.id, tx.contractAddress) - } - } - } catch { - } - } chainInfo[chain.id] = chain }