Merge pull request #744 from signum-network/develop

Merge for 3.7.0 release
signum-network · May 1, 2023 · bd747d7 · bd747d7
2 parents 655890c + aadf006
commit bd747d7
Show file tree

Hide file tree

Showing 163 changed files with 4,536 additions and 537 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,9 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.signum-network:signumj:v0.20.0'
-    compile 'io.reactivex:rxjava:1.3.8'
+    compile 'com.github.signum-network:signumj:v1.3.1'
+
+    compile 'io.reactivex.rxjava2:rxjava:2.2.15'
     compile 'org.bouncycastle:bcprov-jdk15on:1.69'
     compile 'org.ehcache:ehcache:3.9.9'
     compile 'org.flywaydb:flyway-core:8.2.0'

diff --git a/conf/junit/node-default.properties b/conf/junit/node-default.properties
@@ -0,0 +1,8 @@
+#######################################################################
+# Mock configuration file                                             #
+#######################################################################
+
+# Mock mining for junit tests, in-memory db (offline and accepting any nonce as valid)
+node.network = signum.net.MockNetwork
+
+DB.Url=jdbc:h2:mem:signum-mock;DB_CLOSE_ON_EXIT=FALSE
diff --git a/conf/mock/node-default.properties b/conf/mock/node-default.properties
@@ -0,0 +1,6 @@
+#######################################################################
+# Mock configuration file                                             #
+#######################################################################
+
+# Mock mining (offline and accepting any nonce as valid)
+node.network = signum.net.MockNetwork
diff --git a/conf/node-default.properties b/conf/node-default.properties
@@ -333,6 +333,12 @@
 
 # SoloMiningPassphrases=passphrase1;passphrase2;passphrase3;
 
+## List of semicolon-separated passphrases to use when solo mining but with a reward recipient set.
+## Your miner account is the one you provide only the id, while the account which you set
+## your reward recipient is the one you provide the passphrase here.
+
+# RewardRecipientPassphrases=id1:passphrase1;id2:passphrase2;id3:passphrase3;
+
 ## Allow anyone to use the "submitNonce" API call. This call can be abused to force your node to perform lots
 ## of work in order to effectively mine for others. Enabling this option will only allow accounts whose passphrases
 ## are in SoloMiningPassphrases to mine through this node.

diff --git a/conf/testnet/node-default.properties b/conf/testnet/node-default.properties
@@ -0,0 +1,6 @@
+#######################################################################
+# Testnet configuration file                                          #
+#######################################################################
+
+# Testnet network
+node.network = signum.net.TestnetNetwork
diff --git a/html/api-doc/signum-api.json b/html/api-doc/signum-api.json
diff --git a/html/ui/assets/index.js b/html/ui/assets/index.js
@@ -2,29 +2,31 @@ const nodeUrl = location.origin
 const preferredWalletKey = 'preferred-wallet'
 
 async function getNodeVersion() {
-    const url = `${nodeUrl}/burst?requestType=getState`
-    const res = await fetch(url)
+  const url = `${nodeUrl}/api?requestType=getBlockchainStatus`
+  const res = await fetch(url)
 
-    if (!res.ok) {
-        console.error('Request to peer failed', res.status)
-        return ''
-    }
+  if (!res.ok) {
+    console.error('Request to peer failed', res.status)
+    return ''
+  }
 
-    const {version} = await res.json()
-    return version
+  const {version} = await res.json()
+  return version
 }
 
-function selectedWallet(name){
-    if(document.getElementById('remember-wallet__checkbox').checked){
-        localStorage.setItem(preferredWalletKey,name)
-    }
+function selectedWallet(name) {
+  if (document.getElementById('remember-wallet__checkbox').checked) {
+    localStorage.setItem(preferredWalletKey, name)
+  }
 }
 
-(async () => {
-    const version = await getNodeVersion()
+(() => {
+  getNodeVersion().then((version) => {
     document.getElementById('version').textContent = version
-    const walletName = localStorage.getItem(preferredWalletKey)
-    if(walletName){
-        document.getElementById(`${walletName}-link`).click()
-    }
+  })
+  const walletName = localStorage.getItem(preferredWalletKey)
+  if (walletName) {
+    document.getElementById(`${walletName}-link`).click()
+  }
 })()
+
diff --git a/openapi/parameters/alias/tld.json b/openapi/parameters/alias/tld.json
@@ -0,0 +1,11 @@
+{
+  "name": "tld",
+  "in": "query",
+  "description": "The TLD (namespace) of an alias. If not given the default TLD `signum` is applied.",
+  "required": false,
+  "schema": {
+    "type": "string",
+    "maxLength": "40",
+    "pattern": "^[a-zA-Z0-9]{1,40}$"
+  }
+}
diff --git a/openapi/parameters/contract/includeDetails.json b/openapi/parameters/contract/includeDetails.json
@@ -0,0 +1,14 @@
+{
+  "name": "includeDetails",
+  "in": "query",
+  "allowEmptyValue": false,
+  "required": false,
+  "description": "If set `true` more details are being returned (Default: `true`). Use `false` and payload can be reduced by approx. 40%",
+  "schema": {
+    "type": "boolean",
+    "example": [
+      true,
+      false
+    ]
+  }
+}
diff --git a/openapi/paths/alias/buyAlias.json b/openapi/paths/alias/buyAlias.json
@@ -13,12 +13,15 @@
         "name": "aliasName",
         "in": "query",
         "allowEmptyValue": true,
-        "description": "Instead of `alias` you can use the alias' name also.",
+        "description": "Instead of `alias` you can use the alias' name also. But then you need to specify `tld` also, if it is different from default TLD `signum`",
         "schema": {
           "type": "string",
           "maxLength": 100
         }
       },
+      {
+        "$ref" : "../../parameters/alias/tld.json"
+      },
       {
         "name": "amountNQT",
         "in": "query",

diff --git a/openapi/paths/alias/sellAlias.json b/openapi/paths/alias/sellAlias.json
@@ -13,12 +13,15 @@
         "name": "aliasName",
         "in": "query",
         "allowEmptyValue": true,
-        "description": "Instead of `alias` you can use the alias' name also.",
+        "description": "Instead of `alias` you can use the alias' name also. But then you need to specify `tld` also, if it is different from default TLD `signum`",
         "schema": {
           "type": "string",
           "maxLength": 100
         }
       },
+      {
+        "$ref" : "../../parameters/alias/tld.json"
+      },
       {
         "name": "recipient",
         "in": "query",

diff --git a/openapi/paths/alias/setAlias.json b/openapi/paths/alias/setAlias.json
@@ -10,12 +10,23 @@
         "name": "aliasName",
         "in": "query",
         "required": true,
-        "allowEmptyValue": true,
         "description": "If not exists already, you create an alias with the given __unique__ name. If you are the owner of the alias, then you can update the content. - Like a database _upsert_ operation.",
         "schema": {
           "type": "string",
           "maxLength": 100,
-          "pattern": "^[a-zA-Z0-9]{1,100}$"
+          "pattern": "^[a-zA-Z0-9_]{1,100}$"
+        }
+      },
+      {
+        "name": "tld",
+        "in": "query",
+        "required": false,
+        "allowEmptyValue": true,
+        "description": "You can set an alias for a specific namespace aka TLD. The default (if left empty) is `signum`, but you can either acquire [your own TLD](https://github.com/signum-network/SIPs/blob/master/SIP/sip-48.md#custom-stld), or use one of the [freely available](https://github.com/signum-network/SIPs/blob/master/SIP/sip-48.md#stld-signum-top-level-domains).",
+        "schema": {
+          "type": "string",
+          "maxLength": 40,
+          "pattern": "^[a-zA-Z0-9]{1,40}$"
         }
       },
       {
@@ -46,6 +57,36 @@
       },
       {
         "$ref": "../../parameters/transaction/referencedTransactionFullHash.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/message.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageIsText.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncrypt.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncryptIsText.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptedMessageData.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptedMessageNonce.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncryptToSelf.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncryptToSelfIsText.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptToSelfMessageData.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptToSelfMessageNonce.json"
       }
     ],
     "responses": {

diff --git a/openapi/paths/alias/setTLD.json b/openapi/paths/alias/setTLD.json
@@ -0,0 +1,79 @@
+{
+  "post": {
+    "summary": "Set Custom Alias TLD",
+    "description": "Create a [Top Level Domain (TLD)](https://github.com/signum-network/SIPs/blob/master/SIP/sip-48.md) for aliases. A TLD is like a namespace for Aliases, such it is possible to have same Aliases in different TLDs.",
+    "tags": [
+      "alias"
+    ],
+    "parameters": [
+      {
+        "name": "tld",
+        "in": "query",
+        "required": true,
+        "allowEmptyValue": false,
+        "description": "Your custom TLD",
+        "schema": {
+          "type": "string",
+          "maxLength": 40,
+          "pattern": "^[a-zA-Z0-9]{1,40}$"
+        }
+      },
+      {
+        "$ref": "../../parameters/transaction/feeNQT.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/secretPhrase.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/publicKey.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/deadline.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/broadcast.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/referencedTransactionFullHash.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/message.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageIsText.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncrypt.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncryptIsText.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptedMessageData.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptedMessageNonce.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncryptToSelf.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/messageToEncryptToSelfIsText.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptToSelfMessageData.json"
+      },
+      {
+        "$ref": "../../parameters/transaction/encryptToSelfMessageNonce.json"
+      }
+    ],
+    "responses": {
+      "200": {
+        "$ref": "../../responses/transaction.json"
+      },
+      "500" : {
+        "$ref": "../../responses/error.json"
+      }
+    }
+  }
+}
diff --git a/openapi/paths/getters/getAT.json b/openapi/paths/getters/getAT.json
@@ -8,6 +8,9 @@
     "parameters": [
       {
         "$ref": "../../parameters/contract/at.json"
+      },
+      {
+        "$ref": "../../parameters/contract/includeDetails.json"
       }
     ],
     "responses": {

diff --git a/openapi/paths/getters/getATs.json b/openapi/paths/getters/getATs.json
@@ -0,0 +1,64 @@
+{
+  "get": {
+    "summary": "Get Contracts ",
+    "description": "Gets a list of smart contracts by their machin code hash",
+    "tags": [
+      "contract"
+    ],
+    "parameters": [
+      {
+        "name": "machineCodeHashId",
+        "in": "query",
+        "allowEmptyValue": false,
+        "required": true,
+        "description": "The machine code hash",
+        "schema": {
+          "type": "integer",
+          "format": "int64",
+          "example": [
+            "5817622329198284865",
+            "15155055045342098571"
+          ]
+        }
+      },
+      {
+        "$ref": "../../parameters/contract/includeDetails.json"
+      },
+      {
+        "$ref": "../../parameters/firstIndex.json"
+      },
+      {
+        "$ref": "../../parameters/lastIndex.json"
+      }
+    ],
+    "responses": {
+      "200": {
+        "description": "Contract List Response",
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object",
+              "required": [
+                "ats"
+              ],
+              "properties": {
+                "nextIndex": {
+                  "$ref": "../../schemas/nextIndex.json"
+                },
+                "ats": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "../../schemas/contract.json"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "500": {
+        "$ref": "../../responses/error.json"
+      }
+    }
+  }
+}
diff --git a/openapi/paths/getters/getAccountATs.json b/openapi/paths/getters/getAccountATs.json
@@ -18,6 +18,9 @@
         },
         "in": "query",
         "description": "This hash identifies a specific code. Using this parameter as additional filter to search only for a specific class of contracts, i.e. NFTSRC40.<br/>See also the [green contract specification](https://github.com/signum-network/SIPs/blob/master/SIP/sip-30.md)"
+      },
+      {
+        "$ref": "../../parameters/contract/includeDetails.json"
       }
     ],
     "responses": {