merge.

yukiexe · Dec 17, 2018 · adf1fb0 · adf1fb0
2 parents f8ce6c5 + e674a5b
commit adf1fb0
Show file tree

Hide file tree

Showing 12 changed files with 147 additions and 351 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,13 @@
 *.exe
 *.out
 *.app
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
+yarn.lock
diff --git a/.vscode/scripts/buildez.sh b/.vscode/scripts/buildez.sh
diff --git a/.vscode/scripts/generate.sh b/.vscode/scripts/generate.sh
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -25,11 +25,15 @@
         "memory": "cpp",
         "tuple": "cpp",
         "utility": "cpp",
-<<<<<<< Updated upstream
-        "stdexcept": "cpp"
-=======
-        "atomic": "cpp",
-        "algorithm": "cpp"
->>>>>>> Stashed changes
+        "stdexcept": "cpp",
+        "system_error": "cpp",
+        "ios": "cpp",
+        "xutility": "cpp",
+        "xstring": "cpp",
+        "xlocale": "cpp",
+        "xlocnum": "cpp",
+        "istream": "cpp",
+        "xtr1common": "cpp",
+        "xmemory0": "cpp"
     }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,7 +2,7 @@
     "version": "2.0.0",
     "reveal": "always",
     "options": {
-        "cwd": "${workspaceFolder}"
+        "cwd": "${workspaceFolder}/"
     },
     "tasks": [
         {
@@ -18,18 +18,44 @@
         {
             "label": "Generate ABI",
             "type": "shell",
-            "command": "sh ./.vscode/scripts/generate.sh ${fileBasenameNoExtension}",
+            "command": "eosio-abigen",
+            "args": [
+                "${fileBasenameNoExtension}.cpp",
+                "--contract=${fileBasenameNoExtension}",
+                "--output=${fileBasenameNoExtension}.abi"
+            ]
+        },
+        {
+            "label": "Generate ABI with eosiocpp",
+            "type": "shell",
+            "command": "eosiocpp",
+            "args": [
+                "-g",
+                "${fileBasenameNoExtension}.abi",
+                "${fileBasenameNoExtension}.cpp"
+            ]
+        },
+        {
+            "label": "Generate ABI with cdt v1.2.x",
+            "type": "shell",
+            "command": "eosio-cpp",
+            "args": [
+                "${fileBasenameNoExtension}.cpp",
+                "-o",
+                "${fileBasenameNoExtension}.wasm",
+                "--abigen"
+            ],
             "problemMatcher": []
         },
         {
-            "label": "EZ Build",
+            "label": "Build by eosio-cpp ",
             "type": "shell",
-            "windows": {
-                "command": "sh ./.vscode/scripts/buildez.sh ${fileBasenameNoExtension}"
-            },
-            "osx": {
-                "command": "sh ./.vscode/scripts/osxEZbuild.sh ${fileBasenameNoExtension}"
-            },
+            "command": "eosio-cpp",
+            "args": [
+                "${fileBasenameNoExtension}.cpp",
+                "-o",
+                "${fileBasenameNoExtension}.wasm"
+            ],
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/config.hpp b/config.hpp
@@ -6,6 +6,13 @@
 #define ODD 0.75
 #define EVEN 1.07
 
+struct rec_reveal {
+    uint8_t dragon ;
+    uint8_t tiger ;
+    capi_checksum256 server_hash;
+    capi_checksum256 client_seed;
+};
+
 #endif
 
 /*

diff --git a/eoscrazytown.abi b/eoscrazytown.abi
@@ -1,25 +1,5 @@
 {
-<<<<<<< Updated upstream
-  "____comment": "This file was generated by eosio-abigen. DO NOT EDIT - 2018-10-12T04:57:46",
-  "version": "eosio::abi/1.0",
-  "types": [],
-  "structs": [{
-      "name": "st_global",
-      "base": "",
-      "fields": [{
-          "name": "defer_id",
-          "type": "uint64"
-        },{
-          "name": "hash",
-          "type": "checksum256"
-        },{
-          "name": "dragon",
-          "type": "uint8"
-        },{
-          "name": "tiger",
-          "type": "uint8"
-=======
-    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT Fri Dec 14 15:23:54 2018",
+    "____comment": "This file was generated with eosio-abigen. DO NOT EDIT Sat Dec 15 20:30:43 2018",
     "version": "eosio::abi/1.1",
     "structs": [
         {
@@ -108,47 +88,14 @@
                 {
                     "name": "hash",
                     "type": "checksum256"
-                }
-            ]
-        },
-        {
-            "name": "test",
-            "base": "",
-            "fields": []
-        },
-        {
-            "name": "transfer",
-            "base": "",
-            "fields": [
-                {
-                    "name": "from",
-                    "type": "name"
-                },
-                {
-                    "name": "to",
-                    "type": "name"
                 },
                 {
-                    "name": "quantity",
-                    "type": "asset"
-                },
-                {
-                    "name": "memo",
-                    "type": "string"
-                }
-            ]
-        },
-        {
-            "name": "verify",
-            "base": "",
-            "fields": [
-                {
-                    "name": "seed",
-                    "type": "checksum256"
+                    "name": "dragon",
+                    "type": "uint8"
                 },
                 {
-                    "name": "hash",
-                    "type": "checksum256"
+                    "name": "tiger",
+                    "type": "uint8"
                 }
             ]
         }
@@ -174,183 +121,25 @@
             "name": "reveal",
             "type": "reveal",
             "ricardian_contract": ""
-        },
-        {
-            "name": "test",
-            "type": "test",
-            "ricardian_contract": ""
-        },
-        {
-            "name": "transfer",
-            "type": "transfer",
-            "ricardian_contract": ""
-        },
-        {
-            "name": "verify",
-            "type": "verify",
-            "ricardian_contract": ""
->>>>>>> Stashed changes
         }
     ],
     "tables": [
         {
-            "name": "player",
-            "type": "player",
+            "name": "global",
+            "type": "st_global",
             "index_type": "i64",
             "key_names": [],
             "key_types": []
         },
         {
-            "name": "st_global",
-            "type": "st_global",
+            "name": "player",
+            "type": "player",
             "index_type": "i64",
             "key_names": [],
             "key_types": []
         }
-<<<<<<< Updated upstream
-      ]
-    },{
-      "name": "init",
-      "base": "",
-      "fields": [{
-          "name": "hash",
-          "type": "checksum256"
-        }
-      ]
-    },{
-      "name": "clear",
-      "base": "",
-      "fields": []
-    },{
-      "name": "test",
-      "base": "",
-      "fields": []
-    },{
-      "name": "verify",
-      "base": "",
-      "fields": [{
-          "name": "seed",
-          "type": "checksum256"
-        },{
-          "name": "hash",
-          "type": "checksum256"
-        }
-      ]
-    },{
-      "name": "reveal",
-      "base": "",
-      "fields": [{
-          "name": "seed",
-          "type": "checksum256"
-        },{
-          "name": "hash",
-          "type": "checksum256"
-        }
-      ]
-    },{
-      "name": "transfer",
-      "base": "",
-      "fields": [{
-          "name": "from",
-          "type": "name"
-        },{
-          "name": "to",
-          "type": "name"
-        },{
-          "name": "quantity",
-          "type": "asset"
-        },{
-          "name": "memo",
-          "type": "string"
-        }
-      ]
-    },{
-      "name": "rec_reveal",
-      "base": "",
-      "fields": [{
-          "name": "dragon",
-          "type": "uint8"
-        },{
-          "name": "tiger",
-          "type": "uint8"
-        },{
-          "name": "server_hash",
-          "type": "checksum256"
-        },{
-          "name": "client_seed",
-          "type": "checksum256"
-        }
-      ]
-    },{
-      "name": "receipt",
-      "base": "",
-      "fields": [{
-          "name": "reveal",
-          "type": "rec_reveal"
-        }
-      ]
-    }
-  ],
-  "actions": [{
-      "name": "init",
-      "type": "init",
-      "ricardian_contract": ""
-    },{
-      "name": "clear",
-      "type": "clear",
-      "ricardian_contract": ""
-    },{
-      "name": "test",
-      "type": "test",
-      "ricardian_contract": ""
-    },{
-      "name": "verify",
-      "type": "verify",
-      "ricardian_contract": ""
-    },{
-      "name": "reveal",
-      "type": "reveal",
-      "ricardian_contract": ""
-    },{
-      "name": "transfer",
-      "type": "transfer",
-      "ricardian_contract": ""
-    },{
-      "name": "receipt",
-      "type": "receipt",
-      "ricardian_contract": ""
-    }
-  ],
-  "tables": [{
-      "name": "global",
-      "index_type": "i64",
-      "key_names": [
-        "defer_id"
-      ],
-      "key_types": [
-        "uint64"
-      ],
-      "type": "st_global"
-    },{
-      "name": "player",
-      "index_type": "i64",
-      "key_names": [
-        "account"
-      ],
-      "key_types": [
-        "name"
-      ],
-      "type": "player"
-    }
-  ],
-  "ricardian_clauses": [],
-  "error_messages": [],
-  "abi_extensions": [],
-  "variants": []
-=======
     ],
     "ricardian_clauses": [],
     "variants": [],
     "abi_extensions": []
->>>>>>> Stashed changes
 }