@beclab/olaresid 0.1.13 → 0.2.1

package/src/abi/TerminusDIDQueryABI.ts

@@ -0,0 +1,516 @@
+export default [
+	{
+		type: 'constructor',
+		inputs: [
+			{
+				name: '_terminusDID',
+				type: 'address',
+				internalType: 'address'
+			}
+		],
+		stateMutability: 'nonpayable'
+	},
+	{
+		type: 'function',
+		name: 'getAllDomains',
+		inputs: [
+			{
+				name: 'offset',
+				type: 'uint256',
+				internalType: 'uint256'
+			},
+			{
+				name: 'limit',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		],
+		outputs: [
+			{
+				name: 'domains',
+				type: 'tuple[]',
+				internalType: 'struct TerminusDIDQuery.DomainData[]',
+				components: [
+					{
+						name: 'tokenId',
+						type: 'uint256',
+						internalType: 'uint256'
+					},
+					{
+						name: 'domain',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'did',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'notes',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'allowSubdomain',
+						type: 'bool',
+						internalType: 'bool'
+					},
+					{
+						name: 'owner',
+						type: 'address',
+						internalType: 'address'
+					},
+					{
+						name: 'tags',
+						type: 'tuple[]',
+						internalType: 'struct TerminusDIDQuery.TagData[]',
+						components: [
+							{
+								name: 'from',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'name',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'abiType',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'value',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'fieldNamesHash',
+								type: 'bytes32[]',
+								internalType: 'bytes32[]'
+							}
+						]
+					}
+				]
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'getDomain',
+		inputs: [
+			{
+				name: 'tokenId',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		],
+		outputs: [
+			{
+				name: 'data',
+				type: 'tuple',
+				internalType: 'struct TerminusDIDQuery.DomainData',
+				components: [
+					{
+						name: 'tokenId',
+						type: 'uint256',
+						internalType: 'uint256'
+					},
+					{
+						name: 'domain',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'did',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'notes',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'allowSubdomain',
+						type: 'bool',
+						internalType: 'bool'
+					},
+					{
+						name: 'owner',
+						type: 'address',
+						internalType: 'address'
+					},
+					{
+						name: 'tags',
+						type: 'tuple[]',
+						internalType: 'struct TerminusDIDQuery.TagData[]',
+						components: [
+							{
+								name: 'from',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'name',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'abiType',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'value',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'fieldNamesHash',
+								type: 'bytes32[]',
+								internalType: 'bytes32[]'
+							}
+						]
+					}
+				]
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'getDomainByName',
+		inputs: [
+			{
+				name: 'name',
+				type: 'string',
+				internalType: 'string'
+			}
+		],
+		outputs: [
+			{
+				name: 'data',
+				type: 'tuple',
+				internalType: 'struct TerminusDIDQuery.DomainData',
+				components: [
+					{
+						name: 'tokenId',
+						type: 'uint256',
+						internalType: 'uint256'
+					},
+					{
+						name: 'domain',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'did',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'notes',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'allowSubdomain',
+						type: 'bool',
+						internalType: 'bool'
+					},
+					{
+						name: 'owner',
+						type: 'address',
+						internalType: 'address'
+					},
+					{
+						name: 'tags',
+						type: 'tuple[]',
+						internalType: 'struct TerminusDIDQuery.TagData[]',
+						components: [
+							{
+								name: 'from',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'name',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'abiType',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'value',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'fieldNamesHash',
+								type: 'bytes32[]',
+								internalType: 'bytes32[]'
+							}
+						]
+					}
+				]
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'getDomains',
+		inputs: [
+			{
+				name: 'tokenIds',
+				type: 'uint256[]',
+				internalType: 'uint256[]'
+			}
+		],
+		outputs: [
+			{
+				name: 'domains',
+				type: 'tuple[]',
+				internalType: 'struct TerminusDIDQuery.DomainData[]',
+				components: [
+					{
+						name: 'tokenId',
+						type: 'uint256',
+						internalType: 'uint256'
+					},
+					{
+						name: 'domain',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'did',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'notes',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'allowSubdomain',
+						type: 'bool',
+						internalType: 'bool'
+					},
+					{
+						name: 'owner',
+						type: 'address',
+						internalType: 'address'
+					},
+					{
+						name: 'tags',
+						type: 'tuple[]',
+						internalType: 'struct TerminusDIDQuery.TagData[]',
+						components: [
+							{
+								name: 'from',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'name',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'abiType',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'value',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'fieldNamesHash',
+								type: 'bytes32[]',
+								internalType: 'bytes32[]'
+							}
+						]
+					}
+				]
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'getDomainsByIndices',
+		inputs: [
+			{
+				name: 'indices',
+				type: 'uint256[]',
+				internalType: 'uint256[]'
+			}
+		],
+		outputs: [
+			{
+				name: 'domains',
+				type: 'tuple[]',
+				internalType: 'struct TerminusDIDQuery.DomainData[]',
+				components: [
+					{
+						name: 'tokenId',
+						type: 'uint256',
+						internalType: 'uint256'
+					},
+					{
+						name: 'domain',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'did',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'notes',
+						type: 'string',
+						internalType: 'string'
+					},
+					{
+						name: 'allowSubdomain',
+						type: 'bool',
+						internalType: 'bool'
+					},
+					{
+						name: 'owner',
+						type: 'address',
+						internalType: 'address'
+					},
+					{
+						name: 'tags',
+						type: 'tuple[]',
+						internalType: 'struct TerminusDIDQuery.TagData[]',
+						components: [
+							{
+								name: 'from',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'name',
+								type: 'string',
+								internalType: 'string'
+							},
+							{
+								name: 'abiType',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'value',
+								type: 'bytes',
+								internalType: 'bytes'
+							},
+							{
+								name: 'fieldNamesHash',
+								type: 'bytes32[]',
+								internalType: 'bytes32[]'
+							}
+						]
+					}
+				]
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'terminusDID',
+		inputs: [],
+		outputs: [
+			{
+				name: '',
+				type: 'address',
+				internalType: 'contract ITerminusDID'
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'tokenByIndex',
+		inputs: [
+			{
+				name: 'index',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		],
+		outputs: [
+			{
+				name: '',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'function',
+		name: 'totalSupply',
+		inputs: [],
+		outputs: [
+			{
+				name: '',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		],
+		stateMutability: 'view'
+	},
+	{
+		type: 'error',
+		name: 'DomainNotExists',
+		inputs: [
+			{
+				name: 'tokenId',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		]
+	},
+	{
+		type: 'error',
+		name: 'InvalidBatchSize',
+		inputs: [
+			{
+				name: 'size',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		]
+	},
+	{
+		type: 'error',
+		name: 'InvalidPagination',
+		inputs: [
+			{
+				name: 'offset',
+				type: 'uint256',
+				internalType: 'uint256'
+			},
+			{
+				name: 'limit',
+				type: 'uint256',
+				internalType: 'uint256'
+			}
+		]
+	}
+] as const;

package/src/business/index.ts

@@ -111,7 +111,9 @@ export class DomainContext {
 		const [metadata, latestDID] = await Promise.all([
 			didContract.getMetadata(tokenId),
 			// Use catch to handle cases where latestDID is not set
-			resolverContract.getLatestDID(this.domainName).catch(() => '')
+			resolverContract.getLatestDID(this.domainName).catch(() => {
+				return null;
+			})
 		]);
 
 		// Use latestDID if it has a value, otherwise fallback to metadata.did
@@ -792,16 +794,8 @@ export class DomainContext {
 			);
 			addresses.push(...tagger2Addresses);
 		} catch (error: any) {
-			const errorInfo = parseContractError(error);
-
-			// Only skip if it's a contract error (tag doesn't exist, etc.)
-			// Re-throw network errors
-			if (errorInfo.isNetworkError) {
-				throw new Error(
-					`Network error fetching from RootTagger2: ${errorInfo.message}`
-				);
-			}
-			// Contract errors are silently handled (tag doesn't exist is normal)
+			const parsedError = parseContractError(error);
+			throw new Error(parsedError.message);
 		}
 
 		// Get addresses from RootResolver (legacy method for backward compatibility)
@@ -818,16 +812,8 @@ export class DomainContext {
 			);
 			addresses.push(...legacyAddresses);
 		} catch (error: any) {
-			const errorInfo = parseContractError(error);
-
-			// Only skip if it's a contract error
-			// Re-throw network errors
-			if (errorInfo.isNetworkError) {
-				throw new Error(
-					`Network error fetching from RootResolver (legacy): ${errorInfo.message}`
-				);
-			}
-			// Contract errors are silently handled
+			const parsedError = parseContractError(error);
+			throw new Error(parsedError.message);
 		}
 
 		// Remove duplicates and return
@@ -1122,18 +1108,8 @@ export class DomainContext {
 				return new PublicKey(buffer).toBase58();
 			});
 		} catch (error: any) {
-			const errorInfo = parseContractError(error);
-
-			// Only skip if it's a contract error (tag doesn't exist is normal)
-			// Re-throw network errors
-			if (errorInfo.isNetworkError) {
-				throw new Error(
-					`Network error fetching Solana wallets: ${errorInfo.message}`
-				);
-			}
-
-			// For contract errors, return empty array (tag doesn't exist is normal)
-			return [];
+			const parsedError = parseContractError(error);
+			throw new Error(parsedError.message);
 		}
 	}
 

package/src/business/tag-context.ts

@@ -2,14 +2,16 @@ import { DIDConsole } from '../index';
 import { TransactionResult } from './index';
 import { parseContractError } from '../utils/error-parser';
 import { TagTypeBuilder } from '../utils/tag-type-builder';
-import { TagAbiCodec } from '../utils/tag-abi-codec';
 import { normalizeToDomain } from '../utils/olares-id';
+import { AbiCoder } from 'ethers';
 
 /**
  * Tag Operation Context
  * Provides complete Tag management functionality
  */
 export class TagContext {
+	private abiCoder = new AbiCoder();
+
 	constructor(private console: DIDConsole, private fromDomain: string) {
 		// Support Olares ID format (user@domain.com)
 		this.fromDomain = normalizeToDomain(fromDomain);
@@ -237,9 +239,16 @@ export class TagContext {
 				tagTypeInfo.abiType
 			);
 
-			// Encode the ENTIRE value using TagAbiCodec
+			// Encode the ENTIRE value using ethers AbiCoder
 			// Objects are automatically converted to arrays based on ABI type structure
-			const encodedValue = TagAbiCodec.encode(abiType, value);
+			const convertedValue = TagTypeBuilder.convertObjectToArray(
+				abiType,
+				value
+			);
+			const encodedValue = this.abiCoder.encode(
+				[abiType],
+				[convertedValue]
+			);
 
 			// Check if tag already exists
 			const hasTag = await contract.hasTag(
@@ -316,7 +325,8 @@ export class TagContext {
 			const abiType = TagTypeBuilder.parseTypeBytesToAbiString(
 				tagTypeInfo.abiType
 			);
-			return TagAbiCodec.decode(abiType, encodedValue);
+			const decoded = this.abiCoder.decode([abiType], encodedValue);
+			return decoded[0];
 		} catch (error: any) {
 			const errorInfo = parseContractError(error);
 			if (
@@ -474,7 +484,14 @@ export class TagContext {
 				elemPath
 			);
 			// Encode the SINGLE ELEMENT (not the whole array)
-			const encodedValue = TagAbiCodec.encode(elementAbiType, value);
+			const convertedValue = TagTypeBuilder.convertObjectToArray(
+				elementAbiType,
+				value
+			);
+			const encodedValue = this.abiCoder.encode(
+				[elementAbiType],
+				[convertedValue]
+			);
 
 			const tx = await contract.pushTagElem(
 				this.fromDomain,
@@ -582,7 +599,14 @@ export class TagContext {
 				elemPath
 			);
 			// Encode the element value
-			const encodedValue = TagAbiCodec.encode(elementAbiType, value);
+			const convertedValue = TagTypeBuilder.convertObjectToArray(
+				elementAbiType,
+				value
+			);
+			const encodedValue = this.abiCoder.encode(
+				[elementAbiType],
+				[convertedValue]
+			);
 
 			const tx = await contract.updateTagElem(
 				this.fromDomain,
@@ -681,7 +705,11 @@ export class TagContext {
 				elemPath
 			);
 			// Decode the element
-			return TagAbiCodec.decode(elementAbiType, encodedValue);
+			const decoded = this.abiCoder.decode(
+				[elementAbiType],
+				encodedValue
+			);
+			return decoded[0];
 		} catch (error: any) {
 			const errorInfo = parseContractError(error);
 			if (errorInfo.errorName === 'TagInvalidOp') {