Skip to content

Commit 67503c6

Browse files
nialexsannialexsan
committed
bridge fixes
1 parent f681258 commit 67503c6

6 files changed

Lines changed: 207 additions & 90 deletions

File tree

‎flow.json‎

Lines changed: 72 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"EVMTokenConnectors": {
2525
"source": "cadence/contracts/connectors/evm/EVMTokenConnectors.cdc",
2626
"aliases": {
27-
"emulator": "e03daebed8ca0615",
27+
"emulator": "f8d6e0586b0a20c7",
2828
"testing": "0000000000000009"
2929
}
3030
},
@@ -138,7 +138,7 @@
138138
"source": "mainnet://1e4aa0b87d10b141.ArrayUtils",
139139
"hash": "e70ddc2f0c7c72158a3f6c68de3a131e1f49e2908ad83eac0308f9e2953957d5",
140140
"aliases": {
141-
"emulator": "e03daebed8ca0615",
141+
"emulator": "f8d6e0586b0a20c7",
142142
"mainnet": "1e4aa0b87d10b141"
143143
}
144144
},
@@ -155,23 +155,24 @@
155155
"source": "mainnet://1d7e57aa55817448.CrossVMMetadataViews",
156156
"hash": "dded0271279d3ca75f30b56f7552994d8b8bc4f75ef94a4a8d9d6b089e06c25c",
157157
"aliases": {
158-
"emulator": "e03daebed8ca0615",
159-
"mainnet": "1d7e57aa55817448"
158+
"emulator": "f8d6e0586b0a20c7",
159+
"mainnet": "1d7e57aa55817448",
160+
"testnet": "631e88ae7f1d7c20"
160161
}
161162
},
162163
"CrossVMNFT": {
163164
"source": "mainnet://1e4aa0b87d10b141.CrossVMNFT",
164165
"hash": "a9e2ba34ecffda196c58f5c1439bc257d48d0c81457597eb58eb5f879dd95e5a",
165166
"aliases": {
166-
"emulator": "e03daebed8ca0615",
167+
"emulator": "f8d6e0586b0a20c7",
167168
"mainnet": "1e4aa0b87d10b141"
168169
}
169170
},
170171
"CrossVMToken": {
171172
"source": "mainnet://1e4aa0b87d10b141.CrossVMToken",
172173
"hash": "6d5c16804247ab9f1234b06383fa1bed42845211dba22582748abd434296650c",
173174
"aliases": {
174-
"emulator": "e03daebed8ca0615",
175+
"emulator": "f8d6e0586b0a20c7",
175176
"mainnet": "1e4aa0b87d10b141",
176177
"testing": "0000000000000007",
177178
"testnet": "dfc20aee650fcbdf"
@@ -190,7 +191,7 @@
190191
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridge",
191192
"hash": "01ca127d0c7668b4d71fddd99a0ff527b7a95bc4d42074ba6a7cf63e62ba9841",
192193
"aliases": {
193-
"emulator": "e03daebed8ca0615",
194+
"emulator": "f8d6e0586b0a20c7",
194195
"mainnet": "1e4aa0b87d10b141",
195196
"testing": "0000000000000007",
196197
"testnet": "dfc20aee650fcbdf"
@@ -200,7 +201,7 @@
200201
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeAccessor",
201202
"hash": "3976b314476838a624786be25c8ecd7af37b6aae2654e9db225c3c964100ce3f",
202203
"aliases": {
203-
"emulator": "e03daebed8ca0615",
204+
"emulator": "f8d6e0586b0a20c7",
204205
"mainnet": "1e4aa0b87d10b141",
205206
"testing": "0000000000000007",
206207
"testnet": "dfc20aee650fcbdf"
@@ -210,31 +211,31 @@
210211
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeConfig",
211212
"hash": "8cfbe61228b181a654ea45a26e79334f5907199801b94c4e639a67e2068160db",
212213
"aliases": {
213-
"emulator": "e03daebed8ca0615",
214+
"emulator": "f8d6e0586b0a20c7",
214215
"mainnet": "1e4aa0b87d10b141"
215216
}
216217
},
217218
"FlowEVMBridgeCustomAssociationTypes": {
218219
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeCustomAssociationTypes",
219220
"hash": "12bf631191d7d2c2621f002e616cfeb8319c58e753ecccd08f516315149e2066",
220221
"aliases": {
221-
"emulator": "e03daebed8ca0615",
222+
"emulator": "f8d6e0586b0a20c7",
222223
"mainnet": "1e4aa0b87d10b141"
223224
}
224225
},
225226
"FlowEVMBridgeCustomAssociations": {
226227
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeCustomAssociations",
227228
"hash": "984e237c8ea3a97a987b9b502e542b4f22fa55feb74ecc6aaee245a50b287fc4",
228229
"aliases": {
229-
"emulator": "e03daebed8ca0615",
230+
"emulator": "f8d6e0586b0a20c7",
230231
"mainnet": "1e4aa0b87d10b141"
231232
}
232233
},
233234
"FlowEVMBridgeHandlerInterfaces": {
234235
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeHandlerInterfaces",
235236
"hash": "7e0e28eb8fb30595249384cb8c7a44eae3884700d0a6c3139240c0d19e4dc173",
236237
"aliases": {
237-
"emulator": "e03daebed8ca0615",
238+
"emulator": "f8d6e0586b0a20c7",
238239
"mainnet": "1e4aa0b87d10b141",
239240
"testing": "0000000000000007",
240241
"testnet": "dfc20aee650fcbdf"
@@ -244,7 +245,7 @@
244245
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeHandlers",
245246
"hash": "ffd564ff27cbaaa304257bbce02f6015f6c4c4aa5a3dad8b2276977d8ff0c352",
246247
"aliases": {
247-
"emulator": "e03daebed8ca0615",
248+
"emulator": "f8d6e0586b0a20c7",
248249
"mainnet": "1e4aa0b87d10b141",
249250
"testing": "0000000000000007",
250251
"testnet": "dfc20aee650fcbdf"
@@ -254,15 +255,15 @@
254255
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeNFTEscrow",
255256
"hash": "2881ec6db6dde705b2919185230890aba85b4e0cca4537721181588fba7ae4ad",
256257
"aliases": {
257-
"emulator": "e03daebed8ca0615",
258+
"emulator": "f8d6e0586b0a20c7",
258259
"mainnet": "1e4aa0b87d10b141"
259260
}
260261
},
261262
"FlowEVMBridgeResolver": {
262263
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeResolver",
263264
"hash": "4f771894f560063ee59d8ae481c8dd7bc942ac8b51926924a5320fec569d666a",
264265
"aliases": {
265-
"emulator": "e03daebed8ca0615",
266+
"emulator": "f8d6e0586b0a20c7",
266267
"mainnet": "1e4aa0b87d10b141",
267268
"testing": "0000000000000007",
268269
"testnet": "dfc20aee650fcbdf"
@@ -272,7 +273,7 @@
272273
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeTemplates",
273274
"hash": "8f27b22450f57522d93d3045038ac9b1935476f4216f57fe3bb82929c71d7aa6",
274275
"aliases": {
275-
"emulator": "e03daebed8ca0615",
276+
"emulator": "f8d6e0586b0a20c7",
276277
"mainnet": "1e4aa0b87d10b141",
277278
"testing": "0000000000000007",
278279
"testnet": "dfc20aee650fcbdf"
@@ -282,7 +283,7 @@
282283
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeTokenEscrow",
283284
"hash": "b5ec7c0a16e1c49004b2ed072c5eadc8c382e43351982b4a3050422f116b8f46",
284285
"aliases": {
285-
"emulator": "e03daebed8ca0615",
286+
"emulator": "f8d6e0586b0a20c7",
286287
"mainnet": "1e4aa0b87d10b141",
287288
"testing": "0000000000000007",
288289
"testnet": "dfc20aee650fcbdf"
@@ -292,7 +293,7 @@
292293
"source": "mainnet://1e4aa0b87d10b141.FlowEVMBridgeUtils",
293294
"hash": "8582adc5ae360ab746dab61b0b4d00974ff05483679e838475d4577827e6fb01",
294295
"aliases": {
295-
"emulator": "e03daebed8ca0615",
296+
"emulator": "f8d6e0586b0a20c7",
296297
"mainnet": "1e4aa0b87d10b141"
297298
}
298299
},
@@ -336,39 +337,39 @@
336337
"source": "mainnet://1e4aa0b87d10b141.IBridgePermissions",
337338
"hash": "431a51a6cca87773596f79832520b19499fe614297eaef347e49383f2ae809af",
338339
"aliases": {
339-
"emulator": "e03daebed8ca0615",
340+
"emulator": "f8d6e0586b0a20c7",
340341
"mainnet": "1e4aa0b87d10b141"
341342
}
342343
},
343344
"ICrossVM": {
344345
"source": "mainnet://1e4aa0b87d10b141.ICrossVM",
345346
"hash": "e14dcb25f974e216fd83afdc0d0f576ae7014988755a4777b06562ffb06537bc",
346347
"aliases": {
347-
"emulator": "e03daebed8ca0615",
348+
"emulator": "f8d6e0586b0a20c7",
348349
"mainnet": "1e4aa0b87d10b141"
349350
}
350351
},
351352
"ICrossVMAsset": {
352353
"source": "mainnet://1e4aa0b87d10b141.ICrossVMAsset",
353354
"hash": "aa1fbd979c9d7806ea8ea66311e2a4257c5a4051eef020524a0bda4d8048ed57",
354355
"aliases": {
355-
"emulator": "e03daebed8ca0615",
356+
"emulator": "f8d6e0586b0a20c7",
356357
"mainnet": "1e4aa0b87d10b141"
357358
}
358359
},
359360
"IEVMBridgeNFTMinter": {
360361
"source": "mainnet://1e4aa0b87d10b141.IEVMBridgeNFTMinter",
361362
"hash": "65ec734429c12b70cd97ad8ea2c2bc4986fab286744921ed139d9b45da92e77e",
362363
"aliases": {
363-
"emulator": "e03daebed8ca0615",
364+
"emulator": "f8d6e0586b0a20c7",
364365
"mainnet": "1e4aa0b87d10b141"
365366
}
366367
},
367368
"IEVMBridgeTokenMinter": {
368369
"source": "mainnet://1e4aa0b87d10b141.IEVMBridgeTokenMinter",
369370
"hash": "223adb675415984e9c163d15c5922b5c77dc5036bf6548d0b87afa27f4f0a9d9",
370371
"aliases": {
371-
"emulator": "e03daebed8ca0615",
372+
"emulator": "f8d6e0586b0a20c7",
372373
"mainnet": "1e4aa0b87d10b141",
373374
"testing": "0000000000000007",
374375
"testnet": "dfc20aee650fcbdf"
@@ -378,15 +379,15 @@
378379
"source": "mainnet://1e4aa0b87d10b141.IFlowEVMNFTBridge",
379380
"hash": "c6f5962bde2060b4490bd62c7a05e048536aab17e430cf6aa4e5b893b06f8302",
380381
"aliases": {
381-
"emulator": "e03daebed8ca0615",
382+
"emulator": "f8d6e0586b0a20c7",
382383
"mainnet": "1e4aa0b87d10b141"
383384
}
384385
},
385386
"IFlowEVMTokenBridge": {
386387
"source": "mainnet://1e4aa0b87d10b141.IFlowEVMTokenBridge",
387388
"hash": "573a038b1e9c26504f6aa32a091e88168591b7f93feeff9ac0343285488a8eb3",
388389
"aliases": {
389-
"emulator": "e03daebed8ca0615",
390+
"emulator": "f8d6e0586b0a20c7",
390391
"mainnet": "1e4aa0b87d10b141",
391392
"testing": "0000000000000007",
392393
"testnet": "dfc20aee650fcbdf"
@@ -414,7 +415,7 @@
414415
"source": "mainnet://1e4aa0b87d10b141.ScopedFTProviders",
415416
"hash": "d4709f4a5ff1a7c2422c4fc63d26d3d8444ef7c5ae222cd710b8912d02ca7cca",
416417
"aliases": {
417-
"emulator": "e03daebed8ca0615",
418+
"emulator": "f8d6e0586b0a20c7",
418419
"mainnet": "1e4aa0b87d10b141",
419420
"testing": "0000000000000007",
420421
"testnet": "dfc20aee650fcbdf"
@@ -424,15 +425,15 @@
424425
"source": "mainnet://1e4aa0b87d10b141.Serialize",
425426
"hash": "50bf2599bac68e3fb0e426a262e7db2eed91b90c0a5ad57e70688cbf93282b4f",
426427
"aliases": {
427-
"emulator": "e03daebed8ca0615",
428+
"emulator": "f8d6e0586b0a20c7",
428429
"mainnet": "1e4aa0b87d10b141"
429430
}
430431
},
431432
"SerializeMetadata": {
432433
"source": "mainnet://1e4aa0b87d10b141.SerializeMetadata",
433434
"hash": "7be42ac4e42fd3019ab6771f205abeb80ded5a461649a010b1a0668533909012",
434435
"aliases": {
435-
"emulator": "e03daebed8ca0615",
436+
"emulator": "f8d6e0586b0a20c7",
436437
"mainnet": "1e4aa0b87d10b141"
437438
}
438439
},
@@ -448,7 +449,7 @@
448449
"source": "mainnet://1e4aa0b87d10b141.StringUtils",
449450
"hash": "a2a029e106525b53f1a2bbb25aedd161bf79dce66f76bae1a2d75a63522b6460",
450451
"aliases": {
451-
"emulator": "e03daebed8ca0615",
452+
"emulator": "f8d6e0586b0a20c7",
452453
"mainnet": "1e4aa0b87d10b141"
453454
}
454455
},
@@ -541,47 +542,6 @@
541542
"deployments": {
542543
"emulator": {
543544
"emulator-account": [
544-
"DeFiActionsMathUtils",
545-
"DeFiActionsUtils",
546-
"DeFiActions",
547-
"FlowStorageFees",
548-
"FungibleTokenConnectors",
549-
"SwapConnectors",
550-
{
551-
"name": "MOET",
552-
"args": [
553-
{
554-
"value": "1000000.00000000",
555-
"type": "UFix64"
556-
}
557-
]
558-
},
559-
"TidalProtocol",
560-
{
561-
"name": "YieldToken",
562-
"args": [
563-
{
564-
"value": "1000000.00000000",
565-
"type": "UFix64"
566-
}
567-
]
568-
},
569-
{
570-
"name": "MockOracle",
571-
"args": [
572-
{
573-
"value": "A.f8d6e0586b0a20c7.MOET.Vault",
574-
"type": "String"
575-
}
576-
]
577-
},
578-
"MockSwapper",
579-
"TidalYieldAutoBalancers",
580-
"TidalYieldClosedBeta",
581-
"TidalYield",
582-
"TidalYieldStrategies"
583-
],
584-
"evm-gateway": [
585545
{
586546
"name": "FlowEVMBridgeUtils",
587547
"args": [
@@ -599,7 +559,6 @@
599559
"ICrossVMAsset",
600560
"ICrossVM",
601561
"IBridgePermissions",
602-
"FlowEVMBridge",
603562
"IEVMBridgeNFTMinter",
604563
"IEVMBridgeTokenMinter",
605564
"IFlowEVMNFTBridge",
@@ -612,7 +571,7 @@
612571
"name": "FlowEVMBridgeAccessor",
613572
"args": [
614573
{
615-
"value": "0xe03daebed8ca0615",
574+
"value": "0xf8d6e0586b0a20c7",
616575
"type": "Address"
617576
}
618577
]
@@ -624,7 +583,47 @@
624583
"ScopedFTProviders",
625584
"FlowEVMBridgeResolver",
626585
"FlowEVMBridgeCustomAssociations",
627-
"FlowEVMBridgeCustomAssociationTypes"
586+
"FlowEVMBridgeCustomAssociationTypes",
587+
"FlowEVMBridge",
588+
"DeFiActionsMathUtils",
589+
"DeFiActionsUtils",
590+
"DeFiActions",
591+
"FlowStorageFees",
592+
"FungibleTokenConnectors",
593+
"SwapConnectors",
594+
{
595+
"name": "MOET",
596+
"args": [
597+
{
598+
"value": "1000000.00000000",
599+
"type": "UFix64"
600+
}
601+
]
602+
},
603+
"TidalProtocol",
604+
{
605+
"name": "YieldToken",
606+
"args": [
607+
{
608+
"value": "1000000.00000000",
609+
"type": "UFix64"
610+
}
611+
]
612+
},
613+
{
614+
"name": "MockOracle",
615+
"args": [
616+
{
617+
"value": "A.f8d6e0586b0a20c7.MOET.Vault",
618+
"type": "String"
619+
}
620+
]
621+
},
622+
"MockSwapper",
623+
"TidalYieldAutoBalancers",
624+
"TidalYieldClosedBeta",
625+
"TidalYield",
626+
"TidalYieldStrategies"
628627
],
629628
"mock-incrementfi": [
630629
"SwapConfig",

‎local/punchswap/e2e_punchswap.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ set +a
77
forge script ./solidity/script/02_DeployUSDC_WBTC_Create2.s.sol:DeployUSDC_WBTC_Create2 \
88
--rpc-url $RPC_URL --broadcast -vvvv --slow
99

10-
# forge script ./solidity/script/E2E_Pool_LP_Swap.s.sol:E2E_Pool_LP_Swap_OneTx \
11-
# --rpc-url http://127.0.0.1:8545 \
12-
# --broadcast -vvvv --slow --via-ir
13-
#
14-
#
15-
1610
forge script ./solidity/script/03_UseMintedUSDCWBTC_AddLPAndSwap.s.sol:UseMintedUSDCWBTC \
1711
--rpc-url http://127.0.0.1:8545 \
1812
--broadcast -vvvv --slow --via-ir

‎local/punchswap/punchswap.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ TOKENS_OWNER=0xC31A5268a1d311d992D637E8cE925bfdcCEB4310
3030
USDC_MINT=1000000000000
3131
WBTC_MINT=100000000000000
3232

33-
USDC_ADDR=0x19b8169f4dd93a7360a5fc4d4ded1bc2a660d5b7
34-
WBTC_ADDR=0x30c6cdd83cf20d62052dd78c798006a22cdb1141
33+
USDC_ADDR=0x4a2db8f5b3ad87450f32891e5dbaf774e321f824
34+
WBTC_ADDR=0xdb15524400eb5689534c4522ce9f6057b79c57dd
3535

3636
# how much to fund the helper (base units)
3737
# USDC_FUND=600000000 # 600k * 1e6

‎local/run_emulator.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
flow emulator &
1+
flow emulator --setup-vm-bridge=false &
22

33
# Port to check
44
PORT=8080

0 commit comments

Comments
 (0)