handle withdrawal with eth address

l2beat · Jul 21, 2023 · 4991527 · 4991527
1 parent 9ac3ff8
commit 4991527
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/backend/src/api/controllers/UserController.ts b/packages/backend/src/api/controllers/UserController.ts
@@ -135,7 +135,7 @@ export class UserController {
       forcedTradeOffers,
       forcedTradeOffersCount,
       finalizableOffers,
-      withdrawableAssets,
+      starkKeyWithdrawableAssets,
       userStatistics,
     ] = await Promise.all([
       this.userRegistrationEventRepository.findByStarkKey(starkKey),
@@ -178,6 +178,16 @@ export class UserController {
         message: `User with starkKey ${starkKey.toString()} not found`,
       }
     }
+    const ethAddressWithdrawableAssets = givenUser.address
+      ? await this.withdrawableAssetRepository.getAssetBalancesByStarkKey(
+          StarkKey.fromEthereumAddress(givenUser.address)
+        )
+      : []
+
+    const withdrawableAssets = [
+      ...starkKeyWithdrawableAssets,
+      ...ethAddressWithdrawableAssets,
+    ]
 
     const assetDetailsMap = await this.assetDetailsService.getAssetDetailsMap({
       userAssets: userAssets,

diff --git a/packages/types/src/StarkKey.ts b/packages/types/src/StarkKey.ts
@@ -1,5 +1,6 @@
 import { type BigNumber } from '@ethersproject/bignumber'
 
+import { EthereumAddress } from './EthereumAddress'
 import { fakeHexString } from './fake'
 
 export interface StarkKey extends String {
@@ -25,6 +26,12 @@ StarkKey.from = function from(value: BigNumber | bigint) {
   return StarkKey('0x' + value.toString(16).padStart(64, '0'))
 }
 
+StarkKey.fromEthereumAddress = function fromEthereumAddress(
+  address: EthereumAddress
+) {
+  return StarkKey('0' + address.toString().slice(2).padStart(63, '0'))
+}
+
 StarkKey.fake = function fake(start?: string) {
   if (!start) {
     return StarkKey('0' + fakeHexString(63))