@talismn/on-chain-id 0.0.0-pr1671-20241021082009 → 0.0.0-pr1672-20241023070444

package/dist/talismn-on-chain-id.cjs.prod.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var resolverCore = require('@azns/resolver-core');
-var api = require('@polkadot/api');
-var util = require('@talismn/util');
+var util$1 = require('@talismn/util');
 var anylogger = require('anylogger');
+var apiContract = require('@polkadot/api-contract');
+var util = require('@polkadot/util');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -13,7 +13,7 @@ var anylogger__default = /*#__PURE__*/_interopDefault(anylogger);
 
 var packageJson = {
 	name: "@talismn/on-chain-id",
-	version: "0.0.0-pr1671-20241021082009",
+	version: "0.0.0-pr1672-20241023070444",
 	author: "Talisman",
 	homepage: "https://talisman.xyz",
 	license: "GPL-3.0-or-later",
@@ -39,27 +39,28 @@ var packageJson = {
 		clean: "rm -rf dist .turbo node_modules"
 	},
 	dependencies: {
-		"@azns/resolver-core": "https://gitpkg.vercel.app/api/pkg.tgz?url=TalismanSociety%2Fazero-id-resolver%2Fpackages%2Fresolver-core&commit=main",
 		"@talismn/balances": "workspace:*",
 		"@talismn/util": "workspace:*",
 		anylogger: "^1.0.11"
 	},
 	devDependencies: {
-		"@polkadot/api": "^10.9.1",
-		"@polkadot/api-contract": "^10.9.1",
-		"@polkadot/types": "^10.9.1",
+		"@polkadot/api-contract": "14.1.1",
+		"@polkadot/types": "14.1.1",
+		"@polkadot/rpc-provider": "14.1.1",
+		"@polkadot/util": "13.2.1",
 		"@talismn/eslint-config": "workspace:*",
 		"@talismn/tsconfig": "workspace:*",
 		"@types/jest": "^27.5.1",
-		eslint: "^8.52.0",
+		eslint: "^8.57.1",
 		jest: "^29.7.0",
-		"ts-jest": "^29.1.1",
-		typescript: "^5.2.2"
+		"ts-jest": "^29.2.5",
+		typescript: "^5.6.3"
 	},
 	peerDependencies: {
-		"@polkadot/api": "10.x",
 		"@polkadot/api-contract": "10.x",
-		"@polkadot/types": "10.x"
+		"@polkadot/types": "10.x",
+		"@polkadot/rpc-provider": "10.x",
+		"@polkadot/util": "10.x"
 	},
 	eslintConfig: {
 		root: true,
@@ -71,6 +72,1375 @@ var packageJson = {
 
 var log = anylogger__default["default"](packageJson.name);
 
+var aznsRouterAbiJson = {
+	source: {
+		hash: "0x63308c1311af44bb47082327c301fce559ca28f6bb010a61b9884d9246746abf",
+		language: "ink! 4.2.1",
+		compiler: "rustc 1.68.0-nightly",
+		build_info: {
+			build_mode: "Release",
+			cargo_contract_version: "3.0.1",
+			rust_toolchain: "nightly-aarch64-apple-darwin",
+			wasm_opt_settings: {
+				keep_debug_symbols: false,
+				optimization_passes: "Z"
+			}
+		}
+	},
+	contract: {
+		name: "azns_router",
+		version: "1.0.0",
+		authors: [
+			"AZERO.ID <hello@azero.id>"
+		]
+	},
+	spec: {
+		constructors: [
+			{
+				args: [
+					{
+						label: "admin",
+						type: {
+							displayName: [
+								"AccountId"
+							],
+							type: 0
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "new",
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink_primitives",
+						"ConstructorResult"
+					],
+					type: 6
+				},
+				selector: "0x9bae9d5e"
+			}
+		],
+		docs: [
+		],
+		environment: {
+			accountId: {
+				displayName: [
+					"AccountId"
+				],
+				type: 0
+			},
+			balance: {
+				displayName: [
+					"Balance"
+				],
+				type: 25
+			},
+			blockNumber: {
+				displayName: [
+					"BlockNumber"
+				],
+				type: 28
+			},
+			chainExtension: {
+				displayName: [
+					"ChainExtension"
+				],
+				type: 29
+			},
+			hash: {
+				displayName: [
+					"Hash"
+				],
+				type: 26
+			},
+			maxEventTopics: 4,
+			timestamp: {
+				displayName: [
+					"Timestamp"
+				],
+				type: 27
+			}
+		},
+		events: [
+		],
+		lang_error: {
+			displayName: [
+				"ink",
+				"LangError"
+			],
+			type: 8
+		},
+		messages: [
+			{
+				args: [
+					{
+						label: "tld",
+						type: {
+							displayName: [
+								"Vec"
+							],
+							type: 4
+						}
+					},
+					{
+						label: "registry_addr",
+						type: {
+							displayName: [
+								"AccountId"
+							],
+							type: 0
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "add_registry",
+				mutates: true,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 9
+				},
+				selector: "0xc997efe3"
+			},
+			{
+				args: [
+					{
+						label: "tld",
+						type: {
+							displayName: [
+								"Vec"
+							],
+							type: 4
+						}
+					},
+					{
+						label: "registry_addr",
+						type: {
+							displayName: [
+								"AccountId"
+							],
+							type: 0
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "update_registry",
+				mutates: true,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 9
+				},
+				selector: "0x562de86b"
+			},
+			{
+				args: [
+					{
+						label: "registry_addr",
+						type: {
+							displayName: [
+								"AccountId"
+							],
+							type: 0
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "remove_registry_address",
+				mutates: true,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 9
+				},
+				selector: "0xcc78aead"
+			},
+			{
+				args: [
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_all_registries",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 12
+				},
+				selector: "0xe6da7bf0"
+			},
+			{
+				args: [
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_all_tlds",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 15
+				},
+				selector: "0xf1a7af41"
+			},
+			{
+				args: [
+					{
+						label: "registry_addr",
+						type: {
+							displayName: [
+								"AccountId"
+							],
+							type: 0
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_associated_tlds",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 15
+				},
+				selector: "0xcb18f821"
+			},
+			{
+				args: [
+					{
+						label: "tld",
+						type: {
+							displayName: [
+								"String"
+							],
+							type: 5
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_registry",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 16
+				},
+				selector: "0x15a5d20a"
+			},
+			{
+				args: [
+					{
+						label: "domain",
+						type: {
+							displayName: [
+								"String"
+							],
+							type: 5
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_address",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 18
+				},
+				selector: "0xd259f7ba"
+			},
+			{
+				args: [
+					{
+						label: "account",
+						type: {
+							displayName: [
+								"AccountId"
+							],
+							type: 0
+						}
+					},
+					{
+						label: "tld",
+						type: {
+							displayName: [
+								"Option"
+							],
+							type: 20
+						}
+					}
+				],
+				"default": false,
+				docs: [
+					" @returns list of (registry-address, primary-domain) for given account"
+				],
+				label: "get_primary_domains",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 21
+				},
+				selector: "0xdf3a358e"
+			},
+			{
+				args: [
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_admin",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 24
+				},
+				selector: "0x57b8a8a7"
+			},
+			{
+				args: [
+				],
+				"default": false,
+				docs: [
+				],
+				label: "get_pending_admin",
+				mutates: false,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 16
+				},
+				selector: "0xbcd31d76"
+			},
+			{
+				args: [
+					{
+						label: "account",
+						type: {
+							displayName: [
+								"Option"
+							],
+							type: 17
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "transfer_ownership",
+				mutates: true,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 9
+				},
+				selector: "0x107e33ea"
+			},
+			{
+				args: [
+				],
+				"default": false,
+				docs: [
+				],
+				label: "accept_ownership",
+				mutates: true,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 9
+				},
+				selector: "0xb55be9f0"
+			},
+			{
+				args: [
+					{
+						label: "code_hash",
+						type: {
+							displayName: [
+							],
+							type: 1
+						}
+					}
+				],
+				"default": false,
+				docs: [
+				],
+				label: "upgrade_contract",
+				mutates: true,
+				payable: false,
+				returnType: {
+					displayName: [
+						"ink",
+						"MessageResult"
+					],
+					type: 6
+				},
+				selector: "0x1345543d"
+			}
+		]
+	},
+	storage: {
+		root: {
+			layout: {
+				struct: {
+					fields: [
+						{
+							layout: {
+								leaf: {
+									key: "0x00000000",
+									ty: 0
+								}
+							},
+							name: "admin"
+						},
+						{
+							layout: {
+								"enum": {
+									dispatchKey: "0x00000000",
+									name: "Option",
+									variants: {
+										"0": {
+											fields: [
+											],
+											name: "None"
+										},
+										"1": {
+											fields: [
+												{
+													layout: {
+														leaf: {
+															key: "0x00000000",
+															ty: 0
+														}
+													},
+													name: "0"
+												}
+											],
+											name: "Some"
+										}
+									}
+								}
+							},
+							name: "pending_admin"
+						},
+						{
+							layout: {
+								leaf: {
+									key: "0x00000000",
+									ty: 3
+								}
+							},
+							name: "registry"
+						},
+						{
+							layout: {
+								root: {
+									layout: {
+										leaf: {
+											key: "0x00000064",
+											ty: 0
+										}
+									},
+									root_key: "0x00000064"
+								}
+							},
+							name: "routes"
+						},
+						{
+							layout: {
+								root: {
+									layout: {
+										leaf: {
+											key: "0x00000065",
+											ty: 4
+										}
+									},
+									root_key: "0x00000065"
+								}
+							},
+							name: "associated_tlds"
+						}
+					],
+					name: "Router"
+				}
+			},
+			root_key: "0x00000000"
+		}
+	},
+	types: [
+		{
+			id: 0,
+			type: {
+				def: {
+					composite: {
+						fields: [
+							{
+								type: 1,
+								typeName: "[u8; 32]"
+							}
+						]
+					}
+				},
+				path: [
+					"ink_primitives",
+					"types",
+					"AccountId"
+				]
+			}
+		},
+		{
+			id: 1,
+			type: {
+				def: {
+					array: {
+						len: 32,
+						type: 2
+					}
+				}
+			}
+		},
+		{
+			id: 2,
+			type: {
+				def: {
+					primitive: "u8"
+				}
+			}
+		},
+		{
+			id: 3,
+			type: {
+				def: {
+					sequence: {
+						type: 0
+					}
+				}
+			}
+		},
+		{
+			id: 4,
+			type: {
+				def: {
+					sequence: {
+						type: 5
+					}
+				}
+			}
+		},
+		{
+			id: 5,
+			type: {
+				def: {
+					primitive: "str"
+				}
+			}
+		},
+		{
+			id: 6,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 7
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 7
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 7,
+			type: {
+				def: {
+					tuple: [
+					]
+				}
+			}
+		},
+		{
+			id: 8,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								index: 1,
+								name: "CouldNotReadInput"
+							}
+						]
+					}
+				},
+				path: [
+					"ink_primitives",
+					"LangError"
+				]
+			}
+		},
+		{
+			id: 9,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 10
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 10
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 10,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 7
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 11
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 7
+					},
+					{
+						name: "E",
+						type: 11
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 11,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								index: 0,
+								name: "NotAdmin"
+							},
+							{
+								index: 1,
+								name: "InvalidRegistryAddress"
+							},
+							{
+								fields: [
+									{
+										type: 5,
+										typeName: "String"
+									}
+								],
+								index: 2,
+								name: "TldAlreadyInUse"
+							},
+							{
+								fields: [
+									{
+										type: 5,
+										typeName: "String"
+									}
+								],
+								index: 3,
+								name: "TldNotFound"
+							},
+							{
+								index: 4,
+								name: "CouldNotResolveDomain"
+							},
+							{
+								index: 5,
+								name: "InvalidDomainName"
+							},
+							{
+								index: 6,
+								name: "EmptyList"
+							}
+						]
+					}
+				},
+				path: [
+					"azns_router",
+					"azns_router",
+					"Error"
+				]
+			}
+		},
+		{
+			id: 12,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 13
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 13
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 13,
+			type: {
+				def: {
+					sequence: {
+						type: 14
+					}
+				}
+			}
+		},
+		{
+			id: 14,
+			type: {
+				def: {
+					tuple: [
+						0,
+						4
+					]
+				}
+			}
+		},
+		{
+			id: 15,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 4
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 4
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 16,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 17
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 17
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 17,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								index: 0,
+								name: "None"
+							},
+							{
+								fields: [
+									{
+										type: 0
+									}
+								],
+								index: 1,
+								name: "Some"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 0
+					}
+				],
+				path: [
+					"Option"
+				]
+			}
+		},
+		{
+			id: 18,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 19
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 19
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 19,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 0
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 11
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 0
+					},
+					{
+						name: "E",
+						type: 11
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 20,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								index: 0,
+								name: "None"
+							},
+							{
+								fields: [
+									{
+										type: 5
+									}
+								],
+								index: 1,
+								name: "Some"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 5
+					}
+				],
+				path: [
+					"Option"
+				]
+			}
+		},
+		{
+			id: 21,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 22
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 22
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 22,
+			type: {
+				def: {
+					sequence: {
+						type: 23
+					}
+				}
+			}
+		},
+		{
+			id: 23,
+			type: {
+				def: {
+					tuple: [
+						0,
+						5
+					]
+				}
+			}
+		},
+		{
+			id: 24,
+			type: {
+				def: {
+					variant: {
+						variants: [
+							{
+								fields: [
+									{
+										type: 0
+									}
+								],
+								index: 0,
+								name: "Ok"
+							},
+							{
+								fields: [
+									{
+										type: 8
+									}
+								],
+								index: 1,
+								name: "Err"
+							}
+						]
+					}
+				},
+				params: [
+					{
+						name: "T",
+						type: 0
+					},
+					{
+						name: "E",
+						type: 8
+					}
+				],
+				path: [
+					"Result"
+				]
+			}
+		},
+		{
+			id: 25,
+			type: {
+				def: {
+					primitive: "u128"
+				}
+			}
+		},
+		{
+			id: 26,
+			type: {
+				def: {
+					composite: {
+						fields: [
+							{
+								type: 1,
+								typeName: "[u8; 32]"
+							}
+						]
+					}
+				},
+				path: [
+					"ink_primitives",
+					"types",
+					"Hash"
+				]
+			}
+		},
+		{
+			id: 27,
+			type: {
+				def: {
+					primitive: "u64"
+				}
+			}
+		},
+		{
+			id: 28,
+			type: {
+				def: {
+					primitive: "u32"
+				}
+			}
+		},
+		{
+			id: 29,
+			type: {
+				def: {
+					variant: {
+					}
+				},
+				path: [
+					"ink_env",
+					"types",
+					"NoChainExtension"
+				]
+			}
+		}
+	],
+	version: "4"
+};
+
+const ROUTER_ABI = new apiContract.Abi(aznsRouterAbiJson);
+const ROUTER_ADDRESS = {
+  "alephzero": "5FfRtDtpS3Vcr7BTChjPiQNrcAKu3VLv4E1NGF6ng6j3ZopJ",
+  "alephzero-testnet": "5HXjj3xhtRMqRYCRaXTDcVPz3Mez2XBruyujw6UEkvn8PCiA"
+};
+const readContract = async (provider, registry, from, contractAddress, data) => {
+  const rawResult = await provider.send("state_call", ["ContractsApi_call", util.u8aToHex(util.u8aConcatStrict([
+  // origin
+  registry.createType("AccountId", from).toU8a(),
+  // dest
+  registry.createType("AccountId", contractAddress).toU8a(),
+  // value
+  registry.createType("Balance", 0).toU8a(),
+  // gasLimit
+  registry.createType("Option<WeightV2>").toU8a(),
+  // storageDepositLimit
+  registry.createType("Option<Balance>").toU8a(),
+  // inputData
+  data]))]);
+  return registry.createType("ContractExecResult", rawResult);
+};
+const resolveDomainToAddress = async (domain, {
+  provider,
+  registry,
+  chainId
+}) => {
+  try {
+    const routerAddress = ROUTER_ADDRESS[chainId];
+    if (!routerAddress) throw new Error(`No azns router address found for chainId: ${chainId}`);
+    const message = ROUTER_ABI.findMessage("get_address");
+    if (!message) throw new Error(`No get_address message found in aznsRouter abi`);
+    const {
+      result
+    } = await readContract(provider, registry, routerAddress, routerAddress, message.toU8a([domain]));
+    if (!result.isOk) throw result.asErr;
+    const resultType = message.returnType.lookupName ?? message.returnType.type;
+    const returnValue = registry.createTypeUnsafe(resultType, [result.asOk.data.toU8a(true)], {
+      isPedantic: true
+    });
+    if (!returnValue.isOk) throw returnValue.asErr;
+    if (!returnValue.asOk.isOk) throw returnValue.asOk.asErr;
+    return returnValue.asOk.asOk.toString();
+  } catch (cause) {
+    throw new Error(`Failed to resolve azns domain ${domain} on ${chainId}`, {
+      cause
+    });
+  }
+};
+const resolveAddressToDomain = async (address, {
+  provider,
+  registry,
+  chainId
+}) => {
+  try {
+    const routerAddress = ROUTER_ADDRESS[chainId];
+    if (!routerAddress) throw new Error(`No azns router address found for chainId: ${chainId}`);
+    const message = ROUTER_ABI.findMessage("get_primary_domains");
+    if (!message) throw new Error(`No get_address get_primary_domains found in aznsRouter abi`);
+    const {
+      result
+    } = await readContract(provider, registry, routerAddress, routerAddress, message.toU8a([address, undefined]));
+    if (!result.isOk) throw result.asErr;
+    const resultType = message.returnType.lookupName ?? message.returnType.type;
+    const returnValue = registry.createTypeUnsafe(resultType, [result.asOk.data.toU8a(true)], {
+      isPedantic: true
+    });
+    if (!returnValue.isOk) throw returnValue.asErr;
+    return returnValue.asOk[0]?.[1]?.toString() ?? null;
+  } catch (cause) {
+    throw new Error(`Failed to lookup azns domain for ${address} on ${chainId}`, {
+      cause
+    });
+  }
+};
+
 /**
  * Looks up the on-chain identifiers for some addresses.
  * Supports ENS and AZNS.
@@ -99,29 +1469,15 @@ const lookupAznsAddresses = async (config, addresses) => {
     return onChainIds;
   }
   const provider = config.chainConnectors.substrate.asProvider(config.chainIdAlephZero);
-  const customApi = new api.ApiPromise({
-    provider,
-    registry: config.registryAlephZero
-  });
-  await customApi.isReady;
   const results = await Promise.allSettled(addresses.map(async address => {
     // no need to do AZNS lookup for ethereum addresses
-    if (util.isEthereumAddress(address)) return;
-    try {
-      const result = await resolverCore.resolveAddressToDomain(address, {
-        chainId: config.aznsSupportedChainIdAlephZero,
-        customApi
-      });
-      if (result.error) throw result.error;
-      const {
-        primaryDomain: domain
-      } = result;
-      domain !== null && onChainIds.set(address, domain);
-    } catch (cause) {
-      throw new Error(`Failed to resolve AZNS domain for address '${address}': ${String(cause)}`, {
-        cause
-      });
-    }
+    if (util$1.isEthereumAddress(address)) return;
+    const domain = await resolveAddressToDomain(address, {
+      chainId: config.aznsSupportedChainIdAlephZero,
+      registry: config.registryAlephZero,
+      provider
+    });
+    if (domain) onChainIds.set(address, domain);
   }));
   results.forEach(result => result.status === "rejected" && log.warn(result.reason));
   return onChainIds;
@@ -139,7 +1495,7 @@ const lookupEnsAddresses = async (config, addresses) => {
   }
   const results = await Promise.allSettled(addresses.map(async address => {
     // no need to do ENS lookup for polkadot addresses
-    if (!util.isEthereumAddress(address)) return;
+    if (!util$1.isEthereumAddress(address)) return;
     try {
       const domain = await client.getEnsName({
         address
@@ -156,10 +1512,10 @@ const lookupEnsAddresses = async (config, addresses) => {
 };
 
 /** dot separated string with `azero` or `tzero` suffix e.g. `fontbois.tzero` or `talisman.tzero` */
-const isPotentialAzns = name => typeof name === "string" && /^.+\.[ta]zero$/.test(name);
+const isPotentialAzns = name => typeof name === "string" && /^.+\.(([ta]zero)|(a0))$/.test(name);
 
 /** dot separated string e.g. `ens.eth` or `hello.lol`, but not ending with `.azero` nor `.tzero` */
-const isPotentialEns = name => typeof name === "string" && /^.+\.(?![ta]zero).+$/.test(name);
+const isPotentialEns = name => typeof name === "string" && /^.+\..+$/.test(name) && !isPotentialAzns(name);
 
 const resolveNames = async (config, names) => {
   const resolvedNames = new Map(names.map(name => [name, null]));
@@ -190,31 +1546,16 @@ const resolveAznsNames = async (config, names) => {
     return resolvedNames;
   }
   const provider = config.chainConnectors.substrate.asProvider(config.chainIdAlephZero);
-  const customApi = new api.ApiPromise({
-    provider,
-    registry: config.registryAlephZero
-  });
-  await customApi.isReady;
   const results = await Promise.allSettled(names.map(async name => {
     if (!isPotentialAzns(name)) return;
-    try {
-      const result = await resolverCore.resolveDomainToAddress(name, {
-        chainId: config.aznsSupportedChainIdAlephZero,
-        customApi
-      });
-      if (result.error) throw result.error;
-      const {
-        address
-      } = result;
-      address !== null && resolvedNames.set(name, [address, "azns"]);
-    } catch (cause) {
-      throw new Error(`Failed to resolve address for azns domain '${name}'`, {
-        cause
-      });
-    }
+    const address = await resolveDomainToAddress(name, {
+      chainId: config.aznsSupportedChainIdAlephZero,
+      registry: config.registryAlephZero,
+      provider
+    });
+    if (address) resolvedNames.set(name, [address, "azns"]);
   }));
   results.forEach(result => result.status === "rejected" && log.warn(result.reason));
-  customApi.disconnect();
   return resolvedNames;
 };
 
@@ -236,7 +1577,7 @@ const resolveEnsNames = async (config, names) => {
       // this hangs forever in some cases (ex: try agyle.e first, then agyle.et => hangs) - couldn't explain it
       client.getEnsAddress({
         name
-      }), util.throwAfter(10_000, "Timeout")]);
+      }), util$1.throwAfter(10_000, "Timeout")]);
       address !== null && resolvedNames.set(name, [address, "ens"]);
     } catch (cause) {
       throw new Error(`Failed to resolve address for ens domain '${name}'`, {