Skip to content
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

Jump to bottom

feat: distribute ZRC20 rewards function #3019

Merged
merged 23 commits into from
Oct 30, 2024
Merged

feat: distribute ZRC20 rewards function #3019

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
afac1d1
feat: distribute ZRC20 rewards function
fbac Oct 17, 2024
35b1c09
add unit testing first batch
fbac Oct 21, 2024
5592432
fix should return empty array if validators not set unit test
kingpinXD Oct 21, 2024
220a353
migrate to new test suite
fbac Oct 21, 2024
b174dc8
remove function depending on staking precompile
fbac Oct 21, 2024
4728c10
commit last unit test changes
fbac Oct 21, 2024
eae55f2
add e2e base
fbac Oct 24, 2024
5ea0fac
add distribution query client to e2e
fbac Oct 24, 2024
7da0e3a
e2e: finish disitribute tests
fbac Oct 24, 2024
36e36a8
Merge branch 'develop' into feat/staking-distribute-function
fbac Oct 24, 2024
884598c
fix event name typo
fbac Oct 24, 2024
7243c80
Update precompiles/types/coin.go
fbac Oct 25, 2024
95c9237
first batch of reviews
fbac Oct 25, 2024
2f35ee7
apply reviews
fbac Oct 28, 2024
d851eaf
add nonZRC20 token e2e test
fbac Oct 29, 2024
4eae5e2
add fee collector balance check
fbac Oct 29, 2024
d261f1c
Merge branch 'develop' into feat/staking-distribute-function
fbac Oct 29, 2024
f206701
check for err while DepositZRC20
fbac Oct 29, 2024
9584d03
fix CI
fbac Oct 29, 2024
adee5ee
Merge branch 'develop' into feat/staking-distribute-function
fbac Oct 29, 2024
dfd077e
fix gosec
fbac Oct 30, 2024
3b9903f
modify CreateCoinSet to accept a common.Address
fbac Oct 30, 2024
14289d6
fix lint
fbac Oct 30, 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
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* [2987](https://github.com/zeta-chain/node/pull/2987) - add non-EVM standard inbound memo package
* [2979](https://github.com/zeta-chain/node/pull/2979) - add fungible keeper ability to lock/unlock ZRC20 tokens
* [3012](https://github.com/zeta-chain/node/pull/3012) - integrate authenticated calls erc20 smart contract functionality into protocol
* [3019](https://github.com/zeta-chain/node/pull/3019) - add ditribute functions to staking precompile
fbac marked this conversation as resolved.
Show resolved Hide resolved

### Refactor

Expand Down
3 changes: 3 additions & 0 deletions cmd/zetacored/config/prefixes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ const (
// Bech32Prefix defines the Bech32 prefix used for Cronos Accounts
Bech32Prefix = "zeta"

// ZRC20DenomPrefix defines the prefix for ZRC20 tokens when converted to sdk.Coin.
ZRC20DenomPrefix = "zrc20/"

// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
Bech32PrefixAccAddr = Bech32Prefix
// Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
Expand Down
19 changes: 11 additions & 8 deletions cmd/zetae2e/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,17 @@ func localE2ETest(cmd *cobra.Command, _ []string) {

if !skipPrecompiles {
precompiledContractTests = []string{
e2etests.TestPrecompilesPrototypeName,
e2etests.TestPrecompilesPrototypeThroughContractName,
e2etests.TestPrecompilesStakingName,
// Disabled until further notice, check https://github.com/zeta-chain/node/issues/3005.
// e2etests.TestPrecompilesStakingThroughContractName,
e2etests.TestPrecompilesBankName,
e2etests.TestPrecompilesBankFailName,
e2etests.TestPrecompilesBankThroughContractName,
// e2etests.TestPrecompilesPrototypeName,
// e2etests.TestPrecompilesPrototypeThroughContractName,
// e2etests.TestPrecompilesStakingName,
// // Disabled until further notice, check https://github.com/zeta-chain/node/issues/3005.
// // e2etests.TestPrecompilesStakingThroughContractName,
// e2etests.TestPrecompilesBankName,
// e2etests.TestPrecompilesBankFailName,
// e2etests.TestPrecompilesBankThroughContractName,
e2etests.TestPrecompilesDistributeName,
e2etests.TestPrecompilesDistributeNonZRC20Name,
e2etests.TestPrecompilesDistributeThroughContractName,
}
}

Expand Down
64 changes: 64 additions & 0 deletions e2e/contracts/testdistribute/TestDistribute.abi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[
{
"inputs": [],
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "zrc20_distributor",
"type": "address"
},
{
"indexed": true,
"internalType": "address",
"name": "zrc20_token",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "amount",
"type": "uint256"
}
],
"name": "Distributed",
"type": "event"
},
{
"stateMutability": "payable",
"type": "fallback"
},
fbac marked this conversation as resolved.
Show resolved Hide resolved
{
"inputs": [
{
"internalType": "address",
"name": "zrc20",
"type": "address"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
}
],
"name": "distributeThroughContract",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
fbac marked this conversation as resolved.
Show resolved Hide resolved
{
"stateMutability": "payable",
"type": "receive"
}
]
1 change: 1 addition & 0 deletions e2e/contracts/testdistribute/TestDistribute.bin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
60a060405260666000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555034801561005157600080fd5b503373ffffffffffffffffffffffffffffffffffffffff1660808173ffffffffffffffffffffffffffffffffffffffff168152505060805161034d6100a06000396000606c015261034d6000f3fe6080604052600436106100225760003560e01c806350b54e841461002b57610029565b3661002957005b005b34801561003757600080fd5b50610052600480360381019061004d9190610201565b610068565b60405161005f919061025c565b60405180910390f35b60007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146100c257600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663fb93210884846040518363ffffffff1660e01b815260040161011d929190610295565b6020604051808303816000875af115801561013c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016091906102ea565b905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101988261016d565b9050919050565b6101a88161018d565b81146101b357600080fd5b50565b6000813590506101c58161019f565b92915050565b6000819050919050565b6101de816101cb565b81146101e957600080fd5b50565b6000813590506101fb816101d5565b92915050565b6000806040838503121561021857610217610168565b5b6000610226858286016101b6565b9250506020610237858286016101ec565b9150509250929050565b60008115159050919050565b61025681610241565b82525050565b6000602082019050610271600083018461024d565b92915050565b6102808161018d565b82525050565b61028f816101cb565b82525050565b60006040820190506102aa6000830185610277565b6102b76020830184610286565b9392505050565b6102c781610241565b81146102d257600080fd5b50565b6000815190506102e4816102be565b92915050565b600060208284031215610300576102ff610168565b5b600061030e848285016102d5565b9150509291505056fea26469706673582212205443ec313ecb8c2e08ca8a30687daed4c3b666f9318ae72ccbe9033479c8b8be64736f6c634300080a0033
Loading
Loading