comment out erc721

dyne · Oct 12, 2023 · 4cb1f9d · 4cb1f9d
1 parent 2c51d5e
commit 4cb1f9d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/pkg/ethereum/src/plugins.ts b/pkg/ethereum/src/plugins.ts
@@ -7,7 +7,7 @@ import erc20Abi from '@slangroom/ethereum/erc20_abi';
 //const ERC721_ABI = require('./erc721_abi.json');
 //const ERC721_METADATA_ABI = require('./erc721_metadata_abi.json');
 
-const ERC721_TRANSFER_EVENT = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef';
+//const ERC721_TRANSFER_EVENT = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef';
 
 /**
  * @internal
@@ -83,20 +83,6 @@ export const execute = async (
 			throw new Error('Transaction failed');
 		}
 	}
-	const erc20_0 = new Map([
-		[EthereumRequestKind.Erc20Symbol, 'symbol()'],
-		[EthereumRequestKind.Erc20Decimals, 'decimals()'],
-		[EthereumRequestKind.Erc20Name, 'name()'],
-		[EthereumRequestKind.Erc20TotalSupply, 'totalSupply()'],
-	]);
-	if (erc20_0.has(kind)) {
-		const sc = ctx.fetch('sc') as string;
-		if (!web3.utils.isAddress(sc)) {
-			throw new Error(`Not an ethereum address ${sc}`);
-		}
-		const erc20 = new web3.eth.Contract(erc20Abi, sc);
-		return ctx.pass((await erc20.methods[erc20_0.get(kind) || '']?.().call()) || '');
-	}
 	/*if (kind === EthereumRequestKind.Erc20Balance) {
 		const sc = ctx.fetch("sc") as string;
 		//const address = ctx.fetch("address") as string;
@@ -107,7 +93,7 @@ export const execute = async (
 		console.log(erc20.methods['balanceOf']?.('ciccio'))
 
 		return ctx.pass(await erc20.methods?.["balanceOf"]?.()?.call() || "");
-	}*/
+	}
 	if (kind === EthereumRequestKind.Erc721Id) {
 		const tag = ctx.fetch('transaction_id') as string;
 		const receipt = await web3.eth.getTransactionReceipt(
@@ -121,6 +107,21 @@ export const execute = async (
 		}
 		return ctx.pass(parseInt(log.topics[3]?.toString() || '', 16));
 	}
+	*/
+	const erc20_0 = new Map([
+		[EthereumRequestKind.Erc20Symbol, 'symbol()'],
+		[EthereumRequestKind.Erc20Decimals, 'decimals()'],
+		[EthereumRequestKind.Erc20Name, 'name()'],
+		[EthereumRequestKind.Erc20TotalSupply, 'totalSupply()'],
+	]);
+	if (erc20_0.has(kind)) {
+		const sc = ctx.fetch('sc') as string;
+		if (!web3.utils.isAddress(sc)) {
+			throw new Error(`Not an ethereum address ${sc}`);
+		}
+		const erc20 = new web3.eth.Contract(erc20Abi, sc);
+		return ctx.pass((await erc20.methods[erc20_0.get(kind) || '']?.().call()) || '');
+	}
 	return ctx.fail('Should not be here');
 };
 

diff --git a/pkg/ethereum/test/e2e.ts b/pkg/ethereum/test/e2e.ts
@@ -2,7 +2,7 @@ import test from 'ava';
 import { Slangroom } from '@slangroom/core/slangroom';
 import { ethereumPlugins } from '@slangroom/ethereum';
 
-test.skip('Retrieve a zenroom object', async (t) => {
+test('Retrieve a zenroom object', async (t) => {
 	const script = `
 Rule caller restroom-mw
 Scenario ethereum