Merge pull request algorand#2 from ori-shem-tov/feature/asa-global-freeze

update "asset_holding_get" and "asset_params_get" opcodes

Author: nullun

data/transactions/logic/eval.go

@@ -2894,11 +2894,13 @@ func opUncover(cx *EvalContext) error {
 	return nil
 }
 
-func (cx *EvalContext) assetHoldingToValue(holding *basics.AssetHolding, fs assetHoldingFieldSpec) (sv stackValue, err error) {
+func (cx *EvalContext) assetHoldingToValue(holding *basics.AssetHolding, fs assetHoldingFieldSpec, params *basics.AssetParams) (sv stackValue, err error) {
 	switch fs.field {
 	case AssetBalance:
 		sv.Uint = holding.Amount
 	case AssetFrozen:
+		sv.Uint = boolToUint(holding.Frozen || params.GlobalFrozen)
+	case AccountFrozen:
 		sv.Uint = boolToUint(holding.Frozen)
 	default:
 		return sv, fmt.Errorf("invalid asset_holding_get field %d", fs.field)
@@ -2936,6 +2938,8 @@ func (cx *EvalContext) assetParamsToValue(params *basics.AssetParams, creator ba
 		sv.Bytes = params.Clawback[:]
 	case AssetCreator:
 		sv.Bytes = creator[:]
+	case AssetGlobalFrozen:
+		sv.Uint = boolToUint(params.GlobalFrozen)
 	default:
 		return sv, fmt.Errorf("invalid asset_params_get field %d", fs.field)
 	}
@@ -4918,12 +4922,15 @@ func opAssetHoldingGet(cx *EvalContext) error {
 
 	var exist uint64 = 0
 	var value stackValue
-	if holding, err := cx.Ledger.AssetHolding(addr, asset); err == nil {
-		// the holding exists, read the value
-		exist = 1
-		value, err = cx.assetHoldingToValue(&holding, fs)
-		if err != nil {
-			return err
+	if params, _, err := cx.Ledger.AssetParams(asset); err == nil {
+		// params exist, fetch the holding
+		if holding, err := cx.Ledger.AssetHolding(addr, asset); err == nil {
+			// the holding exists, read the value
+			exist = 1
+			value, err = cx.assetHoldingToValue(&holding, fs, &params)
+			if err != nil {
+				return err
+			}
 		}
 	}
 

data/transactions/logic/fields.go

@@ -1147,8 +1147,11 @@ type AssetHoldingField int
 const (
 	// AssetBalance AssetHolding.Amount
 	AssetBalance AssetHoldingField = iota
-	// AssetFrozen AssetHolding.Frozen
+	// AssetFrozen AssetHolding.Frozen || AssetParams.GlobalFrozen
 	AssetFrozen
+	// AccountFrozen AssetHolding.Frozen
+	AccountFrozen
+
 	invalidAssetHoldingField // compile-time constant for number of fields
 )
 
@@ -1180,6 +1183,7 @@ func (fs assetHoldingFieldSpec) Note() string {
 var assetHoldingFieldSpecs = [...]assetHoldingFieldSpec{
 	{AssetBalance, StackUint64, 2, "Amount of the asset unit held by this account"},
 	{AssetFrozen, StackBoolean, 2, "Is the asset frozen or not"},
+	{AccountFrozen, StackBoolean, 12, "Is the account frozen or not"},
 }
 
 func assetHoldingFieldSpecByField(f AssetHoldingField) (assetHoldingFieldSpec, bool) {
@@ -1235,6 +1239,9 @@ const (
 	// AssetCreator is not *in* the Params, but it is uniquely determined.
 	AssetCreator
 
+	// AssetGlobalFrozen AssetParams.GlobalFrozen
+	AssetGlobalFrozen
+
 	invalidAssetParamsField // compile-time constant for number of fields
 )
 
@@ -1276,6 +1283,7 @@ var assetParamsFieldSpecs = [...]assetParamsFieldSpec{
 	{AssetFreeze, StackAddress, 2, "Freeze address"},
 	{AssetClawback, StackAddress, 2, "Clawback address"},
 	{AssetCreator, StackAddress, 5, "Creator address"},
+	{AssetGlobalFrozen, StackBoolean, 12, "Is the asset frozen globally or not"},
 }
 
 func assetParamsFieldSpecByField(f AssetParamsField) (assetParamsFieldSpec, bool) {