Merge pull request #677 from gofractally/main

Updating production contract branch

Author: brandonfancher

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
     build-cpp:
         name: Build C++
         runs-on: ubuntu-latest
-        container: ghcr.io/eoscommunity/eden-builder:sub-chain
+        container: ghcr.io/gofractally/eden-builder:latest
 
         steps:
             - name: ✅ Checkout code
@@ -115,19 +115,20 @@ jobs:
 
                   tar czf clsdk-ubuntu-20-04.tar.gz clsdk
                   rm -rf ../product_cache
-                  mkdir -p ../product_cache
+                  mkdir -p ../product_cache/clsdk/contracts
                   cp clsdk-ubuntu-20-04.tar.gz ../product_cache
                   cp atomicassets.abi ../product_cache
                   cp atomicassets.wasm ../product_cache
                   cp atomicmarket.abi ../product_cache
                   cp atomicmarket.wasm ../product_cache
-                  cp bios.wasm ../product_cache
+                  cp clsdk/contracts/bios.wasm ../product_cache/clsdk/contracts/bios.wasm
                   cp boot.wasm ../product_cache
                   cp eden-micro-chain.wasm ../product_cache
                   cp eden.abi ../product_cache
                   cp eden.wasm ../product_cache
-                  cp run-full-election.wasm ../product_cache
+                  cp run-elections.wasm ../product_cache
                   cp run-genesis.wasm ../product_cache
+                  cp run-complete-elections.wasm ../product_cache
                   cp token.abi ../product_cache
                   cp token.wasm ../product_cache
 
@@ -174,19 +175,20 @@ jobs:
                       product_cache/atomicassets.wasm
                       product_cache/atomicmarket.abi
                       product_cache/atomicmarket.wasm
-                      product_cache/bios.wasm
+                      product_cache/clsdk/contracts/bios.wasm
                       product_cache/boot.wasm
                       product_cache/eden.abi
                       product_cache/eden.wasm
                       product_cache/token.abi
                       product_cache/token.wasm
                       product_cache/run-genesis.wasm
-                      product_cache/run-full-election.wasm
+                      product_cache/run-elections.wasm
+                      product_cache/run-complete-elections.wasm
 
     build-micro-chain:
         name: Build Micro Chain
         runs-on: ubuntu-latest
-        container: ghcr.io/eoscommunity/eden-builder:sub-chain
+        container: ghcr.io/gofractally/eden-builder:latest
 
         steps:
             - name: ✅ Checkout code
@@ -353,6 +355,7 @@ jobs:
                         - "tsconfig.build.json"
                         - "tsconfig.json"
                         - "yarn.lock"
+                        - "scripts/eden_chain_runner.sh"
 
                         - "packages/**"
                         - "contracts/**"
@@ -364,7 +367,7 @@ jobs:
                   name: Eden Microchain
                   path: build
 
-            - name: Download Ephemeral Chain Runners
+            - name: Download Ephemeral Eden Chain Runners
               if: steps.filter.outputs.src == 'true'
               uses: actions/download-artifact@v2
               with:

.github/workflows/eden-builder.yml

@@ -1,6 +1,7 @@
 name: eden-builder container
 
 on:
+    workflow_dispatch:
     push:
         branches:
             - main
@@ -27,7 +28,7 @@ jobs:
                   REGISTRY="ghcr.io"
                   IMAGE="${REGISTRY}/${{ github.repository_owner }}/eden-builder"
                   TAGS="${IMAGE}:${{ github.sha }}"
-                  if [[ $GITHUB_REF == ref/head/master ]]; then
+                  if [[ $GITHUB_REF == ref/head/main ]]; then
                     TAGS="${TAGS},${IMAGE}:latest"
                   fi
                   echo ::set-output name=tags::${TAGS,,}

.gitmodules

@@ -3,16 +3,13 @@
 	url = https://github.com/Tencent/rapidjson.git
 [submodule "external/eos"]
 	path = external/eos
-	url = https://github.com/eoscommunity/eos.git
+	url = https://github.com/eosnetworkfoundation/mandel.git
 [submodule "external/fmt"]
 	path = external/fmt
 	url = https://github.com/fmtlib/fmt.git
 [submodule "external/Catch2"]
 	path = external/Catch2
 	url = https://github.com/catchorg/Catch2.git
-[submodule "external/rocksdb"]
-	path = external/rocksdb
-	url = https://github.com/facebook/rocksdb.git
 [submodule "external/atomicassets-contract"]
 	path = external/atomicassets-contract
 	url = https://github.com/pinknetworkx/atomicassets-contract.git

README.md

@@ -61,3 +61,64 @@ wget https://nodejs.org/dist/v14.16.0/node-v14.16.0-linux-x64.tar.xz
 tar xf node-v14.16.0-linux-x64.tar.xz
 npm i -g yarn
 ```
+
+### Running Eden with Ephemeral Chains Locally
+
+Ephemeral chains are instances of the EOS blockchain spawned by `nodeos` locally, with manipulated data from our chain runners, eg: [Basic Genesis Runner](contracts/eden/tests/run-genesis.cpp), [Elections Runner](contracts/eden/tests/run-elections.cpp) (which finishes with an open, running election), and [Completed Elections Runner](contracts/eden/tests/run-complete-elections.cpp). By running a ephemeral chain you are in full control of the blockchain, giving you more flexibility to test the Eden contracts.
+
+#### Get the executables
+
+You will need to build the repo locally by following the below **build** steps. If you don't have a proper C++ environment setup you can download it from our current [main branch artifacts](https://github.com/eoscommunity/Eden/actions/workflows/build.yml?query=branch%3Amain).
+
+If you built locally, you can skip these steps.
+
+**Downloading the executables**
+
+-   Open our [main branch builds](https://github.com/eoscommunity/Eden/actions/workflows/build.yml?query=branch%3Amain).
+-   Click in the most recent successful one
+-   Scroll down to the artifacts section
+-   Download the following files:
+    -   Eden Microchain
+    -   Ephemeral Eden Chains Runners
+    -   clsdk
+-   From the root of this repo, run the following commands:
+
+```sh
+mkdir build
+# unzip all of the above artifact files in this build folder
+cd build
+tar -xvf clsdk-ubuntu-20-04.tar.gz clsdk/bin
+cp ../scripts/eden_chain_runner.sh ./
+```
+
+Now you have all the files needed for running the ephemeral chain inside the `build` folder.
+
+If you are on a Linux machine compatible with Ubuntu arch you can spin it up by just running: `./eden_chain_runner.sh run-genesis.wasm 1`
+
+Otherwise you can spin it up with the following docker command:
+
+```sh
+docker run --name eden-genesis \
+  -v "$(pwd)":/app \
+  -w /app \
+  -p 8080:8080 -p 8888:8888 \
+  -d -it ghcr.io/eoscommunity/eden-builder:sub-chain \
+  bash ./eden_chain_runner.sh run-genesis.wasm 1
+```
+
+To see if the chain is running successfully you can execute `cleos get info` or watch the nodeos logs: `tail -fn +1 eden-runner.log`
+
+With the ephemeral chain running you can just spin up our local environment with:
+
+```sh
+yarn
+NODE_ENV=test yarn build --stream
+NODE_ENV=test yarn start --stream
+open http://localhost:3000
+```
+
+**Re-running ephemeral chains**
+
+Running the above commands again will just setup a brand new chain! Just watch out to kill nodeos and unlock your keos wallet if built locally or remove your docker container. Also don't forget to restart the `yarn` environment because the blocks state needs to be refreshed.
+
+In the above instructions we ran a simple genesis case with 3 inducted members, but you can also try `run-complete-elections.wasm` to see a community with more than 100 members with chief delegates already elected.

contracts/CMakeLists.txt

@@ -2,3 +2,5 @@ add_subdirectory(eden)
 add_subdirectory(token)
 add_subdirectory(boot)
 add_subdirectory(bios)
+add_subdirectory(bios2)
+add_subdirectory(bios3)

contracts/bios/CMakeLists.txt

@@ -1,4 +1,15 @@
 add_executable(bios src/bios.cpp)
 target_include_directories(bios PUBLIC include)
 target_link_libraries(bios eosio-contract-simple-malloc)
-set_target_properties(bios PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ROOT_BINARY_DIR})
+set_target_properties(bios PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ROOT_BINARY_DIR}/clsdk/contracts)
+
+add_executable(bios-abigen src/bios.cpp)
+target_include_directories(bios-abigen PUBLIC include)
+target_link_libraries(bios-abigen eosio-contract-abigen)
+add_custom_command(TARGET bios-abigen POST_BUILD
+    COMMAND mkdir -p ${ROOT_BINARY_DIR}/clsdk/contracts
+    COMMAND ${ROOT_BINARY_DIR}/cltester bios-abigen.wasm >${ROOT_BINARY_DIR}/clsdk/contracts/bios.abi
+)
+
+configure_file(include/bios/bios.hpp ${ROOT_BINARY_DIR}/clsdk/contracts/bios/include/bios/bios.hpp COPYONLY)
+configure_file(src/bios.cpp ${ROOT_BINARY_DIR}/clsdk/contracts/bios/src/bios.cpp COPYONLY)

contracts/bios/include/bios/bios.hpp

@@ -1,32 +1,149 @@
 #pragma once
 
+#include <eosio/bytes.hpp>
 #include <eosio/contract.hpp>
 #include <eosio/dispatcher.hpp>
+#include <eosio/multi_index.hpp>
 #include <eosio/privileged.hpp>
 
+#if defined(COMPILING_TESTS)
+#include <eosio/tester.hpp>
+#endif
+
 namespace bios
 {
+   struct abi_hash
+   {
+      eosio::name owner;
+      eosio::checksum256 hash;
+
+      uint64_t primary_key() const { return owner.value; }
+   };
+   EOSIO_REFLECT(abi_hash, owner, hash)
+
+   typedef eosio::multi_index<"abihash"_n, abi_hash> abi_hash_table;
+
    class bios_contract : public eosio::contract
    {
      public:
       using eosio::contract::contract;
-      void newaccount() {}
-      void updateauth() {}
-      void deleteauth() {}
-      void linkauth() {}
-      void setcode() {}
-      void setabi() {}
-      void canceldelay() {}
-      void setpriv(eosio::name account, bool is_priv) { eosio::set_privileged(account, is_priv); }
+
+      void onblock() {}
+
+      void newaccount(eosio::ignore<eosio::name> creator,
+                      eosio::ignore<eosio::name> name,
+                      eosio::ignore<eosio::authority> owner,
+                      eosio::ignore<eosio::authority> active)
+      {
+      }
+
+      void updateauth(eosio::ignore<eosio::name> account,
+                      eosio::ignore<eosio::name> permission,
+                      eosio::ignore<eosio::name> parent,
+                      eosio::ignore<eosio::authority> auth)
+      {
+      }
+
+      void deleteauth(eosio::ignore<eosio::name> account, eosio::ignore<eosio::name> permission) {}
+
+      void linkauth(eosio::ignore<eosio::name> account,
+                    eosio::ignore<eosio::name> code,
+                    eosio::ignore<eosio::name> type,
+                    eosio::ignore<eosio::name> requirement)
+      {
+      }
+
+      void unlinkauth(eosio::ignore<eosio::name> account,
+                      eosio::ignore<eosio::name> code,
+                      eosio::ignore<eosio::name> type)
+      {
+      }
+
+      void canceldelay(eosio::ignore<eosio::permission_level> canceling_auth,
+                       eosio::ignore<eosio::checksum256> trx_id)
+      {
+      }
+
+      void setcode(eosio::ignore<eosio::name> account,
+                   eosio::ignore<uint8_t> vmtype,
+                   eosio::ignore<uint8_t> vmversion,
+                   eosio::ignore<eosio::bytes> code)
+      {
+      }
+
+      void setabi(eosio::name account, const eosio::bytes& abi);
+
+      /**
+       * Set privilege status for an account
+       */
+      void setpriv(eosio::name account, bool is_priv);
+
+      /**
+       * Set the resource limits of an account
+       *
+       * @param account - eosio::name of the account whose resource limit to be set
+       * @param ram_bytes - ram limit in absolute bytes
+       * @param net_weight - fractionally proportionate net limit of available resources based on (weight / total_weight_of_all_accounts)
+       * @param cpu_weight - fractionally proportionate cpu limit of available resources based on (weight / total_weight_of_all_accounts)
+       */
+      void setalimits(eosio::name account,
+                      int64_t ram_bytes,
+                      int64_t net_weight,
+                      int64_t cpu_weight);
+
+      /**
+       * Set the blockchain parameters.
+       */
+      void setparams(const eosio::blockchain_parameters& params);
+
+      /**
+       * Check if the account eosio::name `from` passed in as param has authorization to access
+       * current action, that is, if it is listed in the action’s allowed permissions vector.
+       *
+       * @param from - the account eosio::name to authorize
+       */
+      void reqauth(eosio::name from);
+
+      /**
+       * Activate a protocol feature
+       *
+       * @param feature_digest - hash of the protocol feature to activate.
+       */
+      void activate(const eosio::checksum256& feature_digest);
+
+      /**
+       * Assert that a protocol feature has been activated
+       *
+       * @param feature_digest - hash of the protocol feature to check for activation.
+       */
+      void reqactivated(const eosio::checksum256& feature_digest);
    };
    EOSIO_ACTIONS(bios_contract,
                  "eosio"_n,
-                 newaccount,
-                 updateauth,
-                 deleteauth,
-                 linkauth,
-                 setcode,
-                 setabi,
-                 canceldelay,
-                 setpriv)
+                 action(onblock),
+                 action(newaccount, creator, name, owner, active),
+                 action(updateauth, account, permission, parent, auth),
+                 action(deleteauth, account, permission),
+                 action(linkauth, account, code, type, requirement),
+                 action(unlinkauth, account, code, type),
+                 action(canceldelay, canceling_auth, trx_id),
+                 action(setcode, account, vmtype, vmversion, code),
+                 action(setabi, account, abi),
+                 action(setpriv, account, is_priv),
+                 action(setalimits, account, ram_bytes, net_weight, cpu_weight),
+                 action(setparams, params),
+                 action(reqauth, from),
+                 action(activate, feature_digest),
+                 action(reqactivated, feature_digest))
+
+#if defined(COMPILING_TESTS)
+   void activate(eosio::test_chain& chain, const std::vector<eosio::checksum256>& features)
+   {
+      for (auto& feature : features)
+         chain.as("eosio"_n).act<actions::activate>(feature);
+      chain.finish_block();
+      chain.finish_block();
+   }
+#endif
+
 }  // namespace bios