From 06548c06a474645e2d1972cd0716e00a8284d2db Mon Sep 17 00:00:00 2001 From: Julia Samol Date: Thu, 24 Mar 2022 15:08:09 +0100 Subject: [PATCH 1/6] Feat/astar --- package.json | 6 +++--- yarn.lock | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index c6fd5109..fc031cd7 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "apply-diagnostic-modules": "node apply-diagnostic-modules.js" }, "dependencies": { - "@airgap/angular-core": "0.0.26", - "@airgap/angular-ngrx": "0.0.26", - "@airgap/coinlib-core": "0.12.9", + "@airgap/angular-core": "0.0.27-beta.4", + "@airgap/angular-ngrx": "0.0.27-beta.4", + "@airgap/coinlib-core": "0.12.10-beta.4", "@airgap/sapling-wasm": "0.0.6", "@angular/common": "^11.2.9", "@angular/core": "^11.2.9", diff --git a/yarn.lock b/yarn.lock index b0eec843..ef378710 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,24 +2,24 @@ # yarn lockfile v1 -"@airgap/angular-core@0.0.26": - version "0.0.26" - resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.26.tgz#66c7fc1b67b6ee0078f30363cfa51f6031dd65c8" - integrity sha512-mPCDCOoTMe4d3QobRNK+ANGEWZWTUlWPAVO/5bSX7ZlRTLzsJfqK5JerKxk5jmB2jd7X7sHOpQJuhiDTt57ZDA== +"@airgap/angular-core@0.0.27-beta.4": + version "0.0.27-beta.4" + resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.27-beta.4.tgz#852e3c9abdc8c64b5ef2acf9063bc790b0369828" + integrity sha512-+sHxKQsozBWjGWSvi5rbql9AtmU73aACSQFI7r0FbZ3Jhf8kXo/jMTm9mD7DtdwpyCe59XdqS+2QCnkkzWr9mw== dependencies: tslib "^2.2.0" -"@airgap/angular-ngrx@0.0.26": - version "0.0.26" - resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.26.tgz#c01737a9048d3bfab84f3eaa44d80bf05de4b9b2" - integrity sha512-ud+POG5i/ahzily48sSS8WlN7l95DYqIP4g3u3PR+Q5qSKhZNrODf4330hFCFbCpYE7VywrRS7wd4yvQM7s4iA== +"@airgap/angular-ngrx@0.0.27-beta.4": + version "0.0.27-beta.4" + resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.27-beta.4.tgz#2147406d0291bda0bb427f2de36ee971b04e51d0" + integrity sha512-fUr+UWU7OiAgjlegtMKZgRY9bcpTQVr4hod9T1Of5ALOOq6uOHVsQvb9vRU5xWqLrt+dBBkxZlT1ZoFprR1iNw== dependencies: tslib "^2.2.0" -"@airgap/coinlib-core@0.12.9": - version "0.12.9" - resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.12.9.tgz#ab5d5ab8ba8457ee8abf39273882fb65653d05cb" - integrity sha512-IknICQpx+mPQwOXzRSzZBvdBbOFJTmNijYWki/2SdIOsZz77PpFkHZ4+dw5nK8/6uI6+X2XA+dkGOtvgXdGdVA== +"@airgap/coinlib-core@0.12.10-beta.4": + version "0.12.10-beta.4" + resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.12.10-beta.4.tgz#8288df58acdeb801c216362cf1a840ca031e218c" + integrity sha512-zxdM+21aZwc0+5QBWZQYqVnG5LSFwHU7Pahl6GnWSYjTv5UGRWN6d32p0u6SrwjTOz2bymVmZ67+xlfBu3+3FQ== dependencies: "@airgap/sapling-wasm" "0.0.5" "@ethereumjs/common" "2.6.0" From 6da9991ddf8ea32d1e8e2bd6c7232707a4c633b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ng?= Date: Fri, 25 Mar 2022 10:48:21 +0100 Subject: [PATCH 2/6] chore(gitlab-issues) replace issue templates --- .gitlab/issue_templates/Bug.md | 42 +++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 2730f825..46c86b62 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -1,35 +1,39 @@ -### Summary +## Summary + -(Summarize the bug encountered concisely) -### Steps to reproduce +## Steps to reproduce + -(How one can reproduce the issue - this is very important) +## What is the current _bug_ behavior? + -### What is the current _bug_ behavior? +## What is the expected _correct_ behavior? + -(What actually happens) +## Relevant logs, screenshots and/or links + -### What is the expected _correct_ behavior? +## Possible fixes / approach + -(What you should see instead) +## Additional information + -### Relevant logs and/or screenshots +---- + +/estimate -(Paste any relevant logs - please use code blocks (```) to format console output, -logs, and code as it's tough to read otherwise.) + +/label ~"type::bug" ~"proj::airgap" -### Possible fixes -(If you can, link to the line of code that might be responsible for the problem) From b85f575331d34174814dda6cbebff133df7f9f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ng?= Date: Fri, 25 Mar 2022 10:49:30 +0100 Subject: [PATCH 3/6] chore(gitlab-issues) replace issue templates --- .gitlab/issue_templates/Feature.md | 45 ++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md index 1ee290d6..99bd9680 100644 --- a/.gitlab/issue_templates/Feature.md +++ b/.gitlab/issue_templates/Feature.md @@ -1,26 +1,43 @@ -### Summary +## Summary + + + + +## What is the expected behavior? + + + + +## Relevant Mockups, Screenshots and/or links + + + + +## Possible fixes / approach + + + + +## Additional information + + -(Summarize the feature concisely) -### What is the expected behavior? + -(Describe what the user should see) + +/estimate -### Relevant mockups or screenshots -(Paste or link any relevant mockups or screenshot that describe the feature.) -### Possible approach + +/label ~"type::feature" ~"proj::airgap" -(Outline a possible approach for this feature, ex. make an example how the code could look like) From 975b8a65ced08940b80b79f6fe2a2a6b3a4022aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ng?= Date: Fri, 25 Mar 2022 10:51:04 +0100 Subject: [PATCH 4/6] chore(gitlab-issues) replace issue templates --- .gitlab/issue_templates/Task.md | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .gitlab/issue_templates/Task.md diff --git a/.gitlab/issue_templates/Task.md b/.gitlab/issue_templates/Task.md new file mode 100644 index 00000000..49000237 --- /dev/null +++ b/.gitlab/issue_templates/Task.md @@ -0,0 +1,39 @@ + + +## Summary + + + + +## What steps need to be done? + + + + +## Relevant Mockups, Screenshots and/or links + + + + +## Additional information + + + + + + + +/estimate + + + + +/label ~"type::task" ~"proj::airgap" + + From ba6761ae62f94780a915b3f606017e07da5735ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20L=C3=A4ng?= Date: Fri, 25 Mar 2022 10:51:24 +0100 Subject: [PATCH 5/6] chore(gitlab-issues) replace issue templates --- .gitlab/issue_templates/Epic.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitlab/issue_templates/Epic.md diff --git a/.gitlab/issue_templates/Epic.md b/.gitlab/issue_templates/Epic.md new file mode 100644 index 00000000..7baea40d --- /dev/null +++ b/.gitlab/issue_templates/Epic.md @@ -0,0 +1,30 @@ + + +## Summary + + + + +## Which issues need to be completed + + + + + + + +/label ~2141 ~"proj::airgap" + + + + From b7c72b14a66c52e6364209c15668b6785b928813 Mon Sep 17 00:00:00 2001 From: Mike Godenzi Date: Fri, 25 Mar 2022 16:00:42 +0100 Subject: [PATCH 6/6] Feat/ithaca --- android/app/build.gradle | 2 +- ios/App/App.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 24 +++++++------- package.json | 8 ++--- yarn.lock | 32 +++++++++---------- 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4144c8d8..7e74a5a3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") - def saplingVersion = "0.0.6" + def saplingVersion = "0.0.7" implementation "com.github.airgap-it:airgap-sapling:$saplingVersion" } diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index d81b259f..f702ce68 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -551,7 +551,7 @@ repositoryURL = "https://github.com/airgap-it/airgap-sapling"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.0.6; + minimumVersion = 0.0.7; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved index cc5a0400..dae43ad0 100644 --- a/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,16 +1,14 @@ { - "object": { - "pins": [ - { - "package": "AirGapSapling", - "repositoryURL": "https://github.com/airgap-it/airgap-sapling", - "state": { - "branch": null, - "revision": "c6606fce5d84cea678414681b13ef5efb3629a7e", - "version": "0.0.6" - } + "pins" : [ + { + "identity" : "airgap-sapling", + "kind" : "remoteSourceControl", + "location" : "https://github.com/airgap-it/airgap-sapling", + "state" : { + "revision" : "00848f05c305c9997c8f7325527ddc20de7edd2b", + "version" : "0.0.7" } - ] - }, - "version": 1 + } + ], + "version" : 2 } diff --git a/package.json b/package.json index fc031cd7..119dcfec 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,10 @@ "apply-diagnostic-modules": "node apply-diagnostic-modules.js" }, "dependencies": { - "@airgap/angular-core": "0.0.27-beta.4", - "@airgap/angular-ngrx": "0.0.27-beta.4", - "@airgap/coinlib-core": "0.12.10-beta.4", - "@airgap/sapling-wasm": "0.0.6", + "@airgap/angular-core": "0.0.27", + "@airgap/angular-ngrx": "0.0.27", + "@airgap/coinlib-core": "0.13.0", + "@airgap/sapling-wasm": "0.0.7", "@angular/common": "^11.2.9", "@angular/core": "^11.2.9", "@angular/forms": "^11.2.9", diff --git a/yarn.lock b/yarn.lock index ef378710..8161e8eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,24 +2,24 @@ # yarn lockfile v1 -"@airgap/angular-core@0.0.27-beta.4": - version "0.0.27-beta.4" - resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.27-beta.4.tgz#852e3c9abdc8c64b5ef2acf9063bc790b0369828" - integrity sha512-+sHxKQsozBWjGWSvi5rbql9AtmU73aACSQFI7r0FbZ3Jhf8kXo/jMTm9mD7DtdwpyCe59XdqS+2QCnkkzWr9mw== +"@airgap/angular-core@0.0.27": + version "0.0.27" + resolved "https://registry.yarnpkg.com/@airgap/angular-core/-/angular-core-0.0.27.tgz#dce627883f5204395a462e9bd8232b3abd65ae59" + integrity sha512-jqvdd8O3iZWE6pN9ISxsIGdAs7NZaX/rAvEK2iKdOYJAtJMF5bPKjFT8unU/NRHD3zEykz14u9dvU59VN9596Q== dependencies: tslib "^2.2.0" -"@airgap/angular-ngrx@0.0.27-beta.4": - version "0.0.27-beta.4" - resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.27-beta.4.tgz#2147406d0291bda0bb427f2de36ee971b04e51d0" - integrity sha512-fUr+UWU7OiAgjlegtMKZgRY9bcpTQVr4hod9T1Of5ALOOq6uOHVsQvb9vRU5xWqLrt+dBBkxZlT1ZoFprR1iNw== +"@airgap/angular-ngrx@0.0.27": + version "0.0.27" + resolved "https://registry.yarnpkg.com/@airgap/angular-ngrx/-/angular-ngrx-0.0.27.tgz#58d2e96e390481c1e381a8d3fce7518deed25d6c" + integrity sha512-P1dTpp8/NPhNdGy7aAIl1hsYvklrt4eo2DeLC4BQB8nxqAFNxZKsKb1MmqttJ2QuZwjIAwfKhmqGg1seY210RQ== dependencies: tslib "^2.2.0" -"@airgap/coinlib-core@0.12.10-beta.4": - version "0.12.10-beta.4" - resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.12.10-beta.4.tgz#8288df58acdeb801c216362cf1a840ca031e218c" - integrity sha512-zxdM+21aZwc0+5QBWZQYqVnG5LSFwHU7Pahl6GnWSYjTv5UGRWN6d32p0u6SrwjTOz2bymVmZ67+xlfBu3+3FQ== +"@airgap/coinlib-core@0.13.0": + version "0.13.0" + resolved "https://registry.yarnpkg.com/@airgap/coinlib-core/-/coinlib-core-0.13.0.tgz#0f45310fbd3b03386c4d439bb70db3118a728f01" + integrity sha512-MWrORGoqIhqwhrMfdfL/ynOHs5Hru6Zk0BLjIcQIPFOlKElzPFgX2VK9YxLfKh1bCgQ11atOOePwvbNLTwihug== dependencies: "@airgap/sapling-wasm" "0.0.5" "@ethereumjs/common" "2.6.0" @@ -37,10 +37,10 @@ resolved "https://registry.npmjs.org/@airgap/sapling-wasm/-/sapling-wasm-0.0.5.tgz" integrity sha512-u3dCsqC4WqTlscAU6p5BED+O/tXEDRcIzeOf7OTtz4zoK8wyMX6ZcJImZONhYG6IKu8cSc8eQNwm6fghHL3SxA== -"@airgap/sapling-wasm@0.0.6": - version "0.0.6" - resolved "https://registry.npmjs.org/@airgap/sapling-wasm/-/sapling-wasm-0.0.6.tgz" - integrity sha512-hGD1ZMe3aLIJdjRxq6KVLjMkxza9BW2AZxJEWtVOLAwJDvUyb4yw+i2hnjIKve2kO82m6UJ3tJIDGhbZ4gU6eg== +"@airgap/sapling-wasm@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@airgap/sapling-wasm/-/sapling-wasm-0.0.7.tgz#b88356f44807bf91405a9dc7c4111c995f269343" + integrity sha512-IMODbGPTBYKuO5ztiHX9C1PTlhqZvmVWv7m7zj5+VMcbBxrk4+jBAf7FYTH5l+IUsNMaHBOuh8Qq3A1b/pm7jQ== "@angular-devkit/architect@0.1102.14", "@angular-devkit/architect@^0.1102.8": version "0.1102.14"