Pull changes from upstream master (#17)

* Add arbitrum deployment (#84)

* add arbitrum deployment

* newline

* feat: Add and rename audits (#96)

* feat: add cantina

* fix: change all names

* feat: Refactor staging deployments scripting to work for full deployment on Base and Arbitrum (#97)

* feat: do initial refactor

* feat: initial deploy script working

* feat: update with working script

* feat: staging deployment working locally

* fix: cleanup

* feat: update to add full input files

* feat: add arbitrum test coverage

* feat: add more testing and update arbitrum file

* fix: update to remove deps from output, updagte lib

* feat: add live staging contracts

* fix: update sub and blocks

* feat: add release jsons

* fix: add mainnet staing

* fix: arb filename

* feat: Add audits (#26)

* feat: add audits

* fix: update file

* fix: update staging test

* fix: Update Centrifuge tests (#25)

* Adapt to latest vault address

* Update block number

* Remove unused setUp

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* feat: Refactor to use internal functions and modifiers (#24)

* feat: refactor to use internal functions and modifiers

* fix: use view

* fix: move helpers

* fix: rm todo

* feat: Add DaiUsds swaps (SC-940) (#22)

* feat: add dai usds swaps

* fix: rm rate limits

* feat: Add Curve support, remove Morpho allocator logic (SC-938)  (#23)

* feat: add basic curve deposit/withdraw

* feat: Refactor to use internal functions and modifiers (#24)

* feat: refactor to use internal functions and modifiers

* fix: use view

* fix: move helpers

* fix: rm todo

* feat: Add DaiUsds swaps (SC-940) (#22)

* feat: add dai usds swaps

* fix: rm rate limits

* test: add testing for failure modes

* feat: tests all passing

* fix: update broken staging test

* test: add invalid order coverage, cleanup

* fix: rm morpho functionality

* fix: rm morpho

* feat: tests passing

* fix: rm console

* feat: refactor to use rlusd pool

* feat: refactor to use new slippages, remove tokens params

* feat: add remove liquidity working

* feat: tests passing

* fix: rm console

* fix: update remaining fixes

* fix: reorder some code, add zero slippage test coverage

* fix: update test names

* feat: add simplified calculation

* fix: rm unused function

* fix: formatting

* fix: update slippage

* fix: comment

* fix: cache param

* fix: update spacing

* feat: Update to round up for rate limits and minimums (SC-955) (#31)

* feat: Use `get_virtual_price` (SC-959) (#29)

* feat: add comments

* feat: add virtual price

* feat: add stress test

* feat: add starting fuzz tests

* fix: delete fuzz test

* fix: add comments

* fix: update comments

* fix: Add line about transferAsset (#33)

* feat: Add swap rate limiting in `addLiquidityCurve` (SC-952) (#30)

* feat: add initial structure

* feat: add rate limit for swap

* feat: tests passing

* fix: ordering and test

* fix: update optimizer runs

* fix:  update comment

* feat: Add index input validation (SC-960) (#34)

* feat: add index input validation

* feat: update to add testing

* ifx: update to use n coins

* fix: Update swap rate limit calculation (#94)

* feat: Add audits (#26)

* feat: add audits

* fix: update file

* fix: update staging test

* fix: Update Centrifuge tests (#25)

* Adapt to latest vault address

* Update block number

* Remove unused setUp

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* feat: Refactor to use internal functions and modifiers (#24)

* feat: refactor to use internal functions and modifiers

* fix: use view

* fix: move helpers

* fix: rm todo

* feat: Add DaiUsds swaps (SC-940) (#22)

* feat: add dai usds swaps

* fix: rm rate limits

* feat: Add Curve support, remove Morpho allocator logic (SC-938)  (#23)

* feat: add basic curve deposit/withdraw

* feat: Refactor to use internal functions and modifiers (#24)

* feat: refactor to use internal functions and modifiers

* fix: use view

* fix: move helpers

* fix: rm todo

* feat: Add DaiUsds swaps (SC-940) (#22)

* feat: add dai usds swaps

* fix: rm rate limits

* test: add testing for failure modes

* feat: tests all passing

* fix: update broken staging test

* test: add invalid order coverage, cleanup

* fix: rm morpho functionality

* fix: rm morpho

* feat: tests passing

* fix: rm console

* feat: refactor to use rlusd pool

* feat: refactor to use new slippages, remove tokens params

* feat: add remove liquidity working

* feat: tests passing

* fix: rm console

* fix: update remaining fixes

* fix: reorder some code, add zero slippage test coverage

* fix: update test names

* feat: add simplified calculation

* fix: rm unused function

* fix: formatting

* fix: update slippage

* fix: comment

* fix: cache param

* fix: update spacing

* feat: Update to round up for rate limits and minimums (SC-955) (#31)

* feat: Use `get_virtual_price` (SC-959) (#29)

* feat: add comments

* feat: add virtual price

* feat: add stress test

* feat: add starting fuzz tests

* fix: delete fuzz test

* fix: add comments

* fix: update comments

* fix: Add line about transferAsset (#33)

* feat: Add swap rate limiting in `addLiquidityCurve` (SC-952) (#30)

* feat: add initial structure

* feat: add rate limit for swap

* feat: tests passing

* fix: ordering and test

* fix: update optimizer runs

* fix:  update comment

* feat: Add index input validation (SC-960) (#34)

* feat: add index input validation

* feat: update to add testing

* ifx: update to use n coins

* feat: initial logic working

* feat: update to add testing

* fix: cleanup

---------

Co-authored-by: Jeroen <1748621+hieronx@users.noreply.github.com>

* feat: Update staging PSM addresses, fix morpho usdc staging address (#98)

* feat: update addresses

* fix: logs

* fix: rm unconfigured psms

* feat: Add v1.4.0 audits (#99)

* fix: rm redundant audits, add chainsecurity

* feat: add cantina audit

* feat: Deploy v1.4.0 staging (#103)

* feat: deploy v1.4.0 staging

* fix: newlines

* fix: update testing

* feat: Update testing to use USDT pools, focus on USDT approval functionality (#101)

* fix: rm redundant audits, add chainsecurity

* feat: add cantina audit

* fix: refactor tests

* test: add allowance assertions

* test: add coverage for swap rate limits

* fix: update to use higher swaps

* refactor: Remove `setRateLimitData` from RateLimitHelpers (SC-962) (sparkdotfi#108)

* refactor: Split out Curve and PSM logic into libraries (SC-971) (#104)

* refactor: Init library to take multiple relayers (SC 961) (sparkdotfi#109)

* refactor: Spin out logic of CCTP into a library (SC-970) (#105)

* deploy optimism (sparkdotfi#111)

* feat: Adds forceApprove logic (SC-978) (sparkdotfi#110)

* feat: Deploy Unichain (SC-992)

* cleanup: Remove BUIDL redeem facility (SC 994)

* chore: Change `CENTRIFUGE_REQUEST_ID` var to constant (sparkdotfi#118)

* chore: change var to constant

* use internal

* feat: Add LayerZero integration (SC-982) (sparkdotfi#119)

* feat: layerzero integration

* fix review

* change note

* fix followup review

* add success tests

* fix review

* add gas cost test

* chore: linting

* add tests for setter functions

* chore: linting

* chore: linting

* fix: Update README (sparkdotfi#121)

* fix: Order params consistently (sparkdotfi#122)

* fix: interface (sparkdotfi#124)

* fix: Use more robust `_approve` (SC-1036) (sparkdotfi#126)

* feat: add requires

* fix: add full test coverage

* feat: Gas optimize `approve` (SC-1037) (sparkdotfi#128)

* feat: add requires

* fix: add full test coverage

* feat: reuse `approveData` in (Mainnet|Foreign)Controller._approve.

* fix: typo (causing compilation error).

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* Minor issues (#14 from audit) (SC-1032) (sparkdotfi#130)

* chore: rm `IMetaMorpho` imports in MainnetController.sol.

* chore: rm `AccessControl` import in CurveLib.sol.

* chore: rm `RateLimitHelpers` import in PSMLib.sol.

* fix: `multiplied` spelling.

* chore: change IERC(20|4626) to openzeppelin.

* chore: rm import from ForeignController.sol.

* fix: alphabetical ordering.

* fix: re-order imports.

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* fix: Make `transferTokenLayerZero` payable (SC-1039) (sparkdotfi#127)

* fix: make transfer function payable

* fix: review

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* feat: Set LayerZero recipients in deploy (SC-1038) (sparkdotfi#129)

* feat: setLayerzeroRecipients in deploy

* fix: review

* fix: build

* fix: align

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* fix: Add missing approval (SC-1035) (sparkdotfi#123)

* fix: add missing approval

* add comments

* fix: comments

* fix: comments

* fix: comment

---------

Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>

* fix: Reuse approveData in CurveLib (sparkdotfi#131)

* feat: Add v1.5 audit reports (SC-1044) (sparkdotfi#132)

* feat: add cantina audit

* fix: update spark-address-registry

* feat: add new audits

* fix: rm ds store files and add to gitignore

* feat: bring back superstate & maple; remove centrifuge crosschain transfers

* cleanup deployments

---------

Co-authored-by: Sam MacPherson <xylom44@gmail.com>
Co-authored-by: Lucas Manuel <lucasmanuel.tech@gmail.com>
Co-authored-by: Jeroen <1748621+hieronx@users.noreply.github.com>
Co-authored-by: supercontracts <bonjour.tabish@gmail.com>
Co-authored-by: Dom <18601956+hacker-DOM@users.noreply.github.com>

Author: 6 people

.gitignore

@@ -6,3 +6,4 @@ docs/
 lcov.info
 script/output/*/*.json
 !script/output/*/*-release-*.json
+.DS_Store

Makefile

@@ -1,9 +1,6 @@
 # Staging Full Deployment with Dependencies
 deploy-staging-full :; forge script script/staging/FullStagingDeploy.s.sol:FullStagingDeploy --sender ${ETH_FROM} --broadcast --verify --multi
 
-# Staging Mainnet Deployment with Dependencies
-deploy-staging-mainnet :; forge script script/staging/MainnetStagingDeploy.s.sol:MainnetStagingDeploy --sender ${ETH_FROM} --broadcast --verify
-
 # Staging Deployments
 deploy-mainnet-staging-controller :; ENV=staging forge script script/Deploy.s.sol:DeployMainnetController --sender ${ETH_FROM} --broadcast --verify
 deploy-base-staging-controller :; CHAIN=base ENV=staging forge script script/Deploy.s.sol:DeployForeignController --sender ${ETH_FROM} --broadcast --verify
@@ -12,6 +9,9 @@ deploy-base-staging-controller :; CHAIN=base ENV=staging forge script script/Dep
 deploy-mainnet-production-full       :; ENV=production forge script script/Deploy.s.sol:DeployMainnetFull --sender ${ETH_FROM} --broadcast --verify
 deploy-mainnet-production-controller :; ENV=production forge script script/Deploy.s.sol:DeployMainnetController --sender ${ETH_FROM} --broadcast --verify
 
+deploy-arbitrum-one-production-full       :; CHAIN=arbitrum_one ENV=production forge script script/Deploy.s.sol:DeployForeignFull --sender ${ETH_FROM} --broadcast --verify
+deploy-arbitrum-one-production-controller :; CHAIN=arbitrum_one ENV=production forge script script/Deploy.s.sol:DeployForeignController --sender ${ETH_FROM} --broadcast --verify
+
 deploy-base-production-full       :; CHAIN=base ENV=production forge script script/Deploy.s.sol:DeployForeignFull --sender ${ETH_FROM} --broadcast --verify
 deploy-base-production-controller :; CHAIN=base ENV=production forge script script/Deploy.s.sol:DeployForeignController --sender ${ETH_FROM} --broadcast --verify
 
@@ -20,3 +20,6 @@ deploy-unichain-production-controller :; CHAIN=unichain ENV=production forge scr
 
 deploy-avalanche-production-full       :; CHAIN=avalanche ENV=production forge script script/Deploy.s.sol:DeployForeignFull --sender ${ETH_FROM} --broadcast --verify
 deploy-avalanche-production-controller :; CHAIN=avalanche ENV=production forge script script/Deploy.s.sol:DeployForeignController --sender ${ETH_FROM} --broadcast --verify
+
+deploy-optimism-production-full       :; CHAIN=optimism ENV=production forge script script/Deploy.s.sol:DeployForeignFull --sender ${ETH_FROM} --broadcast --verify
+deploy-optimism-production-controller :; CHAIN=optimism ENV=production forge script script/Deploy.s.sol:DeployForeignController --sender ${ETH_FROM} --broadcast --verify

audits/v150-cantina-audit.pdf

@@ -27,7 +27,7 @@ runs = 1
 depth = 100
 
 [etherscan]
-mainnet = { key = "${ETHERSCAN_API_KEY}" }
+mainnet = { key = "${MAINNET_API_KEY}" }
 optimism = { key = "${OPTIMISMSCAN_API_KEY}" }
 base = { key = "${BASESCAN_API_KEY}" }
 gnosis_chain = { key = "${GNOSISSCAN_API_KEY}", url = "https://api.gnosisscan.io/api" }