Commit a71a8963 authored by linj's avatar linj Committed by vipwzw

add fork for unfreeze id

parent 73c71b49
...@@ -48,6 +48,9 @@ func (u *Unfreeze) Exec_Create(payload *pty.UnfreezeCreate, tx *types.Transactio ...@@ -48,6 +48,9 @@ func (u *Unfreeze) Exec_Create(payload *pty.UnfreezeCreate, tx *types.Transactio
// Exec_Withdraw 执行冻结合约中提币 // Exec_Withdraw 执行冻结合约中提币
func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transaction, index int) (*types.Receipt, error) { func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transaction, index int) (*types.Receipt, error) {
if types.IsDappFork(u.GetHeight(), pty.UnfreezeX, pty.ForkUnfreezeIDX) {
payload.UnfreezeID = string(unfreezeID([]byte(payload.UnfreezeID)))
}
unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB()) unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -84,6 +87,9 @@ func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transa ...@@ -84,6 +87,9 @@ func (u *Unfreeze) Exec_Withdraw(payload *pty.UnfreezeWithdraw, tx *types.Transa
// Exec_Terminate 执行终止冻结合约 // Exec_Terminate 执行终止冻结合约
func (u *Unfreeze) Exec_Terminate(payload *pty.UnfreezeTerminate, tx *types.Transaction, index int) (*types.Receipt, error) { func (u *Unfreeze) Exec_Terminate(payload *pty.UnfreezeTerminate, tx *types.Transaction, index int) (*types.Receipt, error) {
if types.IsDappFork(u.GetHeight(), pty.UnfreezeX, pty.ForkUnfreezeIDX) {
payload.UnfreezeID = string(unfreezeID([]byte(payload.UnfreezeID)))
}
unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB()) unfreeze, err := loadUnfreeze(payload.UnfreezeID, u.GetStateDB())
if err != nil { if err != nil {
return nil, err return nil, err
......
...@@ -44,4 +44,5 @@ var ( ...@@ -44,4 +44,5 @@ var (
SupportMeans = []string{"FixAmount", "LeftProportion"} SupportMeans = []string{"FixAmount", "LeftProportion"}
ForkTerminatePartX = "ForkTerminatePart" ForkTerminatePartX = "ForkTerminatePart"
ForkUnfreezeIDX = "ForkUnfreezeIDX"
) )
...@@ -26,6 +26,7 @@ func init() { ...@@ -26,6 +26,7 @@ func init() {
types.RegistorExecutor(name, NewType()) types.RegistorExecutor(name, NewType())
types.RegisterDappFork(name, "Enable", 0) types.RegisterDappFork(name, "Enable", 0)
types.RegisterDappFork(name, ForkTerminatePartX, 1298600) types.RegisterDappFork(name, ForkTerminatePartX, 1298600)
types.RegisterDappFork(name, ForkUnfreezeIDX, 1450000)
} }
//getRealExecName //getRealExecName
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment