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

Staking rename #563

Merged
merged 10 commits into from
Sep 19, 2024
Merged

Staking rename #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56fae8b
rename staking folder to validatorManager
iansuvak Sep 18, 2024
fcaf32c
remove staking abi-bindings
iansuvak Sep 18, 2024
44807c9
update imports
iansuvak Sep 18, 2024
3716819
rename more files
iansuvak Sep 18, 2024
622e6a8
validatorManager -> validator-manager
iansuvak Sep 18, 2024
a7998b8
Merge remote-tracking branch 'origin/staking-rewards' into staking-re…
iansuvak Sep 18, 2024
491ae79
Merge branch 'staking-rewards' into staking-rename
iansuvak Sep 18, 2024
b4ea1b3
rename more references
iansuvak Sep 19, 2024
71230b9
Merge remote-tracking branch 'origin/staking-rewards' into staking-re…
iansuvak Sep 19, 2024
f01daad
Merge remote-tracking branch 'origin/staking-contract' into staking-r…
iansuvak Sep 19, 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
0 ...takingManager/ERC20TokenStakingManager.go → ...takingManager/ERC20TokenStakingManager.go
View file
Open in desktop
File renamed without changes.
0 ...wardCalculator/ExampleRewardCalculator.go → ...wardCalculator/ExampleRewardCalculator.go
View file
Open in desktop
File renamed without changes.
0 ...akingManager/NativeTokenStakingManager.go → ...akingManager/NativeTokenStakingManager.go
View file
Open in desktop
File renamed without changes.
0 ...oAValidatorManager/PoAValidatorManager.go → ...oAValidatorManager/PoAValidatorManager.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion contracts/mocks/ExampleERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
ERC20Burnable,
ERC20
} from "@openzeppelin/[email protected]/token/ERC20/extensions/ERC20Burnable.sol";
import {IERC20Mintable} from "../staking/interfaces/IERC20Mintable.sol";
import {IERC20Mintable} from "../validator-manager/interfaces/IERC20Mintable.sol";

contract ExampleERC20 is ERC20Burnable, IERC20Mintable {
string private constant _TOKEN_NAME = "Mock Token";
Expand Down
0 ...acts/staking/ERC20TokenStakingManager.sol → ...ator-manager/ERC20TokenStakingManager.sol
View file
Open in desktop
File renamed without changes.
0 ...racts/staking/ExampleRewardCalculator.sol → ...dator-manager/ExampleRewardCalculator.sol
View file
Open in desktop
File renamed without changes.
0 ...cts/staking/NativeTokenStakingManager.sol → ...tor-manager/NativeTokenStakingManager.sol
View file
Open in desktop
File renamed without changes.
0 contracts/staking/PoAValidatorManager.sol → ...validator-manager/PoAValidatorManager.sol
View file
Open in desktop
File renamed without changes.
0 contracts/staking/PoSValidatorManager.sol → ...validator-manager/PoSValidatorManager.sol
View file
Open in desktop
File renamed without changes.
0 contracts/staking/README.md → contracts/validator-manager/README.md
View file
Open in desktop
File renamed without changes.
0 contracts/staking/ValidatorManager.sol → ...ts/validator-manager/ValidatorManager.sol
View file
Open in desktop
File renamed without changes.
0 contracts/staking/ValidatorMessages.sol → ...s/validator-manager/ValidatorMessages.sol
View file
Open in desktop
File renamed without changes.
0 ...cts/staking/interfaces/IERC20Mintable.sol → ...tor-manager/interfaces/IERC20Mintable.sol
View file
Open in desktop
File renamed without changes.
0 .../interfaces/IERC20TokenStakingManager.sol → .../interfaces/IERC20TokenStakingManager.sol
View file
Open in desktop
File renamed without changes.
0 ...interfaces/INativeTokenStakingManager.sol → ...interfaces/INativeTokenStakingManager.sol
View file
Open in desktop
File renamed without changes.
0 ...aking/interfaces/IPoAValidatorManager.sol → ...nager/interfaces/IPoAValidatorManager.sol
View file
Open in desktop
File renamed without changes.
0 ...aking/interfaces/IPoSValidatorManager.sol → ...nager/interfaces/IPoSValidatorManager.sol
View file
Open in desktop
File renamed without changes.
0 .../staking/interfaces/IRewardCalculator.sol → ...-manager/interfaces/IRewardCalculator.sol
View file
Open in desktop
File renamed without changes.
0 .../staking/interfaces/IValidatorManager.sol → ...-manager/interfaces/IValidatorManager.sol
View file
Open in desktop
File renamed without changes.
0 ...tests/ERC20TokenStakingManagerTests.t.sol → ...tests/ERC20TokenStakingManagerTests.t.sol
View file
Open in desktop
File renamed without changes.
0 ...tests/ExamplesRewardCalculatorTests.t.sol → ...tests/ExamplesRewardCalculatorTests.t.sol
View file
Open in desktop
File renamed without changes.
0 ...ests/NativeTokenStakingManagerTests.t.sol → ...ests/NativeTokenStakingManagerTests.t.sol
View file
Open in desktop
File renamed without changes.
0 ...king/tests/PoAValidatorManagerTests.t.sol → ...ager/tests/PoAValidatorManagerTests.t.sol
View file
Open in desktop
File renamed without changes.
0 ...king/tests/PoSValidatorManagerTests.t.sol → ...ager/tests/PoSValidatorManagerTests.t.sol
View file
Open in desktop
File renamed without changes.
0 ...staking/tests/ValidatorManagerTests.t.sol → ...manager/tests/ValidatorManagerTests.t.sol
View file
Open in desktop
File renamed without changes.
0 ...taking/tests/ValidatorMessagesTests.t.sol → ...anager/tests/ValidatorMessagesTests.t.sol
View file
Open in desktop
File renamed without changes.
0 tests/flows/staking/erc20_delegation.go → ...ows/validator-manager/erc20_delegation.go
View file
Open in desktop
File renamed without changes.
0 tests/flows/staking/erc20_token_staking.go → .../validator-manager/erc20_token_staking.go
View file
Open in desktop
File renamed without changes.
0 tests/flows/staking/native_delegation.go → ...ws/validator-manager/native_delegation.go
View file
Open in desktop
File renamed without changes.
0 tests/flows/staking/native_token_staking.go → ...validator-manager/native_token_staking.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/flows/staking/poa_to_pos.go → tests/flows/validator-manager/poa_to_pos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/NativeTokenStakingManager"
poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/PoAValidatorManager"
nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager"
poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager"
"github.com/ava-labs/teleporter/tests/interfaces"
"github.com/ava-labs/teleporter/tests/utils"
"github.com/ethereum/go-ethereum/crypto"
Expand Down
2 changes: 1 addition & 1 deletion tests/flows/staking/poa_validator_manager.go → ...alidator-manager/poa_validator_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/PoAValidatorManager"
poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager"
"github.com/ava-labs/teleporter/tests/interfaces"
"github.com/ava-labs/teleporter/tests/utils"
"github.com/ethereum/go-ethereum/crypto"
Expand Down
14 changes: 7 additions & 7 deletions tests/local/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"

"github.com/ava-labs/teleporter/tests/flows/governance"
"github.com/ava-labs/teleporter/tests/flows/staking"
"github.com/ava-labs/teleporter/tests/flows/teleporter"
"github.com/ava-labs/teleporter/tests/flows/teleporter/registry"
validatorManager "github.com/ava-labs/teleporter/tests/flows/validator-manager"
deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils"
"github.com/ethereum/go-ethereum/log"
"github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -200,31 +200,31 @@ var _ = ginkgo.Describe("[Teleporter integration tests]", func() {
ginkgo.It("Native token staking manager",
ginkgo.Label(validatorManagerLabel),
func() {
staking.NativeTokenStakingManager(LocalNetworkInstance)
validatorManager.NativeTokenStakingManager(LocalNetworkInstance)
})
ginkgo.It("ERC20 token staking manager",
ginkgo.Label(validatorManagerLabel),
func() {
staking.ERC20TokenStakingManager(LocalNetworkInstance)
validatorManager.ERC20TokenStakingManager(LocalNetworkInstance)
})
ginkgo.It("PoA validator manager",
ginkgo.Label(validatorManagerLabel),
func() {
staking.PoAValidatorManager(LocalNetworkInstance)
validatorManager.PoAValidatorManager(LocalNetworkInstance)
})
ginkgo.It("ERC20 delegation",
ginkgo.Label(validatorManagerLabel),
func() {
staking.ERC20Delegation(LocalNetworkInstance)
validatorManager.ERC20Delegation(LocalNetworkInstance)
})
ginkgo.It("Native token delegation",
ginkgo.Label(validatorManagerLabel),
func() {
staking.NativeDelegation(LocalNetworkInstance)
validatorManager.NativeDelegation(LocalNetworkInstance)
})
ginkgo.It("PoA migration to PoS",
ginkgo.Label(validatorManagerLabel),
func() {
staking.PoAMigrationToPoS(LocalNetworkInstance)
validatorManager.PoAMigrationToPoS(LocalNetworkInstance)
})
})
8 changes: 4 additions & 4 deletions tests/utils/staking.go → tests/utils/validator_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"github.com/ava-labs/subnet-evm/precompile/contracts/warp"
predicateutils "github.com/ava-labs/subnet-evm/predicate"
exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20"
erc20tokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/ERC20TokenStakingManager"
examplerewardcalculator "github.com/ava-labs/teleporter/abi-bindings/go/staking/ExampleRewardCalculator"
nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/NativeTokenStakingManager"
poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/PoAValidatorManager"
erc20tokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ERC20TokenStakingManager"
examplerewardcalculator "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ExampleRewardCalculator"
nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager"
poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager"
"github.com/ava-labs/teleporter/tests/interfaces"
"github.com/ethereum/go-ethereum/common"

Expand Down