Merge branch 'master' into feat/files-option

Signed-off-by: Sakul <sakulbudhathoki977@gmail.com>

.github/workflows/android.yml

@@ -55,8 +55,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: js/node_modules
-          key: ${{ runner.OS }}-node-v2-${{ hashFiles('js/yarn.lock') }}
-          restore-keys: ${{ runner.OS }}-node-v2-
+          key: ${{ runner.OS }}-node-v4-${{ hashFiles('js/yarn.lock') }}
+          restore-keys: ${{ runner.OS }}-node-v4-
 
       - name: Cache Gomobile .aar
         uses: actions/cache@v2

.github/workflows/ios.yml

@@ -60,8 +60,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: js/node_modules
-          key: ${{ runner.OS }}-node-v2-${{ hashFiles('js/yarn.lock') }}
-          restore-keys: ${{ runner.OS }}-node-v2-
+          key: ${{ runner.OS }}-node-v4-${{ hashFiles('js/yarn.lock') }}
+          restore-keys: ${{ runner.OS }}-node-v4-
 
       - name: Cache Ruby modules
         uses: actions/cache@v2

.github/workflows/js.yml

@@ -36,8 +36,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: js/node_modules
-          key: ${{ runner.OS }}-node-v2-${{ hashFiles('js/yarn.lock') }}
-          restore-keys: ${{ runner.OS }}-node-v2-
+          key: ${{ runner.OS }}-node-v4-${{ hashFiles('js/yarn.lock') }}
+          restore-keys: ${{ runner.OS }}-node-v4-
       - name: "Fetch deps"
         run: |
           cd js

.gitignore

@@ -25,7 +25,10 @@ go/cmd/berty-doctor/berty-doctor
 go/cmd/berty-integration/berty-integration
 go/cmd/betabot/betabot
 go/cmd/rdvp/rdvp
+
+# Various berty outputs
 betabot.store
+benchmark_result.json
 
 # Delve's binaries
 *__debug_bin

api/bertymessenger.proto

@@ -108,10 +108,9 @@ message InstanceShareableBertyID {
     string display_name = 2;
   }
   message Reply {
-    BertyID berty_id = 1 [(gogoproto.customname) = "BertyID"];
-    string berty_id_payload = 2 [(gogoproto.customname) = "BertyIDPayload"];
-    string deep_link = 3 [(gogoproto.customname) = "DeepLink"];
-    string html_url = 4 [(gogoproto.customname) = "HTMLURL"];
+    BertyLink link = 1;
+    string internal_url = 2 [(gogoproto.customname) = "InternalURL"];
+    string web_url = 3 [(gogoproto.customname) = "WebURL"];
   }
 }
 
@@ -121,10 +120,9 @@ message ShareableBertyGroup {
     string group_name = 2;
   }
   message Reply {
-    BertyGroup berty_group = 1 [(gogoproto.customname) = "BertyGroup"];
-    string berty_group_payload = 2 [(gogoproto.customname) = "BertyGroupPayload"];
-    string deep_link = 3 [(gogoproto.customname) = "DeepLink"];
-    string html_url = 4 [(gogoproto.customname) = "HTMLURL"];
+    BertyLink link = 1;
+    string internal_url = 2 [(gogoproto.customname) = "InternalURL"];
+    string web_url = 3 [(gogoproto.customname) = "WebURL"];
   }
 }
 
@@ -142,14 +140,20 @@ message ParseDeepLink {
     string link = 1;
   }
   message Reply {
-    Kind kind = 1;
-    BertyID berty_id = 3 [(gogoproto.customname) = "BertyID"];
-    BertyGroup berty_group = 4 [(gogoproto.customname) = "BertyGroup"];
+    BertyLink link = 1;
   }
+}
+
+message BertyLink {
+  Kind kind = 1;
+  BertyID berty_id = 2 [(gogoproto.customname) = "BertyID"];
+  BertyGroup berty_group = 3 [(gogoproto.customname) = "BertyGroup"];
+  // bool enc = 4;
+
   enum Kind {
     UnknownKind = 0;
-    BertyID = 1;
-    BertyGroup = 2;
+    ContactInviteV1Kind = 1;
+    GroupV1Kind = 2;
   }
 }
 

config/config.yml

@@ -2,36 +2,40 @@ berty:
   contacts:
     betabot:
       name: "BetaBot"
-      link: "https://berty.tech/id#key=CiC35BD9vmG_Jm0Ghfd_R15QjcaFaKQzAe3H4XSW-I9fkhIgB2WfJXaStZ3I9fX75lnEiVkUNZnuJaNKoiUmNWNX7UM&name=BetaBot"
+      link: "https://berty.tech/id#contact/oZBLFkhRFWg9NXmy8wtjzZKeeUwfaWQVkUXfNY6h9z4QnGXuXSox8zs2yXeFHzt9DKJ8B4WHy7Zjy1g8tSat6ee2Jh7vp4J/name=BetaBot"
       description: "Official BetaBot"
       kind: "Bot"
       #icon:
     testbot:
       name: "TestBot"
-      link: "https://berty.tech/id#key=CiAedii3fLdXjfm47RPDhY71ADZNQ1C9DhwWRwsqk3Jg3RIgHvcSW0wWdW0nit2JdLJeJpDxS1EJ2AbqNTn_Igv0vEU&name=TestBot"
+      link: "https://berty.tech/id#contact/oZBLG8gg1RTwCW2u1AxA44dT1Lum2PAr2nBra6WdmTpozq7vdDkae9FjyCW3QZ86AE9pMAudh4GKTfNj1jELcdvtJy44Rbp/name=TestBot"
       description: "Official TestBot"
       kind: "Bot"
       #icon:
     betabot-dev:
       name: "BetaBot Dev"
-      link: "https://berty.tech/id#key=CiBQHH6a84AHwdahXR6NQcOxTKjUHeqLdQfIAzxAYSoD1xIgT-tFTYrU-tD55bYgaXbBNTlqTHubq-_Qb8ksv2bSH9o&name=BetaBot%20Dev"
-      description: "Dev BetaBot"
+      link: "https://berty.tech/id#contact/oZBLFQQTqmZ25yvcRRUVgzzZCpDY7YAVXDEz3g8kmwcSPCmnQrqiMbLrfSp1GRLaNBX6ZRarid8jkSUX4yQYL4oBZcLDtFY/name=BetaBot-Dev"
+      description: "BetaBot-Dev"
       kind: "Bot"
       #icon:
     testbot-dev:
       name: "TestBot Dev"
-      link: "https://berty.tech/id#key=CiAxSP1RYrv4yi7PsQZtqFH9fepMiqDD1M7y1aIZAzMmghIg_fXVz1J-HfCd6gtRlUN0GsWiIlfgVPamj7lgFIUqfOA&name=TestBot%20Dev"
-      description: "Dev TestBot"
+      link: "https://berty.tech/id#contact/oZBLFG6fwy21Dn4o511HC6ghxEghB5apq2QhjFepXCkbhfCWjzvRzhetVCGYwWhCtrWVL1TmExtHvdgGBvx1WK1RnXTdato/name=TestBot-Dev"
+      description: "TestBot-Dev"
       kind: "Bot"
       #icon:
     #support:
     #staff:
     #berty-tv:
   conversations:
     dev-test:
-      link: "https://berty.tech/group#invite=CiAbnwpJK0_Zg-pNE9bpcWKeI2J-RmCVuM7uNXQv7MEizBIg2EBkfV2eRm_SP5GX04H8zf9cpjsPTvMAcSeob3-GQsAaQPLmDQSArZfQ8QdANRX4uCrgQuivtF41pWnRYKEqDI_b1xb8mHExObf4RF9gcs4ktyMYVD6ZpCROyZfCg0f1GAAgAw&name=Dev+Test"
+      link: "https://berty.tech/id#group/5QdUv6Fn3uvi3AchNcqFECaZvngDzWGUJV4wntYCWuYyjXrNi4ykvnP2ZCeWA1YLTmCSFbZaimXzp8rZtkKqby8nGv7S2AXyJPggo3aMghJS3rpeuDx6pbbNqEoNXJK67pWVpcLB6VrXM54zRNbi4zhEsLdATGzguWoruShcRHzFpuP75nyvRnXnfRaHPjdbyC/name=Dev+Test"
       name: "Dev Test"
       description: "Simple Conversation with Replication"
+    dev-test-2:
+      link: "https://berty.tech/id#group/5QdUv6Fn3uwSPQZpLUXcNpQ24bR9y1TUK6xJfE9khJo4jrP8jF4QfdgpTT73Us58y6XZhtvJHLDCouXfgsKDxXqZAsfLDhUZLb48PDcBYYVUk7nzxh1MKh5a6Ug1bP4KpdrVDYQx1gCZA4HZavEUgUBbC1pYBZ2DaY27sCMfqxpt79RjZCBwmVqW1DbbuYCUoc/name=Dev+Test+2"
+      name: "Dev Test 2"
+      description: "Simple Conversation with Replication"
 p2p:
   rdvp:
     # svc fr