#606 | Edit and revoke allowances

src/antelope/chains/EVMChainSettings.ts

@@ -382,6 +382,7 @@ export default abstract class EVMChainSettings implements ChainSettings {
  imageCache: nftResponse.imageCache,
  tokenUri: nftResponse.tokenUri,
  supply: nftResponse.supply,
+ owner: nftResponse.owner,
  }));
 
  // we fix the supportedInterfaces property if it is undefined in the response but present in the request
@@ -728,6 +729,7 @@ export default abstract class EVMChainSettings implements ChainSettings {
  const params = {
  ...filter,
  type: 'erc20',
+ all: true,
  };
  const response = await this.indexer.get(`v1/account/${account}/approvals`, { params });
  return response.data as IndexerAllowanceResponseErc20;
@@ -737,6 +739,7 @@ export default abstract class EVMChainSettings implements ChainSettings {
  const params = {
  ...filter,
  type: 'erc721',
+ all: true,
  };
  const response = await this.indexer.get(`v1/account/${account}/approvals`, { params });
  return response.data as IndexerAllowanceResponseErc721;
@@ -746,6 +749,7 @@ export default abstract class EVMChainSettings implements ChainSettings {
  const params = {
  ...filter,
  type: 'erc1155',
+ all: true,
  };
  const response = await this.indexer.get(`v1/account/${account}/approvals`, { params });
  return response.data as IndexerAllowanceResponseErc1155;

src/antelope/chains/chain-constants.ts

@@ -15,3 +15,5 @@ export const TELOS_ANALYTICS_EVENT_IDS = {
  loginFailedWalletConnect: '9V4IV1BV',
  loginSuccessfulWalletConnect: '2EG2OR3H',
 };
+
+export const ZERO_ADDRESS = '0x'.concat('0'.repeat(40));

src/antelope/stores/contract.ts

@@ -69,6 +69,10 @@ export interface ContractStoreState {
  processing: Record<string, Promise<EvmContract | null>>
  },
  }
+ // addresses which have been checked and are known not to be contract addresses
+ __accounts: {
+ [network: string]: string[],
+ },
 }
 
 const store_name = 'contract';
@@ -187,6 +191,13 @@ export const useContractStore = defineStore(store_name, {
  return this.__contracts[network].cached[addressLower];
  }
 
+ const isContract = await this.addressIsContract(network, address);
+
+ if (!isContract) {
+ // address is an account, not a contract
+ return null;
+ }
+
  // if we have the metadata, we can create the contract and return it
  if (typeof this.__contracts[network].metadata[addressLower] !== 'undefined') {
  const metadata = this.__contracts[network].metadata[addressLower] as EvmContractFactoryData;
@@ -258,7 +269,7 @@ export const useContractStore = defineStore(store_name, {
 
  if (metadata && creationInfo) {
  this.trace('fetchContractUsingHyperion', 'returning verified contract', address, metadata, creationInfo);
- return resolve(this.createAndStoreVerifiedContract(label, addressLower, metadata, creationInfo, suspectedToken));
+ return resolve(await this.createAndStoreVerifiedContract(label, addressLower, metadata, creationInfo, suspectedToken));
  }
 
  const tokenContract = await this.createAndStoreContractFromTokenList(label, address, suspectedToken, creationInfo);
@@ -275,7 +286,7 @@ export const useContractStore = defineStore(store_name, {
 
  if (creationInfo) {
  this.trace('fetchContractUsingHyperion', 'returning empty contract', address, creationInfo);
- return resolve(this.createAndStoreEmptyContract(label, addressLower, creationInfo));
+ return resolve(await this.createAndStoreEmptyContract(label, addressLower, creationInfo));
  } else {
  // We mark this address as not existing so we don't query it again
  this.trace('fetchContractUsingHyperion', 'returning null', address);
@@ -417,10 +428,10 @@ export const useContractStore = defineStore(store_name, {
  metadata: EvmContractMetadata,
  creationInfo: EvmContractCreationInfo,
  suspectedType: string,
- ): Promise<EvmContract> {
+ ): Promise<EvmContract | null> {
  this.trace('createAndStoreVerifiedContract', label, address, [metadata], [creationInfo], suspectedType);
  const token = await this.getToken(label, address, suspectedType) ?? undefined;
- return this.createAndStoreContract(label, address, {
+ return await this.createAndStoreContract(label, address, {
  name: Object.values(metadata.settings?.compilationTarget ?? {})[0],
  address,
  abi: metadata.output?.abi,
@@ -442,9 +453,9 @@ export const useContractStore = defineStore(store_name, {
  label: string,
  address:string,
  creationInfo: EvmContractCreationInfo | null,
- ): Promise<EvmContract> {
+ ): Promise<EvmContract | null> {
  this.trace('createAndStoreEmptyContract', label, address, [creationInfo]);
- return this.createAndStoreContract(label, address, {
+ return await this.createAndStoreContract(label, address, {
  name: `0x${address.slice(0, 16)}...`,
  address,
  creationInfo,
@@ -513,7 +524,7 @@ export const useContractStore = defineStore(store_name, {
  },
 
  // commits -----
- createAndStoreContract(label: string, address: string, metadata: EvmContractFactoryData): EvmContract {
+ async createAndStoreContract(label: string, address: string, metadata: EvmContractFactoryData): Promise<EvmContract | null> {
  const network = useChainStore().getChain(label).settings.getNetwork();
  this.trace('createAndStoreContract', label, network, address, [metadata]);
  if (!address) {
@@ -522,6 +533,14 @@ export const useContractStore = defineStore(store_name, {
  if (!label) {
  throw new AntelopeError('antelope.contracts.error_label_required');
  }
+
+ const isContract = await this.addressIsContract(network, address);
+
+ if (!isContract) {
+ // address is an account, not a contract
+ return null;
+ }
+
  const index = address.toString().toLowerCase();
 
  // If:
@@ -557,10 +576,33 @@ export const useContractStore = defineStore(store_name, {
  const index = address.toString().toLowerCase();
  this.__contracts[network].cached[index] = null;
  },
+
+ async addressIsContract(network: string, address: string) {
+ const addressLower = address.toLowerCase();
+ if (!this.__accounts[network]) {
+ this.__accounts[network] = [];
+ }
+
+ if (this.__accounts[network].includes(addressLower)) {
+ return false;
+ }
+
+ const provider = await getAntelope().wallets.getWeb3Provider();
+ const code = await provider.getCode(address);
+
+ const isContract = code !== '0x';
+
+ if (!isContract && !this.__accounts[network].includes(addressLower)) {
+ this.__accounts[network].push(addressLower);
+ }
+
+ return isContract;
+ },
  },
 });
 
 const contractInitialState: ContractStoreState = {
  __contracts: {},
  __factory: new EvmContractFactory(),
+ __accounts: {},
 };

src/antelope/stores/nfts.ts

@@ -36,6 +36,10 @@ export interface NFTsCollection {
  contract: Address;
  list: Collectible[];
  loading: boolean;
+
+ // this is to prevent the scenario where we fetch a single NFT from a collection, add it to a contract's `list`
+ // and then in future checks we assume that the entire collection has been fetched (as we have at least one item in the list)
+ entireCollectionFetched: boolean;
 }
 
 export interface UserNftFilter {
@@ -220,14 +224,15 @@ export const useNftsStore = defineStore(store_name, {
 
  // If we already have a contract for that network and contract, we search for the NFT in that list first
  this.__contracts[network] = this.__contracts[network] || {};
- if (this.__contracts[network][contractLower]) {
- if (this.__contracts[network][contractLower].loading) {
- let waitCount = 0;
- while (this.__contracts[network][contractLower].loading && waitCount++ < 600) {
- await new Promise(resolve => setTimeout(resolve, 100));
- }
+
+ if (this.__contracts[network]?.[contractLower]?.loading) {
+ let waitCount = 0;
+ while (this.__contracts[network][contractLower].loading && waitCount++ < 600) {
+ await new Promise(resolve => setTimeout(resolve, 100));
  }
+ }
 
+ if (this.__contracts[network]?.[contractLower]?.entireCollectionFetched) {
  const nft = this.__contracts[network][contractLower].list.find(
  nft => nft.contractAddress.toLowerCase() === contract.toLowerCase() && nft.id === tokenId,
  );
@@ -239,6 +244,7 @@ export const useNftsStore = defineStore(store_name, {
  contract: contractLower,
  list: [],
  loading: false,
+ entireCollectionFetched: false,
  };
  }
 
@@ -289,13 +295,14 @@ export const useNftsStore = defineStore(store_name, {
  const chain = useChainStore().getChain(label);
  const network = chain.settings.getNetwork();
 
- if (this.__contracts[network] && this.__contracts[network][contractLower]) {
- if (this.__contracts[network][contractLower].loading) {
- let waitCount = 0;
- while (this.__contracts[network][contractLower].loading && waitCount++ < 600) {
- await new Promise(resolve => setTimeout(resolve, 100));
- }
+ if (this.__contracts[network]?.[contractLower]?.loading) {
+ let waitCount = 0;
+ while (this.__contracts[network][contractLower].loading && waitCount++ < 600) {
+ await new Promise(resolve => setTimeout(resolve, 100));
  }
+ }
+
+ if (this.__contracts[network]?.[contractLower]?.entireCollectionFetched) {
  return Promise.resolve(this.__contracts[network][contractLower].list);
  }
 
@@ -308,6 +315,7 @@ export const useNftsStore = defineStore(store_name, {
  contract,
  list: [],
  loading: true,
+ entireCollectionFetched: false,
  };
  }
 
@@ -317,6 +325,7 @@ export const useNftsStore = defineStore(store_name, {
  try {
  const nfts = await chain.settings.getNftsForCollection(contract, { limit: 10000 });
  this.__contracts[network][contractLower].list = nfts;
+ this.__contracts[network][contractLower].entireCollectionFetched = true;
 
  return nfts;
  } catch {

src/antelope/stores/utils/abi/erc20.ts

@@ -223,4 +223,29 @@ export const erc20Abi = [
  'name': 'Approval',
  'type': 'event',
  },
-] as EvmABI;
+] as EvmABI;
+
+export const erc20AbiApprove = [{
+ 'inputs': [
+ {
+ 'internalType': 'address',
+ 'name': 'spender',
+ 'type': 'address',
+ },
+ {
+ 'internalType': 'uint256',
+ 'name': 'amount',
+ 'type': 'uint256',
+ },
+ ],
+ 'name': 'approve',
+ 'outputs': [
+ {
+ 'internalType': 'bool',
+ 'name': '',
+ 'type': 'bool',
+ },
+ ],
+ 'stateMutability': 'nonpayable',
+ 'type': 'function',
+}] as EvmABI;

src/antelope/stores/utils/abi/erc721.ts

@@ -354,3 +354,16 @@ export const erc721Abi = [{
  'stateMutability': 'nonpayable',
  'type': 'function',
 }] as EvmABI;
+
+export const erc721ApproveAbi = [{
+ 'inputs': [{ 'internalType': 'address', 'name': 'to', 'type': 'address' }, {
+ 'internalType': 'uint256',
+ 'name': 'tokenId',
+ 'type': 'uint256',
+ }],
+ 'name': 'approve',
+ 'outputs': [],
+ 'stateMutability': 'nonpayable',
+ 'type': 'function',
+}] as unknown as EvmABI;
+

src/antelope/stores/utils/abi/setApprovalForAllAbi.ts

@@ -0,0 +1,13 @@
+import { EvmABI } from '.';
+
+export const setApprovalForAllAbi = [{
+ 'inputs': [{ 'internalType': 'address', 'name': 'operator', 'type': 'address' }, {
+ 'internalType': 'bool',
+ 'name': 'approved',
+ 'type': 'bool',
+ }],
+ 'name': 'setApprovalForAll',
+ 'outputs': [],
+ 'stateMutability': 'nonpayable',
+ 'type': 'function',
+}] as unknown as EvmABI;

src/antelope/types/IndexerTypes.ts

@@ -48,6 +48,7 @@ interface IndexerNftResult {
 // results from the /contract/{address}/nfts endpoint
 export interface IndexerCollectionNftResult extends IndexerNftResult {
  supply?: number; // present only for ERC1155
+ owner?: string; // present only for ERC721
 }
 
 // results from the /account/{address}/nfts endpoint
@@ -179,7 +180,7 @@ export interface IndexerErc721AllowanceResult extends IndexerAllowanceResult {
  approved: boolean; // whether the user has approved the spender
  operator: string; // address of the spender contract
 
- tokenId?: string; // only present if single === true
+ tokenId?: string | number; // only present if single === true
 }
 
 export interface IndexerErc1155AllowanceResult extends IndexerAllowanceResult {
@@ -209,15 +210,3 @@ export interface IndexerAllowanceResponseErc1155 {
 }
 
 export type IndexerAllowanceResponse = IndexerAllowanceResponseErc20 | IndexerAllowanceResponseErc721 | IndexerAllowanceResponseErc1155;
-
-export function isIndexerAllowanceResponseErc20(response: IndexerAllowanceResponse): response is IndexerAllowanceResponseErc20 {
- return (response as IndexerAllowanceResponseErc20).results.some(result => result.spender);
-}
-
-export function isIndexerAllowanceResponseErc721(response: IndexerAllowanceResponse): response is IndexerAllowanceResponseErc721 {
- return (response as IndexerAllowanceResponseErc721).results.some(result => result.hasOwnProperty('single') || result.hasOwnProperty('tokenId'));
-}
-
-export function isIndexerAllowanceResponseErc1155(response: IndexerAllowanceResponse): response is IndexerAllowanceResponseErc1155 {
- return !isIndexerAllowanceResponseErc20(response) && !isIndexerAllowanceResponseErc721(response);
-}