Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-v1.3.0 #58

Merged
merged 11 commits into from
Aug 11, 2022
Merged

release-v1.3.0 #58

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aa68c43
Merge branch 'develop'
karlbuys Apr 11, 2022
fb6ec0b
Merge branch 'master' into develop
karlbuys May 16, 2022
909a3fb
fix: quick fix for openalias resolution
karlbuys May 24, 2022
f109f58
build: bump mymonero-app-bridge to v2.1.13 for monero 0.18.0
karlbuys Aug 10, 2022
2468c62
build: bump version to 1.3.0
karlbuys Aug 10, 2022
c8bb478
Merge pull request #56 from mymonero/fix-openalias-issue
karlbuys Aug 10, 2022
a04802d
Merge pull request #57 from mymonero/release-for-monero-0.18.0-hardfork
karlbuys Aug 10, 2022
cee6008
fix: add missing openalias package
karlbuys Aug 10, 2022
835195d
Merge pull request #59 from mymonero/add-openalias-module-to-dependan…
karlbuys Aug 10, 2022
a019273
Update .env.defaults
devinpearson Aug 11, 2022
2c1e1c1
Merge pull request #60 from mymonero/release-v1.3.0
devinpearson Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 39 additions & 27 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "MyMonero",
"author": "MyMonero",
"description": "The simplest way to use Monero",
"version": "1.2.4",
"version": "1.3.0",
"license": "SEE LICENSE IN LICENSE.txt",
"repository": "https://github.com/mymonero/mymonero-web-js",
"scripts": {
Expand All @@ -16,7 +16,7 @@
},
"dependencies": {
"@mymonero/changenow-exchange-integration": "^1.3.0-alpha.26",
"@mymonero/mymonero-app-bridge": "^1.0.11",
"@mymonero/mymonero-app-bridge": "^2.1.13",
"@mymonero/mymonero-bigint": "^1.0.5",
"@mymonero/mymonero-exchange-helper": "^1.3.1-alpha.4",
"@mymonero/mymonero-hosted-api": "^1.1.5",
Expand Down
14 changes: 10 additions & 4 deletions src/OpenAlias/TXTResolver.web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
'use strict'

const request = require('xhr')
const OpenAlias = require('@mymonero/mymonero-openalias')

//TODO: instead of having the TXTRecords function, use instance of OpenAlias instead
class TXTResolver {
//
// Accessors
TXTRecords (
name,
fn // (err, records, dnssec_used, secured, dnssec_fail_reason) -> Void
) {
const completeURL = 'https://cloudflare-dns.com/dns-query?ct=application/dns-json&name=' + encodeURIComponent(name) + '&type=TXT'
const requestHandle = request(
completeURL,
function (err, response, body) {
const completeURL = 'https://cloudflare-dns.com/dns-query?name=' + encodeURIComponent(name) + '&type=TXT'

const requestHandle = request({
uri: completeURL,
headers: {
"accept": "application/dns-json"
}
}, function (err, response, body) {
if (err) {
fn(err)
return
Expand Down