alpha deployment

This commit is contained in:
Tim Olson
2023-11-16 17:36:43 -04:00
parent 49abeabe64
commit daaa7ca46a
6 changed files with 23 additions and 5 deletions

15
.env.mock Normal file
View File

@@ -0,0 +1,15 @@
DEXORDER_PORT=3001
DEXORDER_CORS=http://localhost:3000
DEXORDER_DB_URL=postgresql://dexorder:redoxed@localhost:5432/dexorder
DEXORDER_REDIS_URL=redis://localhost:6379
# Arbitrum
DEXORDER_DEPLOYMENT_42161=latest
DEXORDER_RPC_URL_42161=http://localhost:8545
# Mockchain
DEXORDER_DEPLOYMENT_31337=latest
DEXORDER_RPC_URL_31337=http://localhost:8545
# dev account #2
DEXORDER_ACCOUNTS_31337=0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a

View File

@@ -68,6 +68,7 @@ export class CacheObject {
const blockCaches = {
'31337': new CacheObject('31337|latest_block'),
'42161': new CacheObject('42161|latest_block'),
'53261': new CacheObject('53261|latest_block'),
}
async function latestBlock(chain) {

View File

@@ -12,6 +12,7 @@ export const chainInfo = {}
const _chains = [
{id:42161, name:'Arbitrum'},
{id:31337, name:'Mockchain'},
{id:53261, name:'Dexorder Alpha'},
]
function _setChainInfo(c, k, v) {
@@ -55,7 +56,7 @@ for (const chain of _chains) {
console.log('Factory', chain.factory)
console.log('QueryHelper', chain.helper)
if(chain.id === 31337 ) {
if(chain.id === 31337 || chain.id === 53261) {
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

View File

@@ -6,7 +6,7 @@ import {mockErc20Abi} from "./abi.js";
export async function faucet( chainId, owner, vault=null ) {
if( chainId === 31337 ) {
if( chainId === 31337 || chainId === 53261 ) {
if( vault === null )
vault = vaultAddress(chainId, owner)
const provider = getProvider(chainId);
@@ -18,7 +18,7 @@ export async function faucet( chainId, owner, vault=null ) {
let nonce = await provider.getTransactionCount(faucet.address, 'pending')
faucet = new ethers.NonceManager(faucet)
await faucet.sendTransaction({to:owner, value:1n *10n**18n, nonce: nonce++})
const info = chainInfo[31337]
const info = chainInfo[chainId]
if( info.mockCoins ) {
const [coinAddr, usdAddr] = info.mockCoins
const signer = await provider.getSigner()

View File

@@ -19,7 +19,7 @@ io.on("connection", (socket) => {
socket.on('subPools', (chainId, addresses) => subPools(socket, chainId, addresses) )
socket.on('unsubPools', (chainId, addresses) => unsubPools(socket, chainId, addresses) )
socket.on('ensureVault', (chainId,owner,num) => ensureVault(socket, chainId, owner, num) )
if( 31337 in chainInfo && chainInfo[31337]?.mockenv )
if( 31337 in chainInfo && chainInfo[31337]?.mockenv || 53261 in chainInfo && chainInfo[53261]?.mockenv )
socket.on('faucet', async (chainId, owner) => await faucet(chainId, owner))
socket.join('public')
socket.emit('welcome', {chainInfo, vaultInitCodeHash:VAULT_INIT_CODE_HASH})
@@ -30,6 +30,6 @@ io.on("connection", (socket) => {
// todo unsub pools etc?
// })
const port = parseInt(process.env.DEXORDER_PORT) || 3000;
const port = parseInt(process.env.DEXORDER_PORT) || 3001;
httpServer.listen(port)
console.log('Started server on port '+port)

View File

@@ -10,6 +10,7 @@ const std_arbitrum_tokens = {}
const tokens = {
42161: std_arbitrum_tokens,
31337: std_arbitrum_tokens,
53261: {},
}
export function erc20(chainId, addr, provider=null) {