Merge pull request #389 from EOSIO/merge-release-1.8.1-to-master

Version 1.8.1

.cicd/build.sh

@@ -15,7 +15,7 @@ else
     export DOCKER_IMAGE
 fi
 ARGS=${ARGS:-"--rm -v $(pwd):$MOUNTED_DIR"}
-CDT_COMMANDS="apt-get install -y wget && wget -q $CDT_URL -O eosio.cdt.deb && dpkg -i eosio.cdt.deb && export PATH=/usr/opt/eosio.cdt/$CDT_VERSION/bin:\\\$PATH"
+CDT_COMMANDS="apt-get install -y wget && wget -q $CDT_URL -O eosio.cdt.deb && dpkg -i eosio.cdt.deb && export PATH=/usr/opt/eosio.cdt/\\\$(ls /usr/opt/eosio.cdt/)/bin:\\\$PATH"
 PRE_COMMANDS="$CDT_COMMANDS && cd $MOUNTED_DIR/build"
 BUILD_COMMANDS="cmake -DBUILD_TESTS=true .. && make -j $JOBS"
 COMMANDS="$PRE_COMMANDS && $BUILD_COMMANDS"
@@ -31,4 +31,5 @@ while [[ "$(docker pull $DOCKER_IMAGE 2>&1 | grep -ice "manifest for $DOCKER_IMA
     sleep 60
 done
 # run
+echo "docker run $ARGS $(buildkite-intrinsics) $DOCKER_IMAGE bash -c \"$COMMANDS\""
 eval docker run $ARGS $(buildkite-intrinsics) $DOCKER_IMAGE bash -c \"$COMMANDS\"

.cicd/helpers/dependency-info.sh

@@ -14,15 +14,21 @@ else
     exit 1
 fi
 # search GitHub for commit hash by tag and branch, preferring tag if both match
-if [[ $TRAVIS ]]; then
-    CDT_COMMIT=$((curl -H "Authorization: token $key" -s https://api.github.com/repos/EOSIO/eosio.cdt/git/refs/tags/$CDT_VERSION && curl -H "Authorization: token $key" -s https://api.github.com/repos/EOSIO/eosio.cdt/git/refs/heads/$CDT_VERSION) | jq '.object.sha' | sed "s/null//g" | sed "/^$/d" | tr -d '"' | sed -n '1p')
-    EOSIO_COMMIT=$((curl -H "Authorization: token $key" -s https://api.github.com/repos/EOSIO/eos/git/refs/tags/$EOSIO_VERSION && curl -H "Authorization: token $key" -s https://api.github.com/repos/EOSIO/eos/git/refs/heads/$EOSIO_VERSION) | jq '.object.sha' | sed "s/null//g" | sed "/^$/d" | tr -d '"' | sed -n '1p')
-else
+if [[ "$BUILDKITE" == 'true' ]]; then
     CDT_COMMIT=$((curl -s https://api.github.com/repos/EOSIO/eosio.cdt/git/refs/tags/$CDT_VERSION && curl -s https://api.github.com/repos/EOSIO/eosio.cdt/git/refs/heads/$CDT_VERSION) | jq '.object.sha' | sed "s/null//g" | sed "/^$/d" | tr -d '"' | sed -n '1p')
     EOSIO_COMMIT=$((curl -s https://api.github.com/repos/EOSIO/eos/git/refs/tags/$EOSIO_VERSION && curl -s https://api.github.com/repos/EOSIO/eos/git/refs/heads/$EOSIO_VERSION) | jq '.object.sha' | sed "s/null//g" | sed "/^$/d" | tr -d '"' | sed -n '1p')
+    test -z "$CDT_COMMIT" && CDT_COMMIT=$(echo $CDT_VERSION | tr -d '"' | tr -d "''" | cut -d ' ' -f 1) # if both searches returned nothing, the version is probably specified by commit hash already
+    test -z "$EOSIO_COMMIT" && EOSIO_COMMIT=$(echo $EOSIO_VERSION | tr -d '"' | tr -d "''" | cut -d ' ' -f 1) # if both searches returned nothing, the version is probably specified by commit hash already
+else
+    git clone https://github.com/EOSIO/eosio.cdt && cd eosio.cdt
+    git pull && git checkout $CDT_VERSION
+    CDT_COMMIT=$(git rev-parse --verify HEAD)
+    cd ..
+    git clone https://github.com/EOSIO/eos && cd eos
+    git pull && git checkout $EOSIO_VERSION
+    EOSIO_COMMIT=$(git rev-parse --verify HEAD)
+    cd ..
 fi
-test -z "$CDT_COMMIT" && CDT_COMMIT=$(echo $CDT_VERSION | tr -d '"' | tr -d "''" | cut -d ' ' -f 1) # if both searches returned nothing, the version is probably specified by commit hash already
-echo "Using cdt ${CDT_COMMIT:0:7} from \"$CDT_VERSION\"..."
-test -z "$EOSIO_COMMIT" && EOSIO_COMMIT=$(echo $EOSIO_VERSION | tr -d '"' | tr -d "''" | cut -d ' ' -f 1) # if both searches returned nothing, the version is probably specified by commit hash already
 echo "Using eosio ${EOSIO_COMMIT:0:7} from \"$EOSIO_VERSION\"..."
+echo "Using cdt ${CDT_COMMIT:0:7} from \"$CDT_VERSION\"..."
 export CDT_URL="https://eos-public-oss-binaries.s3-us-west-2.amazonaws.com/${CDT_COMMIT:0:7}-eosio.cdt-ubuntu-18.04_amd64.deb"

.travis.yml

@@ -10,7 +10,4 @@ matrix:
 script: ". ./.cicd/build.sh && ./.cicd/test.sh"
 notifications:
   webhooks:
-    secure: CEIaN/RNCYALwL+QgBhVlyq5DvomyMcmB+gUfdDabxJk55misbIAXkj7l3+1dvq4EeB8Vw3vSKAimfjpj0hGCopOPxPsE5SPYWx3czI7cBPvuu3S4NSmx6WEe+pjI3IexUVQXRLazhvvwB6D/vZnFlr3ECYj59K0fGoYOKW14oG2RLVP7Clx3qoo1O8y7F+Ia6fEp/Q4pvwgFKnUL4hJrCUefJwSKDH8Nxf4FF5U41RLE8Xhdqxo1zbZBpT30gaPERzBnTCO3ko5NIEI/WPruQgcRr/PVDTG1xYZ2XqImDb/fHZKqkOJSoOTH+2U2KBxfXCwLPzkz6CkpJ7v14VL4qoV/F5DA9/fTSB4+B6IWusFF8NhstMmeCw0vkfaO/8WW8VEYHXnlTPFAQZJEiEyIYDcyVnUXur0yFEkvr4ZdGDmUEv/AdClVJ7Ig7T4MF2K66Yqtj930VQhI5PSWMKIWFG+2eboBrmXet+Z+2GRhwCGm5knB4/bcDcg9E80cwUWVol6AxVO07n70Qx57qX9Tvz/Ay9ugtEY+xSDQQ+HkFw62MiPDsNhSFoUD+TNY+SnEe1qnciKhb2/1bNTkKMPjifjJmDWkfC07qrXsDBcj4cIgfj6vh8lBj7U6kg7vCjXeJeljgu0wcTDd+EprDHpfRwkoXi9UsnSw2HXAveZMP4=
-env:
-  global:
-    secure: jE/hVrQwgGs4KDdBqtiaGb9QE7xg8tn9NK2xMyedsi1CzqSZwl1iLjoefD4nH2wYRCGWfTBFES7QtJbj7SZK0+eobwQMO+jyXSOBd8D8HqcT37UMOPYW72YY2UuZpSCinuLHkZxZnb5dGfMqXDIZ3Y3GIgxOAd2+a0Y6xLt0dfZvh4OH8KVc/wWtuAjh0kMYEoQV9gEyok7xnXNjSLbAbkVslQBKHv451oi8saIGQbFC3b1KSGlE9LBv0QAR9MLXlkYMF3tAfegTGzx/NUIwdOOJ6XoPWoUGWV/u/nWexjHwsb1MwqQHN+LWHRM39ehL46na4m32S/ro3wHmBXnxlF3ys8QH0PEpfJL+r8aKGOv3pmWE//x+Ias6K6RWzTMLRFqlDPGTAGgMRGFiyGhT1aRHXD+mC2RppXptBST9brhE7+lyVqzKYFFHi0SHxfRsSQLgGhIJTMBr2Jj5ORlT86BWdxj3P8VOitKif/RP1zuJBKr78EyLGDPvsJhmot/gPg3VAo2R+cyFqVBWig2PC2ylneSS2DptMV6qLlujA+Fr38diYacsMqhej3ukqVZGaOecSIJXweJQ+7Y9SvGQDeAH8gEzgLLlkNrwpaFtLpxUqHrGWKJHUS8oKtleTznoK1Ck9Es2JTG2Tr4gVHk0OCIfc3hZRQl5Kj7AVi20Tec=
+    secure: CEIaN/RNCYALwL+QgBhVlyq5DvomyMcmB+gUfdDabxJk55misbIAXkj7l3+1dvq4EeB8Vw3vSKAimfjpj0hGCopOPxPsE5SPYWx3czI7cBPvuu3S4NSmx6WEe+pjI3IexUVQXRLazhvvwB6D/vZnFlr3ECYj59K0fGoYOKW14oG2RLVP7Clx3qoo1O8y7F+Ia6fEp/Q4pvwgFKnUL4hJrCUefJwSKDH8Nxf4FF5U41RLE8Xhdqxo1zbZBpT30gaPERzBnTCO3ko5NIEI/WPruQgcRr/PVDTG1xYZ2XqImDb/fHZKqkOJSoOTH+2U2KBxfXCwLPzkz6CkpJ7v14VL4qoV/F5DA9/fTSB4+B6IWusFF8NhstMmeCw0vkfaO/8WW8VEYHXnlTPFAQZJEiEyIYDcyVnUXur0yFEkvr4ZdGDmUEv/AdClVJ7Ig7T4MF2K66Yqtj930VQhI5PSWMKIWFG+2eboBrmXet+Z+2GRhwCGm5knB4/bcDcg9E80cwUWVol6AxVO07n70Qx57qX9Tvz/Ay9ugtEY+xSDQQ+HkFw62MiPDsNhSFoUD+TNY+SnEe1qnciKhb2/1bNTkKMPjifjJmDWkfC07qrXsDBcj4cIgfj6vh8lBj7U6kg7vCjXeJeljgu0wcTDd+EprDHpfRwkoXi9UsnSw2HXAveZMP4=

CMakeLists.txt

@@ -4,7 +4,7 @@ project(eosio_contracts)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 8)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 #set(VERSION_SUFFIX develop)
 
 if (VERSION_SUFFIX)

README.md

@@ -1,6 +1,6 @@
 # eosio.contracts
 
-## Version : 1.8.0
+## Version : 1.8.1
 
 The design of the EOSIO blockchain calls for a number of smart contracts that are run at a privileged permission level in order to support functions such as block producer registration and voting, token staking for CPU and network bandwidth, RAM purchasing, multi-sig, etc.  These smart contracts are referred to as the bios, system, msig, wrap (formerly known as sudo) and token contracts.
 
@@ -16,7 +16,7 @@ The following unprivileged contract(s) are also part of the system.
 
 Dependencies:
 * [eosio.cdt v1.6.x](https://github.com/EOSIO/eosio.cdt/releases/tag/v1.6.3)
-* [eosio v1.8.x](https://github.com/EOSIO/eos/releases/tag/v1.8.5) (optional dependency only needed to build unit tests)
+* [eosio v1.8.x](https://github.com/EOSIO/eos/releases/tag/v1.8.6) (optional dependency only needed to build unit tests)
 
 To build the contracts follow the instructions in [`Build and deploy` section](./docs/02_build-and-deploy.md).
 

contracts/eosio.system/src/name_bidding.cpp

@@ -50,7 +50,7 @@ namespace eosiosystem {
          }
 
          eosio::transaction t;
-         t.actions.emplace_back( permission_level{get_self(), active_permission},
+         t.actions.emplace_back( permission_level{current->high_bidder, active_permission},
                                  get_self(), "bidrefund"_n,
                                  std::make_tuple( current->high_bidder, newname )
          );