Skip to content

Commit 939a521

Browse files
nialexsannialexsan
authored
Merge pull request #57 from onflow/nialexsan/testnet-kms
testnet kms
2 parents 2509366 + 54bb861 commit 939a521

2 files changed

Lines changed: 139 additions & 22 deletions

File tree

‎flow.json‎

Lines changed: 93 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,136 @@
44
"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/interfaces/DeFiActions.cdc",
55
"aliases": {
66
"emulator": "f8d6e0586b0a20c7",
7-
"testing": "0000000000000007"
7+
"testing": "0000000000000007",
8+
"testnet": "2ab6f469ee0dfbb6"
89
}
910
},
1011
"DeFiActionsMathUtils": {
1112
"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/utils/DeFiActionsMathUtils.cdc",
1213
"aliases": {
1314
"emulator": "f8d6e0586b0a20c7",
14-
"testing": "0000000000000007"
15+
"testing": "0000000000000007",
16+
"testnet": "2ab6f469ee0dfbb6"
1517
}
1618
},
1719
"DeFiActionsUtils": {
1820
"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/utils/DeFiActionsUtils.cdc",
1921
"aliases": {
2022
"emulator": "f8d6e0586b0a20c7",
21-
"testing": "0000000000000007"
23+
"testing": "0000000000000007",
24+
"testnet": "2ab6f469ee0dfbb6"
25+
}
26+
},
27+
"DummyConnectors": {
28+
"source": "./lib/TidalProtocol/cadence/contracts/mocks/DummyConnectors.cdc",
29+
"aliases": {
30+
"emulator": "f8d6e0586b0a20c7",
31+
"testing": "0000000000000008",
32+
"testnet": "2ab6f469ee0dfbb6"
2233
}
2334
},
2435
"FungibleTokenConnectors": {
2536
"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/connectors/FungibleTokenConnectors.cdc",
2637
"aliases": {
2738
"emulator": "f8d6e0586b0a20c7",
28-
"testing": "0000000000000007"
39+
"testing": "0000000000000007",
40+
"testnet": "2ab6f469ee0dfbb6"
2941
}
3042
},
3143
"MOET": {
3244
"source": "./lib/TidalProtocol/cadence/contracts/MOET.cdc",
3345
"aliases": {
3446
"emulator": "f8d6e0586b0a20c7",
35-
"testing": "0000000000000008"
47+
"testing": "0000000000000008",
48+
"testnet": "2ab6f469ee0dfbb6"
3649
}
3750
},
3851
"MockOracle": {
3952
"source": "cadence/contracts/mocks/MockOracle.cdc",
4053
"aliases": {
4154
"emulator": "f8d6e0586b0a20c7",
42-
"testing": "0000000000000009"
55+
"testing": "0000000000000009",
56+
"testnet": "2ab6f469ee0dfbb6"
4357
}
4458
},
4559
"MockStrategy": {
4660
"source": "cadence/contracts/mocks/MockStrategy.cdc",
4761
"aliases": {
4862
"emulator": "f8d6e0586b0a20c7",
49-
"testing": "0000000000000009"
63+
"testing": "0000000000000009",
64+
"testnet": "2ab6f469ee0dfbb6"
5065
}
5166
},
5267
"MockSwapper": {
5368
"source": "cadence/contracts/mocks/MockSwapper.cdc",
5469
"aliases": {
5570
"emulator": "f8d6e0586b0a20c7",
56-
"testing": "0000000000000009"
71+
"testing": "0000000000000009",
72+
"testnet": "2ab6f469ee0dfbb6"
5773
}
5874
},
5975
"MockTidalProtocolConsumer": {
6076
"source": "./lib/TidalProtocol/cadence/contracts/mocks/MockTidalProtocolConsumer.cdc",
6177
"aliases": {
6278
"emulator": "f8d6e0586b0a20c7",
63-
"testing": "0000000000000008"
79+
"testing": "0000000000000008",
80+
"testnet": "2ab6f469ee0dfbb6"
6481
}
6582
},
6683
"SwapConnectors": {
6784
"source": "./lib/TidalProtocol/DeFiActions/cadence/contracts/connectors/SwapConnectors.cdc",
6885
"aliases": {
6986
"emulator": "f8d6e0586b0a20c7",
70-
"testing": "0000000000000007"
71-
}
72-
},
73-
"TestHelpers": {
74-
"source": "./lib/TidalProtocol/cadence/contracts/mocks/TestHelpers.cdc",
75-
"aliases": {
76-
"testing": "0000000000000008"
87+
"testing": "0000000000000007",
88+
"testnet": "2ab6f469ee0dfbb6"
7789
}
7890
},
7991
"TidalProtocol": {
8092
"source": "./lib/TidalProtocol/cadence/contracts/TidalProtocol.cdc",
8193
"aliases": {
8294
"emulator": "f8d6e0586b0a20c7",
83-
"testing": "0000000000000008"
95+
"testing": "0000000000000008",
96+
"testnet": "2ab6f469ee0dfbb6"
8497
}
8598
},
8699
"TidalYield": {
87100
"source": "cadence/contracts/TidalYield.cdc",
88101
"aliases": {
89102
"emulator": "f8d6e0586b0a20c7",
90-
"testing": "0000000000000009"
103+
"testing": "0000000000000009",
104+
"testnet": "2ab6f469ee0dfbb6"
91105
}
92106
},
93107
"TidalYieldAutoBalancers": {
94108
"source": "cadence/contracts/TidalYieldAutoBalancers.cdc",
95109
"aliases": {
96110
"emulator": "f8d6e0586b0a20c7",
97-
"testing": "0000000000000009"
111+
"testing": "0000000000000009",
112+
"testnet": "2ab6f469ee0dfbb6"
98113
}
99114
},
100115
"TidalYieldClosedBeta": {
101116
"source": "cadence/contracts/TidalYieldClosedBeta.cdc",
102117
"aliases": {
103118
"emulator": "f8d6e0586b0a20c7",
104-
"testing": "0000000000000009"
119+
"testing": "0000000000000009",
120+
"testnet": "2ab6f469ee0dfbb6"
105121
}
106122
},
107123
"TidalYieldStrategies": {
108124
"source": "cadence/contracts/TidalYieldStrategies.cdc",
109125
"aliases": {
110126
"emulator": "f8d6e0586b0a20c7",
111-
"testing": "0000000000000009"
127+
"testing": "0000000000000009",
128+
"testnet": "2ab6f469ee0dfbb6"
112129
}
113130
},
114131
"YieldToken": {
115132
"source": "cadence/contracts/mocks/YieldToken.cdc",
116133
"aliases": {
117134
"emulator": "f8d6e0586b0a20c7",
118-
"testing": "0000000000000010"
135+
"testing": "0000000000000010",
136+
"testnet": "2ab6f469ee0dfbb6"
119137
}
120138
}
121139
},
@@ -284,6 +302,14 @@
284302
"type": "file",
285303
"location": "local/test-user.pkey"
286304
}
305+
},
306+
"testnet-admin": {
307+
"address": "2ab6f469ee0dfbb6",
308+
"key": {
309+
"type": "google-kms",
310+
"hashAlgorithm": "SHA2_256",
311+
"resourceID": "projects/dl-flow-devex-staging/locations/us-central1/keyRings/tidal-keyring/cryptoKeys/tidal_admin_pk/cryptoKeyVersions/1"
312+
}
287313
}
288314
},
289315
"deployments": {
@@ -304,6 +330,7 @@
304330
}
305331
]
306332
},
333+
"DummyConnectors",
307334
"TidalProtocol",
308335
{
309336
"name": "YieldToken",
@@ -345,6 +372,50 @@
345372
"StableSwapFactory",
346373
"SwapRouter"
347374
]
375+
},
376+
"testnet": {
377+
"testnet-admin": [
378+
"DeFiActionsMathUtils",
379+
"DeFiActionsUtils",
380+
"DeFiActions",
381+
"FlowStorageFees",
382+
"FungibleTokenConnectors",
383+
"SwapConnectors",
384+
{
385+
"name": "MOET",
386+
"args": [
387+
{
388+
"value": "1000000.00000000",
389+
"type": "UFix64"
390+
}
391+
]
392+
},
393+
"DummyConnectors",
394+
"TidalProtocol",
395+
{
396+
"name": "YieldToken",
397+
"args": [
398+
{
399+
"value": "1000000.00000000",
400+
"type": "UFix64"
401+
}
402+
]
403+
},
404+
{
405+
"name": "MockOracle",
406+
"args": [
407+
{
408+
"value": "A.2ab6f469ee0dfbb6.MOET.Vault",
409+
"type": "String"
410+
}
411+
]
412+
},
413+
"MockSwapper",
414+
"TidalYieldAutoBalancers",
415+
"TidalYieldClosedBeta",
416+
"TidalYield",
417+
"TidalYieldStrategies"
418+
]
348419
}
349420
}
350421
}

‎local/setup_testnet.sh‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# install DeFiBlocks submodule as dependency
2+
git submodule update --init --recursive
3+
# execute emulator deployment
4+
flow deps install --skip-alias --skip-deployments
5+
flow project deploy --network testnet --update
6+
7+
# set mocked prices in the MockOracle contract, initialized with MOET as unitOfAccount
8+
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
10+
11+
# configure TidalProtocol
12+
#
13+
# 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+
# add FLOW as supported token - params: collateralFactor, borrowFactor, depositRate, depositCapacityCap
16+
flow transactions send ./cadence/transactions/tidal-protocol/pool-governance/add_supported_token_simple_interest_curve.cdc \
17+
'A.7e60df042a9c0868.FlowToken.Vault' \
18+
0.8 \
19+
1.0 \
20+
1_000_000.0 \
21+
1_000_000.0 \
22+
--network testnet \
23+
--signer testnet-admin
24+
25+
# configure TidalYield
26+
#
27+
# wire up liquidity to MockSwapper, mocking AMM liquidity sources
28+
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
31+
# add TracerStrategy as supported Strategy with the ability to initialize when new Tides are created
32+
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 \
36+
--network testnet \
37+
--signer testnet-admin
38+
39+
# grant PoolBeta cap
40+
echo "Grant Protocol Beta access to TidalYield"
41+
flow transactions send ./lib/TidalProtocol/cadence/tests/transactions/tidal-protocol/pool-management/03_grant_beta.cdc \
42+
--authorizer testnet-admin,testnet-admin \
43+
--proposer testnet-admin \
44+
--payer testnet-admin \
45+
--network testnet
46+

0 commit comments

Comments
 (0)