Skip to content

Commit 8666f30

Browse files
committed
feat: integrate frxusd
1 parent 9dd32e1 commit 8666f30

File tree

15 files changed

+1485
-10
lines changed

15 files changed

+1485
-10
lines changed

pkg/liquidity-source/erc4626/pool_simulator.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,12 @@ func (s *PoolSimulator) UpdateBalance(params pool.UpdateBalanceParams) {
159159
}
160160
}
161161

162-
func (s *PoolSimulator) GetMetaInfo(_, _ string) any {
162+
func (s *PoolSimulator) GetMetaInfo(tokenIn, tokenOut string) any {
163+
isDeposit, _ := s.getSwapType(tokenIn, tokenOut)
163164
return Meta{
164165
BlockNumber: s.Info.BlockNumber,
165166
IsNativeAsset: s.IsNativeAsset,
167+
IsDeposit: isDeposit == Deposit,
166168
}
167169
}
168170

pkg/liquidity-source/erc4626/pool_tracker.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (t *PoolTracker) getNewPoolState(
7474

7575
vaultAddr := p.Tokens[0].Address
7676
vaultCfg := t.cfg.Vaults[vaultAddr]
77-
_, state, err := fetchAssetAndState(ctx, t.ethrpcClient, vaultAddr, vaultCfg, false, overrides)
77+
_, state, err := FetchAssetAndState(ctx, t.ethrpcClient, vaultAddr, vaultCfg, false, overrides)
7878
if err != nil {
7979
lg.WithFields(logger.Fields{
8080
"error": err,
@@ -83,10 +83,10 @@ func (t *PoolTracker) getNewPoolState(
8383
return p, err
8484
}
8585

86-
return p, updateEntityState(&p, vaultCfg, state)
86+
return p, UpdateEntityState(&p, vaultCfg, state)
8787
}
8888

89-
func updateEntityState(p *entity.Pool, vaultCfg VaultCfg, state *PoolState) error {
89+
func UpdateEntityState(p *entity.Pool, vaultCfg VaultCfg, state *PoolState) error {
9090
extraBytes, err := json.Marshal(Extra{
9191
Gas: Gas(vaultCfg.Gas),
9292
SwapTypes: vaultCfg.SwapTypes,
@@ -108,7 +108,7 @@ func updateEntityState(p *entity.Pool, vaultCfg VaultCfg, state *PoolState) erro
108108
return nil
109109
}
110110

111-
func fetchAssetAndState(ctx context.Context, ethrpcClient *ethrpc.Client, vaultAddr string, vaultCfg VaultCfg,
111+
func FetchAssetAndState(ctx context.Context, ethrpcClient *ethrpc.Client, vaultAddr string, vaultCfg VaultCfg,
112112
fetchAsset bool, overrides map[common.Address]gethclient.OverrideAccount) (common.Address, *PoolState, error) {
113113
var (
114114
assetToken common.Address

pkg/liquidity-source/erc4626/pools_list_updater.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ func (u *PoolsListUpdater) GetNewPools(ctx context.Context, metadataBytes []byte
7070
}
7171

7272
func (u *PoolsListUpdater) getNewPool(ctx context.Context, vaultAddr string, vaultCfg VaultCfg) (*entity.Pool, error) {
73-
assetToken, state, err := fetchAssetAndState(ctx, u.ethrpcClient, vaultAddr, vaultCfg, true, nil)
73+
assetToken, state, err := FetchAssetAndState(ctx, u.ethrpcClient, vaultAddr, vaultCfg, true, nil)
7474
if err != nil {
7575
u.logger.WithFields(logger.Fields{
7676
"error": err,
77-
}).Error("failed to fetchAssetAndState")
77+
}).Error("failed to FetchAssetAndState")
7878
return nil, err
7979
}
8080

@@ -96,5 +96,5 @@ func (u *PoolsListUpdater) getNewPool(ctx context.Context, vaultAddr string, vau
9696
StaticExtra: string(staticExtraBytes),
9797
}
9898

99-
return p, updateEntityState(p, vaultCfg, state)
99+
return p, UpdateEntityState(p, vaultCfg, state)
100100
}

pkg/liquidity-source/erc4626/type.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ type (
3636
}
3737

3838
Meta struct {
39-
BlockNumber uint64 `json:"blockNumber"`
40-
IsNativeAsset bool `json:"isNativeAsset"`
39+
BlockNumber uint64 `json:"bN"`
40+
IsNativeAsset bool `json:"isNativeAsset,omitempty"`
41+
IsDeposit bool `json:"isDeposit,omitempty"`
4142
}
4243

4344
PoolState struct {

0 commit comments

Comments
 (0)