e2e: add baklava config for easier testing

e2e_test/js-tests/test_viem_tx.mjs

@@ -9,7 +9,14 @@ import { publicClient, walletClient } from "./viem_setup.mjs"
 async function getGasFees(publicClient, tip, feeCurrency) {
 	const rate = await getRate(feeCurrency);
 	const b = await publicClient.getBlock();
-	const tipInFeeCurrency = rate.toFeeCurrency(tip);
+	let tipInFeeCurrency = rate.toFeeCurrency(tip);
+	if (tipInFeeCurrency === 0n) {
+		// The tip must be at least native 1 wei for the tx to be included. No
+		// matter what the exchange rate for a fee currency is, if the fee currency
+		// tip is zero, we can't reach 1 wei if the fee currency tip is zero. So
+		// increase the tip to at least one.
+		tipInFeeCurrency = 1n;
+	}
 	return [rate.toFeeCurrency(b.baseFeePerGas) + tipInFeeCurrency, tipInFeeCurrency];
 }
 

e2e_test/js-tests/viem_setup.mjs

@@ -14,7 +14,17 @@ const devChain = defineChain({
 	...celoAlfajores,
 	id: 1337,
 	name: "local dev chain",
-	network: "dev",
+	rpcUrls: {
+		default: {
+			http: [process.env.ETH_RPC_URL],
+		},
+	},
+});
+
+const celoBaklava = defineChain({
+	...celoAlfajores,
+	id: 62320,
+	name: "baklava",
 	rpcUrls: {
 		default: {
 			http: [process.env.ETH_RPC_URL],
@@ -26,6 +36,8 @@ const chain = (() => {
 	switch (process.env.NETWORK) {
 		case 'alfajores':
 			return celoAlfajores
+		case 'baklava':
+			return celoBaklava
 		default:
 			return devChain
 	};

e2e_test/shared.sh

@@ -5,27 +5,40 @@ SCRIPT_DIR=$(readlink -f "$(dirname "$0")")
 export SCRIPT_DIR
 
 case $NETWORK in
+    # Get these values by querying the registry:
+    # for contract in GoldToken FeeHandler FeeCurrencyDirectory
+    #      cast call 0x000000000000000000000000000000000000ce10 "getAddressForStringOrDie(string calldata identifier) returns (address)" $contract
+    #  end
     alfajores)
       export ETH_RPC_URL=https://alfajores-forno.celo-testnet.org
       export TOKEN_ADDR=0xF194afDf50B03e69Bd7D057c1Aa9e10c9954E4C9
       export FEE_HANDLER=0xEAaFf71AB67B5d0eF34ba62Ea06Ac3d3E2dAAA38
       export FEE_CURRENCY=0x4822e58de6f5e485eF90df51C41CE01721331dC0
+      export FEE_CURRENCY_DIRECTORY_ADDR=0x9212Fb72ae65367A7c887eC4Ad9bE310BAC611BF
       echo "Using Alfajores network"
         ;;
+    baklava)
+      export ETH_RPC_URL=https://baklava-forno.celo-testnet.org
+      export TOKEN_ADDR=0xdDc9bE57f553fe75752D61606B94CBD7e0264eF8
+      export FEE_HANDLER=0xeed0A69c51079114C280f7b936C79e24bD94013e
+      export FEE_CURRENCY=0x62492A644A588FD904270BeD06ad52B9abfEA1aE
+      export FEE_CURRENCY_DIRECTORY_ADDR=0xD59E1599F45e42Eb356202B2C714D6C7b734C034
+      echo "Using Baklava network"
+        ;;
     '')
       export ETH_RPC_URL=http://127.0.0.1:8545
       export TOKEN_ADDR=0x471ece3750da237f93b8e339c536989b8978a438
       export FEE_HANDLER=0xcd437749e43a154c07f3553504c68fbfd56b8778
       export FEE_CURRENCY=0x000000000000000000000000000000000000ce16
-	  export FEE_CURRENCY2=0x000000000000000000000000000000000000ce17
+      export FEE_CURRENCY2=0x000000000000000000000000000000000000ce17
+      export FEE_CURRENCY_DIRECTORY_ADDR=0x9212Fb72ae65367A7c887eC4Ad9bE310BAC611BF
       echo "Using local network"
         ;;
 esac
 
 export ACC_ADDR=0x42cf1bbc38BaAA3c4898ce8790e21eD2738c6A4a
 export ACC_PRIVKEY=0x2771aff413cac48d9f8c114fabddd9195a2129f3c2c436caa07e27bb7f58ead5
 export REGISTRY_ADDR=0x000000000000000000000000000000000000ce10
-export FEE_CURRENCY_DIRECTORY_ADDR=0x9212Fb72ae65367A7c887eC4Ad9bE310BAC611BF
 export ORACLE3=0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0003
 
 export FIXIDITY_1=1000000000000000000000000

e2e_test/test_base_fee_recipient.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 #shellcheck disable=SC2086
 set -eo pipefail
-set -x
 
 source shared.sh
 
+set -x
 # Send token and check balance
 tx_json=$(cast send --json --private-key $ACC_PRIVKEY $TOKEN_ADDR 'transfer(address to, uint256 value) returns (bool)' 0x000000000000000000000000000000000000dEaD 100)
 block_number=$(echo $tx_json | jq -r '.blockNumber' | cast to-dec)