Skip to content

feat: adds gas-optimized code for multiple swaps (GenericSwapFacet v2.0.0 > v.3.0.0) #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 45 commits into from
Jun 12, 2024
Merged

feat: adds gas-optimized code for multiple swaps (GenericSwapFacet v2.0.0 > v.3.0.0) #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
75f9ca1
feat: first version of V3 added
0xDEnYO Apr 26, 2024
60fd12e
docs: updates GenericSwapFacet docs
0xDEnYO Apr 26, 2024
3ecc951
Merge branch 'updateDocsGenericSwapFacet' into GenericSwapFacetV3
0xDEnYO Apr 26, 2024
a8e72bd
refactor: introduces helper functions
0xDEnYO Apr 26, 2024
217386a
Merge branch 'main' into GenericSwapFacetV3
0xDEnYO May 20, 2024
5f55995
tests added for various use cases
0xDEnYO May 20, 2024
19622d8
cleanup
0xDEnYO May 20, 2024
b6a56f6
remove console.log
0xDEnYO May 20, 2024
66bcaa5
feat: sends unused input tokens back to user + tests updated
0xDEnYO May 20, 2024
35d455b
update comment
0xDEnYO May 20, 2024
8ed9cd3
cleanup
0xDEnYO May 20, 2024
f176dd4
re-add GenericSwapFacet (v1) and add V3 as separate facet
0xDEnYO May 20, 2024
527e37d
re-add tests for GenericSwapFacet (v1)
0xDEnYO May 20, 2024
4ad5ed9
functions renamed
0xDEnYO May 20, 2024
95d888c
updates docs
0xDEnYO May 20, 2024
ef5e983
added support for multi-swaps to native + tests
0xDEnYO May 21, 2024
d115c73
harmonized function naming
0xDEnYO May 21, 2024
5c37f05
test: adds additional multiswap test for inputToken dust refund
0xDEnYO May 22, 2024
b3d6083
fix: fixes broken test in POL test file
0xDEnYO May 22, 2024
4e71f3d
test: adds test helpers (dex mock)
0xDEnYO May 24, 2024
6ad69a3
Merge branch 'addTestHelperDexMock' into GenericSwapFacetV3
0xDEnYO May 24, 2024
cd5a973
test: achieves 100% test coverage
0xDEnYO May 24, 2024
737b576
cleanup
0xDEnYO May 24, 2024
75686ee
add missing selectors when deploying mockDEX
0xDEnYO May 24, 2024
344f9b4
Merge branch 'addTestHelperDexMock' into GenericSwapFacetV3
0xDEnYO May 24, 2024
987bcaa
Implment and add tests for LibUtil::revertWith()
ezynda3 May 24, 2024
b4cad32
remove unneeded import
ezynda3 May 24, 2024
5d60f13
deploy to staging
ezynda3 May 24, 2024
6755103
Merge remote-tracking branch 'origin/forward-revert-from-external-cal…
0xDEnYO May 27, 2024
581260d
fix copy/paste error
0xDEnYO May 27, 2024
0ce8b57
removes payable keyword from ERC20To... functions (audit issue #5)
0xDEnYO Jun 3, 2024
ccafc40
uses hardcoded address(0) as sendingAssetId for NativeTo (audit issue…
0xDEnYO Jun 3, 2024
69aec4c
uses hardcoded address(0) as receivingAsset in swapTokensSingleV3ERC2…
0xDEnYO Jun 3, 2024
2b23ae8
initialize variables before loops to save gas (audit issue #8)
0xDEnYO Jun 3, 2024
d1b297f
improved forge coverage to produce a clean, comprehensive report
0xDEnYO Jun 3, 2024
624dc79
test: added tests to achieve 100% branch coverage (audit issue #2)
0xDEnYO Jun 4, 2024
c6f3ce9
Merge branch 'main' of github.com:lifinance/contracts into GenericSwa…
0xDEnYO Jun 4, 2024
a81a6cd
chore: adds comments
0xDEnYO Jun 4, 2024
070de65
deploy to prod
ezynda3 Jun 4, 2024
7a5c068
Merge branch 'main' of github.com:lifinance/contracts into GenericSwa…
ezynda3 Jun 4, 2024
b4b5f56
update logs
ezynda3 Jun 4, 2024
2d95f02
Merge branch 'main' of github.com:lifinance/contracts into GenericSwa…
0xDEnYO Jun 6, 2024
70d89e4
Merge branch 'GenericSwapFacetV3' of github.com:lifinance/contracts i…
0xDEnYO Jun 6, 2024
a104968
Merge branch 'main' of github.com:lifinance/contracts into GenericSwa…
0xDEnYO Jun 11, 2024
1de406a
Merge branch 'main' of github.com:lifinance/contracts into GenericSwa…
0xDEnYO Jun 12, 2024
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
336 changes: 336 additions & 0 deletions deployments/_deployments_log_file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18786,5 +18786,341 @@
]
}
}
},
"GenericSwapFacetV3": {
"polygon": {
"staging": {
"1.0.0": [
{
"ADDRESS": "0x4b904ad5Ca7601595277575824B080e078e2E812",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-05-21 10:40:07",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
},
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:29:58",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"arbitrum": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:04:13",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"aurora": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:05:02",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"avalanche": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:06:09",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"base": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:11:23",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"blast": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:14:42",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"boba": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:15:48",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"bsc": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:32:01",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"celo": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:33:56",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"fantom": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:41:53",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"fuse": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:42:55",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"gnosis": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:47:51",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"mantle": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:49:00",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"mode": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:50:05",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"moonbeam": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:52:04",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"moonriver": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 11:53:27",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"optimism": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:01:12",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"polygonzkevm": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:30:59",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"rootstock": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 13:34:10",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "false"
}
]
}
},
"scroll": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:37:07",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"linea": {
"production": {
"1.0.0": [
{
"ADDRESS": "0xf4E73E2A9cDF1F94579cda3da07aD04031359CB5",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:39:04",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"metis": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x6f862c35A2eDAa23DF8949b77F3E828bCBBE48dA",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:40:49",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
},
"mainnet": {
"production": {
"1.0.0": [
{
"ADDRESS": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F",
"OPTIMIZER_RUNS": "1000000",
"TIMESTAMP": "2024-06-04 12:49:55",
"CONSTRUCTOR_ARGS": "0x",
"SALT": "",
"VERIFIED": "true"
}
]
}
}
}
}
4 changes: 4 additions & 0 deletions deployments/arbitrum.diamond.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@
"0x14B4e2e2e3422DeC6F8bF3DcDc0BF3566F37197D": {
"Name": "MayanFacet",
"Version": "1.0.0"
},
"0x31a9b1835864706Af10103b31Ea2b79bdb995F5F": {
"Name": "GenericSwapFacetV3",
"Version": "1.0.0"
}
},
"Periphery": {
Expand Down
5 changes: 3 additions & 2 deletions deployments/arbitrum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
"SymbiosisFacet": "0xe12b2488c71432F9a116E9ac244D3Ef4c2386d3a",
"TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d",
"SquidFacet": "0x5C2C3F56e33F45389aa4e1DA4D3a807A532a910c",
"MayanFacet": "0x21ED939077835c195c4f92c25d1d5BDEB7d6a2Ce"
}
"MayanFacet": "0x21ED939077835c195c4f92c25d1d5BDEB7d6a2Ce",
"GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F"
}
4 changes: 4 additions & 0 deletions deployments/aurora.diamond.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
"0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0": {
"Name": "CalldataVerificationFacet",
"Version": "1.1.1"
},
"0x31a9b1835864706Af10103b31Ea2b79bdb995F5F": {
"Name": "GenericSwapFacetV3",
"Version": "1.0.0"
}
},
"Periphery": {
Expand Down
3 changes: 2 additions & 1 deletion deployments/aurora.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
"StandardizedCallFacet": "0x175E7799DA0CD40E641352EaB90D8e39e02a4Ca9",
"CalldataVerificationFacet": "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0",
"LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C",
"TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d"
"TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d",
"GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F"
}
4 changes: 4 additions & 0 deletions deployments/avalanche.diamond.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
"0x14B4e2e2e3422DeC6F8bF3DcDc0BF3566F37197D": {
"Name": "MayanFacet",
"Version": "1.0.0"
},
"0x31a9b1835864706Af10103b31Ea2b79bdb995F5F": {
"Name": "GenericSwapFacetV3",
"Version": "1.0.0"
}
},
"Periphery": {
Expand Down
Loading