Skip to content

Commit eb7c94c

Browse files
nialexsannialexsan
committed
update to use moet
1 parent ec01105 commit eb7c94c

2 files changed

Lines changed: 21 additions & 16 deletions

File tree

‎cadence/contracts/TidalYieldStrategies.cdc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ access(all) contract TidalYieldStrategies {
135135
// assign EVM token addresses & types
136136
// TODO: Consider how we're going to handle these addresses across networks, especially testing & CI
137137
let yieldTokenEVMAddress = EVM.addressFromString("0x4154d5B0E2931a0A1E5b733f19161aa7D2fc4b95")
138-
let stableTokenEVMAddress = EVM.addressFromString("0xd431955D55a99EF69BEb96BA34718d0f9fBc91b1")
138+
let moetTokenEVMAddress = EVM.addressFromString("0x51F5cC5f50afB81e8F23C926080FA38C3024b238")
139139
let yieldTokenType = FlowEVMBridgeConfig.getTypeAssociated(with: yieldTokenEVMAddress)
140140
?? panic("YieldToken associated with EVM address \(yieldTokenEVMAddress.toString()) not found in VM Bridge config")
141-
let stableTokenType = FlowEVMBridgeConfig.getTypeAssociated(with: stableTokenEVMAddress)
142-
?? panic("Stables associated with EVM address \(stableTokenEVMAddress.toString()) not found in VM Bridge config")
141+
let moetTokenType = FlowEVMBridgeConfig.getTypeAssociated(with: moetTokenEVMAddress)
142+
?? panic("Stables associated with EVM address \(moetTokenEVMAddress.toString()) not found in VM Bridge config")
143143
// assign collateral & flow token types
144144
let collateralType = withFunds.getType()
145145
let flowTokenType = Type<@FlowToken.Vault>()
@@ -167,17 +167,17 @@ access(all) contract TidalYieldStrategies {
167167
// Stable -> YieldToken
168168
// TODO: Update to use UniswapV3SwapConnectors
169169
// let stableToYieldSwapper = MockSwapper.Swapper(
170-
// inVault: stableTokenType,
170+
// inVault: moetTokenType,
171171
// outVault: yieldTokenType,
172172
// uniqueID: uniqueID
173173
// )
174174
// TODO: consider how we're going to pass the user's COA capability to the Swapper
175175
let stableToYieldSwapper = UniswapV3SwapConnectors.Swapper(
176176
routerAddress: router,
177177
quoterAddress: quoter,
178-
tokenPath: [stableTokenEVMAddress, yieldTokenEVMAddress],
178+
tokenPath: [moetTokenEVMAddress, yieldTokenEVMAddress],
179179
feePath: [3000],
180-
inVault: stableTokenType,
180+
inVault: moetTokenType,
181181
outVault: yieldTokenType,
182182
coaCapability: TidalYieldStrategies._getCOACapability(),
183183
uniqueID: uniqueID
@@ -186,16 +186,16 @@ access(all) contract TidalYieldStrategies {
186186
// TODO: Update to use UniswapV3SwapConnectors
187187
// let yieldToStableSwapper = MockSwapper.Swapper(
188188
// inVault: yieldTokenType,
189-
// outVault: stableTokenType,
189+
// outVault: moetTokenType,
190190
// uniqueID: uniqueID
191191
// )
192192
let yieldToStableSwapper = UniswapV3SwapConnectors.Swapper(
193193
routerAddress: router,
194194
quoterAddress: quoter,
195-
tokenPath: [yieldTokenEVMAddress, stableTokenEVMAddress],
195+
tokenPath: [yieldTokenEVMAddress, moetTokenEVMAddress],
196196
feePath: [3000],
197197
inVault: yieldTokenType,
198-
outVault: stableTokenType,
198+
outVault: moetTokenType,
199199
coaCapability: TidalYieldStrategies._getCOACapability(),
200200
uniqueID: uniqueID
201201
)

‎local/setup_testnet.sh‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ flow project deploy --network testnet --update
66

77
# set mocked prices in the MockOracle contract, initialized with MOET as unitOfAccount
88
flow transactions send ./cadence/transactions/mocks/oracle/set_price.cdc 'A.7e60df042a9c0868.FlowToken.Vault' 0.5 --network testnet --signer testnet-admin
9-
flow transactions send ./cadence/transactions/mocks/oracle/set_price.cdc 'A.2ab6f469ee0dfbb6.YieldToken.Vault' 1.0 --network testnet --signer testnet-admin
9+
#flow transactions send ./cadence/transactions/mocks/oracle/set_price.cdc 'A.d27920b6384e2a78.YieldToken.Vault' 1.0 --network testnet --signer testnet-admin
10+
flow transactions send ./cadence/transactions/mocks/oracle/set_price.cdc 'A.dfc20aee650fcbdf.EVMVMBridgedToken_4154d5b0e2931a0a1e5b733f19161aa7d2fc4b95.Vault' 1.0 --network testnet --signer testnet-admin
1011

1112
# configure TidalProtocol
1213
#
1314
# create Pool with MOET as default token
14-
flow transactions send ./cadence/transactions/tidal-protocol/pool-factory/create_and_store_pool.cdc 'A.2ab6f469ee0dfbb6.MOET.Vault' --network testnet --signer testnet-admin
15+
flow transactions send ./cadence/transactions/tidal-protocol/pool-factory/create_and_store_pool.cdc 'A.d27920b6384e2a78.MOET.Vault' --network testnet --signer testnet-admin
1516
# add FLOW as supported token - params: collateralFactor, borrowFactor, depositRate, depositCapacityCap
1617
flow transactions send ./cadence/transactions/tidal-protocol/pool-governance/add_supported_token_simple_interest_curve.cdc \
1718
'A.7e60df042a9c0868.FlowToken.Vault' \
@@ -26,13 +27,17 @@ flow transactions send ./cadence/transactions/tidal-protocol/pool-governance/add
2627
#
2728
# wire up liquidity to MockSwapper, mocking AMM liquidity sources
2829
flow transactions send ./cadence/transactions/mocks/swapper/set_liquidity_connector.cdc /storage/flowTokenVault --network testnet --signer testnet-admin
29-
flow transactions send ./cadence/transactions/mocks/swapper/set_liquidity_connector.cdc /storage/moetTokenVault_0x2ab6f469ee0dfbb6 --network testnet --signer testnet-admin
30-
flow transactions send ./cadence/transactions/mocks/swapper/set_liquidity_connector.cdc /storage/yieldTokenVault_0x2ab6f469ee0dfbb6 --network testnet --signer testnet-admin
30+
flow transactions send ./cadence/transactions/mocks/swapper/set_liquidity_connector.cdc /storage/moetTokenVault_0xd27920b6384e2a78 --network testnet --signer testnet-admin
31+
#flow transactions send ./cadence/transactions/mocks/swapper/set_liquidity_connector.cdc /storage/yieldTokenVault_0xd27920b6384e2a78 --network testnet --signer testnet-admin
32+
33+
flow transactions send ./lib/TidalProtocol/DeFiActions/cadence/transactions/fungible-tokens/setup_generic_vault.cdc 'A.dfc20aee650fcbdf.EVMVMBridgedToken_4154d5b0e2931a0a1e5b733f19161aa7d2fc4b95.Vault' --network testnet --signer testnet-admin
34+
flow transactions send ./cadence/transactions/mocks/swapper/set_liquidity_connector.cdc /storage/EVMVMBridgedToken_4154d5b0e2931a0a1e5b733f19161aa7d2fc4b95Vault --network testnet --signer testnet-admin
35+
3136
# add TracerStrategy as supported Strategy with the ability to initialize when new Tides are created
3237
flow transactions send ./cadence/transactions/tidal-yield/admin/add_strategy_composer.cdc \
33-
'A.2ab6f469ee0dfbb6.TidalYieldStrategies.TracerStrategy' \
34-
'A.2ab6f469ee0dfbb6.TidalYieldStrategies.TracerStrategyComposer' \
35-
/storage/TidalYieldStrategyComposerIssuer_0x2ab6f469ee0dfbb6 \
38+
'A.d27920b6384e2a78.TidalYieldStrategies.TracerStrategy' \
39+
'A.d27920b6384e2a78.TidalYieldStrategies.TracerStrategyComposer' \
40+
/storage/TidalYieldStrategyComposerIssuer_0xd27920b6384e2a78 \
3641
--network testnet \
3742
--signer testnet-admin
3843

0 commit comments

Comments
 (0)