@ensdomains/ensjs 3.5.0-beta.3 → 3.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/errors/version.js +1 -1
- package/dist/cjs/functions/public/getName.js +9 -7
- package/dist/cjs/functions/public/getName.js.map +1 -1
- package/dist/esm/errors/version.js +1 -1
- package/dist/esm/functions/public/getName.js +10 -8
- package/dist/esm/functions/public/getName.js.map +1 -1
- package/dist/types/errors/version.d.ts +1 -1
- package/dist/types/functions/public/getName.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/errors/version.ts +1 -1
- package/src/functions/public/getName.ts +15 -7
|
@@ -6,6 +6,7 @@ const universalResolver_js_1 = require("../../contracts/universalResolver.js");
|
|
|
6
6
|
const checkSafeUniversalResolverData_js_1 = require("../../utils/checkSafeUniversalResolverData.js");
|
|
7
7
|
const generateFunction_js_1 = require("../../utils/generateFunction.js");
|
|
8
8
|
const hexEncodedName_js_1 = require("../../utils/hexEncodedName.js");
|
|
9
|
+
const normalise_js_1 = require("../../utils/normalise.js");
|
|
9
10
|
const encode = (client, { address, gatewayUrls }) => {
|
|
10
11
|
const reverseNode = `${address.toLowerCase().substring(2)}.addr.reverse`;
|
|
11
12
|
const to = (0, getChainContractAddress_js_1.getChainContractAddress)({
|
|
@@ -53,21 +54,22 @@ const decode = async (_client, data, passthrough, { address, allowMismatch, stri
|
|
|
53
54
|
if (!isSafe)
|
|
54
55
|
return null;
|
|
55
56
|
try {
|
|
56
|
-
const
|
|
57
|
+
const [unnormalisedName, forwardResolvedAddress, reverseResolverAddress, resolverAddress,] = (0, viem_1.decodeFunctionResult)({
|
|
57
58
|
abi: universalResolver_js_1.universalResolverReverseSnippet,
|
|
58
59
|
functionName: 'reverse',
|
|
59
60
|
data,
|
|
60
61
|
});
|
|
61
|
-
if (!
|
|
62
|
+
if (!unnormalisedName)
|
|
62
63
|
return null;
|
|
63
|
-
const match =
|
|
64
|
+
const match = (0, viem_1.getAddress)(forwardResolvedAddress) === (0, viem_1.getAddress)(address);
|
|
64
65
|
if (!match && !allowMismatch)
|
|
65
66
|
return null;
|
|
67
|
+
const normalisedName = (0, normalise_js_1.normalise)(unnormalisedName);
|
|
66
68
|
return {
|
|
67
|
-
name:
|
|
68
|
-
match
|
|
69
|
-
reverseResolverAddress
|
|
70
|
-
resolverAddress
|
|
69
|
+
name: normalisedName,
|
|
70
|
+
match,
|
|
71
|
+
reverseResolverAddress,
|
|
72
|
+
resolverAddress,
|
|
71
73
|
};
|
|
72
74
|
}
|
|
73
75
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getName.js","sourceRoot":"","sources":["../../../../src/functions/public/getName.ts"],"names":[],"mappings":";;AAAA,+
|
|
1
|
+
{"version":3,"file":"getName.js","sourceRoot":"","sources":["../../../../src/functions/public/getName.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = 'v3.
|
|
1
|
+
export const version = 'v3.5.0';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { BaseError, decodeFunctionResult, encodeFunctionData, toHex, } from 'viem';
|
|
1
|
+
import { BaseError, decodeFunctionResult, encodeFunctionData, getAddress, toHex, } from 'viem';
|
|
2
2
|
import { getChainContractAddress } from '../../contracts/getChainContractAddress.js';
|
|
3
3
|
import { universalResolverReverseSnippet, universalResolverReverseWithGatewaysSnippet, } from '../../contracts/universalResolver.js';
|
|
4
4
|
import { checkSafeUniversalResolverData } from '../../utils/checkSafeUniversalResolverData.js';
|
|
5
5
|
import { generateFunction, } from '../../utils/generateFunction.js';
|
|
6
6
|
import { packetToBytes } from '../../utils/hexEncodedName.js';
|
|
7
|
+
import { normalise } from '../../utils/normalise.js';
|
|
7
8
|
const encode = (client, { address, gatewayUrls }) => {
|
|
8
9
|
const reverseNode = `${address.toLowerCase().substring(2)}.addr.reverse`;
|
|
9
10
|
const to = getChainContractAddress({
|
|
@@ -51,21 +52,22 @@ const decode = async (_client, data, passthrough, { address, allowMismatch, stri
|
|
|
51
52
|
if (!isSafe)
|
|
52
53
|
return null;
|
|
53
54
|
try {
|
|
54
|
-
const
|
|
55
|
+
const [unnormalisedName, forwardResolvedAddress, reverseResolverAddress, resolverAddress,] = decodeFunctionResult({
|
|
55
56
|
abi: universalResolverReverseSnippet,
|
|
56
57
|
functionName: 'reverse',
|
|
57
58
|
data,
|
|
58
59
|
});
|
|
59
|
-
if (!
|
|
60
|
+
if (!unnormalisedName)
|
|
60
61
|
return null;
|
|
61
|
-
const match =
|
|
62
|
+
const match = getAddress(forwardResolvedAddress) === getAddress(address);
|
|
62
63
|
if (!match && !allowMismatch)
|
|
63
64
|
return null;
|
|
65
|
+
const normalisedName = normalise(unnormalisedName);
|
|
64
66
|
return {
|
|
65
|
-
name:
|
|
66
|
-
match
|
|
67
|
-
reverseResolverAddress
|
|
68
|
-
resolverAddress
|
|
67
|
+
name: normalisedName,
|
|
68
|
+
match,
|
|
69
|
+
reverseResolverAddress,
|
|
70
|
+
resolverAddress,
|
|
69
71
|
};
|
|
70
72
|
}
|
|
71
73
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getName.js","sourceRoot":"","sources":["../../../../src/functions/public/getName.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,GAGN,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAA;AACpF,OAAO,EACL,+BAA+B,EAC/B,2CAA2C,GAC5C,MAAM,sCAAsC,CAAA;AAK7C,OAAO,EAAE,8BAA8B,EAAE,MAAM,+CAA+C,CAAA;AAC9F,OAAO,EACL,gBAAgB,GAEjB,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"getName.js","sourceRoot":"","sources":["../../../../src/functions/public/getName.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "v3.
|
|
1
|
+
export declare const version = "v3.5.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getName.d.ts","sourceRoot":"","sources":["../../../../src/functions/public/getName.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,
|
|
1
|
+
{"version":3,"file":"getName.d.ts","sourceRoot":"","sources":["../../../../src/functions/public/getName.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAKT,KAAK,OAAO,EACZ,KAAK,GAAG,EACT,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAM9D,OAAO,KAAK,EACV,kBAAkB,EAClB,iCAAiC,EAClC,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAA;AAIxC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,4DAA4D;IAC5D,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,+DAA+D;IAC/D,KAAK,EAAE,OAAO,CAAA;IACd,wCAAwC;IACxC,sBAAsB,EAAE,OAAO,CAAA;IAC/B,yCAAyC;IACzC,eAAe,EAAE,OAAO,CAAA;CACzB,CAAA;AAED,QAAA,MAAM,MAAM,WACF,aAAa,4BACK,KAAK,iBAAiB,EAAE,eAAe,GAAG,QAAQ,CAAC,KAC5E,iCAkCF,CAAA;AAED,QAAA,MAAM,MAAM,YACD,aAAa,QAChB,GAAG,GAAG,SAAS,eACR,kBAAkB,mDACkB,iBAAiB,KACjE,QAAQ,iBAAiB,GAAG,IAAI,CAqClC,CAAA;AAED,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,OAAO,MAAM,EAAE,OAAO,MAAM,CAAC,CAAA;AAE9E;;;;;;;;;;;;;;;;;;GAkBG;AACH,QAAA,MAAM,OAAO,YACH,aAAa,sCACe,iBAAiB,KAClD,QAAQ,iBAAiB,CAAC,2BACN,CAAA;AAEzB,eAAe,OAAO,CAAA"}
|
package/package.json
CHANGED
package/src/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = 'v3.
|
|
1
|
+
export const version = 'v3.5.0'
|
|
@@ -2,6 +2,7 @@ import {
|
|
|
2
2
|
BaseError,
|
|
3
3
|
decodeFunctionResult,
|
|
4
4
|
encodeFunctionData,
|
|
5
|
+
getAddress,
|
|
5
6
|
toHex,
|
|
6
7
|
type Address,
|
|
7
8
|
type Hex,
|
|
@@ -22,6 +23,7 @@ import {
|
|
|
22
23
|
type GeneratedFunction,
|
|
23
24
|
} from '../../utils/generateFunction.js'
|
|
24
25
|
import { packetToBytes } from '../../utils/hexEncodedName.js'
|
|
26
|
+
import { normalise } from '../../utils/normalise.js'
|
|
25
27
|
|
|
26
28
|
export type GetNameParameters = {
|
|
27
29
|
/** Address to get name for */
|
|
@@ -102,19 +104,25 @@ const decode = async (
|
|
|
102
104
|
if (!isSafe) return null
|
|
103
105
|
|
|
104
106
|
try {
|
|
105
|
-
const
|
|
107
|
+
const [
|
|
108
|
+
unnormalisedName,
|
|
109
|
+
forwardResolvedAddress,
|
|
110
|
+
reverseResolverAddress,
|
|
111
|
+
resolverAddress,
|
|
112
|
+
] = decodeFunctionResult({
|
|
106
113
|
abi: universalResolverReverseSnippet,
|
|
107
114
|
functionName: 'reverse',
|
|
108
115
|
data,
|
|
109
116
|
})
|
|
110
|
-
if (!
|
|
111
|
-
const match =
|
|
117
|
+
if (!unnormalisedName) return null
|
|
118
|
+
const match = getAddress(forwardResolvedAddress) === getAddress(address)
|
|
112
119
|
if (!match && !allowMismatch) return null
|
|
120
|
+
const normalisedName = normalise(unnormalisedName)
|
|
113
121
|
return {
|
|
114
|
-
name:
|
|
115
|
-
match
|
|
116
|
-
reverseResolverAddress
|
|
117
|
-
resolverAddress
|
|
122
|
+
name: normalisedName,
|
|
123
|
+
match,
|
|
124
|
+
reverseResolverAddress,
|
|
125
|
+
resolverAddress,
|
|
118
126
|
}
|
|
119
127
|
} catch (error) {
|
|
120
128
|
if (strict) throw error
|