Merge pull request #934 from ergoplatform/v3.1.1

Version 3.1.1 candidate
ergoplatform · Oct 8, 2019 · 79cea8b · 79cea8b
2 parents 63567cb + 651b3a4
commit 79cea8b
Show file tree

Hide file tree

Showing 25 changed files with 119 additions and 45 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -1,3 +1,3 @@
-# Freqently Asked Questions
+# Frequently Asked Questions
 
-TODO
+TODO, currently you can find a FAQ at [https://ergoplatform.org/en/faq/](https://ergoplatform.org/en/faq/)
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ import sbt._
 lazy val commonSettings = Seq(
   organization := "org.ergoplatform",
   name := "ergo",
-  version := "3.1.0",
+  version := "3.1.1",
   scalaVersion := "2.12.8",
   resolvers ++= Seq("Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/",
     "SonaType" at "https://oss.sonatype.org/content/groups/public",

diff --git a/src/main/resources/api/openapi.yaml b/src/main/resources/api/openapi.yaml
@@ -1790,6 +1790,38 @@ paths:
               schema:
                 $ref: '#/components/schemas/ApiError'
 
+  /wallet/status:
+    get:
+      security:
+        - ApiKeyAuth: [api_key]
+      summary: Get wallet status
+      operationId: getWalletStatus
+      tags:
+        - wallet
+      responses:
+        '200':
+          description: Wallet status
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - isInitialized
+                  - isUnlocked
+                properties:
+                  isInitialized:
+                    type: boolean
+                    description: true if wallet is initialized, false otherwise
+                  isUnlocked:
+                    type: boolean
+                    description: true if wallet is unlocked, false otherwise
+        default:
+          description: Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApiError'
+
   /wallet/updateChangeAddress:
     post:
       security:

diff --git a/src/main/resources/panel/asset-manifest.json b/src/main/resources/panel/asset-manifest.json
@@ -1,19 +1,26 @@
 {
   "files": {
     "main.css": "./static/css/main.c5c128ff.chunk.css",
-    "main.js": "./static/js/main.1a1bc9ea.chunk.js",
-    "main.js.map": "./static/js/main.1a1bc9ea.chunk.js.map",
-    "runtime~main.js": "./static/js/runtime~main.386b75ac.js",
-    "runtime~main.js.map": "./static/js/runtime~main.386b75ac.js.map",
-    "static/css/2.1564013a.chunk.css": "./static/css/2.1564013a.chunk.css",
-    "static/js/2.1df3e7a8.chunk.js": "./static/js/2.1df3e7a8.chunk.js",
-    "static/js/2.1df3e7a8.chunk.js.map": "./static/js/2.1df3e7a8.chunk.js.map",
+    "main.js": "./static/js/main.60fde85b.chunk.js",
+    "main.js.map": "./static/js/main.60fde85b.chunk.js.map",
+    "runtime-main.js": "./static/js/runtime-main.b33e8ba4.js",
+    "runtime-main.js.map": "./static/js/runtime-main.b33e8ba4.js.map",
+    "static/css/2.d35aef79.chunk.css": "./static/css/2.d35aef79.chunk.css",
+    "static/js/2.08e66f1b.chunk.js": "./static/js/2.08e66f1b.chunk.js",
+    "static/js/2.08e66f1b.chunk.js.map": "./static/js/2.08e66f1b.chunk.js.map",
     "index.html": "./index.html",
-    "precache-manifest.11c512c6184eb77f0e46fac7fc1b39a6.js": "./precache-manifest.11c512c6184eb77f0e46fac7fc1b39a6.js",
+    "precache-manifest.9588a4c36f6d783dfe8877e2810d6746.js": "./precache-manifest.9588a4c36f6d783dfe8877e2810d6746.js",
     "service-worker.js": "./service-worker.js",
-    "static/css/2.1564013a.chunk.css.map": "./static/css/2.1564013a.chunk.css.map",
+    "static/css/2.d35aef79.chunk.css.map": "./static/css/2.d35aef79.chunk.css.map",
     "static/css/main.c5c128ff.chunk.css.map": "./static/css/main.c5c128ff.chunk.css.map",
     "static/media/index.scss": "./static/media/Roboto-Thin.89e2666c.ttf",
     "static/media/logotype_white.svg": "./static/media/logotype_white.4dcfd639.svg"
-  }
+  },
+  "entrypoints": [
+    "static/js/runtime-main.b33e8ba4.js",
+    "static/css/2.d35aef79.chunk.css",
+    "static/js/2.08e66f1b.chunk.js",
+    "static/css/main.c5c128ff.chunk.css",
+    "static/js/main.60fde85b.chunk.js"
+  ]
 }
diff --git a/src/main/resources/panel/index.html b/src/main/resources/panel/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><title>Ergo node interface</title><link href="./static/css/2.1564013a.chunk.css" rel="stylesheet"><link href="./static/css/main.c5c128ff.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u||[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window["webpackJsonpergo-node-interface"]=window["webpackJsonpergo-node-interface"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./static/js/2.1df3e7a8.chunk.js"></script><script src="./static/js/main.1a1bc9ea.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><title>Ergo node interface</title><link href="./static/css/2.d35aef79.chunk.css" rel="stylesheet"><link href="./static/css/main.c5c128ff.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u||[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./static/js/2.08e66f1b.chunk.js"></script><script src="./static/js/main.60fde85b.chunk.js"></script></body></html>
diff --git a/...ifest.11c512c6184eb77f0e46fac7fc1b39a6.js → ...ifest.9588a4c36f6d783dfe8877e2810d6746.js b/...ifest.11c512c6184eb77f0e46fac7fc1b39a6.js → ...ifest.9588a4c36f6d783dfe8877e2810d6746.js
@@ -1,27 +1,27 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "388b3a1726252e89032a1e1c874e3ea6",
+    "revision": "1261b6b357d515beb5d5804cfeea14ed",
     "url": "./index.html"
   },
   {
-    "revision": "4cedbd0b540cf4e03a3b",
-    "url": "./static/css/2.1564013a.chunk.css"
+    "revision": "10451752e4cc354bf818",
+    "url": "./static/css/2.d35aef79.chunk.css"
   },
   {
-    "revision": "b59db3f89ab6bf56db33",
+    "revision": "0a21cfdd500501b9d5d0",
     "url": "./static/css/main.c5c128ff.chunk.css"
   },
   {
-    "revision": "4cedbd0b540cf4e03a3b",
-    "url": "./static/js/2.1df3e7a8.chunk.js"
+    "revision": "10451752e4cc354bf818",
+    "url": "./static/js/2.08e66f1b.chunk.js"
   },
   {
-    "revision": "b59db3f89ab6bf56db33",
-    "url": "./static/js/main.1a1bc9ea.chunk.js"
+    "revision": "0a21cfdd500501b9d5d0",
+    "url": "./static/js/main.60fde85b.chunk.js"
   },
   {
-    "revision": "ebd091d794dc5ebda6f0",
-    "url": "./static/js/runtime~main.386b75ac.js"
+    "revision": "882c49c2018e9455f457",
+    "url": "./static/js/runtime-main.b33e8ba4.js"
   },
   {
     "revision": "012cf6a10129e2275d79d6adac7f3b02",

diff --git a/src/main/resources/panel/service-worker.js b/src/main/resources/panel/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "./precache-manifest.11c512c6184eb77f0e46fac7fc1b39a6.js"
+  "./precache-manifest.9588a4c36f6d783dfe8877e2810d6746.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/...ces/panel/static/css/2.1564013a.chunk.css → ...ces/panel/static/css/2.d35aef79.chunk.css b/...ces/panel/static/css/2.1564013a.chunk.css → ...ces/panel/static/css/2.d35aef79.chunk.css
diff --git a/...panel/static/css/2.1564013a.chunk.css.map → ...panel/static/css/2.d35aef79.chunk.css.map b/...panel/static/css/2.1564013a.chunk.css.map → ...panel/static/css/2.d35aef79.chunk.css.map
diff --git a/src/main/resources/panel/static/js/2.08e66f1b.chunk.js b/src/main/resources/panel/static/js/2.08e66f1b.chunk.js
diff --git a/src/main/resources/panel/static/js/2.08e66f1b.chunk.js.map b/src/main/resources/panel/static/js/2.08e66f1b.chunk.js.map
diff --git a/src/main/resources/panel/static/js/2.1df3e7a8.chunk.js b/src/main/resources/panel/static/js/2.1df3e7a8.chunk.js
diff --git a/src/main/resources/panel/static/js/2.1df3e7a8.chunk.js.map b/src/main/resources/panel/static/js/2.1df3e7a8.chunk.js.map
diff --git a/src/main/resources/panel/static/js/main.1a1bc9ea.chunk.js b/src/main/resources/panel/static/js/main.1a1bc9ea.chunk.js
diff --git a/src/main/resources/panel/static/js/main.1a1bc9ea.chunk.js.map b/src/main/resources/panel/static/js/main.1a1bc9ea.chunk.js.map
diff --git a/src/main/resources/panel/static/js/main.60fde85b.chunk.js b/src/main/resources/panel/static/js/main.60fde85b.chunk.js
diff --git a/src/main/resources/panel/static/js/main.60fde85b.chunk.js.map b/src/main/resources/panel/static/js/main.60fde85b.chunk.js.map
diff --git a/.../panel/static/js/runtime~main.386b75ac.js → .../panel/static/js/runtime-main.b33e8ba4.js b/.../panel/static/js/runtime~main.386b75ac.js → .../panel/static/js/runtime-main.b33e8ba4.js