From 2f2aa794e28ff1061037cba1a5aebe19a210f27d Mon Sep 17 00:00:00 2001 From: Lucas Araujo Date: Thu, 31 Mar 2022 10:11:26 -0300 Subject: [PATCH 1/2] Update expired certificates --- tls/client/ca.crt | 28 ++++++++-------- tls/client/client.crt | 28 ++++++++-------- tls/client/client.key | 50 +++++++++++++-------------- tls/client/client.pem | 78 +++++++++++++++++++++---------------------- tls/server/ca.crt | 28 ++++++++-------- tls/server/server.crt | 26 +++++++-------- tls/server/server.key | 50 +++++++++++++-------------- tls/server/server.pem | 76 ++++++++++++++++++++--------------------- 8 files changed, 182 insertions(+), 182 deletions(-) diff --git a/tls/client/ca.crt b/tls/client/ca.crt index 7a4e60b4c5..93c0a1ee71 100644 --- a/tls/client/ca.crt +++ b/tls/client/ca.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- MIIDNjCCAh6gAwIBAgIBATANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y -MTAzMzAxNzIwMTBaFw0zMTAzMjgxNzIxMTBaMDoxETAPBgNVBAoMCERhZWRhbHVz +MjAzMzAyMDEzNDhaFw0zMjAzMjcyMDE0NDhaMDoxETAPBgNVBAoMCERhZWRhbHVz MSUwIwYDVQQDDBxEYWVkYWx1cyBTZWxmLVNpZ25lZCBSb290IENBMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIGJJKwYvhby2ib829IE8UU8irHEZ082 -J8XLgADEiG6UCs+aqn9w++27nlzMRMofF49rjfSjDjhzpML8e5Vug9djEz9s2B0u -uPtAzBBJyrA56IIDUO1r/X7AcQ+h86WXWzkmGjvRQLzN0L0rPU26S7RbasXc3FP0 -wCer3Uaw/3npkfZopNXzq16/9CuZB95gka4g/LJVSqvrrZFx4dcQ8mpHK9S/Uq2n -j1tRW8xzgFUg5NWdqhyRxvX4jtPUWMXJfn5ltOSk29Xj0Cra25ZVORtaCsqTargn -pinWLzlejHeGZR4NVPY+213ucyt6EWMf3HnlPxqES83m9rf/oPYHbwIDAQABo0cw +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnH93sgS9S02Wbf9n1bMMPuf7bsu95wh +vQdNRi6lmadjMcqY4KIAwebGO0bEH5fLEuPmvD2PPfjaju7/FKv8QG0aPx0ElrBo +cYbiuYPaFmJWvhThxKSyYEEILxzx9oKxwJk+lbIaSR5p+mQLLR+UYET4fzZ3E9fL +mgMODQNc1JKgM4GBdH13Y+0CxYsj9vQAbXTsIUvGh6+1zh0whdV1/3szSfztftnT +OGT8xdsYZ2kTGeBjp2hQzSagWc50eT9G/d32fAhCKD6uvEsAT6xS2S6/RpGVlA8H ++ZbdHiCVGHVAuCo8DL63fPCXHjCrmOjZnV2hajK95jug2b1XbhMbowIDAQABo0cw RTAPBgNVHQ8BAf8EBQMDBwYAMBIGA1UdEwEB/wQIMAYBAf8CAQAwDQYDVR0OBAYE -BHBw0/IwDwYDVR0jBAgwBoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAUlYcsa/F -xak3RO4YH4mdJOPDt7I16SoqH9EP8BTlOTgFU8Ql5MpG7VE+XWVc1D3NSp0y9iQk -bJH9MGaPLFbkJfwGq+pfpaS/0xI+KwRkG5rQVbpP+jOqGaADOVjuC2J3dNFg71ww -eozmKRjKU16DsFnQJ+N68kWoJ3t776/NzS7p7Oa7k4oijPhGtEAkrKOBzHXLILkZ -kUXYszN4pQGPPuWG2EZpTyAnvrDOwST1VrpGDFMdUy9ML891sMtuf5YM8dSF/WOS -pTmpP4xcb5HciFa+5Hv7242ATVrAirUB6pGA0A9ruxRQPWXwISBRtOIiqqOq2xIi -FX/3TGmzZn7kqw== +BHBw0/IwDwYDVR0jBAgwBoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAUOIAbhAt +9AniOsPJeHL/K9bnls8zcLark229FIYrglInd53ILSKyC2+g/sOVSue2w3WebLD8 +6UkyHxYUsjz1ONla8/HMvYkbWSqCkWczlFzW5WjsTbXhtUIPtfQObnrYg3jtm/Q7 +malzKPGseR1F6cHKOzjJ2jo2FHkLrrQIgnKRAMcW0zso2sAzrx1aJnzhEhsZhKXP +kSUGLQoDStRRJHfE5FYMEstTXa2odkCpR19Eha6BhZBxwmfzXjktjIqeHngUy4U3 +8815LuzFag+wp3nUQlkSLuwfOiBtpcWB2uzKsY6/1jrf9jcZOd8kyzOphYNngN7u +r0BWefYXe1rFEA== -----END CERTIFICATE----- \ No newline at end of file diff --git a/tls/client/client.crt b/tls/client/client.crt index aa47de07b7..3957600385 100644 --- a/tls/client/client.crt +++ b/tls/client/client.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- MIIDOjCCAiKgAwIBAgIBAzANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y -MTAzMzAxNzIwMTFaFw0yMjAzMzAxNzIxMTFaMC8xETAPBgNVBAoMCERhZWRhbHVz +MjAzMzAyMDEzNDhaFw0yMzAzMzAyMDE0NDhaMC8xETAPBgNVBAoMCERhZWRhbHVz MRowGAYDVQQDDBFEYWVkYWx1cyBGcm9udGVuZDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALMc2GWmO1fBqSm+1GR/f93fOusqn1XmhE5kJG48Y0lt1MWS -zpQ2hoynjpuwZ3UACpr6P/asxxboH7MWthDhygKw+dNdtg6R5DMapc8Z6oUQqQtq -UGLL9G8ds5x/jkV3C1VvklX2uy9e2qCKwnwvk1by/xich02G94pdFmsKZ5E1fqcb -x/oF+1dOa67wGFhILYVR0Ai8xdcwb/Yqpk+Zefw3gyQw+qvz0pZlIu0L62eP/5Xx -BtCcdSBK/6/sUIVEtZ9I9WTJuO1JrIgBDL7ZV1cA42qQ8GM+22xoYl+6AkOKo31r -9IAyE/ZhIHDkaRDsllUgDhStQrwWzE8Ef55QsTMCAwEAAaNWMFQwDwYDVR0PAQH/ +ggEPADCCAQoCggEBAMI2Ru5xGpmEN6VhKCy1ids9/9cUVqDP9hTl9KBlwMjIIuDd +Scqs5rI95K7GK49Pv9yHJ048hF31ZS8TuHh2mosrjyxXYSHAVozTDgpeeryuv9od +Qz6GWtLheLcgY3BIhVMgRKrCP8iDMxjseWnOeIjmxdPp9BkAZb85okfGTBptPua0 +M7Y8gjy8fSvyKdF2KBIiReDwJuX9rcc2yzTmixzZ6Y6GzCCK8Fctt6uFgv16nBUT +KY2f/7byuk8GTP7wrOOarHyhdjcSwUq95xiWnOe9pVFFfXPOq3iYxGDF7ULZbVUG +WxSL/cy/f7gk8EqeGllphqGURNxxXTRrYJHUffUCAwEAAaNWMFQwDwYDVR0PAQH/ BAUDAwegADATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMEBTADAQEAMA0GA1Ud -DgQGBATUMSd+MA8GA1UdIwQIMAaABHBw0/IwDQYJKoZIhvcNAQELBQADggEBADN0 -viDwiJiPe5e0nGio2Ac9fXhR4Y5LfIPpTM6o8QYdoshC2BQ2mm8anIGxNd5jS2x7 -dZsBC3Dyhxud5QGzgccsyKGPnUxT3pRrBMIQGu2VjUAvnnfEQc1WhrRCRYEHyuHa -yFobD+78/ywB/yFr1tnjFKcLVi26WyiP1dSGUfNb5/6nLPOQIiKH1j7AcAjSUu2g -u5CVEb6CKo6ePqzyi29Np+SwECQvnw0jR27wdMYIKLpfOw2TccD7wCqaU4g8T0G0 -Y2kf+74kirfpAsiH8oy84uLJQtcmA4xeRM63rz1ieGGQppkzvYCr2ZGAIGkGPxva -wO77oyftSCMLkqP13vw= +DgQGBATUMSd+MA8GA1UdIwQIMAaABHBw0/IwDQYJKoZIhvcNAQELBQADggEBAGP9 +tWmlxTnZtNqyjfzW2x64K4sjXZbhyTBoqf/ViPrEoYJMlBGn7k9Bo4UGyCEYQOpv +ZZmNlsdDV8FK6esW6PnEl2EhF+o4Tf7R51PvI7HqcEXd2ksudKRlMG69uHsWpvrn +tU2kINrYuj7ceZnXswE/ZHY1Y6Dy1ifdoDPY1BiWKxuM6qUKZLX+oiGgfxqkT7fV +Yqf+SBYYQxiZVvoCqCH3y53rKIa918ifNdp5u4tbRXkyiyCswABLbIyuZ3bqACLK +IkBM3cSNJ+fnfNFniaAP9m+F6bthqqpB+Xx0k9tT5VUngKlDXSBSGhr84/uzp2zd +yGNtW0b1cmcBTn9t5pA= -----END CERTIFICATE----- \ No newline at end of file diff --git a/tls/client/client.key b/tls/client/client.key index 0ccd0b70e0..815b1f742f 100644 --- a/tls/client/client.key +++ b/tls/client/client.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/tls/client/client.pem b/tls/client/client.pem index 17c1f9c4a8..f9cc173f65 100644 --- a/tls/client/client.pem +++ b/tls/client/client.pem @@ -1,47 +1,47 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- -----BEGIN CERTIFICATE----- MIIDOjCCAiKgAwIBAgIBAzANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y -MTAzMzAxNzIwMTFaFw0yMjAzMzAxNzIxMTFaMC8xETAPBgNVBAoMCERhZWRhbHVz +MjAzMzAyMDEzNDhaFw0yMzAzMzAyMDE0NDhaMC8xETAPBgNVBAoMCERhZWRhbHVz MRowGAYDVQQDDBFEYWVkYWx1cyBGcm9udGVuZDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALMc2GWmO1fBqSm+1GR/f93fOusqn1XmhE5kJG48Y0lt1MWS -zpQ2hoynjpuwZ3UACpr6P/asxxboH7MWthDhygKw+dNdtg6R5DMapc8Z6oUQqQtq -UGLL9G8ds5x/jkV3C1VvklX2uy9e2qCKwnwvk1by/xich02G94pdFmsKZ5E1fqcb -x/oF+1dOa67wGFhILYVR0Ai8xdcwb/Yqpk+Zefw3gyQw+qvz0pZlIu0L62eP/5Xx -BtCcdSBK/6/sUIVEtZ9I9WTJuO1JrIgBDL7ZV1cA42qQ8GM+22xoYl+6AkOKo31r -9IAyE/ZhIHDkaRDsllUgDhStQrwWzE8Ef55QsTMCAwEAAaNWMFQwDwYDVR0PAQH/ +ggEPADCCAQoCggEBAMI2Ru5xGpmEN6VhKCy1ids9/9cUVqDP9hTl9KBlwMjIIuDd +Scqs5rI95K7GK49Pv9yHJ048hF31ZS8TuHh2mosrjyxXYSHAVozTDgpeeryuv9od +Qz6GWtLheLcgY3BIhVMgRKrCP8iDMxjseWnOeIjmxdPp9BkAZb85okfGTBptPua0 +M7Y8gjy8fSvyKdF2KBIiReDwJuX9rcc2yzTmixzZ6Y6GzCCK8Fctt6uFgv16nBUT +KY2f/7byuk8GTP7wrOOarHyhdjcSwUq95xiWnOe9pVFFfXPOq3iYxGDF7ULZbVUG +WxSL/cy/f7gk8EqeGllphqGURNxxXTRrYJHUffUCAwEAAaNWMFQwDwYDVR0PAQH/ BAUDAwegADATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMEBTADAQEAMA0GA1Ud -DgQGBATUMSd+MA8GA1UdIwQIMAaABHBw0/IwDQYJKoZIhvcNAQELBQADggEBADN0 -viDwiJiPe5e0nGio2Ac9fXhR4Y5LfIPpTM6o8QYdoshC2BQ2mm8anIGxNd5jS2x7 -dZsBC3Dyhxud5QGzgccsyKGPnUxT3pRrBMIQGu2VjUAvnnfEQc1WhrRCRYEHyuHa -yFobD+78/ywB/yFr1tnjFKcLVi26WyiP1dSGUfNb5/6nLPOQIiKH1j7AcAjSUu2g -u5CVEb6CKo6ePqzyi29Np+SwECQvnw0jR27wdMYIKLpfOw2TccD7wCqaU4g8T0G0 -Y2kf+74kirfpAsiH8oy84uLJQtcmA4xeRM63rz1ieGGQppkzvYCr2ZGAIGkGPxva -wO77oyftSCMLkqP13vw= +DgQGBATUMSd+MA8GA1UdIwQIMAaABHBw0/IwDQYJKoZIhvcNAQELBQADggEBAGP9 +tWmlxTnZtNqyjfzW2x64K4sjXZbhyTBoqf/ViPrEoYJMlBGn7k9Bo4UGyCEYQOpv +ZZmNlsdDV8FK6esW6PnEl2EhF+o4Tf7R51PvI7HqcEXd2ksudKRlMG69uHsWpvrn +tU2kINrYuj7ceZnXswE/ZHY1Y6Dy1ifdoDPY1BiWKxuM6qUKZLX+oiGgfxqkT7fV +Yqf+SBYYQxiZVvoCqCH3y53rKIa918ifNdp5u4tbRXkyiyCswABLbIyuZ3bqACLK +IkBM3cSNJ+fnfNFniaAP9m+F6bthqqpB+Xx0k9tT5VUngKlDXSBSGhr84/uzp2zd +yGNtW0b1cmcBTn9t5pA= -----END CERTIFICATE----- \ No newline at end of file diff --git a/tls/server/ca.crt b/tls/server/ca.crt index 7a4e60b4c5..93c0a1ee71 100644 --- a/tls/server/ca.crt +++ b/tls/server/ca.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- MIIDNjCCAh6gAwIBAgIBATANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y -MTAzMzAxNzIwMTBaFw0zMTAzMjgxNzIxMTBaMDoxETAPBgNVBAoMCERhZWRhbHVz +MjAzMzAyMDEzNDhaFw0zMjAzMjcyMDE0NDhaMDoxETAPBgNVBAoMCERhZWRhbHVz MSUwIwYDVQQDDBxEYWVkYWx1cyBTZWxmLVNpZ25lZCBSb290IENBMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIGJJKwYvhby2ib829IE8UU8irHEZ082 -J8XLgADEiG6UCs+aqn9w++27nlzMRMofF49rjfSjDjhzpML8e5Vug9djEz9s2B0u -uPtAzBBJyrA56IIDUO1r/X7AcQ+h86WXWzkmGjvRQLzN0L0rPU26S7RbasXc3FP0 -wCer3Uaw/3npkfZopNXzq16/9CuZB95gka4g/LJVSqvrrZFx4dcQ8mpHK9S/Uq2n -j1tRW8xzgFUg5NWdqhyRxvX4jtPUWMXJfn5ltOSk29Xj0Cra25ZVORtaCsqTargn -pinWLzlejHeGZR4NVPY+213ucyt6EWMf3HnlPxqES83m9rf/oPYHbwIDAQABo0cw +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnH93sgS9S02Wbf9n1bMMPuf7bsu95wh +vQdNRi6lmadjMcqY4KIAwebGO0bEH5fLEuPmvD2PPfjaju7/FKv8QG0aPx0ElrBo +cYbiuYPaFmJWvhThxKSyYEEILxzx9oKxwJk+lbIaSR5p+mQLLR+UYET4fzZ3E9fL +mgMODQNc1JKgM4GBdH13Y+0CxYsj9vQAbXTsIUvGh6+1zh0whdV1/3szSfztftnT +OGT8xdsYZ2kTGeBjp2hQzSagWc50eT9G/d32fAhCKD6uvEsAT6xS2S6/RpGVlA8H ++ZbdHiCVGHVAuCo8DL63fPCXHjCrmOjZnV2hajK95jug2b1XbhMbowIDAQABo0cw RTAPBgNVHQ8BAf8EBQMDBwYAMBIGA1UdEwEB/wQIMAYBAf8CAQAwDQYDVR0OBAYE -BHBw0/IwDwYDVR0jBAgwBoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAUlYcsa/F -xak3RO4YH4mdJOPDt7I16SoqH9EP8BTlOTgFU8Ql5MpG7VE+XWVc1D3NSp0y9iQk -bJH9MGaPLFbkJfwGq+pfpaS/0xI+KwRkG5rQVbpP+jOqGaADOVjuC2J3dNFg71ww -eozmKRjKU16DsFnQJ+N68kWoJ3t776/NzS7p7Oa7k4oijPhGtEAkrKOBzHXLILkZ -kUXYszN4pQGPPuWG2EZpTyAnvrDOwST1VrpGDFMdUy9ML891sMtuf5YM8dSF/WOS -pTmpP4xcb5HciFa+5Hv7242ATVrAirUB6pGA0A9ruxRQPWXwISBRtOIiqqOq2xIi -FX/3TGmzZn7kqw== +BHBw0/IwDwYDVR0jBAgwBoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAUOIAbhAt +9AniOsPJeHL/K9bnls8zcLark229FIYrglInd53ILSKyC2+g/sOVSue2w3WebLD8 +6UkyHxYUsjz1ONla8/HMvYkbWSqCkWczlFzW5WjsTbXhtUIPtfQObnrYg3jtm/Q7 +malzKPGseR1F6cHKOzjJ2jo2FHkLrrQIgnKRAMcW0zso2sAzrx1aJnzhEhsZhKXP +kSUGLQoDStRRJHfE5FYMEstTXa2odkCpR19Eha6BhZBxwmfzXjktjIqeHngUy4U3 +8815LuzFag+wp3nUQlkSLuwfOiBtpcWB2uzKsY6/1jrf9jcZOd8kyzOphYNngN7u +r0BWefYXe1rFEA== -----END CERTIFICATE----- \ No newline at end of file diff --git a/tls/server/server.crt b/tls/server/server.crt index a9ad5e93b5..ca9bf161e5 100644 --- a/tls/server/server.crt +++ b/tls/server/server.crt @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- MIIDhzCCAm+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y -MTAzMzAxNzIwMTFaFw0yMjAzMzAxNzIxMTFaMDUxETAPBgNVBAoMCERhZWRhbHVz +MjAzMzAyMDEzNDhaFw0yMzAzMzAyMDE0NDhaMDUxETAPBgNVBAoMCERhZWRhbHVz MSAwHgYDVQQDDBdEYWVkYWx1cyBXYWxsZXQgQmFja2VuZDCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBALzo7x6RHhLF8EGTBduhrMkhClkZ7LoJCkIJ7wQX -Ngyvw3O4BL45vizBSfXRG+Rm2PAHuIReD3bos/lRDM1z7cOi/iCEFguy3JltgXuB -uiPsOTjZGe+YKGLjQ+M4n/P+NBbkv7bFVVWs5GHGPwAHG94GMYSawKHW539zkTu9 -aF7vbKWdRS9iM5fC7r77cySM1wA/95r1bI63knO6wR7bNnlRH8oHjH+jJ5fv5qBz -JZo8O423/HaM14+d1Rh9THN0hM0f8FgFZC2ea3036u7kssiUAvLIkw2i8ZdrYDc8 -rVwzXPHFaaBGy+Ij5bJWssUYPhDgdG7jnyXUnRQgENWGrq8CAwEAAaOBnDCBmTBD +AQEBBQADggEPADCCAQoCggEBAK86z0CJUZkAiWR9xg+Xki6MVQOjJwF2G4UEm7y1 +VQ/id50dx19ALdBoaoAr7ye6ZZr3b6WYe5ZSMr+hxuMxCVOp8DuTV5jToy2wLdsP +cC9arc0QpZrxUcgx+7v8rHW9DVIgd1ozBUEE6lcnzDVqn06HPN2gkfNqs9XPzSFx +AyJgNNHWMFxW0QAGKRwkHoI3CRAxPQz0VB8e3gl5iMoRY6wuX9nHBEvQcMGy0vQV +AzQqfaduVuu8DE6CbiPgYy0uLMNqXTl84ngtV7MK/+pudOyfgNxGAoftg7rHFShX +fMZCMEqkZInOLdbQ0QK6CoYESaCSDc4nRCI6QL0Fg/YcmN8CAwEAAaOBnDCBmTBD BgNVHREEPDA6gglsb2NhbGhvc3SCFWxvY2FsaG9zdC5sb2NhbGRvbWFpbocEfwAA AYcQAAAAAAAAAAAAAAAAAAAAATAPBgNVHQ8BAf8EBQMDB6AAMBMGA1UdJQQMMAoG CCsGAQUFBwMBMAwGA1UdEwQFMAMBAQAwDQYDVR0OBAYEBGDOyHQwDwYDVR0jBAgw -BoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAiXibit6Uj75+JUCHfSEdFyDALtur -TKMGJuWluaEhvxFTkN6nRSoezpSsbp+jOVLXBqRSBLyAOWkPPBOnbUZuE+LCI2iD -IIzMwo7GWlaBu6IcNQuOOUblxMDhU4SuhSZM+t9FkUfx+n2bv9r51FfvU8FScJ+r -NEEyDMdI5aNpWiku8XVt0p5wkXeFhErmtNEv2gVOV/K7TZcvgbspY9V248dTazIT -myj6+xXEnV20aVlP0rXPvQKKM2yylmkLq1vxNZ1GbNn3vkt0rQtL6HUDVa++6RJY -Nx9qxj0C3SnpYK0lRml7pxjubt1PpVCaxGAjN4kU8HBMEw+I9UMx4/mlZw== +BoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAGkuTq5oISEKy5XL7Invht74iK+N8 +ABsWKDvQbu63UxPWJFk04DZa1zJagkfTt+4feX0lx6Ni2DH9X2sbdc2MAQm5F9oJ +B9xVk4IyxNeTLX6VMZ58hfuydsGX+Z6Er8DIiPsokohjfiEhs+nVFKTIodA9Hqj9 +e2MlcpWZbl2EsDOlOtqy5zj+RJnH65pQWJoIGpdApC+31sijwnjbmEcLs0X+lGhN +8WsHh4bmIdIbBtHaau05ntKgf6Ehosi/YiYd/+xG6pWlQfSxj2ITaTLNUY1E0nme +IUX9FwAopEoMeb5BuCFv5eBDRz/LNktWT9xeqBndSjre4CWxuq95KQeNFg== -----END CERTIFICATE----- \ No newline at end of file diff --git a/tls/server/server.key b/tls/server/server.key index 96566d11c0..5e8b5c9b08 100644 --- a/tls/server/server.key +++ b/tls/server/server.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvOjvHpEeEsXwQZMF26GsySEKWRnsugkKQgnvBBc2DK/Dc7gE -vjm+LMFJ9dEb5GbY8Ae4hF4Pduiz+VEMzXPtw6L+IIQWC7LcmW2Be4G6I+w5ONkZ -75goYuND4zif8/40FuS/tsVVVazkYcY/AAcb3gYxhJrAodbnf3ORO71oXu9spZ1F -L2Izl8LuvvtzJIzXAD/3mvVsjreSc7rBHts2eVEfygeMf6Mnl+/moHMlmjw7jbf8 -dozXj53VGH1Mc3SEzR/wWAVkLZ5rfTfq7uSyyJQC8siTDaLxl2tgNzytXDNc8cVp -oEbL4iPlslayxRg+EOB0buOfJdSdFCAQ1YaurwIDAQABAoIBAGJWz8OVv5X+PGem -ZXJD43KAJKble/oMIq7mBOqYOqa4CIMA1FdCL+GUbS/tvxtS/rNVEZS2ck5wLOAo -dQWux6MEAk5i9Cb64SNtge4NRhzVJ6SUP5AeIUf5DqoGHB4jwnH4emRmrVmAOxM6 -5CjbioI1rylcddLJ0JDkVEJJA0AHdMX5IOpx9wP6jOJMITqyRDaJSttuUolz89ax -Fo7BbftsUl4eq9BJVrBIoPJ3yzOLbEQqr45Ny3rdKj9BzSRcT65TS17nUDTU0vid -YBQ3RM6CAMI6p3/daOFtWwiZSnVdxUjJUnLQ/TdAWsnGWscuk4yYlCIhysS+fX2Y -3VEMu8ECgYEAxdX9+sbYbuzMw43V8tAhJ3IRaJEvJGR6B0sVMpTp6mlvukQfXS8g -Y/IT+iWG+ApEaye+ZXZzUsZzRL5dNdy9SgSETmahunPnBbB3N5xYNfVZth7Zbq/X -5LwIOTdbht8pk8HJz9Rin7CBufMoEdtDSD/uMDURZe3s+Hvs4AsLbtcCgYEA9HMh -iP5K58Vkralwoguyj1fQHs5GhbKrx6ZQRixa6kvGCgxeEfeoM3FHCfY/6HE2dRCm -RQV2V6r/AOBDWmguY8tv4z1WdoSzpbEEHAigSjxwqciIYwygCGS4ZGVje81EanCt -Fi23FulI80Wr/4KKDTv60Lykp1NE8Y2OkKze++kCgYAan/YSbfhq1Uupdck5aHFN -0bguDnv9tdgGa0BrEkd42L/Ena5q6BC/4rB1ld9YOmmC0lJ5bTuQBE03DzeULCT9 -dSYpNv7FDRwmU913in8EpARy0iwJDXlMu1GQAbc7q4T48berVLYBL8wFrofR/2RK -sO/pZPr2cNLXjjYO4O2k+QKBgQCR/YB1tIk/yl/KZ3thC+NkQGmHPGJZzs9QuT8P -6cWSUBbCQYic6m+F6Y0noe2hAJwpZfwnFJAM447QEx+mirnJ1+HGsQdGWRKBTirK -I0y3iUkv3Re3L/8ThDOrofG8KmdFum1k5YCHKmPrBh0mx+ty4/NzXnZniA+Qw531 -QYkaoQKBgQDAz7D8z00lr7vNvYWiy3i7OvyG2q3wFsLvfiV3kpD6Zokkyxkon490 -ebUGdNDZq1sVDDbnOkeiKHZomxj6K5xwU6hhkugnEX2AO2ludV010nfhf3yx36YG -4YB+hQagEkapcpYD7ziU+o73JsZ+qMVv3aa8zGYJd3vRz06+PU7BBw== +MIIEpAIBAAKCAQEArzrPQIlRmQCJZH3GD5eSLoxVA6MnAXYbhQSbvLVVD+J3nR3H +X0At0GhqgCvvJ7plmvdvpZh7llIyv6HG4zEJU6nwO5NXmNOjLbAt2w9wL1qtzRCl +mvFRyDH7u/ysdb0NUiB3WjMFQQTqVyfMNWqfToc83aCR82qz1c/NIXEDImA00dYw +XFbRAAYpHCQegjcJEDE9DPRUHx7eCXmIyhFjrC5f2ccES9BwwbLS9BUDNCp9p25W +67wMToJuI+BjLS4sw2pdOXzieC1Xswr/6m507J+A3EYCh+2DuscVKFd8xkIwSqRk +ic4t1tDRAroKhgRJoJINzidEIjpAvQWD9hyY3wIDAQABAoIBAH51MpygfQKuIHkl +S4p1GEn/fFrjo4KqebHFYZ8OPhT4mtoIY5mZ93Yv5KwbCLzjB/COIUSghpA1QeqK +Fb5f5Rs7yOM1skHYeiq+ulkdCxkhl8wl912aSirv53wDHXLavIJIa9nseB40Leo4 +Dmd+SvmhH4vSFYJVvvLOxHsd0+U51thmvA3+GIuAJjtRx84V4w3ud0g7q7QcpHgi +Bv/Z+GgHvCa7dqSv2zwMc3hr1xk8oJIxBh7aSphl6uAHUGfqYGw4O5vdfgI15ORr +XhiVifEoT4scf8Ht1+npnNSX++OUHf4AgW9mCLy+knMx2lLuzea6I7r52sAk3MZ+ +zr2D6AECgYEA3hy03TrJe/xAtgkpr5SgDjJO9Ih/xUtHQ6Lm8pfyjOhYywbotpyQ +ur9yrw0HTLq4yKBSlUz5z7ALxRgGeRgBpmpovfBHLk2htadQhTIAYdEmsK2UYLJ9 +t8Keh2CTjhUHE8IuvKnLZAk3rkXSFkXfDJWw/SpAxi3yUZyIOoquB5ECgYEAyfb2 +QjfBFepZcg81/+cxj6GDVmyflByLQkyObzbKs8QuEUgAcH+U7ePl0LyfH2kOUd+F +oJ/4DZQnqQOcru/KGRrdYStIRSRgHpzJtT42diU+9VEYzgKR862rzup3oc/5oXU9 +4tpBL3XqdfRPHMFO+hFq4ZY65kHhPS6LB0ZDwW8CgYEApPOOwompHsIc0NQHOFVZ +dJGaH3LL6RrZ5voxJ9L+l/TqFIWiCBRIS9hodGZpmGtHVf/ytNyA3ePxKcOI8x+I +Ai4ecYjjZBjVUpHac8DJldt9L1MJ0bJdOT54+zMXAjrNkbfxe71hxn4t8uf5eP8V +AkSdN7bMeiGfR0rHxSo+ynECgYBeGwXJ+wKsPIMrA21s7QQJ4f85oOmGcPpujQ99 +QLGYq9uvT7ZstPXnFt65sXoPf7sdaSJxorhJU3Rba4RxeufXZM4sfadyGC31dacD +HZbw3BAG7J+7NjVdrtm0U0olCqxNkDyi3IGtJKt4BLtsMaKkIMOFk6OkMKRMBsjf +Pd1KXwKBgQCJs428LySGzlIXO4vUFM1N6TXhjRTeVPcXttAcZ5J+En7nZo3ij09P +qfRR7f/RTq3FE5uYE08wrdItZG48eRrC9ZzjG/W4lbIwlSWRO0zBgdZbOlVzkB/v +T7QrntdELkmWZrEC/L4Kc8GWl/nsg4si5M+NoaW2OnoRNiFJH/h1Nw== -----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/tls/server/server.pem b/tls/server/server.pem index dc93839d29..18a088e49e 100644 --- a/tls/server/server.pem +++ b/tls/server/server.pem @@ -1,48 +1,48 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvOjvHpEeEsXwQZMF26GsySEKWRnsugkKQgnvBBc2DK/Dc7gE -vjm+LMFJ9dEb5GbY8Ae4hF4Pduiz+VEMzXPtw6L+IIQWC7LcmW2Be4G6I+w5ONkZ -75goYuND4zif8/40FuS/tsVVVazkYcY/AAcb3gYxhJrAodbnf3ORO71oXu9spZ1F -L2Izl8LuvvtzJIzXAD/3mvVsjreSc7rBHts2eVEfygeMf6Mnl+/moHMlmjw7jbf8 -dozXj53VGH1Mc3SEzR/wWAVkLZ5rfTfq7uSyyJQC8siTDaLxl2tgNzytXDNc8cVp -oEbL4iPlslayxRg+EOB0buOfJdSdFCAQ1YaurwIDAQABAoIBAGJWz8OVv5X+PGem -ZXJD43KAJKble/oMIq7mBOqYOqa4CIMA1FdCL+GUbS/tvxtS/rNVEZS2ck5wLOAo -dQWux6MEAk5i9Cb64SNtge4NRhzVJ6SUP5AeIUf5DqoGHB4jwnH4emRmrVmAOxM6 -5CjbioI1rylcddLJ0JDkVEJJA0AHdMX5IOpx9wP6jOJMITqyRDaJSttuUolz89ax -Fo7BbftsUl4eq9BJVrBIoPJ3yzOLbEQqr45Ny3rdKj9BzSRcT65TS17nUDTU0vid -YBQ3RM6CAMI6p3/daOFtWwiZSnVdxUjJUnLQ/TdAWsnGWscuk4yYlCIhysS+fX2Y -3VEMu8ECgYEAxdX9+sbYbuzMw43V8tAhJ3IRaJEvJGR6B0sVMpTp6mlvukQfXS8g -Y/IT+iWG+ApEaye+ZXZzUsZzRL5dNdy9SgSETmahunPnBbB3N5xYNfVZth7Zbq/X -5LwIOTdbht8pk8HJz9Rin7CBufMoEdtDSD/uMDURZe3s+Hvs4AsLbtcCgYEA9HMh -iP5K58Vkralwoguyj1fQHs5GhbKrx6ZQRixa6kvGCgxeEfeoM3FHCfY/6HE2dRCm -RQV2V6r/AOBDWmguY8tv4z1WdoSzpbEEHAigSjxwqciIYwygCGS4ZGVje81EanCt -Fi23FulI80Wr/4KKDTv60Lykp1NE8Y2OkKze++kCgYAan/YSbfhq1Uupdck5aHFN -0bguDnv9tdgGa0BrEkd42L/Ena5q6BC/4rB1ld9YOmmC0lJ5bTuQBE03DzeULCT9 -dSYpNv7FDRwmU913in8EpARy0iwJDXlMu1GQAbc7q4T48berVLYBL8wFrofR/2RK -sO/pZPr2cNLXjjYO4O2k+QKBgQCR/YB1tIk/yl/KZ3thC+NkQGmHPGJZzs9QuT8P -6cWSUBbCQYic6m+F6Y0noe2hAJwpZfwnFJAM447QEx+mirnJ1+HGsQdGWRKBTirK -I0y3iUkv3Re3L/8ThDOrofG8KmdFum1k5YCHKmPrBh0mx+ty4/NzXnZniA+Qw531 -QYkaoQKBgQDAz7D8z00lr7vNvYWiy3i7OvyG2q3wFsLvfiV3kpD6Zokkyxkon490 -ebUGdNDZq1sVDDbnOkeiKHZomxj6K5xwU6hhkugnEX2AO2ludV010nfhf3yx36YG -4YB+hQagEkapcpYD7ziU+o73JsZ+qMVv3aa8zGYJd3vRz06+PU7BBw== +MIIEpAIBAAKCAQEArzrPQIlRmQCJZH3GD5eSLoxVA6MnAXYbhQSbvLVVD+J3nR3H +X0At0GhqgCvvJ7plmvdvpZh7llIyv6HG4zEJU6nwO5NXmNOjLbAt2w9wL1qtzRCl +mvFRyDH7u/ysdb0NUiB3WjMFQQTqVyfMNWqfToc83aCR82qz1c/NIXEDImA00dYw +XFbRAAYpHCQegjcJEDE9DPRUHx7eCXmIyhFjrC5f2ccES9BwwbLS9BUDNCp9p25W +67wMToJuI+BjLS4sw2pdOXzieC1Xswr/6m507J+A3EYCh+2DuscVKFd8xkIwSqRk +ic4t1tDRAroKhgRJoJINzidEIjpAvQWD9hyY3wIDAQABAoIBAH51MpygfQKuIHkl +S4p1GEn/fFrjo4KqebHFYZ8OPhT4mtoIY5mZ93Yv5KwbCLzjB/COIUSghpA1QeqK +Fb5f5Rs7yOM1skHYeiq+ulkdCxkhl8wl912aSirv53wDHXLavIJIa9nseB40Leo4 +Dmd+SvmhH4vSFYJVvvLOxHsd0+U51thmvA3+GIuAJjtRx84V4w3ud0g7q7QcpHgi +Bv/Z+GgHvCa7dqSv2zwMc3hr1xk8oJIxBh7aSphl6uAHUGfqYGw4O5vdfgI15ORr +XhiVifEoT4scf8Ht1+npnNSX++OUHf4AgW9mCLy+knMx2lLuzea6I7r52sAk3MZ+ +zr2D6AECgYEA3hy03TrJe/xAtgkpr5SgDjJO9Ih/xUtHQ6Lm8pfyjOhYywbotpyQ +ur9yrw0HTLq4yKBSlUz5z7ALxRgGeRgBpmpovfBHLk2htadQhTIAYdEmsK2UYLJ9 +t8Keh2CTjhUHE8IuvKnLZAk3rkXSFkXfDJWw/SpAxi3yUZyIOoquB5ECgYEAyfb2 +QjfBFepZcg81/+cxj6GDVmyflByLQkyObzbKs8QuEUgAcH+U7ePl0LyfH2kOUd+F +oJ/4DZQnqQOcru/KGRrdYStIRSRgHpzJtT42diU+9VEYzgKR862rzup3oc/5oXU9 +4tpBL3XqdfRPHMFO+hFq4ZY65kHhPS6LB0ZDwW8CgYEApPOOwompHsIc0NQHOFVZ +dJGaH3LL6RrZ5voxJ9L+l/TqFIWiCBRIS9hodGZpmGtHVf/ytNyA3ePxKcOI8x+I +Ai4ecYjjZBjVUpHac8DJldt9L1MJ0bJdOT54+zMXAjrNkbfxe71hxn4t8uf5eP8V +AkSdN7bMeiGfR0rHxSo+ynECgYBeGwXJ+wKsPIMrA21s7QQJ4f85oOmGcPpujQ99 +QLGYq9uvT7ZstPXnFt65sXoPf7sdaSJxorhJU3Rba4RxeufXZM4sfadyGC31dacD +HZbw3BAG7J+7NjVdrtm0U0olCqxNkDyi3IGtJKt4BLtsMaKkIMOFk6OkMKRMBsjf +Pd1KXwKBgQCJs428LySGzlIXO4vUFM1N6TXhjRTeVPcXttAcZ5J+En7nZo3ij09P +qfRR7f/RTq3FE5uYE08wrdItZG48eRrC9ZzjG/W4lbIwlSWRO0zBgdZbOlVzkB/v +T7QrntdELkmWZrEC/L4Kc8GWl/nsg4si5M+NoaW2OnoRNiFJH/h1Nw== -----END RSA PRIVATE KEY----- -----BEGIN CERTIFICATE----- MIIDhzCCAm+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y -MTAzMzAxNzIwMTFaFw0yMjAzMzAxNzIxMTFaMDUxETAPBgNVBAoMCERhZWRhbHVz +MjAzMzAyMDEzNDhaFw0yMzAzMzAyMDE0NDhaMDUxETAPBgNVBAoMCERhZWRhbHVz MSAwHgYDVQQDDBdEYWVkYWx1cyBXYWxsZXQgQmFja2VuZDCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBALzo7x6RHhLF8EGTBduhrMkhClkZ7LoJCkIJ7wQX -Ngyvw3O4BL45vizBSfXRG+Rm2PAHuIReD3bos/lRDM1z7cOi/iCEFguy3JltgXuB -uiPsOTjZGe+YKGLjQ+M4n/P+NBbkv7bFVVWs5GHGPwAHG94GMYSawKHW539zkTu9 -aF7vbKWdRS9iM5fC7r77cySM1wA/95r1bI63knO6wR7bNnlRH8oHjH+jJ5fv5qBz -JZo8O423/HaM14+d1Rh9THN0hM0f8FgFZC2ea3036u7kssiUAvLIkw2i8ZdrYDc8 -rVwzXPHFaaBGy+Ij5bJWssUYPhDgdG7jnyXUnRQgENWGrq8CAwEAAaOBnDCBmTBD +AQEBBQADggEPADCCAQoCggEBAK86z0CJUZkAiWR9xg+Xki6MVQOjJwF2G4UEm7y1 +VQ/id50dx19ALdBoaoAr7ye6ZZr3b6WYe5ZSMr+hxuMxCVOp8DuTV5jToy2wLdsP +cC9arc0QpZrxUcgx+7v8rHW9DVIgd1ozBUEE6lcnzDVqn06HPN2gkfNqs9XPzSFx +AyJgNNHWMFxW0QAGKRwkHoI3CRAxPQz0VB8e3gl5iMoRY6wuX9nHBEvQcMGy0vQV +AzQqfaduVuu8DE6CbiPgYy0uLMNqXTl84ngtV7MK/+pudOyfgNxGAoftg7rHFShX +fMZCMEqkZInOLdbQ0QK6CoYESaCSDc4nRCI6QL0Fg/YcmN8CAwEAAaOBnDCBmTBD BgNVHREEPDA6gglsb2NhbGhvc3SCFWxvY2FsaG9zdC5sb2NhbGRvbWFpbocEfwAA AYcQAAAAAAAAAAAAAAAAAAAAATAPBgNVHQ8BAf8EBQMDB6AAMBMGA1UdJQQMMAoG CCsGAQUFBwMBMAwGA1UdEwQFMAMBAQAwDQYDVR0OBAYEBGDOyHQwDwYDVR0jBAgw -BoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAiXibit6Uj75+JUCHfSEdFyDALtur -TKMGJuWluaEhvxFTkN6nRSoezpSsbp+jOVLXBqRSBLyAOWkPPBOnbUZuE+LCI2iD -IIzMwo7GWlaBu6IcNQuOOUblxMDhU4SuhSZM+t9FkUfx+n2bv9r51FfvU8FScJ+r -NEEyDMdI5aNpWiku8XVt0p5wkXeFhErmtNEv2gVOV/K7TZcvgbspY9V248dTazIT -myj6+xXEnV20aVlP0rXPvQKKM2yylmkLq1vxNZ1GbNn3vkt0rQtL6HUDVa++6RJY -Nx9qxj0C3SnpYK0lRml7pxjubt1PpVCaxGAjN4kU8HBMEw+I9UMx4/mlZw== +BoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAGkuTq5oISEKy5XL7Invht74iK+N8 +ABsWKDvQbu63UxPWJFk04DZa1zJagkfTt+4feX0lx6Ni2DH9X2sbdc2MAQm5F9oJ +B9xVk4IyxNeTLX6VMZ58hfuydsGX+Z6Er8DIiPsokohjfiEhs+nVFKTIodA9Hqj9 +e2MlcpWZbl2EsDOlOtqy5zj+RJnH65pQWJoIGpdApC+31sijwnjbmEcLs0X+lGhN +8WsHh4bmIdIbBtHaau05ntKgf6Ehosi/YiYd/+xG6pWlQfSxj2ITaTLNUY1E0nme +IUX9FwAopEoMeb5BuCFv5eBDRz/LNktWT9xeqBndSjre4CWxuq95KQeNFg== -----END CERTIFICATE----- \ No newline at end of file From 691e91f4b3535669de11a1c746aa1020caf540d9 Mon Sep 17 00:00:00 2001 From: Daniel Main Date: Fri, 1 Apr 2022 13:12:40 +0200 Subject: [PATCH 2/2] [DDW-1065] Added new script to start Daedalus in dev mode in Windows and added the needed documentation --- README.md | 70 +++++++++++++++++++++++++++++++--------------------- package.json | 1 + 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 58330abddf..70452680c2 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,15 @@ Daedalus - Cryptocurrency Wallet -## Installation +## Setup development environment -### Yarn +### Linux/macOS + +#### Yarn [Yarn](https://yarnpkg.com/lang/en/docs/install) is required to install `npm` dependencies to build Daedalus. -### Nix +#### Nix [Nix](https://nixos.org/nix/) is needed to run Daedalus in `nix-shell`. @@ -57,22 +59,19 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot ``` 2. Download certificate from https://docs.certifytheweb.com/docs/kb/kb-202109-letsencrypt/ and import to your keychain. -## Development - -### Running Daedalus with Cardano Node +#### Running Daedalus with Cardano Node -#### Selfnode +##### Selfnode 1. Run `yarn nix:selfnode` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`) - 1. Alternatively: run `yarn nix:selfnode yarn dev` to achieve the same thing in a single command. Note: after `yarn dev` exits, you will still remain in the `nix-shell`. 3. Once Daedalus has started and has gotten past the loading screen run the following commands from a new terminal window if you wish to import funded wallets: - - Byron wallets: `yarn byron:wallet:importer` - - Shelley wallets: `yarn shelley:wallet:importer` - - Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era) - - Yoroi Byron wallets: `yarn yoroi:wallet:importer` - - _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]** - - _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]** + - Byron wallets: `yarn byron:wallet:importer` + - Shelley wallets: `yarn shelley:wallet:importer` + - Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era) + - Yoroi Byron wallets: `yarn yoroi:wallet:importer` + - _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]** + - _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]** These scripts import 3 wallets by default. You can import up to 10 wallets by supplying `WALLET_COUNT` environment variable (e.g. `WALLET_COUNT=10 yarn mary:wallet:importer`). @@ -91,43 +90,37 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot | desiredPoolNumber | 3 | minimumUtxoValue | 1 ADA -#### Mainnet +##### Mainnet 1. Run `yarn nix:mainnet` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -3. Or in one command: `yarn nix:mainnet yarn dev` -#### Flight +##### Flight 1. Run `yarn nix:flight` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -3. Or in one command: `yarn nix:flight yarn dev` -#### Testnet +##### Testnet 1. Run `yarn nix:testnet` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -3. Or in one command: `yarn nix:testnet yarn dev` -#### Staging +##### Staging 1. Run `yarn nix:staging` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -3. Or in one command: `yarn nix:staging yarn dev` -#### Shelley QA +##### Shelley QA 1. Run `yarn nix:shelley_qa` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -3. Or in one command: `yarn nix:shelley_qa yarn dev` -#### Alonzo Purple +##### Alonzo Purple 1. Run `yarn nix:alonzo_purple` from `daedalus`. 2. Run `yarn dev` from the subsequent `nix-shell` -3. Or in one command: `yarn nix:alonzo_purple yarn dev` -#### Native token metadata server +##### Native token metadata server Daedalus, by default, uses the following metadata server for all networks except for the mainnet: `https://metadata.cardano-testnet.iohkdev.io/`. @@ -158,7 +151,28 @@ http://localhost:65432/metadata/query ``` ... and expect a "200 OK" response. -### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix) +### Windows + +This option is only for troubleshooting windows specific issues with hardware wallets. It is not recommended to use Windows as a developer environment. +Most of the commands need `nix` and will run only on Linux or macOS. + +#### Requisites +- Windows 10/11 +- Daedalus testnet installation (similar version used in branch) in `C:\Program Files\Daedalus Testnet` +- NodeJS 16 +- Python2 * +- `yarn global add windows-build-tools` * (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder) +- Microsoft Build Tools 2015 * +- Microsoft Visual Studio 2017 (Include Desktop development with C++) * +- `yarn config set msvsversion 2015 --global` + +*needed for compiling node-sass@4.14.1 on Windows + +#### Steps +- `yarn install` +- `yarn dev:windows` + +#### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix) `Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`. diff --git a/package.json b/package.json index 63271c3b64..75228e8e65 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "start": "gulp start", "start:dev": "NODE_ENV=development gulp start", "dev": "IS_WATCH_MODE=true gulp dev", + "dev:windows": "cross-env DAEDALUS_INSTALL_DIRECTORY=\"C:\\Program Files\\Daedalus Testnet\" LAUNCHER_CONFIG=\"C:\\Program Files\\Daedalus Testnet\\launcher-config.yaml\" gulp dev", "test": "NODE_ENV=test yarn build && yarn test:unit && yarn test:e2e:fail-fast", "test:jest": "NODE_OPTIONS=--experimental-vm-modules jest", "test:generate:report": "ts-node tests/reporter.ts",