@reserve-protocol/sdk 0.1.2 → 0.1.4

package/dist/index.d.mts

@@ -25789,6 +25789,7 @@ type ProposalContractDecoder = {
   readonly contract: string;
   readonly abi: Abi;
 };
+type ProposalContractDecoderMap = Map<string, ProposalContractDecoder | readonly ProposalContractDecoder[]>;
 type IndexDtfProposalGovernanceContractContext = {
   readonly address: Address;
   readonly timelock: {
@@ -25823,7 +25824,7 @@ type IndexDtfProposalDtfContractContext = {
 type DecodeIndexDtfProposalCalldatasParams = {
   readonly targets: readonly Address[];
   readonly calldatas: readonly `0x${string}`[];
-  readonly contractMap: Map<string, ProposalContractDecoder>;
+  readonly contractMap: ProposalContractDecoderMap;
 };
 type DecodeIndexDtfProposalParams = {
   readonly chainId: SupportedChainId;

package/dist/index.mjs

@@ -10314,6 +10314,51 @@ const dtfIndexStakingVaultOptimisticAbi = [
 	}
 ];
 //#endregion
+//#region src/index-dtf/abis/optimistic-timelock.ts
+const optimisticTimelockAbi = [{
+	type: "function",
+	name: "getRoleMemberCount",
+	inputs: [{
+		name: "role",
+		type: "bytes32",
+		internalType: "bytes32"
+	}],
+	outputs: [{
+		name: "",
+		type: "uint256",
+		internalType: "uint256"
+	}],
+	stateMutability: "view"
+}, {
+	type: "function",
+	name: "getRoleMember",
+	inputs: [{
+		name: "role",
+		type: "bytes32",
+		internalType: "bytes32"
+	}, {
+		name: "index",
+		type: "uint256",
+		internalType: "uint256"
+	}],
+	outputs: [{
+		name: "",
+		type: "address",
+		internalType: "address"
+	}],
+	stateMutability: "view"
+}];
+//#endregion
+//#region src/index-dtf/governance/optimistic-errors.ts
+function isUnsupportedOptimisticContractError(error) {
+	const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+	return message.includes("returned no data") || message.includes("could not decode") || message.includes("data size of 0 bytes") || message.includes("function") && message.includes("not found");
+}
+function isUnsupportedVoteLockOptimisticReadError(error) {
+	const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+	return isUnsupportedOptimisticContractError(error) || (message.includes("execution reverted") || message.includes("reverted")) && (message.includes("optimisticdelegates") || message.includes("getoptimisticvotes") || message.includes("getpastoptimisticvotes"));
+}
+//#endregion
 //#region src/index-dtf/governance/utils.ts
 const D18$1 = 10n ** 18n;
 const MAX_UINT256$2 = (1n << 256n) - 1n;
@@ -10466,51 +10511,6 @@ function getVotePercentage(votes, totalVotes) {
 	return Number(votes * 10000n / totalVotes) / 100;
 }
 //#endregion
-//#region src/index-dtf/abis/optimistic-timelock.ts
-const optimisticTimelockAbi = [{
-	type: "function",
-	name: "getRoleMemberCount",
-	inputs: [{
-		name: "role",
-		type: "bytes32",
-		internalType: "bytes32"
-	}],
-	outputs: [{
-		name: "",
-		type: "uint256",
-		internalType: "uint256"
-	}],
-	stateMutability: "view"
-}, {
-	type: "function",
-	name: "getRoleMember",
-	inputs: [{
-		name: "role",
-		type: "bytes32",
-		internalType: "bytes32"
-	}, {
-		name: "index",
-		type: "uint256",
-		internalType: "uint256"
-	}],
-	outputs: [{
-		name: "",
-		type: "address",
-		internalType: "address"
-	}],
-	stateMutability: "view"
-}];
-//#endregion
-//#region src/index-dtf/governance/optimistic-errors.ts
-function isUnsupportedOptimisticContractError(error) {
-	const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
-	return message.includes("returned no data") || message.includes("could not decode") || message.includes("data size of 0 bytes") || message.includes("function") && message.includes("not found");
-}
-function isUnsupportedVoteLockOptimisticReadError(error) {
-	const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
-	return isUnsupportedOptimisticContractError(error) || (message.includes("execution reverted") || message.includes("reverted")) && (message.includes("optimisticdelegates") || message.includes("getoptimisticvotes") || message.includes("getpastoptimisticvotes"));
-}
-//#endregion
 //#region src/index-dtf/governance/optimistic.ts
 const MAX_UINT256$1 = (1n << 256n) - 1n;
 const OPTIMISTIC_PROPOSER_ROLE = "0x26f49d08685d9cdd4951a7470bc8fbe9dd0f00419c1a44c1b89f845867ae12e0";
@@ -22882,9 +22882,9 @@ const EXTRA_PROPOSAL_CONTRACTS = [
 		contract: "Reserve Optimistic Governance Spell",
 		abi: upgradeSpellProposalAbi,
 		addresses: {
-			1: "0x082E701456cd702fBE5797Ab515e6B00580E5a14",
-			8453: "0x0aDc69041a2B086f8772aCcE2A754f410F211bed",
-			56: "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178"
+			1: "0xd7238463494fdd4b103c2ad9d229b3985b5bc6f1",
+			8453: "0xe9ae2cb2b5e5658035617f92efa1878429f9cd3f",
+			56: "0x3dde17cfd36e740cb7452cb2f59fc925eacb91ab"
 		}
 	}
 ];
@@ -22916,24 +22916,33 @@ function buildProposalContractMap({ chainId, dtf, proposalGovernance }) {
 		addContract(contracts, proposalGovernance.address, getGovernanceContractName(proposalGovernance.timelock.type), dtfIndexGovernanceProposalAbi);
 		addContract(contracts, proposalGovernance.timelock.address, getTimelockContractName(proposalGovernance.timelock.type), timelockAbi);
 	}
-	for (const extraContract of EXTRA_PROPOSAL_CONTRACTS) addContract(contracts, extraContract.addresses[chainId], extraContract.contract, extraContract.abi);
+	for (const extraContract of EXTRA_PROPOSAL_CONTRACTS) addContract(contracts, extraContract.addresses[chainId], extraContract.contract, extraContract.abi, true);
 	return contracts;
 }
 function getContractAliases(contractMap) {
 	const aliases = {};
-	for (const contract of contractMap.values()) aliases[contract.target] = contract.contract;
+	for (const entry of contractMap.values()) {
+		const contract = getContractDecoders$1(entry)[0];
+		if (!contract) continue;
+		aliases[contract.target] = contract.contract;
+	}
 	return aliases;
 }
-function addContract(contracts, target, contract, abi) {
+function addContract(contracts, target, contract, abi, prefer = false) {
 	if (!target) return;
 	const address = getAddress(target);
 	const key = address.toLowerCase();
-	if (contracts.has(key)) return;
-	contracts.set(key, {
+	const decoder = {
 		target: address,
 		contract,
 		abi
-	});
+	};
+	const existing = getContractDecoders$1(contracts.get(key));
+	contracts.set(key, existing ? prefer ? [decoder, ...existing] : [...existing, decoder] : [decoder]);
+}
+function getContractDecoders$1(entry) {
+	if (!entry) return [];
+	return "abi" in entry ? [entry] : entry;
 }
 function getGovernanceContractName(type) {
 	if (type === "OWNER") return "Owner Governance";
@@ -22967,8 +22976,8 @@ function decodeIndexDtfProposalCalldatas({ targets, calldatas, contractMap }) {
 		const callData = calldatas[i];
 		const targetAddress = getAddress(target);
 		const targetKey = targetAddress.toLowerCase();
-		const contractDecoder = contractMap.get(targetKey);
-		if (!contractDecoder) {
+		const contractDecoders = getContractDecoders(contractMap.get(targetKey));
+		if (contractDecoders.length === 0) {
 			const fallbackDecoded = decodeFallbackProposalCalldata(i, targetAddress, callData);
 			if (fallbackDecoded) {
 				calls.push(fallbackDecoded);
@@ -22985,7 +22994,7 @@ function decodeIndexDtfProposalCalldatas({ targets, calldatas, contractMap }) {
 			pushUnknownContractGroup(unknownContracts, unknownGroupMap, unknownCall);
 			continue;
 		}
-		const decoded = decodeProposalCalldata(contractDecoder, i, targetAddress, callData);
+		const decoded = decodeProposalCalldata(contractDecoders, i, targetAddress, callData);
 		if (decoded) {
 			calls.push(decoded);
 			pushDecodedContractGroup(dataByContract, dataGroupMap, decoded);
@@ -22993,7 +23002,7 @@ function decodeIndexDtfProposalCalldatas({ targets, calldatas, contractMap }) {
 			const unknownCall = {
 				index: i,
 				target: targetAddress,
-				contract: contractDecoder.contract,
+				contract: contractDecoders[0].contract,
 				callData
 			};
 			unknownCalls.push(unknownCall);
@@ -23043,28 +23052,42 @@ async function getExternalAbiContractMap(explorer, chainId, unknownCalls, contra
 	const externalContractMap = new Map(contractMap);
 	for (const { target, metadata } of withMetadata) {
 		const key = target.toLowerCase();
-		const existing = externalContractMap.get(key);
-		externalContractMap.set(key, {
+		const existing = getContractDecoders(externalContractMap.get(key));
+		if (existing.length > 0) {
+			const [primary, ...rest] = existing;
+			externalContractMap.set(key, [{
+				...primary,
+				abi: [...primary.abi, ...metadata.abi]
+			}, ...rest]);
+			continue;
+		}
+		externalContractMap.set(key, [{
 			target,
-			contract: existing?.contract ?? metadata.contractName,
-			abi: existing ? [...existing.abi, ...metadata.abi] : metadata.abi
-		});
+			contract: metadata.contractName,
+			abi: metadata.abi
+		}]);
 	}
 	return externalContractMap;
 }
-function decodeProposalCalldata(contractDecoder, index, target, callData) {
-	const decoded = tryDecodeCalldata(contractDecoder.abi, callData);
-	if (!decoded) return;
-	return {
-		index,
-		target,
-		contract: contractDecoder.contract,
-		functionName: decoded.functionName,
-		signature: decoded.signature,
-		parameters: decoded.parameters,
-		params: decoded.params,
-		callData
-	};
+function decodeProposalCalldata(contractDecoders, index, target, callData) {
+	for (const contractDecoder of contractDecoders) {
+		const decoded = tryDecodeCalldata(contractDecoder.abi, callData);
+		if (!decoded) continue;
+		return {
+			index,
+			target,
+			contract: contractDecoder.contract,
+			functionName: decoded.functionName,
+			signature: decoded.signature,
+			parameters: decoded.parameters,
+			params: decoded.params,
+			callData
+		};
+	}
+}
+function getContractDecoders(entry) {
+	if (!entry) return [];
+	return "abi" in entry ? [entry] : entry;
 }
 function tryDecodeCalldata(abi, callData) {
 	try {
@@ -23091,10 +23114,10 @@ function tryDecodeCalldata(abi, callData) {
 }
 function decodeFallbackProposalCalldata(index, target, callData) {
 	for (const fallbackDecoder of FALLBACK_DECODERS) {
-		const decoded = decodeProposalCalldata({
+		const decoded = decodeProposalCalldata([{
 			...fallbackDecoder,
 			target
-		}, index, target, callData);
+		}], index, target, callData);
 		if (decoded) return decoded;
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reserve-protocol/sdk",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Core TypeScript SDK for DTF interface integrations.",
   "keywords": [
     "dtf",