Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cadence/tests/MorphoERC4626SwapConnectors_test.cdc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#test_fork(network: "mainnet-fork", height: 140503870)
#test_fork(network: "mainnet-fork", height: 142104481)

import Test

Expand Down Expand Up @@ -91,7 +91,7 @@ access(all) fun testSwap() {
"./transactions/morpho/swap_back.cdc",
[
morphoERC4626VaultEVMAddressHex,
0.99920692 // @TODO investigage losses
0.99 // @TODO investigage losses
],
testAccount
)
Expand Down
113 changes: 89 additions & 24 deletions flow.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,86 +3,109 @@
"BandOracleConnectors": {
"source": "cadence/contracts/connectors/band-oracle/BandOracleConnectors.cdc",
"aliases": {
"testing": "0000000000000007"
"mainnet": "e36ef556b8b5d955",
"mainnet-fork": "e36ef556b8b5d955",
"testing": "0000000000000007",
"testnet": "bb76ea2f8aad74a0"
}
},
"DeFiActions": {
"source": "cadence/contracts/interfaces/DeFiActions.cdc",
"aliases": {
"mainnet": "6d888f175c158410",
"mainnet-fork": "6d888f175c158410",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "0b11b1848a8aa2c0"
}
},
"DeFiActionsUtils": {
"source": "cadence/contracts/utils/DeFiActionsUtils.cdc",
"aliases": {
"mainnet": "6d888f175c158410",
"mainnet-fork": "6d888f175c158410",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "0b11b1848a8aa2c0"
}
},
"ERC4626PriceOracles": {
"source": "./cadence/contracts/connectors/evm/ERC4626PriceOracles.cdc",
"aliases": {
"testing": "0000000000000009"
"mainnet": "04f5ae6bef48c1fc",
"mainnet-fork": "04f5ae6bef48c1fc",
"testing": "0000000000000009",
"testnet": "7014dcffa1f14186"
}
},
"ERC4626SinkConnectors": {
"source": "./cadence/contracts/connectors/evm/ERC4626SinkConnectors.cdc",
"aliases": {
"testing": "0000000000000009"
"mainnet": "04f5ae6bef48c1fc",
"mainnet-fork": "04f5ae6bef48c1fc",
"testing": "0000000000000009",
"testnet": "7014dcffa1f14186"
}
},
"ERC4626SwapConnectors": {
"source": "./cadence/contracts/connectors/evm/ERC4626SwapConnectors.cdc",
"aliases": {
"testing": "0000000000000009"
"mainnet": "04f5ae6bef48c1fc",
"mainnet-fork": "04f5ae6bef48c1fc",
"testing": "0000000000000009",
"testnet": "7014dcffa1f14186"
}
},
"ERC4626Utils": {
"source": "./cadence/contracts/utils/ERC4626Utils.cdc",
"aliases": {
"mainnet": "04f5ae6bef48c1fc",
"mainnet-fork": "04f5ae6bef48c1fc",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "7014dcffa1f14186"
}
},
"EVMAbiHelpers": {
"source": "./cadence/contracts/utils/EVMAbiHelpers.cdc",
"aliases": {
"testing": "0000000000000009"
"mainnet": "a7825d405ac89518",
"mainnet-fork": "a7825d405ac89518",
"testing": "0000000000000009",
"testnet": "3ebb7d2595e97cd2"
}
},
"EVMAmountUtils": {
"source": "./cadence/contracts/connectors/evm/EVMAmountUtils.cdc",
"aliases": {
"mainnet": "6d888f175c158410",
"mainnet-fork": "6d888f175c158410",
"mainnet": "43c9e8bfec507db4",
"mainnet-fork": "43c9e8bfec507db4",
"testing": "0000000000000009",
"testnet": "0b11b1848a8aa2c0"
"testnet": "67402f29666f7b29"
}
},
"EVMNativeFLOWConnectors": {
"source": "cadence/contracts/connectors/evm/EVMNativeFLOWConnectors.cdc",
"aliases": {
"testing": "0000000000000009"
"mainnet": "1a771b21fcceadc2",
"mainnet-fork": "1a771b21fcceadc2",
"testing": "0000000000000009",
"testnet": "bee3f3636cec263a"
}
},
"EVMTokenConnectors": {
"source": "cadence/contracts/connectors/evm/EVMTokenConnectors.cdc",
"aliases": {
"mainnet": "1a771b21fcceadc2",
"mainnet-fork": "1a771b21fcceadc2",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "bee3f3636cec263a"
}
},
"FungibleTokenConnectors": {
"source": "cadence/contracts/connectors/FungibleTokenConnectors.cdc",
"aliases": {
"mainnet": "0c237e1265caa7a3",
"mainnet-fork": "0c237e1265caa7a3",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "4cd02f8de4122c84"
}
},
"IncrementFiFlashloanConnectors": {
Expand Down Expand Up @@ -126,23 +149,26 @@
"aliases": {
"mainnet": "251032a66e9700ef",
"mainnet-fork": "251032a66e9700ef",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "71144a1aff6b7148"
}
},
"MorphoERC4626SwapConnectors": {
"source": "cadence/contracts/connectors/evm/morpho/MorphoERC4626SwapConnectors.cdc",
"aliases": {
"mainnet": "251032a66e9700ef",
"mainnet-fork": "251032a66e9700ef",
"testing": "0000000000000009"
"testing": "0000000000000009",
"testnet": "71144a1aff6b7148"
}
},
"SwapConnectors": {
"source": "cadence/contracts/connectors/SwapConnectors.cdc",
"aliases": {
"mainnet": "e1a479f0cb911df9",
"mainnet-fork": "e1a479f0cb911df9",
"testing": "0000000000000007"
"testing": "0000000000000007",
"testnet": "ad228f1c13a97ec1"
}
},
"TestTokenMinter": {
Expand Down Expand Up @@ -180,7 +206,10 @@
"UniswapV3SwapConnectors": {
"source": "cadence/contracts/connectors/evm/UniswapV3SwapConnectors.cdc",
"aliases": {
"testing": "0000000000000009"
"mainnet": "a7825d405ac89518",
"mainnet-fork": "a7825d405ac89518",
"testing": "0000000000000009",
"testnet": "3ebb7d2595e97cd2"
}
}
},
Expand Down Expand Up @@ -775,6 +804,14 @@
"resourceID": "projects/flow-foundation-admin/locations/global/keyRings/defi-actions/cryptoKeys/mainnet-defi-actions/cryptoKeyVersions/1"
}
},
"mainnet-evm-amount-utils": {
"address": "43c9e8bfec507db4",
"key": {
"type": "google-kms",
"hashAlgorithm": "SHA2_256",
"resourceID": "projects/flow-foundation-admin/locations/global/keyRings/defi-actions/cryptoKeys/mainnet-defi-actions/cryptoKeyVersions/1"
}
},
"mainnet-evm-token-connectors": {
"address": "1a771b21fcceadc2",
"key": {
Expand All @@ -791,7 +828,7 @@
}
},
"mainnet-fork-evm-amount-utils": {
"address": "6d888f175c158410",
"address": "43c9e8bfec507db4",
"key": {
"type": "file",
"location": "emulator-account.pkey"
Expand Down Expand Up @@ -835,6 +872,14 @@
"resourceID": "projects/flow-foundation-admin/locations/global/keyRings/defi-actions/cryptoKeys/mainnet-defi-actions/cryptoKeyVersions/1"
}
},
"testnet-morpho-erc4626-connectors": {
"address": "71144a1aff6b7148",
"key": {
"type": "google-kms",
"hashAlgorithm": "SHA2_256",
"resourceID": "projects/flow-foundation-admin/locations/global/keyRings/defi-actions/cryptoKeys/testnet-defi-actions/cryptoKeyVersions/1"
}
},
"mainnet-originator": {
"address": "0e9374d0c1a78c0f",
"key": {
Expand Down Expand Up @@ -890,6 +935,14 @@
"resourceID": "projects/flow-foundation-admin/locations/global/keyRings/defi-actions/cryptoKeys/testnet-defi-actions/cryptoKeyVersions/1"
}
},
"testnet-evm-amount-utils": {
"address": "67402f29666f7b29",
"key": {
"type": "google-kms",
"hashAlgorithm": "SHA2_256",
"resourceID": "projects/flow-foundation-admin/locations/global/keyRings/defi-actions/cryptoKeys/testnet-defi-actions/cryptoKeyVersions/1"
}
},
"testnet-evm-token-connectors": {
"address": "bee3f3636cec263a",
"key": {
Expand Down Expand Up @@ -999,15 +1052,17 @@
],
"mainnet-defi-actions": [
"DeFiActionsUtils",
"DeFiActions",
"EVMAmountUtils"
"DeFiActions"
],
"mainnet-erc4626-connectors": [
"ERC4626Utils",
"ERC4626PriceOracles",
"ERC4626SinkConnectors",
"ERC4626SwapConnectors"
],
"mainnet-evm-amount-utils": [
"EVMAmountUtils"
],
"mainnet-evm-token-connectors": [
"EVMNativeFLOWConnectors",
"EVMTokenConnectors"
Expand All @@ -1021,6 +1076,10 @@
"IncrementFiPoolLiquidityConnectors",
"IncrementFiStakingConnectors"
],
"mainnet-morpho-erc4626-connectors": [
"MorphoERC4626SwapConnectors",
"MorphoERC4626SinkConnectors"
],
"mainnet-swap-connectors": [
"SwapConnectors"
],
Expand Down Expand Up @@ -1053,15 +1112,21 @@
],
"testnet-defi-actions": [
"DeFiActionsUtils",
"DeFiActions",
"EVMAmountUtils"
"DeFiActions"
],
"testnet-erc4626-connectors": [
"ERC4626Utils",
"ERC4626PriceOracles",
"ERC4626SinkConnectors",
"ERC4626SwapConnectors"
],
"testnet-evm-amount-utils": [
"EVMAmountUtils"
],
"testnet-morpho-erc4626-connectors": [
"MorphoERC4626SwapConnectors",
"MorphoERC4626SinkConnectors"
],
"testnet-evm-token-connectors": [
"EVMNativeFLOWConnectors",
"EVMTokenConnectors"
Expand All @@ -1087,4 +1152,4 @@
]
}
}
}
}