From 29f2f0ef17a6c1df1f4ef8dc087dffa9b0d67dd5 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Thu, 10 Dec 2020 18:45:01 +0300 Subject: [PATCH] [#23] *: Support NEP-17 in native asset transfers Now `transfer()` requires 4 arguments. Signed-off-by: Alex Vanin --- alphabet/alphabet.tpl | 4 ++-- alphabet/az/az_contract.go | 4 ++-- alphabet/buky/buky_contract.go | 4 ++-- alphabet/dobro/dobro_contract.go | 4 ++-- alphabet/glagoli/glagoli_contract.go | 4 ++-- alphabet/jest/jest_contract.go | 4 ++-- alphabet/vedi/vedi_contract.go | 4 ++-- alphabet/zhivete/zhivete_contract.go | 4 ++-- neofs/neofs_contract.go | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/alphabet/alphabet.tpl b/alphabet/alphabet.tpl index 265093f..27f6b67 100644 --- a/alphabet/alphabet.tpl +++ b/alphabet/alphabet.tpl @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/az/az_contract.go b/alphabet/az/az_contract.go index 00a7719..b01f365 100644 --- a/alphabet/az/az_contract.go +++ b/alphabet/az/az_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/buky/buky_contract.go b/alphabet/buky/buky_contract.go index 2e7c599..6c289f4 100644 --- a/alphabet/buky/buky_contract.go +++ b/alphabet/buky/buky_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/dobro/dobro_contract.go b/alphabet/dobro/dobro_contract.go index 4d3a020..b0e2957 100644 --- a/alphabet/dobro/dobro_contract.go +++ b/alphabet/dobro/dobro_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/glagoli/glagoli_contract.go b/alphabet/glagoli/glagoli_contract.go index a7e5440..cb4cb7a 100644 --- a/alphabet/glagoli/glagoli_contract.go +++ b/alphabet/glagoli/glagoli_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/jest/jest_contract.go b/alphabet/jest/jest_contract.go index f2a6676..152dc00 100644 --- a/alphabet/jest/jest_contract.go +++ b/alphabet/jest/jest_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/vedi/vedi_contract.go b/alphabet/vedi/vedi_contract.go index b17408b..a5f623b 100644 --- a/alphabet/vedi/vedi_contract.go +++ b/alphabet/vedi/vedi_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/alphabet/zhivete/zhivete_contract.go b/alphabet/zhivete/zhivete_contract.go index d6a18cc..2a76f6f 100644 --- a/alphabet/zhivete/zhivete_contract.go +++ b/alphabet/zhivete/zhivete_contract.go @@ -125,7 +125,7 @@ func Emit() bool { contractHash := runtime.GetExecutingScriptHash() neo := balance(neoHash, contractHash) - _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo) + _ = contract.Call([]byte(neoHash), "transfer", contractHash, contractHash, neo, nil) gas := balance(gasHash, contractHash) gasPerNode := gas * 7 / 8 / len(innerRingKeys) @@ -139,7 +139,7 @@ func Emit() bool { node := innerRingKeys[i] address := contract.CreateStandardAccount(node.key) - _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode) + _ = contract.Call([]byte(gasHash), "transfer", contractHash, address, gasPerNode, nil) } runtime.Log("utility token has been emitted to inner ring nodes") diff --git a/neofs/neofs_contract.go b/neofs/neofs_contract.go index 7c2dbca..a2838e6 100644 --- a/neofs/neofs_contract.go +++ b/neofs/neofs_contract.go @@ -183,7 +183,7 @@ func InnerRingCandidateAdd(key []byte) bool { to := runtime.GetExecutingScriptHash() fee := getConfig(ctx, candidateFeeConfigKey).(int) - transferred := contract.Call([]byte(tokenHash), "transfer", from, to, fee).(bool) + transferred := contract.Call([]byte(tokenHash), "transfer", from, to, fee, nil).(bool) if !transferred { panic("irCandidateAdd: failed to transfer funds, aborting") } @@ -211,7 +211,7 @@ func Deposit(from []byte, amount int, rcv []byte) bool { to := runtime.GetExecutingScriptHash() - transferred := contract.Call([]byte(tokenHash), "transfer", from, to, amount).(bool) + transferred := contract.Call([]byte(tokenHash), "transfer", from, to, amount, nil).(bool) if !transferred { panic("deposit: failed to transfer funds, aborting") } @@ -277,7 +277,7 @@ func Cheque(id, user []byte, amount int, lockAcc []byte) bool { from := runtime.GetExecutingScriptHash() - transferred := contract.Call([]byte(tokenHash), "transfer", from, user, amount).(bool) + transferred := contract.Call([]byte(tokenHash), "transfer", from, user, amount, nil).(bool) if !transferred { panic("cheque: failed to transfer funds, aborting") }