Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
330 commits
Select commit Hold shift + click to select a range
d265222
fix account to msg.sender
Frenchkebab Sep 26, 2024
819c13f
remove selfstake
Frenchkebab Sep 26, 2024
f31ae90
remove account param
Frenchkebab Sep 26, 2024
2dce130
withdraw checks operatorActiveStakeAmount
Frenchkebab Sep 26, 2024
3195325
add todo comment
Frenchkebab Sep 26, 2024
fae46b1
remove minStakeAmount and fix typo
Frenchkebab Sep 26, 2024
948ea0e
remove locked token address from StakingManager
Frenchkebab Sep 26, 2024
e60d824
add deadline logic
Frenchkebab Sep 26, 2024
2575a1f
remove supported signature
Frenchkebab Sep 26, 2024
cd47892
add refundFee
Frenchkebab Sep 26, 2024
2204958
add upgradeability
Frenchkebab Sep 26, 2024
8c2cbe0
fix param variable
Frenchkebab Sep 26, 2024
c934123
resolve TODOs for StakingManager
Frenchkebab Sep 26, 2024
683e429
remove onlyAdmin
Frenchkebab Sep 26, 2024
f4df6e1
add missing admin functions
Frenchkebab Sep 26, 2024
a421c16
remove unnecessary functions
Frenchkebab Sep 26, 2024
f8422ec
add admin function
Frenchkebab Sep 26, 2024
96ffa9f
refactor code
Frenchkebab Sep 26, 2024
fb50a1c
add missing admin functions
Frenchkebab Sep 26, 2024
3c2e6fa
add upgradeability
Frenchkebab Sep 26, 2024
2a2c043
remove onlyAdmin
Frenchkebab Sep 26, 2024
a04883b
remove transmitter from setShare
Frenchkebab Sep 26, 2024
a5a761d
add unlockStake logic
Frenchkebab Sep 26, 2024
082b2e3
implement completeSubmission logic
Frenchkebab Sep 26, 2024
4d0357f
fix setShare logic
Frenchkebab Sep 26, 2024
4412bf6
update unlockStake logic
Frenchkebab Sep 26, 2024
42aba9f
implement slashing logic
Frenchkebab Sep 27, 2024
4bd8823
move struct to Struct.sol
Frenchkebab Sep 27, 2024
c716bd0
remove lock/unlock from SymbioticStakingReward
Frenchkebab Sep 28, 2024
6db8ede
complete reward distribution logic
Frenchkebab Sep 30, 2024
66ca214
refactor code
Frenchkebab Sep 30, 2024
2ca8ae2
refactor code
Frenchkebab Sep 30, 2024
9513350
logic when operatorStakeAmount < operatorLockAmount
Frenchkebab Sep 30, 2024
4b3dd14
add logic for inflation reward emission
Frenchkebab Oct 1, 2024
359f637
refactor reward distribution logic
Frenchkebab Oct 1, 2024
9671f96
refactor _update logic
Frenchkebab Oct 1, 2024
5ea15b5
update reward claim logic
Frenchkebab Oct 1, 2024
dec69fd
fix reward distribution logic
Frenchkebab Oct 2, 2024
d3d7f24
refactor code
Frenchkebab Oct 5, 2024
25a981f
reimplement symbioticStakingReward
Frenchkebab Oct 5, 2024
2696f61
fix symbiotic reward logic
Frenchkebab Oct 5, 2024
06276b8
fix compile errors
Frenchkebab Oct 5, 2024
9339d7d
fix transmitter comission rate logic
Frenchkebab Oct 5, 2024
a1798aa
add comments
Frenchkebab Oct 5, 2024
18c98a6
add getter for pendingInflationReward
Frenchkebab Oct 5, 2024
c2f1192
fix variable name
Frenchkebab Oct 5, 2024
5b75efa
temporarily comment out
Frenchkebab Oct 5, 2024
29fa07d
temporarily comment out
Frenchkebab Oct 5, 2024
a5d9da4
add comments
Frenchkebab Oct 5, 2024
99b3d3c
format code
Frenchkebab Oct 7, 2024
cc59e38
add 2step withdrawal
Frenchkebab Oct 7, 2024
e74888c
fix typo
Frenchkebab Oct 7, 2024
38fed2d
resolve compile error
Frenchkebab Oct 7, 2024
c6caeb0
remove totalFeeStored
Frenchkebab Oct 7, 2024
0d11aa9
symbioticStakingReward pulls reward
Frenchkebab Oct 8, 2024
5f8a4d3
initialize foundry
Frenchkebab Oct 8, 2024
77ca2da
add comment
Frenchkebab Oct 8, 2024
696b8e7
remove internal change to add public
Frenchkebab Oct 8, 2024
fb9aed3
refactor code
Frenchkebab Oct 8, 2024
974df18
refactor SymbioticStakingLock
Frenchkebab Oct 8, 2024
4b74dbd
remove epoch array and replace with single variable
Frenchkebab Oct 8, 2024
d1109ca
add InflationRewardManager contract
Frenchkebab Oct 9, 2024
106fc42
send comission to operator
Frenchkebab Oct 9, 2024
82442e3
add interaction with InflationRewardManager
Frenchkebab Oct 10, 2024
7ef70c5
add transmitter comission feature
Frenchkebab Oct 10, 2024
f6f8231
fix timestampIdx logic
Frenchkebab Oct 10, 2024
1376f23
implement weight based token selection
Frenchkebab Oct 10, 2024
7424f80
add gaps
Frenchkebab Oct 10, 2024
57ac65d
foundry test setup
Frenchkebab Oct 10, 2024
a245830
consider the case when inflation reward is not enough
Frenchkebab Oct 10, 2024
9a6019f
minor fix
Frenchkebab Oct 11, 2024
30e11a2
test setup
Frenchkebab Oct 11, 2024
22ddb9d
fix token selection algorithm in NativeStaking
Frenchkebab Oct 11, 2024
a4b58a2
minor fix
Frenchkebab Oct 11, 2024
ae2ac28
test operator self stake
Frenchkebab Oct 11, 2024
d1fba22
fix unexpected logic
Frenchkebab Oct 14, 2024
95f7fcb
e2e test
Frenchkebab Oct 14, 2024
45d17de
format import orders
Frenchkebab Oct 14, 2024
291a1ab
fix file name typo
Frenchkebab Oct 15, 2024
ef36745
Arbitrum Sepolia testnet deploy script
Frenchkebab Oct 15, 2024
b997782
comment out inflation reward related code
Frenchkebab Oct 18, 2024
155cf67
add events and refactor code
Frenchkebab Oct 18, 2024
f2576b4
add missing events and setters
Frenchkebab Oct 18, 2024
b8bdad5
remove inflation reward part from test
Frenchkebab Oct 20, 2024
f43b689
fix compile error for e2e test
Frenchkebab Oct 21, 2024
957ac4c
fix submission format
Frenchkebab Oct 21, 2024
251761e
fix test
Frenchkebab Oct 21, 2024
ebbcab7
feat: Symbiotic Middleware contract added
prateekreddy Oct 21, 2024
e6880f8
feat: add getters for vaults supported by middleware
prateekreddy Oct 21, 2024
1e1ca02
e2e test finish
Frenchkebab Oct 22, 2024
70d1490
test for operator and transmitter reward claim
Frenchkebab Oct 23, 2024
a04a640
fix claim function signature
Frenchkebab Oct 23, 2024
a9858dd
test: Symbiotic Middleware contract
prateekreddy Oct 23, 2024
20b3e2c
test: Veto slashing request tested
prateekreddy Oct 23, 2024
fa62e71
staking removed from GeneratorRegistry, and ProofMarketplace updated …
rajatlko13 Oct 23, 2024
c76a8c9
cleanup
rajatlko13 Oct 23, 2024
034eede
feat: deployed middleware on holesky
prateekreddy Oct 24, 2024
a633e34
interfaces added for the contracts
rajatlko13 Oct 25, 2024
9d993de
fix: submission validity check
Frenchkebab Oct 25, 2024
a66b473
test cases updated with few contrat fixes
rajatlko13 Oct 25, 2024
fbb8100
Merge branch 'rajat/staking-updates' of https://github.com/marlinprot…
rajatlko13 Oct 25, 2024
e2ebd5a
feat: Add mock collateral token
prateekreddy Oct 28, 2024
f80a5fd
feat: Attestation Verification added for snapshot submission
prateekreddy Oct 29, 2024
c5b0d3d
fix: Data type added to snapshot signature
prateekreddy Oct 29, 2024
6af2b64
fix failing tests
Frenchkebab Oct 30, 2024
08c37cb
test: add staking setup
Frenchkebab Oct 30, 2024
1a2f27b
add hardhat-tracer
Frenchkebab Oct 30, 2024
e46977d
fix timeout error
Frenchkebab Oct 30, 2024
a80dbba
testnet deploy
Frenchkebab Oct 30, 2024
cfe1b05
fix: comment unused functions to decrease ProofMarketplace contract size
prateekreddy Oct 30, 2024
7bad5c0
testnet deploy script
Frenchkebab Oct 30, 2024
a11ba7e
add script
Frenchkebab Oct 30, 2024
d1490b5
remove access control for operatorRewardShare
Frenchkebab Oct 30, 2024
cdb8a6e
upgrade symbioticStaking
Frenchkebab Nov 1, 2024
ac8fa07
add getOperatorStakeAmountAt to pass compilation
akshay111meher Nov 1, 2024
2124fa0
Add callbacks to Generator Registry
akshay111meher Nov 1, 2024
9c620a3
add callbacks
Frenchkebab Nov 11, 2024
89ffe3a
remove jobManager
Frenchkebab Nov 19, 2024
24f24d0
change Ask > Bid
Frenchkebab Nov 25, 2024
c7b9614
replace generator to prover
Frenchkebab Nov 25, 2024
33b2577
replace operator to prover
Frenchkebab Nov 25, 2024
3dd9212
fix deploy script
Frenchkebab Nov 25, 2024
4d5f99d
.env example
Frenchkebab Nov 25, 2024
e1360f6
fix failing test
Frenchkebab Nov 25, 2024
90ca53d
fix test script
Frenchkebab Nov 25, 2024
cfab570
replace ask to bid
Frenchkebab Nov 25, 2024
04d6f40
refactor code
Frenchkebab Nov 25, 2024
b8be5f0
gitignore
Frenchkebab Nov 25, 2024
d4801a4
remove lib
Frenchkebab Nov 25, 2024
545c811
Merge branch 'jung/initial-deploy' into jung/refactor
Frenchkebab Nov 25, 2024
2daaaea
fix GeneratorCallback to ProverCallback
Frenchkebab Nov 25, 2024
e288b15
remove unnecessary code
Frenchkebab Nov 25, 2024
283a58b
refactor
Frenchkebab Nov 26, 2024
2ad9839
add Enum, Struct
Frenchkebab Nov 26, 2024
9a35909
add captureTimestamp to submission events
Frenchkebab Nov 26, 2024
8fccacf
add update functions
Frenchkebab Dec 2, 2024
229e114
add captureTimestamp to submission events
Frenchkebab Nov 26, 2024
cbbe1f1
add update functions
Frenchkebab Dec 2, 2024
0684085
change Ask > Bid
Frenchkebab Dec 3, 2024
d6ecf9c
replace generator to prover
Frenchkebab Dec 3, 2024
90744c4
refactor code
Frenchkebab Dec 3, 2024
04e6be4
refactor
Frenchkebab Dec 3, 2024
27eac90
add update functions
Frenchkebab Dec 2, 2024
258d723
change Ask > Bid
Frenchkebab Nov 25, 2024
6d0a4b3
refactor code
Frenchkebab Nov 25, 2024
ebee6bd
refactor
Frenchkebab Nov 26, 2024
c56227c
add update functions
Frenchkebab Dec 2, 2024
1fb727a
refactor
Frenchkebab Dec 3, 2024
edd928f
Merge branch 'jung/initial-deploy' into jung/refactor
Frenchkebab Dec 12, 2024
7bf46d3
Merge pull request #80 from marlinprotocol/jung/refactor
Frenchkebab Dec 12, 2024
05c70d3
fix version
Frenchkebab Dec 13, 2024
5322d38
refactor Proofmarketplace
Frenchkebab Dec 13, 2024
8dfa7a6
make import explicit
Frenchkebab Dec 13, 2024
4c59d5a
refactor SymbioticStaking
Frenchkebab Dec 13, 2024
39aba9e
Refactor other contracts
Frenchkebab Dec 16, 2024
d47a5f5
remove stake data - slash result submission order
Frenchkebab Dec 20, 2024
e1e88c3
add block number for slash result
Frenchkebab Dec 22, 2024
bfe855f
feat: delegates added for operator
prateekreddy Dec 23, 2024
46451f2
feat: upgrade testnet deployment
prateekreddy Dec 23, 2024
2870f9f
feat: Remove prover callbacks
prateekreddy Dec 24, 2024
04a059e
feat: Move prover commission to prover registry
prateekreddy Dec 25, 2024
2078974
feat: remove MARKET_ACTIVATION_DELAY from marketplace
prateekreddy Dec 25, 2024
6c9c27b
feat: extradata added for gas opti in marketplace
prateekreddy Dec 27, 2024
3ea1461
feat: update wrappers with updated create bid definition
prateekreddy Dec 27, 2024
3ad6e2f
fix tests
Frenchkebab Dec 27, 2024
9ed8c9d
fix failing tests
Frenchkebab Dec 28, 2024
a437f11
fix: resolve PR reviews
Frenchkebab Dec 30, 2024
7c0c2fa
Merge branch 'jung/refactor' into prateek/remove-callbacks
Frenchkebab Dec 30, 2024
62d6ae1
Merge pull request #83 from marlinprotocol/prateek/remove-callbacks
Frenchkebab Dec 30, 2024
36ac945
fix: fix merge conflict
Frenchkebab Dec 30, 2024
0c91576
fix breaking tests except for snapshot submission feature
Frenchkebab Dec 30, 2024
295c39a
cleanup: events updated
prateekreddy Dec 30, 2024
bac4402
Merge pull request #84 from marlinprotocol/prateek/remove-callbacks
Frenchkebab Dec 31, 2024
95a02d6
Merge commit '295c39a3cdb0218fe8c6b216f39af74daa2773e3' into jung/ref…
Frenchkebab Dec 31, 2024
98f0b13
remove slashing penalty from Market struct
Frenchkebab Jan 2, 2025
4149f49
replace immutables to state variables
Frenchkebab Jan 2, 2025
bb8d529
add deploy script for Arbitrum Sepolia
Frenchkebab Jan 3, 2025
cad4a9f
Change name ProverRegistry to ProverManager
Frenchkebab Jan 3, 2025
99a852e
fix failing tests
Frenchkebab Jan 6, 2025
1e8a31c
deploy and verify script
Frenchkebab Jan 6, 2025
353f77d
hardhat gas-report config
Frenchkebab Jan 6, 2025
64d224f
minor fix
Frenchkebab Jan 6, 2025
70e32b7
refactor deploy code to seperate initalize from deploy
prateekreddy Jan 7, 2025
21a954c
fix: admin checks
prateekreddy Jan 7, 2025
29140a2
add error code searcher
akshay111meher Jan 7, 2025
ac96c39
feat: add updateProverData
Frenchkebab Jan 7, 2025
79350cb
deploy and verify script
Frenchkebab Jan 7, 2025
93a1ae0
fix role name
Frenchkebab Jan 8, 2025
41fc2d3
upgrade and verify script
Frenchkebab Jan 9, 2025
6ad3652
replace block.number to block.timestamp
Frenchkebab Jan 9, 2025
83ea08f
fix block range condition
Frenchkebab Jan 9, 2025
8cba253
add range for bid
Frenchkebab Jan 10, 2025
2985a77
fix timeTakenForProofGeneration > timeForProofGeneration
Frenchkebab Jan 10, 2025
05d7f55
fix missing change
Frenchkebab Jan 10, 2025
0443603
Add Maximum Matching Time
akshay111meher Jan 10, 2025
2ea83cf
Mention Time explicity in code
akshay111meher Jan 13, 2025
6bc97e0
add upgrade script
Frenchkebab Jan 13, 2025
31dccc1
Release Stake in refundFee function
akshay111meher Jan 14, 2025
5bc703f
verification and initial setup script
Frenchkebab Jan 14, 2025
265824d
update slashing logic
Frenchkebab Jan 14, 2025
c8b5c4b
fix slashing logic
Frenchkebab Jan 14, 2025
067d8a7
feat: flag to enable/disable slashing added to middleware
prateekreddy Jan 15, 2025
4103f9e
remove TODOs
Frenchkebab Jan 15, 2025
59e0e9f
feat: add functions to update global vars
prateekreddy Jan 16, 2025
21d9b26
feat: No slasher type added to vault config
prateekreddy Jan 17, 2025
64d35f6
failing test for attestation verification
Frenchkebab Jan 17, 2025
7a17efc
Attestation Verrification
akshay111meher Jan 17, 2025
2693c10
feat: deployment of middleware to mainnet
prateekreddy Jan 17, 2025
0f47302
Update ClaimProverFeeReward
akshay111meher Jan 18, 2025
d413f50
update pmp
akshay111meher Jan 18, 2025
e9a9351
Revert back to old logic
akshay111meher Jan 18, 2025
8f4b333
seperate proverAddress and proverRewardAddress
Frenchkebab Jan 18, 2025
cfc3f30
make prover fee reward temporarily 100%
Frenchkebab Jan 23, 2025
950bd55
solve index issue for lastest confirmed timestamp
Frenchkebab Jan 23, 2025
e7bfe31
fix all failing tests
Frenchkebab Jan 23, 2025
fdafa6e
add gaps
Frenchkebab Jan 23, 2025
9c06546
Merge branch 'jung/initial-deploy' into symbiotic/middleware
Frenchkebab Jan 23, 2025
56af67d
Merge pull request #71 from marlinprotocol/symbiotic/middleware
Frenchkebab Jan 23, 2025
daea90e
add changes for Prover to receive 100% of reward
Frenchkebab Jan 23, 2025
b8adbaf
fix deploy script
Frenchkebab Jan 23, 2025
9ffb6fc
add comment
Frenchkebab Jan 23, 2025
ac7573d
add gap and missing comment
Frenchkebab Jan 23, 2025
67fb7af
add PausableUpgradeable to user interaction functions
Frenchkebab Jan 24, 2025
5bd7811
fix comment to english
Frenchkebab Jan 25, 2025
c04d159
Fix poolRewardShare logic
Frenchkebab Jan 25, 2025
ae5805e
revert back changed event
Frenchkebab Jan 25, 2025
89ac98f
fix fee refund logic
Frenchkebab Jan 25, 2025
8fe91dd
reflect PR comments
Frenchkebab Jan 25, 2025
b469f39
fix typo
Frenchkebab Jan 25, 2025
ed01cdf
remove input condition
Frenchkebab Jan 25, 2025
95b584d
remove unused initialize parameter
Frenchkebab Jan 25, 2025
914467b
resolve potential PoolEnabled bug
Frenchkebab Jan 25, 2025
00c734b
fix compile error
Frenchkebab Jan 25, 2025
d964f24
remove console log back
Frenchkebab Jan 25, 2025
75103d3
fix tests
Frenchkebab Jan 25, 2025
767765e
feat: mainnet deployment
prateekreddy Jan 27, 2025
8e61973
Merge branch 'jung/initial-deploy' into jung/refactor
Frenchkebab Jan 28, 2025
22e78ab
Merge pull request #82 from marlinprotocol/jung/refactor
Frenchkebab Jan 28, 2025
b3e4a3e
fix typo in hardhat config
Frenchkebab Feb 19, 2025
e45f492
feat: Attestation verification initialized
prateekreddy Feb 19, 2025
003f091
add test for StakingManager
Frenchkebab Jan 28, 2025
5b98ab3
test: update tests to align with middleware upgrade
Frenchkebab Feb 19, 2025
eaa4849
test: add tests reflecting future changes to StakingManager
Frenchkebab Feb 19, 2025
2d73c21
Merge branch 'jung/initial-deploy' into jung/refactor
Frenchkebab Feb 19, 2025
355a50a
Merge pull request #85 from marlinprotocol/jung/refactor
Frenchkebab Feb 19, 2025
e6df1f7
Merge branch 'master' into jung/initial-deploy
Frenchkebab Feb 19, 2025
77fdd9e
add back contracts
Frenchkebab Feb 20, 2025
c7e537b
test: fix failing tests
Frenchkebab Feb 20, 2025
3df6b74
sync up with latest deployed version
Frenchkebab Feb 20, 2025
7cf6586
Merge branch 'master' into jung/initial-deploy
Frenchkebab Feb 20, 2025
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
20 changes: 20 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
REPORT_GAS=false

# Tenderly
TENDERLY_ACCESS_KEY=

# Mainnet
MAINNET_DEPLOYER=

# Holesky
HOLESKY_DEPLOYER=

# Arb One
ARBITRUM_ONE_DEPLOYER=
ARBITRUM_ONE_RPC_URL=

# Arb Sepolia
ARBITRUM_SEPOLIA_ADMIN_KEY=
ARBITRUM_SEPOLIA_RPC_URL=
ARB_SEPOLIA_API_KEY=

15 changes: 10 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ dist

# vuepress v2.x temp and cache directory
.temp
.cache

# Docusaurus cache and generated files
.docusaurus
Expand All @@ -122,6 +121,7 @@ dist

# Stores VSCode versions used for testing VSCode extensions
.vscode-test
.vscode

# yarn v2
.yarn/cache
Expand All @@ -130,9 +130,6 @@ dist
.yarn/install-state.gz
.pnp.*

node_modules
.env
coverage
coverage.json
typechain
typechain-types
Expand All @@ -143,7 +140,15 @@ artifacts

addresses/31337.json

*backup*
# Foundry
broadcast

# Openzeppelin
.openzeppelin/

# MacOS
**/.DS_Store

# Python
venv
venv/*
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry/forge-std
[submodule "lib/openzeppelin-foundry-upgrades"]
path = lib/openzeppelin-foundry-upgrades
url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[submodule "lib/openzeppelin-contracts-upgradeable"]
path = lib/openzeppelin-contracts-upgradeable
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
Loading