Merge pull request #133 from telosnetwork/develop

v1.3.0-rc
telosnetwork · Feb 22, 2023 · 1348ba2 · 1348ba2
2 parents ecca501 + 5b6f5a0
commit 1348ba2
Show file tree

Hide file tree

Showing 12 changed files with 599 additions and 7 deletions.
diff --git a/env.js b/env.js
@@ -12,6 +12,7 @@ const sharedEnv = {
 
 const TESTNET = {
   ...sharedEnv,
+  FUEL_RPC: "", // no Fuel support for Test-net yet
   APP_NAME: "Telos Web Wallet (testnet)",
   NETWORK_HOST: "testnet.telos.net",
   NETWORK_CHAIN_ID:
@@ -24,6 +25,7 @@ const TESTNET = {
 
 const MAINNET = {
   ...sharedEnv,
+  FUEL_RPC: "telos.greymass.com",
   APP_NAME: "Telos Web Wallet",
   NETWORK_HOST: "mainnet.telos.net",
   NETWORK_CHAIN_ID:

diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "dependencies": {
+    "@greymass/eosio": "^0.6.8",
     "@eosrio/hyperion-stream-client": "^0.4.0-beta.5",
     "@quasar/extras": "^1.0.0",
     "@telosnetwork/ual-cleos": "1.13.1",

diff --git a/quasar.conf.js b/quasar.conf.js
@@ -23,7 +23,7 @@ module.exports = function(/* ctx */) {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
     // https://quasar.dev/quasar-cli/boot-files
-    boot: ["ual", "hyperion", "i18n", "api", "errorHandling", "helpers", "mixin", "emitter", "telosApi"],
+    boot: ["ual", "hyperion", "i18n", "fuel", "api", "errorHandling", "helpers", "mixin", "emitter", "telosApi"],
 
     // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
     css: ["app.scss"],