From daaa7ca46a3825df071c344b5d4e4ab9f75c2aba Mon Sep 17 00:00:00 2001
From: Tim Olson <>
Date: Thu, 16 Nov 2023 17:36:43 -0400
Subject: [PATCH] alpha deployment

---
 .env.mock | 15 +++++++++++++++
 cache.js  |  1 +
 chain.js  |  3 ++-
 faucet.js |  4 ++--
 main.js   |  4 ++--
 token.js  |  1 +
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 .env.mock

diff --git a/.env.mock b/.env.mock
new file mode 100644
index 0000000..01c8fca
--- /dev/null
+++ b/.env.mock
@@ -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
diff --git a/cache.js b/cache.js
index 60f9256..7afcb08 100644
--- a/cache.js
+++ b/cache.js
@@ -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) {
diff --git a/chain.js b/chain.js
index 95d612c..a7c3d88 100644
--- a/chain.js
+++ b/chain.js
@@ -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
diff --git a/faucet.js b/faucet.js
index 9560cea..9b15e82 100644
--- a/faucet.js
+++ b/faucet.js
@@ -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()
diff --git a/main.js b/main.js
index 8d260e8..758fa99 100644
--- a/main.js
+++ b/main.js
@@ -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)
diff --git a/token.js b/token.js
index 4409d73..3eabb91 100644
--- a/token.js
+++ b/token.js
@@ -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) {