Adding IsPayable flag and updating neoscan

NeoResearch · Oct 29, 2018 · 4a3e463 · 4a3e463
1 parent c5196ee
commit 4a3e463
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/build_everything.sh b/build_everything.sh
@@ -17,6 +17,7 @@ while [[ "$#" > 0 ]]; do case $1 in
         exit 0
         ;;
     --no-build)
+	echo "PARAMETER DISABLE_BUILD actived.";
         DISABLE_BUILD=1
         shift
         ;;

diff --git a/docker-compose-eco-network/docker-compose.yml b/docker-compose-eco-network/docker-compose.yml
@@ -10,6 +10,7 @@ services:
   eco-neo-csharp-node1-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-node1-running"
+    privileged: true
     ports: # config1.json
       - "20333:20333"
       - "30333:30333"
@@ -33,6 +34,7 @@ services:
   eco-neo-csharp-node2-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-node2-running"
+    privileged: true
     ports: #config2.json
       - "20334:20334"
     volumes:
@@ -54,6 +56,7 @@ services:
   eco-neo-csharp-node3-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-node3-running"
+    privileged: true
     ports: #config3.json
       - "20335:20335"
     volumes:
@@ -75,6 +78,7 @@ services:
   eco-neo-csharp-node4-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-node4-running"
+    privileged: true
     ports: #config4.json
       - "20336:20336"
     volumes:
@@ -96,6 +100,7 @@ services:
   eco-neo-csharp-noderpc1-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-noderpc1-running"
+    privileged: true
     ports: #config1RPC.json
       - "20337:20337"
       - "30337:30337"
@@ -118,6 +123,7 @@ services:
   eco-neo-csharp-noderpc2-running:
     image: eco-neo-csharp-node:latest
     container_name: "eco-neo-csharp-noderpc2-running"
+    privileged: true
     ports: #config2RPC.json
       - "20338:20338"
       - "30338:30338"
@@ -143,7 +149,7 @@ services:
 # ================================================================================
 # ================== BEGIN NEO-SCAN LIGHT WALLET INTERFACE AND POSTGRESS DB ======
   eco-neo-scan-api-running:
-    image: "registry.gitlab.com/cityofzion/neo-scan/api:32259754-master"
+    image: "registry.gitlab.com/cityofzion/neo-scan/api:34420572-master"
     container_name: "eco-neo-scan-api-running"
     ports:
       - "4000:4000"
@@ -193,7 +199,7 @@ services:
       DB_PASSWORD: postgres
       DB_DATABASE: neoscan_prodv
       REPLACE_OS_VARS: "true"
-    image: "registry.gitlab.com/cityofzion/neo-scan/sync:32259754-master"
+    image: "registry.gitlab.com/cityofzion/neo-scan/sync:34420572-master"
     links:
       - eco-neo-csharp-node1-running:30333
       - eco-neo-csharp-noderpc1-running:30337

diff --git a/public/js/common/neoEditorScripts.js b/public/js/common/neoEditorScripts.js
@@ -327,6 +327,10 @@
 		storage += 2;
 	}
 
+	if($("#cbx_ispayablejs")[0].checked) {
+		storage += 4;
+	}
+
 	console.log("Final attached gas should be:" + contractGasCost)
 
         Deploy(KNOWN_ADDRESSES[wI].addressBase58,KNOWN_ADDRESSES[wI].pKeyWif,contractGasCost,BASE_PATH_CLI, getCurrentNetworkNickname(),script,storage,rT,params)

diff --git a/public/partials/ecolab.html b/public/partials/ecolab.html
@@ -977,6 +977,13 @@ <h4>ABI:</h4>
                                     </label>
                                   </div>
                                 </div>
+                                <div class="form-group" style="margin-right: 8px">
+                                  <div class="checkbox">
+                                    <label>
+                                      <input type="checkbox" name="cbx_ispayable" id="cbx_ispayablejs"/> IsPayable
+                                    </label>
+                                  </div>
+                                </div>
                               </div>
 
                               <div class="col-md-6">