diff --git a/poly_merger/README.md b/poly_merger/README.md index 045e159..a940a02 100644 --- a/poly_merger/README.md +++ b/poly_merger/README.md @@ -20,10 +20,10 @@ node merge.js [amount_to_merge] [condition_id] [is_neg_risk_market] Example: ``` -node merge.js 1000000 1234567 true +node merge.js 1000000 0xasdasda true ``` -This would merge 1 USDC worth of opposing positions in market 1234567, which is a negative risk market. +This would merge 1 USDC worth of opposing positions in market 0xasdasda, which is a negative risk market. 0xasdasda should be condition_id ## Prerequisites diff --git a/poly_merger/merge.js b/poly_merger/merge.js index 83596ea..dc7e839 100644 --- a/poly_merger/merge.js +++ b/poly_merger/merge.js @@ -15,14 +15,18 @@ const { ethers } = require('ethers'); const { resolve } = require('path'); +const { existsSync } = require('fs'); const { signAndExecuteSafeTransaction } = require('./safe-helpers'); const { safeAbi } = require('./safeAbi'); // Load environment variables -require('dotenv').config() +const localEnvPath = resolve(__dirname, '.env'); +const parentEnvPath = resolve(__dirname, '../.env'); +const envPath = existsSync(localEnvPath) ? localEnvPath : parentEnvPath; +require('dotenv').config({ path: envPath }) // Connect to Polygon network -const provider = new ethers.providers.JsonRpcProvider("https://polygon.llamarpc.com"); +const provider = new ethers.providers.JsonRpcProvider("https://polygon-rpc.com"); const privateKey = process.env.PK; const wallet = new ethers.Wallet(privateKey, provider);