Last updation

.github/workflows/Tests.yml

@@ -0,0 +1,19 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
+      - name: Run npm install
+        run: npm install
+      - name: Run Test
+        run: npm run test

.github/workflows/buildRelease.yml

@@ -0,0 +1,118 @@
+name: Create Distro
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  Linux-Distro:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+
+      - name: NPM install
+        shell: bash
+        run: |
+          cd /home/runner/work/izzzio/izzzio
+          npm install
+
+      - name: Create ZIP distro for Linux
+        shell: bash
+        run: |
+          cp $(which node) /home/runner/work/izzzio/izzzio/.
+          cd /home/runner/work/izzzio/
+          zip -r iz3node-linux-x64.zip izzzio/*
+
+      - name: Upload Linux distro
+        uses: actions/upload-artifact@v1
+        with:
+          name: iz3node-linux-x64.zip
+          path: /home/runner/work/izzzio/iz3node-linux-x64.zip
+
+  Get-Windows-Node-Files:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+
+      - name: NPM install
+        shell: cmd
+        run: npm install "d:\a\izzzio\izzzio"
+
+      - name: Upload Windows Node exe
+        uses: actions/upload-artifact@v1
+        with:
+          name: win-node-exe
+          path: "c:\\Program Files\\nodejs\\node.exe"
+
+      - name: Upload Node Modules for Windows
+        uses: actions/upload-artifact@v1
+        with: 
+          name: win-node-modules
+          path: node_modules
+
+  Build-Windows-Distro:
+    needs: Get-Windows-Node-Files
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Get Windows Node exe
+        uses: actions/download-artifact@v1
+        with: 
+          name: win-node-exe
+
+      - name: Get Windows Node modules
+        uses: actions/download-artifact@v1
+        with: 
+          name: win-node-modules
+
+      - name: Extract files
+        shell: bash
+        run: |
+          WORK_DIR=/home/runner/work/izzzio/izzzio
+          mkdir $WORK_DIR/node_modules
+          mv $WORK_DIR/win-node-modules/* $WORK_DIR/node_modules/
+          mv $WORK_DIR/win-node-exe/* $WORK_DIR/.
+          [ -d $WORK_DIR/win-node-exe ] && rm -r $WORK_DIR/win-node-exe
+          [ -d $WORK_DIR/win-node-modules ] && rm -r $WORK_DIR/win-node-modules
+
+      - name: Create ZIP distro for Windows
+        shell: bash
+        run: |
+          cd /home/runner/work/izzzio/
+          zip -r iz3node-windows-x64.zip izzzio/*
+
+      - name: Upload Windows distro
+        uses: actions/upload-artifact@v1
+        with: 
+          name: iz3node-windows-x64.zip
+          path: /home/runner/work/izzzio/iz3node-windows-x64.zip
+
+  Publish-Binaries:
+    needs: [Build-Windows-Distro, Linux-Distro]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Windows distro
+        uses: actions/download-artifact@v1
+        with: 
+          name: iz3node-windows-x64.zip
+
+      - name: Download Linux distro
+        uses: actions/download-artifact@v1
+        with:
+          name: iz3node-linux-x64.zip
+
+      - name: Publish binaries
+        uses: Roang-zero1/github-upload-release-artifacts-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: 'iz3node-windows-x64.zip iz3node-linux-x64.zip'

.github/workflows/npmpublish.yml

@@ -0,0 +1,32 @@
+name: Node.js Packaging
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm install
+      - run: npm run test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+      - run: cd api/node && npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.gitignore

@@ -59,6 +59,7 @@ typings/
 # dotenv environment variables file
 .env
 
+package-lock.json
 
 Будет удалено .gitignore
 Будет удалено .idea/

.tabnineignore

@@ -0,0 +1,6 @@
+runtime
+blocks
+EcmaContracts
+contractsRuntime
+BigNet/test
+Tests/*

BigNet/mainContract.js

@@ -80,6 +80,12 @@ const C2C_FEE = 0.001;
  */
 const FEE_ADDRESS = CONTRACT_OWNER;
 
+/**
+ * Max size of adding contract
+ * @type {number}
+ */
+const MAX_CONTRACT_LENGTH = 10 * 1024 * 1024;
+
 /**
  * Main IZZZIO token contract
  */
@@ -113,11 +119,18 @@ class mainToken extends TokenContract {
         this._c2cOrders = new BlockchainMap('c2cOrders');
         this._resourcePrice = new BlockchainMap('resourcePrice');
         this._ResourcesCostChange = new Event('ResourcesCostChange', 'string', 'string');
+
+        this._maxContractLength = new KeyValue('maxContractLength');
+        this._MaxContractLengthChange = new Event('MaxContractLengthChange', 'string', 'number');
+
         if (contracts.isDeploy()) {
             this._resourcePrice['ram'] = RESOURCES_PRICE.ram;
             this._resourcePrice['callLimit'] = RESOURCES_PRICE.callLimit;
             this._resourcePrice['timeLimit'] = RESOURCES_PRICE.timeLimit;
             this._ResourcesCostChange.emit('initial',this.getCurrentResources());
+
+            this._maxContractLength.put('maxContractLength', MAX_CONTRACT_LENGTH);
+            this._MaxContractLengthChange.emit('initial', this.getCurrentMaxContractLength());
         }
     }
 
@@ -165,7 +178,8 @@ class mainToken extends TokenContract {
      * @param {string} address contract address
      */
     checkContractAddress(address) {
-        return !isNaN(parseFloat(address)) && isFinite(address);
+        let addr = parseFloat(address);
+        return !isNaN(addr) && isFinite(address) && addr % 1 === 0;
     }
 
     /**
@@ -319,6 +333,15 @@ class mainToken extends TokenContract {
         return {ram: Math.round(ram), timeLimit: Math.round(timeLimit), callLimit: Math.round(callLimit)};
     }
 
+    /**
+     * Returns calculated resources as JSON
+     * @param {string} amount
+     * @return JSON {{callLimit: number, timeLimit: number, ram: number}}
+     */
+    getCalculatedResources(amount) {
+        return JSON.stringify(this.calculateResources(amount));
+    }
+
     /**
      * Returns calculated contracts limits
      * @param address
@@ -341,6 +364,14 @@ class mainToken extends TokenContract {
         this._resourcePrice['callLimit'] = newCost.callLimit;
     }
 
+    /**
+     * accepting new contract size after voting
+     * @param newValue
+     */
+    _acceptNewMaxContractLength(newValue) {
+        this._maxContractLength.put('maxContractLength', +newValue);
+    }
+
     /**
      * get results og voting contract by its address
      * @param voteContractAddress
@@ -354,7 +385,7 @@ class mainToken extends TokenContract {
     /**
      * Process results of change contract cost voting
      * @param voteContractAddress
-     * @returns {number} result of processing: 0 - voting isn't started, 1 - coting hasn't been ended yet, 2 - old variant wins, 4 - new variant wins and accepted
+     * @returns {number} result of processing: 0 - voting isn't started, 1 - voting hasn't been ended yet, 2 - old variant of cost wins, 3 - new variant of cost wins and accepted, 4 - old var of max contract size wins, 5 new var of max contract size wins and accepted
      */
     processResults(voteContractAddress) {
         const voteResults = this._getResultsOfVoting(voteContractAddress);
@@ -367,14 +398,27 @@ class mainToken extends TokenContract {
                 break;
             case 'ended':
                 let winner = this._findMaxVariantIndex(voteResults.results);
-                // if wins the same variant as we have now then do nothing
-                if (winner.index === this.getCurrentResources()) {
-                    this._ResourcesCostChange.emit('not change by voting',this.getCurrentResources());
-                    return 2;
+                if (typeof JSON.parse(winner.index) === 'object'){
+                    // if wins the same variant as we have now then do nothing
+                    const curResourses = this.getCurrentResources();
+                    if (winner.index === curResourses) {
+                        this._ResourcesCostChange.emit('not change by voting',curResourses);
+                        return 2;
+                    } else {
+                        this._acceptNewResources(JSON.parse(winner.index));
+                        this._ResourcesCostChange.emit('change by voting', curResourses);
+                        return 3;
+                    }
                 } else {
-                    this._acceptNewResources(JSON.parse(winner.index));
-                    this._ResourcesCostChange.emit('change by voting',this.getCurrentResources());
-                    return 3;
+                    const curMaxLen = this.getCurrentMaxContractLength();
+                    if ( +winner.index === curMaxLen) {
+                        this._MaxContractLengthChange.emit('not change by voting', curMaxLen);
+                        return 4;    
+                    } else {
+                        this._acceptNewMaxContractLength(JSON.parse(winner.index));
+                        this._MaxContractLengthChange.emit('change by voting', curMaxLen);
+                        return 5;
+                    }
                 }
         }
     }
@@ -413,6 +457,13 @@ class mainToken extends TokenContract {
         });
     }
 
+    /**
+     * get current max contract size
+     */
+    getCurrentMaxContractLength() {
+        return Number(this._maxContractLength.get('maxContractLength'));
+    }
+
     /**
      * returns resources as string
      * @param obj
@@ -423,7 +474,7 @@ class mainToken extends TokenContract {
     }
 
     /**
-     * starts voting contract by addres to decide if we need new resouces price or not
+     * starts voting contract by address to decide if we need new resouces price or not
      * @param voteContractAddress address of voting contract
      * @param newVariant multiplier for new resources cost (new = old * multiplier)
      */
@@ -434,6 +485,18 @@ class mainToken extends TokenContract {
         return JSON.stringify([newCost, oldCost]);
     }
 
+    /**
+     * starts voting contract by address to decide if we need newMaxContractLength or not
+     * @param voteContractAddress address of voting contract
+     * @param newVariant multiplier for new resources cost (new = old * multiplier)
+     */
+    startVotingForChangeMaxContractLength(voteContractAddress, newVariant) {
+        let newVal = newVariant;
+        let oldVal = this.getCurrentMaxContractLength();
+        contracts.callMethodDeploy(voteContractAddress, 'startVoting',[newVal, oldVal]);
+        return JSON.stringify([newVal, oldVal]);
+    }
+
 
     /**
      * TODO: Remove in release

BigNet/startNetwork.js

@@ -61,13 +61,13 @@ class App extends DApp {
         });
 
         process.on('unhandledRejection', error => {
-            logger.fatal(error);
-            process.exit();
+            logger.fatalFall(error);
         });
 
         //Preparing environment
         logger.info('Deploying contract...');
         that.contracts.ecmaContract.deployContract(masterContract, 0, async function (deployedContract) {
+            assert.assert(deployedContract !== null && Object.keys(deployedContract).length !== 0, "Invalid deployed contract");
             assert.true(deployedContract.address === that.getMasterContractAddress(), 'Invalid master contract address ' + that.getMasterContractAddress());
             logger.info("Master contract deployed");
         });

BigNet/test/config.json

@@ -5,6 +5,10 @@
   "initialPeers": [
   ],
   "recieverAddress": "nodeOne",
+  "validators": [
+    "lcpoa",
+    "thrusted"
+  ],
   "blockHashFilter": {
     "blockEndls": [
       "f3c3",
@@ -32,5 +36,7 @@
     "masterContract": 5
   },
   "signFunction": "NEWRSA",
-  "plugins": [ "iz3-basic-crypto"  ]
+  "plugins": [
+    "iz3-basic-crypto"
+  ]
 }