achuprov/frostfs-contract
1
0
Fork 0
forked from TrueCloudLab/frostfs-contract
Code Pull requests Activity

[#151] container: require additional fee for nice-name

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-10-18 13:45:10 +03:00 committed by Alex Vanin
parent e1ee1c203c
commit c957b9ca69
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
container/container_contract.go
View file

@ -53,6 +53,8 @@ const (
// RegistrationFeeKey is a key in netmap config which contains fee for container registration. // RegistrationFeeKey is a key in netmap config which contains fee for container registration.
RegistrationFeeKey = "ContainerFee" RegistrationFeeKey = "ContainerFee"
// AliasFeeKey is a key in netmap config which contains fee for nice-name registration.
AliasFeeKey = "ContainerAliasFee"
containerIDSize = 32 // SHA256 size containerIDSize = 32 // SHA256 size
@ -180,6 +182,10 @@ func PutNamed(container []byte, signature interop.Signature,
balanceContractAddr := storage.Get(ctx, balanceContractKey).(interop.Hash160) balanceContractAddr := storage.Get(ctx, balanceContractKey).(interop.Hash160)
containerFee := contract.Call(netmapContractAddr, "config", contract.ReadOnly, RegistrationFeeKey).(int) containerFee := contract.Call(netmapContractAddr, "config", contract.ReadOnly, RegistrationFeeKey).(int)
balance := contract.Call(balanceContractAddr, "balanceOf", contract.ReadOnly, from).(int) balance := contract.Call(balanceContractAddr, "balanceOf", contract.ReadOnly, from).(int)
if name != "" {
aliasFee := contract.Call(netmapContractAddr, "config", contract.ReadOnly, AliasFeeKey).(int)
containerFee += aliasFee
}
if balance < containerFee*len(alphabet) { if balance < containerFee*len(alphabet) {
panic("insufficient balance to create container") panic("insufficient balance to create container")

19
tests/container_test.go
View file

@ -16,7 +16,10 @@ import (
const containerPath = "../container" const containerPath = "../container"
const containerFee = 0_0100_0000 const (
containerFee = 0_0100_0000
containerAliasFee = 0_0050_0000
)
func deployContainerContract(t *testing.T, bc *core.Blockchain, addrNetmap, addrBalance, addrNNS util.Uint160) util.Uint160 { func deployContainerContract(t *testing.T, bc *core.Blockchain, addrNetmap, addrBalance, addrNNS util.Uint160) util.Uint160 {
args := make([]interface{}, 6) args := make([]interface{}, 6)
@ -41,7 +44,9 @@ func prepareContainerContract(t *testing.T, bc *core.Blockchain) (util.Uint160,
ctrContainer, err := ContractInfo(CommitteeAcc.Contract.ScriptHash(), containerPath) ctrContainer, err := ContractInfo(CommitteeAcc.Contract.ScriptHash(), containerPath)
require.NoError(t, err) require.NoError(t, err)
deployNetmapContract(t, bc, ctrBalance.Hash, ctrContainer.Hash, container.RegistrationFeeKey, int64(containerFee)) deployNetmapContract(t, bc, ctrBalance.Hash, ctrContainer.Hash,
container.RegistrationFeeKey, int64(containerFee),
container.AliasFeeKey, int64(containerAliasFee))
balHash := deployBalanceContract(t, bc, ctrNetmap.Hash, ctrContainer.Hash) balHash := deployBalanceContract(t, bc, ctrNetmap.Hash, ctrContainer.Hash)
return deployContainerContract(t, bc, ctrNetmap.Hash, ctrBalance.Hash, addrNNS), balHash return deployContainerContract(t, bc, ctrNetmap.Hash, ctrBalance.Hash, addrNNS), balHash
} }
@ -96,6 +101,14 @@ func TestContainerPut(t *testing.T) {
balanceMint(t, bc, acc, balanceHash, containerFee*1, []byte{}) balanceMint(t, bc, acc, balanceHash, containerFee*1, []byte{})
putArgs := []interface{}{c.value, c.sig, c.pub, c.token, "mycnt", ""} putArgs := []interface{}{c.value, c.sig, c.pub, c.token, "mycnt", ""}
t.Run("no fee for alias", func(t *testing.T) {
tx = PrepareInvoke(t, bc, acc, h, "putNamed", putArgs...)
AddBlock(t, bc, tx)
CheckFault(t, bc, tx.Hash(), "insufficient balance to create container")
})
balanceMint(t, bc, acc, balanceHash, containerAliasFee*1, []byte{})
tx = PrepareInvoke(t, bc, CommitteeAcc, h, "putNamed", putArgs...) tx = PrepareInvoke(t, bc, CommitteeAcc, h, "putNamed", putArgs...)
AddBlockCheckHalt(t, bc, tx) AddBlockCheckHalt(t, bc, tx)
@ -131,7 +144,7 @@ func TestContainerPut(t *testing.T) {
"whateveriwant@world.com", int64(0), int64(0), int64(0), int64(0)) "whateveriwant@world.com", int64(0), int64(0), int64(0), int64(0))
AddBlockCheckHalt(t, bc, tx) AddBlockCheckHalt(t, bc, tx)
balanceMint(t, bc, acc, balanceHash, containerFee*1, []byte{}) balanceMint(t, bc, acc, balanceHash, (containerFee+containerAliasFee)*1, []byte{})
putArgs := []interface{}{c.value, c.sig, c.pub, c.token, "second", "neofs"} putArgs := []interface{}{c.value, c.sig, c.pub, c.token, "second", "neofs"}
tx = PrepareInvoke(t, bc, []*wallet.Account{CommitteeAcc, acc}, h, "putNamed", putArgs...) tx = PrepareInvoke(t, bc, []*wallet.Account{CommitteeAcc, acc}, h, "putNamed", putArgs...)