get props => [coin, name, ticker, token.address];
+}
diff --git a/lib/models/balance.dart b/lib/models/balance.dart
index 0589ac90d..aa9f04bde 100644
--- a/lib/models/balance.dart
+++ b/lib/models/balance.dart
@@ -1,15 +1,21 @@
import 'dart:convert';
-import 'package:decimal/decimal.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
-import 'package:stackwallet/utilities/format.dart';
+
+enum Unit {
+ base,
+ u,
+ m,
+ normal;
+}
class Balance {
final Coin coin;
- final int total;
- final int spendable;
- final int blockedTotal;
- final int pendingSpendable;
+ final Amount total;
+ final Amount spendable;
+ final Amount blockedTotal;
+ final Amount pendingSpendable;
Balance({
required this.coin,
@@ -19,36 +25,64 @@ class Balance {
required this.pendingSpendable,
});
- Decimal getTotal({bool includeBlocked = true}) => Format.satoshisToAmount(
- includeBlocked ? total : total - blockedTotal,
- coin: coin,
- );
+ // Decimal getTotal({bool includeBlocked = true}) => Format.satoshisToAmount(
+ // includeBlocked ? total : total - blockedTotal,
+ // coin: coin,
+ // );
+ //
+ // Decimal getSpendable() => Format.satoshisToAmount(
+ // spendable,
+ // coin: coin,
+ // );
+ //
+ // Decimal getPending() => Format.satoshisToAmount(
+ // pendingSpendable,
+ // coin: coin,
+ // );
+ //
+ // Decimal getBlocked() => Format.satoshisToAmount(
+ // blockedTotal,
+ // coin: coin,
+ // );
- Decimal getSpendable() => Format.satoshisToAmount(
- spendable,
- coin: coin,
- );
-
- Decimal getPending() => Format.satoshisToAmount(
- pendingSpendable,
- coin: coin,
- );
-
- Decimal getBlocked() => Format.satoshisToAmount(
- blockedTotal,
- coin: coin,
- );
-
- String toJsonIgnoreCoin() => jsonEncode(toMap()..remove("coin"));
+ String toJsonIgnoreCoin() => jsonEncode({
+ "total": total.toJsonString(),
+ "spendable": spendable.toJsonString(),
+ "blockedTotal": blockedTotal.toJsonString(),
+ "pendingSpendable": pendingSpendable.toJsonString(),
+ });
+ // need to fall back to parsing from in due to cached balances being previously
+ // stored as int values instead of Amounts
factory Balance.fromJson(String json, Coin coin) {
final decoded = jsonDecode(json);
return Balance(
coin: coin,
- total: decoded["total"] as int,
- spendable: decoded["spendable"] as int,
- blockedTotal: decoded["blockedTotal"] as int,
- pendingSpendable: decoded["pendingSpendable"] as int,
+ total: decoded["total"] is String
+ ? Amount.fromSerializedJsonString(decoded["total"] as String)
+ : Amount(
+ rawValue: BigInt.from(decoded["total"] as int),
+ fractionDigits: coin.decimals,
+ ),
+ spendable: decoded["spendable"] is String
+ ? Amount.fromSerializedJsonString(decoded["spendable"] as String)
+ : Amount(
+ rawValue: BigInt.from(decoded["spendable"] as int),
+ fractionDigits: coin.decimals,
+ ),
+ blockedTotal: decoded["blockedTotal"] is String
+ ? Amount.fromSerializedJsonString(decoded["blockedTotal"] as String)
+ : Amount(
+ rawValue: BigInt.from(decoded["blockedTotal"] as int),
+ fractionDigits: coin.decimals,
+ ),
+ pendingSpendable: decoded["pendingSpendable"] is String
+ ? Amount.fromSerializedJsonString(
+ decoded["pendingSpendable"] as String)
+ : Amount(
+ rawValue: BigInt.from(decoded["pendingSpendable"] as int),
+ fractionDigits: coin.decimals,
+ ),
);
}
diff --git a/lib/models/isar/exchange_cache/currency.dart b/lib/models/isar/exchange_cache/currency.dart
index 81471a3d1..1744f9350 100644
--- a/lib/models/isar/exchange_cache/currency.dart
+++ b/lib/models/isar/exchange_cache/currency.dart
@@ -44,11 +44,16 @@ class Currency {
@Index()
final bool isStackCoin;
- @ignore
- bool get supportsFixedRate => rateType == SupportedRateType.fixed || rateType == SupportedRateType.both;
+ final String? tokenContract;
@ignore
- bool get supportsEstimatedRate => rateType == SupportedRateType.estimated || rateType == SupportedRateType.both;
+ bool get supportsFixedRate =>
+ rateType == SupportedRateType.fixed || rateType == SupportedRateType.both;
+
+ @ignore
+ bool get supportsEstimatedRate =>
+ rateType == SupportedRateType.estimated ||
+ rateType == SupportedRateType.both;
Currency({
required this.exchangeName,
@@ -61,6 +66,7 @@ class Currency {
required this.rateType,
this.isAvailable,
required this.isStackCoin,
+ required this.tokenContract,
});
factory Currency.fromJson(
@@ -83,6 +89,7 @@ class Currency {
isAvailable: json["isAvailable"] as bool?,
isStackCoin:
json["isStackCoin"] as bool? ?? Currency.checkIsStackCoin(ticker),
+ tokenContract: json["tokenContract"] as String?,
)..id = json["id"] as int?;
} catch (e) {
rethrow;
@@ -102,6 +109,7 @@ class Currency {
"rateType": rateType,
"isAvailable": isAvailable,
"isStackCoin": isStackCoin,
+ "tokenContract": tokenContract,
};
return map;
@@ -119,6 +127,7 @@ class Currency {
SupportedRateType? rateType,
bool? isAvailable,
bool? isStackCoin,
+ String? tokenContract,
}) {
return Currency(
exchangeName: exchangeName ?? this.exchangeName,
@@ -131,6 +140,7 @@ class Currency {
rateType: rateType ?? this.rateType,
isAvailable: isAvailable ?? this.isAvailable,
isStackCoin: isStackCoin ?? this.isStackCoin,
+ tokenContract: tokenContract ?? this.tokenContract,
)..id = id ?? this.id;
}
diff --git a/lib/models/isar/exchange_cache/currency.g.dart b/lib/models/isar/exchange_cache/currency.g.dart
index 02c58cadd..8f81bfdc0 100644
--- a/lib/models/isar/exchange_cache/currency.g.dart
+++ b/lib/models/isar/exchange_cache/currency.g.dart
@@ -67,6 +67,11 @@ const CurrencySchema = CollectionSchema(
id: 9,
name: r'ticker',
type: IsarType.string,
+ ),
+ r'tokenContract': PropertySchema(
+ id: 10,
+ name: r'tokenContract',
+ type: IsarType.string,
)
},
estimateSize: _currencyEstimateSize,
@@ -150,6 +155,12 @@ int _currencyEstimateSize(
bytesCount += 3 + object.name.length * 3;
bytesCount += 3 + object.network.length * 3;
bytesCount += 3 + object.ticker.length * 3;
+ {
+ final value = object.tokenContract;
+ if (value != null) {
+ bytesCount += 3 + value.length * 3;
+ }
+ }
return bytesCount;
}
@@ -169,6 +180,7 @@ void _currencySerialize(
writer.writeString(offsets[7], object.network);
writer.writeByte(offsets[8], object.rateType.index);
writer.writeString(offsets[9], object.ticker);
+ writer.writeString(offsets[10], object.tokenContract);
}
Currency _currencyDeserialize(
@@ -190,6 +202,7 @@ Currency _currencyDeserialize(
_CurrencyrateTypeValueEnumMap[reader.readByteOrNull(offsets[8])] ??
SupportedRateType.fixed,
ticker: reader.readString(offsets[9]),
+ tokenContract: reader.readStringOrNull(offsets[10]),
);
object.id = id;
return object;
@@ -223,6 +236,8 @@ P _currencyDeserializeProp(
SupportedRateType.fixed) as P;
case 9:
return (reader.readString(offset)) as P;
+ case 10:
+ return (reader.readStringOrNull(offset)) as P;
default:
throw IsarError('Unknown property with id $propertyId');
}
@@ -1533,6 +1548,158 @@ extension CurrencyQueryFilter
));
});
}
+
+ QueryBuilder
+ tokenContractIsNull() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(const FilterCondition.isNull(
+ property: r'tokenContract',
+ ));
+ });
+ }
+
+ QueryBuilder
+ tokenContractIsNotNull() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(const FilterCondition.isNotNull(
+ property: r'tokenContract',
+ ));
+ });
+ }
+
+ QueryBuilder tokenContractEqualTo(
+ String? value, {
+ bool caseSensitive = true,
+ }) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.equalTo(
+ property: r'tokenContract',
+ value: value,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder
+ tokenContractGreaterThan(
+ String? value, {
+ bool include = false,
+ bool caseSensitive = true,
+ }) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.greaterThan(
+ include: include,
+ property: r'tokenContract',
+ value: value,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder tokenContractLessThan(
+ String? value, {
+ bool include = false,
+ bool caseSensitive = true,
+ }) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.lessThan(
+ include: include,
+ property: r'tokenContract',
+ value: value,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder tokenContractBetween(
+ String? lower,
+ String? upper, {
+ bool includeLower = true,
+ bool includeUpper = true,
+ bool caseSensitive = true,
+ }) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.between(
+ property: r'tokenContract',
+ lower: lower,
+ includeLower: includeLower,
+ upper: upper,
+ includeUpper: includeUpper,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder
+ tokenContractStartsWith(
+ String value, {
+ bool caseSensitive = true,
+ }) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.startsWith(
+ property: r'tokenContract',
+ value: value,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder tokenContractEndsWith(
+ String value, {
+ bool caseSensitive = true,
+ }) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.endsWith(
+ property: r'tokenContract',
+ value: value,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder tokenContractContains(
+ String value,
+ {bool caseSensitive = true}) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.contains(
+ property: r'tokenContract',
+ value: value,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder tokenContractMatches(
+ String pattern,
+ {bool caseSensitive = true}) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.matches(
+ property: r'tokenContract',
+ wildcard: pattern,
+ caseSensitive: caseSensitive,
+ ));
+ });
+ }
+
+ QueryBuilder
+ tokenContractIsEmpty() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.equalTo(
+ property: r'tokenContract',
+ value: '',
+ ));
+ });
+ }
+
+ QueryBuilder
+ tokenContractIsNotEmpty() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.greaterThan(
+ property: r'tokenContract',
+ value: '',
+ ));
+ });
+ }
}
extension CurrencyQueryObject
@@ -1661,6 +1828,18 @@ extension CurrencyQuerySortBy on QueryBuilder {
return query.addSortBy(r'ticker', Sort.desc);
});
}
+
+ QueryBuilder sortByTokenContract() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'tokenContract', Sort.asc);
+ });
+ }
+
+ QueryBuilder sortByTokenContractDesc() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'tokenContract', Sort.desc);
+ });
+ }
}
extension CurrencyQuerySortThenBy
@@ -1796,6 +1975,18 @@ extension CurrencyQuerySortThenBy
return query.addSortBy(r'ticker', Sort.desc);
});
}
+
+ QueryBuilder thenByTokenContract() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'tokenContract', Sort.asc);
+ });
+ }
+
+ QueryBuilder thenByTokenContractDesc() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'tokenContract', Sort.desc);
+ });
+ }
}
extension CurrencyQueryWhereDistinct
@@ -1865,6 +2056,14 @@ extension CurrencyQueryWhereDistinct
return query.addDistinctBy(r'ticker', caseSensitive: caseSensitive);
});
}
+
+ QueryBuilder distinctByTokenContract(
+ {bool caseSensitive = true}) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addDistinctBy(r'tokenContract',
+ caseSensitive: caseSensitive);
+ });
+ }
}
extension CurrencyQueryProperty
@@ -1935,4 +2134,10 @@ extension CurrencyQueryProperty
return query.addPropertyName(r'ticker');
});
}
+
+ QueryBuilder tokenContractProperty() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addPropertyName(r'tokenContract');
+ });
+ }
}
diff --git a/lib/models/isar/models/blockchain_data/address.dart b/lib/models/isar/models/blockchain_data/address.dart
index 770af4a6b..25281a629 100644
--- a/lib/models/isar/models/blockchain_data/address.dart
+++ b/lib/models/isar/models/blockchain_data/address.dart
@@ -122,7 +122,8 @@ enum AddressType {
cryptonote,
mimbleWimble,
unknown,
- nonWallet;
+ nonWallet,
+ ethereum;
String get readableName {
switch (this) {
@@ -140,6 +141,8 @@ enum AddressType {
return "Unknown";
case AddressType.nonWallet:
return "Non wallet/unknown";
+ case AddressType.ethereum:
+ return "Ethereum";
}
}
}
diff --git a/lib/models/isar/models/blockchain_data/address.g.dart b/lib/models/isar/models/blockchain_data/address.g.dart
index 37186584b..49188b395 100644
--- a/lib/models/isar/models/blockchain_data/address.g.dart
+++ b/lib/models/isar/models/blockchain_data/address.g.dart
@@ -260,6 +260,7 @@ const _AddresstypeEnumValueMap = {
'mimbleWimble': 4,
'unknown': 5,
'nonWallet': 6,
+ 'ethereum': 7,
};
const _AddresstypeValueEnumMap = {
0: AddressType.p2pkh,
@@ -269,6 +270,7 @@ const _AddresstypeValueEnumMap = {
4: AddressType.mimbleWimble,
5: AddressType.unknown,
6: AddressType.nonWallet,
+ 7: AddressType.ethereum,
};
Id _addressGetId(Address object) {
diff --git a/lib/models/isar/models/blockchain_data/transaction.dart b/lib/models/isar/models/blockchain_data/transaction.dart
index 191f62b46..39d2cc0af 100644
--- a/lib/models/isar/models/blockchain_data/transaction.dart
+++ b/lib/models/isar/models/blockchain_data/transaction.dart
@@ -5,6 +5,7 @@ import 'package:isar/isar.dart';
import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
import 'package:stackwallet/models/isar/models/blockchain_data/input.dart';
import 'package:stackwallet/models/isar/models/blockchain_data/output.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
import 'package:tuple/tuple.dart';
part 'transaction.g.dart';
@@ -18,6 +19,7 @@ class Transaction {
required this.type,
required this.subType,
required this.amount,
+ required this.amountString,
required this.fee,
required this.height,
required this.isCancelled,
@@ -26,6 +28,7 @@ class Transaction {
required this.otherData,
required this.inputs,
required this.outputs,
+ required this.nonce,
});
Tuple2 copyWith({
@@ -35,6 +38,7 @@ class Transaction {
TransactionType? type,
TransactionSubType? subType,
int? amount,
+ String? amountString,
int? fee,
int? height,
bool? isCancelled,
@@ -43,6 +47,7 @@ class Transaction {
String? otherData,
List? inputs,
List