Merge pull request #70 from superform-xyz/removeDotenv

fix: removedotenv
superform-xyz · Feb 27, 2024 · 14eeff2 · 14eeff2
2 parents cb840d7 + fd7ef7b
commit 14eeff2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/.env.example b/.env.example
@@ -1,15 +1,3 @@
-ETHEREUM_RPC_URL=https://eth-mainnet.g.alchemy.com/v2/<API_KEY>
-FANTOM_RPC_URL=https://rpc.ankr.com/fantom/
-BSC_RPC_URL=https://bsc-dataseed.binance.org/
-AVALANCHE_RPC_URL=https://api.avax.network/ext/bc/C/rpc
-POLYGON_RPC_URL=https://polygon-rpc.com
-OPTIMISM_RPC_URL=https://mainnet.optimism.io
-
-MANAGER=
-ETHERSCAN_API_KEY=
-PRIVATE_KEY=
-
-
 ############################################
 ### VENUS COMPOUND BINANCE CONFIG ##########
 ############################################
@@ -81,8 +69,8 @@ AAVEV3_AVAX_DAI_PAIR2=0x87dee1cc9ffd464b79e058ba20387c1984aed86a
 AAVEV3_AVAX_USDC=0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E
 AAVEV3_AVAX_AUSDC=0x625E7708f30cA75bfd92586e17077590C60eb4cD
 AAVEV3_AVAX_USDC_SWAPTOKEN=0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E ### USDC, SAME AS ASSET
-AAVEV3_AVAX_USDC_PAIR1=0xf4003f4efbe8691b60249e6afbd307abe7758adb ### WAVAX/USDC POOL
-AAVEV3_AVAX_USDC_PAIR2=0xf4003f4efbe8691b60249e6afbd307abe7758adb ### UNSUED, SAME AS PAIR1
+AAVEV3_AVAX_USDC_PAIR1=0xf4003f4efbe8691b60249e6afbd307abe7758adb     ### WAVAX/USDC POOL
+AAVEV3_AVAX_USDC_PAIR2=0xf4003f4efbe8691b60249e6afbd307abe7758adb     ### UNSUED, SAME AS PAIR1
 
 # addressess for deployment through factory
 AAVEV3_AVAX_WAVAX=0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7
@@ -91,7 +79,7 @@ AAVEV3_AVAX_SAVAX=0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE
 AAVEV3_AVAX_WETHE=0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB
 
 ############################################
-### AAVE-V3 REINVEST OPTIMISM CONFIG ####### 
+### AAVE-V3 REINVEST OPTIMISM CONFIG #######
 ############################################
 AAVEV3_OPTIMISM_LENDINGPOOL=0x794a61358D6845594F94dc1DB02A252b5b4814aD
 AAVEV3_OPTIMISM_REWARDTOKEN=
@@ -111,7 +99,7 @@ AAVEV3_OPTIMISM_USDC_PAIR1=
 AAVEV3_OPTIMISM_USDC_PAIR2=
 
 ############################################
-### AAVE-V3 REINVEST ARBITRUM CONFIG ####### 
+### AAVE-V3 REINVEST ARBITRUM CONFIG #######
 ############################################
 AAVEV3_ARBITRUM_LENDINGPOOL=0x794a61358D6845594F94dc1DB02A252b5b4814aD
 AAVEV3_ARBITRUM_REWARDTOKEN=
@@ -131,7 +119,7 @@ AAVEV3_ARBITRUM_USDC_PAIR1=
 AAVEV3_ARBITRUM_USDC_PAIR2=
 
 ############################################
-### AAVE-V3 REINVEST POLYGON CONFIG ######## 
+### AAVE-V3 REINVEST POLYGON CONFIG ########
 ############################################
 AAVEV3_POLYGON_LENDINGPOOL=0x794a61358D6845594F94dc1DB02A252b5b4814aD
 AAVEV3_POLYGON_REWARDTOKEN=
@@ -165,8 +153,8 @@ BENQI_WAVAX_CETHER=0x5C0401e81Bc07Ca70fAD469b451682c0d747Ef1c
 BENQI_USDC_ASSET=0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664
 BENQI_USDC_CTOKEN=0xBEb5d47A3f720Ec0a390d04b4d41ED7d9688bC7F
 BENQI_SWAPTOKEN_USDC=0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7 # QI-USDC doesnt exist, QI-WAVAX does, SWAPTOKEN=WAVAX
-BENQI_PAIR1_USDC=0x2774516897ac629ad3ed9dcac7e375dda78412b9 # QI-WAVAX PAIR
-BENQI_PAIR2_USDC=0xa389f9430876455c36478deea9769b7ca4e3ddb1 # WAVAX-USDC PAIR
+BENQI_PAIR1_USDC=0x2774516897ac629ad3ed9dcac7e375dda78412b9     # QI-WAVAX PAIR
+BENQI_PAIR2_USDC=0xa389f9430876455c36478deea9769b7ca4e3ddb1     # WAVAX-USDC PAIR
 
 BENQI_DAI_ASSET=0xd586e7f844cea2f87f50152665bcbc2c279d8d70
 BENQI_DAI_CTOKEN=0x835866d37afb8cb8f8334dccdaf66cf01832ff5d
@@ -214,8 +202,8 @@ GEIST_REWARD_TOKEN=0xd8321AA83Fb0a4ECd6348D4577431310A6E0814d
 GEIST_DAI_ASSET=0x8D11eC38a3EB5E956B052f67Da8Bdc9bef8Abf3E
 GEIST_DAI_ATOKEN=0x07e6332dd090d287d3489245038daf987955dcfb
 GEIST_SWAPTOKEN_DAI=0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83 # GEIST-DAI doesnt exist, GEIST-FTM does, SWAPTOKEN=FTM
-GEIST_PAIR1_DAI=0x668ae94d0870230ac007a01b471d02b2c94ddcb9 # GEIST-FTM PAIR
-GEIST_PAIR2_DAI=0xe120ffbda0d14f3bb6d6053e90e63c572a66a428 # FTM-DAI PAIR
+GEIST_PAIR1_DAI=0x668ae94d0870230ac007a01b471d02b2c94ddcb9     # GEIST-FTM PAIR
+GEIST_PAIR2_DAI=0xe120ffbda0d14f3bb6d6053e90e63c572a66a428     # FTM-DAI PAIR
 
 GEIST_USDC_ASSET=0x04068DA6C83AFCFA0e13ba15A6696662335D5B75
 GEIST_USDC_ATOKEN=0xe578c856933d8e1082740bf7661e379aa2a30b26
@@ -236,4 +224,4 @@ GEIST_CRV_ASSET=0x1E4F97b9f9F913c46F1632781732927B9019C68b
 GEIST_CRV_ATOKEN=0x690754A168B022331cAA2467207c61919b3F8A98
 
 GEIST_WBTC_ASSET=0x321162Cd933E2Be498Cd2267a90534A804051b11
-GEIST_WBTC_ATOKEN=0x38aCa5484B8603373Acc6961Ecd57a6a594510A3
+GEIST_WBTC_ATOKEN=0x38aCa5484B8603373Acc6961Ecd57a6a594510A3
diff --git a/Makefile b/Makefile
@@ -2,6 +2,15 @@
 # (-include to ignore error if it does not exist)
 -include .env
 
+export ETHEREUM_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/ETHEREUM_RPC_URL/credential)
+export BSC_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/BSC_RPC_URL/credential)
+export AVALANCHE_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/AVALANCHE_RPC_URL/credential)
+export POLYGON_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/POLYGON_RPC_URL/credential)
+export ARBITRUM_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/ARBITRUM_RPC_URL/credential)
+export OPTIMISM_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/OPTIMISM_RPC_URL/credential)
+export BASE_RPC_URL := $(shell op read op://5ylebqljbh3x6zomdxi3qd7tsa/BASE_RPC_URL/credential)
+
+
 # deps
 install:; forge install
 update:; forge update