Skip to content

Commit c457b84

Browse files
nialexsannialexsan
committed
align changes
1 parent f3e5383 commit c457b84

15 files changed

Lines changed: 48 additions & 34 deletions

cadence/contracts/mocks/SwapPair.cdc renamed to cadence/contracts/mocks/incrementfi/SwapPair.cdc

File renamed without changes.

cadence/contracts/mocks/SwapPairTemplate.cdc renamed to cadence/contracts/mocks/incrementfi/SwapPairTemplate.cdc

File renamed without changes.

‎cadence/transactions/mocks/incrementfi/create_pair.cdc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import "SwapFactory"
2+
import TokenA from 0xTokenA
3+
import TokenB from 0xTokenB
4+
5+
transaction {
6+
prepare(acct: AuthAccount) {
7+
let factory = acct.borrow<&SwapFactory>(from: /storage/factoryPath)!
8+
factory.createPair(tokenA: TokenA.address, tokenB: TokenB.address)
9+
}
10+
}

cadence/transactions/mocks/amm/setup.cdc renamed to cadence/transactions/mocks/incrementfi/setup.cdc

File renamed without changes.

cadence/transactions/mocks/amm/transfer_amm_tokens.cdc renamed to cadence/transactions/mocks/incrementfi/transfer_amm_tokens.cdc

File renamed without changes.

‎flow.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -181,55 +181,55 @@
181181
"source": "mainnet://b063c16cac85dbd1.StableSwapFactory",
182182
"hash": "46318aee6fd29616c8048c23210d4c4f5b172eb99a0ca911fbd849c831a52a0b",
183183
"aliases": {
184-
"emulator": "f3fcd2c1a78f5eee",
184+
"emulator": "f3fcd2c1a78f5eee",
185185
"mainnet": "b063c16cac85dbd1"
186186
}
187187
},
188188
"SwapConfig": {
189189
"source": "mainnet://b78ef7afa52ff906.SwapConfig",
190190
"hash": "ccafdb89804887e4e39a9b8fdff5c0ff0d0743505282f2a8ecf86c964e691c82",
191191
"aliases": {
192-
"emulator": "f3fcd2c1a78f5eee",
192+
"emulator": "f3fcd2c1a78f5eee",
193193
"mainnet": "b78ef7afa52ff906"
194194
}
195195
},
196196
"SwapError": {
197197
"source": "mainnet://b78ef7afa52ff906.SwapError",
198198
"hash": "7d13a652a1308af387513e35c08b4f9a7389a927bddf08431687a846e4c67f21",
199199
"aliases": {
200-
"emulator": "f3fcd2c1a78f5eee",
200+
"emulator": "f3fcd2c1a78f5eee",
201201
"mainnet": "b78ef7afa52ff906"
202202
}
203203
},
204204
"SwapFactory": {
205205
"source": "mainnet://b063c16cac85dbd1.SwapFactory",
206206
"hash": "1142e0102c8597e405e24ed2c6e5579b0faeca41f656818db10f3142a83493d2",
207207
"aliases": {
208-
"emulator": "f3fcd2c1a78f5eee",
208+
"emulator": "f3fcd2c1a78f5eee",
209209
"mainnet": "b063c16cac85dbd1"
210210
}
211211
},
212212
"SwapInterfaces": {
213213
"source": "mainnet://b78ef7afa52ff906.SwapInterfaces",
214214
"hash": "570bb4b9c8da8e0caa8f428494db80779fb906a66cc1904c39a2b9f78b89c6fa",
215215
"aliases": {
216-
"emulator": "f3fcd2c1a78f5eee",
216+
"emulator": "f3fcd2c1a78f5eee",
217217
"mainnet": "b78ef7afa52ff906"
218218
}
219219
},
220220
"SwapPair": {
221221
"source": "mainnet://368caca05ddcb898.SwapPair",
222222
"hash": "69b99c4a8abc123a0a88b1c354f9da414a32e2f73194403e67e89d51713923c0",
223223
"aliases": {
224-
"emulator": "f3fcd2c1a78f5eee",
224+
"emulator": "f3fcd2c1a78f5eee",
225225
"mainnet": "368caca05ddcb898"
226226
}
227227
},
228228
"SwapRouter": {
229229
"source": "mainnet://a6850776a94e6551.SwapRouter",
230230
"hash": "2ae9ecd237b7ea36b4fcc87f415d181b437543722a64f18094e026252607932c",
231231
"aliases": {
232-
"emulator": "f3fcd2c1a78f5eee",
232+
"emulator": "f3fcd2c1a78f5eee",
233233
"mainnet": "a6850776a94e6551"
234234
}
235235
},
@@ -250,43 +250,43 @@
250250
"testnet": "access.devnet.nodes.onflow.org:9000"
251251
},
252252
"accounts": {
253-
"amm": {
254-
"address": "f3fcd2c1a78f5eee",
253+
"emulator-account": {
254+
"address": "f8d6e0586b0a20c7",
255255
"key": {
256256
"type": "file",
257-
"location": "amm.pkey"
257+
"location": "local/emulator-account.pkey"
258258
}
259259
},
260-
"emulator-account": {
261-
"address": "f8d6e0586b0a20c7",
260+
"mock-incrementfi": {
261+
"address": "f3fcd2c1a78f5eee",
262262
"key": {
263263
"type": "file",
264-
"location": "emulator-account.pkey"
264+
"location": "local/mock-incrementfi.pkey"
265265
}
266266
},
267267
"test-user": {
268268
"address": "179b6b1cb6755e31",
269269
"key": {
270270
"type": "file",
271-
"location": "test-user.pkey"
271+
"location": "local/test-user.pkey"
272272
}
273273
}
274274
},
275275
"deployments": {
276276
"emulator": {
277-
"amm": [
277+
"mock-incrementfi": [
278278
"SwapConfig",
279279
"SwapInterfaces",
280280
"SwapError",
281-
{
282-
"name": "SwapFactory",
283-
"args": [
284-
{
285-
"value": "0xf3fcd2c1a78f5eee",
286-
"type": "Address"
287-
}
288-
]
289-
},
281+
{
282+
"name": "SwapFactory",
283+
"args": [
284+
{
285+
"value": "0xf3fcd2c1a78f5eee",
286+
"type": "Address"
287+
}
288+
]
289+
},
290290
"StableSwapFactory",
291291
"SwapRouter"
292292
],

‎local/emulator-account.pkey‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0xb1a77d1b931e602dda3d70e6dcddbd8692b55940cc33a46c4e264b1d7415dd4f

local/amm.sh renamed to local/incrementfi/amm.sh

File renamed without changes.

generate-swap-pair-tx.sh renamed to local/incrementfi/generate-swap-pair-tx.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

3-
TEMPLATE="./cadence/contracts/mocks/SwapPairTemplate.cdc"
4-
OUTPUT="./cadence/contracts/mocks/SwapPair.cdc"
3+
TEMPLATE="./cadence/contracts/mocks/incrementfi/SwapPairTemplate.cdc"
4+
OUTPUT="./cadence/contracts/mocks/incrementfi/SwapPair.cdc"
55

6-
TX="./cadence/transactions/mocks/amm/setup.cdc"
6+
TX="./cadence/transactions/mocks/incrementfi/setup.cdc"
77

88
jq -r '
99
(.contracts, .dependencies)

‎local/mock-incrementfi.pkey‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cf0aa6392b0dce885fc087294dc73b8c3dd65f0a3edfc288d379ebe3b2fa4a10

0 commit comments

Comments
 (0)