Merge branch 'dev' into patch-1

OasisDEX · May 8, 2024 · 3fcb847 · 3fcb847
2 parents 43d9f2d + 13565d8
commit 3fcb847
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/packages/addresses/package.json b/packages/addresses/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oasisdex/addresses",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",

diff --git a/packages/deploy-configurations/configs/mainnet.conf.ts b/packages/deploy-configurations/configs/mainnet.conf.ts
@@ -974,6 +974,10 @@ export const config: SystemConfig = {
       name: 'AWBTC',
       address: '0xFC4B8ED459e00e5400be803A9BB3954234FD50e3',
     },
+    'UNI-V2': {
+      name: 'UNI-V2',
+      address: '0x9fdd7f845baca6d71d93f1619250c6f0b7a58842',
+    },
   },
   aave: {
     v2: {
@@ -1708,6 +1712,10 @@ export const config: SystemConfig = {
       name: 'AjnaPoolPairs_SAFEDAI',
       address: '0x37b5921f0da465df64637a418110a2e3aa90b209',
     },
+    'AjnaPoolPairs_UNI-V2DAI': {
+      name: 'AjnaPoolPairs_UNI-V2DAI',
+      address: '0xc71ad394818474f87f27a5525243de52c278dcb8',
+    },
     AjnaPoolInfo: {
       name: 'AjnaPoolInfo',
       address: '0x30c5eF2997d6a882DE52c4ec01B6D0a5e5B4fAAE',

diff --git a/packages/deploy-configurations/configs/shared/common-defaults.ts b/packages/deploy-configurations/configs/shared/common-defaults.ts
@@ -197,4 +197,8 @@ export const commonDefaults = {
     name: 'PTWEETH',
     address: ADDRESS_ZERO,
   },
+  'UNI-V2': {
+    name: 'UNI-V2',
+    address: ADDRESS_ZERO,
+  },
 } as const
diff --git a/packages/deploy-configurations/configs/shared/empty-ajna-pools.ts b/packages/deploy-configurations/configs/shared/empty-ajna-pools.ts
@@ -245,4 +245,8 @@ export const emptyAjnaPools = {
     name: 'AjnaPoolPairs_SAFEDAI',
     address: ADDRESS_ZERO,
   },
+  'AjnaPoolPairs_UNI-V2DAI': {
+    name: 'AjnaPoolPairs_UNI-V2DAI',
+    address: ADDRESS_ZERO,
+  },
 } as const
diff --git a/packages/deploy-configurations/types/deployment-config/ajna-protocol.ts b/packages/deploy-configurations/types/deployment-config/ajna-protocol.ts
@@ -64,6 +64,7 @@ export type AjnaProtocol =
   | 'AjnaPoolPairs_AEROUSDC'
   | 'AjnaPoolPairs_PRIMEUSDC'
   | 'AjnaPoolPairs_SAFEDAI'
+  | 'AjnaPoolPairs_UNI-V2DAI'
   | 'AjnaProxyActions'
   | 'AjnaRewardsClaimer'
   | 'AjnaRewardsManager'

diff --git a/packages/deploy-configurations/types/deployment-config/tokens.ts b/packages/deploy-configurations/types/deployment-config/tokens.ts
@@ -111,3 +111,4 @@ export type Tokens =
   | 'DEGEN'
   | 'SNX'
   | 'ENA'
+  | 'UNI-V2'