diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..b027e1d26 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +mm: node dist/cjs/src/scripts/mm/market-maker.js \ No newline at end of file diff --git a/package.json b/package.json index c4cf28492..fbbbc9904 100644 --- a/package.json +++ b/package.json @@ -37,18 +37,13 @@ "@types/bs58": "^4.0.1", "@types/chai": "^4.3.0", "@types/mocha": "^9.1.0", - "@types/node": "^14.14.37", + "@types/node": "^18.11.18", "@typescript-eslint/eslint-plugin": "^5.32.0", "@typescript-eslint/parser": "^5.32.0", - "binance-api-node": "^0.12.0", "chai": "^4.3.4", - "cross-fetch": "^3.1.5", - "dotenv": "^16.0.3", "eslint": "^7.28.0", "eslint-config-prettier": "^7.2.0", - "ftx-api": "^1.1.13", "mocha": "^9.1.3", - "node-kraken-api": "^2.2.2", "prettier": "^2.0.5", "ts-mocha": "^10.0.0", "ts-node": "^9.1.1", @@ -70,7 +65,12 @@ "@solana/web3.js": "^1.63.1", "@switchboard-xyz/sbv2-lite": "^0.1.6", "big.js": "^6.1.1", - "bs58": "^5.0.0" + "bs58": "^5.0.0", + "binance-api-node": "^0.12.0", + "node-kraken-api": "^2.2.2", + "ftx-api": "^1.1.13", + "cross-fetch": "^3.1.5", + "dotenv": "^16.0.3" }, "resolutions": { "@project-serum/anchor/@solana/web3.js": "1.63.1" diff --git a/ts/client/src/scripts/mm/market-maker.ts b/ts/client/src/scripts/mm/market-maker.ts index f63e9091c..cd39d5e67 100644 --- a/ts/client/src/scripts/mm/market-maker.ts +++ b/ts/client/src/scripts/mm/market-maker.ts @@ -28,6 +28,7 @@ import { makeInitSequenceEnforcerAccountIx, seqEnforcerProgramIds, } from './sequence-enforcer-util'; +import * as defaultParams from './params/default.json'; // Future // * use async nodejs logging @@ -229,7 +230,11 @@ async function fullMarketMaker() { const options = AnchorProvider.defaultOptions(); const connection = new Connection(CLUSTER_URL!, options); const user = Keypair.fromSecretKey( - Buffer.from(JSON.parse(fs.readFileSync(USER_KEYPAIR!, 'utf-8'))), + Buffer.from( + JSON.parse( + process.env.KEYPAIR || fs.readFileSync(USER_KEYPAIR!, 'utf-8'), + ), + ), ); const userWallet = new Wallet(user); const userProvider = new AnchorProvider(connection, userWallet, options); diff --git a/ts/client/src/scripts/mm/params/default.json b/ts/client/src/scripts/mm/params/default.json index e84ea7e2c..a681de704 100644 --- a/ts/client/src/scripts/mm/params/default.json +++ b/ts/client/src/scripts/mm/params/default.json @@ -5,7 +5,7 @@ "assets": { "BTC": { "perp": { - "sizePerc": 0.05, + "sizePerc": 0.75, "leanCoeff": 0.00025, "bias": 0.0, "requoteThresh": 0.0002, @@ -13,17 +13,6 @@ "spammerCharge": 2, "krakenCode": "XXBTZUSD" } - }, - "MNGO": { - "perp": { - "sizePerc": 0.05, - "leanCoeff": 0.00025, - "bias": 0.0, - "requoteThresh": 0.0002, - "takeSpammers": true, - "spammerCharge": 2, - "krakenCode": "MNGOUSD" - } } } } diff --git a/tsconfig.json b/tsconfig.json index 6e3534ec1..e5d8f227a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,8 @@ "esModuleInterop": true, "moduleResolution": "node", "lib": [ - "es2019" + "es2019", + "dom" ], "outDir": "./dist", "resolveJsonModule": true, diff --git a/yarn.lock b/yarn.lock index f881e3820..9310cbf16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -675,10 +675,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^14.14.37": - version "14.18.12" - resolved "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz" - integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== +"@types/node@^18.11.18": + version "18.11.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" + integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== "@types/promise-retry@^1.1.3": version "1.1.3"