Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.0RC' into testnet

anatolse · anatolse · commit a050481cb290 · 2021-04-27T14:34:30.000+03:00
diff --git a/.github/workflows/boost_build.yml b/.github/workflows/boost_build.yml
@@ -38,7 +38,6 @@ jobs:
           path: ${{runner.workspace}}\boost_prebuild
           if-no-files-found: error
 
-
   build_ubuntu:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -89,3 +88,47 @@ jobs:
           name: boost_prebuild_${{matrix.os}}
           path: ${{runner.workspace}}/boost_prebuild
           if-no-files-found: error
+
+  build_osx:
+    runs-on: macos-10.15
+    steps:
+      - name: Create Build Environment
+        shell: bash
+        run: |
+          mkdir ${{runner.workspace}}/boost_prebuild
+
+      - name: Download
+        shell: bash
+        run: |
+          wget -q https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz
+          tar -xvf boost_1_75_0.tar.gz > /dev/null
+          mv ./boost_1_75_0 ${{runner.workspace}}/boost
+
+      - name: Bootstrap
+        shell: bash
+        run: |
+          cd ${{runner.workspace}}/boost
+          ./bootstrap.sh
+
+      - name: Build
+        shell: bash
+        run: |
+          cd ${{runner.workspace}}/boost
+          ./b2 --target=static
+
+      - name: Install
+        shell: bash
+        run: |
+          cd ${{runner.workspace}}/boost
+          ./b2 install --prefix=${{runner.workspace}}/boost_prebuild
+
+      - name: Pack
+        shell: bash
+        run:
+          tar -zcvf boost_prebuild.tar.gz ${{runner.workspace}}/boost_prebuild
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: boost_prebuild_macos-10.15
+          path: boost_prebuild.tar.gz
+          if-no-files-found: error
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,23 +51,29 @@ jobs:
       run: |
         git clone --depth=1 https://github.com/BeamMW/libs.git c:/beam-libs
         echo "OPENSSL_ROOT_DIR=c:\beam-libs\openssl" >> $GITHUB_ENV
-        git clone --depth=1 https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git c:/boost_prebuild
-        echo "BOOST_ROOT=c:\boost_prebuild" >> $GITHUB_ENV
 
+    - name: Download boost
+      shell: bash
+      run: |
+        git clone --depth=1 https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git ${{runner.workspace}}/boost_prebuild
 
-    - name: Download boost [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Configure boost path [windows]
+      shell: bash
+      if: matrix.os == 'windows-2019'
       run: |
-        brew update
-        brew install boost
-        echo "LDFLAGS=-L/usr/local/opt/icu4c/lib" >> $GITHUB_ENV
-        echo "CPPFLAGS=-I/usr/local/opt/icu4c/include" >> $GITHUB_ENV
+        echo "BOOST_ROOT=${{runner.workspace}}/boost_prebuild" >> $GITHUB_ENV
 
-    - name: Download boost [ununtu all]
+    - name: Configure boost path [ununtu all]
       shell: bash
       if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
       run: |
-        git clone --depth=1 https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git ${{runner.workspace}}/boost_prebuild
+        echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
+        echo "BOOST_LIBRARYDIR=${{runner.workspace}}/boost_prebuild/lib/" >> $GITHUB_ENV
+
+    - name: Configure boost path [macos-10.15]
+      shell: bash
+      if: matrix.os == 'macos-10.15'
+      run: |
         echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
         echo "BOOST_LIBRARYDIR=${{runner.workspace}}/boost_prebuild/lib/" >> $GITHUB_ENV
 
diff --git a/wallet/api/v6_0/wallet_api.cpp b/wallet/api/v6_0/wallet_api.cpp
@@ -83,4 +83,10 @@ namespace beam::wallet
            throw jsonrpc_exception(code, errmsg);
         }
     }
+
+    std::string WalletApi::getTokenType(TokenType type) const
+    {
+        auto it = _ttypesMap.find(type);
+        return it != _ttypesMap.end() ? it->second : "unknown";
+    }
 }
diff --git a/wallet/api/v6_0/wallet_api.h b/wallet/api/v6_0/wallet_api.h
@@ -145,6 +145,8 @@ namespace beam::wallet
 
         virtual void OnComplete(proto::FlyClient::Request&) override;
 
+        std::string getTokenType(TokenType type) const;
+
     protected:
         // Do not access these directly, use getters
         IWalletDB::Ptr       _wdb;
diff --git a/wallet/api/v6_0/wallet_api_defs.h b/wallet/api/v6_0/wallet_api_defs.h
@@ -148,6 +148,8 @@ namespace beam::wallet
         {
             bool isValid;
             bool isMine;
+            TokenType type = TokenType::Unknown;
+            boost::optional<size_t> payments;
         };
     };
 
diff --git a/wallet/api/v6_0/wallet_api_handle.cpp b/wallet/api/v6_0/wallet_api_handle.cpp
@@ -205,10 +205,14 @@ namespace beam::wallet
     {
         LOG_DEBUG() << "ValidateAddress( address = " << data.token << ")";
 
+
+        auto tokenType = GetTokenType(data.token);
+
         auto p = ParseParameters(data.token);
 
         bool isValid = !!p;
         bool isMine = false;
+        boost::optional<size_t> offlinePayments;
 
         if (p)
         {
@@ -226,11 +230,19 @@ namespace beam::wallet
                     {
                         isValid = isValid && !addr->isExpired();
                     }
+                    if (tokenType == TokenType::Offline)
+                    {
+                        if (auto vouchers = p->GetParameter<ShieldedVoucherList>(TxParameterID::ShieldedVoucherList); vouchers)
+                        {
+                            storage::SaveVouchers(*walletDB, *vouchers, *v);
+                        }
+                        offlinePayments = walletDB->getVoucherCount(*v);
+                    }
                 }
             }
         }
 
-        doResponse(id, ValidateAddress::Response{ isValid, isMine });
+        doResponse(id, ValidateAddress::Response{ isValid, isMine, tokenType, offlinePayments });
     }
 
     void WalletApi::doTxAlreadyExistsError(const JsonRpcId& id)
diff --git a/wallet/api/v6_0/wallet_api_parse.cpp b/wallet/api/v6_0/wallet_api_parse.cpp
@@ -989,8 +989,6 @@ namespace beam::wallet
         for (auto& addr : res.list)
         {
             auto type = GetTokenType(addr.m_Address);
-            auto it = _ttypesMap.find(type);
-
             msg["result"].push_back(
             {
                 {"address",     addr.m_Address},
@@ -1003,7 +1001,7 @@ namespace beam::wallet
                 {"own_id",      addr.m_OwnID},
                 {"own_id_str",  std::to_string(addr.m_OwnID)},
                 {"wallet_id",   std::to_string(addr.m_walletID)},
-                {"type",        it != _ttypesMap.end() ? it->second : "unknown"}
+                {"type",        getTokenType(type)}
             });
 
             if (addr.m_Identity != Zero)
@@ -1022,10 +1020,15 @@ namespace beam::wallet
             {"result",
                 {
                     {"is_valid",  res.isValid},
-                    {"is_mine",  res.isMine},
+                    {"is_mine",   res.isMine},
+                    {"type",      getTokenType(res.type)}
                 }
             }
         };
+        if (res.payments)
+        {
+            msg["result"]["payments"] = *res.payments;
+        }
     }
 
     void WalletApi::getResponse(const JsonRpcId& id, const GetUtxo::Response& res, json& msg)
diff --git a/wallet/unittests/wallet_api_test.cpp b/wallet/unittests/wallet_api_test.cpp
@@ -650,13 +650,17 @@ namespace
 
             validateResponce.isMine = true;
             validateResponce.isValid = valid;
+            validateResponce.type = TokenType::Offline;
+            validateResponce.payments = 12;
 
             api.getResponse(123, validateResponce, res);
             testResultHeader(res);
 
             WALLET_CHECK(res["id"] == 123);
             WALLET_CHECK(res["result"]["is_mine"] == true);
             WALLET_CHECK(res["result"]["is_valid"] == valid);
+            WALLET_CHECK(res["result"]["type"] == "offline");
+            WALLET_CHECK(res["result"]["payments"] == 12);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,10 @@ namespace beam::wallet`
`83`	`83`	`throw jsonrpc_exception(code, errmsg);`
`84`	`84`	`}`
`85`	`85`	`}`
	`86`	`+`
	`87`	`+ std::string WalletApi::getTokenType(TokenType type) const`
	`88`	`+ {`
	`89`	`+ auto it = _ttypesMap.find(type);`
	`90`	`+ return it != _ttypesMap.end() ? it->second : "unknown";`
	`91`	`+ }`
`86`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,8 @@ namespace beam::wallet`
`148`	`148`	`{`
`149`	`149`	`bool isValid;`
`150`	`150`	`bool isMine;`
	`151`	`+ TokenType type = TokenType::Unknown;`
	`152`	`+ boost::optional<size_t> payments;`
`151`	`153`	`};`
`152`	`154`	`};`
`153`	`155`
Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,14 @@ namespace beam::wallet`
`205`	`205`	`{`
`206`	`206`	`LOG_DEBUG() << "ValidateAddress( address = " << data.token << ")";`
`207`	`207`
	`208`	`+`
	`209`	`+ auto tokenType = GetTokenType(data.token);`
	`210`	`+`
`208`	`211`	`auto p = ParseParameters(data.token);`
`209`	`212`
`210`	`213`	`bool isValid = !!p;`
`211`	`214`	`bool isMine = false;`
	`215`	`+ boost::optional<size_t> offlinePayments;`
`212`	`216`
`213`	`217`	`if (p)`
`214`	`218`	`{`
`@@ -226,11 +230,19 @@ namespace beam::wallet`
`226`	`230`	`{`
`227`	`231`	`isValid = isValid && !addr->isExpired();`
`228`	`232`	`}`
	`233`	`+ if (tokenType == TokenType::Offline)`
	`234`	`+ {`
	`235`	`+ if (auto vouchers = p->GetParameter<ShieldedVoucherList>(TxParameterID::ShieldedVoucherList); vouchers)`
	`236`	`+ {`
	`237`	`+ storage::SaveVouchers(walletDB, vouchers, *v);`
	`238`	`+ }`
	`239`	`+ offlinePayments = walletDB->getVoucherCount(*v);`
	`240`	`+ }`
`229`	`241`	`}`
`230`	`242`	`}`
`231`	`243`	`}`
`232`	`244`
`233`		`- doResponse(id, ValidateAddress::Response{ isValid, isMine });`
	`245`	`+ doResponse(id, ValidateAddress::Response{ isValid, isMine, tokenType, offlinePayments });`
`234`	`246`	`}`
`235`	`247`
`236`	`248`	`void WalletApi::doTxAlreadyExistsError(const JsonRpcId& id)`
Original file line number	Diff line number	Diff line change
`@@ -989,8 +989,6 @@ namespace beam::wallet`
`989`	`989`	`for (auto& addr : res.list)`
`990`	`990`	`{`
`991`	`991`	`auto type = GetTokenType(addr.m_Address);`
`992`		`- auto it = _ttypesMap.find(type);`
`993`		`-`
`994`	`992`	`msg["result"].push_back(`
`995`	`993`	`{`
`996`	`994`	`{"address", addr.m_Address},`
`@@ -1003,7 +1001,7 @@ namespace beam::wallet`
`1003`	`1001`	`{"own_id", addr.m_OwnID},`
`1004`	`1002`	`{"own_id_str", std::to_string(addr.m_OwnID)},`
`1005`	`1003`	`{"wallet_id", std::to_string(addr.m_walletID)},`
`1006`		`- {"type", it != _ttypesMap.end() ? it->second : "unknown"}`
	`1004`	`+ {"type", getTokenType(type)}`
`1007`	`1005`	`});`
`1008`	`1006`
`1009`	`1007`	`if (addr.m_Identity != Zero)`
`@@ -1022,10 +1020,15 @@ namespace beam::wallet`
`1022`	`1020`	`{"result",`
`1023`	`1021`	`{`
`1024`	`1022`	`{"is_valid", res.isValid},`
`1025`		`- {"is_mine", res.isMine},`
	`1023`	`+ {"is_mine", res.isMine},`
	`1024`	`+ {"type", getTokenType(res.type)}`
`1026`	`1025`	`}`
`1027`	`1026`	`}`
`1028`	`1027`	`};`
	`1028`	`+ if (res.payments)`
	`1029`	`+ {`
	`1030`	`+ msg["result"]["payments"] = *res.payments;`
	`1031`	`+ }`
`1029`	`1032`	`}`
`1030`	`1033`
`1031`	`1034`	`void WalletApi::getResponse(const JsonRpcId& id, const GetUtxo::Response& res, json& msg)`
Original file line number	Diff line number	Diff line change
`@@ -650,13 +650,17 @@ namespace`
`650`	`650`
`651`	`651`	`validateResponce.isMine = true;`
`652`	`652`	`validateResponce.isValid = valid;`
	`653`	`+ validateResponce.type = TokenType::Offline;`
	`654`	`+ validateResponce.payments = 12;`
`653`	`655`
`654`	`656`	`api.getResponse(123, validateResponce, res);`
`655`	`657`	`testResultHeader(res);`
`656`	`658`
`657`	`659`	`WALLET_CHECK(res["id"] == 123);`
`658`	`660`	`WALLET_CHECK(res["result"]["is_mine"] == true);`
`659`	`661`	`WALLET_CHECK(res["result"]["is_valid"] == valid);`
	`662`	`+ WALLET_CHECK(res["result"]["type"] == "offline");`
	`663`	`+ WALLET_CHECK(res["result"]["payments"] == 12);`
`660`	`664`	`}`
`661`	`665`	`}`
`662`	`666`