diff --git a/Adamant/Wallets/Ethereum/EthWalletService+DynamicConstants.swift b/Adamant/Wallets/Ethereum/EthWalletService+DynamicConstants.swift index 9abe34fd9..154d74a48 100644 --- a/Adamant/Wallets/Ethereum/EthWalletService+DynamicConstants.swift +++ b/Adamant/Wallets/Ethereum/EthWalletService+DynamicConstants.swift @@ -78,6 +78,7 @@ extension EthWalletService { static var nodes: [Node] { [ Node(url: URL(string: "https://ethnode1.adamant.im")!), +Node(url: URL(string: "https://ethnode2.adamant.im")!), ] } diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/Contents.json b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/Contents.json new file mode 100644 index 000000000..055207333 --- /dev/null +++ b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "bzz_notification.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "bzz_notification@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "bzz_notification@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification.png new file mode 100644 index 000000000..0b5e05228 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification@2x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification@2x.png new file mode 100644 index 000000000..adbe96388 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification@2x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification@3x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification@3x.png new file mode 100644 index 000000000..e31fa972d Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_notification.imageset/bzz_notification@3x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/Contents.json b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/Contents.json new file mode 100644 index 000000000..7e0d5dc00 --- /dev/null +++ b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "bzz_wallet.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "bzz_wallet@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "bzz_wallet@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet.png new file mode 100644 index 000000000..0b5e05228 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet@2x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet@2x.png new file mode 100644 index 000000000..adbe96388 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet@2x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet@3x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet@3x.png new file mode 100644 index 000000000..e31fa972d Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet.imageset/bzz_wallet@3x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/Contents.json b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/Contents.json new file mode 100644 index 000000000..eb1c615ff --- /dev/null +++ b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "bzz_wallet_row.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "bzz_wallet_row@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "bzz_wallet_row@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row.png new file mode 100644 index 000000000..0b5e05228 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row@2x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row@2x.png new file mode 100644 index 000000000..adbe96388 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row@2x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row@3x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row@3x.png new file mode 100644 index 000000000..e31fa972d Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/bzz_wallet_row.imageset/bzz_wallet_row@3x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/Contents.json b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/Contents.json new file mode 100644 index 000000000..be0f6fb5b --- /dev/null +++ b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "flux_notification.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "flux_notification@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "flux_notification@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification.png new file mode 100644 index 000000000..b74647910 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification@2x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification@2x.png new file mode 100644 index 000000000..99e558b70 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification@2x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification@3x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification@3x.png new file mode 100644 index 000000000..0275aab8d Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_notification.imageset/flux_notification@3x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/Contents.json b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/Contents.json new file mode 100644 index 000000000..205f3d260 --- /dev/null +++ b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "flux_wallet.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "flux_wallet@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "flux_wallet@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet.png new file mode 100644 index 000000000..b74647910 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet@2x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet@2x.png new file mode 100644 index 000000000..99e558b70 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet@2x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet@3x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet@3x.png new file mode 100644 index 000000000..0275aab8d Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet.imageset/flux_wallet@3x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/Contents.json b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/Contents.json new file mode 100644 index 000000000..04453b061 --- /dev/null +++ b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "flux_wallet_row.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "flux_wallet_row@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "flux_wallet_row@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row.png new file mode 100644 index 000000000..b74647910 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row@2x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row@2x.png new file mode 100644 index 000000000..99e558b70 Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row@2x.png differ diff --git a/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row@3x.png b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row@3x.png new file mode 100644 index 000000000..0275aab8d Binary files /dev/null and b/CommonKit/Sources/CommonKit/Assets/Shared.xcassets/Wallets/flux_wallet_row.imageset/flux_wallet_row@3x.png differ diff --git a/CommonKit/Sources/CommonKit/Models/ethereumTokensList.swift b/CommonKit/Sources/CommonKit/Models/ethereumTokensList.swift index 2961e7f60..22b1dcdf9 100644 --- a/CommonKit/Sources/CommonKit/Models/ethereumTokensList.swift +++ b/CommonKit/Sources/CommonKit/Models/ethereumTokensList.swift @@ -27,6 +27,18 @@ defaultGasPriceGwei: 30, defaultGasLimit: 58000, warningGasPriceGwei: 70), + ERC20Token(symbol: "BZZ", + name: "Swarm", + contractAddress: "0x19062190B1925b5b6689D7073fDfC8c2976EF8Cb", + decimals: 16, + naturalUnits: 16, + defaultVisibility: true, + defaultOrdinalLevel: 95, + reliabilityGasPricePercent: 10, + reliabilityGasLimitPercent: 10, + defaultGasPriceGwei: 30, + defaultGasLimit: 58000, + warningGasPriceGwei: 70), ERC20Token(symbol: "DAI", name: "Dai", contractAddress: "0x6b175474e89094c44da98b954eedeac495271d0f", @@ -51,6 +63,18 @@ defaultGasPriceGwei: 30, defaultGasLimit: 58000, warningGasPriceGwei: 70), + ERC20Token(symbol: "FLUX", + name: "Flux", + contractAddress: "0x720CD16b011b987Da3518fbf38c3071d4F0D1495", + decimals: 8, + naturalUnits: 8, + defaultVisibility: true, + defaultOrdinalLevel: 90, + reliabilityGasPricePercent: 10, + reliabilityGasLimitPercent: 10, + defaultGasPriceGwei: 30, + defaultGasLimit: 58000, + warningGasPriceGwei: 70), ERC20Token(symbol: "HOT", name: "Holo", contractAddress: "0x6c6ee5e31d828de241282b9606c8e98ea48526e2", @@ -152,8 +176,8 @@ contractAddress: "0x00c83aecc790e8a4453e5dd3b0b4b3680501a7a7", decimals: 18, naturalUnits: 18, - defaultVisibility: false, - defaultOrdinalLevel: nil, + defaultVisibility: true, + defaultOrdinalLevel: 85, reliabilityGasPricePercent: 10, reliabilityGasLimitPercent: 10, defaultGasPriceGwei: 30, diff --git a/NotificationServiceExtension/WalletImages/bzz_notificationContent.png b/NotificationServiceExtension/WalletImages/bzz_notificationContent.png new file mode 100644 index 000000000..e31fa972d Binary files /dev/null and b/NotificationServiceExtension/WalletImages/bzz_notificationContent.png differ diff --git a/NotificationServiceExtension/WalletImages/flux_notificationContent.png b/NotificationServiceExtension/WalletImages/flux_notificationContent.png new file mode 100644 index 000000000..0275aab8d Binary files /dev/null and b/NotificationServiceExtension/WalletImages/flux_notificationContent.png differ