En 7630/esdt new built in funcs #2332

sasurobert · 2020-09-29T15:00:50Z

No description provided.

…iltInFuncs

SebastianMarian

Need some unit tests for these new builtin functions

SebastianMarian · 2020-09-29T20:12:48Z

process/smartContract/builtInFunctions/esdtBurn.go

+	return e, nil
+}
+
+// ProcessBuiltinFunction resolve ESDT function calls


SebastianMarian · 2020-09-29T20:16:18Z

process/smartContract/builtInFunctions/esdtFreezeWipe.go

+	return e, nil
+}
+
+// ProcessBuiltinFunction resolve ESDT function calls


SebastianMarian · 2020-09-29T20:20:17Z

process/smartContract/builtInFunctions/esdtPause.go

+	return e, nil
+}
+
+// ProcessBuiltinFunction resolve ESDT function calls


SebastianMarian · 2020-09-29T20:21:25Z

process/smartContract/builtInFunctions/esdtPause.go

+}
+
+func (e *esdtPause) togglePause(_ state.UserAccountHandler, _ []byte) error {
+


remove empty line

SebastianMarian · 2020-09-29T20:21:59Z

process/smartContract/builtInFunctions/esdtTransfer.go

@@ -43,20 +43,20 @@ func NewESDTTransferFunc(
 	return e, nil
 }

-// ProcessBuiltinFunction will transfer the underlying esdt balance of the account
+// ProcessBuiltinFunction resolve ESDT function calls


SebastianMarian · 2020-09-30T16:07:18Z

process/interface.go

+}
+
+// IsPayableHandler provides IsPayable function which returns if an account is payable or not
+type IsPayableHandler interface {


PayableHandler is enough

SebastianMarian · 2020-09-30T16:07:49Z

process/errors.go

+var ErrESDTIsFrozenForAccount = errors.New("account is frozen for this esdt token")
+
+// ErrNilIsPayableHandler signals that nil isPayableHandler was provided
+var ErrNilIsPayableHandler = errors.New("nil isPayableHandler was provided")


ErrNilPayableHandler is enough

SebastianMarian · 2020-09-30T16:08:38Z

process/mock/isPayableHandlerStub.go

+package mock
+
+// IsPayableHandlerStub -
+type IsPayableHandlerStub struct {


PayableHandlerStub is enough

SebastianMarian · 2020-09-30T16:29:34Z

process/smartContract/builtInFunctions/esdtTransfer.go

 }

 // NewESDTTransferFunc returns the esdt transfer built-in function component
 func NewESDTTransferFunc(
 	funcGasCost uint64,
 	marshalizer marshal.Marshalizer,
+	pauseHandler process.ESDTPauseHandler,


payableHandler is not sent and set but is used below. If there would have been some unit tests this would have not been happened :)

payableHandler is given via SET function. It is a chicken and egg problem in the constructors.

SebastianMarian · 2020-09-30T16:33:40Z

process/smartContract/builtInFunctions/esdtTransfer.go

@@ -187,6 +217,15 @@ func getESDTDataFromKey(
 	return esdtData, nil
 }

+func (e *esdtTransfer) setIsPayable(isPayableHandler process.IsPayableHandler) error {


payableHandler process.PayableHandler is enough

SebastianMarian · 2020-09-30T16:41:50Z

process/smartContract/builtInFunctions/factory.go

@@ -154,3 +156,20 @@ func createGasConfig(gasMap map[string]map[string]uint64) (*GasCost, error) {

 	return &gasCost, nil
 }
+
+// SetIsPayableHandler sets the payable interface to the needed functions
+func SetIsPayableHandler(container process.BuiltInFunctionContainer, isPayableHandler process.IsPayableHandler) error {


func SetPayableHandler(container process.BuiltInFunctionContainer, payableHandler process.PayableHandler)

SebastianMarian · 2020-09-30T16:45:17Z

process/smartContract/builtInFunctions/proto/esdt.proto

-	bytes Value  = 1 [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go/data.BigIntCaster"];
-	bool  Frozen = 2 [(gogoproto.jsontag) = "frozen"];
+	bytes Value      = 1 [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/ElrondNetwork/elrond-go/data.BigIntCaster"];
+	bytes Properties = 3 [(gogoproto.jsontag) = "properties"];


You deleted -> bool Frozen = 2 [(gogoproto.jsontag) = "frozen"];

SebastianMarian · 2020-09-30T16:56:54Z

process/smartContract/builtInFunctions/esdtTransfer.go

 	if err != nil {
 		return nil, err
 	}

 	return esdtData, nil
 }

+func (e *esdtTransfer) setIsPayable(isPayableHandler process.IsPayableHandler) error {


setPayable or setPayableHandler

ccorcoveanu · 2020-10-06T07:09:51Z

process/smartContract/builtInFunctions/esdtMetaData.go

+const lengthOfESDTMetadata = 2
+
+const (
+	METADATA_PAUSED = 1


Please rename to camel case, that's how we use constants everywhere

ccorcoveanu · 2020-10-06T07:10:42Z

process/smartContract/builtInFunctions/esdtMetaData.go

+}
+
+const (
+	METADATA_FROZEN = 1


Can we move constants up, too have them in the same place? Wold provide a better overview on the possible metadata

ccorcoveanu · 2020-10-06T07:26:26Z

process/smartContract/builtInFunctions/esdtFreezeWipe.go

+}
+
+// NewESDTFreezeWipeFunc returns the esdt freeze/un-freeze/wipe built-in function component
+func NewESDTFreezeWipeFunc(


I would rename this, so it won't have both freeze and wipe in the name. But I don't have a good enough suggestion right now, so if you also don't have a better idea, it can stay like this

yep, I did not have any good idea.

sasurobert added 5 commits September 29, 2020 12:44

started implementation of new builtin functions

0d2c7a4

Merge branch 'EN-7630/ESDT-burn-mint-freeze' into EN-7630/ESDT-new-bu…

bd89b46

…iltInFuncs

implementing new built in functions

1f2d0ea

Merge branch 'feat/ESDT-new-arwen' into EN-7630/ESDT-new-builtInFuncs

3a7f01c

small fix on tests.

6edbe64

SebastianMarian self-requested a review September 29, 2020 17:23

SebastianMarian reviewed Sep 29, 2020

View reviewed changes

ccorcoveanu self-requested a review September 30, 2020 06:25

sasurobert added 5 commits September 30, 2020 13:47

added new functions.

fe10f57

fix gasMap.go

e5bfd1b

fixed constructors

c706805

gasSchedule fix

c2fc508

fix after review

613fd2a

SebastianMarian reviewed Sep 30, 2020

View reviewed changes

sasurobert added 3 commits October 1, 2020 09:08

fix after review

6d7a95c

fix after review

3aa3f47

fix after review

96d9c8c

SebastianMarian previously approved these changes Oct 1, 2020

View reviewed changes

ccorcoveanu reviewed Oct 6, 2020

View reviewed changes

fixed after review

d66b88b

sasurobert dismissed SebastianMarian’s stale review via d66b88b October 6, 2020 08:01

ccorcoveanu approved these changes Oct 6, 2020

View reviewed changes

SebastianMarian approved these changes Oct 6, 2020

View reviewed changes

sasurobert merged commit 0545bab into feat/ESDT-new-arwen Oct 6, 2020

sasurobert deleted the EN-7630/ESDT-new-builtInFuncs branch October 6, 2020 09:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

En 7630/esdt new built in funcs #2332

En 7630/esdt new built in funcs #2332

sasurobert commented Sep 29, 2020

SebastianMarian left a comment

SebastianMarian Sep 29, 2020

sasurobert Sep 30, 2020

SebastianMarian Sep 29, 2020

sasurobert Sep 30, 2020

SebastianMarian Sep 29, 2020

sasurobert Sep 30, 2020

SebastianMarian Sep 29, 2020

sasurobert Sep 30, 2020

SebastianMarian Sep 29, 2020

sasurobert Sep 30, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

SebastianMarian Sep 30, 2020

sasurobert Oct 1, 2020

ccorcoveanu Oct 6, 2020

sasurobert Oct 6, 2020

ccorcoveanu Oct 6, 2020

sasurobert Oct 6, 2020

ccorcoveanu Oct 6, 2020

sasurobert Oct 6, 2020

		}

		func (e *esdtPause) togglePause(_ state.UserAccountHandler, _ []byte) error {

En 7630/esdt new built in funcs #2332

En 7630/esdt new built in funcs #2332

Conversation

sasurobert commented Sep 29, 2020

SebastianMarian left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment