dead code cleanup

This commit is contained in:
tim
2025-02-24 19:12:48 -04:00
parent 5af7422b9d
commit bf31648a57

View File

@@ -1,9 +1,7 @@
import {ethers} from "ethers";
import {getProvider, getSigner} from "./blockchain.js";
import {vaultBalances, vaults} from './cache.js';
import {chainInfo} from "./chain.js";
import {sendVaultOrders} from "./order.js";
import {newContract} from "./contract.js";
import {approveWallet} from "./approval.js";
import {sql} from "./db.js";
import {clientIP} from "./misc.js";
@@ -66,76 +64,6 @@ export async function loginAddress(socket, chainId, address) {
}
}
const ensuring = {}
export async function ensureVault_OLD(socket, chainId, owner, num) {
if (!approveWallet(owner))
return
const key = [chainId, owner, num]
if( key in ensuring ) {
console.log('squelching ensureVault since one is in-progress')
return
}
ensuring[key] = true
console.log('ensureVault', chainId, owner, num)
if( chainId in chainInfo ) {
const address = vaultAddress(chainId, owner, num)
console.log('vault addr', address)
if (!await vaults.contains(chainId,address)) {
try {
const vault = await createVault(chainId, owner, num)
if (vault !== null) {
console.log('created vault', vault)
socket.emit('vaults', chainId, owner, [vault])
await emitBalances(socket, chainId, vault)
}
else
console.error('got null vault for chainId', chainId)
} catch {
}
}
else
console.log('ensureVault', owner, 'exists:', address)
}
await sendVaultInfo(socket, chainId, owner)
delete ensuring[key]
}
async function createVault(chainId, owner, num) {
if (!approveWallet(owner))
return
const signer = getSigner(chainId);
const factory = chainInfo[chainId].factory;
owner = ethers.getAddress(owner);
console.log('createVault', chainId, owner, num, factory, chainInfo[chainId].vaultInitCodeHash )
const deployer = await newContract(factory, 'IVaultFactory', signer)
const vaultAddr = vaultAddress(chainId, owner, num)
console.log(' ==> vault addr', vaultAddr )
try {
const tx = await deployer['deployVault(address,uint8)'](owner, num) // must specify which deployVault() to call
console.log(`deploying vault for ${owner} #${num} with tx ${tx.hash}`)
const result = await tx.wait()
if (result.status !== 1) {
// noinspection ExceptionCaughtLocallyJS
throw Error(`Vault deployment reverted. tx ${tx.hash}`)
}
}
catch (e) {
const vault = await newContract(vaultAddr, 'IVault', getProvider(chainId))
try {
const ver = await vault.version()
console.log(`vault already deployed at ${vaultAddr} with version ${ver}`)
}
catch (e2) {
console.error('could not deploy vault:', e)
return null
}
}
return vaultAddr
}
export async function requestVault(socket, chainId, owner, num) {
const ipAddress = clientIP(socket)
const time = new Date().toISOString();