Skip to content

Commit

Permalink
Feature/delegation tss (mantlenetworkio#837)
Browse files Browse the repository at this point in the history
* modify stake,slash,reward contract base on delegation lib

* modify stake,slash,reward contract base on delegation lib

* modify stake,slash,reward contract base on delegation lib

* modify stake,slash,reward contract base on delegation lib

* modify stake,slash,reward contract base on delegation lib

* modify stake,slash,reward contract base on delegation lib

* modify slash logic in tss module

* modify slash logic in tss module

* fix some bug in stakingslashing contract

* remove log

* add event in contracts
  • Loading branch information
byteflyfunny authored May 17, 2023
1 parent bd5a938 commit ac5c335
Show file tree
Hide file tree
Showing 32 changed files with 1,532 additions and 562 deletions.
33 changes: 33 additions & 0 deletions go.work.sum
Original file line number Diff line number Diff line change
@@ -1,19 +1,52 @@
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
github.com/consensys/gnark-crypto v0.8.0 h1:HHmhTEzHq6k/fJroPGzq8Biafn2X2IFKlKDhaL5gMHU=
github.com/consensys/gnark-crypto v0.8.0/go.mod h1:ZTnSzNlt98CpwYIJyk6q/KVcshYWr3fOXXFrrY8a0QQ=
github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
github.com/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY=
github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29 h1:B1PEwpArrNp4dkQrfxh/abbBAOZBVp0ds+fBEOUOqOc=
github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg=
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/supranational/blst v0.3.8-0.20220526154634-513d2456b344/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20220727055044-e65921a090b8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0=
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
1 change: 1 addition & 0 deletions ops/config/tss-manager-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ keygen_timeout = "1m"
cpk_confirm_timeout = "10s"
ask_timeout = "1m"
sign_timeout = "2m"
private_key = ""
21 changes: 6 additions & 15 deletions ops/scripts/deployer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,16 @@ echo "test point1"
if [ $CONTRACTS_TARGET_NETWORK == "local" ] ;then
DEPLOY_CMD="npx hardhat deploy --network $CONTRACTS_TARGET_NETWORK"

# # fraud proof verifier deploy
# DEPLOY_VERIFIER="npx hardhat deployVerifier --verifier $VERIFIER_ENTRY_ADDRESS"
#
# # whiteListInit
# WHITELIST_INIT="npx hardhat whiteListInit --delegation $Proxy__FraudProofDelegation --manager $Proxy__FraudProofDelegationManager"
#
# # registerAsOperator
# REGISTER_AS_OPERATOR="npx hardhat registerAsOperator --delegation $Proxy__FraudProofDelegation"
#
# # fraud proof rollup stake
# ROLLUP_STAKE="npx hardhat rollupStake --manager $Proxy__FraudProofDelegationManager"
# # whiteListInit
# WHITELIST_INIT="npx hardhat whiteListInit --delegation $ROLLUP_CONTRACT_ADDRESS"
# # fraud proof verifier deploy
# DEPLOY_VERIFIER="npx hardhat deployVerifier --verifier $VERIFIER_ENTRY_ADDRESS"

echo "Deploying contracts. Deployment command:"
echo "$DEPLOY_CMD"
eval "$DEPLOY_CMD"
echo "done DEPLOY_CMD"
# echo "$DEPLOY_VERIFIER"
# eval "$DEPLOY_VERIFIER"
# echo "done DEPLOY_VERIFIER"
# echo "$DEPLOY_VERIFIER"
# eval "$DEPLOY_VERIFIER"
# echo "$WHITELIST_INIT"
# eval "$WHITELIST_INIT"
# echo "done WHITELIST_INIT"
Expand Down
42 changes: 21 additions & 21 deletions packages/contracts/addresses.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{
"Proxy__Verifier": "0x4f958F2C2303BDca22b739339cD633F8543BB07D",
"FraudProofDelegationSlasher": "0x91dC1bd9704151B0Bc4cAD3BB5c24494188aA00B",
"Proxy__Verifier": "0x8eC353337d109C0f8eef2200021D28C542CAe8E6",
"ChainStorageContainer-SCC-batches": "0x0090171f848B2aa86918E5Ef2406Ab3d424fdd83",
"Proxy__AssertionMap": "0x86E10B59cFDFeFBCf3ED5b40D018949CbFCE8B59",
"Proxy__AssertionMap": "0x88e7b36Ae38D502e4Df97e7240560B77F6B4a58E",
"BVM_EigenDataLayrFee": "0x5BA7b75fE6fE4412713acc62EC3e9eA87e4B8282",
"StateCommitmentChain": "0x8BAccFF561FDe61D6bC8B6f299fFBa561d2189B9",
"Proxy__FraudProofDelegationSlasher": "0x8eC353337d109C0f8eef2200021D28C542CAe8E6",
"TestBitToken": "0x92aBAD50368175785e4270ca9eFd169c949C4ce1",
"TssDelegationSlasher": "0xa83239cf2b900682001f9144144B5E5e5788A631",
"TssDelegation": "0x82e130FF187E787D5DdDFAa4f36CB59e6B1Da6dd",
"ChainStorageContainer-CTC-batches": "0x7A8B94a9fA2bb0581D2EEA2fEd875FCA97494612",
"Proxy__BVM_L1StandardBridge": "0x52753615226F8aC8a464bfecb11Ef798CFF3793f",
"Rollup": "0x2eC3980EcddA68E073c39afD44909f8fe0fE3000",
"Proxy__FraudProofDelegation": "0x88e7b36Ae38D502e4Df97e7240560B77F6B4a58E",
"TssStakingSlashing": "0x36fCf02Fc651c0b7ef2ECA446Dd2405364F85337",
"Proxy__TssDelegationManager": "0xE6A251EefaEE70E8645FBAdf21E9B1246e07C374",
"Rollup": "0x91dC1bd9704151B0Bc4cAD3BB5c24494188aA00B",
"TssStakingSlashing": "0x7d0f87007795438DBCF67e4a91c03Bb3eDe152dE",
"BVM_L1CrossDomainMessenger": "0xD076364Fa5de1a4512c58b39ad63DD720B7B9E11",
"Proxy__TSS_GroupManager": "0xa83239cf2b900682001f9144144B5E5e5788A631",
"Proxy__TssDelegation": "0xe6cd9e7b620964bECd42c7Ad41e56724f515E284",
"Proxy__TSS_GroupManager": "0xF48398a3D94D57AE1406B343D2a7C541336Ea2c2",
"Proxy__TssDelegationSlasher": "0xD007896d9E3e4514a1f1216A91d33a72e15bf5C0",
"Proxy__BVM_EigenDataLayrFee": "0xeeC65aC2497dFE595b382132E0a35E73e93f2166",
"Lib_AddressManager": "0x19C22f181280dF6Ad1d97285cdD430173Df91C12",
"VerifierEntry": "0x9109811E8eEe02520219612bB5D47C60c382F4aa",
"AddressDictator": "0xE6A251EefaEE70E8645FBAdf21E9B1246e07C374",
"BVM_EigenDataLayrChain": "0xc2E4F2038D456AfEFfF2351234BCaFCB6837baC1",
"VerifierEntry": "0x1eeAdb6C93161a34b2eBE9994fD73d6B7Bc70817",
"AddressDictator": "0xC346c14AA2c1001eee47CCEc1404D193ab1667Ab",
"BVM_EigenDataLayrChain": "0x4f958F2C2303BDca22b739339cD633F8543BB07D",
"CanonicalTransactionChain": "0x9faB987C9C469EB23Da31B7848B28aCf30905eA8",
"TssGroupManager": "0x82e130FF187E787D5DdDFAa4f36CB59e6B1Da6dd",
"FraudProofDelegation": "0xb416faEaEf670632Db2Ad66558e74aaD6518FB84",
"L1StandardBridge_for_verification_only": "0xdf3BD218A936A92be5e43592143ecc7a33cef514",
"Proxy__FraudProofDelegationManager": "0x90c9E4f7F11C93BCec2e1F272b2063640d3bb264",
"FraudProofDelegationManager": "0x1eeAdb6C93161a34b2eBE9994fD73d6B7Bc70817",
"ChugSplashDictator": "0x18DF7d7Cc40928f07d3EF0e5404b41F97e8560Ad",
"Proxy__BVM_EigenDataLayrChain": "0x5a0069E211A28cBD1a7dbD585877596FeD07805b",
"TssGroupManager": "0x1FB27316e91e477943A87Eb215E40Fab6b382Fda",
"L1StandardBridge_for_verification_only": "0x86E10B59cFDFeFBCf3ED5b40D018949CbFCE8B59",
"TssDelegationManager": "0x36fCf02Fc651c0b7ef2ECA446Dd2405364F85337",
"ChugSplashDictator": "0x1Edd37fc504513bAa00D782E52478d0a3f675553",
"Proxy__BVM_EigenDataLayrChain": "0x8013ac56e4c4A562b72a6D8B39D60cDa7aE173A9",
"Proxy__BVM_L1CrossDomainMessenger": "0xd9e2F450525079e1e29fB23Bc7Caca6F61f8fD4a",
"Proxy__TSS_StakingSlashing": "0xe6cd9e7b620964bECd42c7Ad41e56724f515E284",
"Proxy__TSS_StakingSlashing": "0x9c28c8D298ae7Ebf8daA6FA54e1F2909313dB158",
"BondManager": "0xEd5166f12FCb48a0804B62FDccB37f59F1F1bc3B",
"AssertionMap": "0x1Edd37fc504513bAa00D782E52478d0a3f675553",
"Proxy__Rollup": "0x8013ac56e4c4A562b72a6D8B39D60cDa7aE173A9",
"AssertionMap": "0xb416faEaEf670632Db2Ad66558e74aaD6518FB84",
"Proxy__Rollup": "0x90c9E4f7F11C93BCec2e1F272b2063640d3bb264",
"AddressManager": "0x19C22f181280dF6Ad1d97285cdD430173Df91C12"
}
42 changes: 21 additions & 21 deletions packages/contracts/addresses.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
0x4f958F2C2303BDca22b739339cD633F8543BB07D
0x91dC1bd9704151B0Bc4cAD3BB5c24494188aA00B
0x8eC353337d109C0f8eef2200021D28C542CAe8E6
0x0090171f848B2aa86918E5Ef2406Ab3d424fdd83
0x86E10B59cFDFeFBCf3ED5b40D018949CbFCE8B59
0x88e7b36Ae38D502e4Df97e7240560B77F6B4a58E
0x5BA7b75fE6fE4412713acc62EC3e9eA87e4B8282
0x8BAccFF561FDe61D6bC8B6f299fFBa561d2189B9
0x8eC353337d109C0f8eef2200021D28C542CAe8E6
0x92aBAD50368175785e4270ca9eFd169c949C4ce1
0xa83239cf2b900682001f9144144B5E5e5788A631
0x82e130FF187E787D5DdDFAa4f36CB59e6B1Da6dd
0x7A8B94a9fA2bb0581D2EEA2fEd875FCA97494612
0x52753615226F8aC8a464bfecb11Ef798CFF3793f
0x2eC3980EcddA68E073c39afD44909f8fe0fE3000
0x88e7b36Ae38D502e4Df97e7240560B77F6B4a58E
0x36fCf02Fc651c0b7ef2ECA446Dd2405364F85337
0xE6A251EefaEE70E8645FBAdf21E9B1246e07C374
0x91dC1bd9704151B0Bc4cAD3BB5c24494188aA00B
0x7d0f87007795438DBCF67e4a91c03Bb3eDe152dE
0xD076364Fa5de1a4512c58b39ad63DD720B7B9E11
0xa83239cf2b900682001f9144144B5E5e5788A631
0xe6cd9e7b620964bECd42c7Ad41e56724f515E284
0xF48398a3D94D57AE1406B343D2a7C541336Ea2c2
0xD007896d9E3e4514a1f1216A91d33a72e15bf5C0
0xeeC65aC2497dFE595b382132E0a35E73e93f2166
0x19C22f181280dF6Ad1d97285cdD430173Df91C12
0x9109811E8eEe02520219612bB5D47C60c382F4aa
0xE6A251EefaEE70E8645FBAdf21E9B1246e07C374
0xc2E4F2038D456AfEFfF2351234BCaFCB6837baC1
0x9faB987C9C469EB23Da31B7848B28aCf30905eA8
0x82e130FF187E787D5DdDFAa4f36CB59e6B1Da6dd
0xb416faEaEf670632Db2Ad66558e74aaD6518FB84
0xdf3BD218A936A92be5e43592143ecc7a33cef514
0x90c9E4f7F11C93BCec2e1F272b2063640d3bb264
0x1eeAdb6C93161a34b2eBE9994fD73d6B7Bc70817
0x18DF7d7Cc40928f07d3EF0e5404b41F97e8560Ad
0x5a0069E211A28cBD1a7dbD585877596FeD07805b
0xd9e2F450525079e1e29fB23Bc7Caca6F61f8fD4a
0xe6cd9e7b620964bECd42c7Ad41e56724f515E284
0xEd5166f12FCb48a0804B62FDccB37f59F1F1bc3B
0xC346c14AA2c1001eee47CCEc1404D193ab1667Ab
0x4f958F2C2303BDca22b739339cD633F8543BB07D
0x9faB987C9C469EB23Da31B7848B28aCf30905eA8
0x1FB27316e91e477943A87Eb215E40Fab6b382Fda
0x86E10B59cFDFeFBCf3ED5b40D018949CbFCE8B59
0x36fCf02Fc651c0b7ef2ECA446Dd2405364F85337
0x1Edd37fc504513bAa00D782E52478d0a3f675553
0x8013ac56e4c4A562b72a6D8B39D60cDa7aE173A9
0xd9e2F450525079e1e29fB23Bc7Caca6F61f8fD4a
0x9c28c8D298ae7Ebf8daA6FA54e1F2909313dB158
0xEd5166f12FCb48a0804B62FDccB37f59F1F1bc3B
0xb416faEaEf670632Db2Ad66558e74aaD6518FB84
0x90c9E4f7F11C93BCec2e1F272b2063640d3bb264
Loading

0 comments on commit ac5c335

Please sign in to comment.