diff --git a/CLI.md b/CLI.md
index 35ee321a..1d3fbdb1 100644
--- a/CLI.md
+++ b/CLI.md
@@ -68,7 +68,7 @@ iexec wallet show # show your wallet
 iexec storage init # initialize your remote storage
 ```
 
-> _NB:_ iExec SDK CLI access the public blockchain (mainnet) through [ethers](https://github.com/ethers-io/ethers.js/) to connect different backends ([Alchemy](https://alchemyapi.io/), [Etherscan](https://etherscan.io/), [INFURA](https://infura.io/)).
+> _NB:_ iExec SDK CLI access the blockchain through [ethers](https://github.com/ethers-io/ethers.js/) to connect different backends ([Alchemy](https://alchemyapi.io/), [Etherscan](https://etherscan.io/), [INFURA](https://infura.io/)).
 >
 > Default API keys for backend services are provided for convenience.
 > As these keys are shared across all users and are subject to rate limits, **you must use your own API keys** or better **your own node**.
@@ -103,8 +103,7 @@ iexec storage init # initialize your remote storage
 >    "default": ...,
 >    "chains": {
 >       ...
->       "mainnet": {
->         "id": "1",
+>       "arbitrum-mainnet": {
 >         "host": "http://localhost:8545"
 >       }
 >    }
@@ -302,7 +301,6 @@ Commands:
 - [init](#iexec-init)
 - [iexec wallet](#iexec-wallet)
 - [iexec account](#iexec-account)
-- [iexec voucher](#iexec-voucher)
 - [iexec app](#iexec-app)
 - [iexec dataset](#iexec-dataset)
 - [iexec workerpool](#iexec-workerpool)
@@ -313,7 +311,6 @@ Commands:
 - [iexec task](#iexec-task)
 - [iexec storage](#iexec-storage)
 - [iexec result](#iexec-result)
-- [iexec ens](#iexec-ens)
 - [iexec category](#iexec-category)
 - [info](#iexec-info)
 
@@ -357,9 +354,6 @@ Commands:
 - [send-ether](#iexec-wallet-send-ether)
 - [send-RLC](#iexec-wallet-send-rlc)
 - [sweep](#iexec-wallet-sweep)
-- [bridge-to-sidechain](#iexec-wallet-bridge-to-sidechain)
-- [bridge-to-mainchain](#iexec-wallet-bridge-to-mainchain)
-- [sendRLC](#iexec-wallet-sendrlc)
 
 #### iexec wallet create
 
@@ -428,8 +422,6 @@ Options:
 
 #### iexec wallet send-ether
 
-_Alias: sendETH_
-
 send ether to an address (default unit ether)
 
 Usage:
@@ -449,7 +441,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --to \<address\> | receiver address |
@@ -475,7 +466,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --to \<address\> | receiver address |
@@ -501,83 +491,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
-| --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
-| --force | force perform action without prompting user |
-| --to \<address\> | receiver address |
-
-#### iexec wallet bridge-to-sidechain
-
-send RLC from the mainchain to the sidechain (default unit nRLC)
-
-Usage:
-
-```sh
-iexec wallet bridge-to-sidechain <amount> [unit] [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
-| --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
-| --force | force perform action without prompting user |
-
-#### iexec wallet bridge-to-mainchain
-
-send RLC from the sidechain to the mainchain (default unit nRLC)
-
-Usage:
-
-```sh
-iexec wallet bridge-to-mainchain <amount> [unit] [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
-| --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
-| --force | force perform action without prompting user |
-
-#### iexec wallet sendRLC
-
-\[DEPRECATED see send-RLC\] send RLC to an address (WARNING! default unit nRLC)
-
-Usage:
-
-```sh
-iexec wallet sendRLC <amount> [unit] [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --to \<address\> | receiver address |
@@ -622,7 +535,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec account withdraw
@@ -646,7 +558,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec account show
@@ -692,7 +603,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec account allowance
@@ -739,92 +649,8 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
-### iexec voucher
-
-manage iExec voucher
-
-Usage:
-
-```sh
-iexec voucher <command> [options]
-```
-
-Commands:
-
-- [show](#iexec-voucher-show)
-- [authorize](#iexec-voucher-authorize)
-- [revoke](#iexec-voucher-revoke)
-
-#### iexec voucher show
-
-show voucher iExec details
-
-Usage:
-
-```sh
-iexec voucher show [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-| --user \<address\> | custom user address |
-
-#### iexec voucher authorize
-
-authorize requester to use the voucher
-
-Usage:
-
-```sh
-iexec voucher authorize <requester> [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-
-#### iexec voucher revoke
-
-revoke authorization to use the voucher
-
-Usage:
-
-```sh
-iexec voucher revoke <requester> [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-
 ### iexec app
 
 manage iExec apps
@@ -869,8 +695,6 @@ Options:
 | --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --tee | use the Trusted Execution Environment template |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec app deploy
 
@@ -893,7 +717,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec app show
@@ -959,7 +782,6 @@ Options:
 | --raw | use raw output |
 | --quiet | stop prompting updates |
 | --chain \<name\> | chain name from "chain.json" |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec app push-secret
 
@@ -983,7 +805,6 @@ Options:
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
 | --secret-value \<secretValue\> | secret value (unsafe) |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec app publish
 
@@ -1060,7 +881,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --watch | watch execution status changes |
@@ -1071,15 +891,13 @@ Options:
 | --secret \<secretMapping...\> | specify the requester secrets mappings (\<appSecretKey\>=\<requesterSecretName\>) to use in the app (only available for TEE tasks, use with --tag tee)<br/>\* usage: <br/>  \* \[command\] \[args\] --secret 1=login 2=password<br/>  \* \[command\] \[args\] --secret 1=login --secret 2=password<br/>  \* \[command\] --secret 1=login --secret 2=password -- \[args\]<br/>\* please note that this option is variadic, any number of mappings can be passed, use `--` to stop the list<br/> |
 | --category \<id\> | id of the task category |
 | --tag \<tag\> | specify tags<br/>\* usage: --tag tag1,tag2 |
-| --storage-provider \<"ipfs"\|"dropbox"\> | specify the storage to use to store the result archive |
+| --storage-provider \<"dropbox"\|"ipfs"\> | specify the storage to use to store the result archive |
 | --callback \<address\> | specify the callback address of the request |
 | --encrypt-result | encrypt the result archive with the beneficiary public key (only available for TEE tasks, use with --tag tee) |
 | --trust \<integer\> | trust level |
 | --beneficiary \<address\> | specify the beneficiary of the request (default user address) |
 | --params \<json\> | specify the params of the request<br/>\* usage: --params '{"iexec\_args":"do stuff","iexec\_input\_files":\["https://example.com/file.zip"\]}' |
 | --skip-preflight-check | skip preflight check, this may result in task execution fail |
-| --use-voucher | use the voucher to cover the costs of matching orders |
-| --voucher-address \<voucherAddress\> | specify the voucher contract to use other than the owned voucher |
 
 #### iexec app request-execution
 
@@ -1114,7 +932,7 @@ Options:
 | --category \<id\> | id of the task category |
 | --tag \<tag\> | specify tags<br/>\* usage: --tag tag1,tag2 |
 | --volume \<volume\> | number of run |
-| --storage-provider \<"ipfs"\|"dropbox"\> | specify the storage to use to store the result archive |
+| --storage-provider \<"dropbox"\|"ipfs"\> | specify the storage to use to store the result archive |
 | --callback \<address\> | specify the callback address of the request |
 | --encrypt-result | encrypt the result archive with the beneficiary public key (only available for TEE tasks, use with --tag tee) |
 | --trust \<integer\> | trust level |
@@ -1143,7 +961,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --to \<address\> | receiver address |
@@ -1218,7 +1035,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec dataset show
@@ -1310,7 +1126,6 @@ Options:
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
 | --secret-path \<secretPath\> | push the secret from a file |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec dataset check-secret
 
@@ -1329,7 +1144,6 @@ Options:
 | --raw | use raw output |
 | --quiet | stop prompting updates |
 | --chain \<name\> | chain name from "chain.json" |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec dataset publish
 
@@ -1406,7 +1220,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --to \<address\> | receiver address |
@@ -1425,7 +1238,6 @@ Commands:
 
 - [init](#iexec-workerpool-init)
 - [deploy](#iexec-workerpool-deploy)
-- [set-api-url](#iexec-workerpool-set-api-url)
 - [show](#iexec-workerpool-show)
 - [count](#iexec-workerpool-count)
 - [publish](#iexec-workerpool-publish)
@@ -1474,31 +1286,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
-| --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
-
-#### iexec workerpool set-api-url
-
-declare the workerpool API URL on the blockchain
-
-Usage:
-
-```sh
-iexec workerpool set-api-url <apiUrl> [workerpoolAddress] [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec workerpool show
@@ -1623,7 +1410,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --to \<address\> | receiver address |
@@ -1665,7 +1451,6 @@ Options:
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
 | --secret-value \<secretValue\> | secret value (unsafe) |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec requester check-secret
 
@@ -1688,7 +1473,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 ### iexec order
 
@@ -1785,7 +1569,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --app \<orderHash\> | specify the app order from the marketplace to fill |
@@ -1794,8 +1577,6 @@ Options:
 | --request \<orderHash\> | specify the requestorder from the marketplace to fill |
 | --params \<json\> | specify the params of the request, existing request order will be ignored<br/>\* usage: --params '{"iexec\_args":"do stuff","iexec\_input\_files":\["https://example.com/file.zip"\]}' |
 | --skip-preflight-check | skip preflight check, this may result in task execution fail |
-| --use-voucher | use the voucher to cover the costs of matching orders |
-| --voucher-address \<voucherAddress\> | specify the voucher contract to use other than the owned voucher |
 
 #### iexec order publish
 
@@ -1873,7 +1654,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 | --force | force perform action without prompting user |
 | --app | cancel a signed apporder |
@@ -2095,7 +1875,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 ### iexec task
@@ -2185,7 +1964,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 ### iexec storage
@@ -2210,7 +1988,7 @@ initialize the remote storage
 Usage:
 
 ```sh
-iexec storage init [provider] [options]
+iexec storage init <provider> [options]
 ```
 
 Options:
@@ -2226,7 +2004,6 @@ Options:
 | --chain \<name\> | chain name from "chain.json" |
 | --force-update | update if already exists |
 | --token \<token\> | storage provider authorization token (unsafe) |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec storage check
 
@@ -2235,7 +2012,7 @@ check if the remote storage is initialized
 Usage:
 
 ```sh
-iexec storage check [provider] [options]
+iexec storage check <provider> [options]
 ```
 
 Options:
@@ -2250,7 +2027,6 @@ Options:
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
 | --user \<address\> | custom user address |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 ### iexec result
 
@@ -2343,7 +2119,6 @@ Options:
 | --chain \<name\> | chain name from "chain.json" |
 | --force-update | update if already exists |
 | --secret-path \<secretPath\> | push the secret from a file |
-| --tee-framework \<name\> | specify the TEE framework to use |
 
 #### iexec result check-encryption-key
 
@@ -2368,105 +2143,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --tee-framework \<name\> | specify the TEE framework to use |
-
-### iexec ens
-
-manage ENS names
-
-Usage:
-
-```sh
-iexec ens <command> [options]
-```
-
-Commands:
-
-- [resolve](#iexec-ens-resolve)
-- [lookup](#iexec-ens-lookup)
-- [get-owner](#iexec-ens-get-owner)
-- [register](#iexec-ens-register)
-
-#### iexec ens resolve
-
-resolve an ENS name to an address
-
-Usage:
-
-```sh
-iexec ens resolve <name> [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --chain \<name\> | chain name from "chain.json" |
-
-#### iexec ens lookup
-
-lookup for the ENS name of an address
-
-Usage:
-
-```sh
-iexec ens lookup <address> [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --chain \<name\> | chain name from "chain.json" |
-
-#### iexec ens get-owner
-
-find the the owner address of an ENS name
-
-Usage:
-
-```sh
-iexec ens get-owner <name> [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --chain \<name\> | chain name from "chain.json" |
-
-#### iexec ens register
-
-register an ENS if needed and setup both ENS resolution and reverse resolution
-
-Usage:
-
-```sh
-iexec ens register <label> [options]
-```
-
-Options:
-
-| option | description |
-| --- | --- |
-| --raw | use raw output |
-| --quiet | stop prompting updates |
-| --password \<password\> | password used to encrypt the wallet (unsafe) |
-| --wallet-file \<walletFileName\> | specify the name of the wallet file to use |
-| --wallet-address \<walletAddress\> | specify the address of the wallet to use |
-| --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
-| --chain \<name\> | chain name from "chain.json" |
-| --force | force perform action without prompting user |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
-| --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
-| --domain \<domain\> | use the specified ENS domain (default `users.iexec.eth`)<br/> - if the ENS name (label.domain) is not owned by the user, the domain must be controlled by a FIFS registrar<br/> - if the ENS name (label.domain) is already owned by the user, the registration will be skipped |
-| --for \<address\> | register for an owned iExec app, dataset or workerpool |
 
 ### iexec category
 
@@ -2523,7 +2199,6 @@ Options:
 | --wallet-address \<walletAddress\> | specify the address of the wallet to use |
 | --keystoredir \<path\> | specify the wallet directory \<"global"\|"local"\|custom\> |
 | --chain \<name\> | chain name from "chain.json" |
-| --gas-price \<amount unit...\> | set custom gas price for transactions (default unit wei) |
 | --confirms \<blockCount\> | set custom block count to wait for transactions confirmation (default 1 block) |
 
 #### iexec category show
@@ -2695,67 +2370,24 @@ The `chain.json` file, located in every iExec project, describes the parameters
 - `chains` set the available chains
   - optional key `host` set the url of the ethereum node used by the SDK cli on each chain (overwrite default value).
   - optional key `hub` set the address of the hub used by the SDK cli on each chain (overwrite default value).
-  - optional key `sms` set the url of the Secret Management Service used by the SDK cli on each chain (overwrite default value), this key accepts a string or a mapping TEE framework - SMS url.
-  - optional key `resultProxy` set the url of the Result Proxy used by the SDK cli on each chain (overwrite default value).
+  - optional key `sms` set the url of the Secret Management Service used by the SDK cli on each chain (overwrite default value).
   - optional key `iexecGateway` set the url of the iexec marketplace gateway used by the SDK cli on each chain (overwrite default value).
   - optional key `ipfsGateway` set the url of the IPFS gateway used by the SDK cli on each chain (overwrite default value).
   - optional key `pocoSubgraph` set the url of the PoCo subgraph used by the SDK cli on each chain (overwrite default value).
-  - optional key `voucherSubgraph` set the url of the voucher subgraph used by the SDK cli on each chain (overwrite default value).
-  - optional key `bridge` set the bridge used by the SDK cli when working with bridged networks (sidechain). `bridge.contract` set the address of the RLC bridge on the chain, `bridge.bridgedChainName` set the reference to the bridged network.
-  - optional key `voucherHub` set the address of the voucher hub contract used by the SDK cli on each chain (overwrite default value).
-  - optional key `native` specify whether or not the chain native token is RLC (overwrite default value: chain value or `false`).
-  - optional key `useGas` specify whether or not the chain requires to spend gas to send a transaction (overwrite default value: chain value or `true`).
-- optional key `providers` set the backends for public chains
-  - optional key `alchemy` set Alchemy API Token
-  - optional key `etherscan` set Etherscan API Token
-  - optional key `infura` set INFURA Project ID or ProjectID and Project Secret
-  - optional key `quorum` set minimum number of backends that must agree before forwarding blockchain responses
 
 ```json
 {
-  "default": "bellecour",
+  "default": "arbitrum-sepolia-testnet",
   "chains": {
     "dev": {
       "host": "http://localhost:8545",
       "id": "65535",
-      "sms": {
-        "scone": "http://localhost:5000"
-      },
-      "resultProxy": "http://localhost:8089",
+      "sms": "http://localhost:5000",
       "ipfsGateway": "http://localhost:8080",
-      "hub": "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca",
-      "bridge": {
-        "contract": "0x1e32aFA55854B6c015D284E3ccA9aA5a463A1418",
-        "bridgedChainName": "dev-sidechain"
-      }
-    },
-    "dev-sidechain": {
-      "host": "http://localhost:18545",
-      "id": "123456",
-      "sms": {
-        "scone": "http://localhost:15000"
-      },
-      "resultProxy": "http://localhost:18089",
-      "ipfsGateway": "http://localhost:18080",
-      "native": true,
-      "useGas": false,
-      "hub": "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca",
-      "bridge": {
-        "contract": "0x1e32aFA55854B6c015D284E3ccA9aA5a463A1418",
-        "bridgedChainName": "development"
-      }
-    },
-    "mainnet": {},
-    "bellecour": {}
-  },
-  "providers": {
-    "alchemy": "ALCHEMY_API_KEY",
-    "etherscan": "ETHERSCAN_API_KEY",
-    "infura": {
-      "projectId": "INFURA_PROJECT_ID",
-      "projectSecret": "INFURA_PROJECT_SECRET"
+      "hub": "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca"
     },
-    "quorum": 1
+    "arbitrum-sepolia-testnet": {},
+    "arbitrum-mainnet": {}
   }
 }
 ```
diff --git a/cli_template.md b/cli_template.md
index fcedaea2..f3e12bf4 100644
--- a/cli_template.md
+++ b/cli_template.md
@@ -68,7 +68,7 @@ iexec wallet show # show your wallet
 iexec storage init # initialize your remote storage
 ```
 
-> _NB:_ iExec SDK CLI access the public blockchain (mainnet) through [ethers](https://github.com/ethers-io/ethers.js/) to connect different backends ([Alchemy](https://alchemyapi.io/), [Etherscan](https://etherscan.io/), [INFURA](https://infura.io/)).
+> _NB:_ iExec SDK CLI access the blockchain through [ethers](https://github.com/ethers-io/ethers.js/) to connect different backends ([Alchemy](https://alchemyapi.io/), [Etherscan](https://etherscan.io/), [INFURA](https://infura.io/)).
 >
 > Default API keys for backend services are provided for convenience.
 > As these keys are shared across all users and are subject to rate limits, **you must use your own API keys** or better **your own node**.
@@ -103,8 +103,7 @@ iexec storage init # initialize your remote storage
 >    "default": ...,
 >    "chains": {
 >       ...
->       "mainnet": {
->         "id": "1",
+>       "arbitrum-mainnet": {
 >         "host": "http://localhost:8545"
 >       }
 >    }
@@ -396,67 +395,24 @@ The `chain.json` file, located in every iExec project, describes the parameters
 - `chains` set the available chains
   - optional key `host` set the url of the ethereum node used by the SDK cli on each chain (overwrite default value).
   - optional key `hub` set the address of the hub used by the SDK cli on each chain (overwrite default value).
-  - optional key `sms` set the url of the Secret Management Service used by the SDK cli on each chain (overwrite default value), this key accepts a string or a mapping TEE framework - SMS url.
-  - optional key `resultProxy` set the url of the Result Proxy used by the SDK cli on each chain (overwrite default value).
+  - optional key `sms` set the url of the Secret Management Service used by the SDK cli on each chain (overwrite default value).
   - optional key `iexecGateway` set the url of the iexec marketplace gateway used by the SDK cli on each chain (overwrite default value).
   - optional key `ipfsGateway` set the url of the IPFS gateway used by the SDK cli on each chain (overwrite default value).
   - optional key `pocoSubgraph` set the url of the PoCo subgraph used by the SDK cli on each chain (overwrite default value).
-  - optional key `voucherSubgraph` set the url of the voucher subgraph used by the SDK cli on each chain (overwrite default value).
-  - optional key `bridge` set the bridge used by the SDK cli when working with bridged networks (sidechain). `bridge.contract` set the address of the RLC bridge on the chain, `bridge.bridgedChainName` set the reference to the bridged network.
-  - optional key `voucherHub` set the address of the voucher hub contract used by the SDK cli on each chain (overwrite default value).
-  - optional key `native` specify whether or not the chain native token is RLC (overwrite default value: chain value or `false`).
-  - optional key `useGas` specify whether or not the chain requires to spend gas to send a transaction (overwrite default value: chain value or `true`).
-- optional key `providers` set the backends for public chains
-  - optional key `alchemy` set Alchemy API Token
-  - optional key `etherscan` set Etherscan API Token
-  - optional key `infura` set INFURA Project ID or ProjectID and Project Secret
-  - optional key `quorum` set minimum number of backends that must agree before forwarding blockchain responses
 
 ```json
 {
-  "default": "bellecour",
+  "default": "arbitrum-sepolia-testnet",
   "chains": {
     "dev": {
       "host": "http://localhost:8545",
       "id": "65535",
-      "sms": {
-        "scone": "http://localhost:5000"
-      },
-      "resultProxy": "http://localhost:8089",
+      "sms": "http://localhost:5000",
       "ipfsGateway": "http://localhost:8080",
-      "hub": "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca",
-      "bridge": {
-        "contract": "0x1e32aFA55854B6c015D284E3ccA9aA5a463A1418",
-        "bridgedChainName": "dev-sidechain"
-      }
+      "hub": "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca"
     },
-    "dev-sidechain": {
-      "host": "http://localhost:18545",
-      "id": "123456",
-      "sms": {
-        "scone": "http://localhost:15000"
-      },
-      "resultProxy": "http://localhost:18089",
-      "ipfsGateway": "http://localhost:18080",
-      "native": true,
-      "useGas": false,
-      "hub": "0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca",
-      "bridge": {
-        "contract": "0x1e32aFA55854B6c015D284E3ccA9aA5a463A1418",
-        "bridgedChainName": "development"
-      }
-    },
-    "mainnet": {},
-    "bellecour": {}
-  },
-  "providers": {
-    "alchemy": "ALCHEMY_API_KEY",
-    "etherscan": "ETHERSCAN_API_KEY",
-    "infura": {
-      "projectId": "INFURA_PROJECT_ID",
-      "projectSecret": "INFURA_PROJECT_SECRET"
-    },
-    "quorum": 1
+    "arbitrum-sepolia-testnet": {},
+    "arbitrum-mainnet": {}
   }
 }
 ```
diff --git a/docs/-internal-/README.md b/docs/-internal-/README.md
index 924452f6..e24f2964 100644
--- a/docs/-internal-/README.md
+++ b/docs/-internal-/README.md
@@ -8,9 +8,7 @@
 
 ## Classes
 
-- [BridgeObservable](classes/BridgeObservable.md)
 - [DealObservable](classes/DealObservable.md)
-- [ENSConfigurationObservable](classes/ENSConfigurationObservable.md)
 - [IExecContractsClient](classes/IExecContractsClient.md)
 - [TaskObservable](classes/TaskObservable.md)
 
@@ -27,7 +25,6 @@
 - [Dataset](interfaces/Dataset.md)
 - [DatasetDeploymentArgs](interfaces/DatasetDeploymentArgs.md)
 - [DatasetorderTemplate](interfaces/DatasetorderTemplate.md)
-- [GramineMREnclave](interfaces/GramineMREnclave.md)
 - [HashableApporder](interfaces/HashableApporder.md)
 - [HashableDatasetorder](interfaces/HashableDatasetorder.md)
 - [HashableRequestorder](interfaces/HashableRequestorder.md)
@@ -40,7 +37,6 @@
 - [PublishedWorkerpoolorder](interfaces/PublishedWorkerpoolorder.md)
 - [RequestorderParams](interfaces/RequestorderParams.md)
 - [RequestorderTemplate](interfaces/RequestorderTemplate.md)
-- [SconeMREnclave](interfaces/SconeMREnclave.md)
 - [SignableApporder](interfaces/SignableApporder.md)
 - [SignableDatasetorder](interfaces/SignableDatasetorder.md)
 - [SignableRequestorder](interfaces/SignableRequestorder.md)
@@ -50,7 +46,6 @@
 - [SignedRequestorder](interfaces/SignedRequestorder.md)
 - [SignedWorkerpoolorder](interfaces/SignedWorkerpoolorder.md)
 - [Task](interfaces/Task.md)
-- [VoucherInfo](interfaces/VoucherInfo.md)
 - [Workerpool](interfaces/Workerpool.md)
 - [WorkerpoolDeploymentArgs](interfaces/WorkerpoolDeploymentArgs.md)
 - [WorkerpoolorderTemplate](interfaces/WorkerpoolorderTemplate.md)
diff --git a/docs/-internal-/classes/BridgeObservable.md b/docs/-internal-/classes/BridgeObservable.md
deleted file mode 100644
index 2d91065e..00000000
--- a/docs/-internal-/classes/BridgeObservable.md
+++ /dev/null
@@ -1,97 +0,0 @@
-[**iexec**](../../README.md)
-
-***
-
-[iexec](../../globals.md) / [\<internal\>](../README.md) / BridgeObservable
-
-# Class: BridgeObservable
-
-## Extends
-
-- [`Observable`](../../classes/Observable.md)
-
-## Constructors
-
-### Constructor
-
-> **new BridgeObservable**(): `BridgeObservable`
-
-#### Returns
-
-`BridgeObservable`
-
-#### Inherited from
-
-[`Observable`](../../classes/Observable.md).[`constructor`](../../classes/Observable.md#constructor)
-
-## Methods
-
-### subscribe()
-
-> **subscribe**(`callbacks`): () => `void`
-
-subscribe and start the bridge process to transfer tokens from one chain to another until either `complete()` or `error(error: Error)` is called on the Observer or the subscribtion is canceled by calling the returned cancel method.
-
-return the `cancel: () => void` method.
-
-data:
-| message | comment | additional entries |
-| --- | --- | --- |
-| `CHECK_BRIDGE_POLICY` | sent once | |
-| `BRIDGE_POLICY_CHECKED` | sent once | `minPerTx`,`maxPerTx`,`dailyLimit` |
-| `CHECK_BRIDGE_LIMIT` | sent once |  |
-| `BRIDGE_LIMIT_CHECKED` | sent once | `totalSpentPerDay` |
-| `SEND_TO_BRIDGE_TX_REQUEST` | sent once | `bridgeAddress` |
-| `SEND_TO_BRIDGE_TX_SUCCESS` | sent once | `txHash` |
-| `WAIT_RECEIVE_TX` | sent once if the bridged chain is configured | `bridgeAddress` |
-| `RECEIVE_TX_SUCCESS` | sent once if the bridged chain is configured | `txHash` |
-
-#### Parameters
-
-##### callbacks
-
-###### complete?
-
-() => `any`
-
-callback fired once when the bridge process is completed
-
-no other callback is fired after firing `complete()`
-
-###### error?
-
-(`error`) => `any`
-
-callback fired once when an error occurs
-
-no other callback is fired after firing `error(error: Error)`
-
-###### next?
-
-(`data`) => `any`
-
-callback fired at every configuration step
-
-data:
-| message | comment | additional entries |
-| --- | --- | --- |
-| `CHECK_BRIDGE_POLICY` | sent once | |
-| `BRIDGE_POLICY_CHECKED` | sent once | `minPerTx`,`maxPerTx`,`dailyLimit` |
-| `CHECK_BRIDGE_LIMIT` | sent once |  |
-| `BRIDGE_LIMIT_CHECKED` | sent once | `totalSpentPerDay` |
-| `SEND_TO_BRIDGE_TX_REQUEST` | sent once | `bridgeAddress` |
-| `SEND_TO_BRIDGE_TX_SUCCESS` | sent once | `txHash` |
-| `WAIT_RECEIVE_TX` | sent once if the bridged chain is configured | `bridgeAddress` |
-| `RECEIVE_TX_SUCCESS` | sent once if the bridged chain is configured | `txHash` |
-
-#### Returns
-
-> (): `void`
-
-##### Returns
-
-`void`
-
-#### Overrides
-
-[`Observable`](../../classes/Observable.md).[`subscribe`](../../classes/Observable.md#subscribe)
diff --git a/docs/-internal-/classes/ENSConfigurationObservable.md b/docs/-internal-/classes/ENSConfigurationObservable.md
deleted file mode 100644
index 7df6c5f9..00000000
--- a/docs/-internal-/classes/ENSConfigurationObservable.md
+++ /dev/null
@@ -1,101 +0,0 @@
-[**iexec**](../../README.md)
-
-***
-
-[iexec](../../globals.md) / [\<internal\>](../README.md) / ENSConfigurationObservable
-
-# Class: ENSConfigurationObservable
-
-## Extends
-
-- [`Observable`](../../classes/Observable.md)
-
-## Constructors
-
-### Constructor
-
-> **new ENSConfigurationObservable**(): `ENSConfigurationObservable`
-
-#### Returns
-
-`ENSConfigurationObservable`
-
-#### Inherited from
-
-[`Observable`](../../classes/Observable.md).[`constructor`](../../classes/Observable.md#constructor)
-
-## Methods
-
-### subscribe()
-
-> **subscribe**(`callbacks`): () => `void`
-
-subscribe and start the ENS configuration process until either `complete()` or `error(error: Error)` is called on the Observer or the subscribtion is canceled by calling the returned cancel method.
-
-return the `cancel: () => void` method.
-
-data:
-| message | comment | additional entries |
-| --- | --- | --- |
-| `DESCRIBE_WORKFLOW` | sent once | `addressType`,`steps` |
-| `SET_RESOLVER_TX_REQUEST` | sent once if resolver is not set | `name`,`resolverAddress` |
-| `SET_RESOLVER_TX_SENT` | sent once if resolver is not set | `txHash` |
-| `SET_RESOLVER_SUCCESS` | sent once | `name`,`resolverAddress` |
-| `SET_ADDR_TX_REQUEST` | sent once if addr is not set | `name`,`address` |
-| `SET_ADDR_TX_SENT` | sent once if addr is not set | `txHash` |
-| `SET_ADDR_SUCCESS` | sent once | `name`,`address` |
-| `SET_NAME_TX_REQUEST` | sent once if the name is not set | `name`,`address` |
-| `SET_NAME_TX_SENT` | sent once if the name is not set | `txHash` |
-| `SET_NAME_SUCCESS` | sent once | `name`,`address` |
-
-#### Parameters
-
-##### callbacks
-
-###### complete?
-
-() => `any`
-
-callback fired once when the configuration is completed
-
-no other callback is fired after firing `complete()`
-
-###### error?
-
-(`error`) => `any`
-
-callback fired once when an error occurs
-
-no other callback is fired after firing `error(error: Error)`
-
-###### next?
-
-(`data`) => `any`
-
-callback fired at every configuration step
-
-data:
-| message | comment | additional entries |
-| --- | --- | --- |
-| `DESCRIBE_WORKFLOW` | sent once | `addressType`,`steps` |
-| `SET_RESOLVER_TX_REQUEST` | sent once if resolver is not set | `name`,`resolverAddress` |
-| `SET_RESOLVER_TX_SENT` | sent once if resolver is not set | `txHash` |
-| `SET_RESOLVER_SUCCESS` | sent once | `name`,`resolverAddress` |
-| `SET_ADDR_TX_REQUEST` | sent once if addr is not set | `name`,`address` |
-| `SET_ADDR_TX_SENT` | sent once if addr is not set | `txHash` |
-| `SET_ADDR_SUCCESS` | sent once | `name`,`address` |
-| `SET_NAME_TX_REQUEST` | sent once if the name is not set | `name`,`address` |
-| `SET_NAME_TX_SENT` | sent once if the name is not set | `txHash` |
-| `SET_NAME_SUCCESS` | sent once | `name`,`address` |
-
-#### Returns
-
-> (): `void`
-
-##### Returns
-
-`void`
-
-#### Overrides
-
-[`Observable`](../../classes/Observable.md).[`subscribe`](../../classes/Observable.md#subscribe)
diff --git a/docs/-internal-/classes/IExecContractsClient.md b/docs/-internal-/classes/IExecContractsClient.md
index 515aa7a6..e84f6d92 100644
--- a/docs/-internal-/classes/IExecContractsClient.md
+++ b/docs/-internal-/classes/IExecContractsClient.md
@@ -36,12 +36,6 @@ number of block to wait for transactions confirmation (default 1)
 
 IExec contract address
 
-###### isNative?
-
-`boolean`
-
-true if IExec contract use the chain native token
-
 ###### provider
 
 `Provider`
@@ -54,12 +48,6 @@ ethers Provider
 
 ethers Signer, required to sign transactions and messages
 
-###### useGas?
-
-`boolean`
-
-if false set the gasPrice to 0 (default true)
-
 #### Returns
 
 `IExecContractsClient`
@@ -90,14 +78,6 @@ current IExec contract address
 
 ***
 
-### isNative
-
-> **isNative**: `string`
-
-true if current instance use native token
-
-***
-
 ### pocoVersion
 
 > **pocoVersion**: `string`
@@ -120,20 +100,6 @@ current Provider
 
 current Signer
 
-***
-
-### txOptions
-
-> **txOptions**: `object`
-
-transaction options
-
-#### gasPrice?
-
-> `optional` **gasPrice**: `bigint`
-
-gasPrice override
-
 ## Methods
 
 ### fetchRegistryAddress()
@@ -176,7 +142,7 @@ fetch the IExec registry Contract instance of specified resource
 
 > **fetchTokenAddress**(`resourceName`): `Promise`\<`string`\>
 
-fetch the IExec token contract address, not available when isNative is true
+fetch the IExec token contract address
 
 #### Parameters
 
@@ -194,7 +160,7 @@ fetch the IExec token contract address, not available when isNative is true
 
 > `optional` **fetchTokenContract**(`resourceName`): `Promise`\<`Contract`\>
 
-fetch the IExec token Contract instance, not available when isNative is true
+fetch the IExec token Contract instance
 
 #### Parameters
 
diff --git a/docs/-internal-/interfaces/App.md b/docs/-internal-/interfaces/App.md
index 465a43b0..3af113f7 100644
--- a/docs/-internal-/interfaces/App.md
+++ b/docs/-internal-/interfaces/App.md
@@ -22,7 +22,7 @@ app image digest
 
 > **appMREnclave**: `string`
 
-for TEE apps only, specify the TEE protocol to use
+used for legacy TEE apps only, should be an empty string for modern TEE apps
 
 ***
 
diff --git a/docs/-internal-/interfaces/AppDeploymentArgs.md b/docs/-internal-/interfaces/AppDeploymentArgs.md
index 5f66a17a..f017ae3c 100644
--- a/docs/-internal-/interfaces/AppDeploymentArgs.md
+++ b/docs/-internal-/interfaces/AppDeploymentArgs.md
@@ -16,11 +16,13 @@ app image digest
 
 ***
 
-### mrenclave?
+### ~~mrenclave?~~
 
-> `optional` **mrenclave**: [`SconeMREnclave`](SconeMREnclave.md) \| [`GramineMREnclave`](GramineMREnclave.md)
+> `optional` **mrenclave**: `string`
 
-optional for TEE apps only, specify the TEE protocol to use
+#### Deprecated
+
+used for legacy TEE apps only, should not be set for modern TEE apps
 
 ***
 
diff --git a/docs/-internal-/interfaces/GramineMREnclave.md b/docs/-internal-/interfaces/GramineMREnclave.md
deleted file mode 100644
index efed3554..00000000
--- a/docs/-internal-/interfaces/GramineMREnclave.md
+++ /dev/null
@@ -1,31 +0,0 @@
-[**iexec**](../../README.md)
-
-***
-
-[iexec](../../globals.md) / [\<internal\>](../README.md) / GramineMREnclave
-
-# Interface: GramineMREnclave
-
-## Properties
-
-### fingerprint
-
-> **fingerprint**: `string`
-
-app tee fingerprint
-
-***
-
-### framework
-
-> **framework**: `string`
-
-TEE framework name 'GRAMINE'
-
-***
-
-### version
-
-> **version**: `string`
-
-framework's protocol version
diff --git a/docs/-internal-/interfaces/RequestorderParams.md b/docs/-internal-/interfaces/RequestorderParams.md
index 373a31fa..412793ab 100644
--- a/docs/-internal-/interfaces/RequestorderParams.md
+++ b/docs/-internal-/interfaces/RequestorderParams.md
@@ -58,14 +58,6 @@ default `'ipfs'`
 
 ***
 
-### iexec\_result\_storage\_proxy?
-
-> `optional` **iexec\_result\_storage\_proxy**: `string`
-
-result proxy url
-
-***
-
 ### iexec\_secrets?
 
 > `optional` **iexec\_secrets**: `Record`\<`number`, `string`\>
diff --git a/docs/-internal-/interfaces/SconeMREnclave.md b/docs/-internal-/interfaces/SconeMREnclave.md
deleted file mode 100644
index 6588adcd..00000000
--- a/docs/-internal-/interfaces/SconeMREnclave.md
+++ /dev/null
@@ -1,47 +0,0 @@
-[**iexec**](../../README.md)
-
-***
-
-[iexec](../../globals.md) / [\<internal\>](../README.md) / SconeMREnclave
-
-# Interface: SconeMREnclave
-
-## Properties
-
-### entrypoint
-
-> **entrypoint**: `string`
-
-app entrypoint path
-
-***
-
-### fingerprint
-
-> **fingerprint**: `string`
-
-app tee fingerprint
-
-***
-
-### framework
-
-> **framework**: `string`
-
-TEE framework name 'SCONE'
-
-***
-
-### heapSize
-
-> **heapSize**: `number`
-
-dedicated memory in bytes
-
-***
-
-### version
-
-> **version**: `string`
-
-framework's protocol version
diff --git a/docs/-internal-/interfaces/VoucherInfo.md b/docs/-internal-/interfaces/VoucherInfo.md
deleted file mode 100644
index 348da80b..00000000
--- a/docs/-internal-/interfaces/VoucherInfo.md
+++ /dev/null
@@ -1,67 +0,0 @@
-[**iexec**](../../README.md)
-
-***
-
-[iexec](../../globals.md) / [\<internal\>](../README.md) / VoucherInfo
-
-# Interface: VoucherInfo
-
-## Properties
-
-### address
-
-> **address**: `string`
-
-***
-
-### allowanceAmount
-
-> **allowanceAmount**: [`BN`](../../interfaces/BN.md)
-
-***
-
-### authorizedAccounts
-
-> **authorizedAccounts**: `string`[]
-
-***
-
-### balance
-
-> **balance**: [`BN`](../../interfaces/BN.md)
-
-***
-
-### expirationTimestamp
-
-> **expirationTimestamp**: [`BN`](../../interfaces/BN.md)
-
-***
-
-### owner
-
-> **owner**: `string`
-
-***
-
-### sponsoredApps
-
-> **sponsoredApps**: `string`[]
-
-***
-
-### sponsoredDatasets
-
-> **sponsoredDatasets**: `string`[]
-
-***
-
-### sponsoredWorkerpools
-
-> **sponsoredWorkerpools**: `string`[]
-
-***
-
-### type
-
-> **type**: [`BN`](../../interfaces/BN.md)
diff --git a/docs/README.md b/docs/README.md
index 402eb8df..831377a0 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -75,7 +75,6 @@ Additionally the [IExec](./classes/IExec.md) module exposes all the following li
 - [IExecAppModule](./classes/IExecAppModule.md) exposes **app** methods
 - [IExecDatasetModule](./classes/IExecDatasetModule.md) exposes **dataset** methods
 - [IExecDealModule](./classes/IExecDealModule.md) exposes **deal** methods
-- [IExecENSModule](./classes/IExecENSModule.md) exposes **ENS** methods
 - [IExecHubModule](./classes/IExecHubModule.md) exposes **hub** methods
 - [IExecNetworkModule](./classes/IExecNetworkModule.md) exposes **network** methods
 - [IExecOrderModule](./classes/IExecOrderModule.md) exposes **order** methods
@@ -84,7 +83,6 @@ Additionally the [IExec](./classes/IExec.md) module exposes all the following li
 - [IExecSecretsModule](./classes/IExecSecretsModule.md) exposes **secrets** methods
 - [IExecStorageModule](./classes/IExecStorageModule.md) exposes **storage** methods
 - [IExecTaskModule](./classes/IExecTaskModule.md) exposes **task** methods
-- [IExecVoucherModule](./classes/IExecVoucherModule.md) exposes **voucher** methods
 - [IExecWalletModule](./classes/IExecWalletModule.md) exposes **wallet** methods
 - [IExecWorkerpoolModule](./classes/IExecWorkerpoolModule.md) exposes **workerpool** methods
 
diff --git a/docs/classes/EnhancedWallet.md b/docs/classes/EnhancedWallet.md
deleted file mode 100644
index 29a7e855..00000000
--- a/docs/classes/EnhancedWallet.md
+++ /dev/null
@@ -1,45 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / EnhancedWallet
-
-# Class: EnhancedWallet
-
-## Extends
-
-- `Wallet`
-
-## Constructors
-
-### Constructor
-
-> **new EnhancedWallet**(`privateKey`, `provider?`, `options?`): `EnhancedWallet`
-
-#### Parameters
-
-##### privateKey
-
-`string` | `SigningKey`
-
-##### provider?
-
-`Provider`
-
-##### options?
-
-###### gasPrice?
-
-`string`
-
-###### getTransactionCount?
-
-(`blockTag?`) => `Promise`\<`number`\>
-
-#### Returns
-
-`EnhancedWallet`
-
-#### Overrides
-
-`Wallet.constructor`
diff --git a/docs/classes/IExec.md b/docs/classes/IExec.md
index 94ba6e6b..86f9af82 100644
--- a/docs/classes/IExec.md
+++ b/docs/classes/IExec.md
@@ -84,14 +84,6 @@ deal module
 
 ***
 
-### ens
-
-> **ens**: [`IExecENSModule`](IExecENSModule.md)
-
-ens module
-
-***
-
 ### hub
 
 > **hub**: [`IExecHubModule`](IExecHubModule.md)
@@ -156,14 +148,6 @@ task module
 
 ***
 
-### voucher
-
-> **voucher**: [`IExecVoucherModule`](IExecVoucherModule.md)
-
-voucher module
-
-***
-
 ### wallet
 
 > **wallet**: [`IExecWalletModule`](IExecWalletModule.md)
diff --git a/docs/classes/IExecAccountModule.md b/docs/classes/IExecAccountModule.md
index aaca2713..4abe39ec 100644
--- a/docs/classes/IExecAccountModule.md
+++ b/docs/classes/IExecAccountModule.md
@@ -135,30 +135,6 @@ console.log('Nano RLC locked:', balance.locked.toString());
 
 ***
 
-### checkBridgedBalance()
-
-> **checkBridgedBalance**(`address`): `Promise`\<\{ `locked`: [`BN`](../interfaces/BN.md); `stake`: [`BN`](../interfaces/BN.md); \}\>
-
-check the account balance on bridged chain of specified address ie: when connected to mainnet, check the account ballance on bellecour
-example:
-```js
-const balance = await checkBridgedBalance(ethAddress);
-console.log('Nano RLC staked:', balance.stake.toString());
-console.log('Nano RLC locked:', balance.locked.toString());
-```
-
-#### Parameters
-
-##### address
-
-`string`
-
-#### Returns
-
-`Promise`\<\{ `locked`: [`BN`](../interfaces/BN.md); `stake`: [`BN`](../interfaces/BN.md); \}\>
-
-***
-
 ### deposit()
 
 > **deposit**(`amount`): `Promise`\<\{ `amount`: [`BN`](../interfaces/BN.md); `txHash`: `string`; \}\>
diff --git a/docs/classes/IExecAppModule.md b/docs/classes/IExecAppModule.md
index 594ecc24..f8d39a8e 100644
--- a/docs/classes/IExecAppModule.md
+++ b/docs/classes/IExecAppModule.md
@@ -54,7 +54,7 @@ current IExecConfig
 
 ### checkAppSecretExists()
 
-> **checkAppSecretExists**(`appAddress`, `options?`): `Promise`\<`boolean`\>
+> **checkAppSecretExists**(`appAddress`): `Promise`\<`boolean`\>
 
 check if a secret exists for the app in the Secret Management Service
 
@@ -72,12 +72,6 @@ _NB_:
 
 `string`
 
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`boolean`\>
@@ -196,7 +190,7 @@ console.log('address', address);
 
 ### pushAppSecret()
 
-> **pushAppSecret**(`appAddress`, `secretValue`, `options?`): `Promise`\<`boolean`\>
+> **pushAppSecret**(`appAddress`, `secretValue`): `Promise`\<`boolean`\>
 
 **SIGNER REQUIRED, ONLY APP OWNER**
 
@@ -223,12 +217,6 @@ console.log('pushed App secret:', isPushed);
 
 `String`
 
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`boolean`\>
diff --git a/docs/classes/IExecConfig.md b/docs/classes/IExecConfig.md
index 16e6882b..f15aee03 100644
--- a/docs/classes/IExecConfig.md
+++ b/docs/classes/IExecConfig.md
@@ -41,7 +41,7 @@ const config = new IExecConfig({ ethProvider: window.ethereum });
 
 ```js
 import { getSignerFromPrivateKey } from 'iexec/utils';
-const config = new IExecConfig({ ethProvider: getSignerFromPrivateKey('mainnet', privateKey) });
+const config = new IExecConfig({ ethProvider: getSignerFromPrivateKey('arbitrum-sepolia-testnet', privateKey) });
 ```
 
 #### Parameters
@@ -60,42 +60,6 @@ const config = new IExecConfig({ ethProvider: getSignerFromPrivateKey('mainnet',
 
 ## Methods
 
-### resolveBridgeAddress()
-
-> **resolveBridgeAddress**(): `Promise`\<`string`\>
-
-resolve the current bridge contract address
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### resolveBridgeBackAddress()
-
-> **resolveBridgeBackAddress**(): `Promise`\<`string`\>
-
-resolve the bridge contract address on bridged chain
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### resolveBridgedContractsClient()
-
-> **resolveBridgedContractsClient**(): `Promise`\<[`IExecContractsClient`](../-internal-/classes/IExecContractsClient.md)\>
-
-resolve the current bridged IExecContractsClient
-
-#### Returns
-
-`Promise`\<[`IExecContractsClient`](../-internal-/classes/IExecContractsClient.md)\>
-
-***
-
 ### resolveChainId()
 
 > **resolveChainId**(): `Promise`\<`number`\>
@@ -134,18 +98,6 @@ resolve the current IExecContractsClient
 
 ***
 
-### resolveEnsPublicResolverAddress()
-
-> **resolveEnsPublicResolverAddress**(): `Promise`\<`string`\>
-
-resolve the current ENS public resolver contract address
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
 ### resolveIexecGatewayURL()
 
 > **resolveIexecGatewayURL**(): `Promise`\<`string`\>
@@ -194,58 +146,12 @@ resolve the current PoCo subgraph URL
 
 ***
 
-### resolveResultProxyURL()
-
-> **resolveResultProxyURL**(): `Promise`\<`string`\>
-
-resolve the current result proxy URL
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
 ### resolveSmsURL()
 
-> **resolveSmsURL**(`options?`): `Promise`\<`string`\>
+> **resolveSmsURL**(): `Promise`\<`string`\>
 
 resolve the current SMS URL
 
-#### Parameters
-
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`string`\>
-
-***
-
-### resolveVoucherHubAddress()
-
-> **resolveVoucherHubAddress**(): `Promise`\<`string` \| `null`\>
-
-resolve the current VoucherHub contract address
-returns `null` if not available
-
-#### Returns
-
-`Promise`\<`string` \| `null`\>
-
-***
-
-### resolveVoucherSubgraphURL()
-
-> **resolveVoucherSubgraphURL**(): `Promise`\<`string` \| `null`\>
-
-resolve the current voucher subgraph URL
-returns `null` if not available
-
-#### Returns
-
-`Promise`\<`string` \| `null`\>
diff --git a/docs/classes/IExecDatasetModule.md b/docs/classes/IExecDatasetModule.md
index 04869091..ed88fbbc 100644
--- a/docs/classes/IExecDatasetModule.md
+++ b/docs/classes/IExecDatasetModule.md
@@ -54,7 +54,7 @@ current IExecConfig
 
 ### checkDatasetSecretExists()
 
-> **checkDatasetSecretExists**(`datasetAddress`, `options?`): `Promise`\<`boolean`\>
+> **checkDatasetSecretExists**(`datasetAddress`): `Promise`\<`boolean`\>
 
 check if a the dataset secret exists in the Secret Management Service
 
@@ -70,12 +70,6 @@ console.log('secret exists:', isSecretSet);
 
 `string`
 
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`boolean`\>
@@ -288,7 +282,7 @@ console.log('address', address);
 
 ### pushDatasetSecret()
 
-> **pushDatasetSecret**(`datasetAddress`, `encryptionKey`, `options?`): `Promise`\<`boolean`\>
+> **pushDatasetSecret**(`datasetAddress`, `encryptionKey`): `Promise`\<`boolean`\>
 
 **SIGNER REQUIRED, ONLY DATASET OWNER**
 
@@ -312,12 +306,6 @@ console.log('secret pushed:', pushed);
 
 `string`
 
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`boolean`\>
diff --git a/docs/classes/IExecENSModule.md b/docs/classes/IExecENSModule.md
deleted file mode 100644
index af0939ce..00000000
--- a/docs/classes/IExecENSModule.md
+++ /dev/null
@@ -1,381 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / IExecENSModule
-
-# Class: IExecENSModule
-
-module exposing ENS methods
-
-## Extends
-
-- [`IExecModule`](IExecModule.md)
-
-## Constructors
-
-### Constructor
-
-> **new IExecENSModule**(`configOrArgs`, `options?`): `IExecENSModule`
-
-Create an IExecModule instance
-
-#### Parameters
-
-##### configOrArgs
-
-[`IExecConfigArgs`](../interfaces/IExecConfigArgs.md) | [`IExecConfig`](IExecConfig.md)
-
-##### options?
-
-[`IExecConfigOptions`](../interfaces/IExecConfigOptions.md)
-
-#### Returns
-
-`IExecENSModule`
-
-#### Inherited from
-
-[`IExecModule`](IExecModule.md).[`constructor`](IExecModule.md#constructor)
-
-## Properties
-
-### config
-
-> **config**: [`IExecConfig`](IExecConfig.md)
-
-current IExecConfig
-
-#### Inherited from
-
-[`IExecModule`](IExecModule.md).[`config`](IExecModule.md#config)
-
-## Methods
-
-### claimName()
-
-> **claimName**(`label`, `domain?`): `Promise`\<\{ `name`: `string`; `registerTxHash?`: `string`; \}\>
-
-register a subdomain (label) on an ENS FIFSRegistrar
-
-_NB_:
-- if specifier, the domain must be controlled by a FIFSRegistrar, default "users.iexec.eth" (use `getDefaultDomain(address)` to determine the best suited domain for an address)
-- if the user already own the domain, the register transaction will not occur
-
-example:
-```js
-const { name, registerTxHash } = claimName(
-  'me',
-  'users.iexec.eth',
-);
-console.log('registered:', name);
-```
-
-#### Parameters
-
-##### label
-
-`string`
-
-##### domain?
-
-`string`
-
-#### Returns
-
-`Promise`\<\{ `name`: `string`; `registerTxHash?`: `string`; \}\>
-
-***
-
-### configureResolution()
-
-> **configureResolution**(`name`, `address?`): `Promise`\<\{ `address`: `string`; `name`: `string`; `setAddrTxHash?`: `string`; `setNameTxHash?`: `string`; `setResolverTxHash?`: `string`; \}\>
-
-**SIGNER REQUIRED, ONLY ENS NAME OWNER**
-
-configure the ENS resolution and reverse resolution for an owned ENS name, same as `obsConfigureResolution` wrapped in a `Promise`.
-
-_NB_:
-- `address` must be an iExec RegistryEntry address (ie: app, dataset or workerpool) or the user address, default user address
-- the configuration may require up to 3 transactions, depending on the current state, some transaction may or may not occur to complete the configuration
-
-example:
-- EOA ENS configuration
-```js
-const { address, name } = await configureResolution(
-  'me.users.iexec.eth',
-);
-console.log('configured resolution:', address, '<=>', name);
-```
-- iExec App contract ENS configuration
-```js
-const { address, name } = await configureResolution(
-  'my-app.eth',
-   appAddress
-);
-console.log('configured resolution:', address, '<=>', name);
-```
-
-#### Parameters
-
-##### name
-
-`string`
-
-##### address?
-
-`string`
-
-#### Returns
-
-`Promise`\<\{ `address`: `string`; `name`: `string`; `setAddrTxHash?`: `string`; `setNameTxHash?`: `string`; `setResolverTxHash?`: `string`; \}\>
-
-***
-
-### getDefaultDomain()
-
-> **getDefaultDomain**(`address`): `Promise`\<`string`\>
-
-get the default free to use ENS domain given an address
-
-_NB_:
-- the ENS domain is determined by the nature of the address (app, dataset, workerpool, other)
-- the returned ENS domain is controlled by a FIFSRegistrar that allocates subdomains to the first person to claim them
-
-example:
-```js
-const domain = await getDefaultDomain(address);
-console.log('default domain:', domain);
-```
-
-#### Parameters
-
-##### address
-
-`string`
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### getOwner()
-
-> **getOwner**(`name`): `Promise`\<`string` \| `null`\>
-
-get the address of the ENS name's owner.
-
-example:
-```js
-const owner = await getOwner('iexec.eth');
-console.log('iexec.eth owner:', owner);
-```
-
-#### Parameters
-
-##### name
-
-`string`
-
-#### Returns
-
-`Promise`\<`string` \| `null`\>
-
-***
-
-### lookupAddress()
-
-> **lookupAddress**(`address`): `Promise`\<`string` \| `null`\>
-
-lookup to find the ENS name of an ethereum address
-
-example:
-```js
-const name = await lookupAddress(address);
-console.log('ENS name:', name);
-```
-
-#### Parameters
-
-##### address
-
-`string`
-
-#### Returns
-
-`Promise`\<`string` \| `null`\>
-
-***
-
-### obsConfigureResolution()
-
-> **obsConfigureResolution**(`name`, `address?`): `Promise`\<[`ENSConfigurationObservable`](../-internal-/classes/ENSConfigurationObservable.md)\>
-
-**SIGNER REQUIRED, ONLY ENS NAME OWNER**
-
-return a cold Observable with a `subscribe` method to start and monitor the ENS resolution and reverse resolution configuration.
-
-calling the `subscribe` method on the observable will immediately return a cancel function and start the asynchronous ENS configuration.
-
-calling the returned cancel method will stop the configuration process
-
-_NB_:
-- `address` must be an iExec RegistryEntry address (ie: app, dataset or workerpool) or the user address, default user address
-- the configuration may require up to 4 transactions, depending on the target type (EOA or RegistryEntry) and the current state, some transaction may or may not occur to complete the configuration
-
-example:
-- EOA ENS configuration
-```js
-const configureResolutionObservable = await obsConfigureResolution(
-  'me.users.iexec.eth',
-);
-configureResolutionObservable.subscribe({
-  error: console.error,
-  next: ({ message, ...rest }) =>
-    console.log(`${message} ${JSON.stringify(rest)}`),
-  completed: () => console.log('resolution configured'),
-});
-```
-- iExec App contract ENS configuration
-```js
-const configureResolutionObservable = await obsConfigureResolution(
-  'my-app.eth',
-   appAddress
-);
-configureResolutionObservable.subscribe({
-  error: console.error,
-  next: ({ message, ...rest }) =>
-    console.log(`${message} ${JSON.stringify(rest)}`),
-  completed: () => console.log('resolution configured'),
-});
-```
-
-#### Parameters
-
-##### name
-
-`string`
-
-##### address?
-
-`string`
-
-#### Returns
-
-`Promise`\<[`ENSConfigurationObservable`](../-internal-/classes/ENSConfigurationObservable.md)\>
-
-***
-
-### readTextRecord()
-
-> **readTextRecord**(`name`, `key`): `Promise`\<`string`\>
-
-read an ENS text record associated to an ENS name
-
-example:
-```js
-const value = await readTextRecord('me.users.iexec.eth', 'email');
-console.log('email record:', value);
-```
-
-#### Parameters
-
-##### name
-
-`string`
-
-##### key
-
-`string`
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### resolveName()
-
-> **resolveName**(`name`): `Promise`\<`string` \| `null`\>
-
-resolve the ENS name to an ethereum address if a resolver is configured for the name
-
-example:
-```js
-const address = await resolveName('me.users.iexec.eth');
-console.log('me.users.iexec.eth:', address);
-```
-
-#### Parameters
-
-##### name
-
-`string`
-
-#### Returns
-
-`Promise`\<`string` \| `null`\>
-
-***
-
-### setTextRecord()
-
-> **setTextRecord**(`name`, `key`, `value?`): `Promise`\<`string`\>
-
-**ONLY ENS NAME OWNER**
-
-set a text record associated to an ENS name
-
-_NB_:
-- if value is not specified, the text record is reset to `""`
-
-example:
-```js
-const txHash = setTextRecord(
-  'me.users.iexec.eth',
-  'email',
-  'me@iex.ec'
-);
-console.log('txHash:', txHash);
-```
-
-#### Parameters
-
-##### name
-
-`string`
-
-##### key
-
-`string`
-
-##### value?
-
-`string`
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### fromConfig()
-
-> `static` **fromConfig**(`config`): `IExecENSModule`
-
-Create an IExecENSModule instance using an IExecConfig instance
-
-#### Parameters
-
-##### config
-
-[`IExecConfig`](IExecConfig.md)
-
-#### Returns
-
-`IExecENSModule`
-
-#### Overrides
-
-[`IExecModule`](IExecModule.md).[`fromConfig`](IExecModule.md#fromconfig)
diff --git a/docs/classes/IExecModule.md b/docs/classes/IExecModule.md
index fe5fc1ba..5b8e466c 100644
--- a/docs/classes/IExecModule.md
+++ b/docs/classes/IExecModule.md
@@ -15,7 +15,6 @@ module base
 - [`IExecAppModule`](IExecAppModule.md)
 - [`IExecDatasetModule`](IExecDatasetModule.md)
 - [`IExecDealModule`](IExecDealModule.md)
-- [`IExecENSModule`](IExecENSModule.md)
 - [`IExecHubModule`](IExecHubModule.md)
 - [`IExecNetworkModule`](IExecNetworkModule.md)
 - [`IExecOrderModule`](IExecOrderModule.md)
@@ -24,7 +23,6 @@ module base
 - [`IExecSecretsModule`](IExecSecretsModule.md)
 - [`IExecStorageModule`](IExecStorageModule.md)
 - [`IExecTaskModule`](IExecTaskModule.md)
-- [`IExecVoucherModule`](IExecVoucherModule.md)
 - [`IExecWalletModule`](IExecWalletModule.md)
 - [`IExecWorkerpoolModule`](IExecWorkerpoolModule.md)
 
diff --git a/docs/classes/IExecNetworkModule.md b/docs/classes/IExecNetworkModule.md
index 08093b9c..f8489e81 100644
--- a/docs/classes/IExecNetworkModule.md
+++ b/docs/classes/IExecNetworkModule.md
@@ -54,21 +54,19 @@ current IExecConfig
 
 ### getNetwork()
 
-> **getNetwork**(): `Promise`\<\{ `chainId`: `string`; `isNative`: `boolean`; \}\>
+> **getNetwork**(): `Promise`\<\{ `chainId`: `string`; \}\>
 
 get info about the current iExec network
 
-_NB_: `isNative` is true when the iExec instance use the chain's native token for payment (otherwise the payment token is an ERC20)
-
 example:
 ```js
-const { chainId, isNative } = await getNetwork();
-console.log(`working on chain ${chainId}, using native token: ${isNative}`);
+const { chainId } = await getNetwork();
+console.log(`working on chain ${chainId}`);
 ```
 
 #### Returns
 
-`Promise`\<\{ `chainId`: `string`; `isNative`: `boolean`; \}\>
+`Promise`\<\{ `chainId`: `string`; \}\>
 
 ***
 
diff --git a/docs/classes/IExecOrderModule.md b/docs/classes/IExecOrderModule.md
index b39276c4..c59735fc 100644
--- a/docs/classes/IExecOrderModule.md
+++ b/docs/classes/IExecOrderModule.md
@@ -520,7 +520,7 @@ default `0`
 
 ### estimateMatchOrders()
 
-> **estimateMatchOrders**(`orders`, `options?`): `Promise`\<\{ `sponsored`: [`BN`](../interfaces/BN.md); `total`: [`BN`](../interfaces/BN.md); `volume`: [`BN`](../interfaces/BN.md); \}\>
+> **estimateMatchOrders**(`orders`): `Promise`\<\{ `sponsored`: [`BN`](../interfaces/BN.md); `total`: [`BN`](../interfaces/BN.md); `volume`: [`BN`](../interfaces/BN.md); \}\>
 
 estimates the cost of matching the provided orders
 
@@ -532,10 +532,9 @@ const orders = {
   workerpoolorder,
   requestorder,
 };
-const result = await estimateMatchOrders(orders, {useVoucher: true});
+const result = await estimateMatchOrders(orders);
 console.log(`executable volume: ${result.volume} tasks`);
 console.log(`total cost for matching orders: ${result.total} nRLC`);
-console.log(`sponsored cost covered by voucher: ${result.sponsored} nRLC`);
 ```
 
 #### Parameters
@@ -558,22 +557,6 @@ console.log(`sponsored cost covered by voucher: ${result.sponsored} nRLC`);
 
 [`ConsumableWorkerpoolorder`](../-internal-/interfaces/ConsumableWorkerpoolorder.md)
 
-##### options?
-
-###### useVoucher?
-
-`boolean`
-
-use a voucher contract to sponsor the deal
-
-###### voucherAddress?
-
-`string`
-
-override the voucher contract to use, must be combined with `useVoucher: true`
-
-the user must be authorized by the voucher's owner to use it
-
 #### Returns
 
 `Promise`\<\{ `sponsored`: [`BN`](../interfaces/BN.md); `total`: [`BN`](../interfaces/BN.md); `volume`: [`BN`](../interfaces/BN.md); \}\>
@@ -721,20 +704,6 @@ console.log(`created deal ${dealid} in tx ${txHash}`);
 
 `boolean`
 
-###### useVoucher?
-
-`boolean`
-
-use a voucher contract to sponsor the deal
-
-###### voucherAddress?
-
-`string`
-
-override the voucher contract to use, must be combined with `useVoucher: true`
-
-the user must be authorized by the voucher's owner to use it
-
 #### Returns
 
 `Promise`\<\{ `dealid`: `string`; `txHash`: `string`; `volume`: [`BN`](../interfaces/BN.md); \}\>
diff --git a/docs/classes/IExecOrderbookModule.md b/docs/classes/IExecOrderbookModule.md
index ad967383..33c8dda4 100644
--- a/docs/classes/IExecOrderbookModule.md
+++ b/docs/classes/IExecOrderbookModule.md
@@ -79,7 +79,7 @@ console.log('remaining volume:', remaining);
 
 ### fetchAppOrderbook()
 
-> **fetchAppOrderbook**(`appAddressOrOptions`, `options?`): `Promise`\<[`PaginableOrders`](../-internal-/interfaces/PaginableOrders.md)\<[`PublishedApporder`](../-internal-/interfaces/PublishedApporder.md)\>\>
+> **fetchAppOrderbook**(`options`): `Promise`\<[`PaginableOrders`](../-internal-/interfaces/PaginableOrders.md)\<[`PublishedApporder`](../-internal-/interfaces/PublishedApporder.md)\>\>
 
 find the cheapest orders for the specified app.
 
@@ -94,11 +94,7 @@ console.log('total orders:', count);
 
 #### Parameters
 
-##### appAddressOrOptions
-
-`string` |
-
-\{ `app?`: `string`; `appOwner?`: `string`; `dataset?`: `string`; `isDatasetStrict?`: `boolean`; `isRequesterStrict?`: `boolean`; `isWorkerpoolStrict?`: `boolean`; `maxTag?`: [`Tag`](../type-aliases/Tag.md) \| `string`[]; `minTag?`: [`Tag`](../type-aliases/Tag.md) \| `string`[]; `minVolume?`: [`BNish`](../type-aliases/BNish.md); `page?`: `number`; `pageSize?`: `number`; `requester?`: `string`; `workerpool?`: `string`; \}
+##### options
 
 ###### app?
 
@@ -178,82 +174,6 @@ include orders restricted to specified requester (use `'any'` to include any req
 
 include orders restricted to specified workerpool (use `'any'` to include any workerpool)
 
-##### options?
-
-**Deprecated**
-
-use first parameter instead
-
-migration:
-
-replace `fetchAppOrderbook(appAddress, options)` by `fetchAppOrderbook({ app: appAddress, ...options })`
-
-###### dataset?
-
-`string`
-
-include orders restricted to specified dataset (use `'any'` to include any dataset)
-
-###### isDatasetStrict?
-
-`boolean`
-
-filters out orders allowing “any” dataset (default: `false`)
-
-###### isRequesterStrict?
-
-`boolean`
-
-filters out orders allowing “any” requester (default: `false`)
-
-###### isWorkerpoolStrict?
-
-`boolean`
-
-filters out orders allowing “any” workerpool (default: `false`)
-
-###### maxTag?
-
-[`Tag`](../type-aliases/Tag.md) \| `string`[]
-
-filter by maximum tag accepted
-
-###### minTag?
-
-[`Tag`](../type-aliases/Tag.md) \| `string`[]
-
-filter by minimum tag required
-
-###### minVolume?
-
-[`BNish`](../type-aliases/BNish.md)
-
-filter by minimum volume remaining
-
-###### page?
-
-`number`
-
-index of the page to fetch
-
-###### pageSize?
-
-`number`
-
-size of the page to fetch
-
-###### requester?
-
-`string`
-
-include orders restricted to specified requester (use `'any'` to include any requester)
-
-###### workerpool?
-
-`string`
-
-include orders restricted to specified workerpool (use `'any'` to include any workerpool)
-
 #### Returns
 
 `Promise`\<[`PaginableOrders`](../-internal-/interfaces/PaginableOrders.md)\<[`PublishedApporder`](../-internal-/interfaces/PublishedApporder.md)\>\>
@@ -287,7 +207,7 @@ console.log('remaining volume:', remaining);
 
 ### fetchDatasetOrderbook()
 
-> **fetchDatasetOrderbook**(`datasetAddressOrOptions`, `options?`): `Promise`\<[`PaginableOrders`](../-internal-/interfaces/PaginableOrders.md)\<[`PublishedDatasetorder`](../-internal-/interfaces/PublishedDatasetorder.md)\>\>
+> **fetchDatasetOrderbook**(`options`): `Promise`\<[`PaginableOrders`](../-internal-/interfaces/PaginableOrders.md)\<[`PublishedDatasetorder`](../-internal-/interfaces/PublishedDatasetorder.md)\>\>
 
 find the cheapest orders for the specified dataset.
 
@@ -302,11 +222,7 @@ console.log('total orders:', count);
 
 #### Parameters
 
-##### datasetAddressOrOptions
-
-`string` |
-
-\{ `app?`: `string`; `bulkOnly?`: `boolean`; `dataset?`: `string`; `datasetOwner?`: `string`; `isAppStrict?`: `boolean`; `isRequesterStrict?`: `boolean`; `isWorkerpoolStrict?`: `boolean`; `maxTag?`: [`Tag`](../type-aliases/Tag.md) \| `string`[]; `minTag?`: [`Tag`](../type-aliases/Tag.md) \| `string`[]; `minVolume?`: [`BNish`](../type-aliases/BNish.md); `page?`: `number`; `pageSize?`: `number`; `requester?`: `string`; `workerpool?`: `string`; \}
+##### options
 
 ###### app?
 
@@ -392,88 +308,6 @@ include orders restricted to specified requester (use `'any'` to include any req
 
 include orders restricted to specified workerpool (use `'any'` to include any workerpool)
 
-##### options?
-
-**Deprecated**
-
-use first parameter instead
-
-migration:
-
-replace `fetchDatasetOrderbook(datasetAddress, options)` by `fetchDatasetOrderbook({ dataset: datasetAddress, ...options })`
-
-###### app?
-
-`string`
-
-include orders restricted to specified app (use `'any'` to include any app)
-
-###### bulkOnly?
-
-`boolean`
-
-filters out orders that don't allow bulk processing (default: `false`)
-
-###### isAppStrict?
-
-`boolean`
-
-filters out orders allowing “any” app (default: `false`)
-
-###### isRequesterStrict?
-
-`boolean`
-
-filters out orders allowing “any” requester (default: `false`)
-
-###### isWorkerpoolStrict?
-
-`boolean`
-
-filters out orders allowing “any” workerpool (default: `false`)
-
-###### maxTag?
-
-[`Tag`](../type-aliases/Tag.md) \| `string`[]
-
-filter by maximum tag accepted
-
-###### minTag?
-
-[`Tag`](../type-aliases/Tag.md) \| `string`[]
-
-filter by minimum tag required
-
-###### minVolume?
-
-[`BNish`](../type-aliases/BNish.md)
-
-filter by minimum volume remaining
-
-###### page?
-
-`number`
-
-index of the page to fetch
-
-###### pageSize?
-
-`number`
-
-size of the page to fetch
-
-###### requester?
-
-`string`
-
-include orders restricted to specified requester (use `'any'` to include any requester)
-
-###### workerpool?
-
-`string`
-
-include orders restricted to specified workerpool (use `'any'` to include any workerpool)
-
 #### Returns
 
 `Promise`\<[`PaginableOrders`](../-internal-/interfaces/PaginableOrders.md)\<[`PublishedDatasetorder`](../-internal-/interfaces/PublishedDatasetorder.md)\>\>
diff --git a/docs/classes/IExecResultModule.md b/docs/classes/IExecResultModule.md
index cce22092..a6440332 100644
--- a/docs/classes/IExecResultModule.md
+++ b/docs/classes/IExecResultModule.md
@@ -54,7 +54,7 @@ current IExecConfig
 
 ### checkResultEncryptionKeyExists()
 
-> **checkResultEncryptionKeyExists**(`beneficiaryAddress`, `options`): `Promise`\<`boolean`\>
+> **checkResultEncryptionKeyExists**(`beneficiaryAddress`): `Promise`\<`boolean`\>
 
 check if a beneficiary result encryption key exists in the Secret Management Service
 
@@ -70,12 +70,6 @@ console.log('encryption key available:', isEncryptionKeyAvailable);
 
 `string`
 
-##### options
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`boolean`\>
@@ -142,10 +136,6 @@ console.log('encryption key pushed:', isPushed);
 
 `boolean`
 
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<\{ `isPushed`: `boolean`; `isUpdated`: `boolean`; \}\>
diff --git a/docs/classes/IExecSecretsModule.md b/docs/classes/IExecSecretsModule.md
index 9a9768ce..bffdcc88 100644
--- a/docs/classes/IExecSecretsModule.md
+++ b/docs/classes/IExecSecretsModule.md
@@ -54,7 +54,7 @@ current IExecConfig
 
 ### checkRequesterSecretExists()
 
-> **checkRequesterSecretExists**(`requesterAddress`, `secretName`, `options?`): `Promise`\<`boolean`\>
+> **checkRequesterSecretExists**(`requesterAddress`, `secretName`): `Promise`\<`boolean`\>
 
 check if a named secret exists for the requester in the Secret Management Service
 
@@ -72,13 +72,7 @@ console.log('secret "my-password" set:', isSecretSet);
 
 ##### secretName
 
-`String`
-
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
+`string`
 
 #### Returns
 
@@ -88,7 +82,7 @@ console.log('secret "my-password" set:', isSecretSet);
 
 ### pushRequesterSecret()
 
-> **pushRequesterSecret**(`secretName`, `secretValue`, `options?`): `Promise`\<\{ `isPushed`: `boolean`; \}\>
+> **pushRequesterSecret**(`secretName`, `secretValue`): `Promise`\<\{ `isPushed`: `boolean`; \}\>
 
 **SIGNER REQUIRED, ONLY REQUESTER**
 
@@ -114,12 +108,6 @@ console.log('pushed secret "my-password":', isPushed);
 
 `String`
 
-##### options?
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<\{ `isPushed`: `boolean`; \}\>
diff --git a/docs/classes/IExecStorageModule.md b/docs/classes/IExecStorageModule.md
index 5c9db81d..e78d19b1 100644
--- a/docs/classes/IExecStorageModule.md
+++ b/docs/classes/IExecStorageModule.md
@@ -54,16 +54,16 @@ current IExecConfig
 
 ### checkStorageTokenExists()
 
-> **checkStorageTokenExists**(`beneficiaryAddress`, `options?`): `Promise`\<`boolean`\>
+> **checkStorageTokenExists**(`beneficiaryAddress`, `storageProvider`): `Promise`\<`boolean`\>
 
-check if a storage token exists for the beneficiary in the Secret Management Service
+check if a storage access token exists for the beneficiary in the Secret Management Service
 
-_NB_: specify the storage provider with the option `provider` (supported values `'ipfs'`|`'dropbox'` default `'ipfs'`)
+_NB_: currently only 'dropbox' storage provider authentication is supported.
 
 example:
 ```js
-const isIpfsStorageInitialized = await checkStorageTokenExists(userAddress);
-console.log('IPFS storage initialized:', isIpfsStorageInitialized);
+const isStorageInitialized = await checkStorageTokenExists(userAddress, 'dropbox');
+console.log('Dropbox storage initialized:', isStorageInitialized);
 ```
 
 #### Parameters
@@ -72,66 +72,34 @@ console.log('IPFS storage initialized:', isIpfsStorageInitialized);
 
 `string`
 
-##### options?
-
-###### provider?
+##### storageProvider
 
 `string`
 
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<`boolean`\>
 
 ***
 
-### defaultStorageLogin()
-
-> **defaultStorageLogin**(): `Promise`\<`string`\>
-
-**SIGNER REQUIRED, ONLY BENEFICIARY**
-
-get an authorization token from the default IPFS based remote storage
-
-example:
-```js
-const token = await defaultStorageLogin();
-const { isPushed } = await pushStorageToken(token);
-console.log('default storage initialized:', isPushed);
-```
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
 ### pushStorageToken()
 
-> **pushStorageToken**(`token`, `options?`): `Promise`\<\{ `isPushed`: `boolean`; `isUpdated`: `boolean`; \}\>
+> **pushStorageToken**(`token`, `storageProvider`, `options?`): `Promise`\<\{ `isPushed`: `boolean`; `isUpdated`: `boolean`; \}\>
 
 **SIGNER REQUIRED, ONLY BENEFICIARY**
 
-push a personal storage token to the Secret Management Service to allow result archive upload
+push a storage access token to the Secret Management Service to allow result archive upload
+supported storage provider 'dropbox'.
 
 _NB_:
-- specify the storage provider with the option `provider` (supported values `'ipfs'`|`'dropbox'` default `'ipfs'`)
+- currently only 'dropbox' storage provider authentication is supported.
 - this method will throw an error if a token already exists for the target storage provider in the Secret Management Service unless the option `forceUpdate: true` is used.
 
 example:
-- init default storage
+- init Dropbox storage
 ```js
-const token = await defaultStorageLogin();
-const { isPushed } = await pushStorageToken(token);
-console.log('default storage initialized:', isPushed);
-```
-- init dropbox storage
-```js
-const { isPushed } = await pushStorageToken(dropboxApiToken, {provider: 'dropbox'});
-console.log('dropbox storage initialized:', isPushed);
+const { isPushed } = await pushStorageToken(dropboxApiToken, 'dropbox');
+console.log('Dropbox storage initialized:', isPushed);
 ```
 
 #### Parameters
@@ -140,20 +108,16 @@ console.log('dropbox storage initialized:', isPushed);
 
 `string`
 
+##### storageProvider
+
+`string`
+
 ##### options?
 
 ###### forceUpdate?
 
 `boolean`
 
-###### provider?
-
-`string`
-
-###### teeFramework?
-
-[`TeeFramework`](../type-aliases/TeeFramework.md)
-
 #### Returns
 
 `Promise`\<\{ `isPushed`: `boolean`; `isUpdated`: `boolean`; \}\>
diff --git a/docs/classes/IExecVoucherModule.md b/docs/classes/IExecVoucherModule.md
deleted file mode 100644
index 816c996a..00000000
--- a/docs/classes/IExecVoucherModule.md
+++ /dev/null
@@ -1,170 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / IExecVoucherModule
-
-# Class: IExecVoucherModule
-
-module exposing voucher methods
-
-## Extends
-
-- [`IExecModule`](IExecModule.md)
-
-## Constructors
-
-### Constructor
-
-> **new IExecVoucherModule**(`configOrArgs`, `options?`): `IExecVoucherModule`
-
-Create an IExecModule instance
-
-#### Parameters
-
-##### configOrArgs
-
-[`IExecConfigArgs`](../interfaces/IExecConfigArgs.md) | [`IExecConfig`](IExecConfig.md)
-
-##### options?
-
-[`IExecConfigOptions`](../interfaces/IExecConfigOptions.md)
-
-#### Returns
-
-`IExecVoucherModule`
-
-#### Inherited from
-
-[`IExecModule`](IExecModule.md).[`constructor`](IExecModule.md#constructor)
-
-## Properties
-
-### config
-
-> **config**: [`IExecConfig`](IExecConfig.md)
-
-current IExecConfig
-
-#### Inherited from
-
-[`IExecModule`](IExecModule.md).[`config`](IExecModule.md#config)
-
-## Methods
-
-### authorizeRequester()
-
-> **authorizeRequester**(`requester`): `Promise`\<`string`\>
-
-**SIGNER REQUIRED**
-
-authorize a requester to use the voucher
-
-example:
-```js
-const txHash = await authorizeRequester(requesterAddress);
-console.log('tx:', txHash);
-```
-
-#### Parameters
-
-##### requester
-
-`string`
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### getVoucherAddress()
-
-> **getVoucherAddress**(`owner`): `Promise`\<`string` \| `null`\>
-
-returns the address of the voucher contract for the specified address if the address owns a voucher
-
-example:
-```js
-const voucherAddress = await getVoucherAddress(ownerAddress);
-console.log('voucher contract address:', voucherAddress);
-```
-
-#### Parameters
-
-##### owner
-
-`string`
-
-#### Returns
-
-`Promise`\<`string` \| `null`\>
-
-***
-
-### revokeRequesterAuthorization()
-
-> **revokeRequesterAuthorization**(`requester`): `Promise`\<`string`\>
-
-#### Parameters
-
-##### requester
-
-`string`
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
-### showUserVoucher()
-
-> **showUserVoucher**(`owner`): `Promise`\<[`VoucherInfo`](../-internal-/interfaces/VoucherInfo.md)\>
-
-returns the user voucher information
-
-example:
-```js
-const userVoucher = await showUserVoucher(userAddress);
-console.log('address:', userVoucher.address);
-console.log('balance:', userVoucher.balance);
-console.log('expiration:', userVoucher.expirationTimestamp);
-console.log('sponsored apps:', userVoucher.sponsoredApps);
-console.log('sponsored datasets:', userVoucher.sponsoredDatasets);
-console.log('sponsored workerpools:', userVoucher.sponsoredWorkerpools);
-console.log('allowance on user account:', userVoucher.allowanceAmount);
-console.log('authorized accounts:', userVoucher.authorizedAccounts);
-```
-
-#### Parameters
-
-##### owner
-
-`string`
-
-#### Returns
-
-`Promise`\<[`VoucherInfo`](../-internal-/interfaces/VoucherInfo.md)\>
-
-***
-
-### fromConfig()
-
-> `static` **fromConfig**(`config`): `IExecVoucherModule`
-
-Create an IExecVoucherModule instance using an IExecConfig instance
-
-#### Parameters
-
-##### config
-
-[`IExecConfig`](IExecConfig.md)
-
-#### Returns
-
-`IExecVoucherModule`
-
-#### Overrides
-
-[`IExecModule`](IExecModule.md).[`fromConfig`](IExecModule.md#fromconfig)
diff --git a/docs/classes/IExecWalletModule.md b/docs/classes/IExecWalletModule.md
index a2409dee..649ab0b9 100644
--- a/docs/classes/IExecWalletModule.md
+++ b/docs/classes/IExecWalletModule.md
@@ -52,66 +52,6 @@ current IExecConfig
 
 ## Methods
 
-### bridgeToMainchain()
-
-> **bridgeToMainchain**(`nRLCAmount`): `Promise`\<\{ `receiveTxHash?`: `string`; `sendTxHash`: `string`; \}\>
-
-**SIGNER REQUIRED**
-
-send some nRLC to the mainchain
-
-_NB_:
-- RLC is send to the sidechain bridge smart contract on sidechain then credited on mainchain by the mainchain bridge smart contract
-- the reception of the value on the mainchain (`receiveTxHash`) will not be monitored if the bridged network configuration is missing
-
-example:
-```js
-const { sendTxHash, receiveTxHash } = await bridgeToSidechain('1000000000');
-console.log(`sent RLC on sidechain (tx: ${sendTxHash}), wallet credited on mainchain (tx: ${receiveTxHash})`);
-```
-
-#### Parameters
-
-##### nRLCAmount
-
-[`NRLCAmount`](../type-aliases/NRLCAmount.md)
-
-#### Returns
-
-`Promise`\<\{ `receiveTxHash?`: `string`; `sendTxHash`: `string`; \}\>
-
-***
-
-### bridgeToSidechain()
-
-> **bridgeToSidechain**(`nRLCAmount`): `Promise`\<\{ `receiveTxHash?`: `string`; `sendTxHash`: `string`; \}\>
-
-**SIGNER REQUIRED**
-
-send some nRLC to the sidechain
-
-_NB_:
-- RLC is send to the mainchain bridge smart contract on mainchain then credited on sidechain by the sidechain bridge smart contract
-- the reception of the value on the sidechain (`receiveTxHash`) will not be monitored if the bridged network configuration is missing
-
-example:
-```js
-const { sendTxHash, receiveTxHash } = await bridgeToSidechain('1000000000');
-console.log(`sent RLC on mainchain (tx: ${sendTxHash}), wallet credited on sidechain (tx: ${receiveTxHash})`);
-```
-
-#### Parameters
-
-##### nRLCAmount
-
-[`NRLCAmount`](../type-aliases/NRLCAmount.md)
-
-#### Returns
-
-`Promise`\<\{ `receiveTxHash?`: `string`; `sendTxHash`: `string`; \}\>
-
-***
-
 ### checkBalances()
 
 > **checkBalances**(`address`): `Promise`\<\{ `nRLC`: [`BN`](../interfaces/BN.md); `wei`: [`BN`](../interfaces/BN.md); \}\>
@@ -137,31 +77,6 @@ console.log('ethereum wei:', wei.toString());
 
 ***
 
-### checkBridgedBalances()
-
-> **checkBridgedBalances**(`address`): `Promise`\<\{ `nRLC`: [`BN`](../interfaces/BN.md); `wei`: [`BN`](../interfaces/BN.md); \}\>
-
-check the wallet balances (native and iExec token) of specified address on bridged chain
-
-example:
-```js
-const { wei, nRLC } = await checkBalances(address);
-console.log('iExec nano RLC:', nRLC.toString());
-console.log('ethereum wei:', wei.toString());
-```
-
-#### Parameters
-
-##### address
-
-`string`
-
-#### Returns
-
-`Promise`\<\{ `nRLC`: [`BN`](../interfaces/BN.md); `wei`: [`BN`](../interfaces/BN.md); \}\>
-
-***
-
 ### getAddress()
 
 > **getAddress**(): `Promise`\<`string`\>
@@ -182,66 +97,6 @@ console.log('user address:', userAddress);
 
 ***
 
-### obsBridgeToMainchain()
-
-> **obsBridgeToMainchain**(`nRLCAmount`): `Promise`\<[`BridgeObservable`](../-internal-/classes/BridgeObservable.md)\>
-
-**SIGNER REQUIRED**
-
-return an Observable with a subscribe method to start and monitor the bridge to mainchain process
-
-example:
-```js
-const bridgeObservable = await obsBridgeToMainchain('1000000000');
-const cancel = bridgeObservable.subscribe({
-  next: ({message, ...rest}) => console.log(message, ...rest),
-  error: (err) => console.error(err),
-  complete: () => console.log('completed'),
-});
-```
-
-#### Parameters
-
-##### nRLCAmount
-
-[`NRLCAmount`](../type-aliases/NRLCAmount.md)
-
-#### Returns
-
-`Promise`\<[`BridgeObservable`](../-internal-/classes/BridgeObservable.md)\>
-
-***
-
-### obsBridgeToSidechain()
-
-> **obsBridgeToSidechain**(`nRLCAmount`): `Promise`\<[`BridgeObservable`](../-internal-/classes/BridgeObservable.md)\>
-
-**SIGNER REQUIRED**
-
-return an Observable with a subscribe method to start and monitor the bridge to sidechain process
-
-example:
-```js
-const bridgeObservable = await obsBridgeToSidechain('1000000000');
-const cancel = bridgeObservable.subscribe({
-  next: ({message, ...rest}) => console.log(message, ...rest),
-  error: (err) => console.error(err),
-  complete: () => console.log('completed'),
-});
-```
-
-#### Parameters
-
-##### nRLCAmount
-
-[`NRLCAmount`](../type-aliases/NRLCAmount.md)
-
-#### Returns
-
-`Promise`\<[`BridgeObservable`](../-internal-/classes/BridgeObservable.md)\>
-
-***
-
 ### sendETH()
 
 > **sendETH**(`WeiAmount`, `to`): `Promise`\<`string`\>
diff --git a/docs/classes/IExecWorkerpoolModule.md b/docs/classes/IExecWorkerpoolModule.md
index 8297151a..baa544b1 100644
--- a/docs/classes/IExecWorkerpoolModule.md
+++ b/docs/classes/IExecWorkerpoolModule.md
@@ -139,7 +139,7 @@ _NB_: resolve to `undefined` if the workerpool API url was not declared.
 
 example:
 ```js
-const url = await getWorkerpoolApiUrl('my-workerpool.eth');
+const url = await getWorkerpoolApiUrl(address);
 console.log('workerpool API url:', url);
 ```
 
@@ -182,38 +182,6 @@ console.log('address', address);
 
 ***
 
-### setWorkerpoolApiUrl()
-
-> **setWorkerpoolApiUrl**(`workerpoolAddress`, `url`): `Promise`\<`string`\>
-
-**ONLY WORKERPOOL ENS NAME OWNER**
-
-declare the workerpool API url on the blockchain
-
-_NB_: declaring the workerpool API url require an ENS name with a configured reverse resolution on the workerpool address (see: IExecENSModule obsConfigureResolution/configureResolution)
-
-example:
-```js
-const txHash = await setWorkerpoolApiUrl('my-workerpool.eth', 'my-workerpool.com');
-console.log('txHash:', txHash);
-```
-
-#### Parameters
-
-##### workerpoolAddress
-
-`string`
-
-##### url
-
-`string`
-
-#### Returns
-
-`Promise`\<`string`\>
-
-***
-
 ### showUserWorkerpool()
 
 > **showUserWorkerpool**(`index`, `address`): `Promise`\<\{ `objAddress`: `string`; `workerpool`: [`Workerpool`](../-internal-/interfaces/Workerpool.md); \}\>
diff --git a/docs/classes/Observable.md b/docs/classes/Observable.md
index 7eb04144..38475288 100644
--- a/docs/classes/Observable.md
+++ b/docs/classes/Observable.md
@@ -9,9 +9,7 @@
 ## Extended by
 
 - [`DealObservable`](../-internal-/classes/DealObservable.md)
-- [`ENSConfigurationObservable`](../-internal-/classes/ENSConfigurationObservable.md)
 - [`TaskObservable`](../-internal-/classes/TaskObservable.md)
-- [`BridgeObservable`](../-internal-/classes/BridgeObservable.md)
 
 ## Constructors
 
diff --git a/docs/globals.md b/docs/globals.md
index a281c50e..2c6be769 100644
--- a/docs/globals.md
+++ b/docs/globals.md
@@ -16,14 +16,12 @@
 ## Classes
 
 - [BrowserProviderSignerAdapter](classes/BrowserProviderSignerAdapter.md)
-- [EnhancedWallet](classes/EnhancedWallet.md)
 - [IExec](classes/IExec.md)
 - [IExecAccountModule](classes/IExecAccountModule.md)
 - [IExecAppModule](classes/IExecAppModule.md)
 - [IExecConfig](classes/IExecConfig.md)
 - [IExecDatasetModule](classes/IExecDatasetModule.md)
 - [IExecDealModule](classes/IExecDealModule.md)
-- [IExecENSModule](classes/IExecENSModule.md)
 - [IExecHubModule](classes/IExecHubModule.md)
 - [IExecModule](classes/IExecModule.md)
 - [IExecNetworkModule](classes/IExecNetworkModule.md)
@@ -33,7 +31,6 @@
 - [IExecSecretsModule](classes/IExecSecretsModule.md)
 - [IExecStorageModule](classes/IExecStorageModule.md)
 - [IExecTaskModule](classes/IExecTaskModule.md)
-- [IExecVoucherModule](classes/IExecVoucherModule.md)
 - [IExecWalletModule](classes/IExecWalletModule.md)
 - [IExecWorkerpoolModule](classes/IExecWorkerpoolModule.md)
 - [Observable](classes/Observable.md)
@@ -44,18 +41,14 @@
 - [Eip1193Provider](interfaces/Eip1193Provider.md)
 - [IExecConfigArgs](interfaces/IExecConfigArgs.md)
 - [IExecConfigOptions](interfaces/IExecConfigOptions.md)
-- [ProviderOptions](interfaces/ProviderOptions.md)
 
 ## Type Aliases
 
 - [Address](type-aliases/Address.md)
-- [Addressish](type-aliases/Addressish.md)
-- [AnyRecord](type-aliases/AnyRecord.md)
 - [BNish](type-aliases/BNish.md)
 - [Bytes](type-aliases/Bytes.md)
 - [Bytes32](type-aliases/Bytes32.md)
 - [Dealid](type-aliases/Dealid.md)
-- [ENS](type-aliases/ENS.md)
 - [HumanSingleTag](type-aliases/HumanSingleTag.md)
 - [Multiaddress](type-aliases/Multiaddress.md)
 - [NRLCAmount](type-aliases/NRLCAmount.md)
@@ -63,6 +56,5 @@
 - [Tag](type-aliases/Tag.md)
 - [Taskid](type-aliases/Taskid.md)
 - [TaskIndex](type-aliases/TaskIndex.md)
-- [TeeFramework](type-aliases/TeeFramework.md)
 - [TxHash](type-aliases/TxHash.md)
 - [WeiAmount](type-aliases/WeiAmount.md)
diff --git a/docs/iexec/namespaces/errors/README.md b/docs/iexec/namespaces/errors/README.md
index 3ebbcdc6..85aeb65c 100644
--- a/docs/iexec/namespaces/errors/README.md
+++ b/docs/iexec/namespaces/errors/README.md
@@ -9,13 +9,11 @@
 ## Classes
 
 - [ApiCallError](classes/ApiCallError.md)
-- [BridgeError](classes/BridgeError.md)
 - [CompassCallError](classes/CompassCallError.md)
 - [ConfigurationError](classes/ConfigurationError.md)
 - [IpfsGatewayCallError](classes/IpfsGatewayCallError.md)
 - [MarketCallError](classes/MarketCallError.md)
 - [ObjectNotFoundError](classes/ObjectNotFoundError.md)
-- [ResultProxyCallError](classes/ResultProxyCallError.md)
 - [SmsCallError](classes/SmsCallError.md)
 - [ValidationError](classes/ValidationError.md)
 - [Web3ProviderCallError](classes/Web3ProviderCallError.md)
diff --git a/docs/iexec/namespaces/errors/classes/ApiCallError.md b/docs/iexec/namespaces/errors/classes/ApiCallError.md
index d458a46e..48d4d33e 100644
--- a/docs/iexec/namespaces/errors/classes/ApiCallError.md
+++ b/docs/iexec/namespaces/errors/classes/ApiCallError.md
@@ -15,7 +15,6 @@ ApiCallError encapsulates an error occurring during a call to an API such as a n
 ## Extended by
 
 - [`SmsCallError`](SmsCallError.md)
-- [`ResultProxyCallError`](ResultProxyCallError.md)
 - [`MarketCallError`](MarketCallError.md)
 - [`IpfsGatewayCallError`](IpfsGatewayCallError.md)
 - [`CompassCallError`](CompassCallError.md)
@@ -25,7 +24,7 @@ ApiCallError encapsulates an error occurring during a call to an API such as a n
 
 ### Constructor
 
-> **new ApiCallError**(`message`, `originalError`): `ApiCallError`
+> **new ApiCallError**(`message`, `options?`): `ApiCallError`
 
 #### Parameters
 
@@ -35,11 +34,13 @@ ApiCallError encapsulates an error occurring during a call to an API such as a n
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this API call error.
+`unknown`
+
+The original error that caused this API call error.
 
 #### Returns
 
@@ -51,18 +52,8 @@ The original Error object that caused this API call error.
 
 ## Properties
 
-### cause
-
-> **cause**: `Error`
-
-The original Error object that caused this API call error.
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
+### cause?
 
-#### Deprecated
+> `optional` **cause**: `unknown`
 
-use Error cause instead.
+The original error that caused this API call error.
diff --git a/docs/iexec/namespaces/errors/classes/BridgeError.md b/docs/iexec/namespaces/errors/classes/BridgeError.md
deleted file mode 100644
index ffbe74a1..00000000
--- a/docs/iexec/namespaces/errors/classes/BridgeError.md
+++ /dev/null
@@ -1,67 +0,0 @@
-[**iexec**](../../../../README.md)
-
-***
-
-[iexec](../../../../globals.md) / [errors](../README.md) / BridgeError
-
-# Class: BridgeError
-
-BridgeError is thrown when bridging RLC between mainchain and sidechain fail before the value transfer confirmation.
-
-## Extends
-
-- `Error`
-
-## Constructors
-
-### Constructor
-
-> **new BridgeError**(`originalError`, `sendTxHash`): `BridgeError`
-
-#### Parameters
-
-##### originalError
-
-`Error`
-
-The original Error object that caused this API call error.
-
-##### sendTxHash
-
-`string`
-
-Hash of the transaction sending the value to the bridge contract.
-
-#### Returns
-
-`BridgeError`
-
-#### Overrides
-
-`Error.constructor`
-
-## Properties
-
-### cause
-
-> **cause**: `Error`
-
-The original Error object that caused this API call error.
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead
-
-***
-
-### sendTxHash
-
-> **sendTxHash**: `string`
-
-Hash of the transaction sending the value to the bridge contract.
diff --git a/docs/iexec/namespaces/errors/classes/CompassCallError.md b/docs/iexec/namespaces/errors/classes/CompassCallError.md
index 84c14bcb..33e92cf0 100644
--- a/docs/iexec/namespaces/errors/classes/CompassCallError.md
+++ b/docs/iexec/namespaces/errors/classes/CompassCallError.md
@@ -16,7 +16,7 @@ CompassCallError encapsulates an error occurring during a call to the Compass AP
 
 ### Constructor
 
-> **new CompassCallError**(`message`, `originalError`): `CompassCallError`
+> **new CompassCallError**(`message`, `options?`): `CompassCallError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ CompassCallError encapsulates an error occurring during a call to the Compass AP
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this API call error.
+`unknown`
+
+The original error that caused this API call error.
 
 #### Returns
 
@@ -42,26 +44,12 @@ The original Error object that caused this API call error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this API call error.
+The original error that caused this API call error.
 
 #### Inherited from
 
 [`ApiCallError`](ApiCallError.md).[`cause`](ApiCallError.md#cause)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`originalError`](ApiCallError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/IpfsGatewayCallError.md b/docs/iexec/namespaces/errors/classes/IpfsGatewayCallError.md
index 51919504..33ad9260 100644
--- a/docs/iexec/namespaces/errors/classes/IpfsGatewayCallError.md
+++ b/docs/iexec/namespaces/errors/classes/IpfsGatewayCallError.md
@@ -16,7 +16,7 @@ IpfsGatewayCallError encapsulates an error occurring during a call to the IPFS g
 
 ### Constructor
 
-> **new IpfsGatewayCallError**(`message`, `originalError`): `IpfsGatewayCallError`
+> **new IpfsGatewayCallError**(`message`, `options?`): `IpfsGatewayCallError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ IpfsGatewayCallError encapsulates an error occurring during a call to the IPFS g
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this API call error.
+`unknown`
+
+The original error that caused this API call error.
 
 #### Returns
 
@@ -42,26 +44,12 @@ The original Error object that caused this API call error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this API call error.
+The original error that caused this API call error.
 
 #### Inherited from
 
 [`ApiCallError`](ApiCallError.md).[`cause`](ApiCallError.md#cause)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`originalError`](ApiCallError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/MarketCallError.md b/docs/iexec/namespaces/errors/classes/MarketCallError.md
index 259daada..8a79152e 100644
--- a/docs/iexec/namespaces/errors/classes/MarketCallError.md
+++ b/docs/iexec/namespaces/errors/classes/MarketCallError.md
@@ -16,7 +16,7 @@ MarketCallError encapsulates an error occurring during a call to the Market API
 
 ### Constructor
 
-> **new MarketCallError**(`message`, `originalError`): `MarketCallError`
+> **new MarketCallError**(`message`, `options?`): `MarketCallError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ MarketCallError encapsulates an error occurring during a call to the Market API
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this API call error.
+`unknown`
+
+The original error that caused this API call error.
 
 #### Returns
 
@@ -42,26 +44,12 @@ The original Error object that caused this API call error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this API call error.
+The original error that caused this API call error.
 
 #### Inherited from
 
 [`ApiCallError`](ApiCallError.md).[`cause`](ApiCallError.md#cause)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`originalError`](ApiCallError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/ResultProxyCallError.md b/docs/iexec/namespaces/errors/classes/ResultProxyCallError.md
deleted file mode 100644
index 1102aa98..00000000
--- a/docs/iexec/namespaces/errors/classes/ResultProxyCallError.md
+++ /dev/null
@@ -1,67 +0,0 @@
-[**iexec**](../../../../README.md)
-
-***
-
-[iexec](../../../../globals.md) / [errors](../README.md) / ResultProxyCallError
-
-# Class: ResultProxyCallError
-
-ResultProxyCallError encapsulates an error occurring during a call to the Result Proxy API such as a network error or a server-side internal error.
-
-## Extends
-
-- [`ApiCallError`](ApiCallError.md)
-
-## Constructors
-
-### Constructor
-
-> **new ResultProxyCallError**(`message`, `originalError`): `ResultProxyCallError`
-
-#### Parameters
-
-##### message
-
-`string`
-
-A descriptive error message detailing the nature of the error.
-
-##### originalError
-
-`Error`
-
-The original Error object that caused this API call error.
-
-#### Returns
-
-`ResultProxyCallError`
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`constructor`](ApiCallError.md#constructor)
-
-## Properties
-
-### cause
-
-> **cause**: `Error`
-
-The original Error object that caused this API call error.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`cause`](ApiCallError.md#cause)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`originalError`](ApiCallError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/SmsCallError.md b/docs/iexec/namespaces/errors/classes/SmsCallError.md
index ab6d600d..d03149b6 100644
--- a/docs/iexec/namespaces/errors/classes/SmsCallError.md
+++ b/docs/iexec/namespaces/errors/classes/SmsCallError.md
@@ -16,7 +16,7 @@ SmsCallError encapsulates an error occurring during a call to the SMS API such a
 
 ### Constructor
 
-> **new SmsCallError**(`message`, `originalError`): `SmsCallError`
+> **new SmsCallError**(`message`, `options?`): `SmsCallError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ SmsCallError encapsulates an error occurring during a call to the SMS API such a
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this API call error.
+`unknown`
+
+The original error that caused this API call error.
 
 #### Returns
 
@@ -42,26 +44,12 @@ The original Error object that caused this API call error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this API call error.
+The original error that caused this API call error.
 
 #### Inherited from
 
 [`ApiCallError`](ApiCallError.md).[`cause`](ApiCallError.md#cause)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`originalError`](ApiCallError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/Web3ProviderCallError.md b/docs/iexec/namespaces/errors/classes/Web3ProviderCallError.md
index 1cab92df..135c74dc 100644
--- a/docs/iexec/namespaces/errors/classes/Web3ProviderCallError.md
+++ b/docs/iexec/namespaces/errors/classes/Web3ProviderCallError.md
@@ -16,7 +16,7 @@ Web3ProviderCallError encapsulates an error thrown by the web3 provider during a
 
 ### Constructor
 
-> **new Web3ProviderCallError**(`message`, `originalError`): `Web3ProviderCallError`
+> **new Web3ProviderCallError**(`message`, `options?`): `Web3ProviderCallError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ Web3ProviderCallError encapsulates an error thrown by the web3 provider during a
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this web3 provider error.
+`unknown`
+
+The original error that caused this web3 provider error.
 
 #### Returns
 
@@ -42,11 +44,11 @@ The original Error object that caused this web3 provider error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this web3 provider error.
+The original error that caused this web3 provider error.
 
 #### Inherited from
 
@@ -63,17 +65,3 @@ Wether the error was caused by a user rejection
 #### Inherited from
 
 [`Web3ProviderError`](Web3ProviderError.md).[`isUserRejection`](Web3ProviderError.md#isuserrejection)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`Web3ProviderError`](Web3ProviderError.md).[`originalError`](Web3ProviderError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/Web3ProviderError.md b/docs/iexec/namespaces/errors/classes/Web3ProviderError.md
index 8a44575d..c910f44b 100644
--- a/docs/iexec/namespaces/errors/classes/Web3ProviderError.md
+++ b/docs/iexec/namespaces/errors/classes/Web3ProviderError.md
@@ -22,7 +22,7 @@ Web3ProviderError encapsulates an error thrown by the web3 provider.
 
 ### Constructor
 
-> **new Web3ProviderError**(`message`, `originalError`): `Web3ProviderError`
+> **new Web3ProviderError**(`message`, `options?`): `Web3ProviderError`
 
 #### Parameters
 
@@ -32,11 +32,13 @@ Web3ProviderError encapsulates an error thrown by the web3 provider.
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this web3 provider error.
+`unknown`
+
+The original error that caused this web3 provider error.
 
 #### Returns
 
@@ -48,11 +50,11 @@ The original Error object that caused this web3 provider error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this web3 provider error.
+The original error that caused this web3 provider error.
 
 ***
 
@@ -61,13 +63,3 @@ The original Error object that caused this web3 provider error.
 > `optional` **isUserRejection**: `boolean`
 
 Wether the error was caused by a user rejection
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
diff --git a/docs/iexec/namespaces/errors/classes/Web3ProviderSendError.md b/docs/iexec/namespaces/errors/classes/Web3ProviderSendError.md
index 9c6863e0..8f100dc8 100644
--- a/docs/iexec/namespaces/errors/classes/Web3ProviderSendError.md
+++ b/docs/iexec/namespaces/errors/classes/Web3ProviderSendError.md
@@ -16,7 +16,7 @@ Web3ProviderSendError encapsulates an error thrown by the web3 provider during a
 
 ### Constructor
 
-> **new Web3ProviderSendError**(`message`, `originalError`): `Web3ProviderSendError`
+> **new Web3ProviderSendError**(`message`, `options?`): `Web3ProviderSendError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ Web3ProviderSendError encapsulates an error thrown by the web3 provider during a
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this web3 provider error.
+`unknown`
+
+The original error that caused this web3 provider error.
 
 #### Returns
 
@@ -42,11 +44,11 @@ The original Error object that caused this web3 provider error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this web3 provider error.
+The original error that caused this web3 provider error.
 
 #### Inherited from
 
@@ -63,17 +65,3 @@ Wether the error was caused by a user rejection
 #### Inherited from
 
 [`Web3ProviderError`](Web3ProviderError.md).[`isUserRejection`](Web3ProviderError.md#isuserrejection)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`Web3ProviderError`](Web3ProviderError.md).[`originalError`](Web3ProviderError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/Web3ProviderSignMessageError.md b/docs/iexec/namespaces/errors/classes/Web3ProviderSignMessageError.md
index c45ac04c..8f13248b 100644
--- a/docs/iexec/namespaces/errors/classes/Web3ProviderSignMessageError.md
+++ b/docs/iexec/namespaces/errors/classes/Web3ProviderSignMessageError.md
@@ -16,7 +16,7 @@ Web3ProviderSignMessageError encapsulates an error thrown by the web3 provider d
 
 ### Constructor
 
-> **new Web3ProviderSignMessageError**(`message`, `originalError`): `Web3ProviderSignMessageError`
+> **new Web3ProviderSignMessageError**(`message`, `options?`): `Web3ProviderSignMessageError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ Web3ProviderSignMessageError encapsulates an error thrown by the web3 provider d
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this web3 provider error.
+`unknown`
+
+The original error that caused this web3 provider error.
 
 #### Returns
 
@@ -42,11 +44,11 @@ The original Error object that caused this web3 provider error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this web3 provider error.
+The original error that caused this web3 provider error.
 
 #### Inherited from
 
@@ -63,17 +65,3 @@ Wether the error was caused by a user rejection
 #### Inherited from
 
 [`Web3ProviderError`](Web3ProviderError.md).[`isUserRejection`](Web3ProviderError.md#isuserrejection)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`Web3ProviderError`](Web3ProviderError.md).[`originalError`](Web3ProviderError.md#originalerror)
diff --git a/docs/iexec/namespaces/errors/classes/WorkerpoolCallError.md b/docs/iexec/namespaces/errors/classes/WorkerpoolCallError.md
index 59649501..ac032e80 100644
--- a/docs/iexec/namespaces/errors/classes/WorkerpoolCallError.md
+++ b/docs/iexec/namespaces/errors/classes/WorkerpoolCallError.md
@@ -16,7 +16,7 @@ WorkerpoolCallError encapsulates an error occurring during a call to a workerpoo
 
 ### Constructor
 
-> **new WorkerpoolCallError**(`message`, `originalError`): `WorkerpoolCallError`
+> **new WorkerpoolCallError**(`message`, `options?`): `WorkerpoolCallError`
 
 #### Parameters
 
@@ -26,11 +26,13 @@ WorkerpoolCallError encapsulates an error occurring during a call to a workerpoo
 
 A descriptive error message detailing the nature of the error.
 
-##### originalError
+##### options?
 
-`Error`
+###### cause?
 
-The original Error object that caused this API call error.
+`unknown`
+
+The original error that caused this API call error.
 
 #### Returns
 
@@ -42,26 +44,12 @@ The original Error object that caused this API call error.
 
 ## Properties
 
-### cause
+### cause?
 
-> **cause**: `Error`
+> `optional` **cause**: `unknown`
 
-The original Error object that caused this API call error.
+The original error that caused this API call error.
 
 #### Inherited from
 
 [`ApiCallError`](ApiCallError.md).[`cause`](ApiCallError.md#cause)
-
-***
-
-### ~~originalError~~
-
-> **originalError**: `Error`
-
-#### Deprecated
-
-use Error cause instead.
-
-#### Inherited from
-
-[`ApiCallError`](ApiCallError.md).[`originalError`](ApiCallError.md#originalerror)
diff --git a/docs/iexec/namespaces/utils/variables/getSignerFromPrivateKey.md b/docs/iexec/namespaces/utils/variables/getSignerFromPrivateKey.md
index 933628fb..b9d194ce 100644
--- a/docs/iexec/namespaces/utils/variables/getSignerFromPrivateKey.md
+++ b/docs/iexec/namespaces/utils/variables/getSignerFromPrivateKey.md
@@ -6,7 +6,7 @@
 
 # Variable: getSignerFromPrivateKey()
 
-> `const` **getSignerFromPrivateKey**: (`host`, `privateKey`, `options?`) => [`EnhancedWallet`](../../../../classes/EnhancedWallet.md)
+> `const` **getSignerFromPrivateKey**: (`host`, `privateKey`, `options?`) => `AbstractSigner`\<`Provider`\>
 
 create a signer connected to the specified blockchain host from a private key
 
@@ -36,24 +36,6 @@ if true allows using a provider connected to an experimental networks (default f
 
 ⚠️ experimental networks are networks on which the iExec's stack is partially deployed, experimental networks can be subject to instabilities or discontinuity. Access is provided without warranties.
 
-#### gasPrice?
-
-`bigint` \| `number` \| `string`
-
-gas price override
-
-#### getTransactionCount?
-
-(`blockTag?`) => `Promise`\<`number`\>
-
-nonce override
-
-#### providers?
-
-[`ProviderOptions`](../../../../interfaces/ProviderOptions.md)
-
-providers options
-
 ## Returns
 
-[`EnhancedWallet`](../../../../classes/EnhancedWallet.md)
+`AbstractSigner`\<`Provider`\>
diff --git a/docs/interfaces/IExecConfigArgs.md b/docs/interfaces/IExecConfigArgs.md
index 01f45dd9..4ab079ef 100644
--- a/docs/interfaces/IExecConfigArgs.md
+++ b/docs/interfaces/IExecConfigArgs.md
@@ -15,13 +15,12 @@
 A web3 Eth provider, a network name, a chain id or an ethers provider
 
 read-only provider examples:
-- `"mainnet"` or `1` or `"1"` for ethereum mainnet provider
-- `"bellecour"` or `134` or `"134"` for iExec sidechain
+- `"arbitrum-sepolia-testnet"` or `421614` or `"421614"` for arbitrum sepolia testnet provider
 - `"arbitrum-mainnet"` or `42161` or `"42161"` for arbitrum mainnet provider
 - `"http://localhost:8545"` for local chain
-- `new ethers.JsonRpcProvider("https://bellecour.iex.ec")` ethers provider connected to bellecour
+- `new ethers.JsonRpcProvider("https://<rpc-provider>")` ethers provider connected to your RPC provider
 
 signer provider examples:
 - `window.ethereum` for browser injected wallet provider
-- `utils.getSignerFromPrivateKey('bellecour', PRIVATE_KEY)` signer connected to bellecour
-- `new ethers.Wallet(PRIVATE_KEY, new ethers.JsonRpcProvider("https://bellecour.iex.ec"))` ethers wallet connected to bellecour
+- `utils.getSignerFromPrivateKey('arbitrum-sepolia-testnet', PRIVATE_KEY)` signer connected to arbitrum sepolia testnet using a private key
+- `new ethers.Wallet(PRIVATE_KEY, new ethers.JsonRpcProvider("https://<rpc-provider>"))` ethers wallet connected to a specific network
diff --git a/docs/interfaces/IExecConfigOptions.md b/docs/interfaces/IExecConfigOptions.md
index 5335dfcb..9348d513 100644
--- a/docs/interfaces/IExecConfigOptions.md
+++ b/docs/interfaces/IExecConfigOptions.md
@@ -18,46 +18,6 @@ if true allows using a provider connected to an experimental networks (default f
 
 ***
 
-### bridgeAddress?
-
-> `optional` **bridgeAddress**: `string`
-
-override the bridge contract address to target a custom instance
-
-***
-
-### bridgedNetworkConf?
-
-> `optional` **bridgedNetworkConf**: `object`
-
-override the bridged network configuration
-
-#### bridgeAddress?
-
-> `optional` **bridgeAddress**: `string`
-
-bridge contract address on bridged network
-
-#### chainId?
-
-> `optional` **chainId**: `string` \| `number`
-
-bridged network chainId
-
-#### hubAddress?
-
-> `optional` **hubAddress**: `string`
-
-IExec contract address on bridged network
-
-#### rpcURL?
-
-> `optional` **rpcURL**: `string`
-
-bridged network node url
-
-***
-
 ### compassURL?
 
 > `optional` **compassURL**: `string`
@@ -76,22 +36,6 @@ number of block to wait for transactions confirmation (default 1)
 
 ***
 
-### defaultTeeFramework?
-
-> `optional` **defaultTeeFramework**: [`TeeFramework`](../type-aliases/TeeFramework.md)
-
-override the TEE framework to use when as default
-
-***
-
-### ensPublicResolverAddress?
-
-> `optional` **ensPublicResolverAddress**: `string`
-
-override the ENS public resolver contract address to target a custom instance
-
-***
-
 ### hubAddress?
 
 > `optional` **hubAddress**: `string`
@@ -124,14 +68,6 @@ override the IPFS node URL to target a custom instance
 
 ***
 
-### isNative?
-
-> `optional` **isNative**: `boolean`
-
-true if IExec contract use the chain native token (default false)
-
-***
-
 ### pocoSubgraphURL?
 
 > `optional` **pocoSubgraphURL**: `string`
@@ -140,48 +76,8 @@ override the PoCo subgraph URL to target a custom instance
 
 ***
 
-### providerOptions?
-
-> `optional` **providerOptions**: [`ProviderOptions`](ProviderOptions.md) \| [`AnyRecord`](../type-aliases/AnyRecord.md)
-
-[ethers default provider](https://docs.ethers.io/v5/api/providers/#providers-getDefaultProvider) options
-
-***
-
-### resultProxyURL?
-
-> `optional` **resultProxyURL**: `string`
-
-override the result proxy URL to target a custom instance
-
-***
-
 ### smsURL?
 
-> `optional` **smsURL**: `string` \| `Record`\<[`TeeFramework`](../type-aliases/TeeFramework.md), `string`\>
+> `optional` **smsURL**: `string`
 
 override the SMS URL to target a custom instance
-
-***
-
-### useGas?
-
-> `optional` **useGas**: `boolean`
-
-if false set the gasPrice to 0 (default true)
-
-***
-
-### voucherHubAddress?
-
-> `optional` **voucherHubAddress**: `string`
-
-override the VoucherHub contract address to target a custom instance
-
-***
-
-### voucherSubgraphURL?
-
-> `optional` **voucherSubgraphURL**: `string`
-
-override the voucher subgraph URL to target a custom instance
diff --git a/docs/interfaces/ProviderOptions.md b/docs/interfaces/ProviderOptions.md
deleted file mode 100644
index 4072cee7..00000000
--- a/docs/interfaces/ProviderOptions.md
+++ /dev/null
@@ -1,67 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / ProviderOptions
-
-# Interface: ProviderOptions
-
-[ethers default provider](https://docs.ethers.io/v5/api/providers/#providers-getDefaultProvider) options
-
-## Properties
-
-### alchemy?
-
-> `optional` **alchemy**: `string`
-
-[Alchemy](https://alchemyapi.io/) API key
-
-***
-
-### cloudflare?
-
-> `optional` **cloudflare**: `boolean`
-
-allow Cloudflare provider
-
-***
-
-### etherscan?
-
-> `optional` **etherscan**: `string`
-
-[Etherscan](https://etherscan.io/) API key
-
-***
-
-### infura?
-
-> `optional` **infura**: `string` \| \{ `projectId`: `string`; `projectSecret`: `string`; \}
-
-[INFURA](https://infura.io/) Project ID or { projectId, projectSecret }
-
-#### Type Declaration
-
-`string`
-
-\{ `projectId`: `string`; `projectSecret`: `string`; \}
-
-#### projectId
-
-> **projectId**: `string`
-
-[INFURA](https://infura.io/) project ID
-
-#### projectSecret
-
-> **projectSecret**: `string`
-
-[INFURA](https://infura.io/) project secret
-
-***
-
-### quorum?
-
-> `optional` **quorum**: `number`
-
-the number of backends that must agree (default: 2 for mainnet, 1 for testnets)
diff --git a/docs/type-aliases/Addressish.md b/docs/type-aliases/Addressish.md
deleted file mode 100644
index 8c7fc588..00000000
--- a/docs/type-aliases/Addressish.md
+++ /dev/null
@@ -1,11 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / Addressish
-
-# Type Alias: Addressish
-
-> **Addressish** = [`Address`](Address.md) \| [`ENS`](ENS.md)
-
-ethereum address or ENS
diff --git a/docs/type-aliases/AnyRecord.md b/docs/type-aliases/AnyRecord.md
deleted file mode 100644
index 80bdd12e..00000000
--- a/docs/type-aliases/AnyRecord.md
+++ /dev/null
@@ -1,9 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / AnyRecord
-
-# Type Alias: AnyRecord
-
-> **AnyRecord** = `Record`\<`string`, `any`\>
diff --git a/docs/type-aliases/ENS.md b/docs/type-aliases/ENS.md
deleted file mode 100644
index a5d61c81..00000000
--- a/docs/type-aliases/ENS.md
+++ /dev/null
@@ -1,16 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / ENS
-
-# Type Alias: ENS
-
-> **ENS** = `string`
-
-ENS
-
-example:
-```js
-const ensName = 'iexec.eth';
-```
diff --git a/docs/type-aliases/Tag.md b/docs/type-aliases/Tag.md
index 6dba9596..8512315e 100644
--- a/docs/type-aliases/Tag.md
+++ b/docs/type-aliases/Tag.md
@@ -13,6 +13,5 @@ task tag used to specify the runtime
 example:
 ```js
 const gpuTag = ['gpu'];
-const sconeTeeTag = ['tee', 'scone'];
-const gramineTeeTag = ['tee', 'gramine'];
+const tdxTeeTag = ['tee', 'tdx'];
 ```
diff --git a/docs/type-aliases/TeeFramework.md b/docs/type-aliases/TeeFramework.md
deleted file mode 100644
index fed490e6..00000000
--- a/docs/type-aliases/TeeFramework.md
+++ /dev/null
@@ -1,11 +0,0 @@
-[**iexec**](../README.md)
-
-***
-
-[iexec](../globals.md) / TeeFramework
-
-# Type Alias: TeeFramework
-
-> **TeeFramework** = `"scone"` \| `"gramine"` \| `"tdx"`
-
-Trusted Execution Environment name
diff --git a/eslint.config.js b/eslint.config.js
index ce4dd684..423bf6c3 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -40,9 +40,7 @@ export default [
             '_subscribe',
             '_chainId',
             '_contracts',
-            '_bridgedContracts',
             '_chainConfDefaults',
-            '_bridgedConf',
           ],
         },
       ],
diff --git a/generateEsModulesFromJson.cjs b/generateEsModulesFromJson.cjs
index 2574294d..0ebe86da 100644
--- a/generateEsModulesFromJson.cjs
+++ b/generateEsModulesFromJson.cjs
@@ -35,10 +35,6 @@ const sources = [
     '@iexec/poco/artifacts/contracts/IexecInterfaceToken.sol/IexecInterfaceToken.json',
     { dir: '@iexec/poco', minifier: minifiers.abi },
   ],
-  [
-    '@iexec/poco/artifacts/contracts/IexecInterfaceNative.sol/IexecInterfaceNative.json',
-    { dir: '@iexec/poco', minifier: minifiers.abi },
-  ],
   [
     '@iexec/poco/artifacts/contracts/registries/apps/AppRegistry.sol/AppRegistry.json',
     { dir: '@iexec/poco', minifier: minifiers.abi },
@@ -63,37 +59,6 @@ const sources = [
     '@iexec/poco/artifacts/contracts/registries/datasets/Dataset.sol/Dataset.json',
     { dir: '@iexec/poco', minifier: minifiers.abi },
   ],
-  [
-    '@iexec/voucher-contracts/artifacts/contracts/beacon/Voucher.sol/Voucher.json',
-    { dir: '@iexec/voucher-contracts', minifier: minifiers.abi },
-  ],
-  [
-    '@iexec/voucher-contracts/artifacts/contracts/VoucherHub.sol/VoucherHub.json',
-    { dir: '@iexec/voucher-contracts', minifier: minifiers.abi },
-  ],
-  [
-    '@iexec/voucher-contracts/deployments/bellecour/VoucherHubERC1967Proxy.json',
-    {
-      dir: '@iexec/voucher-contracts/deployments/bellecour',
-      minifier: minifiers.hardhatDeployment,
-    },
-  ],
-  [
-    '@ensdomains/ens-contracts/artifacts/contracts/registry/ENSRegistry.sol/ENSRegistry.json',
-    { dir: '@ensdomains/registry', minifier: minifiers.abi },
-  ],
-  [
-    '@ensdomains/ens-contracts/artifacts/contracts/registry/FIFSRegistrar.sol/FIFSRegistrar.json',
-    { dir: '@ensdomains/registry', minifier: minifiers.abi },
-  ],
-  [
-    '@ensdomains/ens-contracts/artifacts/contracts/reverseRegistrar/ReverseRegistrar.sol/ReverseRegistrar.json',
-    { dir: '@ensdomains/registry', minifier: minifiers.abi },
-  ],
-  [
-    '@ensdomains/ens-contracts/artifacts/contracts/resolvers/PublicResolver.sol/PublicResolver.json',
-    { dir: '@ensdomains/resolvers', minifier: minifiers.abi },
-  ],
 ];
 
 const createEsModule = (jsonObj) => {
diff --git a/package-lock.json b/package-lock.json
index 451b8992..f3ef245a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,10 +36,8 @@
         "iexec": "dist/esm/cli/cmd/iexec.js"
       },
       "devDependencies": {
-        "@ensdomains/ens-contracts": "^1.2.5",
         "@eslint/js": "^9.23.0",
         "@iexec/poco": "^6.1.0",
-        "@iexec/voucher-contracts": "^1.0.1",
         "eslint": "^9.23.0",
         "eslint-config-prettier": "^10.1.1",
         "eslint-plugin-import": "^2.32.0",
@@ -612,42 +610,6 @@
         "@chainsafe/is-ip": "^2.0.1"
       }
     },
-    "node_modules/@ensdomains/buffer": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@ensdomains/buffer/-/buffer-0.1.3.tgz",
-      "integrity": "sha512-L/GoCkQFePjSn4DeVnBNfkGdm2CI8UxTxwgQztcZ1L9aHaFefRD+mTUXxtikk946KwwMHRQJDn38wo1IWtEpSg==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/@ensdomains/ens-contracts": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@ensdomains/ens-contracts/-/ens-contracts-1.2.5.tgz",
-      "integrity": "sha512-bzoc/o5OAF1NP2PeCmKhexspT8hVkQZfvN1n2bLNDCPWhdNfyVU2peNqVwqFh/gah9L1GJabhPPU2gKRURgD5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ensdomains/buffer": "^0.1.1",
-        "@ensdomains/solsha1": "0.0.3",
-        "@openzeppelin/contracts": "^4.1.0",
-        "dns-packet": "^5.3.0"
-      }
-    },
-    "node_modules/@ensdomains/ens-contracts/node_modules/@openzeppelin/contracts": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.3.tgz",
-      "integrity": "sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@ensdomains/solsha1": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@ensdomains/solsha1/-/solsha1-0.0.3.tgz",
-      "integrity": "sha512-uhuG5LzRt/UJC0Ux83cE2rCKwSleRePoYdQVcqPN1wyf3/ekMzT/KZUF9+v7/AG5w9jlMLCQkUM50vfjr0Yu9Q==",
-      "dev": true,
-      "dependencies": {
-        "hash-test-vectors": "^1.3.2"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.9.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
@@ -947,48 +909,6 @@
       "integrity": "sha512-bUOmkSoPkjnUyMiKo6RYnb0VHBk5D9KKDAgNLzF41aqAM3TeE0yGdFF5dVRcV60pZdJLlyFT/jjXIZCWyyEzAQ==",
       "dev": true
     },
-    "node_modules/@iexec/voucher-contracts": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@iexec/voucher-contracts/-/voucher-contracts-1.0.1.tgz",
-      "integrity": "sha512-nHku8/Rv8uxZYLdpe9hbk0zIr0tJRgEXjFMemb9CFXZ9ej8tXIff8NtmhkaXfxMnvfX4p/hygytd31ITelXHvA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@iexec/poco": "^5.5.0",
-        "@openzeppelin/contracts-upgradeable": "^5.0.2"
-      }
-    },
-    "node_modules/@iexec/voucher-contracts/node_modules/@iexec/poco": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@iexec/poco/-/poco-5.5.0.tgz",
-      "integrity": "sha512-F2Jlhhc4CuTM2nghFQVjK+HGkasvX0OApyPGCB5VDm8XizfHPliw4rL9ABnrVcSl4XXc2FQaoWQfo9T6KpRNLQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@iexec/interface": "3.0.35-8",
-        "@iexec/solidity": "^0.1.1",
-        "@openzeppelin/contracts": "3.3.0",
-        "@openzeppelin/contracts-v5": "npm:@openzeppelin/contracts@^5.0.2",
-        "@uniswap/v2-periphery": "1.1.0-beta.0",
-        "rlc-faucet-contract": "1.0.10"
-      }
-    },
-    "node_modules/@iexec/voucher-contracts/node_modules/@iexec/poco/node_modules/@openzeppelin/contracts": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.3.0.tgz",
-      "integrity": "sha512-AemZEsQYtUp1WRkcmZm1div5ORfTpLquLaziCIrSagjxyKdmObxuaY1yjQ5SHFMctR8rLwp706NXTbiIRJg7pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@iexec/voucher-contracts/node_modules/@openzeppelin/contracts-upgradeable": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz",
-      "integrity": "sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ==",
-      "dev": true,
-      "peerDependencies": {
-        "@openzeppelin/contracts": "5.0.2"
-      }
-    },
     "node_modules/@inquirer/ansi": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.2.tgz",
@@ -2171,14 +2091,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@openzeppelin/contracts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz",
-      "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/@openzeppelin/contracts-v5": {
       "name": "@openzeppelin/contracts",
       "version": "5.1.0",
@@ -4718,12 +4630,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/hash-test-vectors": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/hash-test-vectors/-/hash-test-vectors-1.3.2.tgz",
-      "integrity": "sha512-PKd/fitmsrlWGh3OpKbgNLE04ZQZsvs1ZkuLoQpeIKuwx+6CYVNdW6LaPIS1QAdZvV40+skk0w4YomKnViUnvQ==",
-      "dev": true
-    },
     "node_modules/hashlru": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/hashlru/-/hashlru-2.3.0.tgz",
@@ -9439,41 +9345,6 @@
         "@chainsafe/is-ip": "^2.0.1"
       }
     },
-    "@ensdomains/buffer": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@ensdomains/buffer/-/buffer-0.1.3.tgz",
-      "integrity": "sha512-L/GoCkQFePjSn4DeVnBNfkGdm2CI8UxTxwgQztcZ1L9aHaFefRD+mTUXxtikk946KwwMHRQJDn38wo1IWtEpSg==",
-      "dev": true
-    },
-    "@ensdomains/ens-contracts": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@ensdomains/ens-contracts/-/ens-contracts-1.2.5.tgz",
-      "integrity": "sha512-bzoc/o5OAF1NP2PeCmKhexspT8hVkQZfvN1n2bLNDCPWhdNfyVU2peNqVwqFh/gah9L1GJabhPPU2gKRURgD5g==",
-      "dev": true,
-      "requires": {
-        "@ensdomains/buffer": "^0.1.1",
-        "@ensdomains/solsha1": "0.0.3",
-        "@openzeppelin/contracts": "^4.1.0",
-        "dns-packet": "^5.3.0"
-      },
-      "dependencies": {
-        "@openzeppelin/contracts": {
-          "version": "4.9.3",
-          "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.3.tgz",
-          "integrity": "sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==",
-          "dev": true
-        }
-      }
-    },
-    "@ensdomains/solsha1": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@ensdomains/solsha1/-/solsha1-0.0.3.tgz",
-      "integrity": "sha512-uhuG5LzRt/UJC0Ux83cE2rCKwSleRePoYdQVcqPN1wyf3/ekMzT/KZUF9+v7/AG5w9jlMLCQkUM50vfjr0Yu9Q==",
-      "dev": true,
-      "requires": {
-        "hash-test-vectors": "^1.3.2"
-      }
-    },
     "@eslint-community/eslint-utils": {
       "version": "4.9.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
@@ -9676,47 +9547,6 @@
         }
       }
     },
-    "@iexec/voucher-contracts": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@iexec/voucher-contracts/-/voucher-contracts-1.0.1.tgz",
-      "integrity": "sha512-nHku8/Rv8uxZYLdpe9hbk0zIr0tJRgEXjFMemb9CFXZ9ej8tXIff8NtmhkaXfxMnvfX4p/hygytd31ITelXHvA==",
-      "dev": true,
-      "requires": {
-        "@iexec/poco": "^5.5.0",
-        "@openzeppelin/contracts-upgradeable": "^5.0.2"
-      },
-      "dependencies": {
-        "@iexec/poco": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/@iexec/poco/-/poco-5.5.0.tgz",
-          "integrity": "sha512-F2Jlhhc4CuTM2nghFQVjK+HGkasvX0OApyPGCB5VDm8XizfHPliw4rL9ABnrVcSl4XXc2FQaoWQfo9T6KpRNLQ==",
-          "dev": true,
-          "requires": {
-            "@iexec/interface": "3.0.35-8",
-            "@iexec/solidity": "^0.1.1",
-            "@openzeppelin/contracts": "3.3.0",
-            "@openzeppelin/contracts-v5": "npm:@openzeppelin/contracts@^5.0.2",
-            "@uniswap/v2-periphery": "1.1.0-beta.0",
-            "rlc-faucet-contract": "1.0.10"
-          },
-          "dependencies": {
-            "@openzeppelin/contracts": {
-              "version": "3.3.0",
-              "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.3.0.tgz",
-              "integrity": "sha512-AemZEsQYtUp1WRkcmZm1div5ORfTpLquLaziCIrSagjxyKdmObxuaY1yjQ5SHFMctR8rLwp706NXTbiIRJg7pw==",
-              "dev": true
-            }
-          }
-        },
-        "@openzeppelin/contracts-upgradeable": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz",
-          "integrity": "sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
     "@inquirer/ansi": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.2.tgz",
@@ -10561,13 +10391,6 @@
         "fastq": "^1.6.0"
       }
     },
-    "@openzeppelin/contracts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz",
-      "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==",
-      "dev": true,
-      "peer": true
-    },
     "@openzeppelin/contracts-v5": {
       "version": "npm:@openzeppelin/contracts@5.1.0",
       "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.1.0.tgz",
@@ -12333,12 +12156,6 @@
         "has-symbols": "^1.0.3"
       }
     },
-    "hash-test-vectors": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/hash-test-vectors/-/hash-test-vectors-1.3.2.tgz",
-      "integrity": "sha512-PKd/fitmsrlWGh3OpKbgNLE04ZQZsvs1ZkuLoQpeIKuwx+6CYVNdW6LaPIS1QAdZvV40+skk0w4YomKnViUnvQ==",
-      "dev": true
-    },
     "hashlru": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/hashlru/-/hashlru-2.3.0.tgz",
diff --git a/package.json b/package.json
index 74a3797e..004357cb 100644
--- a/package.json
+++ b/package.json
@@ -51,12 +51,6 @@
       "browser": "./dist/esm/lib/IExecDealModule.js",
       "default": "./dist/esm/lib/IExecDealModule.js"
     },
-    "./IExecENSModule": {
-      "types": "./dist/esm/lib/IExecENSModule.d.ts",
-      "import": "./dist/esm/lib/IExecENSModule.js",
-      "browser": "./dist/esm/lib/IExecENSModule.js",
-      "default": "./dist/esm/lib/IExecENSModule.js"
-    },
     "./IExecHubModule": {
       "types": "./dist/esm/lib/IExecHubModule.d.ts",
       "import": "./dist/esm/lib/IExecHubModule.js",
@@ -111,12 +105,6 @@
       "browser": "./dist/esm/lib/IExecTaskModule.js",
       "default": "./dist/esm/lib/IExecTaskModule.js"
     },
-    "./IExecVoucherModule": {
-      "types": "./dist/esm/lib/IExecVoucherModule.d.ts",
-      "import": "./dist/esm/lib/IExecVoucherModule.js",
-      "browser": "./dist/esm/lib/IExecVoucherModule.js",
-      "default": "./dist/esm/lib/IExecVoucherModule.js"
-    },
     "./IExecWalletModule": {
       "types": "./dist/esm/lib/IExecWalletModule.d.ts",
       "import": "./dist/esm/lib/IExecWalletModule.js",
@@ -161,7 +149,7 @@
     "build:doc": "npm run build:doc:lib && npm run build:doc:cli",
     "build:doc:lib": "./node_modules/typedoc/bin/typedoc --tsconfig tsconfig.doc.json --disableSources",
     "build:doc:cli": "node generateCliDoc.cjs",
-    "test:prepare": "node test/scripts/prepare-bellecour-fork-for-tests.js"
+    "test:prepare": "node test/scripts/prepare-forks-for-tests.js"
   },
   "files": [
     "src/",
@@ -172,7 +160,6 @@
     "IExecDatasetModule",
     "IExecConfig",
     "IExecDealModule",
-    "IExecENSModule",
     "IExecHubModule",
     "IExecModule",
     "IExecNetworkModule",
@@ -182,7 +169,6 @@
     "IExecSecretsModule",
     "IExecStorageModule",
     "IExecTaskModule",
-    "IExecVoucherModule",
     "IExecWalletModule",
     "IExecWorkerpoolModule",
     "errors",
@@ -223,10 +209,8 @@
     "yup": "^1.6.1"
   },
   "devDependencies": {
-    "@ensdomains/ens-contracts": "^1.2.5",
     "@eslint/js": "^9.23.0",
     "@iexec/poco": "^6.1.0",
-    "@iexec/voucher-contracts": "^1.0.1",
     "eslint": "^9.23.0",
     "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-import": "^2.32.0",
diff --git a/src/cli/cmd/iexec-account.js b/src/cli/cmd/iexec-account.js
index 3a1f542b..2bda19a4 100644
--- a/src/cli/cmd/iexec-account.js
+++ b/src/cli/cmd/iexec-account.js
@@ -38,7 +38,6 @@ addGlobalOptions(deposit);
 addWalletLoadOptions(deposit);
 deposit
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.deposit())
   .action(async (amount, unit, opts) => {
@@ -49,7 +48,7 @@ deposit
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.depositing());
       const depositRes = await accountDeposit(chain.contracts, [amount, unit]);
       spinner.succeed(info.deposited(formatRLC(depositRes.amount)), {
@@ -65,7 +64,6 @@ addGlobalOptions(withdraw);
 addWalletLoadOptions(withdraw);
 withdraw
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.withdraw())
   .action(async (amount, unit, opts) => {
@@ -76,7 +74,7 @@ withdraw
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.withdrawing());
       const res = await accountWithdraw(chain.contracts, [amount, unit]);
       spinner.succeed(info.withdrawn(formatRLC(res.amount)), {
@@ -144,7 +142,6 @@ addGlobalOptions(approve);
 addWalletLoadOptions(approve);
 approve
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.approve())
   .action(async (amount, spender, unit = 'nRLC', opts) => {
@@ -155,7 +152,7 @@ approve
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.approving());
       const txHash = await accountApprove(
         chain.contracts,
@@ -203,7 +200,6 @@ addGlobalOptions(revoke);
 addWalletLoadOptions(revoke);
 revoke
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.revoke())
   .action(async (spender, opts) => {
@@ -214,7 +210,7 @@ revoke
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.revoking(spender));
       const txHash = await accountApprove(chain.contracts, 0, spender);
       spinner.succeed(info.revoked(spender), {
diff --git a/src/cli/cmd/iexec-app.js b/src/cli/cmd/iexec-app.js
index 7b166735..45d37367 100644
--- a/src/cli/cmd/iexec-app.js
+++ b/src/cli/cmd/iexec-app.js
@@ -15,12 +15,11 @@ import {
   paramsEncryptResultSchema,
   paramsRequesterSecretsSchema,
   nRlcAmountSchema,
-  teeFrameworkSchema,
   datasetorderSchema,
   apporderSchema,
   requestorderSchema,
 } from '../../common/utils/validator.js';
-import { app, sconeTeeApp, gramineTeeApp } from '../utils/templates.js';
+import { app } from '../utils/templates.js';
 import {
   deployApp,
   showApp,
@@ -32,7 +31,6 @@ import {
   checkDeployedApp,
   checkDeployedDataset,
   checkDeployedWorkerpool,
-  resolveTeeFrameworkFromApp,
   transferApp,
 } from '../../common/protocol/registries.js';
 import { showCategory } from '../../common/protocol/category.js';
@@ -86,7 +84,6 @@ import {
 import {
   checkRequestRequirements,
   checkDatasetRequirements,
-  resolveTeeFrameworkFromTag,
   checkAppRequirements,
 } from '../../common/execution/order-helper.js';
 import {
@@ -104,12 +101,8 @@ import {
   Spinner,
   pretty,
   info,
-  isEthAddress,
   renderTasksStatus,
-  getPropertyFormChain,
-  getDefaultTeeFrameworkFromChain,
-  getSmsUrlFromChain,
-  optionCreator,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import {
   loadIExecConf,
@@ -119,13 +112,10 @@ import {
 } from '../utils/fs.js';
 import { Keystore } from '../utils/keystore.js';
 import { loadChain, connectKeystore } from '../utils/chains.js';
-import { lookupAddress } from '../../common/ens/resolution.js';
-import {
-  ConfigurationError,
-  ValidationError,
-} from '../../common/utils/errors.js';
+import { ValidationError } from '../../common/utils/errors.js';
 import { pushAppSecret } from '../../common/sms/push.js';
 import { checkAppSecretExists } from '../../common/sms/check.js';
+import { isAddress } from 'ethers';
 
 const debug = Debug('iexec:iexec-app');
 
@@ -139,54 +129,32 @@ cli
 const init = cli.command('init');
 addGlobalOptions(init);
 addWalletLoadOptions(init);
-init
-  .option(...option.initTee())
-  .addOption(optionCreator.teeFramework())
-  .description(desc.initObj(objName))
-  .action(async (opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const walletOptions = computeWalletLoadOptions(opts);
-      const keystore = Keystore({ ...walletOptions, isSigner: false });
-      const [address] = await keystore.accounts();
-
-      const teeFramework =
-        (await teeFrameworkSchema().validate(opts.teeFramework)) ||
-        (opts.tee &&
-          getDefaultTeeFrameworkFromChain(
-            await loadChain(opts.chain, { spinner }),
-          ));
-      let teeTemplate = {};
-      if (teeFramework === TEE_FRAMEWORKS.SCONE) {
-        teeTemplate = sconeTeeApp;
-      }
-      if (teeFramework === TEE_FRAMEWORKS.GRAMINE) {
-        teeTemplate = gramineTeeApp;
-      }
-      if (teeFramework === TEE_FRAMEWORKS.TDX) {
-        teeTemplate = app;
-      }
-      const { saved, fileName } = await initObj(objName, {
-        overwrite: { ...teeTemplate, owner: address },
-      });
-      spinner.succeed(
-        `Saved default ${objName} in "${fileName}", you can edit it:${pretty(
-          saved,
-        )}`,
-        { raw: { app: saved } },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
+init.description(desc.initObj(objName)).action(async (opts) => {
+  await checkUpdate(opts);
+  const spinner = Spinner(opts);
+  try {
+    const walletOptions = computeWalletLoadOptions(opts);
+    const keystore = Keystore({ ...walletOptions, isSigner: false });
+    const [address] = await keystore.accounts();
+    const { saved, fileName } = await initObj(objName, {
+      overwrite: { ...app, owner: address },
+    });
+    spinner.succeed(
+      `Saved default ${objName} in "${fileName}", you can edit it:${pretty(
+        saved,
+      )}`,
+      { raw: { app: saved } },
+    );
+  } catch (error) {
+    handleError(error, cli, opts);
+  }
+});
 
 const deploy = cli.command('deploy');
 addGlobalOptions(deploy);
 addWalletLoadOptions(deploy);
 deploy
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.deployObj(objName))
   .action(async (opts) => {
@@ -205,7 +173,7 @@ deploy
           `Missing ${objName} in "iexec.json". Did you forget to run "iexec ${objName} init"?`,
         );
       }
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.deploying(objName));
       const { address, txHash } = await deployApp(
         chain.contracts,
@@ -243,9 +211,9 @@ show
           (deployedObj) => deployedObj && deployedObj[chain.id],
         ));
 
-      const isAddress = isEthAddress(addressOrIndex, { strict: false });
+      const isAddr = isAddress(addressOrIndex);
       const userAddress = opts.user || (address !== NULL_ADDRESS && address);
-      if (!isAddress && !userAddress)
+      if (!isAddr && !userAddress)
         throw new Error(`Missing option ${option.user()[0]} or wallet`);
 
       if (!addressOrIndex)
@@ -253,38 +221,18 @@ show
       spinner.start(info.showing(objName));
 
       let res;
-      let ens;
-      if (isAddress) {
-        [res, ens] = await Promise.all([
-          showApp(chain.contracts, addressOrIndex),
-          lookupAddress(chain.contracts, addressOrIndex).catch((e) => {
-            if (e instanceof ConfigurationError) {
-              /** no ENS */
-            } else {
-              throw e;
-            }
-          }),
-        ]);
+      if (isAddr) {
+        res = await showApp(chain.contracts, addressOrIndex);
       } else {
         res = await showUserApp(chain.contracts, addressOrIndex, userAddress);
-        ens = await lookupAddress(chain.contracts, res.objAddress).catch(
-          (e) => {
-            if (e instanceof ConfigurationError) {
-              /** no ENS */
-            } else {
-              throw e;
-            }
-          },
-        );
       }
       const { app, objAddress } = res;
       spinner.succeed(
         `App ${objAddress} details:${pretty({
-          ...(ens && { ENS: ens }),
           ...app,
         })}`,
         {
-          raw: { address: objAddress, ens, app },
+          raw: { address: objAddress, app },
         },
       );
     } catch (error) {
@@ -327,7 +275,6 @@ const checkSecret = cli.command('check-secret [appAddress]');
 addGlobalOptions(checkSecret);
 checkSecret
   .option(...option.chain())
-  .addOption(optionCreator.teeFramework())
   .description(desc.checkSecret())
   .action(async (objAddress, opts) => {
     await checkUpdate(opts);
@@ -345,17 +292,8 @@ checkSecret
         );
       }
       spinner.info(`Checking secret for address ${resourceAddress}`);
-      let teeFramework = await teeFrameworkSchema().validate(opts.teeFramework);
-      if (!teeFramework) {
-        const { app } = await showApp(chain.contracts, resourceAddress);
-        teeFramework = await resolveTeeFrameworkFromApp(app);
-      }
-      const sms = getSmsUrlFromChain(chain, { teeFramework });
-      const secretIsSet = await checkAppSecretExists(
-        chain.contracts,
-        sms,
-        resourceAddress,
-      );
+      const sms = getPropertyFromChain(chain, 'sms');
+      const secretIsSet = await checkAppSecretExists(sms, resourceAddress);
       if (secretIsSet) {
         spinner.succeed(`Secret found for app ${resourceAddress}`, {
           raw: { isSecretSet: true },
@@ -376,7 +314,6 @@ addWalletLoadOptions(pushSecret);
 pushSecret
   .option(...option.chain())
   .option(...option.secretValue())
-  .addOption(optionCreator.teeFramework())
   .description('push the app secret to the secret management service')
   .action(async (objAddress, opts) => {
     await checkUpdate(opts);
@@ -398,12 +335,7 @@ pushSecret
         );
       }
       spinner.info(`App ${resourceAddress}`);
-      let teeFramework = await teeFrameworkSchema().validate(opts.teeFramework);
-      if (!teeFramework) {
-        const { app } = await showApp(chain.contracts, resourceAddress);
-        teeFramework = await resolveTeeFrameworkFromApp(app);
-      }
-      const sms = getSmsUrlFromChain(chain, { teeFramework });
+      const sms = getPropertyFromChain(chain, 'sms');
       const secretValue =
         opts.secretValue ||
         (await prompt.password(`Paste your secret`, {
@@ -478,7 +410,7 @@ publish
         workerpoolrestrict: opts.workerpoolRestrict,
         requesterrestrict: opts.requesterRestrict,
       };
-      const orderToSign = await createApporder(chain.contracts, overrides);
+      const orderToSign = await createApporder(overrides);
       if (!opts.skipPreflightCheck) {
         await checkAppRequirements({ contracts: chain.contracts }, orderToSign);
       }
@@ -489,7 +421,7 @@ publish
       const signedOrder = await signApporder(chain.contracts, orderToSign);
       const orderHash = await publishApporder(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         signedOrder,
       );
       spinner.succeed(
@@ -543,12 +475,12 @@ unpublish
       const unpublished = all
         ? await unpublishAllApporders(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             address,
           )
         : await unpublishLastApporder(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             address,
           );
       spinner.succeed(
@@ -571,7 +503,6 @@ addGlobalOptions(run);
 addWalletLoadOptions(run);
 run
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.appRunWatch())
@@ -589,8 +520,6 @@ run
   .option(...orderOption.beneficiary())
   .option(...orderOption.params())
   .option(...option.skipPreflightCheck())
-  .option(...option.useVoucher())
-  .option(...option.voucherAddress())
   .description(desc.appRun())
   .action(async (appAddress, opts) => {
     await checkUpdate(opts);
@@ -735,13 +664,9 @@ run
       debug('tag', tag);
       const trust = await positiveIntSchema().validate(opts.trust || '0');
       debug('trust', trust);
-      const callback = await addressSchema({
-        ethProvider: chain.contracts.provider,
-      }).validate(opts.callback);
+      const callback = await addressSchema().validate(opts.callback);
       debug('callback', callback);
-      const beneficiary = await addressSchema({
-        ethProvider: chain.contracts.provider,
-      }).validate(opts.beneficiary);
+      const beneficiary = await addressSchema().validate(opts.beneficiary);
       debug('beneficiary', beneficiary);
 
       const watch = !!opts.watch || !!opts.download;
@@ -758,7 +683,7 @@ run
         if (isAppOwner) {
           spinner.info('Creating apporder');
           await connectKeystore(chain, keystore);
-          return createApporder(chain.contracts, {
+          return createApporder({
             app,
             appprice: 0,
             volume: 1,
@@ -767,24 +692,24 @@ run
           }).then((o) => signApporder(chain.contracts, o));
         }
         spinner.info('Fetching apporder from iExec Marketplace');
-        const minTags = [];
+        const appMinTags = [];
         if (checkActiveBitInTag(tag, TAG_MAP.tee)) {
-          minTags.push('tee');
+          appMinTags.push('tee');
         }
         Object.values(TEE_FRAMEWORKS).forEach((teeFrameworkTag) => {
           if (checkActiveBitInTag(tag, TAG_MAP[teeFrameworkTag])) {
-            minTags.push(teeFrameworkTag);
+            appMinTags.push(teeFrameworkTag);
           }
         });
         const { orders } = await fetchAppOrderbook(
           chain.contracts,
-          getPropertyFormChain(chain, 'iexecGateway'),
+          getPropertyFromChain(chain, 'iexecGateway'),
           {
             app,
             requester,
             ...(useDataset && { dataset }),
             ...(runOnWorkerpool && { workerpool }),
-            ...{ minTag: encodeTag(minTags) },
+            ...{ minTag: encodeTag(appMinTags) },
             maxTag: tag,
           },
         );
@@ -811,7 +736,7 @@ run
         if (isDatasetOwner) {
           spinner.info('Creating datasetorder');
           await connectKeystore(chain, keystore);
-          return createDatasetorder(chain.contracts, {
+          return createDatasetorder({
             dataset,
             datasetprice: 0,
             volume: 1,
@@ -822,7 +747,7 @@ run
         spinner.info('Fetching datasetorder from iExec Marketplace');
         const { orders } = await fetchDatasetOrderbook(
           chain.contracts,
-          getPropertyFormChain(chain, 'iexecGateway'),
+          getPropertyFromChain(chain, 'iexecGateway'),
           {
             dataset,
             app,
@@ -869,7 +794,7 @@ run
           if (isWorkerpoolOwner) {
             spinner.info('Creating workerpoolorder');
             await connectKeystore(chain, keystore);
-            return createWorkerpoolorder(chain.contracts, {
+            return createWorkerpoolorder({
               workerpool,
               workerpoolprice: 0,
               volume: 1,
@@ -888,7 +813,7 @@ run
           debug('try category', catid, 'strict', strict);
           const { orders } = await fetchWorkerpoolOrderbook(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             {
               category: catid,
               app,
@@ -954,7 +879,7 @@ run
       debug('datasetorder', datasetorder);
 
       spinner.info('Creating requestorder');
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       const requestorderToSign = await createRequestorder(
         {
           contracts: chain.contracts,
@@ -984,18 +909,19 @@ run
               .validate(requestorderToSign)
           ).tag,
           (await apporderSchema().label('apporder').validate(apporder)).tag,
-          (
-            await datasetorderSchema()
-              .label('datasetorder')
-              .validate(datasetorder)
-          ).tag,
+          stripTeeFrameworkFromTag(
+            (
+              await datasetorderSchema()
+                .label('datasetorder')
+                .validate(datasetorder)
+            ).tag,
+          ),
         ]);
         await checkAppRequirements(
           {
             contracts: chain.contracts,
           },
           apporder,
-          { tagOverride: resolvedTag },
         ).catch((e) => {
           throw new Error(
             `App requirements check failed: ${
@@ -1007,10 +933,7 @@ run
         });
         await checkDatasetRequirements(
           {
-            contracts: chain.contracts,
-            smsURL: getSmsUrlFromChain(chain, {
-              teeFramework: await resolveTeeFrameworkFromTag(resolvedTag),
-            }),
+            smsURL: getPropertyFromChain(chain, 'sms'),
           },
           datasetorder,
           { tagOverride: resolvedTag },
@@ -1025,10 +948,7 @@ run
         });
         await checkRequestRequirements(
           {
-            contracts: chain.contracts,
-            smsURL: getSmsUrlFromChain(chain, {
-              teeFramework: await resolveTeeFrameworkFromTag(resolvedTag),
-            }),
+            smsURL: getPropertyFromChain(chain, 'sms'),
           },
           requestorderToSign,
         ).catch((e) => {
@@ -1048,64 +968,60 @@ run
 
       debug('requestorder', requestorder);
 
-      const { total: totalCost, sponsored } = await estimateMatchOrders({
+      const { total: totalCost } = await estimateMatchOrders({
         contracts: chain.contracts,
-        voucherHubAddress: chain.voucherHub,
         apporder,
         datasetorder,
         workerpoolorder,
         requestorder,
-        useVoucher: opts.useVoucher,
-        voucherAddress: opts.voucherAddress,
       });
 
       spinner.stop();
 
       if (!opts.force) {
         await prompt.custom(
-          `Do you want to spend ${formatRLC(totalCost)} nRLC ${
-            sponsored > 0 ? `(${sponsored} nRLC sponsored by the voucher)` : ''
-          } to execute the following request: ${pretty({
-            app: `${requestorder.app} (${formatRLC(
-              requestorder.appmaxprice,
-            )} RLC)`,
-            dataset:
-              requestorder.dataset !== NULL_ADDRESS
-                ? `${requestorder.dataset} (${formatRLC(
-                    requestorder.datasetmaxprice,
-                  )} RLC)`
-                : undefined,
-            workerpool: `${requestorder.workerpool} (${formatRLC(
-              requestorder.workerpoolmaxprice,
-            )} RLC)`,
-            params:
-              (requestorder.params && JSON.parse(requestorder.params)) ||
-              undefined,
-            category: requestorder.category,
-            tag:
-              requestorder.tag !== NULL_BYTES32 ? requestorder.tag : undefined,
-            callback:
-              requestorder.callback !== NULL_ADDRESS
-                ? requestorder.callback
-                : undefined,
-            beneficiary:
-              requestorder.beneficiary !== requestorder.requester
-                ? requestorder.beneficiary
-                : undefined,
-          })}`,
+          `Do you want to spend ${formatRLC(totalCost)} nRLC to execute the following request: ${pretty(
+            {
+              app: `${requestorder.app} (${formatRLC(
+                requestorder.appmaxprice,
+              )} RLC)`,
+              dataset:
+                requestorder.dataset !== NULL_ADDRESS
+                  ? `${requestorder.dataset} (${formatRLC(
+                      requestorder.datasetmaxprice,
+                    )} RLC)`
+                  : undefined,
+              workerpool: `${requestorder.workerpool} (${formatRLC(
+                requestorder.workerpoolmaxprice,
+              )} RLC)`,
+              params:
+                (requestorder.params && JSON.parse(requestorder.params)) ||
+                undefined,
+              category: requestorder.category,
+              tag:
+                requestorder.tag !== NULL_BYTES32
+                  ? requestorder.tag
+                  : undefined,
+              callback:
+                requestorder.callback !== NULL_ADDRESS
+                  ? requestorder.callback
+                  : undefined,
+              beneficiary:
+                requestorder.beneficiary !== requestorder.requester
+                  ? requestorder.beneficiary
+                  : undefined,
+            },
+          )}`,
         );
       }
 
       spinner.start('Submitting deal');
       const { dealid, volume, txHash } = await matchOrders({
         contracts: chain.contracts,
-        voucherHubAddress: chain.voucherHub,
         apporder,
         datasetorder,
         workerpoolorder,
         requestorder,
-        useVoucher: opts.useVoucher,
-        voucherAddress: opts.voucherAddress,
       });
 
       result.deals.push({ dealid, volume: volume.toString(), txHash });
@@ -1295,13 +1211,9 @@ requestRun
       debug('tag', tag);
       const trust = await positiveIntSchema().validate(opts.trust || 0);
       debug('trust', trust);
-      const callback = await addressSchema({
-        ethProvider: chain.contracts.provider,
-      }).validate(opts.callback);
+      const callback = await addressSchema().validate(opts.callback);
       debug('callback', callback);
-      const beneficiary = await addressSchema({
-        ethProvider: chain.contracts.provider,
-      }).validate(opts.beneficiary);
+      const beneficiary = await addressSchema().validate(opts.beneficiary);
       debug('beneficiary', beneficiary);
 
       spinner.info('Creating requestorder');
@@ -1330,8 +1242,7 @@ requestRun
       if (!opts.skipPreflightCheck) {
         await checkRequestRequirements(
           {
-            contracts: chain.contracts,
-            smsURL: getSmsUrlFromChain(chain),
+            smsURL: getPropertyFromChain(chain, 'sms'),
           },
           requestorderToSign,
         ).catch((e) => {
@@ -1407,7 +1318,7 @@ requestRun
       spinner.start('Publishing requestorder');
       const orderHash = await publishRequestorder(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         requestorder,
       );
       spinner.succeed(
@@ -1428,7 +1339,6 @@ addGlobalOptions(transfer);
 addWalletLoadOptions(transfer);
 transfer
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.to())
@@ -1441,7 +1351,7 @@ transfer
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       if (!opts.to) throw new Error('Missing --to option');
       if (!opts.force) {
         await prompt.transferObj(objName, objAddress, opts.to, chain.id);
diff --git a/src/cli/cmd/iexec-category.js b/src/cli/cmd/iexec-category.js
index 07414ce2..03c3327e 100644
--- a/src/cli/cmd/iexec-category.js
+++ b/src/cli/cmd/iexec-category.js
@@ -51,7 +51,6 @@ addGlobalOptions(create);
 addWalletLoadOptions(create);
 create
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.createObj(objName))
   .action(async (opts) => {
@@ -70,7 +69,7 @@ create
           `Missing ${objName} in "iexec.json". Did you forget to run "iexec ${objName} init"?`,
         );
       }
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.creating('category'));
       const { catid, txHash } = await createCategory(
         chain.contracts,
diff --git a/src/cli/cmd/iexec-dataset.js b/src/cli/cmd/iexec-dataset.js
index 21277253..cb74f9e9 100644
--- a/src/cli/cmd/iexec-dataset.js
+++ b/src/cli/cmd/iexec-dataset.js
@@ -56,17 +56,10 @@ import {
   pretty,
   info,
   prompt,
-  isEthAddress,
-  getPropertyFormChain,
-  getSmsUrlFromChain,
-  optionCreator,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
-import { lookupAddress } from '../../common/ens/resolution.js';
-import { ConfigurationError } from '../../common/utils/errors.js';
-import {
-  checkDatasetRequirements,
-  resolveTeeFrameworkFromTag,
-} from '../../common/execution/order-helper.js';
+import { checkDatasetRequirements } from '../../common/execution/order-helper.js';
+import { isAddress } from 'ethers';
 
 const { ensureDir, pathExists, readFile, lstat, readdir } = fsExtra;
 
@@ -130,7 +123,6 @@ addGlobalOptions(deploy);
 addWalletLoadOptions(deploy);
 deploy
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.deployObj(objName))
   .action(async (opts) => {
@@ -149,7 +141,7 @@ deploy
           `Missing ${objName} in "iexec.json". Did you forget to run "iexec ${objName} init"?`,
         );
       }
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.deploying(objName));
       const { address, txHash } = await deployDataset(
         chain.contracts,
@@ -187,9 +179,9 @@ show
           (deployedObj) => deployedObj && deployedObj[chain.id],
         ));
 
-      const isAddress = isEthAddress(addressOrIndex, { strict: false });
+      const isAddr = isAddress(addressOrIndex);
       const userAddress = opts.user || (address !== NULL_ADDRESS && address);
-      if (!isAddress && !userAddress)
+      if (!isAddr && !userAddress)
         throw new Error(`Missing option ${option.user()[0]} or wallet`);
 
       if (!addressOrIndex)
@@ -198,42 +190,22 @@ show
       spinner.start(info.showing(objName));
 
       let res;
-      let ens;
-      if (isAddress) {
-        [res, ens] = await Promise.all([
-          showDataset(chain.contracts, addressOrIndex),
-          lookupAddress(chain.contracts, addressOrIndex).catch((e) => {
-            if (e instanceof ConfigurationError) {
-              /** no ENS */
-            } else {
-              throw e;
-            }
-          }),
-        ]);
+      if (isAddr) {
+        res = await showDataset(chain.contracts, addressOrIndex);
       } else {
         res = await showUserDataset(
           chain.contracts,
           addressOrIndex,
           userAddress,
         );
-        ens = await lookupAddress(chain.contracts, res.objAddress).catch(
-          (e) => {
-            if (e instanceof ConfigurationError) {
-              /** no ENS */
-            } else {
-              throw e;
-            }
-          },
-        );
       }
       const { dataset, objAddress } = res;
       spinner.succeed(
         `Dataset ${objAddress} details:${pretty({
-          ...(ens && { ENS: ens }),
           ...dataset,
         })}`,
         {
-          raw: { address: objAddress, ens, dataset },
+          raw: { address: objAddress, dataset },
         },
       );
     } catch (error) {
@@ -406,7 +378,6 @@ addWalletLoadOptions(pushSecret);
 pushSecret
   .option(...option.chain())
   .option(...option.secretPath())
-  .addOption(optionCreator.teeFramework())
   .description(desc.pushDatasetSecret())
   .action(async (objAddress, opts) => {
     await checkUpdate(opts);
@@ -416,9 +387,7 @@ pushSecret
       const keystore = Keystore(Object.assign(walletOptions));
       const chain = await loadChain(opts.chain, { spinner });
       const { contracts } = chain;
-      const sms = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
+      const sms = getPropertyFromChain(chain, 'sms');
       const [address] = await keystore.accounts();
       debug('address', address);
       const resourceAddress =
@@ -470,7 +439,6 @@ const checkSecret = cli.command('check-secret [datasetAddress]');
 addGlobalOptions(checkSecret);
 checkSecret
   .option(...option.chain())
-  .addOption(optionCreator.teeFramework())
   .description(desc.checkSecret())
   .action(async (objAddress, opts) => {
     await checkUpdate(opts);
@@ -488,14 +456,8 @@ checkSecret
         );
       }
       spinner.info(`Checking secret for address ${resourceAddress}`);
-      const sms = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
-      const secretIsSet = await checkWeb3SecretExists(
-        chain.contracts,
-        sms,
-        resourceAddress,
-      );
+      const sms = getPropertyFromChain(chain, 'sms');
+      const secretIsSet = await checkWeb3SecretExists(sms, resourceAddress);
       if (secretIsSet) {
         spinner.succeed(`Secret found for dataset ${resourceAddress}`, {
           raw: { isSecretSet: true },
@@ -550,7 +512,7 @@ publish
       if (!(await checkDeployedDataset(chain.contracts, address))) {
         throw new Error(`No ${objName} deployed at address ${address}`);
       }
-      const overrides = {
+      const orderToSign = await createDatasetorder({
         dataset: address,
         datasetprice: opts.price,
         volume: opts.volume || '1000000',
@@ -558,16 +520,10 @@ publish
         apprestrict: opts.appRestrict,
         workerpoolrestrict: opts.workerpoolRestrict,
         requesterrestrict: opts.requesterRestrict,
-      };
-      const orderToSign = await createDatasetorder(chain.contracts, overrides);
+      });
       if (!opts.skipPreflightCheck) {
-        const sms = getSmsUrlFromChain(chain, {
-          teeFramework: await resolveTeeFrameworkFromTag(orderToSign.tag),
-        });
-        await checkDatasetRequirements(
-          { contracts: chain.contracts, smsURL: sms },
-          orderToSign,
-        );
+        const sms = getPropertyFromChain(chain, 'sms');
+        await checkDatasetRequirements({ smsURL: sms }, orderToSign);
       }
       if (!opts.force) {
         await prompt.publishOrder(`${objName}order`, pretty(orderToSign));
@@ -576,7 +532,7 @@ publish
       const signedOrder = await signDatasetorder(chain.contracts, orderToSign);
       const orderHash = await publishDatasetorder(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         signedOrder,
       );
       spinner.succeed(
@@ -630,12 +586,12 @@ unpublish
       const unpublished = all
         ? await unpublishAllDatasetorders(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             address,
           )
         : await unpublishLastDatasetorder(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             address,
           );
       spinner.succeed(
@@ -658,7 +614,6 @@ addGlobalOptions(transfer);
 addWalletLoadOptions(transfer);
 transfer
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.to())
@@ -671,7 +626,7 @@ transfer
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       if (!opts.to) throw new Error('Missing --to option');
       if (!opts.force) {
         await prompt.transferObj(objName, objAddress, opts.to, chain.id);
diff --git a/src/cli/cmd/iexec-deal.js b/src/cli/cmd/iexec-deal.js
index c49fadd1..8c9a1407 100644
--- a/src/cli/cmd/iexec-deal.js
+++ b/src/cli/cmd/iexec-deal.js
@@ -95,7 +95,6 @@ addGlobalOptions(claimDeal);
 addWalletLoadOptions(claimDeal);
 claimDeal
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.claimObj(objName))
   .action(async (dealid, opts) => {
@@ -106,7 +105,7 @@ claimDeal
       const keystore = Keystore(walletOptions);
       const txOptions = await computeTxOptions(opts);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.claiming(objName));
       const { claimed, transactions } = await claim(chain.contracts, dealid);
       spinner.succeed(
diff --git a/src/cli/cmd/iexec-ens.js b/src/cli/cmd/iexec-ens.js
deleted file mode 100644
index a3a08fc4..00000000
--- a/src/cli/cmd/iexec-ens.js
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/env node
-
-// const Debug = require('debug');
-import { program as cli } from 'commander';
-import {
-  getOwner,
-  resolveName,
-  lookupAddress,
-} from '../../common/ens/resolution.js';
-import {
-  registerFifsEns,
-  configureResolution,
-  getDefaultDomain,
-} from '../../common/ens/registration.js';
-import {
-  finalizeCli,
-  addGlobalOptions,
-  addWalletLoadOptions,
-  computeWalletLoadOptions,
-  computeTxOptions,
-  checkUpdate,
-  handleError,
-  option,
-  Spinner,
-  getPropertyFormChain,
-  prompt,
-} from '../utils/cli-helper.js';
-import { Keystore } from '../utils/keystore.js';
-import { loadChain, connectKeystore } from '../utils/chains.js';
-
-cli.name('iexec ens').usage('<command> [options]');
-
-const resolve = cli.command('resolve <name>');
-addGlobalOptions(resolve);
-resolve
-  .option(...option.chain())
-  .description('resolve an ENS name to an address')
-  .action(async (name, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const chain = await loadChain(opts.chain, { spinner });
-
-      spinner.start('Resolving ENS');
-      const address = await resolveName(chain.contracts, name);
-      spinner.succeed(
-        address
-          ? `ENS ${name} resolved to ${address}`
-          : `No resolver configured for ${name}`,
-        {
-          raw: {
-            address,
-          },
-        },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-const lookup = cli.command('lookup <address>');
-addGlobalOptions(lookup);
-lookup
-  .option(...option.chain())
-  .description('lookup for the ENS name of an address')
-  .action(async (address, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const chain = await loadChain(opts.chain, { spinner });
-
-      spinner.start('Looking up for the ENS name');
-      const name = await lookupAddress(chain.contracts, address);
-      spinner.succeed(
-        name
-          ? `${address} is associated to ENS ${name}`
-          : `No reverse resolution configured for ${address}`,
-        {
-          raw: {
-            name,
-          },
-        },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-const getEnsOwner = cli.command('get-owner <name>');
-addGlobalOptions(getEnsOwner);
-getEnsOwner
-  .option(...option.chain())
-  .description('find the the owner address of an ENS name')
-  .action(async (name, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const chain = await loadChain(opts.chain, { spinner });
-
-      spinner.start('Finding ENS name owner');
-      const owner = await getOwner(chain.contracts, name);
-      spinner.succeed(`ENS ${name} is owned by ${owner}`, {
-        raw: {
-          owner,
-        },
-      });
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-const register = cli.command('register <label>');
-addGlobalOptions(register);
-addWalletLoadOptions(register);
-register
-  .option(...option.chain())
-  .option(...option.force())
-  .option(...option.txGasPrice())
-  .option(...option.txConfirms())
-  .option(
-    '--domain <domain>',
-    `use the specified ENS domain (default \`users.iexec.eth\`)
- - if the ENS name (label.domain) is not owned by the user, the domain must be controlled by a FIFS registrar
- - if the ENS name (label.domain) is already owned by the user, the registration will be skipped`,
-  )
-  .option(
-    '--for <address>',
-    'register for an owned iExec app, dataset or workerpool',
-  )
-  .description(
-    'register an ENS if needed and setup both ENS resolution and reverse resolution',
-  )
-  .action(async (label, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const { force } = opts;
-      const forAddress = opts.for; // workaround cannot destructure for
-      let { domain } = opts;
-      const walletOptions = computeWalletLoadOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const txOptions = await computeTxOptions(opts);
-      const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
-
-      const [walletAddress] = await keystore.accounts();
-      const targetAddress = forAddress || walletAddress;
-
-      if (!force) {
-        const currentEns = await lookupAddress(chain.contracts, targetAddress);
-        if (currentEns) {
-          await prompt.custom(
-            `An ENS (${currentEns}) is already configured for address ${targetAddress}, this configuration will be replaced, do you want to continue?`,
-            { strict: true },
-          );
-        }
-      }
-
-      spinner.start('Registering ENS');
-      if (!domain) {
-        domain = await getDefaultDomain(chain.contracts, targetAddress);
-      }
-      const { registerTxHash, name } = await registerFifsEns(
-        chain.contracts,
-        label,
-        domain,
-      );
-      spinner.info(
-        registerTxHash
-          ? `Registered new ENS ${name}`
-          : `ENS ${name} already owned`,
-      );
-
-      spinner.start('Configuring ENS resolution');
-      const {
-        setResolverTxHash,
-        setAddrTxHash,
-        claimReverseTxHash,
-        setNameTxHash,
-      } = await configureResolution(
-        chain.contracts,
-        getPropertyFormChain(chain, 'ensPublicResolver'),
-        name,
-        targetAddress,
-      );
-      spinner.succeed(
-        `ENS ${name} successfully registered and configured for ${targetAddress}`,
-        {
-          raw: {
-            name,
-            address: targetAddress,
-            registerTxHash,
-            setResolverTxHash,
-            setAddrTxHash,
-            claimReverseTxHash,
-            setNameTxHash,
-          },
-        },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-finalizeCli(cli);
diff --git a/src/cli/cmd/iexec-order.js b/src/cli/cmd/iexec-order.js
index e41df8e6..06cacb7d 100644
--- a/src/cli/cmd/iexec-order.js
+++ b/src/cli/cmd/iexec-order.js
@@ -60,12 +60,10 @@ import {
   info,
   isBytes32,
   prompt,
-  getPropertyFormChain,
-  getSmsUrlFromChain,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import {
   checkRequestRequirements,
-  resolveTeeFrameworkFromTag,
   checkDatasetRequirements,
   checkAppRequirements,
 } from '../../common/execution/order-helper.js';
@@ -213,7 +211,7 @@ sign
           if (!loadedOrder) {
             throw new Error(info.missingOrder(APP_ORDER, 'app'));
           }
-          const orderObj = await createApporder(chain.contracts, loadedOrder);
+          const orderObj = await createApporder(loadedOrder);
           if (!(await checkDeployedApp(chain.contracts, orderObj.app)))
             throw new Error(`No app deployed at address ${orderObj.app}`);
           if (!opts.skipPreflightCheck) {
@@ -254,10 +252,7 @@ sign
           if (!loadedOrder) {
             throw new Error(info.missingOrder(DATASET_ORDER, 'dataset'));
           }
-          const orderObj = await createDatasetorder(
-            chain.contracts,
-            loadedOrder,
-          );
+          const orderObj = await createDatasetorder(loadedOrder);
           if (!(await checkDeployedDataset(chain.contracts, orderObj.dataset)))
             throw new Error(
               `No dataset deployed at address ${orderObj.dataset}`,
@@ -265,10 +260,7 @@ sign
           if (!opts.skipPreflightCheck) {
             await checkDatasetRequirements(
               {
-                contracts: chain.contracts,
-                smsURL: getSmsUrlFromChain(chain, {
-                  teeFramework: await resolveTeeFrameworkFromTag(orderObj.tag),
-                }),
+                smsURL: getPropertyFromChain(chain, 'sms'),
               },
               orderObj,
             ).catch((e) => {
@@ -305,10 +297,7 @@ sign
           if (!loadedOrder) {
             throw new Error(info.missingOrder(WORKERPOOL_ORDER, 'workerpool'));
           }
-          const orderObj = await createWorkerpoolorder(
-            chain.contracts,
-            loadedOrder,
-          );
+          const orderObj = await createWorkerpoolorder(loadedOrder);
           if (
             !(await checkDeployedWorkerpool(
               chain.contracts,
@@ -354,10 +343,7 @@ sign
           if (!opts.skipPreflightCheck) {
             await checkRequestRequirements(
               {
-                contracts: chain.contracts,
-                smsURL: getSmsUrlFromChain(chain, {
-                  teeFramework: await resolveTeeFrameworkFromTag(orderObj.tag),
-                }),
+                smsURL: getPropertyFromChain(chain, 'sms'),
               },
               orderObj,
             ).catch((e) => {
@@ -409,7 +395,6 @@ addGlobalOptions(fill);
 addWalletLoadOptions(fill);
 fill
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.fillAppOrder())
@@ -418,8 +403,6 @@ fill
   .option(...option.fillRequestOrder())
   .option(...option.fillRequestParams())
   .option(...option.skipPreflightCheck())
-  .option(...option.useVoucher())
-  .option(...option.voucherAddress())
   .description(desc.fill(objName))
   .action(async (opts) => {
     await checkUpdate(opts);
@@ -442,7 +425,7 @@ fill
             `Fetching ${orderName} ${orderHash} from iexec marketplace`,
           );
           const orderRes = await fetchPublishedOrderByHash(
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             orderName,
             chain.id,
             orderHash,
@@ -484,7 +467,7 @@ fill
       if (!workerpoolorder) throw new Error('Missing workerpoolorder');
 
       const computeRequestOrder = async () => {
-        await connectKeystore(chain, keystore, { txOptions });
+        await connectKeystore(chain, keystore);
         const unsignedOrder = await createRequestorder(
           {
             contracts: chain.contracts,
@@ -536,7 +519,6 @@ fill
             contracts: chain.contracts,
           },
           apporder,
-          { tagOverride: resolvedTag },
         ).catch((e) => {
           throw new Error(
             `App requirements check failed: ${
@@ -549,10 +531,7 @@ fill
         if (useDataset) {
           await checkDatasetRequirements(
             {
-              contracts: chain.contracts,
-              smsURL: getSmsUrlFromChain(chain, {
-                teeFramework: await resolveTeeFrameworkFromTag(resolvedTag),
-              }),
+              smsURL: getPropertyFromChain(chain, 'sms'),
             },
             datasetorder,
             { tagOverride: resolvedTag },
@@ -568,10 +547,7 @@ fill
         }
         await checkRequestRequirements(
           {
-            contracts: chain.contracts,
-            smsURL: getSmsUrlFromChain(chain, {
-              teeFramework: await resolveTeeFrameworkFromTag(resolvedTag),
-            }),
+            smsURL: getPropertyFromChain(chain, 'sms'),
           },
           requestorder,
         ).catch((e) => {
@@ -585,17 +561,14 @@ fill
         });
       }
 
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.filling(objName));
       const { dealid, volume, txHash } = await matchOrders({
         contracts: chain.contracts,
-        voucherHubAddress: chain.voucherHub,
         apporder,
         datasetorder: useDataset ? datasetorder : undefined,
         workerpoolorder,
         requestorder,
-        useVoucher: opts.useVoucher,
-        voucherAddress: opts.voucherAddress,
       });
       spinner.succeed(
         `${volume} task successfully purchased with dealid ${dealid}`,
@@ -672,7 +645,7 @@ publish
               }
               orderHash = await publishApporder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderToPublish,
               );
               break;
@@ -680,12 +653,7 @@ publish
               if (!opts.skipPreflightCheck) {
                 await checkDatasetRequirements(
                   {
-                    contracts: chain.contracts,
-                    smsURL: getSmsUrlFromChain(chain, {
-                      teeFramework: await resolveTeeFrameworkFromTag(
-                        orderToPublish.tag,
-                      ),
-                    }),
+                    smsURL: getPropertyFromChain(chain, 'sms'),
                   },
                   orderToPublish,
                 ).catch((e) => {
@@ -700,14 +668,14 @@ publish
               }
               orderHash = await publishDatasetorder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderToPublish,
               );
               break;
             case WORKERPOOL_ORDER:
               orderHash = await publishWorkerpoolorder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderToPublish,
               );
               break;
@@ -715,12 +683,7 @@ publish
               if (!opts.skipPreflightCheck) {
                 await checkRequestRequirements(
                   {
-                    contracts: chain.contracts,
-                    smsURL: getSmsUrlFromChain(chain, {
-                      teeFramework: await resolveTeeFrameworkFromTag(
-                        orderToPublish.tag,
-                      ),
-                    }),
+                    smsURL: getPropertyFromChain(chain, 'sms'),
                   },
                   orderToPublish,
                 ).catch((e) => {
@@ -735,7 +698,7 @@ publish
               }
               orderHash = await publishRequestorder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderToPublish,
               );
               break;
@@ -835,28 +798,28 @@ unpublish
             case APP_ORDER:
               unpublished = await unpublishApporder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderHashToUnpublish,
               );
               break;
             case DATASET_ORDER:
               unpublished = await unpublishDatasetorder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderHashToUnpublish,
               );
               break;
             case WORKERPOOL_ORDER:
               unpublished = await unpublishWorkerpoolorder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderHashToUnpublish,
               );
               break;
             case REQUEST_ORDER:
               unpublished = await unpublishRequestorder(
                 chain.contracts,
-                getPropertyFormChain(chain, 'iexecGateway'),
+                getPropertyFromChain(chain, 'iexecGateway'),
                 orderHashToUnpublish,
               );
               break;
@@ -896,7 +859,6 @@ addGlobalOptions(cancel);
 addWalletLoadOptions(cancel);
 cancel
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.cancelAppOrder())
@@ -920,7 +882,7 @@ cancel
         loadChain(opts.chain, { txOptions, spinner }),
         loadSignedOrders(),
       ]);
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       const success = {};
       const failed = [];
 
@@ -1033,7 +995,7 @@ show
           isBytes32(orderHash);
           spinner.start(info.showing(orderName));
           const orderToShow = await fetchPublishedOrderByHash(
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             orderName,
             chain.id,
             orderHash,
@@ -1041,7 +1003,7 @@ show
           let deals;
           if (opts.deals) {
             deals = await fetchDealsByOrderHash(
-              getPropertyFormChain(chain, 'iexecGateway'),
+              getPropertyFromChain(chain, 'iexecGateway'),
               orderName,
               chain.id,
               orderHash,
diff --git a/src/cli/cmd/iexec-orderbook.js b/src/cli/cmd/iexec-orderbook.js
index 2350db6d..5450ba58 100644
--- a/src/cli/cmd/iexec-orderbook.js
+++ b/src/cli/cmd/iexec-orderbook.js
@@ -19,7 +19,7 @@ import {
   displayPaginableRequest,
   pretty,
   info,
-  getPropertyFormChain,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import { loadChain } from '../utils/chains.js';
 
@@ -65,7 +65,7 @@ orderbookApp
 
       const request = fetchAppOrderbook(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         {
           app,
           dataset,
@@ -179,7 +179,7 @@ orderbookDataset
 
       const request = fetchDatasetOrderbook(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         {
           dataset,
           app,
@@ -297,7 +297,7 @@ orderbookWorkerpool
 
       const request = fetchWorkerpoolOrderbook(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         {
           category,
           workerpool,
@@ -422,7 +422,7 @@ orderbookRequester
 
       const request = fetchRequestOrderbook(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         {
           category,
           requester: address,
diff --git a/src/cli/cmd/iexec-requester.js b/src/cli/cmd/iexec-requester.js
index ffb2fae9..187f3efc 100644
--- a/src/cli/cmd/iexec-requester.js
+++ b/src/cli/cmd/iexec-requester.js
@@ -14,8 +14,7 @@ import {
   option,
   prompt,
   Spinner,
-  getSmsUrlFromChain,
-  optionCreator,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import { loadChain, connectKeystore } from '../utils/chains.js';
 import { Keystore } from '../utils/keystore.js';
@@ -28,7 +27,6 @@ addWalletLoadOptions(pushSecret);
 pushSecret
   .option(...option.chain())
   .option(...option.secretValue())
-  .addOption(optionCreator.teeFramework())
   .description(desc.pushRequesterSecret())
   .action(async (secretName, opts) => {
     await checkUpdate(opts);
@@ -44,9 +42,7 @@ pushSecret
       ]);
       await connectKeystore(chain, keystore);
       const { contracts } = chain;
-      const sms = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
+      const sms = getPropertyFromChain(chain, 'sms');
       spinner.info(`Secret "${secretName}" for address ${address}`);
       const secretValue =
         opts.secretValue ||
@@ -77,7 +73,6 @@ addGlobalOptions(checkSecret);
 addWalletLoadOptions(checkSecret);
 checkSecret
   .option(...option.chain())
-  .addOption(optionCreator.teeFramework())
   .description(desc.checkSecret())
   .action(async (secretName, requesterAddress, opts) => {
     await checkUpdate(opts);
@@ -99,12 +94,8 @@ checkSecret
           `Checking secret "${secretName}" exists for wallet ${address}`,
         );
       }
-      const { contracts } = chain;
-      const sms = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
+      const sms = getPropertyFromChain(chain, 'sms');
       const secretExists = await checkRequesterSecretExists(
-        contracts,
         sms,
         address,
         secretName,
diff --git a/src/cli/cmd/iexec-result.js b/src/cli/cmd/iexec-result.js
index 7132721e..542c3fc1 100644
--- a/src/cli/cmd/iexec-result.js
+++ b/src/cli/cmd/iexec-result.js
@@ -27,8 +27,7 @@ import {
   DEFAULT_DECRYPTED_RESULTS_NAME,
   publicKeyName,
   privateKeyName,
-  getSmsUrlFromChain,
-  optionCreator,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import { loadChain, connectKeystore } from '../utils/chains.js';
 import { saveTextToFile } from '../utils/fs.js';
@@ -210,7 +209,6 @@ pushSecret
   .option(...option.chain())
   .option(...option.forceUpdateSecret())
   .option(...option.secretPath())
-  .addOption(optionCreator.teeFramework())
   .description(desc.pushResultKey())
   .action(async (opts) => {
     await checkUpdate(opts);
@@ -226,9 +224,7 @@ pushSecret
       ]);
       await connectKeystore(chain, keystore);
       const { contracts } = chain;
-      const sms = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
+      const sms = getPropertyFromChain(chain, 'sms');
       let secretFilePath;
       if (opts.secretPath) {
         secretFilePath = opts.secretPath;
@@ -267,7 +263,6 @@ addGlobalOptions(checkSecret);
 addWalletLoadOptions(checkSecret);
 checkSecret
   .option(...option.chain())
-  .addOption(optionCreator.teeFramework())
   .description(desc.checkSecret())
   .action(async (address, opts) => {
     await checkUpdate(opts);
@@ -287,12 +282,8 @@ checkSecret
         [keyAddress] = await keystore.accounts();
         spinner.info(`Checking encryption key exists for wallet ${keyAddress}`);
       }
-      const { contracts } = chain;
-      const sms = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
+      const sms = getPropertyFromChain(chain, 'sms');
       const secretExists = await checkWeb2SecretExists(
-        contracts,
         sms,
         keyAddress,
         getResultEncryptionKeyName(),
diff --git a/src/cli/cmd/iexec-storage.js b/src/cli/cmd/iexec-storage.js
index 132572b3..dac86708 100644
--- a/src/cli/cmd/iexec-storage.js
+++ b/src/cli/cmd/iexec-storage.js
@@ -1,10 +1,6 @@
 #!/usr/bin/env node
 
 import { program as cli } from 'commander';
-import { checkWeb2SecretExists } from '../../common/sms/check.js';
-import { pushWeb2Secret } from '../../common/sms/push.js';
-import { login as resultProxyLogin } from '../../common/storage/result-proxy.js';
-import { getStorageTokenKeyName } from '../../common/utils/secrets-utils.js';
 import {
   finalizeCli,
   addGlobalOptions,
@@ -16,23 +12,25 @@ import {
   option,
   prompt,
   Spinner,
-  getPropertyFormChain,
-  getSmsUrlFromChain,
-  optionCreator,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import { loadChain, connectKeystore } from '../utils/chains.js';
 import { Keystore } from '../utils/keystore.js';
+import { STORAGE_PROVIDERS } from '../../common/utils/constant.js';
+import {
+  checkStorageTokenExists,
+  pushStorageToken,
+} from '../../common/execution/storage.js';
 
 cli.name('iexec storage').usage('<command> [options]');
 
-const initStorage = cli.command('init [provider]');
+const initStorage = cli.command('init <provider>');
 addGlobalOptions(initStorage);
 addWalletLoadOptions(initStorage);
 initStorage
   .option(...option.chain())
   .option(...option.forceUpdateSecret())
   .option(...option.storageToken())
-  .addOption(optionCreator.teeFramework())
   .description(desc.initStorage())
   .action(async (provider, opts) => {
     await checkUpdate(opts);
@@ -45,19 +43,12 @@ initStorage
         keystore.accounts(),
       ]);
       const { contracts } = chain;
-      const smsURL = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
-      const resultProxyURL = getPropertyFormChain(chain, 'resultProxy');
-
-      const providerName = provider || 'default';
-      const tokenKeyName = getStorageTokenKeyName(providerName);
-
-      const tokenExists = await checkWeb2SecretExists(
-        contracts,
-        smsURL,
+      const smsURL = getPropertyFromChain(chain, 'sms');
+      const providerName = provider || STORAGE_PROVIDERS.IPFS;
+      const tokenExists = await checkStorageTokenExists(
+        { smsURL },
         address,
-        tokenKeyName,
+        providerName,
       );
       if (tokenExists && !opts.forceUpdate) {
         throw new Error(
@@ -66,24 +57,16 @@ initStorage
           } option to update your storage token`,
         );
       }
-
-      let token;
-      if (providerName === 'default') {
-        await connectKeystore(chain, keystore);
-        token = await resultProxyLogin(contracts, resultProxyURL);
-      } else {
-        token =
-          opts.token ||
-          (await prompt.password(`Paste your ${provider} token`, {
-            useMask: true,
-          }));
-        await connectKeystore(chain, keystore);
-      }
-      const { isPushed, isUpdated } = await pushWeb2Secret(
-        contracts,
-        smsURL,
-        tokenKeyName,
+      const token =
+        opts.token ||
+        (await prompt.password(`Paste your ${provider} token`, {
+          useMask: true,
+        }));
+      await connectKeystore(chain, keystore);
+      const { isPushed, isUpdated } = await pushStorageToken(
+        { contracts, smsURL },
         token,
+        providerName,
         { forceUpdate: !!opts.forceUpdate },
       );
       if (isPushed) {
@@ -101,13 +84,12 @@ initStorage
     }
   });
 
-const checkStorage = cli.command('check [provider]');
+const checkStorage = cli.command('check <provider>');
 addGlobalOptions(checkStorage);
 addWalletLoadOptions(checkStorage);
 checkStorage
   .option(...option.chain())
   .option(...option.user())
-  .addOption(optionCreator.teeFramework())
   .description(desc.checkStorage())
   .action(async (provider, opts) => {
     await checkUpdate(opts);
@@ -119,21 +101,16 @@ checkStorage
         loadChain(opts.chain, { spinner }),
         keystore.accounts(),
       ]);
-      const { contracts } = chain;
-      const smsURL = getSmsUrlFromChain(chain, {
-        teeFramework: opts.teeFramework,
-      });
-      const providerName = provider || 'default';
-      const tokenKeyName = getStorageTokenKeyName(providerName);
+      const smsURL = getPropertyFromChain(chain, 'sms');
+      const providerName = provider || STORAGE_PROVIDERS.IPFS;
       const userAddress = opts.user || address;
       spinner.info(
         `Checking ${providerName} storage token for user ${userAddress}`,
       );
-      const tokenExists = await checkWeb2SecretExists(
-        contracts,
-        smsURL,
+      const tokenExists = await checkStorageTokenExists(
+        { smsURL },
         userAddress,
-        tokenKeyName,
+        providerName,
       );
       if (tokenExists) {
         spinner.succeed('Storage already initialized', {
diff --git a/src/cli/cmd/iexec-task.js b/src/cli/cmd/iexec-task.js
index 436b44f7..fe7ef074 100644
--- a/src/cli/cmd/iexec-task.js
+++ b/src/cli/cmd/iexec-task.js
@@ -247,7 +247,6 @@ addGlobalOptions(claimTask);
 addWalletLoadOptions(claimTask);
 claimTask
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.claimObj(objName))
   .action(async (taskid, opts) => {
@@ -258,7 +257,7 @@ claimTask
       const keystore = Keystore(walletOptions);
       const txOptions = await computeTxOptions(opts);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
 
       spinner.start(info.claiming(objName));
       const txHash = await claim(chain.contracts, taskid);
diff --git a/src/cli/cmd/iexec-voucher.js b/src/cli/cmd/iexec-voucher.js
deleted file mode 100644
index 5c562649..00000000
--- a/src/cli/cmd/iexec-voucher.js
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env node
-
-import { program as cli } from 'commander';
-import { Keystore } from '../utils/keystore.js';
-import { connectKeystore, loadChain } from '../utils/chains.js';
-import {
-  finalizeCli,
-  addGlobalOptions,
-  addWalletLoadOptions,
-  computeWalletLoadOptions,
-  checkUpdate,
-  handleError,
-  option,
-  desc,
-  Spinner,
-  info,
-  pretty,
-  computeTxOptions,
-} from '../utils/cli-helper.js';
-import {
-  authorizeRequester,
-  revokeRequesterAuthorization,
-  showUserVoucher,
-} from '../../common/voucher/voucher.js';
-
-const objName = 'voucher';
-
-cli.name('iexec voucher').usage('<command> [options]');
-
-const show = cli.command('show');
-addGlobalOptions(show);
-addWalletLoadOptions(show);
-show
-  .option(...option.chain())
-  .option(...option.user())
-  .description(desc.showObj('iExec', objName))
-  .action(async (opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const walletOptions = computeWalletLoadOptions(opts);
-      const keystore = Keystore({ ...walletOptions, isSigner: false });
-      const [chain, [address]] = await Promise.all([
-        loadChain(opts.chain, { spinner }),
-        keystore.accounts(),
-      ]);
-      const owner = opts.user || address;
-      spinner.start(info.checking('Voucher details'));
-      const voucherDetails = await showUserVoucher(
-        chain.contracts,
-        chain.voucherSubgraph,
-        chain.voucherHub,
-        owner,
-      );
-      const prettyDetails = pretty({
-        type: voucherDetails.type.toString(),
-        balance: voucherDetails.balance.toString(),
-        expirationTimestamp: voucherDetails.expirationTimestamp.toString(),
-        allowanceAmount: voucherDetails.allowanceAmount.toString(),
-        address: voucherDetails.address,
-      });
-      spinner.succeed(`Voucher details: ${prettyDetails}`, {
-        raw: voucherDetails,
-      });
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-const authorize = cli.command('authorize <requester>');
-addGlobalOptions(authorize);
-addWalletLoadOptions(authorize);
-authorize
-  .option(...option.chain())
-  .description(desc.authorize())
-  .action(async (requester, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const walletOptions = computeWalletLoadOptions(opts);
-      const txOptions = await computeTxOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
-      spinner.start(info.authorizing(requester));
-
-      const txHash = await authorizeRequester(
-        chain.contracts,
-        chain.voucherHub,
-        requester,
-      );
-      spinner.succeed(info.authorized(requester), {
-        raw: { txHash },
-      });
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-const revoke = cli.command('revoke <requester>');
-addGlobalOptions(revoke);
-addWalletLoadOptions(revoke);
-revoke
-  .option(...option.chain())
-  .description(desc.revokeVoucherAuthorization())
-  .action(async (requester, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const walletOptions = computeWalletLoadOptions(opts);
-      const txOptions = await computeTxOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
-      spinner.start(info.revokingVoucherAuthorization());
-
-      const txHash = await revokeRequesterAuthorization(
-        chain.contracts,
-        chain.voucherHub,
-        requester,
-      );
-
-      spinner.succeed(info.revokedVoucherAuthorization(requester), {
-        raw: { txHash },
-      });
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-finalizeCli(cli);
diff --git a/src/cli/cmd/iexec-wallet.js b/src/cli/cmd/iexec-wallet.js
index 7ec53f6e..fb75c6bc 100644
--- a/src/cli/cmd/iexec-wallet.js
+++ b/src/cli/cmd/iexec-wallet.js
@@ -7,10 +7,6 @@ import {
   sendRLC as walletSendRLC,
   sweep as walletSweep,
 } from '../../common/wallet/send.js';
-import {
-  bridgeToSidechain as walletBridgeToSidechain,
-  bridgeToMainchain as walletBridgeToMainchain,
-} from '../../common/wallet/bridge.js';
 import {
   Keystore,
   createAndSave,
@@ -38,11 +34,8 @@ import {
   prompt,
   pretty,
   info,
-  getPropertyFormChain,
 } from '../utils/cli-helper.js';
 import { loadChain, connectKeystore } from '../utils/chains.js';
-import { lookupAddress } from '../../common/ens/resolution.js';
-import { ConfigurationError } from '../../common/utils/errors.js';
 
 const objName = 'wallet';
 
@@ -159,21 +152,9 @@ show
       // show address balance
       const addressToShow = address || userWalletAddress;
       spinner.start(info.checkBalance(''));
-      const [balances, ens] = await Promise.all([
-        checkBalances(chain.contracts, addressToShow),
-        lookupAddress(chain.contracts, addressToShow).catch((e) => {
-          if (e instanceof ConfigurationError) {
-            /** no ENS */
-          } else {
-            throw e;
-          }
-        }),
-      ]);
-      if (ens) {
-        spinner.info(`ENS: ${ens}`);
-      }
+      const balances = await checkBalances(chain.contracts, addressToShow);
       const displayBalances = {
-        ether: chain.contracts.isNative ? undefined : formatEth(balances.wei),
+        ether: formatEth(balances.wei),
         RLC: formatRLC(balances.nRLC),
       };
       spinner.succeed(
@@ -183,12 +164,9 @@ show
             balance: {
               ...displayBalances,
               nRLC: balances.nRLC.toString(),
-              wei: chain.contracts.isNative
-                ? undefined
-                : balances.wei.toString(),
+              wei: balances.wei.toString(),
             },
             ...(!address && displayedWallet && { wallet: displayedWallet }),
-            ens,
           },
         },
       );
@@ -197,12 +175,11 @@ show
     }
   });
 
-const sendETH = cli.command('send-ether <amount> [unit]').alias('sendETH'); // DEPRECATED senETH
+const sendETH = cli.command('send-ether <amount> [unit]');
 addGlobalOptions(sendETH);
 addWalletLoadOptions(sendETH);
 sendETH
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.to())
@@ -221,7 +198,7 @@ sendETH
         keystore.accounts(),
         loadChain(opts.chain, { txOptions, spinner }),
       ]);
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       if (!opts.to) throw new Error('Missing --to option');
       if (!opts.force) {
         await prompt.transferETH(
@@ -254,7 +231,6 @@ addGlobalOptions(sendRLC);
 addWalletLoadOptions(sendRLC);
 sendRLC
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.to())
@@ -274,7 +250,7 @@ sendRLC
         loadChain(opts.chain, { txOptions, spinner }),
       ]);
       if (!opts.to) throw new Error('Missing --to option');
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       if (!opts.force) {
         await prompt.transferRLC(
           formatRLC(nRlcAmount),
@@ -308,7 +284,6 @@ addGlobalOptions(sweep);
 addWalletLoadOptions(sweep);
 sweep
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.to())
@@ -324,14 +299,10 @@ sweep
         keystore.accounts(),
         loadChain(opts.chain, { txOptions, spinner }),
       ]);
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       if (!opts.to) throw new Error('Missing --to option');
       if (!opts.force) {
-        await prompt.sweep(chain.contracts.isNative ? 'RLC' : 'ether and RLC')(
-          chain.name,
-          opts.to,
-          chain.id,
-        );
+        await prompt.sweep('ether and RLC')(chain.name, opts.to, chain.id);
       }
       spinner.start('Sweeping wallet...');
       const { sendNativeTxHash, sendERC20TxHash, errors } = await walletSweep(
@@ -357,231 +328,4 @@ sweep
     }
   });
 
-const bridgeToSidechain = cli.command('bridge-to-sidechain <amount> [unit]');
-addGlobalOptions(bridgeToSidechain);
-addWalletLoadOptions(bridgeToSidechain);
-bridgeToSidechain
-  .option(...option.chain())
-  .option(...option.txGasPrice())
-  .option(...option.txConfirms())
-  .option(...option.force())
-  .description(desc.bridgeToSidechain())
-  .action(async (amount, unit, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const nRlcAmount = await nRlcAmountSchema().validate([amount, unit]);
-      const walletOptions = computeWalletLoadOptions(opts);
-      const txOptions = await computeTxOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const [[address], chain] = await Promise.all([
-        keystore.accounts(),
-        loadChain(opts.chain, { txOptions, spinner }),
-      ]);
-      await connectKeystore(chain, keystore, { txOptions });
-      if (chain.contracts.isNative)
-        throw new Error('Cannot bridge sidechain to sidechain');
-      const bridgeConf = getPropertyFormChain(chain, 'bridge');
-      const bridgeAddress = bridgeConf && bridgeConf.contract;
-      const bridgedChainId = bridgeConf && bridgeConf.bridgedChainId;
-      if (!bridgeAddress) {
-        throw new Error(
-          `Missing bridge contract address in "chain.json" for chain ${chain.name}`,
-        );
-      }
-      if (!bridgedChainId) {
-        throw new Error(
-          `Missing bridge bridgedChainId in "chain.json" for chain ${chain.name}`,
-        );
-      }
-      if (!opts.force) {
-        await prompt.transferRLC(
-          formatRLC(nRlcAmount),
-          chain.name,
-          `bridge contract ${bridgeAddress} (please double check the address)`,
-          chain.id,
-        );
-      }
-      const bridgedChainConfigured = !!(
-        chain.bridgedNetwork &&
-        chain.bridgedNetwork.contracts &&
-        chain.bridgedNetwork.bridge &&
-        chain.bridgedNetwork.bridge.contract
-      );
-      const message = `${formatRLC(nRlcAmount)} ${
-        chain.name
-      } RLC to ${bridgeAddress}`;
-      spinner.start(`Sending ${message}...`);
-      const { sendTxHash, receiveTxHash } = await walletBridgeToSidechain(
-        chain.contracts,
-        bridgeAddress,
-        nRlcAmount,
-        {
-          sidechainBridgeAddress:
-            bridgedChainConfigured && chain.bridgedNetwork.bridge.contract,
-          bridgedContracts:
-            bridgedChainConfigured && chain.bridgedNetwork.contracts,
-        },
-      );
-      spinner.succeed(
-        `Sent ${message} (tx: ${sendTxHash})\n${
-          bridgedChainConfigured
-            ? `Wallet credited on chain ${bridgedChainId} (tx: ${receiveTxHash})`
-            : `Please wait for the agent to credit your wallet on chain ${bridgedChainId}`
-        }`,
-        {
-          raw: {
-            amount: nRlcAmount,
-            from: address,
-            to: bridgeAddress,
-            sendTxHash,
-            receiveTxHash,
-          },
-        },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-const bridgeToMainchain = cli.command('bridge-to-mainchain <amount> [unit]');
-addGlobalOptions(bridgeToMainchain);
-addWalletLoadOptions(bridgeToMainchain);
-bridgeToMainchain
-  .option(...option.chain())
-  .option(...option.txGasPrice())
-  .option(...option.txConfirms())
-  .option(...option.force())
-  .description(desc.bridgeToMainchain())
-  .action(async (amount, unit, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const nRlcAmount = await nRlcAmountSchema().validate([amount, unit]);
-      const walletOptions = computeWalletLoadOptions(opts);
-      const txOptions = await computeTxOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const [[address], chain] = await Promise.all([
-        keystore.accounts(),
-        loadChain(opts.chain, { txOptions, spinner }),
-      ]);
-      await connectKeystore(chain, keystore, { txOptions });
-      if (!chain.contracts.isNative)
-        throw new Error('Cannot bridge mainchain to mainchain');
-      const bridgeConf = getPropertyFormChain(chain, 'bridge');
-      const bridgeAddress = bridgeConf && bridgeConf.contract;
-      const bridgedChainId = bridgeConf && bridgeConf.bridgedChainId;
-      if (!bridgeAddress) {
-        throw new Error(
-          `Missing bridge contract address in "chain.json" for chain ${chain.name}`,
-        );
-      }
-      if (!bridgedChainId) {
-        throw new Error(
-          `Missing bridge bridgedChainId in "chain.json" for chain ${chain.name}`,
-        );
-      }
-      if (!opts.force) {
-        await prompt.transferRLC(
-          formatRLC(nRlcAmount),
-          chain.name,
-          `bridge contract ${bridgeAddress} (please double check the address)`,
-          chain.id,
-        );
-      }
-      const bridgedChainConfigured = !!(
-        chain.bridgedNetwork &&
-        chain.bridgedNetwork.contracts &&
-        chain.bridgedNetwork.bridge &&
-        chain.bridgedNetwork.bridge.contract
-      );
-      const message = `${formatRLC(nRlcAmount)} ${
-        chain.name
-      } RLC to ${bridgeAddress}`;
-      spinner.start(`Sending ${message}...`);
-      const { sendTxHash, receiveTxHash } = await walletBridgeToMainchain(
-        chain.contracts,
-        bridgeAddress,
-        nRlcAmount,
-        {
-          mainchainBridgeAddress:
-            bridgedChainConfigured && chain.bridgedNetwork.bridge.contract,
-          bridgedContracts:
-            bridgedChainConfigured && chain.bridgedNetwork.contracts,
-        },
-      );
-      spinner.succeed(
-        `Sent ${message} (tx: ${sendTxHash})\n${
-          bridgedChainConfigured
-            ? `Wallet credited on chain ${bridgedChainId} (tx: ${receiveTxHash})`
-            : `Please wait for the agent to credit your wallet on chain ${bridgedChainId}`
-        }`,
-        {
-          raw: {
-            amount: nRlcAmount,
-            from: address,
-            to: bridgeAddress,
-            sendTxHash,
-            receiveTxHash,
-          },
-        },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
-// DEPRECATED
-const sendNRLC = cli.command('sendRLC <amount> [unit]');
-addGlobalOptions(sendNRLC);
-addWalletLoadOptions(sendNRLC);
-sendNRLC
-  .option(...option.chain())
-  .option(...option.txGasPrice())
-  .option(...option.txConfirms())
-  .option(...option.force())
-  .option(...option.to())
-  .description(desc.sendNRLC())
-  .action(async (amount, unit, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const nRlcAmount = await nRlcAmountSchema().validate([amount, unit]);
-      const walletOptions = computeWalletLoadOptions(opts);
-      const txOptions = await computeTxOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const [[address], chain] = await Promise.all([
-        keystore.accounts(),
-        loadChain(opts.chain, { txOptions, spinner }),
-      ]);
-      if (!opts.to) throw new Error('Missing --to option');
-      await connectKeystore(chain, keystore, { txOptions });
-      if (!opts.force) {
-        await prompt.transferRLC(
-          formatRLC(nRlcAmount),
-          chain.name,
-          opts.to,
-          chain.id,
-        );
-      }
-      const message = `${formatRLC(nRlcAmount)} ${
-        chain.name
-      } RLC from ${address} to ${opts.to}`;
-      spinner.start(`Sending ${message}...`);
-
-      const txHash = await walletSendRLC(chain.contracts, nRlcAmount, opts.to);
-
-      spinner.succeed(`Sent ${message}\n`, {
-        raw: {
-          amount: nRlcAmount,
-          from: address,
-          to: opts.to,
-          txHash,
-        },
-      });
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
 finalizeCli(cli);
diff --git a/src/cli/cmd/iexec-workerpool.js b/src/cli/cmd/iexec-workerpool.js
index 5ff25661..514e7a1b 100644
--- a/src/cli/cmd/iexec-workerpool.js
+++ b/src/cli/cmd/iexec-workerpool.js
@@ -36,8 +36,7 @@ import {
   pretty,
   info,
   prompt,
-  getPropertyFormChain,
-  isEthAddress,
+  getPropertyFromChain,
 } from '../utils/cli-helper.js';
 import {
   loadIExecConf,
@@ -47,10 +46,8 @@ import {
 } from '../utils/fs.js';
 import { Keystore } from '../utils/keystore.js';
 import { loadChain, connectKeystore } from '../utils/chains.js';
-import { setWorkerpoolApiUrl } from '../../common/execution/workerpool.js';
 import { getWorkerpoolApiUrl } from '../../common/execution/debug.js';
-import { lookupAddress } from '../../common/ens/resolution.js';
-import { ConfigurationError } from '../../common/utils/errors.js';
+import { isAddress } from 'ethers';
 
 const debug = Debug('iexec:iexec-workerpool');
 
@@ -90,7 +87,6 @@ addGlobalOptions(deploy);
 addWalletLoadOptions(deploy);
 deploy
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .description(desc.deployObj(objName))
   .action(async (opts) => {
@@ -109,7 +105,7 @@ deploy
           `Missing ${objName} in "iexec.json". Did you forget to run "iexec ${objName} init"?`,
         );
       }
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       spinner.start(info.deploying(objName));
       const { address, txHash } = await deployWorkerpool(
         chain.contracts,
@@ -124,49 +120,6 @@ deploy
     }
   });
 
-const setApiUrl = cli.command('set-api-url <apiUrl> [workerpoolAddress]');
-addGlobalOptions(setApiUrl);
-addWalletLoadOptions(setApiUrl);
-setApiUrl
-  .option(...option.chain())
-  .option(...option.txGasPrice())
-  .option(...option.txConfirms())
-  .description('declare the workerpool API URL on the blockchain')
-  .action(async (url, workerpoolAddress, opts) => {
-    await checkUpdate(opts);
-    const spinner = Spinner(opts);
-    try {
-      const walletOptions = computeWalletLoadOptions(opts);
-      const txOptions = await computeTxOptions(opts);
-      const keystore = Keystore(walletOptions);
-      const chain = await loadChain(opts.chain, { txOptions, spinner });
-      const address =
-        workerpoolAddress ||
-        (await loadDeployedObj(objName).then(
-          (deployedObj) => deployedObj && deployedObj[chain.id],
-        ));
-      if (!address) {
-        throw new Error(info.missingAddressOrDeployed(objName, chain.id));
-      }
-      const ens = await lookupAddress(chain.contracts, address);
-      if (!ens) {
-        throw new Error(info.missingEnsForObjectAtAddress(objName, address));
-      }
-
-      await connectKeystore(chain, keystore, { txOptions });
-      spinner.start(`Setting API URL for workerpool ${address}`);
-      const txHash = await setWorkerpoolApiUrl(chain.contracts, address, url);
-      spinner.succeed(
-        `API URL "${url}" is set for ${objName} at address ${address}`,
-        {
-          raw: { address, url, txHash },
-        },
-      );
-    } catch (error) {
-      handleError(error, cli, opts);
-    }
-  });
-
 const show = cli.command('show [addressOrIndex]');
 addGlobalOptions(show);
 addWalletLoadOptions(show);
@@ -190,9 +143,9 @@ show
           (deployedObj) => deployedObj && deployedObj[chain.id],
         ));
 
-      const isAddress = isEthAddress(addressOrIndex, { strict: false });
+      const isAddr = isAddress(addressOrIndex);
       const userAddress = opts.user || (address !== NULL_ADDRESS && address);
-      if (!isAddress && !userAddress)
+      if (!isAddr && !userAddress)
         throw new Error(`Missing option ${option.user()[0]} or wallet`);
 
       if (!addressOrIndex)
@@ -200,18 +153,10 @@ show
 
       spinner.start(info.showing(objName));
       let showInfo;
-      let ens;
       let apiUrl;
-      if (isAddress) {
-        [showInfo, ens, apiUrl] = await Promise.all([
+      if (isAddr) {
+        [showInfo, apiUrl] = await Promise.all([
           showWorkerpool(chain.contracts, addressOrIndex),
-          lookupAddress(chain.contracts, addressOrIndex).catch((e) => {
-            if (e instanceof ConfigurationError) {
-              /** no ENS */
-            } else {
-              throw e;
-            }
-          }),
           getWorkerpoolApiUrl(
             chain.contracts,
             chain.compass,
@@ -224,31 +169,21 @@ show
           addressOrIndex,
           userAddress,
         );
-        [ens, apiUrl] = await Promise.all([
-          lookupAddress(chain.contracts, showInfo.objAddress).catch((e) => {
-            if (e instanceof ConfigurationError) {
-              /** no ENS */
-            } else {
-              throw e;
-            }
-          }),
-          getWorkerpoolApiUrl(
-            chain.contracts,
-            chain.compass,
-            showInfo.objAddress,
-          ).catch(() => undefined),
-        ]);
+        apiUrl = await getWorkerpoolApiUrl(
+          chain.contracts,
+          chain.compass,
+          showInfo.objAddress,
+        ).catch(() => undefined);
       }
       const { workerpool, objAddress } = showInfo;
       const cleanObj = stringifyNestedBn(workerpool);
       spinner.succeed(
         `Workerpool ${objAddress} details:${pretty({
-          ...(ens && { ENS: ens }),
           ...cleanObj,
           url: apiUrl,
         })}`,
         {
-          raw: { address: objAddress, workerpool: cleanObj, ens, apiUrl },
+          raw: { address: objAddress, workerpool: cleanObj, apiUrl },
         },
       );
     } catch (error) {
@@ -344,10 +279,7 @@ publish
         datasetrestrict: opts.datasetRestrict,
         requesterrestrict: opts.requesterRestrict,
       };
-      const orderToSign = await createWorkerpoolorder(
-        chain.contracts,
-        overrides,
-      );
+      const orderToSign = await createWorkerpoolorder(overrides);
       if (!opts.force) {
         await prompt.publishOrder(`${objName}order`, pretty(orderToSign));
       }
@@ -358,7 +290,7 @@ publish
       );
       const orderHash = await publishWorkerpoolorder(
         chain.contracts,
-        getPropertyFormChain(chain, 'iexecGateway'),
+        getPropertyFromChain(chain, 'iexecGateway'),
         signedOrder,
       );
       spinner.succeed(
@@ -412,12 +344,12 @@ unpublish
       const unpublished = all
         ? await unpublishAllWorkerpoolorders(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             address,
           )
         : await unpublishLastWorkerpoolorder(
             chain.contracts,
-            getPropertyFormChain(chain, 'iexecGateway'),
+            getPropertyFromChain(chain, 'iexecGateway'),
             address,
           );
       spinner.succeed(
@@ -440,7 +372,6 @@ addGlobalOptions(transfer);
 addWalletLoadOptions(transfer);
 transfer
   .option(...option.chain())
-  .option(...option.txGasPrice())
   .option(...option.txConfirms())
   .option(...option.force())
   .option(...option.to())
@@ -453,7 +384,7 @@ transfer
       const txOptions = await computeTxOptions(opts);
       const keystore = Keystore(walletOptions);
       const chain = await loadChain(opts.chain, { txOptions, spinner });
-      await connectKeystore(chain, keystore, { txOptions });
+      await connectKeystore(chain, keystore);
       if (!opts.to) throw new Error('Missing --to option');
       if (!opts.force) {
         await prompt.transferObj(objName, objAddress, opts.to, chain.id);
diff --git a/src/cli/cmd/iexec.js b/src/cli/cmd/iexec.js
index 41226536..5a4c6a3d 100755
--- a/src/cli/cmd/iexec.js
+++ b/src/cli/cmd/iexec.js
@@ -85,8 +85,6 @@ cli.command('wallet', 'manage local ethereum wallet');
 
 cli.command('account', 'manage iExec account');
 
-cli.command('voucher', 'manage iExec voucher');
-
 cli.command('app', 'manage iExec apps');
 
 cli.command('dataset', 'manage iExec datasets');
@@ -107,8 +105,6 @@ cli.command('storage', 'manage remote storage');
 
 cli.command('result', 'manage results encryption');
 
-cli.command('ens', 'manage ENS names');
-
 cli.command('category', 'manage iExec categories');
 
 const infoCmd = cli.command('info');
@@ -125,13 +121,8 @@ infoCmd
       const host =
         chain.host === getChainDefaults(chain.id).host ? 'default' : chain.host;
       spinner.info(`Ethereum host: ${host}`);
-
       spinner.start(info.checking('iExec contracts info'));
-
-      const useNative = !!chain.contracts.isNative;
-      const rlcAddress = useNative
-        ? undefined
-        : await wrapCall(chain.contracts.fetchTokenAddress());
+      const rlcAddress = await wrapCall(chain.contracts.fetchTokenAddress());
       const [
         appRegistryAddress,
         datasetRegistryAddress,
@@ -145,9 +136,7 @@ infoCmd
 
       const iexecAddresses = {
         'iExec PoCo version': pocoVersion,
-        ...((useNative && {
-          'native RLC': true,
-        }) || { 'RLC ERC20 address': rlcAddress }),
+        'RLC ERC20 address': rlcAddress,
         'iExec contract address': chain.contracts.hubAddress,
         'app registry address': appRegistryAddress,
         'dataset registry address': datasetRegistryAddress,
@@ -162,7 +151,6 @@ infoCmd
           appRegistryAddress,
           datasetRegistryAddress,
           workerpoolRegistryAddress,
-          useNative,
         },
       });
     } catch (error) {
diff --git a/src/cli/utils/chains.js b/src/cli/utils/chains.js
index bdb2c774..18463403 100644
--- a/src/cli/utils/chains.js
+++ b/src/cli/utils/chains.js
@@ -1,27 +1,21 @@
 import Debug from 'debug';
 import { getId, getChainDefaults } from '../../common/utils/config.js';
 import IExecContractsClient from '../../common/utils/IExecContractsClient.js';
-import { EnhancedWallet } from '../../common/utils/signers.js';
 import { loadChainConf } from './fs.js';
 import { Spinner } from './cli-helper.js';
 import { getReadOnlyProvider } from '../../common/utils/providers.js';
+import { Wallet } from 'ethers';
 
 const debug = Debug('iexec:chains');
 
 const createChainFromConf = (
   chainName,
   chainConf,
-  {
-    bridgeConf,
-    providerOptions,
-    txOptions = {},
-    allowExperimentalNetworks = false,
-  } = {},
+  { txOptions = {}, allowExperimentalNetworks = false } = {},
 ) => {
   try {
     const chain = { ...chainConf };
     const provider = getReadOnlyProvider(chainConf.host, {
-      providers: providerOptions,
       allowExperimentalNetworks,
     });
 
@@ -30,26 +24,9 @@ const createChainFromConf = (
       provider,
       chainId: chain.id,
       hubAddress: chain.hub,
-      useGas: chain.useGas,
-      isNative: chain.native,
       confirms: txOptions.confirms,
     });
     chain.contracts = contracts;
-    if (bridgeConf) {
-      chain.bridgedNetwork = { ...bridgeConf };
-      const bridgeProvider = getReadOnlyProvider(bridgeConf.host, {
-        providers: providerOptions,
-        allowExperimentalNetworks,
-      });
-      chain.bridgedNetwork.contracts = new IExecContractsClient({
-        provider: bridgeProvider,
-        chainId: bridgeConf.id,
-        hubAddress: bridgeConf.hub,
-        useGas: bridgeConf.useGas,
-        isNative: bridgeConf.native,
-        confirms: txOptions.confirms,
-      });
-    }
     return chain;
   } catch (error) {
     debug('createChainFromConf()', error);
@@ -64,7 +41,6 @@ export const loadChain = async (
   try {
     const chainsConf = await loadChainConf();
     const { allowExperimentalNetworks } = chainsConf;
-    const providerOptions = chainsConf.providers;
     let name;
     let loadedConf;
     if (chainNameOrId) {
@@ -122,55 +98,7 @@ export const loadChain = async (
         `Missing RPC host, no "host" key in "chain.json" and no default value for chain ${conf.id}`,
       );
     }
-
-    let bridgeConf;
-    const bridgedChainNameOrId = conf.bridge && conf.bridge.bridgedChainName;
-    if (bridgedChainNameOrId) {
-      let bridgeLoadedConf;
-      if (chainsConf.chains[bridgedChainNameOrId]) {
-        bridgeLoadedConf = chainsConf.chains[bridgedChainNameOrId];
-      } else {
-        const { name: alias } = getChainDefaults(
-          getId(bridgedChainNameOrId, {
-            allowExperimentalNetworks,
-          }),
-          {
-            allowExperimentalNetworks,
-          },
-        );
-        if (alias && chainsConf.chains[alias]) {
-          bridgeLoadedConf = chainsConf.chains[alias];
-        }
-        if (!bridgeLoadedConf)
-          throw new Error(`Missing "${name}" chain in "chain.json"`);
-      }
-      const bridgeIdConf = {
-        id:
-          bridgeLoadedConf.id ||
-          getId(bridgedChainNameOrId, {
-            allowExperimentalNetworks,
-          }),
-      };
-      const bridgeDefaultConf = getChainDefaults(bridgeIdConf.id, {
-        allowExperimentalNetworks,
-      });
-      debug('bridgeLoadedConf', bridgeLoadedConf);
-      debug('bridgeDefaultConf', defaultConf);
-      bridgeConf = {
-        ...bridgeIdConf,
-        ...bridgeDefaultConf,
-        ...bridgeLoadedConf,
-      };
-      if (!bridgeConf.host) {
-        throw new Error(
-          `Missing RPC host for bridged chain, no "host" key in "chain.json" and no default value for bridged chain ${bridgeConf.id}`,
-        );
-      }
-    }
-    debug('bridged chain', bridgeConf);
     const chain = createChainFromConf(name, conf, {
-      bridgeConf,
-      providerOptions,
       txOptions,
       allowExperimentalNetworks,
     });
@@ -182,14 +110,7 @@ export const loadChain = async (
   }
 };
 
-export const connectKeystore = async (
-  chain,
-  keystore,
-  { txOptions = {} } = {},
-) => {
+export const connectKeystore = async (chain, keystore) => {
   const { privateKey } = await keystore.load();
-  const keystoreOptions = { gasPrice: txOptions.gasPrice };
-  chain.contracts.setSigner(
-    new EnhancedWallet(privateKey, undefined, keystoreOptions),
-  );
+  chain.contracts.setSigner(new Wallet(privateKey));
 };
diff --git a/src/cli/utils/cli-helper.js b/src/cli/utils/cli-helper.js
index ffb056ee..000b395f 100644
--- a/src/cli/utils/cli-helper.js
+++ b/src/cli/utils/cli-helper.js
@@ -1,19 +1,12 @@
 import { isAbsolute, join } from 'node:path';
 import Debug from 'debug';
-import { Option } from 'commander';
 import Ora from 'ora';
 import inquirer from 'inquirer';
 import { render } from 'prettyjson';
 import checkForUpdate from 'update-check';
 import isDocker from 'is-docker';
-import {
-  weiAmountSchema,
-  positiveStrictIntSchema,
-} from '../../common/utils/validator.js';
-import {
-  TEE_FRAMEWORKS,
-  STORAGE_PROVIDERS,
-} from '../../common/utils/constant.js';
+import { positiveStrictIntSchema } from '../../common/utils/validator.js';
+import { STORAGE_PROVIDERS } from '../../common/utils/constant.js';
 import packageJSON, { version } from '../../common/generated/sdk/package.js';
 
 const debug = Debug('help');
@@ -79,18 +72,14 @@ export const info = {
   depositing: () => 'Making deposit...',
   approving: () => 'Making approve...',
   revoking: (spender) => `Revoking allowance for spender address ${spender}...`,
-  revokingVoucherAuthorization: () => `Revoking voucher authorization...`,
   checkingSwapRate: () => 'Checking swap rate...',
   claiming: (obj) => `Claiming ${obj}...`,
   deposited: (amount) => `Deposited ${amount} RLC to your iExec account`,
   withdrawing: () => 'Making withdraw...',
-  authorizing: (requester) => `Authorizing ${requester} to use the voucher...`,
   approved: (amount, spender, unit) =>
     `Approved ${spender} to spend ${amount} ${unit} from your iExec account`,
   authorized: (requester) => `Requester ${requester} authorized successfully`,
   revoked: (spender) => `Revoked ${spender} to use your iExec account`,
-  revokedVoucherAuthorization: (requester) =>
-    `Revoked ${requester} to use the voucher`,
   checkingAllowance: (spender, user) =>
     `Checking allowance for ${spender} on user's account ${user}...`,
   allowance: (spender, user, amount) =>
@@ -101,8 +90,6 @@ export const info = {
   downloaded: (filePath) => `Downloaded task result to file ${filePath}`,
   missingAddressOrDeployed: (objName, chainId) =>
     `Missing ${objName}Address and no ${objName} found in "deployed.json" for chain ${chainId}`,
-  missingEnsForObjectAtAddress: (objName, address) =>
-    `Missing ENS for ${objName} ${address}. You probably forgot to run "iexec ens register <name> --for ${address}"`,
   checking: (obj) => `Checking ${obj}...`,
   missingOrder: (orderName, optionName) =>
     `Missing ${orderName}. You probably forgot to run "iexec order init --${optionName}"`,
@@ -132,8 +119,6 @@ export const desc = {
   claimObj: (objName) => `claim a ${objName} that is not COMPLETED`,
   deposit: () => 'deposit RLC onto your iExec account (default unit nRLC)',
   withdraw: () => 'withdraw RLC from your iExec account (default unit nRLC)',
-  authorize: () => 'authorize requester to use the voucher',
-  revokeVoucherAuthorization: () => 'revoke authorization to use the voucher',
   approve: () =>
     'approve spender to spend up to amount of RLC from your iExec account (default unit nRLC)',
   allowance: () =>
@@ -141,8 +126,6 @@ export const desc = {
   revoke: () => 'revoke the approval for the spender to use your iExec account',
   sendETH: () => 'send ether to an address (default unit ether)',
   sendRLC: () => 'send RLC to an address (default unit RLC)',
-  sendNRLC: () =>
-    '[DEPRECATED see send-RLC] send RLC to an address (WARNING! default unit nRLC)',
   sweep: () => 'send all ether and RLC to an address',
   info: () => 'show iExec contracts addresses',
   decrypt: () => 'decrypt work result',
@@ -165,10 +148,6 @@ export const desc = {
   generateKeys: () =>
     'generate a beneficiary key pair to encrypt and decrypt the results',
   decryptResults: () => 'decrypt encrypted results with beneficiary key',
-  bridgeToSidechain: () =>
-    'send RLC from the mainchain to the sidechain (default unit nRLC)',
-  bridgeToMainchain: () =>
-    'send RLC from the sidechain to the mainchain (default unit nRLC)',
   appRun: () =>
     'run an iExec application at market price (default run last deployed app)',
   requestRun: () => 'request an iExec application execution at limit price',
@@ -363,10 +342,6 @@ export const option = {
     '--original-dataset-dir <path>',
     'specify the original dataset directory',
   ],
-  txGasPrice: () => [
-    '--gas-price <amount unit...>',
-    'set custom gas price for transactions (default unit wei)',
-  ],
   txConfirms: () => [
     '--confirms <blockCount>',
     'set custom block count to wait for transactions confirmation (default 1 block)',
@@ -397,22 +372,6 @@ export const option = {
     '--requester-strict',
     'fetch orders created strictly for the specified requester',
   ],
-  useVoucher: () => [
-    '--use-voucher',
-    'use the voucher to cover the costs of matching orders',
-  ],
-  voucherAddress: () => [
-    '--voucher-address <voucherAddress>',
-    'specify the voucher contract to use other than the owned voucher',
-  ],
-};
-
-export const optionCreator = {
-  teeFramework: () =>
-    new Option(
-      `--tee-framework <name>`,
-      'specify the TEE framework to use',
-    ).choices(Object.values(TEE_FRAMEWORKS)),
 };
 
 export const orderOption = {
@@ -862,16 +821,7 @@ export const publicKeyName = (address) => `${address}_key.pub`;
 export const privateKeyName = (address) => `${address}_key`;
 
 export const computeTxOptions = async (opts) => {
-  let gasPrice;
   let confirms;
-  if (opts.gasPrice) {
-    debug('opts.gasPrice', opts.gasPrice);
-    const stringGasPrice = await weiAmountSchema({ defaultUnit: 'wei' })
-      .label('gas-price')
-      .validate(opts.gasPrice);
-    gasPrice = BigInt(stringGasPrice);
-  }
-  debug('gasPrice', gasPrice);
   if (opts.confirms !== undefined) {
     debug('opts.confirms', opts.confirms);
     confirms = await positiveStrictIntSchema()
@@ -881,10 +831,10 @@ export const computeTxOptions = async (opts) => {
       });
   }
   debug('confirms', confirms);
-  return { gasPrice, confirms };
+  return { confirms };
 };
 
-export const getPropertyFormChain = (
+export const getPropertyFromChain = (
   chain,
   property,
   { strict = true } = {},
@@ -897,33 +847,6 @@ export const getPropertyFormChain = (
   return value;
 };
 
-export const getDefaultTeeFrameworkFromChain = (chain) =>
-  getPropertyFormChain(chain, 'defaultTeeFramework', { strict: false }) ||
-  TEE_FRAMEWORKS.SCONE;
-
-export const getSmsUrlFromChain = (
-  chain,
-  { teeFramework, strict = true } = {},
-) => {
-  const selectedTeeFramework =
-    teeFramework || getDefaultTeeFrameworkFromChain(chain);
-  let smsUrl;
-  const smsUrlOrMap = getPropertyFormChain(chain, 'sms', { strict });
-  if (typeof smsUrlOrMap === 'string') {
-    smsUrl = smsUrlOrMap;
-  } else if (
-    typeof smsUrlOrMap === 'object' &&
-    smsUrlOrMap[selectedTeeFramework]
-  ) {
-    smsUrl = smsUrlOrMap[selectedTeeFramework];
-  }
-  if (smsUrl === undefined && strict)
-    throw new Error(
-      `Missing sms for tee framework ${selectedTeeFramework} in "chain.json" for chain ${chain.id}`,
-    );
-  return smsUrl;
-};
-
 export const handleError = (error, cli, opts) => {
   debug('error', error);
   const spinner = Spinner(opts);
@@ -961,19 +884,6 @@ export const prettyRPC = (rpcObj) => {
   return pretty(prettyObj);
 };
 
-export const isEthAddress = (address, { strict = false } = {}) => {
-  const isHexString =
-    typeof address === 'string' && address.substr(0, 2) === '0x';
-  const isEns =
-    typeof address === 'string' &&
-    address.substring(address.length - 4) === '.eth';
-  const isAddress = isEns || (isHexString && address.length === 42);
-  if (!isAddress && strict) {
-    throw new Error(`Address ${address} is not a valid Ethereum address`);
-  }
-  return isAddress;
-};
-
 export const isBytes32 = (str, { strict = false } = {}) => {
   if (
     typeof str !== 'string' ||
diff --git a/src/cli/utils/fs.js b/src/cli/utils/fs.js
index 14528db1..eea43de4 100644
--- a/src/cli/utils/fs.js
+++ b/src/cli/utils/fs.js
@@ -1,13 +1,12 @@
 import { join } from 'node:path';
 import Debug from 'debug';
 import fsExtra from 'fs-extra';
-import { object, string, number, boolean, lazy } from 'yup';
+import { object, string, boolean } from 'yup';
 import { APP, DATASET } from '../../common/utils/constant.js';
 import {
   addressSchema,
+  basicUrlSchema,
   chainIdSchema,
-  smsUrlOrMapSchema,
-  teeFrameworkSchema,
 } from '../../common/utils/validator.js';
 import { prompt, info } from './cli-helper.js';
 import templates, {
@@ -26,25 +25,11 @@ const chainConfSchema = () =>
     id: chainIdSchema(),
     host: string(),
     hub: string(), // todo address
-    ensRegistry: string(), // TODO: DEPRECATED not used anymore
-    ensPublicResolver: string(), // todo address
-    voucherHub: string(), // todo address
-    sms: smsUrlOrMapSchema(),
-    resultProxy: string(),
+    sms: basicUrlSchema(),
     ipfsGateway: string(),
     iexecGateway: string(),
     compass: string(),
     pocoSubgraph: string(),
-    voucherSubgraph: string(),
-    native: boolean(),
-    useGas: boolean().default(true),
-    defaultTeeFramework: teeFrameworkSchema(),
-    bridge: object({
-      bridgedChainName: string().required(),
-      contract: addressSchema().required(),
-    })
-      .notRequired()
-      .strict(),
   })
     .noUnknown(true, 'Unknown key "${unknown}"')
     .strict();
@@ -64,24 +49,6 @@ const chainsConfSchema = () =>
         return true;
       })
       .required(),
-    providers: object({
-      alchemy: string().notRequired(),
-      etherscan: string().notRequired(),
-      infura: lazy((value) => {
-        if (typeof value === 'object') {
-          return object({
-            projectId: string().required(),
-            projectSecret: string(),
-          })
-            .noUnknown(true, 'Unknown key "${unknown}" in providers.infura')
-            .strict();
-        }
-        return string();
-      }),
-      quorum: number().integer().min(1).max(3).notRequired(),
-    })
-      .noUnknown(true, 'Unknown key "${unknown}" in providers')
-      .strict(),
   })
     .noUnknown(true, 'Unknown key "${unknown}"')
     .strict();
diff --git a/src/cli/utils/templates.js b/src/cli/utils/templates.js
index 0674d006..28f6baed 100644
--- a/src/cli/utils/templates.js
+++ b/src/cli/utils/templates.js
@@ -21,39 +21,6 @@ export const app = {
     '0xb0b664b7a6d249f81c067a9262b1763144eeb3ca63e553567f71673442ce9e84',
 };
 
-export const sconeTeeApp = {
-  owner: '0x0000000000000000000000000000000000000000',
-  name: 'hello-world-scone',
-  type: 'DOCKER',
-  multiaddr:
-    'docker.io/iexechub/python-hello-world:8.0.0-sconify-5.9.1-v15-production',
-  checksum:
-    '0x15de77fd7ac448028884256b3ab376e7d4560e9ef6acf0594ea0b3c031d5d395',
-  mrenclave: {
-    framework: 'SCONE',
-    version: 'v5.9',
-    entrypoint: 'python /app/app.py',
-    heapSize: 1073741824,
-    fingerprint:
-      '2d4b9efd066d0bb058b8da79bf8551be7d244779bc41d03a12201a4004779609',
-  },
-};
-
-export const gramineTeeApp = {
-  owner: '0x0000000000000000000000000000000000000000',
-  name: 'hello-world-gramine',
-  type: 'DOCKER',
-  multiaddr: 'iexechub/tee-python-hello-world:8.0.3-gramine',
-  checksum:
-    '0x8e13b1592bff2e1651225b1533282ed2e1939ce173c9f0c2c39ed02a4963401f',
-  mrenclave: {
-    framework: 'GRAMINE',
-    version: 'v0',
-    fingerprint:
-      'c879351b3640a21331c4d931d3e32bfbb8373b502966f9c639538666b2cf3641',
-  },
-};
-
 export const buyConf = {
   params: {
     [IEXEC_REQUEST_PARAMS.IEXEC_ARGS]: '',
@@ -146,8 +113,6 @@ export const category = {
 export const chains = {
   default: 'arbitrum-sepolia-testnet',
   chains: {
-    mainnet: {},
-    bellecour: {},
     'arbitrum-mainnet': {},
     'arbitrum-sepolia-testnet': {},
   },
diff --git a/src/common/account/allowance.js b/src/common/account/allowance.js
index 9b27ffcd..b72e11e4 100644
--- a/src/common/account/allowance.js
+++ b/src/common/account/allowance.js
@@ -20,15 +20,11 @@ export const approve = async (
     const vAmount = await nRlcAmountSchema().required().validate(amount);
     if (new BN(vAmount).lten(new BN(0)))
       throw new Error('Approve amount must be less than or equals 0');
-    const vSpenderAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vSpenderAddress = await addressSchema()
       .required()
       .validate(spenderAddress);
     const iexecContract = contracts.getIExecContract();
-    const tx = await wrapSend(
-      iexecContract.approve(vSpenderAddress, vAmount, contracts.txOptions),
-    );
+    const tx = await wrapSend(iexecContract.approve(vSpenderAddress, vAmount));
     const txReceipt = await wrapWait(tx.wait(contracts.confirms));
 
     if (!checkEventFromLogs('Approval', txReceipt.logs))
@@ -47,14 +43,10 @@ export const checkAllowance = async (
   spenderAddress,
 ) => {
   try {
-    const vOwnerAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vOwnerAddress = await addressSchema()
       .required()
       .validate(ownerAddress);
-    const vSpenderAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vSpenderAddress = await addressSchema()
       .required()
       .validate(spenderAddress);
 
diff --git a/src/common/account/balance.js b/src/common/account/balance.js
index 947f12b2..72e2e4be 100644
--- a/src/common/account/balance.js
+++ b/src/common/account/balance.js
@@ -7,11 +7,7 @@ const debug = Debug('iexec:account:balance');
 
 export const checkBalance = async (contracts = throwIfMissing(), address) => {
   try {
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(address);
+    const vAddress = await addressSchema().required().validate(address);
     const iexecContract = contracts.getIExecContract();
     const { stake, locked } = await wrapCall(
       iexecContract.viewAccount(vAddress),
diff --git a/src/common/account/fund.js b/src/common/account/fund.js
index 48ff11c7..06a1cd5d 100644
--- a/src/common/account/fund.js
+++ b/src/common/account/fund.js
@@ -3,12 +3,7 @@ import BN from 'bn.js';
 import { checkBalance } from './balance.js';
 import { getAddress } from '../wallet/address.js';
 import { checkBalances } from '../wallet/balance.js';
-import {
-  checkEventFromLogs,
-  bnNRlcToBnWei,
-  bnToBigInt,
-  checkSigner,
-} from '../utils/utils.js';
+import { checkEventFromLogs, checkSigner } from '../utils/utils.js';
 import { NULL_BYTES } from '../utils/constant.js';
 import { nRlcAmountSchema, throwIfMissing } from '../utils/validator.js';
 import { wrapCall, wrapSend, wrapWait } from '../utils/errorWrappers.js';
@@ -31,36 +26,16 @@ export const deposit = async (
     );
     if (nRLC.lt(new BN(vAmount)))
       throw new Error('Deposit amount exceed wallet balance');
-    const iexecContract = contracts.getIExecContract();
-    if (!contracts.isNative) {
-      const rlcContract = await wrapCall(contracts.fetchTokenContract());
-      const tx = await wrapSend(
-        rlcContract.approveAndCall(
-          contracts.hubAddress,
-          vAmount,
-          NULL_BYTES,
-          contracts.txOptions,
-        ),
-      );
-      const txReceipt = await wrapWait(tx.wait(contracts.confirms));
-      if (!checkEventFromLogs('Approval', txReceipt.logs))
-        throw new Error('Approval not confirmed');
-      if (!checkEventFromLogs('Transfer', txReceipt.logs))
-        throw new Error('Transfer not confirmed');
-      txHash = tx.hash;
-    } else {
-      const weiAmount = bnToBigInt(bnNRlcToBnWei(new BN(vAmount)));
-      const tx = await wrapSend(
-        iexecContract.deposit({
-          value: weiAmount,
-          ...contracts.txOptions,
-        }),
-      );
-      const txReceipt = await wrapWait(tx.wait(contracts.confirms));
-      if (!checkEventFromLogs('Transfer', txReceipt.logs))
-        throw new Error('Deposit not confirmed');
-      txHash = tx.hash;
-    }
+    const rlcContract = await wrapCall(contracts.fetchTokenContract());
+    const tx = await wrapSend(
+      rlcContract.approveAndCall(contracts.hubAddress, vAmount, NULL_BYTES),
+    );
+    const txReceipt = await wrapWait(tx.wait(contracts.confirms));
+    if (!checkEventFromLogs('Approval', txReceipt.logs))
+      throw new Error('Approval not confirmed');
+    if (!checkEventFromLogs('Transfer', txReceipt.logs))
+      throw new Error('Transfer not confirmed');
+    txHash = tx.hash;
     return { amount: vAmount, txHash };
   } catch (error) {
     debug('deposit()', error);
@@ -84,9 +59,7 @@ export const withdraw = async (
     );
     if (stake.lt(new BN(vAmount)))
       throw new Error('Withdraw amount exceed account balance');
-    const tx = await wrapSend(
-      iexecContract.withdraw(vAmount, contracts.txOptions),
-    );
+    const tx = await wrapSend(iexecContract.withdraw(vAmount));
     const txReceipt = await wrapWait(tx.wait(contracts.confirms));
     if (!checkEventFromLogs('Transfer', txReceipt.logs))
       throw new Error('Withdraw not confirmed');
diff --git a/src/common/ens/registration.js b/src/common/ens/registration.js
deleted file mode 100644
index b0a5e501..00000000
--- a/src/common/ens/registration.js
+++ /dev/null
@@ -1,423 +0,0 @@
-import Debug from 'debug';
-import { Contract, namehash, id } from 'ethers';
-import { abi as RegistryEntryAbi } from '../generated/@iexec/poco/RegistryEntry.js';
-import { abi as ENSRegistryAbi } from '../generated/@ensdomains/registry/ENSRegistry.js';
-import { abi as FIFSRegistrarAbi } from '../generated/@ensdomains/registry/FIFSRegistrar.js';
-import { abi as ReverseRegistrarAbi } from '../generated/@ensdomains/registry/ReverseRegistrar.js';
-import { abi as PublicResolverAbi } from '../generated/@ensdomains/resolvers/PublicResolver.js';
-import {
-  throwIfMissing,
-  addressSchema,
-  ensDomainSchema,
-  ensLabelSchema,
-} from '../utils/validator.js';
-import { getAddress } from '../wallet/address.js';
-import { checkDeployedObj } from '../protocol/registries.js';
-import { wrapSend, wrapWait, wrapCall } from '../utils/errorWrappers.js';
-import { Observable, SafeObserver } from '../utils/reactive.js';
-import { checkSigner } from '../utils/utils.js';
-import { NULL_ADDRESS, APP, DATASET, WORKERPOOL } from '../utils/constant.js';
-import { getEnsRegistryAddress } from './registry.js';
-import { getOwner, lookupAddress } from './resolution.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:ens:registration');
-
-const FIFS_DOMAINS = {
-  [APP]: 'apps.iexec.eth',
-  [DATASET]: 'datasets.iexec.eth',
-  [WORKERPOOL]: 'pools.iexec.eth',
-  default: 'users.iexec.eth',
-};
-
-export const getDefaultDomain = async (
-  contracts = throwIfMissing(),
-  address,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(address);
-    const [isApp, isDataset, isWorkerpool] = await Promise.all([
-      checkDeployedObj(APP)(contracts, vAddress),
-      checkDeployedObj(DATASET)(contracts, vAddress),
-      checkDeployedObj(WORKERPOOL)(contracts, vAddress),
-    ]);
-    if (isApp) {
-      return FIFS_DOMAINS[APP];
-    }
-    if (isDataset) {
-      return FIFS_DOMAINS[DATASET];
-    }
-    if (isWorkerpool) {
-      return FIFS_DOMAINS[WORKERPOOL];
-    }
-    return FIFS_DOMAINS.default;
-  } catch (error) {
-    debug('getDefaultDomain()', error);
-    throw error;
-  }
-};
-
-export const registerFifsEns = async (
-  contracts = throwIfMissing(),
-  label = throwIfMissing(),
-  domain = FIFS_DOMAINS.default,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    checkSigner(contracts);
-    const vDomain = await ensDomainSchema().validate(domain);
-    const vLabel = await ensLabelSchema().validate(label);
-    let registerTxHash;
-    const name = `${vLabel}.${vDomain}`;
-    const labelHash = id(vLabel);
-    const address = await getAddress(contracts);
-    const ownedBy = await getOwner(contracts, name);
-    if (ownedBy === NULL_ADDRESS) {
-      const domainOwner = await getOwner(contracts, vDomain);
-      const domainOwnerCode = await wrapCall(
-        contracts.provider.getCode(domainOwner),
-      );
-      if (domainOwnerCode === '0x') {
-        throw new Error(
-          `The base domain ${vDomain} owner ${domainOwner} is not a contract`,
-        );
-      }
-      const fifsRegistrarContract = new Contract(
-        domainOwner,
-        FIFSRegistrarAbi,
-        contracts.signer,
-      );
-      const registerTx = await wrapSend(
-        fifsRegistrarContract.register(labelHash, address, contracts.txOptions),
-      );
-      await wrapWait(registerTx.wait(contracts.confirms));
-      registerTxHash = registerTx.hash;
-    } else if (ownedBy.toLowerCase() === address.toLowerCase()) {
-      debug(`${name} is already owned by current wallet ${ownedBy}`);
-    } else {
-      throw new Error(`${name} is already owned by ${ownedBy}`);
-    }
-    return {
-      registerTxHash,
-      name,
-    };
-  } catch (e) {
-    debug('registerFifsEns()', e);
-    throw e;
-  }
-};
-
-const obsConfigureResolutionMessages = {
-  DESCRIBE_WORKFLOW: 'DESCRIBE_WORKFLOW',
-  SET_RESOLVER_TX_REQUEST: 'SET_RESOLVER_TX_REQUEST',
-  SET_RESOLVER_TX_SENT: 'SET_RESOLVER_TX_SENT',
-  SET_RESOLVER_SUCCESS: 'SET_RESOLVER_SUCCESS',
-  SET_ADDR_TX_REQUEST: 'SET_ADDR_TX_REQUEST',
-  SET_ADDR_TX_SENT: 'SET_ADDR_TX_SENT',
-  SET_ADDR_SUCCESS: 'SET_ADDR_SUCCESS',
-  SET_NAME_TX_REQUEST: 'SET_NAME_TX_REQUEST',
-  SET_NAME_TX_SENT: 'SET_NAME_TX_SENT',
-  SET_NAME_SUCCESS: 'SET_NAME_SUCCESS',
-};
-
-export const obsConfigureResolution = (
-  contracts = throwIfMissing(),
-  publicResolverAddress = throwIfMissing(),
-  name = throwIfMissing(),
-  address,
-) =>
-  new Observable((observer) => {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    checkSigner(contracts);
-
-    const safeObserver = new SafeObserver(observer);
-    let abort = false;
-    const configure = async () => {
-      try {
-        const vAddress =
-          address !== undefined
-            ? await addressSchema({
-                ethProvider: contracts.provider,
-              }).validate(address)
-            : await getAddress(contracts);
-        const vName = await ensDomainSchema().validate(name);
-        const nameHash = namehash(vName);
-        const walletAddress = await getAddress(contracts);
-        const ensAddress = await getEnsRegistryAddress(contracts);
-
-        const REVERSE_DOMAIN = 'addr.reverse';
-
-        let addressIsContract = false;
-        if (vAddress !== walletAddress) {
-          const addressCode = await wrapCall(
-            contracts.provider.getCode(vAddress),
-          );
-          if (addressCode === '0x') {
-            throw new Error(
-              `Target address ${vAddress} is not a contract and don't match current wallet address ${walletAddress}, impossible to setup ENS resolution`,
-            );
-          } else {
-            addressIsContract = true;
-          }
-        }
-
-        const nameOwner = await getOwner(contracts, vName);
-        if (nameOwner.toLowerCase() !== walletAddress.toLowerCase()) {
-          throw new Error(
-            `The current address ${walletAddress} is not owner of ${vName}`,
-          );
-        }
-
-        if (addressIsContract) {
-          const registryEntryContract = new Contract(
-            vAddress,
-            RegistryEntryAbi,
-            contracts.signer,
-          );
-          const entryOwner = await wrapCall(registryEntryContract.owner());
-          if (
-            !(
-              entryOwner &&
-              entryOwner.toLowerCase() === walletAddress.toLowerCase()
-            )
-          ) {
-            throw new Error(
-              `${walletAddress} is not the owner of ${vAddress}, impossible to setup ENS resolution`,
-            );
-          }
-        }
-
-        if (abort) return;
-        safeObserver.next({
-          message: obsConfigureResolutionMessages.DESCRIBE_WORKFLOW,
-          addressType: addressIsContract ? 'CONTRACT' : 'EAO',
-          steps: ['SET_RESOLVER', 'SET_ADDR', 'SET_NAME'],
-        });
-
-        const resolverCode = await wrapCall(
-          contracts.provider.getCode(publicResolverAddress),
-        );
-        if (resolverCode === '0x') {
-          throw new Error(
-            `The resolver ${publicResolverAddress} is not a contract`,
-          );
-        }
-
-        // 1 - setup resolution
-        // set resolver
-        const currentResolver = await wrapCall(
-          contracts.provider.getResolver(vName),
-        );
-        const isResolverSet =
-          currentResolver &&
-          currentResolver.address &&
-          currentResolver.address.toLowerCase() ===
-            publicResolverAddress.toLowerCase();
-
-        if (!isResolverSet) {
-          const registryContract = new Contract(
-            ensAddress,
-            ENSRegistryAbi,
-            contracts.signer,
-          );
-          safeObserver.next({
-            message: obsConfigureResolutionMessages.SET_RESOLVER_TX_REQUEST,
-            name: vName,
-            resolverAddress: publicResolverAddress,
-          });
-          if (abort) return;
-          const setResolverTx = await wrapSend(
-            registryContract.setResolver(
-              nameHash,
-              publicResolverAddress,
-              contracts.txOptions,
-            ),
-          );
-          safeObserver.next({
-            message: obsConfigureResolutionMessages.SET_RESOLVER_TX_SENT,
-            txHash: setResolverTx.hash,
-          });
-          if (abort) return;
-          await wrapWait(setResolverTx.wait(contracts.confirms));
-        }
-        safeObserver.next({
-          message: obsConfigureResolutionMessages.SET_RESOLVER_SUCCESS,
-          name: vName,
-          resolverAddress: publicResolverAddress,
-        });
-
-        // set addr
-        const resolverContract = new Contract(
-          publicResolverAddress,
-          PublicResolverAbi,
-          contracts.signer,
-        );
-        const addr = await wrapCall(
-          resolverContract.getFunction('addr(bytes32)')(nameHash),
-        );
-        const isAddrSet = addr && addr.toLowerCase() === vAddress.toLowerCase();
-        if (!isAddrSet) {
-          safeObserver.next({
-            message: obsConfigureResolutionMessages.SET_ADDR_TX_REQUEST,
-            name: vName,
-            address: vAddress,
-          });
-          if (abort) return;
-          const setAddrTx = await wrapSend(
-            resolverContract.getFunction('setAddr(bytes32,address)')(
-              nameHash,
-              vAddress,
-              contracts.txOptions,
-            ),
-          );
-          safeObserver.next({
-            message: obsConfigureResolutionMessages.SET_ADDR_TX_SENT,
-            txHash: setAddrTx.hash,
-          });
-          if (abort) return;
-          await wrapWait(setAddrTx.wait(contracts.confirms));
-        }
-        safeObserver.next({
-          message: obsConfigureResolutionMessages.SET_ADDR_SUCCESS,
-          name: vName,
-          address: vAddress,
-        });
-
-        // 2 - setup reverse resolution
-        const configuredName = await lookupAddress(contracts, vAddress);
-        if (configuredName !== vName) {
-          if (addressIsContract) {
-            // set name for iExec NFTs
-            const registryEntryContract = new Contract(
-              vAddress,
-              RegistryEntryAbi,
-              contracts.signer,
-            );
-            safeObserver.next({
-              message: obsConfigureResolutionMessages.SET_NAME_TX_REQUEST,
-              name: vName,
-              address: vAddress,
-            });
-            if (abort) return;
-            const setNameTx = await wrapSend(
-              registryEntryContract.setName(
-                ensAddress,
-                vName,
-                contracts.txOptions,
-              ),
-            );
-            safeObserver.next({
-              message: obsConfigureResolutionMessages.SET_NAME_TX_SENT,
-              txHash: setNameTx.hash,
-            });
-            if (abort) return;
-            await wrapWait(setNameTx.wait(contracts.confirms));
-          } else {
-            // set name for EOA
-            const reverseRegistrarAddress = await getOwner(
-              contracts,
-              REVERSE_DOMAIN,
-            );
-            const reverseRegistrarContract = new Contract(
-              reverseRegistrarAddress,
-              ReverseRegistrarAbi,
-              contracts.signer,
-            );
-            safeObserver.next({
-              message: obsConfigureResolutionMessages.SET_NAME_TX_REQUEST,
-              name: vName,
-              address: vAddress,
-            });
-            if (abort) return;
-            const setNameTx = await wrapSend(
-              reverseRegistrarContract.setName(vName, contracts.txOptions),
-            );
-            safeObserver.next({
-              message: obsConfigureResolutionMessages.SET_NAME_TX_SENT,
-              txHash: setNameTx.hash,
-            });
-            if (abort) return;
-            await wrapWait(setNameTx.wait(contracts.confirms));
-          }
-        }
-        safeObserver.next({
-          message: obsConfigureResolutionMessages.SET_NAME_SUCCESS,
-          name: vName,
-          address: vAddress,
-        });
-        safeObserver.complete();
-      } catch (e) {
-        debug('obsConfigureResolution()', e);
-        safeObserver.error(e);
-      }
-    };
-    configure();
-
-    safeObserver.unsub = () => {
-      abort = true;
-    };
-    return safeObserver.unsubscribe.bind(safeObserver);
-  });
-
-export const configureResolution = async (
-  contracts = throwIfMissing(),
-  publicResolverAddress = throwIfMissing(),
-  name = throwIfMissing(),
-  address,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    checkSigner(contracts);
-    const vAddress =
-      address !== undefined
-        ? await addressSchema({ ethProvider: contracts.provider }).validate(
-            address,
-          )
-        : await getAddress(contracts);
-    const vName = await ensDomainSchema().validate(name);
-    const configObserver = await obsConfigureResolution(
-      contracts,
-      publicResolverAddress,
-      name,
-      address,
-    );
-    return new Promise((resolve, reject) => {
-      const result = {
-        name: vName,
-        address: vAddress,
-      };
-      configObserver.subscribe({
-        error: (e) => reject(e),
-        next: ({ message, ...rest }) => {
-          switch (message) {
-            case obsConfigureResolutionMessages.SET_RESOLVER_TX_SENT:
-              result.setResolverTxHash = rest.txHash;
-              break;
-            case obsConfigureResolutionMessages.SET_ADDR_TX_SENT:
-              result.setAddrTxHash = rest.txHash;
-              break;
-            case obsConfigureResolutionMessages.SET_NAME_TX_SENT:
-              result.setNameTxHash = rest.txHash;
-              break;
-            default:
-              break;
-          }
-        },
-        complete: () => {
-          resolve(result);
-        },
-      });
-    });
-  } catch (e) {
-    debug('configureResolution()', e);
-    throw e;
-  }
-};
diff --git a/src/common/ens/registry.js b/src/common/ens/registry.js
deleted file mode 100644
index 6bd61812..00000000
--- a/src/common/ens/registry.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Debug from 'debug';
-import { throwIfMissing } from '../utils/validator.js';
-import { wrapCall } from '../utils/errorWrappers.js';
-import { ConfigurationError } from '../utils/errors.js';
-
-const debug = Debug('iexec:ens:registry');
-
-export const getEnsRegistryAddress = async (contracts = throwIfMissing()) => {
-  try {
-    const network = await wrapCall(contracts.provider.getNetwork());
-    const ensPlugin = network.getPlugin('org.ethers.plugins.network.Ens');
-    if (!ensPlugin || !ensPlugin.address) {
-      throw new ConfigurationError('Network does not support ENS');
-    }
-    return ensPlugin.address;
-  } catch (e) {
-    debug('getEnsRegistryAddress()', e);
-    throw e;
-  }
-};
-
-export const checkEns = async (contracts = throwIfMissing()) => {
-  try {
-    await getEnsRegistryAddress(contracts);
-  } catch (e) {
-    debug('checkEns()', e);
-    throw e;
-  }
-};
diff --git a/src/common/ens/resolution.js b/src/common/ens/resolution.js
deleted file mode 100644
index 85c62459..00000000
--- a/src/common/ens/resolution.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import Debug from 'debug';
-import { Contract, namehash } from 'ethers';
-import { abi } from '../generated/@ensdomains/registry/ENSRegistry.js';
-import {
-  throwIfMissing,
-  addressSchema,
-  ensDomainSchema,
-} from '../utils/validator.js';
-import { wrapCall } from '../utils/errorWrappers.js';
-import { getEnsRegistryAddress, checkEns } from './registry.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:ens:resolution');
-
-export const getOwner = async (
-  contracts = throwIfMissing(),
-  name = throwIfMissing(),
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    const vName = await ensDomainSchema().validate(name);
-    const nameHash = namehash(vName);
-    const ensAddress = await getEnsRegistryAddress(contracts);
-    const ensRegistryContract = new Contract(
-      ensAddress,
-      abi,
-      contracts.provider,
-    );
-    return await wrapCall(ensRegistryContract.owner(nameHash));
-  } catch (e) {
-    debug('getOwner()', e);
-    throw e;
-  }
-};
-
-export const resolveName = async (
-  contracts = throwIfMissing(),
-  name = throwIfMissing(),
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    const vName = await ensDomainSchema().validate(name);
-    await checkEns(contracts);
-    return await wrapCall(contracts.provider.resolveName(vName));
-  } catch (e) {
-    debug('resolveName()', e);
-    throw e;
-  }
-};
-
-export const lookupAddress = async (contracts = throwIfMissing(), address) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(address);
-    await checkEns(contracts);
-    return await wrapCall(contracts.provider.lookupAddress(vAddress));
-  } catch (e) {
-    debug('lookupAddress()', e);
-    throw e;
-  }
-};
diff --git a/src/common/ens/text-record.js b/src/common/ens/text-record.js
deleted file mode 100644
index 82152434..00000000
--- a/src/common/ens/text-record.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import Debug from 'debug';
-import { Contract, namehash } from 'ethers';
-import { abi } from '../generated/@ensdomains/resolvers/PublicResolver.js';
-import {
-  throwIfMissing,
-  ensDomainSchema,
-  textRecordKeySchema,
-  textRecordValueSchema,
-} from '../utils/validator.js';
-import { getAddress } from '../wallet/address.js';
-import { wrapSend, wrapWait, wrapCall } from '../utils/errorWrappers.js';
-import { NULL_ADDRESS } from '../utils/constant.js';
-import { getOwner } from './resolution.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:ens:text-record');
-
-export const readTextRecord = async (
-  contracts = throwIfMissing(),
-  name,
-  key,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    const vName = await ensDomainSchema().validate(name);
-    const vKey = await textRecordKeySchema().validate(key);
-    const node = namehash(vName);
-    const currentResolver = await wrapCall(
-      contracts.provider.getResolver(vName),
-    );
-    const isResolverSet =
-      currentResolver &&
-      currentResolver.address &&
-      currentResolver.address !== NULL_ADDRESS;
-    if (!isResolverSet) {
-      throw new Error(`No resolver is configured for ${vName}`);
-    }
-    const resolverContract = new Contract(
-      currentResolver.address,
-      abi,
-      contracts.provider,
-    );
-    return await wrapCall(resolverContract.text(node, vKey));
-  } catch (e) {
-    debug('readText()', e);
-    throw e;
-  }
-};
-
-export const setTextRecord = async (
-  contracts = throwIfMissing(),
-  name,
-  key,
-  value = '',
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.ENS);
-    const vName = await ensDomainSchema().validate(name);
-    const vKey = await textRecordKeySchema().validate(key);
-    const vValue = await textRecordValueSchema().validate(value);
-    const node = namehash(vName);
-    const currentResolver = await wrapCall(
-      contracts.provider.getResolver(vName),
-    );
-    const isResolverSet =
-      currentResolver &&
-      currentResolver.address &&
-      currentResolver.address !== NULL_ADDRESS;
-    if (!isResolverSet) {
-      throw new Error(`No resolver is configured for ${vName}`);
-    }
-    const ownedBy = await getOwner(contracts, vName);
-    const userAddress = await getAddress(contracts);
-    if (ownedBy !== userAddress) {
-      throw new Error(
-        `${userAddress} is not authorised to set a text record for ${vName}`,
-      );
-    }
-    const resolverContract = new Contract(
-      currentResolver.address,
-      abi,
-      contracts.signer,
-    );
-    const tx = await wrapSend(resolverContract.setText(node, vKey, vValue));
-    await wrapWait(tx.wait(contracts.confirms));
-    return tx.hash;
-  } catch (e) {
-    debug('setTextRecord()', e);
-    throw e;
-  }
-};
diff --git a/src/common/execution/deal.js b/src/common/execution/deal.js
index fc76d632..efe38aa3 100644
--- a/src/common/execution/deal.js
+++ b/src/common/execution/deal.js
@@ -40,21 +40,14 @@ export const fetchRequesterDeals = async (
   } = {},
 ) => {
   try {
-    const vRequesterAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vRequesterAddress = await addressSchema()
       .required()
       .validate(requesterAddress);
     const vChainId = await chainIdSchema().validate(contracts.chainId);
-    const vAppAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(appAddress);
-    const vDatasetAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(datasetAddress);
-    const vWorkerpoolAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(workerpoolAddress);
+    const vAppAddress = await addressSchema().validate(appAddress);
+    const vDatasetAddress = await addressSchema().validate(datasetAddress);
+    const vWorkerpoolAddress =
+      await addressSchema().validate(workerpoolAddress);
     const query = {
       chainId: vChainId,
       requester: vRequesterAddress,
@@ -295,9 +288,7 @@ export const claim = async (
         const taskidToProcess = initializedToProcess.map(
           ({ taskid }) => taskid,
         );
-        const tx = await wrapSend(
-          iexecContract.claimArray(taskidToProcess, contracts.txOptions),
-        );
+        const tx = await wrapSend(iexecContract.claimArray(taskidToProcess));
         debug(`claimArray ${tx.hash} (${initializedToProcess.length} tasks)`);
         await wrapWait(tx.wait(contracts.confirms));
         transactions.push({
@@ -325,11 +316,7 @@ export const claim = async (
         const idxToProcess = notInitializedToProcess.map(({ idx }) => idx);
         const dealidArray = new Array(idxToProcess.length).fill(vDealid);
         const tx = await wrapSend(
-          iexecContract.initializeAndClaimArray(
-            dealidArray,
-            idxToProcess,
-            contracts.txOptions,
-          ),
+          iexecContract.initializeAndClaimArray(dealidArray, idxToProcess),
         );
         debug(
           `initializeAndClaimArray ${tx.hash} (${notInitializedToProcess.length} tasks)`,
diff --git a/src/common/execution/debug.js b/src/common/execution/debug.js
index 7861b1ba..076a18f9 100644
--- a/src/common/execution/debug.js
+++ b/src/common/execution/debug.js
@@ -2,14 +2,10 @@ import Debug from 'debug';
 import {
   throwIfMissing,
   addressSchema,
-  workerpoolApiUrlSchema,
   bytes32Schema,
 } from '../utils/validator.js';
-import { lookupAddress } from '../ens/resolution.js';
-import { readTextRecord } from '../ens/text-record.js';
 import { show as dealShow } from './deal.js';
 import { show as taskShow } from './task.js';
-import { WORKERPOOL_URL_TEXT_RECORD_KEY } from '../utils/constant.js';
 import { jsonApi, getAuthorization } from '../utils/api-utils.js';
 import { checkSigner } from '../utils/utils.js';
 import { getAddress } from '../wallet/address.js';
@@ -27,9 +23,7 @@ export const getWorkerpoolApiUrl = async (
   workerpoolAddress,
 ) => {
   try {
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vAddress = await addressSchema()
       .required()
       .label('workerpool address')
       .validate(workerpoolAddress);
@@ -54,25 +48,6 @@ export const getWorkerpoolApiUrl = async (
         });
       return json?.apiUrl;
     }
-
-    // ENS based workerpool API URL resolution
-    const name = await lookupAddress(contracts, vAddress).catch(() => {
-      /** return undefined */
-    });
-    if (!name) {
-      return undefined;
-    }
-    const url = await readTextRecord(
-      contracts,
-      name,
-      WORKERPOOL_URL_TEXT_RECORD_KEY,
-    );
-    return await workerpoolApiUrlSchema()
-      .required()
-      .validate(url)
-      .catch(() => {
-        /** return undefined */
-      });
   } catch (e) {
     debug('getWorkerpoolApiUrl()', e);
     throw e;
diff --git a/src/common/execution/order-helper.js b/src/common/execution/order-helper.js
index e35b9835..db975139 100644
--- a/src/common/execution/order-helper.js
+++ b/src/common/execution/order-helper.js
@@ -10,7 +10,6 @@ import {
   NULL_ADDRESS,
   NULL_BYTES32,
   IEXEC_REQUEST_PARAMS,
-  STORAGE_PROVIDERS,
   TEE_FRAMEWORKS,
 } from '../utils/constant.js';
 import {
@@ -33,23 +32,16 @@ import {
   positiveStrictIntSchema,
   signedDatasetorderBulkSchema,
 } from '../utils/validator.js';
-import { resolveTeeFrameworkFromApp, showApp } from '../protocol/registries.js';
+import { showApp } from '../protocol/registries.js';
 import { add } from '../utils/ipfs.js';
 
 const debug = Debug('iexec:execution:order-helper');
 
 export const resolveTeeFrameworkFromTag = async (tag) => {
   const vTag = await tagSchema({ allowAgnosticTee: true }).validate(tag);
-  if (checkActiveBitInTag(vTag, TAG_MAP[TEE_FRAMEWORKS.SCONE])) {
-    return TEE_FRAMEWORKS.SCONE;
-  }
   if (checkActiveBitInTag(vTag, TAG_MAP[TEE_FRAMEWORKS.TDX])) {
     return TEE_FRAMEWORKS.TDX;
   }
-  if (checkActiveBitInTag(vTag, TAG_MAP[TEE_FRAMEWORKS.GRAMINE])) {
-    return TEE_FRAMEWORKS.GRAMINE;
-  }
-
   return undefined;
 };
 
@@ -80,10 +72,7 @@ export const createObjParams = async ({
 };
 
 export const checkRequestRequirements = async (
-  {
-    contracts = throwIfMissing(),
-    smsURL = throwIfMissing(),
-  } = throwIfMissing(),
+  { smsURL = throwIfMissing() } = throwIfMissing(),
   requestorder = throwIfMissing(),
 ) => {
   const vRequestorder = await requestorderSchema().validate(requestorder);
@@ -100,7 +89,6 @@ export const checkRequestRequirements = async (
   // check encryption key
   if (paramsObj[IEXEC_REQUEST_PARAMS.IEXEC_RESULT_ENCRYPTION] === true) {
     const isEncryptionKeySet = await checkWeb2SecretExists(
-      contracts,
       smsURL,
       beneficiary,
       reservedSecretKeyName.IEXEC_RESULT_ENCRYPTION_PUBLIC_KEY,
@@ -112,35 +100,28 @@ export const checkRequestRequirements = async (
     }
   }
 
-  // check dropbox storage token
-  if (
-    paramsObj[IEXEC_REQUEST_PARAMS.IEXEC_RESULT_STORAGE_PROVIDER] ===
-    STORAGE_PROVIDERS.DROPBOX
-  ) {
-    const isStorageTokenSet = await checkWeb2SecretExists(
-      contracts,
-      smsURL,
-      requester,
-      getStorageTokenKeyName(
-        paramsObj[IEXEC_REQUEST_PARAMS.IEXEC_RESULT_STORAGE_PROVIDER],
-      ),
-    );
-    if (!isStorageTokenSet) {
-      throw new Error(
-        `Requester storage token is not set for selected provider "${
-          paramsObj[IEXEC_REQUEST_PARAMS.IEXEC_RESULT_STORAGE_PROVIDER]
-        }". Result archive upload will fail.`,
+  // check storage token
+  const storageProvider =
+    paramsObj[IEXEC_REQUEST_PARAMS.IEXEC_RESULT_STORAGE_PROVIDER];
+  if (storageProvider) {
+    const storageTokenKeyName = getStorageTokenKeyName(storageProvider);
+    if (storageTokenKeyName) {
+      const isStorageTokenSet = await checkWeb2SecretExists(
+        smsURL,
+        requester,
+        storageTokenKeyName,
       );
+      if (!isStorageTokenSet) {
+        throw new Error(
+          `Requester storage token is not set for selected provider "${storageProvider}". Result archive upload will fail.`,
+        );
+      }
     }
   }
 
   // check tee dataset encryption key
   if (dataset && dataset !== NULL_ADDRESS && isTee) {
-    const isDatasetSecretSet = await checkWeb3SecretExists(
-      contracts,
-      smsURL,
-      dataset,
-    );
+    const isDatasetSecretSet = await checkWeb3SecretExists(smsURL, dataset);
     if (!isDatasetSecretSet) {
       throw new Error(
         `Dataset encryption key is not set for dataset ${dataset} in the SMS. Dataset decryption will fail.`,
@@ -153,7 +134,6 @@ export const checkRequestRequirements = async (
       Object.values(paramsObj[IEXEC_REQUEST_PARAMS.IEXEC_SECRETS]).map(
         async (secretName) => {
           const isSecretSet = await checkRequesterSecretExists(
-            contracts,
             smsURL,
             requester,
             secretName,
@@ -170,10 +150,7 @@ export const checkRequestRequirements = async (
 };
 
 export const checkDatasetRequirements = async (
-  {
-    contracts = throwIfMissing(),
-    smsURL = throwIfMissing(),
-  } = throwIfMissing(),
+  { smsURL = throwIfMissing() } = throwIfMissing(),
   datasetorder = throwIfMissing(),
   { tagOverride } = {},
 ) => {
@@ -187,11 +164,7 @@ export const checkDatasetRequirements = async (
   );
   // check tee dataset encryption key
   if (dataset && dataset !== NULL_ADDRESS && isTee) {
-    const isDatasetSecretSet = await checkWeb3SecretExists(
-      contracts,
-      smsURL,
-      dataset,
-    );
+    const isDatasetSecretSet = await checkWeb3SecretExists(smsURL, dataset);
     if (!isDatasetSecretSet) {
       throw new Error(
         `Dataset encryption key is not set for dataset ${dataset} in the SMS. Dataset decryption will fail.`,
@@ -203,21 +176,14 @@ export const checkDatasetRequirements = async (
 export const checkAppRequirements = async (
   { contracts = throwIfMissing() } = throwIfMissing(),
   apporder = throwIfMissing(),
-  { tagOverride } = {},
 ) => {
   const vApporder = await apporderSchema().validate(apporder);
-  const { tag, app } = vApporder;
-  const tagTeeFramework = await resolveTeeFrameworkFromTag(
-    tagOverride ? await tagSchema().validate(tagOverride) : tag,
-  );
-  const appTeeFramework = await showApp(contracts, app).then((res) =>
-    resolveTeeFrameworkFromApp(res.app, { strict: false }),
-  );
-  const tagMatchesApp =
-    appTeeFramework === tagTeeFramework ||
-    (tagTeeFramework === undefined && appTeeFramework === TEE_FRAMEWORKS.TDX);
-  if (!tagMatchesApp) {
-    throw new Error('Tag mismatch the TEE framework specified by app');
+  const { app } = vApporder;
+  const registeredApp = await showApp(contracts, app);
+  if (registeredApp.app.appMREnclave) {
+    throw new Error(
+      `App ${app} has an MREnclave, which is no longer supported`,
+    );
   }
 };
 
diff --git a/src/common/execution/storage.js b/src/common/execution/storage.js
new file mode 100644
index 00000000..d5cbdc2f
--- /dev/null
+++ b/src/common/execution/storage.js
@@ -0,0 +1,40 @@
+import { checkWeb2SecretExists } from '../sms/check.js';
+import { pushWeb2Secret } from '../sms/push.js';
+import { getStorageTokenKeyName } from '../utils/secrets-utils.js';
+import { addressSchema, storageProviderSchema } from '../utils/validator.js';
+
+export const checkStorageTokenExists = async (
+  { smsURL },
+  address,
+  provider,
+) => {
+  const vAddress = await addressSchema().validate(address);
+  const vProvider = await storageProviderSchema().validate(provider);
+  const storageTokenKeyName = getStorageTokenKeyName(vProvider);
+  if (storageTokenKeyName) {
+    return checkWeb2SecretExists(smsURL, vAddress, storageTokenKeyName);
+  } else {
+    throw new Error(
+      `Storage provider "${vProvider}" does not support authentication tokens`,
+    );
+  }
+};
+
+export const pushStorageToken = async (
+  { contracts, smsURL },
+  token,
+  provider,
+  { forceUpdate = false } = {},
+) => {
+  const vProvider = await storageProviderSchema().validate(provider);
+  const storageTokenKeyName = getStorageTokenKeyName(vProvider);
+  if (storageTokenKeyName) {
+    return pushWeb2Secret(contracts, smsURL, storageTokenKeyName, token, {
+      forceUpdate,
+    });
+  } else {
+    throw new Error(
+      `Storage provider "${vProvider}" does not support authentication tokens`,
+    );
+  }
+};
diff --git a/src/common/execution/task.js b/src/common/execution/task.js
index f875e663..4bc66f7d 100644
--- a/src/common/execution/task.js
+++ b/src/common/execution/task.js
@@ -198,9 +198,7 @@ export const claim = async (
     }
 
     const iexecContract = contracts.getIExecContract();
-    const claimTx = await wrapSend(
-      iexecContract.claim(taskid, contracts.txOptions),
-    );
+    const claimTx = await wrapSend(iexecContract.claim(taskid));
 
     const claimTxReceipt = await wrapWait(claimTx.wait(contracts.confirms));
     if (!checkEventFromLogs('TaskClaimed', claimTxReceipt.logs))
diff --git a/src/common/execution/workerpool.js b/src/common/execution/workerpool.js
deleted file mode 100644
index 6a27522b..00000000
--- a/src/common/execution/workerpool.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import Debug from 'debug';
-import {
-  throwIfMissing,
-  addressSchema,
-  workerpoolApiUrlSchema,
-} from '../utils/validator.js';
-import { lookupAddress } from '../ens/resolution.js';
-import { setTextRecord } from '../ens/text-record.js';
-import { WORKERPOOL_URL_TEXT_RECORD_KEY } from '../utils/constant.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:execution:workerpool');
-
-export const setWorkerpoolApiUrl = async (
-  contracts = throwIfMissing(),
-  workerpoolAddress,
-  url,
-) => {
-  try {
-    checkImplementedOnChain(
-      contracts.chainId,
-      CHAIN_SPECIFIC_FEATURES.WORKERPOOL_API_URL_REGISTRATION,
-    );
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(workerpoolAddress);
-    const vUrl = await workerpoolApiUrlSchema()
-      .label('workerpool API url')
-      .validate(url);
-    const name = await lookupAddress(contracts, vAddress);
-    if (!name) {
-      throw new Error(
-        `No ENS name reverse resolution configured for ${vAddress}`,
-      );
-    }
-    return await setTextRecord(
-      contracts,
-      name,
-      WORKERPOOL_URL_TEXT_RECORD_KEY,
-      vUrl,
-    );
-  } catch (e) {
-    debug('setWorkerpoolApiUrl()', e);
-    throw e;
-  }
-};
diff --git a/src/common/market/marketplace.js b/src/common/market/marketplace.js
index fd6065c8..96e91ee3 100644
--- a/src/common/market/marketplace.js
+++ b/src/common/market/marketplace.js
@@ -252,11 +252,7 @@ export const unpublishAllApporders = async (
     await chainIdSchema().validate(contracts.chainId),
     {
       target: UNPUBLISH_TARGET_ALL_ORDERS,
-      address: await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(appAddress),
+      address: await addressSchema().required().validate(appAddress),
     },
   );
 
@@ -272,11 +268,7 @@ export const unpublishAllDatasetorders = async (
     await chainIdSchema().validate(contracts.chainId),
     {
       target: UNPUBLISH_TARGET_ALL_ORDERS,
-      address: await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(datasetAddress),
+      address: await addressSchema().required().validate(datasetAddress),
     },
   );
 
@@ -292,11 +284,7 @@ export const unpublishAllWorkerpoolorders = async (
     await chainIdSchema().validate(contracts.chainId),
     {
       target: UNPUBLISH_TARGET_ALL_ORDERS,
-      address: await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(workerpoolAddress),
+      address: await addressSchema().required().validate(workerpoolAddress),
     },
   );
 
@@ -327,11 +315,7 @@ export const unpublishLastApporder = async (
     await chainIdSchema().validate(contracts.chainId),
     {
       target: UNPUBLISH_TARGET_LAST_ORDER,
-      address: await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(appAddress),
+      address: await addressSchema().required().validate(appAddress),
     },
   );
   return unpublished[0];
@@ -349,11 +333,7 @@ export const unpublishLastDatasetorder = async (
     await chainIdSchema().validate(contracts.chainId),
     {
       target: UNPUBLISH_TARGET_LAST_ORDER,
-      address: await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(datasetAddress),
+      address: await addressSchema().required().validate(datasetAddress),
     },
   );
   return unpublished[0];
@@ -371,11 +351,7 @@ export const unpublishLastWorkerpoolorder = async (
     await chainIdSchema().validate(contracts.chainId),
     {
       target: UNPUBLISH_TARGET_LAST_ORDER,
-      address: await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(workerpoolAddress),
+      address: await addressSchema().required().validate(workerpoolAddress),
     },
   );
   return unpublished[0];
diff --git a/src/common/market/order.js b/src/common/market/order.js
index ca8d92fd..96f9fd19 100644
--- a/src/common/market/order.js
+++ b/src/common/market/order.js
@@ -53,7 +53,6 @@ import {
   uint256Schema,
   nRlcAmountSchema,
   throwIfMissing,
-  booleanSchema,
 } from '../utils/validator.js';
 import {
   wrapCall,
@@ -61,13 +60,6 @@ import {
   wrapWait,
   wrapSignTypedData,
 } from '../utils/errorWrappers.js';
-import { getVoucherHubContract } from '../utils/voucher-utils.js';
-import { checkAllowance } from '../account/allowance.js';
-import { fetchVoucherContract } from '../voucher/voucher.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
 
 const debug = Debug('iexec:market:order');
 
@@ -209,32 +201,6 @@ const getMatchOrdersTotalCost = (
     bnAppPrice.add(bnDatasetPrice).add(bnWorkerpoolPrice),
   );
 };
-const getMatchOrdersSponsoredCostWithVoucher = (
-  appOrder,
-  datasetOrder,
-  workerpoolOrder,
-  matchableVolume,
-  balance,
-  isAppEligibleToMatchOrdersSponsoring,
-  isDatasetEligibleToMatchOrdersSponsoring,
-  isWorkerpoolEligibleToMatchOrdersSponsoring,
-) => {
-  const sponsoredAppPrice = isAppEligibleToMatchOrdersSponsoring
-    ? appOrder.appprice
-    : 0;
-  const sponsoredDatasetPrice = isDatasetEligibleToMatchOrdersSponsoring
-    ? datasetOrder.datasetprice
-    : 0;
-  const sponsoredWorkerpoolPrice = isWorkerpoolEligibleToMatchOrdersSponsoring
-    ? workerpoolOrder.workerpoolprice
-    : 0;
-  const sponsoredAmount = new BN(matchableVolume).mul(
-    new BN(sponsoredAppPrice)
-      .add(new BN(sponsoredDatasetPrice))
-      .add(new BN(sponsoredWorkerpoolPrice)),
-  );
-  return BN.min(sponsoredAmount, new BN(balance));
-};
 
 export const computeOrderHash = async (
   contracts = throwIfMissing(),
@@ -245,24 +211,16 @@ export const computeOrderHash = async (
     let vOrder;
     switch (orderName) {
       case APP_ORDER:
-        vOrder = await saltedApporderSchema({
-          ethProvider: contracts.provider,
-        }).validate(order);
+        vOrder = await saltedApporderSchema().validate(order);
         break;
       case DATASET_ORDER:
-        vOrder = await saltedDatasetorderSchema({
-          ethProvider: contracts.provider,
-        }).validate(order);
+        vOrder = await saltedDatasetorderSchema().validate(order);
         break;
       case WORKERPOOL_ORDER:
-        vOrder = await saltedWorkerpoolorderSchema({
-          ethProvider: contracts.provider,
-        }).validate(order);
+        vOrder = await saltedWorkerpoolorderSchema().validate(order);
         break;
       case REQUEST_ORDER:
-        vOrder = await saltedRequestorderSchema({
-          ethProvider: contracts.provider,
-        }).validate(order);
+        vOrder = await saltedRequestorderSchema().validate(order);
         break;
       default:
     }
@@ -291,9 +249,7 @@ export const hashApporder = async (
   computeOrderHash(
     contracts,
     APP_ORDER,
-    await saltedApporderSchema({
-      ethProvider: contracts.provider,
-    }).validate(order),
+    await saltedApporderSchema().validate(order),
   );
 export const hashDatasetorder = async (
   contracts = throwIfMissing(),
@@ -302,9 +258,7 @@ export const hashDatasetorder = async (
   computeOrderHash(
     contracts,
     DATASET_ORDER,
-    await saltedDatasetorderSchema({
-      ethProvider: contracts.provider,
-    }).validate(order),
+    await saltedDatasetorderSchema().validate(order),
   );
 export const hashWorkerpoolorder = async (
   contracts = throwIfMissing(),
@@ -313,9 +267,7 @@ export const hashWorkerpoolorder = async (
   computeOrderHash(
     contracts,
     WORKERPOOL_ORDER,
-    await saltedWorkerpoolorderSchema({
-      ethProvider: contracts.provider,
-    }).validate(order),
+    await saltedWorkerpoolorderSchema().validate(order),
   );
 export const hashRequestorder = async (
   contracts = throwIfMissing(),
@@ -324,9 +276,7 @@ export const hashRequestorder = async (
   computeOrderHash(
     contracts,
     REQUEST_ORDER,
-    await saltedRequestorderSchema({
-      ethProvider: contracts.provider,
-    }).validate(order),
+    await saltedRequestorderSchema().validate(order),
   );
 
 export const getRemainingVolume = async (
@@ -383,14 +333,7 @@ const signOrder = async (
 export const signApporder = async (
   contracts = throwIfMissing(),
   apporder = throwIfMissing(),
-) =>
-  signOrder(
-    contracts,
-    APP_ORDER,
-    await apporderSchema({ ethProvider: contracts.provider }).validate(
-      apporder,
-    ),
-  );
+) => signOrder(contracts, APP_ORDER, await apporderSchema().validate(apporder));
 
 export const signDatasetorder = async (
   contracts = throwIfMissing(),
@@ -399,9 +342,7 @@ export const signDatasetorder = async (
   signOrder(
     contracts,
     DATASET_ORDER,
-    await datasetorderSchema({
-      ethProvider: contracts.provider,
-    }).validate(datasetorder),
+    await datasetorderSchema().validate(datasetorder),
   );
 
 export const signWorkerpoolorder = async (
@@ -411,9 +352,7 @@ export const signWorkerpoolorder = async (
   signOrder(
     contracts,
     WORKERPOOL_ORDER,
-    await workerpoolorderSchema({
-      ethProvider: contracts.provider,
-    }).validate(workerpoolorder),
+    await workerpoolorderSchema().validate(workerpoolorder),
   );
 
 export const signRequestorder = async (
@@ -423,9 +362,7 @@ export const signRequestorder = async (
   signOrder(
     contracts,
     REQUEST_ORDER,
-    await requestorderSchema({
-      ethProvider: contracts.provider,
-    }).validate(requestorder),
+    await requestorderSchema().validate(requestorder),
   );
 
 const cancelOrder = async (
@@ -445,10 +382,7 @@ const cancelOrder = async (
       throw new Error(`${orderName} already canceled`);
     const iexecContract = contracts.getIExecContract();
     const tx = await wrapSend(
-      iexecContract[objDesc[orderName].cancelMethod](
-        [args, 1, NULL_BYTES],
-        contracts.txOptions,
-      ),
+      iexecContract[objDesc[orderName].cancelMethod]([args, 1, NULL_BYTES]),
     );
     const txReceipt = await wrapWait(tx.wait(contracts.confirms));
     if (!checkEventFromLogs(objDesc[orderName].cancelEvent, txReceipt.logs))
@@ -673,7 +607,7 @@ const getMatchableVolume = async (
     // app tag check
     const teeAppRequired = checkActiveBitInTag(
       sumTags([vRequestOrder.tag, stripTeeFrameworkFromTag(vDatasetOrder.tag)]),
-      1,
+      TAG_MAP.tee,
     );
     if (teeAppRequired && !checkActiveBitInTag(vAppOrder.tag, TAG_MAP.tee)) {
       throw new Error('Missing tag [tee] in apporder');
@@ -793,43 +727,27 @@ const getMatchableVolume = async (
 
 export const estimateMatchOrders = async ({
   contracts = throwIfMissing(),
-  voucherHubAddress,
   apporder,
   datasetorder = NULL_DATASETORDER,
   workerpoolorder,
   requestorder,
-  useVoucher = false,
-  voucherAddress,
 }) => {
-  const [
-    vAppOrder,
-    vDatasetOrder,
-    vWorkerpoolOrder,
-    vRequestOrder,
-    vUseVoucher,
-    vVoucherAddress,
-  ] = await Promise.all([
-    signedApporderSchema().required().label('apporder').validate(apporder),
-    signedDatasetorderSchema()
-      .required()
-      .label('datasetorder')
-      .validate(datasetorder),
-    signedWorkerpoolorderSchema()
-      .required()
-      .label('workerpoolorder')
-      .validate(workerpoolorder),
-    signedRequestorderSchema()
-      .required()
-      .label('requestorder')
-      .validate(requestorder),
-    booleanSchema().required().label('useVoucher').validate(useVoucher),
-    addressSchema({ ethProvider: contracts.provider })
-      .label('voucherAddress')
-      .validate(voucherAddress),
-  ]);
-  if (vUseVoucher) {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.VOUCHER);
-  }
+  const [vAppOrder, vDatasetOrder, vWorkerpoolOrder, vRequestOrder] =
+    await Promise.all([
+      signedApporderSchema().required().label('apporder').validate(apporder),
+      signedDatasetorderSchema()
+        .required()
+        .label('datasetorder')
+        .validate(datasetorder),
+      signedWorkerpoolorderSchema()
+        .required()
+        .label('workerpoolorder')
+        .validate(workerpoolorder),
+      signedRequestorderSchema()
+        .required()
+        .label('requestorder')
+        .validate(requestorder),
+    ]);
   const matchableVolume = await getMatchableVolume(
     contracts,
     vAppOrder,
@@ -843,119 +761,37 @@ export const estimateMatchOrders = async ({
     vDatasetOrder.datasetprice,
     vWorkerpoolOrder.workerpoolprice,
   );
-  let sponsoredCost = new BN(0);
-  if (vUseVoucher) {
-    const voucherContract = await fetchVoucherContract(
-      contracts,
-      voucherHubAddress,
-      await getAddress(contracts),
-      { voucherAddress: vVoucherAddress },
-    );
-    if (!voucherContract) {
-      return { total: totalCost, sponsored: sponsoredCost };
-    }
-    const voucherExpiration = await wrapCall(voucherContract.getExpiration());
-    const now = Math.floor(Date.now() / 1000);
-    if (voucherExpiration <= now) {
-      return { total: totalCost, sponsored: sponsoredCost };
-    }
-    const [balance, voucherTypeId] = await Promise.all([
-      wrapCall(voucherContract.getBalance()),
-      wrapCall(voucherContract.getType()),
-    ]);
-    const voucherHubContract = getVoucherHubContract(
-      contracts,
-      voucherHubAddress,
-    );
-
-    const [
-      isAppEligibleToMatchOrdersSponsoring,
-      isDatasetEligibleToMatchOrdersSponsoring,
-      isWorkerpoolEligibleToMatchOrdersSponsoring,
-    ] = await Promise.all([
-      wrapCall(
-        voucherHubContract.isAssetEligibleToMatchOrdersSponsoring(
-          voucherTypeId,
-          apporder.app,
-        ),
-      ),
-      wrapCall(
-        voucherHubContract.isAssetEligibleToMatchOrdersSponsoring(
-          voucherTypeId,
-          datasetorder.dataset,
-        ),
-      ),
-      wrapCall(
-        voucherHubContract.isAssetEligibleToMatchOrdersSponsoring(
-          voucherTypeId,
-          workerpoolorder.workerpool,
-        ),
-      ),
-    ]);
-
-    sponsoredCost = getMatchOrdersSponsoredCostWithVoucher(
-      vAppOrder,
-      vDatasetOrder,
-      vWorkerpoolOrder,
-      matchableVolume,
-      balance,
-      isAppEligibleToMatchOrdersSponsoring,
-      isDatasetEligibleToMatchOrdersSponsoring,
-      isWorkerpoolEligibleToMatchOrdersSponsoring,
-    );
-  }
-
   return {
     volume: matchableVolume,
     total: totalCost,
-    sponsored: sponsoredCost,
   };
 };
 
 export const matchOrders = async ({
   contracts = throwIfMissing(),
-  voucherHubAddress,
   apporder,
   datasetorder = NULL_DATASETORDER,
   workerpoolorder,
   requestorder,
-  useVoucher = false,
-  voucherAddress,
 }) => {
   try {
     checkSigner(contracts);
-    const [
-      vAppOrder,
-      vDatasetOrder,
-      vWorkerpoolOrder,
-      vRequestOrder,
-      vUseVoucher,
-      vVoucherAddress,
-    ] = await Promise.all([
-      signedApporderSchema().required().label('apporder').validate(apporder),
-      signedDatasetorderSchema()
-        .required()
-        .label('datasetorder')
-        .validate(datasetorder),
-      signedWorkerpoolorderSchema()
-        .required()
-        .label('workerpoolorder')
-        .validate(workerpoolorder),
-      signedRequestorderSchema()
-        .required()
-        .label('requestorder')
-        .validate(requestorder),
-      booleanSchema().required().label('useVoucher').validate(useVoucher),
-      addressSchema({ ethProvider: contracts.provider })
-        .label('voucherAddress')
-        .validate(voucherAddress),
-    ]);
-    if (vUseVoucher) {
-      checkImplementedOnChain(
-        contracts.chainId,
-        CHAIN_SPECIFIC_FEATURES.VOUCHER,
-      );
-    }
+    const [vAppOrder, vDatasetOrder, vWorkerpoolOrder, vRequestOrder] =
+      await Promise.all([
+        signedApporderSchema().required().label('apporder').validate(apporder),
+        signedDatasetorderSchema()
+          .required()
+          .label('datasetorder')
+          .validate(datasetorder),
+        signedWorkerpoolorderSchema()
+          .required()
+          .label('workerpoolorder')
+          .validate(workerpoolorder),
+        signedRequestorderSchema()
+          .required()
+          .label('requestorder')
+          .validate(requestorder),
+      ]);
 
     // check resulting tag
     await tagSchema()
@@ -985,63 +821,20 @@ export const matchOrders = async ({
     const appPrice = new BN(vAppOrder.appprice);
     const datasetPrice = new BN(vDatasetOrder.datasetprice);
 
-    // resolve voucher contract address if used
-    let voucherContract;
-    if (vUseVoucher) {
-      voucherContract = await fetchVoucherContract(
-        contracts,
-        voucherHubAddress,
-        await getAddress(contracts),
-        { voucherAddress: vVoucherAddress },
-      );
-      if (!voucherContract) {
-        throw new Error(
-          `No voucher available for the requester ${vRequestOrder.requester}`,
-        );
-      }
-    }
-
     // account stake check
     const checkRequesterSolvabilityAsync = async () => {
       const costPerTask = appPrice.add(datasetPrice).add(workerpoolPrice);
       const totalCost = costPerTask.mul(matchableVolume);
       const { stake } = await checkBalance(contracts, vRequestOrder.requester);
-      if (vUseVoucher) {
-        const { total, sponsored } = await estimateMatchOrders({
-          contracts,
-          voucherHubAddress,
-          apporder: vAppOrder,
-          datasetorder: vDatasetOrder,
-          workerpoolorder: vWorkerpoolOrder,
-          requestorder: vRequestOrder,
-          useVoucher: vUseVoucher,
-          voucherAddress: vVoucherAddress,
-        });
-        if (total.gt(sponsored)) {
-          const allowance = await checkAllowance(
-            contracts,
-            vRequestOrder.requester,
-            await voucherContract.getAddress(),
-          );
-          const requiredAllowance = total.sub(sponsored);
-          if (allowance.lt(requiredAllowance)) {
-            const missingAmount = requiredAllowance.sub(allowance);
-            throw new Error(
-              `Orders can't be matched. Please approve an additional ${missingAmount} for voucher usage.`,
-            );
-          }
-        }
-      } else {
-        if (stake.lt(costPerTask)) {
-          throw new Error(
-            `Cost per task (${costPerTask}) is greater than requester account stake (${stake}). Orders can't be matched. If you are the requester, you should deposit to top up your account`,
-          );
-        }
-        if (stake.lt(totalCost)) {
-          throw new Error(
-            `Total cost for ${matchableVolume} tasks (${totalCost}) is greater than requester account stake (${stake}). Orders can't be matched. If you are the requester, you should deposit to top up your account or reduce your requestorder volume`,
-          );
-        }
+      if (stake.lt(costPerTask)) {
+        throw new Error(
+          `Cost per task (${costPerTask}) is greater than requester account stake (${stake}). Orders can't be matched. If you are the requester, you should deposit to top up your account`,
+        );
+      }
+      if (stake.lt(totalCost)) {
+        throw new Error(
+          `Total cost for ${matchableVolume} tasks (${totalCost}) is greater than requester account stake (${stake}). Orders can't be matched. If you are the requester, you should deposit to top up your account or reduce your requestorder volume`,
+        );
       }
     };
 
@@ -1060,31 +853,15 @@ export const matchOrders = async ({
       REQUEST_ORDER,
       vRequestOrder,
     );
-
-    let tx;
     const iexecContract = contracts.getIExecContract();
-    if (vUseVoucher) {
-      tx = await wrapSend(
-        voucherContract
-          .connect(contracts.signer)
-          .matchOrders(
-            appOrderStruct,
-            datasetOrderStruct,
-            workerpoolOrderStruct,
-            requestOrderStruct,
-          ),
-      );
-    } else {
-      tx = await wrapSend(
-        iexecContract.matchOrders(
-          appOrderStruct,
-          datasetOrderStruct,
-          workerpoolOrderStruct,
-          requestOrderStruct,
-          contracts.txOptions,
-        ),
-      );
-    }
+    const tx = await wrapSend(
+      iexecContract.matchOrders(
+        appOrderStruct,
+        datasetOrderStruct,
+        workerpoolOrderStruct,
+        requestOrderStruct,
+      ),
+    );
     const txReceipt = await wrapWait(tx.wait(contracts.confirms));
     const events = parseTransactionLogs(
       txReceipt.logs,
@@ -1103,99 +880,65 @@ export const matchOrders = async ({
   }
 };
 
-export const createApporder = async (
-  contracts = throwIfMissing(),
-  {
-    app,
-    appprice = '0',
-    volume = '1',
-    tag = NULL_BYTES32,
-    datasetrestrict = NULL_ADDRESS,
-    workerpoolrestrict = NULL_ADDRESS,
-    requesterrestrict = NULL_ADDRESS,
-  } = {},
-) => ({
-  app: await addressSchema({ ethProvider: contracts.provider })
-    .required()
-    .label('app')
-    .validate(app),
+export const createApporder = async ({
+  app,
+  appprice = '0',
+  volume = '1',
+  tag = NULL_BYTES32,
+  datasetrestrict = NULL_ADDRESS,
+  workerpoolrestrict = NULL_ADDRESS,
+  requesterrestrict = NULL_ADDRESS,
+} = {}) => ({
+  app: await addressSchema().required().label('app').validate(app),
   appprice: await nRlcAmountSchema().validate(appprice),
   volume: await uint256Schema().validate(volume),
   tag: await tagSchema().validate(tag),
-  datasetrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(datasetrestrict),
-  workerpoolrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(workerpoolrestrict),
-  requesterrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(requesterrestrict),
+  datasetrestrict: await addressSchema().validate(datasetrestrict),
+  workerpoolrestrict: await addressSchema().validate(workerpoolrestrict),
+  requesterrestrict: await addressSchema().validate(requesterrestrict),
 });
 
-export const createDatasetorder = async (
-  contracts = throwIfMissing(),
-  {
-    dataset,
-    datasetprice = '0',
-    volume = '1',
-    tag = NULL_BYTES32,
-    apprestrict = NULL_ADDRESS,
-    workerpoolrestrict = NULL_ADDRESS,
-    requesterrestrict = NULL_ADDRESS,
-  } = {},
-) => ({
-  dataset: await addressSchema({
-    ethProvider: contracts.provider,
-  })
-    .label('dataset')
-    .required()
-    .validate(dataset),
+export const createDatasetorder = async ({
+  dataset,
+  datasetprice = '0',
+  volume = '1',
+  tag = NULL_BYTES32,
+  apprestrict = NULL_ADDRESS,
+  workerpoolrestrict = NULL_ADDRESS,
+  requesterrestrict = NULL_ADDRESS,
+} = {}) => ({
+  dataset: await addressSchema().label('dataset').required().validate(dataset),
   datasetprice: await nRlcAmountSchema().validate(datasetprice),
   volume: await uint256Schema().validate(volume),
-  tag: await tagSchema({ allowAgnosticTee: true }).validate(tag),
-  apprestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(apprestrict),
-  workerpoolrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(workerpoolrestrict),
-  requesterrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(requesterrestrict),
+  tag: await tagSchema({
+    allowAgnosticTee: true,
+    ignoreLegacyTeeFramework: true,
+  }).validate(tag),
+  apprestrict: await addressSchema().validate(apprestrict),
+  workerpoolrestrict: await addressSchema().validate(workerpoolrestrict),
+  requesterrestrict: await addressSchema().validate(requesterrestrict),
 });
 
-export const createWorkerpoolorder = async (
-  contracts = throwIfMissing(),
-  {
-    workerpool = throwIfMissing(),
-    category = throwIfMissing(),
-    workerpoolprice = '0',
-    volume = '1',
-    trust = '0',
-    tag = NULL_BYTES32,
-    apprestrict = NULL_ADDRESS,
-    datasetrestrict = NULL_ADDRESS,
-    requesterrestrict = NULL_ADDRESS,
-  } = {},
-) => ({
-  workerpool: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(workerpool),
+export const createWorkerpoolorder = async ({
+  workerpool = throwIfMissing(),
+  category = throwIfMissing(),
+  workerpoolprice = '0',
+  volume = '1',
+  trust = '0',
+  tag = NULL_BYTES32,
+  apprestrict = NULL_ADDRESS,
+  datasetrestrict = NULL_ADDRESS,
+  requesterrestrict = NULL_ADDRESS,
+} = {}) => ({
+  workerpool: await addressSchema().validate(workerpool),
   workerpoolprice: await nRlcAmountSchema().validate(workerpoolprice),
   volume: await uint256Schema().validate(volume),
   category: await uint256Schema().validate(category),
   trust: await uint256Schema().validate(trust),
   tag: await tagSchema().validate(tag),
-  apprestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(apprestrict),
-  datasetrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(datasetrestrict),
-  requesterrestrict: await addressSchema({
-    ethProvider: contracts.provider,
-  }).validate(requesterrestrict),
+  apprestrict: await addressSchema().validate(apprestrict),
+  datasetrestrict: await addressSchema().validate(datasetrestrict),
+  requesterrestrict: await addressSchema().validate(requesterrestrict),
 });
 
 export const createRequestorder = async (
@@ -1220,38 +963,21 @@ export const createRequestorder = async (
   const requesterOrUser = requester || (await getAddress(contracts));
   const vTag = await tagSchema({ allowAgnosticTee: true }).validate(tag);
   return {
-    app: await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .label('app')
-      .validate(app),
+    app: await addressSchema().required().label('app').validate(app),
     appmaxprice: await nRlcAmountSchema().validate(appmaxprice),
-    dataset: await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(dataset),
+    dataset: await addressSchema().validate(dataset),
     datasetmaxprice: await nRlcAmountSchema().validate(datasetmaxprice),
-    workerpool: await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(workerpool),
+    workerpool: await addressSchema().validate(workerpool),
     workerpoolmaxprice: await nRlcAmountSchema().validate(workerpoolmaxprice),
-    requester: await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(requesterOrUser),
-    beneficiary: await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(beneficiary || requesterOrUser),
+    requester: await addressSchema().validate(requesterOrUser),
+    beneficiary: await addressSchema().validate(beneficiary || requesterOrUser),
     volume: await uint256Schema().validate(volume),
     params: await createObjParams({
       params,
       tag: vTag,
-      callback: await addressSchema({
-        ethProvider: contracts.provider,
-      }).validate(callback),
+      callback: await addressSchema().validate(callback),
     }),
-    callback: await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(callback),
+    callback: await addressSchema().validate(callback),
     category: await uint256Schema()
       .required()
       .label('category')
diff --git a/src/common/market/orderbook.js b/src/common/market/orderbook.js
index 3fdfe826..e8a3931b 100644
--- a/src/common/market/orderbook.js
+++ b/src/common/market/orderbook.js
@@ -20,94 +20,44 @@ const ERROR_GETTING_ORDERBOOK = 'An error occurred while getting orderbook';
 export const fetchAppOrderbook = async (
   contracts = throwIfMissing(),
   iexecGatewayURL = throwIfMissing(),
-  appOrOptions = throwIfMissing(),
-  options,
+  {
+    app,
+    appOwner,
+    dataset,
+    workerpool,
+    requester,
+    minTag,
+    maxTag,
+    minVolume,
+    page = 0,
+    pageSize = 20,
+    isDatasetStrict = false,
+    isWorkerpoolStrict = false,
+    isRequesterStrict = false,
+  } = {},
 ) => {
   try {
-    let app;
-    let appOwner;
-    let dataset;
-    let workerpool;
-    let requester;
-    let minTag;
-    let maxTag;
-    let minVolume;
-    let page;
-    let pageSize;
-    let isDatasetStrict;
-    let isWorkerpoolStrict;
-    let isRequesterStrict;
-    if (typeof appOrOptions === 'object' && appOrOptions !== null) {
-      ({
-        app,
-        appOwner,
-        dataset,
-        workerpool,
-        requester,
-        minTag,
-        maxTag,
-        minVolume,
-        page = 0,
-        pageSize = 20,
-        isDatasetStrict = false,
-        isWorkerpoolStrict = false,
-        isRequesterStrict = false,
-      } = appOrOptions);
-    } else {
-      // deprecated
-      // eslint-disable-next-line no-console
-      console.warn(
-        'passing app as first argument is deprecated, please pass the options object containing app or appOwner instead',
-      );
-      app = appOrOptions;
-      ({
-        dataset,
-        workerpool,
-        requester,
-        minTag,
-        maxTag,
-        minVolume,
-        page = 0,
-        pageSize = 20,
-        isDatasetStrict = false,
-        isWorkerpoolStrict = false,
-        isRequesterStrict = false,
-      } = options || {});
-    }
     if (!app && !appOwner) {
       throw Error('app or appOwner is required');
     }
-
     const query = {
       chainId: await chainIdSchema().validate(contracts.chainId),
       ...(app && {
-        app: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('app')
-          .validate(app),
+        app: await addressOrAnySchema().label('app').validate(app),
       }),
       ...(appOwner && {
-        appOwner: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        appOwner: await addressOrAnySchema()
           .label('appOwner')
           .validate(appOwner),
       }),
       ...(dataset && {
-        dataset: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('dataset')
-          .validate(dataset),
+        dataset: await addressOrAnySchema().label('dataset').validate(dataset),
       }),
       isDatasetStrict: await booleanSchema()
         .label('isDatasetStrict')
         .validate(isDatasetStrict),
       ...(workerpool && {
-        workerpool: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        workerpool: await addressOrAnySchema()
           .label('workerpool')
           .validate(workerpool),
       }),
@@ -115,9 +65,7 @@ export const fetchAppOrderbook = async (
         .label('isWorkerpoolStrict')
         .validate(isWorkerpoolStrict),
       ...(requester && {
-        requester: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        requester: await addressOrAnySchema()
           .label('requester')
           .validate(requester),
       }),
@@ -168,97 +116,45 @@ export const fetchAppOrderbook = async (
 export const fetchDatasetOrderbook = async (
   contracts = throwIfMissing(),
   iexecGatewayURL = throwIfMissing(),
-  datasetOrOptions = throwIfMissing(),
-  options,
+  {
+    dataset,
+    datasetOwner,
+    app,
+    workerpool,
+    requester,
+    minTag,
+    maxTag,
+    minVolume,
+    page = 0,
+    pageSize = 20,
+    isAppStrict = false,
+    isWorkerpoolStrict = false,
+    isRequesterStrict = false,
+    bulkOnly = false,
+  } = {},
 ) => {
   try {
-    let dataset;
-    let datasetOwner;
-    let app;
-    let workerpool;
-    let requester;
-    let minTag;
-    let maxTag;
-    let minVolume;
-    let page;
-    let pageSize;
-    let isAppStrict;
-    let isWorkerpoolStrict;
-    let isRequesterStrict;
-    let bulkOnly;
-    if (typeof datasetOrOptions === 'object' && datasetOrOptions !== null) {
-      ({
-        dataset,
-        datasetOwner,
-        app,
-        workerpool,
-        requester,
-        minTag,
-        maxTag,
-        minVolume,
-        page = 0,
-        pageSize = 20,
-        isAppStrict = false,
-        isWorkerpoolStrict = false,
-        isRequesterStrict = false,
-        bulkOnly = false,
-      } = datasetOrOptions);
-    } else {
-      // deprecated
-      // eslint-disable-next-line no-console
-      console.warn(
-        'passing dataset as first argument is deprecated, please pass the options object containing dataset or datasetOwner instead',
-      );
-      dataset = datasetOrOptions;
-      ({
-        app,
-        workerpool,
-        requester,
-        minTag,
-        maxTag,
-        minVolume,
-        page = 0,
-        pageSize = 20,
-        isAppStrict = false,
-        isWorkerpoolStrict = false,
-        isRequesterStrict = false,
-        bulkOnly = false,
-      } = options || {});
-    }
     if (!dataset && !datasetOwner) {
       throw Error('dataset or datasetOwner is required');
     }
-
     const query = {
       chainId: await chainIdSchema().validate(contracts.chainId),
       ...(dataset && {
-        dataset: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('dataset')
-          .validate(dataset),
+        dataset: await addressOrAnySchema().label('dataset').validate(dataset),
       }),
       ...(datasetOwner && {
-        datasetOwner: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        datasetOwner: await addressOrAnySchema()
           .label('datasetOwner')
           .validate(datasetOwner),
       }),
       ...(app && {
-        app: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('app')
-          .validate(app),
+        app: await addressOrAnySchema().label('app').validate(app),
       }),
       isAppStrict: await booleanSchema()
         .label('isAppStrict')
         .validate(isAppStrict),
       ...(workerpool && {
-        workerpool: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        workerpool: await addressOrAnySchema()
           .label('workerpool')
           .validate(workerpool),
       }),
@@ -266,9 +162,7 @@ export const fetchDatasetOrderbook = async (
         .label('isWorkerpoolStrict')
         .validate(isWorkerpoolStrict),
       ...(requester && {
-        requester: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        requester: await addressOrAnySchema()
           .label('requester')
           .validate(requester),
       }),
@@ -345,36 +239,24 @@ export const fetchWorkerpoolOrderbook = async (
         .validate(contracts.chainId),
       category: await uint256Schema().label('category').validate(category),
       ...(workerpool && {
-        workerpool: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        workerpool: await addressOrAnySchema()
           .label('workerpool')
           .validate(workerpool),
       }),
       ...(app && {
-        app: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('app')
-          .validate(app),
+        app: await addressOrAnySchema().label('app').validate(app),
       }),
       isAppStrict: await booleanSchema()
         .label('isAppStrict')
         .validate(isAppStrict),
       ...(dataset && {
-        dataset: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('dataset')
-          .validate(dataset),
+        dataset: await addressOrAnySchema().label('dataset').validate(dataset),
       }),
       isDatasetStrict: await booleanSchema()
         .label('isDatasetStrict')
         .validate(isDatasetStrict),
       ...(requester && {
-        requester: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        requester: await addressOrAnySchema()
           .label('requester')
           .validate(requester),
       }),
@@ -392,9 +274,7 @@ export const fetchWorkerpoolOrderbook = async (
           .validate(maxTag),
       }),
       ...(workerpoolOwner && {
-        workerpoolOwner: await addressSchema({
-          ethProvider: contracts.provider,
-        })
+        workerpoolOwner: await addressSchema()
           .label('workerpoolOwner')
           .validate(workerpoolOwner),
       }),
@@ -460,37 +340,23 @@ export const fetchRequestOrderbook = async (
         .validate(contracts.chainId),
       category: await uint256Schema().label('category').validate(category),
       ...(requester && {
-        requester: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        requester: await addressOrAnySchema()
           .label('requester')
           .validate(requester),
       }),
       ...(beneficiary && {
-        beneficiary: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        beneficiary: await addressOrAnySchema()
           .label('beneficiary')
           .validate(beneficiary),
       }),
       ...(app && {
-        app: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('app')
-          .validate(app),
+        app: await addressOrAnySchema().label('app').validate(app),
       }),
       ...(dataset && {
-        dataset: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
-          .label('dataset')
-          .validate(dataset),
+        dataset: await addressOrAnySchema().label('dataset').validate(dataset),
       }),
       ...(workerpool && {
-        workerpool: await addressOrAnySchema({
-          ethProvider: contracts.provider,
-        })
+        workerpool: await addressOrAnySchema()
           .label('workerpool')
           .validate(workerpool),
       }),
diff --git a/src/common/protocol/category.js b/src/common/protocol/category.js
index 0ae5ddbf..c3b19d63 100644
--- a/src/common/protocol/category.js
+++ b/src/common/protocol/category.js
@@ -35,9 +35,7 @@ export const createCategory = async (
       vCategory.description,
       vCategory.workClockTimeRef,
     ];
-    const tx = await wrapSend(
-      iexecContract.createCategory(...args, contracts.txOptions),
-    );
+    const tx = await wrapSend(iexecContract.createCategory(...args));
     const txReceipt = await wrapWait(tx.wait(contracts.confirms));
     const { catid: catidBigInt } = getEventFromLogs(
       'CreateCategory',
diff --git a/src/common/protocol/registries.js b/src/common/protocol/registries.js
index d9f0b56b..a61efc4f 100644
--- a/src/common/protocol/registries.js
+++ b/src/common/protocol/registries.js
@@ -7,7 +7,6 @@ import {
   datasetSchema,
   workerpoolSchema,
   uint256Schema,
-  objMrenclaveSchema,
   throwIfMissing,
 } from '../utils/validator.js';
 import {
@@ -20,7 +19,7 @@ import {
   hexToBuffer,
   BN,
 } from '../utils/utils.js';
-import { APP, DATASET, TEE_FRAMEWORKS, WORKERPOOL } from '../utils/constant.js';
+import { APP, DATASET, WORKERPOOL } from '../utils/constant.js';
 import { wrapCall, wrapSend, wrapWait } from '../utils/errorWrappers.js';
 import { ObjectNotFoundError } from '../utils/errors.js';
 
@@ -48,9 +47,7 @@ export const checkDeployedObj =
 export const checkDeployedApp = async (contracts = throwIfMissing(), address) =>
   checkDeployedObj(APP)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
+    await addressSchema().required().validate(address),
   );
 
 export const checkDeployedDataset = async (
@@ -59,9 +56,7 @@ export const checkDeployedDataset = async (
 ) =>
   checkDeployedObj(DATASET)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
+    await addressSchema().required().validate(address),
   );
 
 export const checkDeployedWorkerpool = async (
@@ -70,9 +65,7 @@ export const checkDeployedWorkerpool = async (
 ) =>
   checkDeployedObj(WORKERPOOL)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
+    await addressSchema().required().validate(address),
   );
 
 const toUpperFirst = (str) => ''.concat(str[0].toUpperCase(), str.substr(1));
@@ -121,9 +114,7 @@ const deployObj =
       }
       const args = createArgs[objName].map((e) => obj[e]);
       const createFunctionName = 'create'.concat(toUpperFirst(objName));
-      const tx = await wrapSend(
-        registryContract[createFunctionName](...args, contracts.txOptions),
-      );
+      const tx = await wrapSend(registryContract[createFunctionName](...args));
       const txReceipt = await wrapWait(tx.wait(contracts.confirms));
       const event = getEventFromLogs('Transfer', txReceipt.logs, {
         strict: true,
@@ -139,39 +130,26 @@ const deployObj =
   };
 
 export const predictAppAddress = async (contracts, app) =>
-  predictObjAddress(APP)(
-    contracts,
-    await appSchema({ ethProvider: contracts.provider }).validate(app),
-  );
+  predictObjAddress(APP)(contracts, await appSchema().validate(app));
 export const predictDatasetAddress = async (contracts, dataset) =>
   predictObjAddress(DATASET)(
     contracts,
-    await datasetSchema({ ethProvider: contracts.provider }).validate(dataset),
+    await datasetSchema().validate(dataset),
   );
 export const predictWorkerpoolAddress = async (contracts, workerpool) =>
   predictObjAddress(WORKERPOOL)(
     contracts,
-    await workerpoolSchema({ ethProvider: contracts.provider }).validate(
-      workerpool,
-    ),
+    await workerpoolSchema().validate(workerpool),
   );
 
 export const deployApp = async (contracts, app) =>
-  deployObj(APP)(
-    contracts,
-    await appSchema({ ethProvider: contracts.provider }).validate(app),
-  );
+  deployObj(APP)(contracts, await appSchema().validate(app));
 export const deployDataset = async (contracts, dataset) =>
-  deployObj(DATASET)(
-    contracts,
-    await datasetSchema({ ethProvider: contracts.provider }).validate(dataset),
-  );
+  deployObj(DATASET)(contracts, await datasetSchema().validate(dataset));
 export const deployWorkerpool = async (contracts, workerpool) =>
   deployObj(WORKERPOOL)(
     contracts,
-    await workerpoolSchema({ ethProvider: contracts.provider }).validate(
-      workerpool,
-    ),
+    await workerpoolSchema().validate(workerpool),
   );
 
 const getObjOwner =
@@ -189,17 +167,13 @@ const getObjOwner =
 export const getAppOwner = async (contracts = throwIfMissing(), address) =>
   getObjOwner(APP)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
+    await addressSchema().required().validate(address),
   );
 
 export const getDatasetOwner = async (contracts = throwIfMissing(), address) =>
   getObjOwner(DATASET)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
+    await addressSchema().required().validate(address),
   );
 
 export const getWorkerpoolOwner = async (
@@ -208,20 +182,14 @@ export const getWorkerpoolOwner = async (
 ) =>
   getObjOwner(WORKERPOOL)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
+    await addressSchema().required().validate(address),
   );
 
 const showObjByAddress =
   (objName = throwIfMissing()) =>
   async (contracts = throwIfMissing(), objAddress = throwIfMissing()) => {
     try {
-      const vAddress = await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(objAddress);
+      const vAddress = await addressSchema().required().validate(objAddress);
       const isDeployed = await checkDeployedObj(objName)(contracts, objAddress);
       if (!isDeployed)
         throw new ObjectNotFoundError(objName, objAddress, contracts.chainId);
@@ -248,11 +216,7 @@ const countUserObj =
   (objName = throwIfMissing()) =>
   async (contracts = throwIfMissing(), userAddress = throwIfMissing()) => {
     try {
-      const vAddress = await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(userAddress);
+      const vAddress = await addressSchema().required().validate(userAddress);
       const registryContract = await wrapCall(
         contracts.fetchRegistryContract(objName),
       );
@@ -270,9 +234,7 @@ export const countUserApps = async (
 ) =>
   countUserObj(APP)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(userAddress),
+    await addressSchema().required().validate(userAddress),
   );
 export const countUserDatasets = async (
   contracts = throwIfMissing(),
@@ -280,9 +242,7 @@ export const countUserDatasets = async (
 ) =>
   countUserObj(DATASET)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(userAddress),
+    await addressSchema().required().validate(userAddress),
   );
 export const countUserWorkerpools = async (
   contracts = throwIfMissing(),
@@ -290,9 +250,7 @@ export const countUserWorkerpools = async (
 ) =>
   countUserObj(WORKERPOOL)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(userAddress),
+    await addressSchema().required().validate(userAddress),
   );
 
 const showUserObjByIndex =
@@ -300,11 +258,7 @@ const showUserObjByIndex =
   async (contracts = throwIfMissing(), objIndex, userAddress) => {
     try {
       const vIndex = await uint256Schema().required().validate(objIndex);
-      const vAddress = await addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .validate(userAddress);
+      const vAddress = await addressSchema().required().validate(userAddress);
       const totalObj = await countUserObj(objName)(contracts, userAddress);
       if (new BN(vIndex).gte(totalObj))
         throw new Error(`${objName} not deployed`);
@@ -345,9 +299,7 @@ const cleanApp = (obj) =>
 export const showApp = async (contracts = throwIfMissing(), appAddress) => {
   const { obj, objAddress } = await showObjByAddress(APP)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(appAddress),
+    await addressSchema().required().validate(appAddress),
   );
   return { objAddress, app: cleanApp(obj) };
 };
@@ -360,9 +312,7 @@ export const showUserApp = async (
   const { obj, objAddress } = await showUserObjByIndex(APP)(
     contracts,
     await uint256Schema().required().validate(index),
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(userAddress),
+    await addressSchema().required().validate(userAddress),
   );
   return { objAddress, app: cleanApp(obj) };
 };
@@ -373,9 +323,7 @@ export const showDataset = async (
 ) => {
   const { obj, objAddress } = await showObjByAddress(DATASET)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(datasetAddress),
+    await addressSchema().required().validate(datasetAddress),
   );
   const clean = Object.assign(
     cleanObj(obj),
@@ -394,9 +342,7 @@ export const showUserDataset = async (
   const { obj, objAddress } = await showUserObjByIndex(DATASET)(
     contracts,
     await uint256Schema().required().validate(index),
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(userAddress),
+    await addressSchema().required().validate(userAddress),
   );
   const clean = Object.assign(
     cleanObj(obj),
@@ -413,9 +359,7 @@ export const showWorkerpool = async (
 ) => {
   const { obj, objAddress } = await showObjByAddress(WORKERPOOL)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(workerpoolAddress),
+    await addressSchema().required().validate(workerpoolAddress),
   );
   const clean = cleanObj(obj);
   return { objAddress, workerpool: clean };
@@ -429,9 +373,7 @@ export const showUserWorkerpool = async (
   const { obj, objAddress } = await showUserObjByIndex(WORKERPOOL)(
     contracts,
     await uint256Schema().required().validate(index),
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(userAddress),
+    await addressSchema().required().validate(userAddress),
   );
   const clean = cleanObj(obj);
   return { objAddress, workerpool: clean };
@@ -465,7 +407,6 @@ const transferObj =
           walletAddress,
           to,
           address,
-          contracts.txOptions,
         ),
       );
       await wrapWait(tx.wait(contracts.confirms));
@@ -480,12 +421,8 @@ const transferObj =
 export const transferApp = async (contracts = throwIfMissing(), address, to) =>
   transferObj(APP)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(to),
+    await addressSchema().required().validate(address),
+    await addressSchema().required().validate(to),
   );
 
 export const transferDataset = async (
@@ -495,12 +432,8 @@ export const transferDataset = async (
 ) =>
   transferObj(DATASET)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(to),
+    await addressSchema().required().validate(address),
+    await addressSchema().required().validate(to),
   );
 
 export const transferWorkerpool = async (
@@ -510,30 +443,6 @@ export const transferWorkerpool = async (
 ) =>
   transferObj(WORKERPOOL)(
     contracts,
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(address),
-    await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .validate(to),
+    await addressSchema().required().validate(address),
+    await addressSchema().required().validate(to),
   );
-
-export const resolveTeeFrameworkFromApp = async (
-  app,
-  { strict = true } = {},
-) => {
-  if (app.appMREnclave) {
-    try {
-      const mrenclave = await objMrenclaveSchema().validate(app.appMREnclave);
-      return mrenclave.framework;
-    } catch (err) {
-      debug('resolveTeeFrameworkFromApp()', err);
-      if (strict) {
-        throw new Error('Failed to resolve TEE framework from app');
-      }
-    }
-  } else {
-    return TEE_FRAMEWORKS.TDX;
-  }
-  return undefined;
-};
diff --git a/src/common/sms/check.js b/src/common/sms/check.js
index 5969aa0a..33ca5f1b 100644
--- a/src/common/sms/check.js
+++ b/src/common/sms/check.js
@@ -22,14 +22,11 @@ const cacheSecretExists = ({ smsURL, kindOfSecret, secretId }) => {
 
 // used for dataset key
 export const checkWeb3SecretExists = async (
-  contracts = throwIfMissing(),
   smsURL = throwIfMissing(),
   resourceAddress,
 ) => {
   try {
-    const vResourceAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vResourceAddress = await addressSchema()
       .required()
       .validate(resourceAddress);
     const kindOfSecret = 'web3';
@@ -64,15 +61,12 @@ export const checkWeb3SecretExists = async (
 
 // used for beneficiary key
 export const checkWeb2SecretExists = async (
-  contracts = throwIfMissing(),
   smsURL = throwIfMissing(),
   ownerAddress,
   secretName,
 ) => {
   try {
-    const vOwnerAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
+    const vOwnerAddress = await addressSchema()
       .required()
       .validate(ownerAddress);
     const kindOfSecret = 'web2';
@@ -107,15 +101,12 @@ export const checkWeb2SecretExists = async (
 };
 
 export const checkRequesterSecretExists = async (
-  contracts = throwIfMissing(),
   smsURL = throwIfMissing(),
   requesterAddress = throwIfMissing(),
   secretName = throwIfMissing(),
 ) => {
   try {
-    const vRequesterAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    }).validate(requesterAddress);
+    const vRequesterAddress = await addressSchema().validate(requesterAddress);
     const kindOfSecret = 'requester';
     const secretId = `${vRequesterAddress}|${secretName}`;
     const cached = checkCache({ smsURL, kindOfSecret, secretId });
@@ -144,16 +135,11 @@ export const checkRequesterSecretExists = async (
 };
 
 export const checkAppSecretExists = async (
-  contracts = throwIfMissing(),
   smsURL = throwIfMissing(),
   appAddress,
 ) => {
   try {
-    const vAppAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(appAddress);
+    const vAppAddress = await addressSchema().required().validate(appAddress);
     const kindOfSecret = 'app';
     const secretId = vAppAddress;
     const cached = checkCache({ smsURL, kindOfSecret, secretId });
diff --git a/src/common/sms/push.js b/src/common/sms/push.js
index 89cf28a4..9617aac0 100644
--- a/src/common/sms/push.js
+++ b/src/common/sms/push.js
@@ -121,7 +121,6 @@ export const pushWeb2Secret = async (
     await stringSchema().validate(secretName, { strict: true });
     await stringSchema().validate(secretValue, { strict: true });
     const secretExists = await checkWeb2SecretExists(
-      contracts,
       smsURL,
       ownerAddress,
       secretName,
@@ -181,7 +180,6 @@ export const pushRequesterSecret = async (
     await stringSchema().validate(secretName, { strict: true });
     await stringSchema().validate(secretValue, { strict: true });
     const secretExists = await checkRequesterSecretExists(
-      contracts,
       smsURL,
       requesterAddress,
       secretName,
diff --git a/src/common/storage/result-proxy.js b/src/common/storage/result-proxy.js
deleted file mode 100644
index 164025f0..00000000
--- a/src/common/storage/result-proxy.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import Debug from 'debug';
-import { getAddress } from '../wallet/address.js';
-import { getAuthorization, httpRequest } from '../utils/api-utils.js';
-import { throwIfMissing } from '../utils/validator.js';
-import { checkSigner } from '../utils/utils.js';
-import { ResultProxyCallError } from '../utils/errors.js';
-
-const debug = Debug('iexec:storage:result-proxy');
-
-export const login = async (
-  contracts = throwIfMissing(),
-  resultProxyURL = throwIfMissing(),
-) => {
-  try {
-    checkSigner(contracts);
-    const userAddress = await getAddress(contracts);
-    const authorization = await getAuthorization({
-      api: resultProxyURL,
-      endpoint: '/results/challenge',
-      chainId: contracts.chainId,
-      address: userAddress,
-      signer: contracts.signer,
-      ApiCallErrorClass: ResultProxyCallError,
-    });
-    const res = await httpRequest('POST')({
-      api: resultProxyURL,
-      endpoint: '/results/login',
-      query: { chainId: contracts.chainId },
-      body: authorization,
-      ApiCallErrorClass: ResultProxyCallError,
-    });
-    if (res.ok) {
-      return await res.text();
-    }
-    throw new Error(
-      `Result Proxy login failed: ${res.status} ${res.statusText}`,
-    );
-  } catch (error) {
-    debug('login()', error);
-    throw error;
-  }
-};
diff --git a/src/common/types.d.ts b/src/common/types.d.ts
index 02812df5..9702925c 100644
--- a/src/common/types.d.ts
+++ b/src/common/types.d.ts
@@ -19,19 +19,6 @@ export type BNish = BN | bigint | string | number;
  * ```
  */
 export type Address = string;
-/**
- * ENS
- *
- * example:
- * ```js
- * const ensName = 'iexec.eth';
- * ```
- */
-export type ENS = string;
-/**
- * ethereum address or ENS
- */
-export type Addressish = Address | ENS;
 /**
  * bytes hex string
  *
@@ -125,8 +112,7 @@ export type HumanSingleTag = string;
  * example:
  * ```js
  * const gpuTag = ['gpu'];
- * const sconeTeeTag = ['tee', 'scone'];
- * const gramineTeeTag = ['tee', 'gramine'];
+ * const tdxTeeTag = ['tee', 'tdx'];
  * ```
  */
 export type Tag = Bytes32 | HumanSingleTag[];
@@ -140,47 +126,3 @@ export type Tag = Bytes32 | HumanSingleTag[];
  * ```
  */
 export type Multiaddress = string | Buffer;
-
-/**
- * Trusted Execution Environment name
- */
-export type TeeFramework = 'scone' | 'gramine' | 'tdx';
-
-export type AnyRecord = Record<string, any>;
-
-/**
- * [ethers default provider](https://docs.ethers.io/v5/api/providers/#providers-getDefaultProvider) options
- */
-export interface ProviderOptions {
-  /**
-   * [Alchemy](https://alchemyapi.io/) API key
-   */
-  alchemy?: string;
-  /**
-   * [Etherscan](https://etherscan.io/) API key
-   */
-  etherscan?: string;
-  /**
-   * [INFURA](https://infura.io/) Project ID or { projectId, projectSecret }
-   */
-  infura?:
-    | string
-    | {
-        /**
-         * [INFURA](https://infura.io/) project ID
-         */
-        projectId: string;
-        /**
-         * [INFURA](https://infura.io/) project secret
-         */
-        projectSecret: string;
-      };
-  /**
-   * allow Cloudflare provider
-   */
-  cloudflare?: boolean;
-  /**
-   * the number of backends that must agree (default: 2 for mainnet, 1 for testnets)
-   */
-  quorum?: number;
-}
diff --git a/src/common/utils/IExecContractsClient.d.ts b/src/common/utils/IExecContractsClient.d.ts
index e44b05ea..6c3c9e4f 100644
--- a/src/common/utils/IExecContractsClient.d.ts
+++ b/src/common/utils/IExecContractsClient.d.ts
@@ -21,14 +21,6 @@ export default class IExecContractsClient {
      * IExec contract address
      */
     hubAddress: string;
-    /**
-     * if false set the gasPrice to 0 (default true)
-     */
-    useGas?: boolean;
-    /**
-     * true if IExec contract use the chain native token
-     */
-    isNative?: boolean;
     /**
      * number of block to wait for transactions confirmation (default 1)
      */
@@ -46,10 +38,6 @@ export default class IExecContractsClient {
    * current chainId
    */
   chainId: string;
-  /**
-   * true if current instance use native token
-   */
-  isNative: string;
   /**
    * current IExec contract address
    */
@@ -58,15 +46,6 @@ export default class IExecContractsClient {
    * IExec PoCo ABI version
    */
   pocoVersion: string;
-  /**
-   * transaction options
-   */
-  txOptions: {
-    /**
-     * gasPrice override
-     */
-    gasPrice?: bigint;
-  };
   /**
    * number of block to wait for transactions confirmation
    */
@@ -92,11 +71,11 @@ export default class IExecContractsClient {
    */
   fetchRegistryAddress(resourceName: string): Promise<string>;
   /**
-   * fetch the IExec token Contract instance, not available when isNative is true
+   * fetch the IExec token Contract instance
    */
   fetchTokenContract?(resourceName: string): Promise<Contract>;
   /**
-   * fetch the IExec token contract address, not available when isNative is true
+   * fetch the IExec token contract address
    */
   fetchTokenAddress(resourceName: string): Promise<string>;
 }
diff --git a/src/common/utils/IExecContractsClient.js b/src/common/utils/IExecContractsClient.js
index f714a0e6..8a9ca742 100644
--- a/src/common/utils/IExecContractsClient.js
+++ b/src/common/utils/IExecContractsClient.js
@@ -2,7 +2,6 @@ import Debug from 'debug';
 import { Contract } from 'ethers';
 import { version as pocoVersion } from '../generated/@iexec/poco/package.js';
 import iexecTokenDesc from '../generated/@iexec/poco/IexecInterfaceToken.js';
-import iexecNativeDesc from '../generated/@iexec/poco/IexecInterfaceNative.js';
 import appRegistryDesc from '../generated/@iexec/poco/AppRegistry.js';
 import workerpoolRegistryDesc from '../generated/@iexec/poco/WorkerpoolRegistry.js';
 import datasetRegistryDesc from '../generated/@iexec/poco/DatasetRegistry.js';
@@ -13,29 +12,12 @@ import rlcDesc from '../generated/@iexec/rlc/RLC.js';
 
 const debug = Debug('iexec:IExecContractsClient');
 
-const nativeNetworks = ['134'];
-
-const gasPriceByNetwork = {
-  134: 0n,
-};
-
-const getIsNative = (chainId) => nativeNetworks.includes(chainId);
-
-const getGasPriceOverride = (chainId) => gasPriceByNetwork[chainId];
-
-const getTokenDesc = (isNative) => {
-  if (isNative) {
-    return undefined;
-  }
-  return rlcDesc;
-};
-
-const getContractsDescMap = (isNative) => ({
+const contractsDescMap = {
   hub: {
-    contractDesc: isNative ? iexecNativeDesc : iexecTokenDesc,
+    contractDesc: iexecTokenDesc,
   },
   token: {
-    contractDesc: getTokenDesc(isNative),
+    contractDesc: rlcDesc,
     hubPropName: 'token',
   },
   app: {
@@ -62,14 +44,12 @@ const getContractsDescMap = (isNative) => ({
     contractDesc: workerpoolRegistryDesc,
     hubPropName: 'workerpoolregistry',
   },
-});
+};
 
-const createClient = ({ ethSigner, ethProvider, hubAddress, isNative }) => {
+const createClient = ({ ethSigner, ethProvider, hubAddress }) => {
   const cachedAddresses = {};
   if (!hubAddress) throw new Error('Missing iExec contract address');
 
-  const contractsDescMap = getContractsDescMap(isNative);
-
   const getContract = (objName, address) => {
     try {
       const { contractDesc } = contractsDescMap[objName];
@@ -142,27 +122,18 @@ const createClient = ({ ethSigner, ethProvider, hubAddress, isNative }) => {
 
   return {
     pocoVersion,
-    isNative,
     hubAddress,
     getContract,
     getIExecContract,
     fetchRegistryContract,
-    ...(!isNative && { fetchTokenContract }),
-    ...(!isNative && { fetchTokenAddress }),
+    fetchTokenContract,
+    fetchTokenAddress,
     fetchRegistryAddress,
   };
 };
 
 class IExecContractsClient {
-  constructor({
-    provider,
-    signer,
-    chainId,
-    hubAddress,
-    useGas = true,
-    isNative,
-    confirms = 1,
-  } = {}) {
+  constructor({ provider, signer, chainId, hubAddress, confirms = 1 } = {}) {
     const stringChainId = `${chainId}`;
     if (!provider) throw new Error('missing provider key');
     if (!hubAddress) throw new Error('missing hubAddress key');
@@ -175,21 +146,12 @@ class IExecContractsClient {
       signer,
       chainId: stringChainId,
       hubAddress,
-      useGas,
-      isNative,
     };
 
-    const native =
-      isNative !== undefined ? !!isNative : getIsNative(stringChainId);
-
-    const gasPriceOverride =
-      useGas === false ? 0n : getGasPriceOverride(stringChainId);
-
     const client = createClient({
       ethSigner: signer,
       ethProvider: provider,
       hubAddress,
-      isNative: native,
     });
 
     this.setSigner = (ethSigner) => {
@@ -204,7 +166,6 @@ class IExecContractsClient {
       provider,
       signer,
       chainId: stringChainId,
-      txOptions: { gasPrice: gasPriceOverride },
       confirms,
       ...client,
     });
diff --git a/src/common/utils/api-utils.js b/src/common/utils/api-utils.js
index f3cbc266..afdfa7ad 100644
--- a/src/common/utils/api-utils.js
+++ b/src/common/utils/api-utils.js
@@ -65,20 +65,22 @@ export const httpRequest =
       ...makeHeaders(method, headers, body),
       ...makeBody(method, body),
     })
-      .catch((error) => {
-        debug(`httpRequest() fetch:`, error);
+      .catch((cause) => {
+        debug(`httpRequest() fetch:`, cause);
         throw new ApiCallErrorClass(
           `Connection to ${api} failed with a network error`,
-          error,
+          { cause },
         );
       })
       .then((response) => {
         if (response.status >= 500 && response.status <= 599) {
           throw new ApiCallErrorClass(
             `Server at ${api} encountered an internal error`,
-            new Error(
-              `Server internal error: ${response.status} ${response.statusText}`,
-            ),
+            {
+              cause: new Error(
+                `Server internal error: ${response.status} ${response.statusText}`,
+              ),
+            },
           );
         }
         return response;
diff --git a/src/common/utils/config.js b/src/common/utils/config.js
index 9667ccc1..d74f8fdf 100644
--- a/src/common/utils/config.js
+++ b/src/common/utils/config.js
@@ -1,137 +1,37 @@
-import { EnsPlugin, Network } from 'ethers';
-import { address as voucherHubBellecourAddress } from '../generated/@iexec/voucher-contracts/deployments/bellecour/VoucherHubERC1967Proxy.js';
-import { TEE_FRAMEWORKS } from './constant.js';
 import { ConfigurationError } from './errors.js';
 
-export const CHAIN_SPECIFIC_FEATURES = {
-  ENS: 'ENS',
-  WORKERPOOL_API_URL_REGISTRATION: 'Workerpool API Registration',
-  VOUCHER: 'iExec Voucher',
-  COMPASS: 'iExec Compass',
-  XRLC_BRIDGE: 'iExec xRLC Bridge',
-  BULK_PROCESSING: 'Bulk processing',
-};
+export const CHAIN_SPECIFIC_FEATURES = {};
 
 const networkConfigs = [
-  {
-    id: 134,
-    name: 'bellecour',
-    hub: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f',
-    host: 'https://bellecour.iex.ec',
-    ensRegistry: '0x5f5B93fca68c9C79318d1F3868A354EE67D8c006',
-    ensPublicResolver: '0x1347d8a1840A810B990d0B774A6b7Bb8A1bd62BB',
-    sms: {
-      [TEE_FRAMEWORKS.SCONE]: 'https://sms.iex.ec',
-      [TEE_FRAMEWORKS.GRAMINE]: 'https://sms.gramine.v8-bellecour.iex.ec',
-    },
-    resultProxy: 'https://result.v8-bellecour.iex.ec',
-    ipfsGateway: 'https://ipfs-gateway.v8-bellecour.iex.ec',
-    ipfsNode: 'https://ipfs-upload.v8-bellecour.iex.ec',
-    iexecGateway: 'https://api.market.v8-bellecour.iex.ec',
-    compass: undefined, // no compass using ENS
-    pocoSubgraph: 'https://thegraph.iex.ec/subgraphs/name/bellecour/poco-v5',
-    voucherHub: voucherHubBellecourAddress,
-    voucherSubgraph:
-      'https://thegraph.iex.ec/subgraphs/name/bellecour/iexec-voucher',
-    bridge: {
-      contract: '0x188A4376a1D818bF2434972Eb34eFd57102a19b7',
-      bridgedChainId: '1',
-    },
-    shouldRegisterNetwork: true,
-    isExperimental: false,
-    notImplemented: [
-      CHAIN_SPECIFIC_FEATURES.COMPASS,
-      CHAIN_SPECIFIC_FEATURES.BULK_PROCESSING,
-    ],
-  },
-  {
-    id: 1,
-    name: 'mainnet',
-    hub: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f',
-    host: 'mainnet',
-    ensRegistry: undefined, // use ethers default
-    ensPublicResolver: '0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41',
-    sms: undefined, // no protocol running
-    resultProxy: undefined, // no protocol running
-    ipfsGateway: undefined, // no protocol running
-    ipfsNode: undefined, // no protocol running
-    iexecGateway: undefined, // no protocol running
-    compass: undefined, // no protocol running
-    pocoSubgraph: undefined, // no protocol running
-    voucherHub: undefined, // no voucher
-    voucherSubgraph: undefined, // no voucher
-    bridge: {
-      contract: '0x4e55c9B8953AB1957ad0A59D413631A66798c6a2',
-      bridgedChainId: '134',
-    },
-    shouldRegisterNetwork: false,
-    isExperimental: false,
-    notImplemented: [
-      CHAIN_SPECIFIC_FEATURES.COMPASS,
-      CHAIN_SPECIFIC_FEATURES.VOUCHER,
-      CHAIN_SPECIFIC_FEATURES.BULK_PROCESSING,
-    ],
-  },
   {
     id: 421614,
     name: 'arbitrum-sepolia-testnet',
     hub: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E',
     host: 'https://sepolia-rollup.arbitrum.io/rpc',
-    ensRegistry: undefined, // not supported
-    ensPublicResolver: undefined, // not supported
-    sms: {
-      [TEE_FRAMEWORKS.SCONE]: 'https://sms.arbitrum-sepolia-testnet.iex.ec',
-      [TEE_FRAMEWORKS.TDX]: 'https://sms.arbitrum-sepolia-testnet.iex.ec',
-    },
-    resultProxy: undefined, // not exposed
+    sms: 'https://sms.arbitrum-sepolia-testnet.iex.ec',
     ipfsGateway: 'https://ipfs-gateway.arbitrum-sepolia-testnet.iex.ec',
     ipfsNode: 'https://ipfs-upload.arbitrum-sepolia-testnet.iex.ec',
     iexecGateway: 'https://api-market.arbitrum-sepolia-testnet.iex.ec',
     compass: 'https://compass.arbitrum-sepolia-testnet.iex.ec',
     pocoSubgraph:
       'https://thegraph.arbitrum-sepolia-testnet.iex.ec/api/subgraphs/id/2GCj8gzLCihsiEDq8cYvC5nUgK6VfwZ6hm3Wj8A3kcxz',
-    voucherHub: undefined, // no voucher
-    voucherSubgraph: undefined, // no voucher
-    bridge: {}, // no bridge
-    shouldRegisterNetwork: false,
     isExperimental: false,
     uploadBulkForThegraph: true,
-    notImplemented: [
-      CHAIN_SPECIFIC_FEATURES.ENS,
-      CHAIN_SPECIFIC_FEATURES.WORKERPOOL_API_URL_REGISTRATION,
-      CHAIN_SPECIFIC_FEATURES.VOUCHER,
-      CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE,
-    ],
   },
   {
     id: 42161,
     name: 'arbitrum-mainnet',
     hub: '0x098bFCb1E50ebcA0BaA92C12eA0c3F045A1aD9f0',
     host: 'https://arb1.arbitrum.io/rpc',
-    ensRegistry: undefined, // not supported
-    ensPublicResolver: undefined, // not supported
-    sms: {
-      [TEE_FRAMEWORKS.SCONE]: 'https://sms.arbitrum-mainnet.iex.ec',
-      [TEE_FRAMEWORKS.TDX]: 'https://sms.arbitrum-mainnet.iex.ec',
-    },
-    resultProxy: undefined, // not exposed
+    sms: 'https://sms.arbitrum-mainnet.iex.ec',
     ipfsGateway: 'https://ipfs-gateway.arbitrum-mainnet.iex.ec',
     ipfsNode: 'https://ipfs-upload.arbitrum-mainnet.iex.ec',
     iexecGateway: 'https://api.market.arbitrum-mainnet.iex.ec',
     compass: 'https://compass.arbitrum-mainnet.iex.ec',
     pocoSubgraph:
       'https://thegraph.arbitrum.iex.ec/api/subgraphs/id/B1comLe9SANBLrjdnoNTJSubbeC7cY7EoNu6zD82HeKy',
-    voucherHub: undefined, // no voucher
-    voucherSubgraph: undefined, // no voucher
-    bridge: {}, // no bridge
-    shouldRegisterNetwork: false,
+    isExperimental: false,
     uploadBulkForThegraph: true,
-    notImplemented: [
-      CHAIN_SPECIFIC_FEATURES.ENS,
-      CHAIN_SPECIFIC_FEATURES.WORKERPOOL_API_URL_REGISTRATION,
-      CHAIN_SPECIFIC_FEATURES.VOUCHER,
-      CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE,
-    ],
   },
 ];
 
@@ -154,19 +54,13 @@ export const getChainDefaults = (
   const {
     name,
     host,
-    ensRegistry,
-    ensPublicResolver,
     hub,
     sms,
-    resultProxy,
     iexecGateway,
     ipfsGateway,
     ipfsNode,
     compass,
     pocoSubgraph,
-    voucherHub,
-    voucherSubgraph,
-    bridge,
   } =
     networkConfigs
       .filter(
@@ -177,19 +71,13 @@ export const getChainDefaults = (
   return {
     name,
     host,
-    ensRegistry,
-    ensPublicResolver,
     hub,
     sms,
-    resultProxy,
     iexecGateway,
     ipfsGateway,
     ipfsNode,
     compass,
     pocoSubgraph,
-    voucherHub,
-    voucherSubgraph,
-    bridge,
   };
 };
 
@@ -198,31 +86,12 @@ export const shouldUploadBulkForThegraph = (chainId) =>
 
 export const checkImplementedOnChain = (chainId, featureName) => {
   const networkConfig = getConfig(chainId);
-  if (
-    networkConfig?.notImplemented &&
-    networkConfig.notImplemented.includes(featureName)
-  ) {
+  if (networkConfig?.notImplemented?.includes(featureName)) {
     throw new ConfigurationError(
       `${featureName} is not available on network ${networkConfig.name}`,
     );
   }
 };
 
-// Register unknown networks and their ENS settings for the ethers library
-networkConfigs.forEach((networkConfig) => {
-  if (
-    networkConfig.shouldRegisterNetwork &&
-    Network.from(networkConfig.id).name === 'unknown' &&
-    networkConfig.ensRegistry
-  ) {
-    const network = new Network(
-      networkConfig.name,
-      networkConfig.id,
-    ).attachPlugin(new EnsPlugin(networkConfig.ensRegistry, networkConfig.id));
-    Network.register(network.chainId, () => network);
-    Network.register(network.name, () => network);
-  }
-});
-
 export const THEGRAPH_IPFS_NODE = 'https://ipfs.thegraph.com';
 export const THEGRAPH_IPFS_GATEWAY = THEGRAPH_IPFS_NODE;
diff --git a/src/common/utils/constant.js b/src/common/utils/constant.js
index 3fdfe9f9..2c89e2e8 100644
--- a/src/common/utils/constant.js
+++ b/src/common/utils/constant.js
@@ -26,17 +26,13 @@ export const NULL_DATASETORDER = {
   sign: NULL_BYTES,
 };
 
-export const WORKERPOOL_URL_TEXT_RECORD_KEY = 'iexec:workerpool-api:url';
-
 export const TEE_FRAMEWORKS = {
-  SCONE: 'scone',
-  GRAMINE: 'gramine',
   TDX: 'tdx',
 };
 
 export const STORAGE_PROVIDERS = {
-  IPFS: 'ipfs',
   DROPBOX: 'dropbox',
+  IPFS: 'ipfs',
 };
 
 export const IEXEC_REQUEST_PARAMS = {
@@ -45,7 +41,6 @@ export const IEXEC_REQUEST_PARAMS = {
   IEXEC_SECRETS: 'iexec_secrets',
   IEXEC_RESULT_ENCRYPTION: 'iexec_result_encryption',
   IEXEC_RESULT_STORAGE_PROVIDER: 'iexec_result_storage_provider',
-  IEXEC_RESULT_STORAGE_PROXY: 'iexec_result_storage_proxy',
   IEXEC_BULK_CID: 'bulk_cid',
 };
 
diff --git a/src/common/utils/errorWrappers.js b/src/common/utils/errorWrappers.js
index a168be46..e172171e 100644
--- a/src/common/utils/errorWrappers.js
+++ b/src/common/utils/errorWrappers.js
@@ -17,8 +17,8 @@ const getMessage = (err) => {
 export const wrapCall = async (promise) => {
   try {
     return await promise;
-  } catch (err) {
-    throw new Web3ProviderCallError(getMessage(err), err);
+  } catch (cause) {
+    throw new Web3ProviderCallError(getMessage(cause), { cause });
   }
 };
 
@@ -27,16 +27,16 @@ export const wrapWait = wrapCall;
 export const wrapSend = async (promise) => {
   try {
     return await promise;
-  } catch (err) {
-    throw new Web3ProviderSendError(getMessage(err), err);
+  } catch (cause) {
+    throw new Web3ProviderSendError(getMessage(cause), { cause });
   }
 };
 
 export const wrapSign = async (promise) => {
   try {
     return await promise;
-  } catch (err) {
-    throw new Web3ProviderSignMessageError(getMessage(err), err);
+  } catch (cause) {
+    throw new Web3ProviderSignMessageError(getMessage(cause), { cause });
   }
 };
 
diff --git a/src/common/utils/errors.js b/src/common/utils/errors.js
index da9d2885..1a5d4c97 100644
--- a/src/common/utils/errors.js
+++ b/src/common/utils/errors.js
@@ -1,19 +1,6 @@
 /* eslint-disable sonarjs/no-identical-functions */
 export { ValidationError } from 'yup';
 
-const getPropsToCopy = (error) => {
-  const {
-    name,
-    message,
-    stack,
-    constructor,
-    originalError,
-    toJSON,
-    ...propsToCopy
-  } = error;
-  return propsToCopy;
-};
-
 export class ConfigurationError extends Error {
   constructor(...args) {
     super(...args);
@@ -22,15 +9,11 @@ export class ConfigurationError extends Error {
 }
 
 export class Web3ProviderError extends Error {
-  constructor(message, originalError) {
-    super(message, { cause: originalError });
+  constructor(message, options = {}) {
+    super(message, options);
     this.name = this.constructor.name;
-    this.originalError = originalError; // deprecated
-    if (originalError && typeof originalError === 'object') {
-      Object.assign(this, getPropsToCopy(originalError));
-    }
     // detect user rejection from ethers error code
-    if (originalError?.code === 'ACTION_REJECTED') {
+    if (options?.cause?.code === 'ACTION_REJECTED') {
       this.isUserRejection = true;
     }
   }
@@ -67,26 +50,10 @@ export class ObjectNotFoundError extends Error {
   }
 }
 
-export class BridgeError extends Error {
-  constructor(originalError, sendTxHash) {
-    super(
-      `Failed to get bridged chain confirmation for transaction ${sendTxHash}`,
-      { cause: originalError },
-    );
-    this.name = this.constructor.name;
-    this.sendTxHash = sendTxHash;
-    this.originalError = originalError; // deprecated
-    if (originalError && typeof originalError === 'object') {
-      Object.assign(this, getPropsToCopy(originalError));
-    }
-  }
-}
-
 export class ApiCallError extends Error {
-  constructor(message, originalError) {
-    super(message, { cause: originalError });
+  constructor(message, options = {}) {
+    super(message, options);
     this.name = this.constructor.name;
-    this.originalError = originalError; // deprecated
   }
 }
 
@@ -97,13 +64,6 @@ export class SmsCallError extends ApiCallError {
   }
 }
 
-export class ResultProxyCallError extends ApiCallError {
-  constructor(message, ...args) {
-    super(`Result Proxy error: ${message}`, ...args);
-    this.name = this.constructor.name;
-  }
-}
-
 export class MarketCallError extends ApiCallError {
   constructor(message, ...args) {
     super(`Market API error: ${message}`, ...args);
@@ -119,8 +79,8 @@ export class IpfsGatewayCallError extends ApiCallError {
 }
 
 export class CompassCallError extends ApiCallError {
-  constructor(message, originalError) {
-    super(`Compass API error: ${message}`, originalError);
+  constructor(message, ...args) {
+    super(`Compass API error: ${message}`, ...args);
     this.name = this.constructor.name;
   }
 }
diff --git a/src/common/utils/providers.js b/src/common/utils/providers.js
index b46ca421..61c46c60 100644
--- a/src/common/utils/providers.js
+++ b/src/common/utils/providers.js
@@ -1,55 +1,20 @@
-import { getDefaultProvider, JsonRpcProvider } from 'ethers';
+import { JsonRpcProvider } from 'ethers';
 import { getChainDefaults, getId } from './config.js';
 
 export const getReadOnlyProvider = (
   host,
-  { providers = {}, allowExperimentalNetworks = false } = {},
+  { allowExperimentalNetworks = false } = {},
 ) => {
-  let resolvedHost = host;
-
-  const defaults = getChainDefaults(
-    getId(host, { allowExperimentalNetworks }),
-    {
+  let resolvedHost =
+    getChainDefaults(getId(host, { allowExperimentalNetworks }), {
       allowExperimentalNetworks,
-    },
-  );
+    })?.host || host;
 
-  if (defaults && defaults.host) {
-    resolvedHost = defaults.host;
-  } else if (
-    // host in host map, must be a RPC endpoint
-    typeof resolvedHost !== 'string' ||
-    !resolvedHost.startsWith('http')
-  ) {
-    throw new Error('Invalid provider host name or url');
-  }
-
-  // RPC endpoint
-  if (resolvedHost.startsWith('http')) {
+  if (typeof resolvedHost === 'string' && resolvedHost.startsWith('http')) {
     return new JsonRpcProvider(resolvedHost, undefined, {
       pollingInterval: 1000, // override default 4s for faster tx confirms (TODO: default value per network + option)
     });
+  } else {
+    throw new Error('Invalid provider host name or url');
   }
-  // API provider
-  const { quorum, ...providersOptionsRest } = providers;
-  // disable non configured providers when at least 1 is configured
-  const apiProvidersList = [
-    'alchemy',
-    'ankr',
-    'cloudflare',
-    'etherscan',
-    'infura',
-    'pocket', // currently commented in ethers
-    'chainstack',
-    'quicknode',
-  ];
-  const nonConfiguredProviders = apiProvidersList.filter(
-    (apiProvider) => !Object.keys(providersOptionsRest).includes(apiProvider),
-  );
-  return getDefaultProvider(resolvedHost, {
-    quorum: quorum || 1,
-    ...(nonConfiguredProviders.length < apiProvidersList.length &&
-      Object.fromEntries(nonConfiguredProviders.map((name) => [name, '-']))),
-    ...providersOptionsRest,
-  });
 };
diff --git a/src/common/utils/secrets-utils.js b/src/common/utils/secrets-utils.js
index f9478620..14599ea2 100644
--- a/src/common/utils/secrets-utils.js
+++ b/src/common/utils/secrets-utils.js
@@ -5,19 +5,16 @@ export const reservedSecretKeyName = {
   IEXEC_RESULT_ENCRYPTION_PUBLIC_KEY: 'iexec-result-encryption-public-key',
   // result storage
   IEXEC_RESULT_DROPBOX_TOKEN: 'iexec-result-dropbox-token',
-  IEXEC_RESULT_IEXEC_IPFS_TOKEN: 'iexec-result-iexec-ipfs-token',
 };
 
 export const getStorageTokenKeyName = (provider) => {
   switch (provider) {
-    case undefined:
-    case 'default':
     case STORAGE_PROVIDERS.IPFS:
-      return reservedSecretKeyName.IEXEC_RESULT_IEXEC_IPFS_TOKEN;
+      return undefined; // no token needed for ipfs
     case STORAGE_PROVIDERS.DROPBOX:
       return reservedSecretKeyName.IEXEC_RESULT_DROPBOX_TOKEN;
     default:
-      throw new Error(`"${provider}" not supported`);
+      return undefined; // unknown provider, no token key name
   }
 };
 
diff --git a/src/common/utils/signers.d.ts b/src/common/utils/signers.d.ts
index 54a8c05f..0dfaaf7d 100644
--- a/src/common/utils/signers.d.ts
+++ b/src/common/utils/signers.d.ts
@@ -11,17 +11,6 @@ import {
   BrowserProvider,
 } from 'ethers';
 
-export class EnhancedWallet extends Wallet {
-  constructor(
-    privateKey: string | SigningKey,
-    provider?: Provider,
-    options?: {
-      gasPrice?: string;
-      getTransactionCount?: (blockTag?: BlockTag) => Promise<number>;
-    },
-  );
-}
-
 /**
  * BrowserProvider wrapped in an AbstractSigner
  */
diff --git a/src/common/utils/signers.js b/src/common/utils/signers.js
index d8a65686..029a9778 100644
--- a/src/common/utils/signers.js
+++ b/src/common/utils/signers.js
@@ -1,57 +1,6 @@
-import { Wallet, BrowserProvider, AbstractSigner } from 'ethers';
+import { BrowserProvider, AbstractSigner, Wallet } from 'ethers';
 import { getReadOnlyProvider } from './providers.js';
 
-export class EnhancedWallet extends Wallet {
-  constructor(privateKey, provider, options = {}) {
-    super(privateKey, provider);
-    this._options = options;
-    if (options.gasPrice) {
-      try {
-        BigInt(options.gasPrice);
-      } catch {
-        throw new Error('Invalid gasPrice option');
-      }
-    }
-    if (
-      options.getTransactionCount !== undefined &&
-      typeof options.getTransactionCount !== 'function'
-    ) {
-      throw new Error('Invalid getTransactionCount option, must be a function');
-    }
-  }
-
-  static createRandom() {
-    return new EnhancedWallet(super.createRandom().privateKey);
-  }
-
-  connect(provider) {
-    return new EnhancedWallet(this.privateKey, provider, this._options);
-  }
-
-  getFeeData() {
-    if (this._options.gasPrice === undefined) return super.getFeeData();
-    return {
-      gasPrice: BigInt(this._options.gasPrice),
-      maxFeePerGas: null,
-      maxPriorityFeePerGas: null,
-    };
-  }
-
-  getNonce(...args) {
-    if (this._options.getTransactionCount === undefined)
-      return super.getNonce(...args);
-    return this._options.getTransactionCount(...args);
-  }
-
-  sendTransaction(tx) {
-    let gasPrice;
-    if (this._options.gasPrice !== undefined) {
-      gasPrice = BigInt(this._options.gasPrice);
-    }
-    return super.sendTransaction({ ...tx, gasPrice: tx.gasPrice ?? gasPrice });
-  }
-}
-
 /**
  * BrowserProvider wrapped in an AbstractSigner
  */
@@ -100,18 +49,9 @@ export class BrowserProviderSignerAdapter extends AbstractSigner {
 export const getSignerFromPrivateKey = (
   host,
   privateKey,
-  {
-    gasPrice,
-    getTransactionCount,
-    providers,
-    allowExperimentalNetworks = false,
-  } = {},
+  { allowExperimentalNetworks = false } = {},
 ) =>
-  new EnhancedWallet(
+  new Wallet(
     privateKey,
-    getReadOnlyProvider(host, { providers, allowExperimentalNetworks }),
-    {
-      gasPrice,
-      getTransactionCount,
-    },
+    getReadOnlyProvider(host, { allowExperimentalNetworks }),
   );
diff --git a/src/common/utils/utils.js b/src/common/utils/utils.js
index fae94cfe..7078b53d 100644
--- a/src/common/utils/utils.js
+++ b/src/common/utils/utils.js
@@ -83,18 +83,6 @@ export const parseEth = (value, defaultUnit = 'ether') => {
   }
 };
 
-export const truncateBnWeiToBnNRlc = (bnWei) => {
-  const weiString = bnWei.toString();
-  const nRlcString = weiString.length > 9 ? weiString.slice(0, -9) : '0';
-  return new BN(nRlcString);
-};
-
-export const bnNRlcToBnWei = (bnNRlc) => {
-  const nRlcString = bnNRlc.toString();
-  const weiString = nRlcString !== '0' ? nRlcString.concat('000000000') : '0';
-  return new BN(weiString);
-};
-
 export const bnifyNestedBigInt = (obj) => {
   const objOut = Array.isArray(obj) ? [] : {};
   Object.entries(obj).forEach((e) => {
@@ -215,8 +203,8 @@ export const getSalt = () => hexlify(randomBytes(32));
 
 export const TAG_MAP = {
   tee: 0,
-  [TEE_FRAMEWORKS.SCONE]: 1,
-  [TEE_FRAMEWORKS.GRAMINE]: 2,
+  scone: 1, // previously supported tee framework
+  gramine: 2, // previously supported tee framework
   [TEE_FRAMEWORKS.TDX]: 3,
   gpu: 8,
 };
diff --git a/src/common/utils/validator.js b/src/common/utils/validator.js
index 17e1787a..ee976741 100644
--- a/src/common/utils/validator.js
+++ b/src/common/utils/validator.js
@@ -1,7 +1,7 @@
 import { Buffer } from 'buffer';
 import Debug from 'debug';
-import { string, number, object, mixed, boolean, array, lazy } from 'yup';
-import { getAddress, isAddress, namehash } from 'ethers';
+import { string, number, object, mixed, boolean, array } from 'yup';
+import { getAddress, isAddress } from 'ethers';
 // import-js/eslint-plugin-import/issues/2703
 // eslint-disable-next-line import/no-unresolved
 import { CID } from 'multiformats/cid';
@@ -16,7 +16,6 @@ import {
   TAG_MAP,
 } from './utils.js';
 import { ValidationError } from './errors.js';
-import { wrapCall } from './errorWrappers.js';
 import {
   TEE_FRAMEWORKS,
   IEXEC_REQUEST_PARAMS,
@@ -31,15 +30,8 @@ const posIntRegex = /^\d+$/;
 
 const posStrictIntRegex = /^[1-9]\d*$/;
 
-const teeFrameworksList = Object.values(TEE_FRAMEWORKS);
-
 export const stringSchema = string;
 
-export const teeFrameworkSchema = () =>
-  string()
-    .transform((name) => name.toLowerCase())
-    .oneOf(teeFrameworksList, '${path} is not a valid TEE framework');
-
 export const stringNumberSchema = ({ message } = {}) =>
   string()
     .transform((value) => {
@@ -142,96 +134,30 @@ export const weiAmountSchema = ({ defaultUnit = 'wei' } = {}) =>
 export const chainIdSchema = () =>
   stringNumberSchema({ message: '${originalValue} is not a valid chainId' });
 
-const transformAddressOrEns = (ethProvider) => (value) => {
-  try {
-    if (typeof value === 'string') {
-      if (value.match(/^.*\.eth$/)) {
-        if (
-          ethProvider &&
-          ethProvider.resolveName &&
-          typeof ethProvider.resolveName === 'function'
-        ) {
-          debug('resolving ENS', value);
-          return wrapCall(ethProvider.resolveName(value))
-            .then((resolved) => {
-              debug('resolved ENS', resolved);
-              return resolved;
-            })
-            .catch((error) => {
-              debug('ENS resolution error', error);
-              return null;
-            });
-        }
-        debug("no ethProvider ENS can't be resolved");
-      }
-      return getAddress(value.toLowerCase());
-    }
-  } catch (e) {
-    debug('Error', e);
+const toChecksummedAddress = (value) => {
+  if (typeof value === 'string' && isAddress(value.toLowerCase())) {
+    return getAddress(value.toLowerCase());
   }
   return value;
 };
 
-const testResolveEnsPromise = async (value) => {
-  if (value === undefined) {
-    return true;
-  }
-  if (typeof value === 'string') {
-    return !value.match(/^.*\.eth$/);
-  }
-  try {
-    const address = await value;
-    if (!address) return false;
-    getAddress(address);
-    return true;
-  } catch (e) {
-    debug('resolve-ens', e);
-    return false;
-  }
-};
-
-const testAddressOrAddressPromise = async (value) => {
-  if (value === undefined) {
-    return true;
-  }
-  const resolvedValue = typeof value === 'string' ? value : await value;
-  return isAddress(resolvedValue);
-};
-
-export const addressSchema = ({ ethProvider } = {}) =>
-  mixed()
-    .transform((value) => transformAddressOrEns(ethProvider)(value))
-    .test('resolve-ens', 'Unable to resolve ENS ${originalValue}', (value) =>
-      testResolveEnsPromise(value),
-    )
+export const addressSchema = () =>
+  string()
+    .transform((value) => toChecksummedAddress(value))
     .test(
       'is-address',
       '${originalValue} is not a valid ethereum address',
-      (value) => testAddressOrAddressPromise(value),
+      (value) => isAddress(value) || value === undefined,
     );
 
-export const addressOrAnySchema = ({ ethProvider } = {}) =>
-  mixed()
-    .transform((value) => {
-      if (value === ANY) {
-        return value;
-      }
-      return transformAddressOrEns(ethProvider)(value);
-    })
-    .test('resolve-ens', 'Unable to resolve ENS ${originalValue}', (value) => {
-      if (value === ANY) {
-        return true;
-      }
-      return testResolveEnsPromise(value);
-    })
+export const addressOrAnySchema = () =>
+  string()
+    .transform((value) => toChecksummedAddress(value))
     .test(
       'is-address',
       '${originalValue} is not a valid ethereum address',
       (value) => {
-        if (value === ANY) {
-          return true;
-        }
-        return testAddressOrAddressPromise(value);
+        return isAddress(value) || value === undefined || value === ANY;
       },
     );
 
@@ -273,6 +199,12 @@ export const paramsInputFilesArraySchema = () =>
 
 export const paramsEncryptResultSchema = () => boolean();
 
+export const storageProviderSchema = () =>
+  string().oneOf(
+    Object.values(STORAGE_PROVIDERS),
+    '"${value}" is not a valid storage provider, use one of the supported providers (${values})',
+  );
+
 const addAllStorageProviders = (schema) =>
   schema.oneOf(
     Object.values(STORAGE_PROVIDERS),
@@ -356,8 +288,6 @@ export const objParamsSchema = () =>
             (value) => value === undefined,
           ),
     ),
-    [IEXEC_REQUEST_PARAMS.IEXEC_RESULT_STORAGE_PROXY]:
-      basicUrlSchema().notRequired(),
   })
     .json()
     .noUnknown(true, 'Unknown key "${unknown}" in params');
@@ -390,8 +320,12 @@ export const paramsSchema = () =>
  * tag validation schema
  * @param {*} options
  * @param {boolean} options.allowAgnosticTee - allow 'tee' tag without tee framework tag (use for datasetorders and requestorders that don't need to specify tee framework)
+ * @param {boolean} options.ignoreLegacyTeeFramework - ignore TEE framework validation (use for legacy TEE framework tags)
  */
-export const tagSchema = ({ allowAgnosticTee = false } = {}) =>
+export const tagSchema = ({
+  allowAgnosticTee = false,
+  ignoreLegacyTeeFramework = false,
+} = {}) =>
   mixed()
     .transform((value) => {
       if (Array.isArray(value)) {
@@ -440,6 +374,18 @@ export const tagSchema = ({ allowAgnosticTee = false } = {}) =>
         if (value instanceof Error) {
           return true;
         }
+        if (!ignoreLegacyTeeFramework) {
+          const unsupportedTeeFrameworks = ['gramine', 'scone'].filter(
+            (teeFramework) => checkActiveBitInTag(value, TAG_MAP[teeFramework]),
+          );
+          if (unsupportedTeeFrameworks.length > 0) {
+            throw new Error(
+              `Unsupported legacy TEE framework tag (${unsupportedTeeFrameworks
+                .map((name) => `'${name}'`)
+                .join(', ')})`,
+            );
+          }
+        }
         const isTee = checkActiveBitInTag(value, TAG_MAP.tee);
         const teeFrameworks = Object.values(TEE_FRAMEWORKS).filter(
           (teeFramework) => checkActiveBitInTag(value, TAG_MAP[teeFramework]),
@@ -476,54 +422,57 @@ export const tagSchema = ({ allowAgnosticTee = false } = {}) =>
       },
     );
 
-export const apporderSchema = (opt) =>
+export const apporderSchema = () =>
   object(
     {
-      app: addressSchema(opt).required(),
+      app: addressSchema().required(),
       appprice: nRlcAmountSchema().required(),
       volume: uint256Schema().required(),
       tag: tagSchema().required(),
-      datasetrestrict: addressSchema(opt).required(),
-      workerpoolrestrict: addressSchema(opt).required(),
-      requesterrestrict: addressSchema(opt).required(),
+      datasetrestrict: addressSchema().required(),
+      workerpoolrestrict: addressSchema().required(),
+      requesterrestrict: addressSchema().required(),
     },
     '${originalValue} is not a valid apporder',
   );
 
-export const saltedApporderSchema = (opt) =>
-  apporderSchema(opt).shape(
+export const saltedApporderSchema = () =>
+  apporderSchema().shape(
     salted(),
     '${originalValue} is not a valid salted apporder',
   );
 
-export const signedApporderSchema = (opt) =>
-  saltedApporderSchema(opt).shape(
+export const signedApporderSchema = () =>
+  saltedApporderSchema().shape(
     signed(),
     '${originalValue} is not a valid signed apporder',
   );
 
-export const datasetorderSchema = (opt) =>
+export const datasetorderSchema = () =>
   object(
     {
-      dataset: addressSchema(opt).required(),
+      dataset: addressSchema().required(),
       datasetprice: nRlcAmountSchema().required(),
       volume: uint256Schema().required(),
-      tag: tagSchema({ allowAgnosticTee: true }).required(),
-      apprestrict: addressSchema(opt).required(),
-      workerpoolrestrict: addressSchema(opt).required(),
-      requesterrestrict: addressSchema(opt).required(),
+      tag: tagSchema({
+        allowAgnosticTee: true,
+        ignoreLegacyTeeFramework: true,
+      }).required(),
+      apprestrict: addressSchema().required(),
+      workerpoolrestrict: addressSchema().required(),
+      requesterrestrict: addressSchema().required(),
     },
     '${originalValue} is not a valid datasetorder',
   );
 
-export const saltedDatasetorderSchema = (opt) =>
-  datasetorderSchema(opt).shape(
+export const saltedDatasetorderSchema = () =>
+  datasetorderSchema().shape(
     salted(),
     '${originalValue} is not a valid salted datasetorder',
   );
 
-export const signedDatasetorderSchema = (opt) =>
-  saltedDatasetorderSchema(opt).shape(
+export const signedDatasetorderSchema = () =>
+  saltedDatasetorderSchema().shape(
     signed(),
     '${originalValue} is not a valid signed datasetorder',
   );
@@ -545,7 +494,10 @@ export const signedDatasetorderBulkSchema = () =>
           (value) => parseInt(value) >= DATASET_INFINITE_VOLUME - 1, // (DATASET_INFINITE_VOLUME - 1) is accepted for compatibility with already created orders
         )
         .required(),
-      tag: tagSchema({ allowAgnosticTee: true }).required(),
+      tag: tagSchema({
+        allowAgnosticTee: true,
+        ignoreLegacyTeeFramework: true,
+      }).required(),
       apprestrict: addressSchema().required(),
       workerpoolrestrict: addressSchema().required(),
       requesterrestrict: addressSchema().required(),
@@ -555,63 +507,63 @@ export const signedDatasetorderBulkSchema = () =>
     '${originalValue} is not a valid bulk datasetorder',
   );
 
-export const workerpoolorderSchema = (opt) =>
+export const workerpoolorderSchema = () =>
   object(
     {
-      workerpool: addressSchema(opt).required(),
+      workerpool: addressSchema().required(),
       workerpoolprice: nRlcAmountSchema().required(),
       volume: uint256Schema().required(),
       tag: tagSchema().required(),
       category: catidSchema().required(),
       trust: uint256Schema().required(),
-      apprestrict: addressSchema(opt).required(),
-      datasetrestrict: addressSchema(opt).required(),
-      requesterrestrict: addressSchema(opt).required(),
+      apprestrict: addressSchema().required(),
+      datasetrestrict: addressSchema().required(),
+      requesterrestrict: addressSchema().required(),
     },
     '${originalValue} is not a valid workerpoolorder',
   );
 
-export const saltedWorkerpoolorderSchema = (opt) =>
-  workerpoolorderSchema(opt).shape(
+export const saltedWorkerpoolorderSchema = () =>
+  workerpoolorderSchema().shape(
     salted(),
     '${originalValue} is not a valid salted workerpoolorder',
   );
 
-export const signedWorkerpoolorderSchema = (opt) =>
-  saltedWorkerpoolorderSchema(opt).shape(
+export const signedWorkerpoolorderSchema = () =>
+  saltedWorkerpoolorderSchema().shape(
     signed(),
     '${originalValue} is not a valid signed workerpoolorder',
   );
 
-export const requestorderSchema = (opt) =>
+export const requestorderSchema = () =>
   object(
     {
-      app: addressSchema(opt).required(),
+      app: addressSchema().required(),
       appmaxprice: nRlcAmountSchema().required(),
-      dataset: addressSchema(opt).required(),
+      dataset: addressSchema().required(),
       datasetmaxprice: nRlcAmountSchema().required(),
-      workerpool: addressSchema(opt).required(),
+      workerpool: addressSchema().required(),
       workerpoolmaxprice: nRlcAmountSchema().required(),
-      requester: addressSchema(opt).required(),
+      requester: addressSchema().required(),
       volume: uint256Schema().required(),
       tag: tagSchema({ allowAgnosticTee: true }).required(),
       category: catidSchema().required(),
       trust: uint256Schema().required(),
-      beneficiary: addressSchema(opt).required(),
-      callback: addressSchema(opt).required(),
+      beneficiary: addressSchema().required(),
+      callback: addressSchema().required(),
       params: paramsSchema(),
     },
     '${originalValue} is not a valid requestorder',
   );
 
-export const saltedRequestorderSchema = (opt) =>
-  requestorderSchema(opt).shape(
+export const saltedRequestorderSchema = () =>
+  requestorderSchema().shape(
     salted(),
     '${originalValue} is not a valid salted requestorder',
   );
 
-export const signedRequestorderSchema = (opt) =>
-  saltedRequestorderSchema(opt).shape(
+export const signedRequestorderSchema = () =>
+  saltedRequestorderSchema().shape(
     signed(),
     '${originalValue} is not a valid signed requestorder',
   );
@@ -625,92 +577,25 @@ export const multiaddressSchema = () =>
     throw new ValidationError('${originalValue} is not a valid multiaddr');
   });
 
-export const objMrenclaveSchema = () =>
-  object({
-    // common keys
-    framework: teeFrameworkSchema().required(),
-    version: string().required(),
-    fingerprint: string().required(),
-    // framework specific keys
-    entrypoint: mixed().when('framework', ([framework], entrypointSchema) =>
-      framework && framework.toLowerCase() === TEE_FRAMEWORKS.SCONE
-        ? string().required()
-        : entrypointSchema.is(
-            [undefined],
-            'Unknown key "${path}" in mrenclave',
-          ),
-    ),
-    heapSize: mixed().when('framework', ([framework], entrypointSchema) =>
-      framework && framework.toLowerCase() === TEE_FRAMEWORKS.SCONE
-        ? positiveIntSchema().required()
-        : entrypointSchema.is(
-            [undefined],
-            'Unknown key "${path}" in mrenclave',
-          ),
-    ),
-  })
-    .json()
-    .noUnknown(true, 'Unknown key "${unknown}" in mrenclave');
-
 export const mrenclaveSchema = () =>
   mixed()
     .transform((value) => {
-      if (value instanceof Uint8Array) {
-        return value;
-      }
       if (typeof value === 'string') {
         return utf8ToBuffer(value);
       }
-      if (typeof value === 'object') {
-        return utf8ToBuffer(JSON.stringify(value));
-      }
-      return utf8ToBuffer('');
+      return value;
     })
-    .test(
-      'is-valid-mrenclave',
-      '${path} is not a valid mrenclave',
-      async (value, { originalValue, createError }) => {
-        let stringValue;
-        let objValue;
-        if (originalValue instanceof Uint8Array) {
-          try {
-            stringValue = Buffer.from(originalValue).toString();
-          } catch {
-            return false;
-          }
-        } else if (typeof originalValue === 'string') {
-          stringValue = originalValue;
-        } else if (originalValue && typeof originalValue === 'object') {
-          objValue = originalValue;
-        } else if (originalValue !== undefined) {
-          return false;
-        }
-        try {
-          if (stringValue !== undefined && stringValue !== '') {
-            objValue = JSON.parse(stringValue);
-          }
-          if (objValue) {
-            await objMrenclaveSchema().validate(objValue, {
-              stripUnknown: false,
-            });
-          }
-          return true;
-        } catch (e) {
-          if (e instanceof ValidationError) {
-            return createError({ message: e.message });
-          }
-          return false;
-        }
-      },
+    .test('is-buffer', '${path} is not a valid mrenclave', (value) =>
+      Buffer.isBuffer(value),
     )
     .default(() => utf8ToBuffer(''));
 
 export const appTypeSchema = () =>
   string().oneOf(['DOCKER'], '${originalValue} is not a valid type');
 
-export const appSchema = (opt) =>
+export const appSchema = () =>
   object({
-    owner: addressSchema(opt).required(),
+    owner: addressSchema().required(),
     name: string().required(),
     type: appTypeSchema().required(),
     multiaddr: multiaddressSchema().required(),
@@ -718,17 +603,17 @@ export const appSchema = (opt) =>
     mrenclave: mrenclaveSchema().required(),
   });
 
-export const datasetSchema = (opt) =>
+export const datasetSchema = () =>
   object({
-    owner: addressSchema(opt).required(),
+    owner: addressSchema().required(),
     name: string().required(),
     multiaddr: multiaddressSchema().required(),
     checksum: bytes32Schema().required(),
   });
 
-export const workerpoolSchema = (opt) =>
+export const workerpoolSchema = () =>
   object({
-    owner: addressSchema(opt).required(),
+    owner: addressSchema().required(),
     description: string().required(),
   });
 
@@ -771,124 +656,6 @@ export const base64Encoded256bitsKeySchema = () =>
     },
   );
 
-export const ensDomainSchema = () =>
-  string()
-    .test(
-      'no-empty-label',
-      '${originalValue} is not a valid ENS domain (domain cannot have empty labels)',
-      (value) => {
-        try {
-          const nameArray = value.split('.');
-          const hasEmptyLabels =
-            nameArray.filter((e) => e.length < 1).length > 0;
-          if (hasEmptyLabels)
-            throw new Error('Domain cannot have empty labels');
-          return true;
-        } catch (e) {
-          debug('ensDomainSchema no-empty-label', e);
-          return false;
-        }
-      },
-    )
-    .test(
-      'valid-namehash',
-      '${originalValue} is not a valid ENS domain (domain cannot contain unsupported characters)',
-      (value) => {
-        try {
-          namehash(value);
-          return true;
-        } catch (e) {
-          debug('ensDomainSchema valid-namehash', e);
-          return false;
-        }
-      },
-    )
-    .test(
-      'no-uppercase',
-      '${originalValue} is not a valid ENS domain (domain cannot contain uppercase characters)',
-      (value) => {
-        try {
-          if (value !== value.toLowerCase()) {
-            throw new Error('Domain cannot have uppercase characters');
-          }
-          return true;
-        } catch (e) {
-          debug('ensDomainSchema no-uppercase', e);
-          return false;
-        }
-      },
-    );
-
-export const ensLabelSchema = () =>
-  string()
-    .test(
-      'no-dot',
-      '${originalValue} is not a valid ENS label (label cannot have `.`)',
-      async (value) => {
-        try {
-          const hasDot = value.indexOf('.') !== -1;
-          if (hasDot) throw new Error('Label cannot have `.`');
-          return true;
-        } catch (e) {
-          debug('ensLabelSchema no-dot', e);
-          return false;
-        }
-      },
-    )
-    .test(
-      'valid-namehash',
-      '${originalValue} is not a valid ENS label (label cannot contain unsupported characters)',
-      (value) => {
-        try {
-          namehash(value);
-          return true;
-        } catch (e) {
-          debug('ensLabelSchema valid-namehash', e);
-          return false;
-        }
-      },
-    )
-    .test(
-      'no-uppercase',
-      '${originalValue} is not a valid ENS label (label cannot contain uppercase characters)',
-      (value) => {
-        try {
-          if (value !== value.toLowerCase()) {
-            throw new Error('Label cannot have uppercase characters');
-          }
-          return true;
-        } catch (e) {
-          debug('ensLabelSchema no-uppercase', e);
-          return false;
-        }
-      },
-    );
-
-export const textRecordKeySchema = () => string().required().strict(true);
-
-export const textRecordValueSchema = () => string().default('').strict(true);
-
-export const workerpoolApiUrlSchema = () =>
-  string()
-    .matches(/^(https?:\/\/.*)?$/, '${path} "${value}" is not a valid URL') // accept empty string to reset workerpool URL
-    .default('');
-
-export const smsUrlOrMapSchema = () =>
-  lazy((stringOrMap) => {
-    if (typeof stringOrMap === 'object' && stringOrMap !== null) {
-      return object(
-        teeFrameworksList.reduce(
-          (acc, curr) => ({ ...acc, [curr]: basicUrlSchema() }),
-          {},
-        ),
-      )
-        .noUnknown(true)
-        .nonNullable()
-        .strict(true);
-    }
-    return basicUrlSchema();
-  });
-
 export const throwIfMissing = () => {
   throw new ValidationError('Missing parameter');
 };
diff --git a/src/common/utils/voucher-utils.js b/src/common/utils/voucher-utils.js
deleted file mode 100644
index b3756b8a..00000000
--- a/src/common/utils/voucher-utils.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Contract } from 'ethers';
-import { GraphQLClient } from 'graphql-request';
-import { throwIfMissing } from './validator.js';
-import { ConfigurationError } from './errors.js';
-import { abi as voucherHubAbi } from '../generated/@iexec/voucher-contracts/VoucherHub.js';
-import { abi as voucherAbi } from '../generated/@iexec/voucher-contracts/Voucher.js';
-
-export const getVoucherContract = (
-  contracts = throwIfMissing(),
-  voucherAddress = throwIfMissing(),
-) => new Contract(voucherAddress, voucherAbi, contracts.provider);
-
-export const getVoucherHubContract = (
-  contracts = throwIfMissing(),
-  voucherHubAddress,
-) => {
-  if (!voucherHubAddress) {
-    throw new ConfigurationError(
-      `voucherHubAddress option not set and no default value for your chain ${contracts.chainId}`,
-    );
-  }
-  return new Contract(voucherHubAddress, voucherHubAbi, contracts.provider);
-};
-
-export const getVoucherSubgraphClient = (
-  contracts = throwIfMissing(),
-  voucherSubgraphUrl,
-) => {
-  if (!voucherSubgraphUrl) {
-    throw new ConfigurationError(
-      `voucherSubgraphURL option not set and no default value for your chain ${contracts.chainId}`,
-    );
-  }
-  try {
-    return new GraphQLClient(voucherSubgraphUrl);
-  } catch (error) {
-    throw new Error(`Failed to create GraphQLClient: ${error.message}`);
-  }
-};
diff --git a/src/common/voucher/subgraph/voucherInfo.js b/src/common/voucher/subgraph/voucherInfo.js
deleted file mode 100644
index 1ba1100c..00000000
--- a/src/common/voucher/subgraph/voucherInfo.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import Debug from 'debug';
-import { gql } from 'graphql-request';
-import { throwIfMissing } from '../../utils/validator.js';
-import { checksummedAddress } from '../../utils/utils.js';
-
-const debug = Debug('iexec:voucher:info');
-
-export const getVoucherInfo = async (
-  graphQLClient = throwIfMissing(),
-  voucherId,
-) => {
-  const lowercaseVoucherId = voucherId.toLowerCase();
-
-  const query = gql`
-    query getVoucherInfo($id: ID!) {
-      voucher(id: $id) {
-        voucherType {
-          eligibleAssets {
-            type: __typename
-            id
-          }
-        }
-        authorizedAccounts {
-          id
-        }
-      }
-    }
-  `;
-
-  try {
-    const response = await graphQLClient.request(query, {
-      id: lowercaseVoucherId,
-    });
-    const voucherInfo = response.voucher;
-
-    const mapIds = (items) =>
-      items?.map((item) => checksummedAddress(item.id.toLowerCase())) || [];
-
-    const sponsoredApps = mapIds(
-      voucherInfo?.voucherType?.eligibleAssets.filter(
-        ({ type }) => type === 'App',
-      ),
-    );
-    const sponsoredDatasets = mapIds(
-      voucherInfo?.voucherType?.eligibleAssets.filter(
-        ({ type }) => type === 'Dataset',
-      ),
-    );
-    const sponsoredWorkerpools = mapIds(
-      voucherInfo?.voucherType?.eligibleAssets.filter(
-        ({ type }) => type === 'Workerpool',
-      ),
-    );
-    const authorizedAccounts = mapIds(voucherInfo?.authorizedAccounts);
-
-    return {
-      sponsoredApps,
-      sponsoredDatasets,
-      sponsoredWorkerpools,
-      authorizedAccounts,
-    };
-  } catch (error) {
-    debug('getVoucherInfo()', error);
-    throw error;
-  }
-};
diff --git a/src/common/voucher/voucher.js b/src/common/voucher/voucher.js
deleted file mode 100644
index 991d8c47..00000000
--- a/src/common/voucher/voucher.js
+++ /dev/null
@@ -1,223 +0,0 @@
-import Debug from 'debug';
-import { addressSchema, throwIfMissing } from '../utils/validator.js';
-import { fetchVoucherAddress, isVoucherAddress } from './voucherHub.js';
-import { checkAllowance } from '../account/allowance.js';
-import { bigIntToBn, checkSigner } from '../utils/utils.js';
-import { getAddress } from '../wallet/address.js';
-import { wrapCall, wrapSend } from '../utils/errorWrappers.js';
-import { getVoucherInfo } from './subgraph/voucherInfo.js';
-import {
-  getVoucherContract,
-  getVoucherSubgraphClient,
-} from '../utils/voucher-utils.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:voucher:voucher');
-
-export const fetchVoucherContract = async (
-  contracts = throwIfMissing(),
-  voucherHubAddress,
-  userAddress,
-  { voucherAddress } = {},
-) => {
-  try {
-    const [vUserAddress, vVoucherAddress] = await Promise.all([
-      addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .required()
-        .label('userAddress')
-        .validate(userAddress),
-      addressSchema({
-        ethProvider: contracts.provider,
-      })
-        .label('voucherAddress')
-        .validate(voucherAddress),
-    ]);
-
-    let voucherContract;
-    if (vVoucherAddress) {
-      const isVoucher = await isVoucherAddress(
-        contracts,
-        voucherHubAddress,
-        vVoucherAddress,
-      );
-      if (!isVoucher) {
-        throw new Error('Invalid voucher contract address');
-      }
-      voucherContract = getVoucherContract(contracts, vVoucherAddress);
-      const [userAuthorized, userIsOwner] = await Promise.all([
-        wrapCall(voucherContract.isAccountAuthorized(vUserAddress)),
-        wrapCall(voucherContract.owner()).then(
-          (owner) => owner.toLowerCase() === vUserAddress.toLowerCase(),
-        ),
-      ]);
-      if (!userAuthorized && !userIsOwner) {
-        throw new Error('User is not authorized to use the voucher');
-      }
-    } else {
-      const ownedVoucherAddress = await fetchVoucherAddress(
-        contracts,
-        voucherHubAddress,
-        userAddress,
-      );
-      if (ownedVoucherAddress) {
-        voucherContract = getVoucherContract(contracts, ownedVoucherAddress);
-      }
-    }
-    return voucherContract;
-  } catch (error) {
-    debug('fetchVoucherContract()', error);
-    throw error;
-  }
-};
-
-export const showUserVoucher = async (
-  contracts = throwIfMissing(),
-  voucherSubgraphURL,
-  voucherHubAddress,
-  owner = throwIfMissing(),
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.VOUCHER);
-    const vOwner = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .label('owner')
-      .validate(owner);
-    const graphQLClient = getVoucherSubgraphClient(
-      contracts,
-      voucherSubgraphURL,
-    );
-    const voucherAddress = await fetchVoucherAddress(
-      contracts,
-      voucherHubAddress,
-      vOwner,
-    );
-    if (!voucherAddress) {
-      throw new Error(`No Voucher found for address ${vOwner}`);
-    }
-    const voucherContract = await fetchVoucherContract(
-      contracts,
-      voucherHubAddress,
-      vOwner,
-    );
-    const fetchType = voucherContract.getType();
-    const fetchBalance = voucherContract.getBalance();
-    const fetchExpirationTimestamp = voucherContract.getExpiration();
-    const fetchAllowanceAmount = checkAllowance(
-      contracts,
-      vOwner,
-      voucherAddress,
-    );
-    const fetchVoucherInfo = getVoucherInfo(graphQLClient, voucherAddress);
-    const [type, balance, expirationTimestamp, allowanceAmount, voucherInfo] =
-      await Promise.all([
-        fetchType,
-        fetchBalance,
-        fetchExpirationTimestamp,
-        fetchAllowanceAmount,
-        fetchVoucherInfo,
-      ]);
-    return {
-      owner,
-      address: voucherAddress,
-      type: bigIntToBn(type),
-      balance: bigIntToBn(balance),
-      allowanceAmount: bigIntToBn(allowanceAmount),
-      expirationTimestamp: bigIntToBn(expirationTimestamp),
-      ...voucherInfo,
-    };
-  } catch (error) {
-    debug('showUserVoucher()', error);
-    throw error;
-  }
-};
-
-export const authorizeRequester = async (
-  contracts = throwIfMissing(),
-  voucherHubAddress,
-  requester,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.VOUCHER);
-    checkSigner(contracts);
-    const userAddress = await getAddress(contracts);
-    const vRequester = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .label('requester')
-      .validate(requester);
-    const voucherContract = await fetchVoucherContract(
-      contracts,
-      voucherHubAddress,
-      userAddress,
-    );
-    if (!voucherContract) {
-      throw new Error(`No Voucher found for address ${userAddress}`);
-    }
-    const isAuthorized = await wrapCall(
-      voucherContract.isAccountAuthorized(vRequester),
-    );
-    if (isAuthorized) {
-      throw new Error(`${vRequester} is already authorized`);
-    }
-    const tx = await wrapSend(
-      voucherContract
-        .connect(contracts.signer)
-        .authorizeAccount(vRequester, contracts.txOptions),
-    );
-    await tx.wait();
-    return tx.hash;
-  } catch (error) {
-    debug('authorizeRequester()', error);
-    throw error;
-  }
-};
-
-export const revokeRequesterAuthorization = async (
-  contracts = throwIfMissing(),
-  voucherHubAddress,
-  requester,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.VOUCHER);
-    checkSigner(contracts);
-    const userAddress = await getAddress(contracts);
-    const vRequester = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .label('requester')
-      .validate(requester);
-    const voucherContract = await fetchVoucherContract(
-      contracts,
-      voucherHubAddress,
-      userAddress,
-    );
-    if (!voucherContract) {
-      throw new Error(`No Voucher found for address ${userAddress}`);
-    }
-    const isAuthorized = await wrapCall(
-      voucherContract.isAccountAuthorized(vRequester),
-    );
-    if (!isAuthorized) {
-      throw new Error(`${vRequester} is not authorized`);
-    }
-    const tx = await wrapSend(
-      voucherContract
-        .connect(contracts.signer)
-        .unauthorizeAccount(vRequester, contracts.txOptions),
-    );
-    await tx.wait();
-    return tx.hash;
-  } catch (error) {
-    debug('revokeRequesterAuthorization()', error);
-    throw error;
-  }
-};
diff --git a/src/common/voucher/voucherHub.js b/src/common/voucher/voucherHub.js
deleted file mode 100644
index 55d11e01..00000000
--- a/src/common/voucher/voucherHub.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import Debug from 'debug';
-
-import { addressSchema, throwIfMissing } from '../utils/validator.js';
-import { wrapCall } from '../utils/errorWrappers.js';
-import { NULL_ADDRESS } from '../utils/constant.js';
-import { getVoucherHubContract } from '../utils/voucher-utils.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:voucher:voucherHub');
-
-export const fetchVoucherAddress = async (
-  contracts = throwIfMissing(),
-  voucherHubAddress,
-  owner,
-) => {
-  try {
-    checkImplementedOnChain(contracts.chainId, CHAIN_SPECIFIC_FEATURES.VOUCHER);
-    const vOwner = await addressSchema({ ethProvider: contracts.provider })
-      .required()
-      .label('owner')
-      .validate(owner);
-    const voucherHubContract = getVoucherHubContract(
-      contracts,
-      voucherHubAddress,
-    );
-    const address = await wrapCall(voucherHubContract.getVoucher(vOwner));
-    return address !== NULL_ADDRESS ? address : null;
-  } catch (error) {
-    debug('fetchVoucherAddress()', error);
-    throw error;
-  }
-};
-
-export const isVoucherAddress = async (
-  contracts = throwIfMissing(),
-  voucherHubAddress,
-  voucherAddress,
-) => {
-  try {
-    const vVoucherAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .label('voucherAddress')
-      .validate(voucherAddress);
-    const voucherHubContract = getVoucherHubContract(
-      contracts,
-      voucherHubAddress,
-    );
-    return wrapCall(voucherHubContract.isVoucher(vVoucherAddress));
-  } catch (error) {
-    debug('checkVoucherAddress()', error);
-    throw error;
-  }
-};
diff --git a/src/common/wallet/abi/ForeignBridgeErcToNative.js b/src/common/wallet/abi/ForeignBridgeErcToNative.js
deleted file mode 100644
index b5ec339f..00000000
--- a/src/common/wallet/abi/ForeignBridgeErcToNative.js
+++ /dev/null
@@ -1,634 +0,0 @@
-export const abi = [
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_txHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'relayedMessages',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: 'vs',
-        type: 'uint8[]',
-      },
-      {
-        name: 'rs',
-        type: 'bytes32[]',
-      },
-      {
-        name: 'ss',
-        type: 'bytes32[]',
-      },
-      {
-        name: 'message',
-        type: 'bytes',
-      },
-    ],
-    name: 'executeSignatures',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_day',
-        type: 'uint256',
-      },
-    ],
-    name: 'totalSpentPerDay',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'isInitialized',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_dailyLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'setExecutionDailyLimit',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getCurrentDay',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'requiredBlockConfirmations',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'executionDailyLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_day',
-        type: 'uint256',
-      },
-    ],
-    name: 'totalExecutedPerDay',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'dailyLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_amount',
-        type: 'uint256',
-      },
-    ],
-    name: 'withinExecutionLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'executionMaxPerTx',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'requiredSignatures',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'owner',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'validatorContract',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'deployedAtBlock',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getBridgeInterfacesVersion',
-    outputs: [
-      {
-        name: 'major',
-        type: 'uint64',
-      },
-      {
-        name: 'minor',
-        type: 'uint64',
-      },
-      {
-        name: 'patch',
-        type: 'uint64',
-      },
-    ],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_minPerTx',
-        type: 'uint256',
-      },
-    ],
-    name: 'setMinPerTx',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_blockConfirmations',
-        type: 'uint256',
-      },
-    ],
-    name: 'setRequiredBlockConfirmations',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_dailyLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'setDailyLimit',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_gasPrice',
-        type: 'uint256',
-      },
-    ],
-    name: 'setGasPrice',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-    ],
-    name: 'setMaxPerTx',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'upgradeabilityAdmin',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'minPerTx',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_amount',
-        type: 'uint256',
-      },
-    ],
-    name: 'withinLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-    ],
-    name: 'setExecutionMaxPerTx',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'transferOwnership',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'maxPerTx',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'gasPrice',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'RelayedMessage',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'gasPrice',
-        type: 'uint256',
-      },
-    ],
-    name: 'GasPriceChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'requiredBlockConfirmations',
-        type: 'uint256',
-      },
-    ],
-    name: 'RequiredBlockConfirmationChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'newLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'DailyLimitChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'newLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'ExecutionDailyLimitChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'previousOwner',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'OwnershipTransferred',
-    type: 'event',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_validatorContract',
-        type: 'address',
-      },
-      {
-        name: '_erc20token',
-        type: 'address',
-      },
-      {
-        name: '_requiredBlockConfirmations',
-        type: 'uint256',
-      },
-      {
-        name: '_gasPrice',
-        type: 'uint256',
-      },
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_homeDailyLimit',
-        type: 'uint256',
-      },
-      {
-        name: '_homeMaxPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_owner',
-        type: 'address',
-      },
-    ],
-    name: 'initialize',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getBridgeMode',
-    outputs: [
-      {
-        name: '_data',
-        type: 'bytes4',
-      },
-    ],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_token',
-        type: 'address',
-      },
-      {
-        name: '_to',
-        type: 'address',
-      },
-    ],
-    name: 'claimTokens',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'erc20token',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-];
-export default { abi };
diff --git a/src/common/wallet/abi/HomeBridgeErcToNative.js b/src/common/wallet/abi/HomeBridgeErcToNative.js
deleted file mode 100644
index bc0dafd3..00000000
--- a/src/common/wallet/abi/HomeBridgeErcToNative.js
+++ /dev/null
@@ -1,1185 +0,0 @@
-export const abi = [
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_message',
-        type: 'bytes32',
-      },
-    ],
-    name: 'numMessagesSigned',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_hash',
-        type: 'bytes32',
-      },
-      {
-        name: '_index',
-        type: 'uint256',
-      },
-    ],
-    name: 'signature',
-    outputs: [
-      {
-        name: '',
-        type: 'bytes',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_fee',
-        type: 'uint256',
-      },
-    ],
-    name: 'setForeignFee',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_txHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'fixedAssets',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_day',
-        type: 'uint256',
-      },
-    ],
-    name: 'totalSpentPerDay',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_fee',
-        type: 'uint256',
-      },
-    ],
-    name: 'setHomeFee',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'isInitialized',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_dailyLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'setExecutionDailyLimit',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getCurrentDay',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'requiredBlockConfirmations',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'requiredMessageLength',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'executionDailyLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_hash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'message',
-    outputs: [
-      {
-        name: '',
-        type: 'bytes',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_day',
-        type: 'uint256',
-      },
-    ],
-    name: 'totalExecutedPerDay',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_feeManager',
-        type: 'address',
-      },
-    ],
-    name: 'setFeeManagerContract',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: 'signature',
-        type: 'bytes',
-      },
-      {
-        name: 'message',
-        type: 'bytes',
-      },
-    ],
-    name: 'submitSignature',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: 'txHash',
-        type: 'bytes32',
-      },
-      {
-        name: 'unlockOnForeign',
-        type: 'bool',
-      },
-    ],
-    name: 'fixAssetsAboveLimits',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'dailyLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_token',
-        type: 'address',
-      },
-      {
-        name: '_to',
-        type: 'address',
-      },
-    ],
-    name: 'claimTokens',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_withdrawal',
-        type: 'bytes32',
-      },
-    ],
-    name: 'numAffirmationsSigned',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_withdrawal',
-        type: 'bytes32',
-      },
-    ],
-    name: 'affirmationsSigned',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_amount',
-        type: 'uint256',
-      },
-    ],
-    name: 'withinExecutionLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'executionMaxPerTx',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'requiredSignatures',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'owner',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_message',
-        type: 'bytes32',
-      },
-    ],
-    name: 'messagesSigned',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_value',
-        type: 'uint256',
-      },
-    ],
-    name: 'getAmountToBurn',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getHomeFee',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'validatorContract',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'executeAffirmation',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'deployedAtBlock',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getBridgeInterfacesVersion',
-    outputs: [
-      {
-        name: 'major',
-        type: 'uint64',
-      },
-      {
-        name: 'minor',
-        type: 'uint64',
-      },
-      {
-        name: 'patch',
-        type: 'uint64',
-      },
-    ],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'outOfLimitAmount',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_minPerTx',
-        type: 'uint256',
-      },
-    ],
-    name: 'setMinPerTx',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_blockConfirmations',
-        type: 'uint256',
-      },
-    ],
-    name: 'setRequiredBlockConfirmations',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_dailyLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'setDailyLimit',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_gasPrice',
-        type: 'uint256',
-      },
-    ],
-    name: 'setGasPrice',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-    ],
-    name: 'setMaxPerTx',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'feeManagerContract',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'upgradeabilityAdmin',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'minPerTx',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_amount',
-        type: 'uint256',
-      },
-    ],
-    name: 'withinLimit',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-    ],
-    name: 'setExecutionMaxPerTx',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getFeeManagerMode',
-    outputs: [
-      {
-        name: '',
-        type: 'bytes4',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'transferOwnership',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'maxPerTx',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'gasPrice',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: '_number',
-        type: 'uint256',
-      },
-    ],
-    name: 'isAlreadyProcessed',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getForeignFee',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    payable: true,
-    stateMutability: 'payable',
-    type: 'fallback',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'AmountLimitExceeded',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'feeAmount',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'FeeDistributedFromAffirmation',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'feeAmount',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'FeeDistributedFromSignatures',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'value',
-        type: 'uint256',
-      },
-    ],
-    name: 'UserRequestForSignature',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'AffirmationCompleted',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: 'signer',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'messageHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'SignedForUserRequest',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: 'signer',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'transactionHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'SignedForAffirmation',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'authorityResponsibleForRelay',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'messageHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: false,
-        name: 'NumberOfCollectedSignatures',
-        type: 'uint256',
-      },
-    ],
-    name: 'CollectedSignatures',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'gasPrice',
-        type: 'uint256',
-      },
-    ],
-    name: 'GasPriceChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'requiredBlockConfirmations',
-        type: 'uint256',
-      },
-    ],
-    name: 'RequiredBlockConfirmationChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'newLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'DailyLimitChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'newLimit',
-        type: 'uint256',
-      },
-    ],
-    name: 'ExecutionDailyLimitChanged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        name: 'previousOwner',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'OwnershipTransferred',
-    type: 'event',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_validatorContract',
-        type: 'address',
-      },
-      {
-        name: '_dailyLimit',
-        type: 'uint256',
-      },
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_minPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_homeGasPrice',
-        type: 'uint256',
-      },
-      {
-        name: '_requiredBlockConfirmations',
-        type: 'uint256',
-      },
-      {
-        name: '_blockReward',
-        type: 'address',
-      },
-      {
-        name: '_foreignDailyLimit',
-        type: 'uint256',
-      },
-      {
-        name: '_foreignMaxPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_owner',
-        type: 'address',
-      },
-    ],
-    name: 'initialize',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_validatorContract',
-        type: 'address',
-      },
-      {
-        name: '_dailyLimit',
-        type: 'uint256',
-      },
-      {
-        name: '_maxPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_minPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_homeGasPrice',
-        type: 'uint256',
-      },
-      {
-        name: '_requiredBlockConfirmations',
-        type: 'uint256',
-      },
-      {
-        name: '_blockReward',
-        type: 'address',
-      },
-      {
-        name: '_foreignDailyLimit',
-        type: 'uint256',
-      },
-      {
-        name: '_foreignMaxPerTx',
-        type: 'uint256',
-      },
-      {
-        name: '_owner',
-        type: 'address',
-      },
-      {
-        name: '_feeManager',
-        type: 'address',
-      },
-      {
-        name: '_homeFee',
-        type: 'uint256',
-      },
-      {
-        name: '_foreignFee',
-        type: 'uint256',
-      },
-    ],
-    name: 'rewardableInitialize',
-    outputs: [
-      {
-        name: '',
-        type: 'bool',
-      },
-    ],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'getBridgeMode',
-    outputs: [
-      {
-        name: '_data',
-        type: 'bytes4',
-      },
-    ],
-    payable: false,
-    stateMutability: 'pure',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'blockRewardContract',
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'totalBurntCoins',
-    outputs: [
-      {
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_blockReward',
-        type: 'address',
-      },
-    ],
-    name: 'setBlockRewardContract',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-];
-export default { abi };
diff --git a/src/common/wallet/balance.js b/src/common/wallet/balance.js
index bddc9dfb..058fa43f 100644
--- a/src/common/wallet/balance.js
+++ b/src/common/wallet/balance.js
@@ -1,43 +1,26 @@
 import Debug from 'debug';
-import { bigIntToBn, truncateBnWeiToBnNRlc } from '../utils/utils.js';
+import { bigIntToBn } from '../utils/utils.js';
 import { addressSchema, throwIfMissing } from '../utils/validator.js';
 import { wrapCall } from '../utils/errorWrappers.js';
 
 const debug = Debug('iexec:wallet:balance');
 
 export const getRlcBalance = async (contracts = throwIfMissing(), address) => {
-  const vAddress = await addressSchema({
-    ethProvider: contracts.provider,
-  })
-    .required()
-    .validate(address);
-  const { isNative } = contracts;
-  if (isNative) {
-    const weiBalance = await contracts.provider.getBalance(vAddress);
-    return truncateBnWeiToBnNRlc(bigIntToBn(weiBalance));
-  }
+  const vAddress = await addressSchema().required().validate(address);
   const rlcContract = await wrapCall(contracts.fetchTokenContract());
   const nRlcBalance = await wrapCall(rlcContract.balanceOf(vAddress));
   return bigIntToBn(nRlcBalance);
 };
 
 export const getEthBalance = async (contracts = throwIfMissing(), address) => {
-  const vAddress = await addressSchema({
-    ethProvider: contracts.provider,
-  })
-    .required()
-    .validate(address);
+  const vAddress = await addressSchema().required().validate(address);
   const weiBalance = await contracts.provider.getBalance(vAddress);
   return bigIntToBn(weiBalance);
 };
 
 export const checkBalances = async (contracts = throwIfMissing(), address) => {
   try {
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(address);
+    const vAddress = await addressSchema().required().validate(address);
     const [weiBalance, rlcBalance] = await Promise.all([
       getEthBalance(contracts, vAddress),
       getRlcBalance(contracts, vAddress),
diff --git a/src/common/wallet/bridge.js b/src/common/wallet/bridge.js
deleted file mode 100644
index aebc704f..00000000
--- a/src/common/wallet/bridge.js
+++ /dev/null
@@ -1,568 +0,0 @@
-import Debug from 'debug';
-import BN from 'bn.js';
-import { Contract } from 'ethers';
-import {
-  bigIntToBn,
-  truncateBnWeiToBnNRlc,
-  bnNRlcToBnWei,
-  formatRLC,
-  checkSigner,
-} from '../utils/utils.js';
-import {
-  addressSchema,
-  nRlcAmountSchema,
-  throwIfMissing,
-} from '../utils/validator.js';
-import { wrapCall } from '../utils/errorWrappers.js';
-import { BridgeError } from '../utils/errors.js';
-import { Observable, SafeObserver } from '../utils/reactive.js';
-import { abi as ForeignBridgeErcToNativeAbi } from './abi/ForeignBridgeErcToNative.js';
-import { abi as HomeBridgeErcToNativeAbi } from './abi/HomeBridgeErcToNative.js';
-import { getAddress } from './address.js';
-import { getRlcBalance } from './balance.js';
-import { sendRLC } from './send.js';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-} from '../utils/config.js';
-
-const debug = Debug('iexec:wallet:bridge');
-
-const obsBridgeMessages = {
-  CHECK_BRIDGE_POLICY: 'CHECK_BRIDGE_POLICY',
-  BRIDGE_POLICY_CHECKED: 'BRIDGE_POLICY_CHECKED',
-  CHECK_BRIDGE_LIMIT: 'CHECK_BRIDGE_LIMIT',
-  BRIDGE_LIMIT_CHECKED: 'BRIDGE_LIMIT_CHECKED',
-  SEND_TO_BRIDGE_TX_REQUEST: 'SEND_TO_BRIDGE_TX_REQUEST',
-  SEND_TO_BRIDGE_TX_SUCCESS: 'SEND_TO_BRIDGE_TX_SUCCESS',
-  WAIT_RECEIVE_TX: 'WAIT_RECEIVE_TX',
-  RECEIVE_TX_SUCCESS: 'RECEIVE_TX_SUCCESS',
-};
-
-const findBlockNumberBeforeTimestamp = async (
-  provider,
-  targetTimestamp,
-  { step = 100, refBlock } = {},
-) => {
-  const lastTriedBlock = refBlock || (await wrapCall(provider.getBlock()));
-  const triedBlockNumber = Math.max(lastTriedBlock.number - step, 0);
-  const triedBlock = await wrapCall(provider.getBlock(triedBlockNumber));
-  const triedBlockTimestamp = triedBlock.timestamp;
-  const remainingTime = triedBlockTimestamp - targetTimestamp;
-  if (remainingTime > 0) {
-    const stepTime = Math.max(
-      lastTriedBlock.timestamp - triedBlockTimestamp,
-      100,
-    );
-    const nextStep = Math.min(
-      Math.ceil((remainingTime / stepTime) * step) + 5,
-      1000,
-    );
-    return findBlockNumberBeforeTimestamp(provider, targetTimestamp, {
-      refBlock: triedBlock,
-      step: nextStep,
-    });
-  }
-  return triedBlock.number;
-};
-
-export const obsBridgeToSidechain = (
-  contracts = throwIfMissing(),
-  bridgeAddress,
-  nRlcAmount,
-  { sidechainBridgeAddress, bridgedContracts } = {},
-) =>
-  new Observable((observer) => {
-    checkImplementedOnChain(
-      contracts.chainId,
-      CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE,
-    );
-    const safeObserver = new SafeObserver(observer);
-    let abort;
-    let stopWatchPromise;
-    const bridgeToken = async () => {
-      try {
-        checkSigner(contracts);
-        // input validation
-        const vBridgeAddress = await addressSchema({
-          ethProvider: contracts.provider,
-        })
-          .required()
-          .validate(bridgeAddress);
-        const vSidechainBridgeAddress = sidechainBridgeAddress
-          ? await addressSchema({
-              ethProvider: contracts.provider,
-            }).validate(sidechainBridgeAddress)
-          : undefined;
-        const vAmount = await nRlcAmountSchema()
-          .required()
-          .validate(nRlcAmount);
-        if (contracts.isNative) throw new Error('Current chain is a sidechain');
-        const balance = await getRlcBalance(
-          contracts,
-          await getAddress(contracts),
-        );
-        if (balance.lt(new BN(vAmount))) {
-          throw new Error('Amount to bridge exceeds wallet balance');
-        }
-
-        // check bridge policy
-        safeObserver.next({
-          message: obsBridgeMessages.CHECK_BRIDGE_POLICY,
-        });
-        if (abort) return;
-        const ercBridgeContract = new Contract(
-          vBridgeAddress,
-          ForeignBridgeErcToNativeAbi,
-          contracts.provider,
-        );
-        const [minPerTx, maxPerTx, dailyLimit] = await Promise.all([
-          wrapCall(ercBridgeContract.minPerTx()),
-          wrapCall(ercBridgeContract.maxPerTx()),
-          wrapCall(ercBridgeContract.dailyLimit()),
-        ]);
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.BRIDGE_POLICY_CHECKED,
-          minPerTx: bigIntToBn(minPerTx),
-          maxPerTx: bigIntToBn(maxPerTx),
-          dailyLimit: bigIntToBn(dailyLimit),
-        });
-        if (new BN(vAmount).lt(bigIntToBn(minPerTx))) {
-          throw new Error(
-            `Minimum amount allowed to bridge is ${formatRLC(
-              minPerTx.toString(),
-            )} RLC`,
-          );
-        }
-        if (new BN(vAmount).gt(bigIntToBn(maxPerTx))) {
-          throw new Error(
-            `Maximum amount allowed to bridge is ${formatRLC(
-              maxPerTx.toString(),
-            )} RLC`,
-          );
-        }
-
-        // check bridge daily limit
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.CHECK_BRIDGE_LIMIT,
-        });
-        const currentDay = await wrapCall(ercBridgeContract.getCurrentDay());
-        const dayStartTimestamp = currentDay.toNumber() * (60 * 60 * 24);
-        const startBlockNumber = await findBlockNumberBeforeTimestamp(
-          contracts.provider,
-          dayStartTimestamp,
-        );
-        if (abort) return;
-        const erc20Contract = await wrapCall(contracts.fetchTokenContract());
-        const transferLogs = await contracts.provider.getLogs({
-          fromBlock: startBlockNumber,
-          toBlock: 'latest',
-          address: erc20Contract.address,
-          topics: [
-            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-          ],
-        });
-
-        const erc20Interface = erc20Contract.interface;
-        let totalSpentPerDay = new BN(0);
-        const processTransferLogs = async (logs, checkTimestamp = true) => {
-          if (logs.length === 0) return;
-          let isInvalidTimestamp = checkTimestamp;
-          if (checkTimestamp) {
-            const logTimestamp = (
-              await wrapCall(contracts.provider.getBlock(logs[0].blockNumber))
-            ).timestamp;
-            isInvalidTimestamp = logTimestamp < dayStartTimestamp;
-          }
-          if (!isInvalidTimestamp) {
-            const parsedLog = erc20Interface.parseLog(logs[0]);
-            if (parsedLog.args.to === vBridgeAddress) {
-              totalSpentPerDay = totalSpentPerDay.add(
-                bigIntToBn(parsedLog.args.value),
-              );
-            }
-          }
-          logs.shift();
-          if (abort) return;
-          await processTransferLogs(logs, isInvalidTimestamp);
-        };
-        if (abort) return;
-        await processTransferLogs(transferLogs);
-        if (abort) return;
-        const withinLimit = totalSpentPerDay.lt(bigIntToBn(dailyLimit));
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.BRIDGE_LIMIT_CHECKED,
-          totalSpentPerDay,
-        });
-        if (!withinLimit) {
-          throw new Error(
-            `Amount to bridge would exceed bridge daily limit. ${formatRLC(
-              totalSpentPerDay,
-            )}/${formatRLC(dailyLimit)} RLC already bridged today.`,
-          );
-        }
-
-        // prepare to watch
-        const waitReceive = vSidechainBridgeAddress && bridgedContracts;
-        const sidechainBlockNumber = waitReceive
-          ? await bridgedContracts.provider.getBlockNumber()
-          : 0;
-
-        // send to bridge
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.SEND_TO_BRIDGE_TX_REQUEST,
-          bridgeAddress: vBridgeAddress,
-        });
-        const sendTxHash = await sendRLC(contracts, vAmount, vBridgeAddress);
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.SEND_TO_BRIDGE_TX_SUCCESS,
-          bridgeAddress: vBridgeAddress,
-          txHash: sendTxHash,
-        });
-
-        // watch receive
-        if (waitReceive) {
-          safeObserver.next({
-            message: obsBridgeMessages.WAIT_RECEIVE_TX,
-            bridgeAddress: vSidechainBridgeAddress,
-          });
-          const waitAffirmationCompleted = (txHash) =>
-            new Promise((resolve, reject) => {
-              const sidechainBridge = new Contract(
-                vSidechainBridgeAddress,
-                HomeBridgeErcToNativeAbi,
-                bridgedContracts.provider,
-              );
-              const cleanListeners = () =>
-                sidechainBridge.removeAllListeners('AffirmationCompleted');
-              stopWatchPromise = () => {
-                cleanListeners();
-                reject(Error('aborted'));
-              };
-              try {
-                sidechainBridge.on(
-                  sidechainBridge.filters.AffirmationCompleted(),
-                  (address, amount, refTxHash, event) => {
-                    if (refTxHash === txHash) {
-                      cleanListeners();
-                      resolve(event);
-                    }
-                  },
-                );
-                bridgedContracts.provider.resetEventsBlock(
-                  sidechainBlockNumber,
-                );
-                debug(
-                  `watching AffirmationCompleted events from block ${sidechainBlockNumber}`,
-                );
-              } catch (e) {
-                cleanListeners();
-                throw e;
-              }
-            });
-          if (abort) return;
-          const event = await waitAffirmationCompleted(sendTxHash);
-          const receiveTxHash = event.transactionHash;
-          safeObserver.next({
-            message: obsBridgeMessages.RECEIVE_TX_SUCCESS,
-            txHash: receiveTxHash,
-          });
-        }
-
-        // done
-        safeObserver.complete();
-      } catch (error) {
-        debug('obsBridgeToSidechain()', error);
-        safeObserver.error(error);
-      }
-    };
-    bridgeToken();
-    safeObserver.unsub = () => {
-      abort = true;
-      if (stopWatchPromise) {
-        stopWatchPromise();
-      }
-    };
-    return safeObserver.unsubscribe.bind(safeObserver);
-  });
-
-export const bridgeToSidechain = async (
-  contracts = throwIfMissing(),
-  bridgeAddress = throwIfMissing(),
-  nRlcAmount = throwIfMissing(),
-  { sidechainBridgeAddress, bridgedContracts } = {},
-) => {
-  checkImplementedOnChain(
-    contracts.chainId,
-    CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE,
-  );
-  checkSigner(contracts);
-  let sendTxHash;
-  let receiveTxHash;
-  try {
-    await new Promise((resolve, reject) => {
-      obsBridgeToSidechain(contracts, bridgeAddress, nRlcAmount, {
-        sidechainBridgeAddress,
-        bridgedContracts,
-      }).subscribe({
-        next: ({ message, ...data }) => {
-          if (message === obsBridgeMessages.SEND_TO_BRIDGE_TX_SUCCESS) {
-            sendTxHash = data.txHash;
-          }
-          if (message === obsBridgeMessages.RECEIVE_TX_SUCCESS) {
-            receiveTxHash = data.txHash;
-          }
-          debug(message, data);
-        },
-        error: reject,
-        complete: resolve,
-      });
-    });
-    return { sendTxHash, receiveTxHash };
-  } catch (error) {
-    debug('bridgeToSidechain()', error);
-    if (sendTxHash) throw new BridgeError(error, sendTxHash);
-    throw error;
-  }
-};
-
-export const obsBridgeToMainchain = (
-  contracts = throwIfMissing(),
-  bridgeAddress,
-  nRlcAmount,
-  { mainchainBridgeAddress, bridgedContracts } = {},
-) =>
-  new Observable((observer) => {
-    checkImplementedOnChain(
-      contracts.chainId,
-      CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE,
-    );
-    const safeObserver = new SafeObserver(observer);
-    let abort;
-    let stopWatchPromise;
-    const bridgeToken = async () => {
-      try {
-        checkSigner(contracts);
-        // input validation
-        const vBridgeAddress = await addressSchema({
-          ethProvider: contracts.provider,
-        }).validate(bridgeAddress);
-        const vMainchainBridgeAddress = mainchainBridgeAddress
-          ? await addressSchema({
-              ethProvider: contracts.provider,
-            })
-              .required()
-              .validate(mainchainBridgeAddress)
-          : undefined;
-        const vAmount = await nRlcAmountSchema()
-          .required()
-          .validate(nRlcAmount);
-        if (!contracts.isNative)
-          throw new Error('Current chain is a mainchain');
-        const balance = await getRlcBalance(
-          contracts,
-          await getAddress(contracts),
-        );
-        if (balance.lt(new BN(vAmount))) {
-          throw new Error('Amount to bridge exceeds wallet balance');
-        }
-        const sidechainBridgeContract = new Contract(
-          vBridgeAddress,
-          HomeBridgeErcToNativeAbi,
-          contracts.provider,
-        );
-        const bnWeiValue = bnNRlcToBnWei(new BN(vAmount));
-        const weiValue = bnWeiValue.toString();
-
-        // check bridge policy
-        safeObserver.next({
-          message: obsBridgeMessages.CHECK_BRIDGE_POLICY,
-        });
-        if (abort) return;
-        const [minPerTx, maxPerTx, dailyLimit] = await Promise.all([
-          wrapCall(sidechainBridgeContract.minPerTx()),
-          wrapCall(sidechainBridgeContract.maxPerTx()),
-          wrapCall(sidechainBridgeContract.dailyLimit()),
-        ]);
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.BRIDGE_POLICY_CHECKED,
-          minPerTx: bigIntToBn(minPerTx),
-          maxPerTx: bigIntToBn(maxPerTx),
-          dailyLimit: bigIntToBn(dailyLimit),
-        });
-        if (bnWeiValue.lt(bigIntToBn(minPerTx))) {
-          throw new Error(
-            `Minimum amount allowed to bridge is ${formatRLC(
-              truncateBnWeiToBnNRlc(bigIntToBn(minPerTx)),
-            )} RLC`,
-          );
-        }
-        if (bnWeiValue.gt(bigIntToBn(maxPerTx))) {
-          throw new Error(
-            `Maximum amount allowed to bridge is ${formatRLC(
-              truncateBnWeiToBnNRlc(bigIntToBn(maxPerTx)),
-            )} RLC`,
-          );
-        }
-
-        // check bridge daily limit
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.CHECK_BRIDGE_LIMIT,
-        });
-        const [withinLimit, totalSpentPerDay] = await Promise.all([
-          wrapCall(sidechainBridgeContract.withinLimit(weiValue)),
-          wrapCall(
-            sidechainBridgeContract
-              .getCurrentDay()
-              .then((currentDay) =>
-                sidechainBridgeContract.totalSpentPerDay(currentDay),
-              ),
-          ),
-        ]);
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.BRIDGE_LIMIT_CHECKED,
-          totalSpentPerDay: bigIntToBn(totalSpentPerDay),
-        });
-        if (!withinLimit) {
-          throw new Error(
-            `Amount to bridge would exceed bridge daily limit. ${formatRLC(
-              truncateBnWeiToBnNRlc(bigIntToBn(totalSpentPerDay)),
-            )}/${formatRLC(
-              truncateBnWeiToBnNRlc(bigIntToBn(dailyLimit)),
-            )} RLC already bridged today`,
-          );
-        }
-
-        // prepare to watch
-        const waitReceive = vMainchainBridgeAddress && bridgedContracts;
-        const mainchainBlockNumber = waitReceive
-          ? await wrapCall(bridgedContracts.provider.getBlockNumber())
-          : 0;
-
-        // send to bridge
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.SEND_TO_BRIDGE_TX_REQUEST,
-          bridgeAddress: vBridgeAddress,
-        });
-        const sendTxHash = await sendRLC(contracts, vAmount, vBridgeAddress);
-        if (abort) return;
-        safeObserver.next({
-          message: obsBridgeMessages.SEND_TO_BRIDGE_TX_SUCCESS,
-          bridgeAddress: vBridgeAddress,
-          txHash: sendTxHash,
-        });
-
-        // watch receive
-        if (waitReceive) {
-          safeObserver.next({
-            message: obsBridgeMessages.WAIT_RECEIVE_TX,
-            bridgeAddress: vMainchainBridgeAddress,
-          });
-          const waitRelayedMessage = (txHash) =>
-            new Promise((resolve, reject) => {
-              const mainchainBridge = new Contract(
-                vMainchainBridgeAddress,
-                ForeignBridgeErcToNativeAbi,
-                bridgedContracts.provider,
-              );
-              const cleanListeners = () =>
-                mainchainBridge.removeAllListeners('RelayedMessage');
-              stopWatchPromise = () => {
-                cleanListeners();
-                reject(Error('aborted'));
-              };
-              try {
-                mainchainBridge.on(
-                  mainchainBridge.filters.RelayedMessage(),
-                  (address, amount, refTxHash, event) => {
-                    if (refTxHash === txHash) {
-                      cleanListeners();
-                      resolve(event);
-                    }
-                  },
-                );
-                bridgedContracts.provider.resetEventsBlock(
-                  mainchainBlockNumber,
-                );
-                debug(
-                  `watching RelayedMessage events from block ${mainchainBlockNumber}`,
-                );
-              } catch (e) {
-                cleanListeners();
-                throw e;
-              }
-            });
-          if (abort) return;
-          const event = await waitRelayedMessage(sendTxHash);
-          const receiveTxHash = event.transactionHash;
-          safeObserver.next({
-            message: obsBridgeMessages.RECEIVE_TX_SUCCESS,
-            txHash: receiveTxHash,
-          });
-        }
-
-        // done
-        safeObserver.complete();
-      } catch (error) {
-        debug('obsBridgeToMainchain()', error);
-        safeObserver.error(error);
-      }
-    };
-    bridgeToken();
-    safeObserver.unsub = () => {
-      abort = true;
-      if (stopWatchPromise) {
-        stopWatchPromise();
-      }
-    };
-    return safeObserver.unsubscribe.bind(safeObserver);
-  });
-
-export const bridgeToMainchain = async (
-  contracts = throwIfMissing(),
-  bridgeAddress = throwIfMissing(),
-  nRlcAmount = throwIfMissing(),
-  { mainchainBridgeAddress, bridgedContracts } = {},
-) => {
-  checkImplementedOnChain(
-    contracts.chainId,
-    CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE,
-  );
-  checkSigner(contracts);
-  let sendTxHash;
-  let receiveTxHash;
-  try {
-    await new Promise((resolve, reject) => {
-      obsBridgeToMainchain(contracts, bridgeAddress, nRlcAmount, {
-        mainchainBridgeAddress,
-        bridgedContracts,
-      }).subscribe({
-        next: ({ message, ...data }) => {
-          if (message === obsBridgeMessages.SEND_TO_BRIDGE_TX_SUCCESS) {
-            sendTxHash = data.txHash;
-          }
-          if (message === obsBridgeMessages.RECEIVE_TX_SUCCESS) {
-            receiveTxHash = data.txHash;
-          }
-          debug(message, data);
-        },
-        error: reject,
-        complete: resolve,
-      });
-    });
-    return { sendTxHash, receiveTxHash };
-  } catch (error) {
-    debug('bridgeToMainchain()', error);
-    if (sendTxHash) throw new BridgeError(error, sendTxHash);
-    throw error;
-  }
-};
diff --git a/src/common/wallet/send.js b/src/common/wallet/send.js
index 71bd6070..99e3a3e8 100644
--- a/src/common/wallet/send.js
+++ b/src/common/wallet/send.js
@@ -1,11 +1,6 @@
 import Debug from 'debug';
 import BN from 'bn.js';
-import {
-  bigIntToBn,
-  bnToBigInt,
-  bnNRlcToBnWei,
-  checkSigner,
-} from '../utils/utils.js';
+import { bigIntToBn, bnToBigInt, checkSigner } from '../utils/utils.js';
 import {
   addressSchema,
   uint256Schema,
@@ -27,18 +22,13 @@ const sendNativeToken = async (
 ) => {
   try {
     checkSigner(contracts);
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(to);
+    const vAddress = await addressSchema().required().validate(to);
     const vValue = await uint256Schema().required().validate(value);
     const tx = await wrapSend(
       contracts.signer.sendTransaction({
         data: '0x',
         to: vAddress,
         value: BigInt(vValue),
-        ...contracts.txOptions,
         ...gasFees,
       }),
     );
@@ -52,16 +42,12 @@ const sendNativeToken = async (
 
 const sendERC20 = async (contracts = throwIfMissing(), nRlcAmount, to) => {
   checkSigner(contracts);
-  const vAddress = await addressSchema({
-    ethProvider: contracts.provider,
-  })
-    .required()
-    .validate(to);
+  const vAddress = await addressSchema().required().validate(to);
   const vAmount = await nRlcAmountSchema().required().validate(nRlcAmount);
   try {
     const rlcContract = await wrapCall(contracts.fetchTokenContract());
     const tx = await wrapSend(
-      rlcContract.transfer(vAddress, bnToBigInt(vAmount), contracts.txOptions),
+      rlcContract.transfer(vAddress, bnToBigInt(vAmount)),
     );
     await wrapWait(tx.wait(contracts.confirms));
     return tx.hash;
@@ -74,14 +60,8 @@ const sendERC20 = async (contracts = throwIfMissing(), nRlcAmount, to) => {
 export const sendETH = async (contracts = throwIfMissing(), amount, to) => {
   try {
     checkSigner(contracts);
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(to);
+    const vAddress = await addressSchema().required().validate(to);
     const vAmount = await weiAmountSchema().required().validate(amount);
-    if (contracts.isNative)
-      throw new Error('sendETH() is disabled on sidechain, use sendRLC()');
     const balance = await getEthBalance(contracts, await getAddress(contracts));
     if (balance.lt(new BN(vAmount))) {
       throw new Error('Amount to send exceed wallet balance');
@@ -96,21 +76,12 @@ export const sendETH = async (contracts = throwIfMissing(), amount, to) => {
 export const sendRLC = async (contracts = throwIfMissing(), nRlcAmount, to) => {
   try {
     checkSigner(contracts);
-    const vAddress = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(to);
+    const vAddress = await addressSchema().required().validate(to);
     const vAmount = await nRlcAmountSchema().required().validate(nRlcAmount);
     const balance = await getRlcBalance(contracts, await getAddress(contracts));
     if (balance.lt(new BN(vAmount))) {
       throw new Error('Amount to send exceed wallet balance');
     }
-    if (contracts.isNative) {
-      debug('send native token');
-      const weiValue = bnNRlcToBnWei(new BN(vAmount)).toString();
-      return await sendNativeToken(contracts, weiValue, vAddress);
-    }
     debug('send ERC20 token');
     return await sendERC20(contracts, vAmount, vAddress);
   } catch (error) {
@@ -122,11 +93,7 @@ export const sendRLC = async (contracts = throwIfMissing(), nRlcAmount, to) => {
 export const sweep = async (contracts = throwIfMissing(), to) => {
   try {
     checkSigner(contracts);
-    const vAddressTo = await addressSchema({
-      ethProvider: contracts.provider,
-    })
-      .required()
-      .validate(to);
+    const vAddressTo = await addressSchema().required().validate(to);
     const userAddress = await getAddress(contracts);
     const code = await contracts.provider.getCode(vAddressTo);
     if (code !== '0x') {
@@ -135,7 +102,7 @@ export const sweep = async (contracts = throwIfMissing(), to) => {
     let balances = await checkBalances(contracts, userAddress);
     const res = {};
     const errors = [];
-    if (!contracts.isNative && balances.nRLC.gt(new BN(0))) {
+    if (balances.nRLC.gt(new BN(0))) {
       try {
         const sendERC20TxHash = await sendERC20(
           contracts,
@@ -154,24 +121,16 @@ export const sweep = async (contracts = throwIfMissing(), to) => {
     }
 
     let maxGasPrice;
-    const gasFees = {
-      gasPrice: contracts.txOptions && contracts.txOptions.gasPrice,
-    };
-    if (gasFees.gasPrice === undefined) {
-      const networkGasFees = await contracts.provider.getFeeData();
-      if (
-        (networkGasFees.gasPrice || 0n) < (networkGasFees.maxFeePerGas || 0n)
-      ) {
-        gasFees.gasPrice = undefined;
-        gasFees.maxFeePerGas = networkGasFees.maxFeePerGas || 0n;
-        gasFees.maxPriorityFeePerGas = gasFees.maxFeePerGas; // pay all
-      } else {
-        gasFees.gasPrice = networkGasFees.gasPrice || 0n;
-      }
-    }
-    if ((gasFees.gasPrice || 0n) < (gasFees.maxFeePerGas || 0n)) {
+    let gasFees = {};
+
+    const networkGasFees = await contracts.provider.getFeeData();
+    if ((networkGasFees.gasPrice || 0n) < (networkGasFees.maxFeePerGas || 0n)) {
+      gasFees.gasPrice = undefined;
+      gasFees.maxFeePerGas = networkGasFees.maxFeePerGas || 0n;
+      gasFees.maxPriorityFeePerGas = gasFees.maxFeePerGas; // pay all
       maxGasPrice = gasFees.maxFeePerGas;
     } else {
+      gasFees.gasPrice = networkGasFees.gasPrice || 0n;
       maxGasPrice = gasFees.gasPrice;
     }
 
diff --git a/src/lib/IExec.d.ts b/src/lib/IExec.d.ts
index 0cb68117..923abab6 100644
--- a/src/lib/IExec.d.ts
+++ b/src/lib/IExec.d.ts
@@ -7,7 +7,6 @@ import IExecAccountModule from './IExecAccountModule.js';
 import IExecAppModule from './IExecAppModule.js';
 import IExecDatasetModule from './IExecDatasetModule.js';
 import IExecDealModule from './IExecDealModule.js';
-import IExecENSModule from './IExecENSModule.js';
 import IExecHubModule from './IExecHubModule.js';
 import IExecNetworkModule from './IExecNetworkModule.js';
 import IExecOrderModule from './IExecOrderModule.js';
@@ -16,7 +15,6 @@ import IExecResultModule from './IExecResultModule.js';
 import IExecSecretsModule from './IExecSecretsModule.js';
 import IExecStorageModule from './IExecStorageModule.js';
 import IExecTaskModule from './IExecTaskModule.js';
-import IExecVoucherModule from './IExecVoucherModule.js';
 import IExecWalletModule from './IExecWalletModule.js';
 import IExecWorkerpoolModule from './IExecWorkerpoolModule.js';
 
@@ -40,10 +38,6 @@ export default class IExec extends IExecModule {
    * deal module
    */
   deal: IExecDealModule;
-  /**
-   * ens module
-   */
-  ens: IExecENSModule;
   /**
    * hub module
    */
@@ -76,10 +70,6 @@ export default class IExec extends IExecModule {
    * task module
    */
   task: IExecTaskModule;
-  /**
-   * voucher module
-   */
-  voucher: IExecVoucherModule;
   /**
    * wallet module
    */
diff --git a/src/lib/IExec.js b/src/lib/IExec.js
index 5df313df..6b52a5ce 100644
--- a/src/lib/IExec.js
+++ b/src/lib/IExec.js
@@ -3,7 +3,6 @@ import IExecAccountModule from './IExecAccountModule.js';
 import IExecAppModule from './IExecAppModule.js';
 import IExecDatasetModule from './IExecDatasetModule.js';
 import IExecDealModule from './IExecDealModule.js';
-import IExecENSModule from './IExecENSModule.js';
 import IExecHubModule from './IExecHubModule.js';
 import IExecNetworkModule from './IExecNetworkModule.js';
 import IExecOrderModule from './IExecOrderModule.js';
@@ -14,7 +13,6 @@ import IExecStorageModule from './IExecStorageModule.js';
 import IExecTaskModule from './IExecTaskModule.js';
 import IExecWalletModule from './IExecWalletModule.js';
 import IExecWorkerpoolModule from './IExecWorkerpoolModule.js';
-import IExecVoucherModule from './IExecVoucherModule.js';
 
 export default class IExec extends IExecModule {
   constructor(...args) {
@@ -33,8 +31,6 @@ export default class IExec extends IExecModule {
     this.result = IExecResultModule.fromConfig(this.config);
     this.secrets = IExecSecretsModule.fromConfig(this.config);
     this.storage = IExecStorageModule.fromConfig(this.config);
-    this.ens = IExecENSModule.fromConfig(this.config);
-    this.voucher = IExecVoucherModule.fromConfig(this.config);
     this.network = IExecNetworkModule.fromConfig(this.config);
   }
 }
diff --git a/src/lib/IExecAccountModule.d.ts b/src/lib/IExecAccountModule.d.ts
index 57d6d688..6d69d82d 100644
--- a/src/lib/IExecAccountModule.d.ts
+++ b/src/lib/IExecAccountModule.d.ts
@@ -3,7 +3,7 @@ export type * from './IExecConfig.js';
 
 import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
-import { Addressish, BN, NRLCAmount, TxHash } from '../common/types.js';
+import { Address, BN, NRLCAmount, TxHash } from '../common/types.js';
 
 /**
  * module exposing account methods
@@ -20,7 +20,7 @@ export default class IExecAccountModule extends IExecModule {
    * console.log('tx:', txHash);
    * ```
    */
-  approve(amount: NRLCAmount, spenderAddress: Addressish): Promise<TxHash>;
+  approve(amount: NRLCAmount, spenderAddress: Address): Promise<TxHash>;
   /**
    * checks the amount of allowance approved for the specified spender to use the account of the owner.
    *
@@ -31,8 +31,8 @@ export default class IExecAccountModule extends IExecModule {
    * ```
    */
   checkAllowance(
-    ownerAddress: Addressish,
-    spenderAddress: Addressish,
+    ownerAddress: Address,
+    spenderAddress: Address,
   ): Promise<NRLCAmount>;
   /**
    * **SIGNER REQUIRED**
@@ -45,7 +45,7 @@ export default class IExecAccountModule extends IExecModule {
    * console.log('tx:', txHash);
    * ```
    */
-  revokeApproval(spenderAddress: Addressish): Promise<TxHash>;
+  revokeApproval(spenderAddress: Address): Promise<TxHash>;
   /**
    * **SIGNER REQUIRED**
    *
@@ -82,17 +82,7 @@ export default class IExecAccountModule extends IExecModule {
    * console.log('Nano RLC locked:', balance.locked.toString());
    * ```
    */
-  checkBalance(address: Addressish): Promise<{ stake: BN; locked: BN }>;
-  /**
-   * check the account balance on bridged chain of specified address ie: when connected to mainnet, check the account ballance on bellecour
-   * example:
-   * ```js
-   * const balance = await checkBridgedBalance(ethAddress);
-   * console.log('Nano RLC staked:', balance.stake.toString());
-   * console.log('Nano RLC locked:', balance.locked.toString());
-   * ```
-   */
-  checkBridgedBalance(address: Addressish): Promise<{ stake: BN; locked: BN }>;
+  checkBalance(address: Address): Promise<{ stake: BN; locked: BN }>;
   /**
    * Create an IExecAccountModule instance using an IExecConfig instance
    */
diff --git a/src/lib/IExecAccountModule.js b/src/lib/IExecAccountModule.js
index 75f61ebb..b354036c 100644
--- a/src/lib/IExecAccountModule.js
+++ b/src/lib/IExecAccountModule.js
@@ -8,8 +8,6 @@ export default class IExecAccountModule extends IExecModule {
     super(...args);
     this.checkBalance = async (address) =>
       checkBalance(await this.config.resolveContractsClient(), address);
-    this.checkBridgedBalance = async (address) =>
-      checkBalance(await this.config.resolveBridgedContractsClient(), address);
     this.deposit = async (nRlcAmount) =>
       deposit(await this.config.resolveContractsClient(), nRlcAmount);
     this.withdraw = async (nRlcAmount) =>
diff --git a/src/lib/IExecAppModule.d.ts b/src/lib/IExecAppModule.d.ts
index 2c5aa938..c0467447 100644
--- a/src/lib/IExecAppModule.d.ts
+++ b/src/lib/IExecAppModule.d.ts
@@ -5,58 +5,18 @@ import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
 import {
   Address,
-  Addressish,
   BN,
   BNish,
   Bytes32,
   Multiaddress,
-  TeeFramework,
   TxHash,
 } from '../common/types.js';
 
-export interface SconeMREnclave {
-  /**
-   * TEE framework name 'SCONE'
-   */
-  framework: string;
-  /**
-   * app entrypoint path
-   */
-  entrypoint: string;
-  /**
-   * dedicated memory in bytes
-   */
-  heapSize: number;
-  /**
-   * framework's protocol version
-   */
-  version: string;
-  /**
-   * app tee fingerprint
-   */
-  fingerprint: string;
-}
-
-export interface GramineMREnclave {
-  /**
-   * TEE framework name 'GRAMINE'
-   */
-  framework: string;
-  /**
-   * framework's protocol version
-   */
-  version: string;
-  /**
-   * app tee fingerprint
-   */
-  fingerprint: string;
-}
-
 export interface AppDeploymentArgs {
   /**
    * the app owner
    */
-  owner: Addressish;
+  owner: Address;
   /**
    * a name for the app
    */
@@ -74,9 +34,9 @@ export interface AppDeploymentArgs {
    */
   checksum: Bytes32;
   /**
-   * optional for TEE apps only, specify the TEE protocol to use
+   * @deprecated used for legacy TEE apps only, should not be set for modern TEE apps
    */
-  mrenclave?: SconeMREnclave | GramineMREnclave;
+  mrenclave?: string;
 }
 /**
  * IExec app
@@ -103,7 +63,7 @@ export interface App {
    */
   appChecksum: Bytes32;
   /**
-   * for TEE apps only, specify the TEE protocol to use
+   * used for legacy TEE apps only, should be an empty string for modern TEE apps
    */
   appMREnclave: string;
   /**
@@ -161,7 +121,7 @@ export default class IExecAppModule extends IExecModule {
    * console.log('app deployed', isDeployed);
    * ```
    */
-  checkDeployedApp(appAddress: Addressish): Promise<Boolean>;
+  checkDeployedApp(appAddress: Address): Promise<Boolean>;
   /**
    * show a deployed app details
    *
@@ -171,7 +131,7 @@ export default class IExecAppModule extends IExecModule {
    * console.log('app:', app);
    * ```
    */
-  showApp(appAddress: Addressish): Promise<{ objAddress: Address; app: App }>;
+  showApp(appAddress: Address): Promise<{ objAddress: Address; app: App }>;
   /**
    * count the apps owned by an address.
    *
@@ -181,7 +141,7 @@ export default class IExecAppModule extends IExecModule {
    * console.log('app count:', count);
    * ```
    */
-  countUserApps(userAddress: Addressish): Promise<BN>;
+  countUserApps(userAddress: Address): Promise<BN>;
   /**
    * show deployed app details by index for specified user user
    *
@@ -193,7 +153,7 @@ export default class IExecAppModule extends IExecModule {
    */
   showUserApp(
     index: BNish,
-    address: Addressish,
+    address: Address,
   ): Promise<{ objAddress: Address; app: App }>;
   /**
    * check if a secret exists for the app in the Secret Management Service
@@ -207,10 +167,7 @@ export default class IExecAppModule extends IExecModule {
    * - each TEE framework comes with a distinct Secret Management Service, if not specified the TEE framework is inferred from the app
    *
    */
-  checkAppSecretExists(
-    appAddress: Addressish,
-    options?: { teeFramework?: TeeFramework },
-  ): Promise<boolean>;
+  checkAppSecretExists(appAddress: Address): Promise<boolean>;
   /**
    * **SIGNER REQUIRED, ONLY APP OWNER**
    *
@@ -227,11 +184,7 @@ export default class IExecAppModule extends IExecModule {
    * console.log('pushed App secret:', isPushed);
    * ```
    */
-  pushAppSecret(
-    appAddress: Addressish,
-    secretValue: String,
-    options?: { teeFramework?: TeeFramework },
-  ): Promise<boolean>;
+  pushAppSecret(appAddress: Address, secretValue: String): Promise<boolean>;
   /**
    * **ONLY APP OWNER**
    *
@@ -246,8 +199,8 @@ export default class IExecAppModule extends IExecModule {
    * ```
    */
   transferApp(
-    appAddress: Addressish,
-    to: Addressish,
+    appAddress: Address,
+    to: Address,
   ): Promise<{ address: Address; to: Address; txHash: TxHash }>;
   /**
    * Create an IExecAppModule instance using an IExecConfig instance
diff --git a/src/lib/IExecAppModule.js b/src/lib/IExecAppModule.js
index f27c8126..094f540a 100644
--- a/src/lib/IExecAppModule.js
+++ b/src/lib/IExecAppModule.js
@@ -6,7 +6,6 @@ import {
   countUserApps,
   predictAppAddress,
   checkDeployedApp,
-  resolveTeeFrameworkFromApp,
   transferApp,
 } from '../common/protocol/registries.js';
 import { checkAppSecretExists } from '../common/sms/check.js';
@@ -28,37 +27,16 @@ export default class IExecAppModule extends IExecModule {
       );
     this.countUserApps = async (address) =>
       countUserApps(await this.config.resolveContractsClient(), address);
-    this.checkAppSecretExists = async (appAddress, { teeFramework } = {}) => {
-      let appTeeFramework = teeFramework;
-      if (appTeeFramework === undefined) {
-        const { app } = await showApp(
-          await this.config.resolveContractsClient(),
-          appAddress,
-        );
-        appTeeFramework = await resolveTeeFrameworkFromApp(app);
-      }
+    this.checkAppSecretExists = async (appAddress) => {
       return checkAppSecretExists(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework: appTeeFramework }),
+        await this.config.resolveSmsURL(),
         appAddress,
       );
     };
-    this.pushAppSecret = async (
-      appAddress,
-      appSecret,
-      { teeFramework } = {},
-    ) => {
-      let appTeeFramework = teeFramework;
-      if (appTeeFramework === undefined) {
-        const { app } = await showApp(
-          await this.config.resolveContractsClient(),
-          appAddress,
-        );
-        appTeeFramework = await resolveTeeFrameworkFromApp(app);
-      }
+    this.pushAppSecret = async (appAddress, appSecret) => {
       return pushAppSecret(
         await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework: appTeeFramework }),
+        await this.config.resolveSmsURL(),
         appAddress,
         appSecret,
       );
diff --git a/src/lib/IExecConfig.d.ts b/src/lib/IExecConfig.d.ts
index 8f04674a..b684605e 100644
--- a/src/lib/IExecConfig.d.ts
+++ b/src/lib/IExecConfig.d.ts
@@ -2,7 +2,6 @@ export type * from '../common/types.js';
 export type * from './IExecConfig.js';
 
 import IExecContractsClient from '../common/utils/IExecContractsClient.js';
-import { AnyRecord, ProviderOptions, TeeFramework } from '../common/types.js';
 import { AbstractProvider, AbstractSigner, BrowserProvider } from 'ethers';
 
 export interface Eip1193Provider {
@@ -16,16 +15,15 @@ export interface IExecConfigArgs {
    * A web3 Eth provider, a network name, a chain id or an ethers provider
    *
    * read-only provider examples:
-   * - `"mainnet"` or `1` or `"1"` for ethereum mainnet provider
-   * - `"bellecour"` or `134` or `"134"` for iExec sidechain
+   * - `"arbitrum-sepolia-testnet"` or `421614` or `"421614"` for arbitrum sepolia testnet provider
    * - `"arbitrum-mainnet"` or `42161` or `"42161"` for arbitrum mainnet provider
    * - `"http://localhost:8545"` for local chain
-   * - `new ethers.JsonRpcProvider("https://bellecour.iex.ec")` ethers provider connected to bellecour
+   * - `new ethers.JsonRpcProvider("https://<rpc-provider>")` ethers provider connected to your RPC provider
    *
    * signer provider examples:
    * - `window.ethereum` for browser injected wallet provider
-   * - `utils.getSignerFromPrivateKey('bellecour', PRIVATE_KEY)` signer connected to bellecour
-   * - `new ethers.Wallet(PRIVATE_KEY, new ethers.JsonRpcProvider("https://bellecour.iex.ec"))` ethers wallet connected to bellecour
+   * - `utils.getSignerFromPrivateKey('arbitrum-sepolia-testnet', PRIVATE_KEY)` signer connected to arbitrum sepolia testnet using a private key
+   * - `new ethers.Wallet(PRIVATE_KEY, new ethers.JsonRpcProvider("https://<rpc-provider>"))` ethers wallet connected to a specific network
    */
   ethProvider:
     | Eip1193Provider
@@ -37,63 +35,14 @@ export interface IExecConfigArgs {
 }
 
 export interface IExecConfigOptions {
-  /**
-   * true if IExec contract use the chain native token (default false)
-   */
-  isNative?: boolean;
-  /**
-   * if false set the gasPrice to 0 (default true)
-   */
-  useGas?: boolean;
   /**
    * override the IExec contract address to target a custom instance
    */
   hubAddress?: string;
-  /**
-   * override the ENS public resolver contract address to target a custom instance
-   */
-  ensPublicResolverAddress?: string;
-  /**
-   * override the VoucherHub contract address to target a custom instance
-   */
-  voucherHubAddress?: string;
-  /**
-   * override the bridge contract address to target a custom instance
-   */
-  bridgeAddress?: string;
-  /**
-   * override the bridged network configuration
-   */
-  bridgedNetworkConf?: {
-    /**
-     * bridged network chainId
-     */
-    chainId?: number | string;
-    /**
-     * bridged network node url
-     */
-    rpcURL?: string;
-    /**
-     * IExec contract address on bridged network
-     */
-    hubAddress?: string;
-    /**
-     * bridge contract address on bridged network
-     */
-    bridgeAddress?: string;
-  };
-  /**
-   * override the result proxy URL to target a custom instance
-   */
-  resultProxyURL?: string;
   /**
    * override the SMS URL to target a custom instance
    */
-  smsURL?: Record<TeeFramework, string> | string;
-  /**
-   * override the TEE framework to use when as default
-   */
-  defaultTeeFramework?: TeeFramework;
+  smsURL?: string;
   /**
    * override the IPFS gateway URL to target a custom instance
    */
@@ -116,18 +65,10 @@ export interface IExecConfigOptions {
    * override the PoCo subgraph URL to target a custom instance
    */
   pocoSubgraphURL?: string;
-  /**
-   * override the voucher subgraph URL to target a custom instance
-   */
-  voucherSubgraphURL?: string;
   /**
    * number of block to wait for transactions confirmation (default 1)
    */
   confirms?: number;
-  /**
-   * [ethers default provider](https://docs.ethers.io/v5/api/providers/#providers-getDefaultProvider) options
-   */
-  providerOptions?: ProviderOptions | AnyRecord;
   /**
    * if true allows using a provider connected to an experimental networks (default false)
    *
@@ -168,7 +109,7 @@ export default class IExecConfig {
    *
    * ```js
    * import { getSignerFromPrivateKey } from 'iexec/utils';
-   * const config = new IExecConfig({ ethProvider: getSignerFromPrivateKey('mainnet', privateKey) });
+   * const config = new IExecConfig({ ethProvider: getSignerFromPrivateKey('arbitrum-sepolia-testnet', privateKey) });
    * ```
    */
   constructor(args: IExecConfigArgs, options?: IExecConfigOptions);
@@ -180,18 +121,10 @@ export default class IExecConfig {
    * resolve the current IExecContractsClient
    */
   resolveContractsClient(): Promise<IExecContractsClient>;
-  /**
-   * resolve the current bridged IExecContractsClient
-   */
-  resolveBridgedContractsClient(): Promise<IExecContractsClient>;
   /**
    * resolve the current SMS URL
    */
-  resolveSmsURL(options?: { teeFramework?: TeeFramework }): Promise<string>;
-  /**
-   * resolve the current result proxy URL
-   */
-  resolveResultProxyURL(): Promise<string>;
+  resolveSmsURL(): Promise<string>;
   /**
    * resolve the current IExec market URL
    */
@@ -213,26 +146,4 @@ export default class IExecConfig {
    * resolve the current PoCo subgraph URL
    */
   resolvePocoSubgraphURL(): Promise<string>;
-  /**
-   * resolve the current voucher subgraph URL
-   * returns `null` if not available
-   */
-  resolveVoucherSubgraphURL(): Promise<string | null>;
-  /**
-   * resolve the current bridge contract address
-   */
-  resolveBridgeAddress(): Promise<string>;
-  /**
-   * resolve the bridge contract address on bridged chain
-   */
-  resolveBridgeBackAddress(): Promise<string>;
-  /**
-   * resolve the current ENS public resolver contract address
-   */
-  resolveEnsPublicResolverAddress(): Promise<string>;
-  /**
-   * resolve the current VoucherHub contract address
-   * returns `null` if not available
-   */
-  resolveVoucherHubAddress(): Promise<string | null>;
 }
diff --git a/src/lib/IExecConfig.js b/src/lib/IExecConfig.js
index 1e2e3001..576f99fb 100644
--- a/src/lib/IExecConfig.js
+++ b/src/lib/IExecConfig.js
@@ -3,38 +3,24 @@ import { BrowserProvider, AbstractProvider, AbstractSigner } from 'ethers';
 import IExecContractsClient from '../common/utils/IExecContractsClient.js';
 import { ConfigurationError } from '../common/utils/errors.js';
 import { getChainDefaults } from '../common/utils/config.js';
-import { TEE_FRAMEWORKS } from '../common/utils/constant.js';
 import { getReadOnlyProvider } from '../common/utils/providers.js';
 import { BrowserProviderSignerAdapter } from '../common/utils/signers.js';
-import {
-  smsUrlOrMapSchema,
-  teeFrameworkSchema,
-} from '../common/utils/validator.js';
+import { basicUrlSchema } from '../common/utils/validator.js';
 
 const debug = Debug('iexec:IExecConfig');
 
 export default class IExecConfig {
   constructor(
-    { ethProvider } = {},
+    { ethProvider } = {}, // TODO DEPRECATE pass ethProvider as first argument
     {
       hubAddress,
-      ensPublicResolverAddress,
-      voucherHubAddress,
-      isNative,
-      useGas = true,
       confirms,
-      bridgeAddress,
-      bridgedNetworkConf = {},
       smsURL,
-      resultProxyURL,
       ipfsGatewayURL,
       ipfsNodeURL,
       iexecGatewayURL,
       compassURL,
       pocoSubgraphURL,
-      voucherSubgraphURL,
-      defaultTeeFramework,
-      providerOptions,
       allowExperimentalNetworks = false,
     } = {},
   ) {
@@ -78,7 +64,6 @@ export default class IExecConfig {
     try {
       if (isRpcUrlProvider) {
         provider = getReadOnlyProvider(ethProvider, {
-          providers: providerOptions,
           allowExperimentalNetworks,
         });
       } else if (isEthersAbstractSignerWithProvider) {
@@ -101,21 +86,46 @@ export default class IExecConfig {
     } catch (err) {
       throw new ConfigurationError(`Invalid ethProvider: ${err.message}`);
     }
-    let vSmsUrlOrMap;
+    let vSmsUrl;
     try {
-      vSmsUrlOrMap = smsUrlOrMapSchema().validateSync(smsURL);
+      vSmsUrl = basicUrlSchema().validateSync(smsURL);
     } catch (err) {
       throw new ConfigurationError(`Invalid smsURL: ${err.message}`);
     }
 
-    let vDefaultTeeFramework;
+    let vIexecGatewayURL;
     try {
-      vDefaultTeeFramework =
-        teeFrameworkSchema().validateSync(defaultTeeFramework);
+      vIexecGatewayURL = basicUrlSchema().validateSync(iexecGatewayURL);
     } catch (err) {
-      throw new ConfigurationError(
-        `Invalid defaultTeeFramework: ${err.message}`,
-      );
+      throw new ConfigurationError(`Invalid iexecGatewayURL: ${err.message}`);
+    }
+
+    let vIpfsGatewayURL;
+    try {
+      vIpfsGatewayURL = basicUrlSchema().validateSync(ipfsGatewayURL);
+    } catch (err) {
+      throw new ConfigurationError(`Invalid ipfsGatewayURL: ${err.message}`);
+    }
+
+    let vIpfsNodeURL;
+    try {
+      vIpfsNodeURL = basicUrlSchema().validateSync(ipfsNodeURL);
+    } catch (err) {
+      throw new ConfigurationError(`Invalid ipfsNodeURL: ${err.message}`);
+    }
+
+    let vPocoSubgraphURL;
+    try {
+      vPocoSubgraphURL = basicUrlSchema().validateSync(pocoSubgraphURL);
+    } catch (err) {
+      throw new ConfigurationError(`Invalid pocoSubgraphURL: ${err.message}`);
+    }
+
+    let vCompassURL;
+    try {
+      vCompassURL = basicUrlSchema().validateSync(compassURL);
+    } catch (err) {
+      throw new ConfigurationError(`Invalid compassURL: ${err.message}`);
     }
 
     const networkPromise = (async () => {
@@ -123,9 +133,7 @@ export default class IExecConfig {
         throw new Error(`Failed to detect network: ${err.message}`);
       });
       const { chainId, name } = network;
-      const ensPlugin = network.getPlugin('org.ethers.plugins.network.Ens');
-      const ensAddress = ensPlugin ? ensPlugin.address : undefined;
-      return { chainId: Number(chainId), name, ensAddress };
+      return { chainId: Number(chainId), name };
     })();
 
     networkPromise.catch((err) => {
@@ -158,9 +166,7 @@ export default class IExecConfig {
           provider,
           signer,
           hubAddress: resolvedHubAddress,
-          useGas,
           confirms,
-          isNative,
         });
       } catch (err) {
         throw new ConfigurationError(
@@ -173,105 +179,14 @@ export default class IExecConfig {
       debug('contractsPromise', err);
     });
 
-    const bridgedConfPromise = (async () => {
-      const { chainId } = await networkPromise;
-      const chainConfDefaults = await chainConfDefaultsPromise;
-      const isBridged =
-        Object.getOwnPropertyNames(bridgedNetworkConf).length > 0 ||
-        chainConfDefaults.bridge;
-      if (!isBridged) {
-        throw new ConfigurationError(
-          `bridgedNetworkConf option not set and no default value for your chain ${chainId}`,
-        );
-      }
-      const bridgedChainId =
-        bridgedNetworkConf.chainId ?? chainConfDefaults.bridge?.bridgedChainId;
-      if (!bridgedChainId) {
-        throw new ConfigurationError(
-          `Missing chainId in bridgedNetworkConf and no default value for your chain ${chainId}`,
-        );
-      }
-      const bridgedChainConfDefaults = getChainDefaults(bridgedChainId, {
-        allowExperimentalNetworks,
-      });
-      const bridgedRpcUrl =
-        bridgedNetworkConf.rpcURL ?? bridgedChainConfDefaults.host;
-      if (!bridgedRpcUrl) {
-        throw new ConfigurationError(
-          `Missing rpcURL in bridgedNetworkConf and no default value for bridged chain ${bridgedChainId}`,
-        );
-      }
-      const bridgedBridgeAddress =
-        bridgedNetworkConf.bridgeAddress ??
-        bridgedChainConfDefaults.bridge?.contract;
-      if (!bridgedBridgeAddress) {
-        throw new ConfigurationError(
-          `Missing bridgeAddress in bridgedNetworkConf and no default value for bridged chain ${bridgedChainId}`,
-        );
-      }
-      const bridgedHubAddress =
-        bridgedNetworkConf.hubAddress ?? bridgedChainConfDefaults.hub;
-      const contracts = await contractsPromise;
-      return {
-        chainId: bridgedChainId,
-        rpcURL: bridgedRpcUrl,
-        isNative: !contracts.isNative,
-        hubAddress: bridgedHubAddress,
-        bridgeAddress: bridgedBridgeAddress,
-      };
-    })();
-
-    bridgedConfPromise.catch((err) => {
-      debug('bridgedConfPromise', err);
-    });
-
-    const bridgedContractsPromise = (async () => {
-      const bridgedConf = await bridgedConfPromise;
-      const { hubAddress, chainId, isNative, rpcURL } = bridgedConf;
-      if (!hubAddress) {
-        throw new ConfigurationError(
-          `Missing hubAddress in bridgedNetworkConf and no default value for bridged chain ${chainId}`,
-        );
-      }
-      try {
-        return new IExecContractsClient({
-          chainId,
-          provider: getReadOnlyProvider(rpcURL, {
-            providers: providerOptions,
-            allowExperimentalNetworks,
-          }),
-          hubAddress,
-          confirms,
-          isNative,
-        });
-      } catch (err) {
-        throw new ConfigurationError(
-          `Failed to create bridged contracts client: ${err.message}`,
-        );
-      }
-    })();
-    bridgedContractsPromise.catch((err) => {
-      debug('bridgedContractsPromise', err);
-    });
-
     this.resolveChainId = async () => (await networkPromise).chainId;
 
     this.resolveContractsClient = async () => contractsPromise;
 
-    this.resolveBridgedContractsClient = async () => bridgedContractsPromise;
-
-    this.resolveSmsURL = async ({
-      teeFramework = vDefaultTeeFramework || TEE_FRAMEWORKS.SCONE,
-    } = {}) => {
+    this.resolveSmsURL = async () => {
       const { chainId } = await networkPromise;
       const chainConfDefaults = await chainConfDefaultsPromise;
-      const vTeeFramework = await teeFrameworkSchema()
-        .label('teeFramework')
-        .validate(teeFramework);
-      const value =
-        (typeof vSmsUrlOrMap === 'string' && vSmsUrlOrMap) ||
-        (typeof vSmsUrlOrMap === 'object' && vSmsUrlOrMap[vTeeFramework]) ||
-        (chainConfDefaults.sms && chainConfDefaults.sms[vTeeFramework]);
+      const value = vSmsUrl || chainConfDefaults.sms;
       if (value !== undefined) {
         return value;
       }
@@ -280,22 +195,10 @@ export default class IExecConfig {
       );
     };
 
-    this.resolveResultProxyURL = async () => {
-      const { chainId } = await networkPromise;
-      const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = resultProxyURL || chainConfDefaults.resultProxy;
-      if (value !== undefined) {
-        return value;
-      }
-      throw new ConfigurationError(
-        `resultProxyURL option not set and no default value for your chain ${chainId}`,
-      );
-    };
-
     this.resolveIexecGatewayURL = async () => {
       const { chainId } = await networkPromise;
       const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = iexecGatewayURL || chainConfDefaults.iexecGateway;
+      const value = vIexecGatewayURL || chainConfDefaults.iexecGateway;
       if (value !== undefined) {
         return value;
       }
@@ -306,13 +209,13 @@ export default class IExecConfig {
 
     this.resolveCompassURL = async () => {
       const chainConfDefaults = await chainConfDefaultsPromise;
-      return compassURL || chainConfDefaults.compass;
+      return vCompassURL || chainConfDefaults.compass;
     };
 
     this.resolveIpfsGatewayURL = async () => {
       const { chainId } = await networkPromise;
       const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = ipfsGatewayURL || chainConfDefaults.ipfsGateway;
+      const value = vIpfsGatewayURL || chainConfDefaults.ipfsGateway;
       if (value !== undefined) {
         return value;
       }
@@ -324,7 +227,7 @@ export default class IExecConfig {
     this.resolveIpfsNodeURL = async () => {
       const { chainId } = await networkPromise;
       const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = ipfsNodeURL || chainConfDefaults.ipfsNode;
+      const value = vIpfsNodeURL || chainConfDefaults.ipfsNode;
       if (value !== undefined) {
         return value;
       }
@@ -336,7 +239,7 @@ export default class IExecConfig {
     this.resolvePocoSubgraphURL = async () => {
       const { chainId } = await networkPromise;
       const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = pocoSubgraphURL || chainConfDefaults.pocoSubgraph;
+      const value = vPocoSubgraphURL || chainConfDefaults.pocoSubgraph;
       if (value !== undefined) {
         return value;
       }
@@ -344,55 +247,5 @@ export default class IExecConfig {
         `pocoSubgraphURL option not set and no default value for your chain ${chainId}`,
       );
     };
-
-    this.resolveVoucherSubgraphURL = async () => {
-      const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = voucherSubgraphURL || chainConfDefaults.voucherSubgraph;
-      if (value !== undefined) {
-        return value;
-      }
-      return null;
-    };
-
-    this.resolveBridgeAddress = async () => {
-      const { chainId } = await networkPromise;
-      const chainConfDefaults = await chainConfDefaultsPromise;
-      const value =
-        bridgeAddress ||
-        (chainConfDefaults.bridge && chainConfDefaults.bridge.contract);
-      if (value !== undefined) {
-        return value;
-      }
-      throw new ConfigurationError(
-        `bridgeAddress option not set and no default value for your chain ${chainId}`,
-      );
-    };
-
-    this.resolveBridgeBackAddress = async () => {
-      const bridgedChainConf = await bridgedConfPromise;
-      return bridgedChainConf.bridgeAddress;
-    };
-
-    this.resolveEnsPublicResolverAddress = async () => {
-      const { chainId } = await networkPromise;
-      const chainConfDefaults = await chainConfDefaultsPromise;
-      const value =
-        ensPublicResolverAddress || chainConfDefaults.ensPublicResolver;
-      if (value !== undefined) {
-        return value;
-      }
-      throw new ConfigurationError(
-        `ensPublicResolverAddress option not set and no default value for your chain ${chainId}`,
-      );
-    };
-
-    this.resolveVoucherHubAddress = async () => {
-      const chainConfDefaults = await chainConfDefaultsPromise;
-      const value = voucherHubAddress || chainConfDefaults.voucherHub;
-      if (value !== undefined) {
-        return value;
-      }
-      return null;
-    };
   }
 }
diff --git a/src/lib/IExecDatasetModule.d.ts b/src/lib/IExecDatasetModule.d.ts
index 269caf63..3bb4baf6 100644
--- a/src/lib/IExecDatasetModule.d.ts
+++ b/src/lib/IExecDatasetModule.d.ts
@@ -5,20 +5,18 @@ import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
 import {
   Address,
-  Addressish,
   BN,
   BNish,
   Bytes32,
   Multiaddress,
   TxHash,
-  TeeFramework,
 } from '../common/types.js';
 
 export interface DatasetDeploymentArgs {
   /**
    * the dataset owner
    */
-  owner: Addressish;
+  owner: Address;
   /**
    * a name for the dataset
    */
@@ -106,7 +104,7 @@ export default class IExecDatasetModule extends IExecModule {
    * console.log('dataset deployed', isDeployed);
    * ```
    */
-  checkDeployedDataset(datasetAddress: Addressish): Promise<Boolean>;
+  checkDeployedDataset(datasetAddress: Address): Promise<Boolean>;
   /**
    * show a deployed dataset details
    *
@@ -117,7 +115,7 @@ export default class IExecDatasetModule extends IExecModule {
    * ```
    */
   showDataset(
-    datasetAddress: Addressish,
+    datasetAddress: Address,
   ): Promise<{ objAddress: Address; dataset: Dataset }>;
   /**
    * count the datasets owned by an address.
@@ -128,7 +126,7 @@ export default class IExecDatasetModule extends IExecModule {
    * console.log('dataset count:', count);
    * ```
    */
-  countUserDatasets(userAddress: Addressish): Promise<BN>;
+  countUserDatasets(userAddress: Address): Promise<BN>;
   /**
    * show deployed dataset details by index for specified user user
    *
@@ -140,7 +138,7 @@ export default class IExecDatasetModule extends IExecModule {
    */
   showUserDataset(
     index: BNish,
-    address: Addressish,
+    address: Address,
   ): Promise<{ objAddress: Address; dataset: Dataset }>;
   /**
    * generate an encryption key to encrypt a dataset
@@ -212,12 +210,7 @@ export default class IExecDatasetModule extends IExecModule {
    * console.log('secret exists:', isSecretSet);
    * ```
    */
-  checkDatasetSecretExists(
-    datasetAddress: Addressish,
-    options?: {
-      teeFramework?: TeeFramework;
-    },
-  ): Promise<boolean>;
+  checkDatasetSecretExists(datasetAddress: Address): Promise<boolean>;
   /**
    * **SIGNER REQUIRED, ONLY DATASET OWNER**
    *
@@ -232,11 +225,8 @@ export default class IExecDatasetModule extends IExecModule {
    * ```
    */
   pushDatasetSecret(
-    datasetAddress: Addressish,
+    datasetAddress: Address,
     encryptionKey: string,
-    options?: {
-      teeFramework?: TeeFramework;
-    },
   ): Promise<boolean>;
   /**
    * **ONLY DATASET OWNER**
@@ -252,8 +242,8 @@ export default class IExecDatasetModule extends IExecModule {
    * ```
    */
   transferDataset(
-    datasetAddress: Addressish,
-    to: Addressish,
+    datasetAddress: Address,
+    to: Address,
   ): Promise<{ address: Address; to: Address; txHash: TxHash }>;
   /**
    * Create an IExecDatasetModule instance using an IExecConfig instance
diff --git a/src/lib/IExecDatasetModule.js b/src/lib/IExecDatasetModule.js
index f8958677..96b27efd 100644
--- a/src/lib/IExecDatasetModule.js
+++ b/src/lib/IExecDatasetModule.js
@@ -37,23 +37,12 @@ export default class IExecDatasetModule extends IExecModule {
       );
     this.countUserDatasets = async (address) =>
       countUserDatasets(await this.config.resolveContractsClient(), address);
-    this.checkDatasetSecretExists = async (
-      datasetAddress,
-      { teeFramework } = {},
-    ) =>
-      checkWeb3SecretExists(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
-        datasetAddress,
-      );
-    this.pushDatasetSecret = async (
-      datasetAddress,
-      datasetSecret,
-      { teeFramework } = {},
-    ) =>
+    this.checkDatasetSecretExists = async (datasetAddress) =>
+      checkWeb3SecretExists(await this.config.resolveSmsURL(), datasetAddress);
+    this.pushDatasetSecret = async (datasetAddress, datasetSecret) =>
       pushWeb3Secret(
         await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
+        await this.config.resolveSmsURL(),
         datasetAddress,
         datasetSecret,
       );
diff --git a/src/lib/IExecDealModule.d.ts b/src/lib/IExecDealModule.d.ts
index 53045ff5..cee93287 100644
--- a/src/lib/IExecDealModule.d.ts
+++ b/src/lib/IExecDealModule.d.ts
@@ -6,7 +6,6 @@ import { Observable } from '../common/utils/reactive.js';
 import IExecModule from './IExecModule.js';
 import {
   Address,
-  Addressish,
   BN,
   BNish,
   Bytes,
@@ -245,20 +244,20 @@ export default class IExecDealModule extends IExecModule {
    * ```
    */
   fetchRequesterDeals(
-    requesterAddress: Addressish,
+    requesterAddress: Address,
     options?: {
       /**
        * filter by app
        */
-      appAddress?: Addressish;
+      appAddress?: Address;
       /**
        * filter by dataset
        */
-      datasetAddress?: Addressish;
+      datasetAddress?: Address;
       /**
        * filter by workerpool
        */
-      workerpoolAddress?: Addressish;
+      workerpoolAddress?: Address;
       /**
        * index of the page to fetch
        */
diff --git a/src/lib/IExecENSModule.d.ts b/src/lib/IExecENSModule.d.ts
deleted file mode 100644
index f183ea96..00000000
--- a/src/lib/IExecENSModule.d.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-export type * from '../common/types.js';
-export type * from './IExecConfig.js';
-
-import IExecConfig from './IExecConfig.js';
-import { Observable } from '../common/utils/reactive.js';
-import IExecModule from './IExecModule.js';
-import { Address, ENS, TxHash } from '../common/types.js';
-
-declare class ENSConfigurationObservable extends Observable {
-  /**
-   * subscribe and start the ENS configuration process until either `complete()` or `error(error: Error)` is called on the Observer or the subscribtion is canceled by calling the returned cancel method.
-   *
-   * return the `cancel: () => void` method.
-   *
-   * data:
-   * | message | comment | additional entries |
-   * | --- | --- | --- |
-   * | `DESCRIBE_WORKFLOW` | sent once | `addressType`,`steps` |
-   * | `SET_RESOLVER_TX_REQUEST` | sent once if resolver is not set | `name`,`resolverAddress` |
-   * | `SET_RESOLVER_TX_SENT` | sent once if resolver is not set | `txHash` |
-   * | `SET_RESOLVER_SUCCESS` | sent once | `name`,`resolverAddress` |
-   * | `SET_ADDR_TX_REQUEST` | sent once if addr is not set | `name`,`address` |
-   * | `SET_ADDR_TX_SENT` | sent once if addr is not set | `txHash` |
-   * | `SET_ADDR_SUCCESS` | sent once | `name`,`address` |
-   * | `SET_NAME_TX_REQUEST` | sent once if the name is not set | `name`,`address` |
-   * | `SET_NAME_TX_SENT` | sent once if the name is not set | `txHash` |
-   * | `SET_NAME_SUCCESS` | sent once | `name`,`address` |
-   */
-  subscribe(callbacks: {
-    /**
-     * callback fired at every configuration step
-     *
-     * data:
-     * | message | comment | additional entries |
-     * | --- | --- | --- |
-     * | `DESCRIBE_WORKFLOW` | sent once | `addressType`,`steps` |
-     * | `SET_RESOLVER_TX_REQUEST` | sent once if resolver is not set | `name`,`resolverAddress` |
-     * | `SET_RESOLVER_TX_SENT` | sent once if resolver is not set | `txHash` |
-     * | `SET_RESOLVER_SUCCESS` | sent once | `name`,`resolverAddress` |
-     * | `SET_ADDR_TX_REQUEST` | sent once if addr is not set | `name`,`address` |
-     * | `SET_ADDR_TX_SENT` | sent once if addr is not set | `txHash` |
-     * | `SET_ADDR_SUCCESS` | sent once | `name`,`address` |
-     * | `SET_NAME_TX_REQUEST` | sent once if the name is not set | `name`,`address` |
-     * | `SET_NAME_TX_SENT` | sent once if the name is not set | `txHash` |
-     * | `SET_NAME_SUCCESS` | sent once | `name`,`address` |
-     */
-    next?: (data: {
-      message:
-        | 'DESCRIBE_WORKFLOW'
-        | 'SET_RESOLVER_TX_REQUEST'
-        | 'SET_RESOLVER_TX_SENT'
-        | 'SET_RESOLVER_SUCCESS'
-        | 'SET_ADDR_TX_REQUEST'
-        | 'SET_ADDR_TX_SENT'
-        | 'SET_ADDR_SUCCESS'
-        | 'SET_NAME_TX_REQUEST'
-        | 'SET_NAME_TX_SENT'
-        | 'SET_NAME_SUCCESS';
-      addressType?: string;
-      steps?: string[];
-      name?: ENS;
-      resolverAddress?: Address;
-      address?: Address;
-      txHash?: TxHash;
-    }) => any;
-    /**
-     * callback fired once when the configuration is completed
-     *
-     * no other callback is fired after firing `complete()`
-     */
-    complete?: () => any;
-    /**
-     * callback fired once when an error occurs
-     *
-     * no other callback is fired after firing `error(error: Error)`
-     */
-    error?: (error: Error) => any;
-  }): /**
-   * `cancel: () => void` method, calling this method cancels the subscription and stops the configuration
-   *
-   * no callback is fired after calling this method
-   */
-  () => void;
-}
-
-/**
- * module exposing ENS methods
- */
-export default class IExecENSModule extends IExecModule {
-  /**
-   * get the address of the ENS name's owner.
-   *
-   * example:
-   * ```js
-   * const owner = await getOwner('iexec.eth');
-   * console.log('iexec.eth owner:', owner);
-   * ```
-   */
-  getOwner(name: ENS): Promise<Address | null>;
-  /**
-   * resolve the ENS name to an ethereum address if a resolver is configured for the name
-   *
-   * example:
-   * ```js
-   * const address = await resolveName('me.users.iexec.eth');
-   * console.log('me.users.iexec.eth:', address);
-   * ```
-   */
-  resolveName(name: ENS): Promise<Address | null>;
-  /**
-   * lookup to find the ENS name of an ethereum address
-   *
-   * example:
-   * ```js
-   * const name = await lookupAddress(address);
-   * console.log('ENS name:', name);
-   * ```
-   */
-  lookupAddress(address: Address): Promise<ENS | null>;
-  /**
-   * get the default free to use ENS domain given an address
-   *
-   * _NB_:
-   * - the ENS domain is determined by the nature of the address (app, dataset, workerpool, other)
-   * - the returned ENS domain is controlled by a FIFSRegistrar that allocates subdomains to the first person to claim them
-   *
-   * example:
-   * ```js
-   * const domain = await getDefaultDomain(address);
-   * console.log('default domain:', domain);
-   * ```
-   */
-  getDefaultDomain(address: Address): Promise<ENS>;
-  /**
-   * register a subdomain (label) on an ENS FIFSRegistrar
-   *
-   * _NB_:
-   * - if specifier, the domain must be controlled by a FIFSRegistrar, default "users.iexec.eth" (use `getDefaultDomain(address)` to determine the best suited domain for an address)
-   * - if the user already own the domain, the register transaction will not occur
-   *
-   * example:
-   * ```js
-   * const { name, registerTxHash } = claimName(
-   *   'me',
-   *   'users.iexec.eth',
-   * );
-   * console.log('registered:', name);
-   * ```
-   */
-  claimName(
-    label: string,
-    domain?: ENS,
-  ): Promise<{ name: ENS; registerTxHash?: TxHash }>;
-  /**
-   * **SIGNER REQUIRED, ONLY ENS NAME OWNER**
-   *
-   * return a cold Observable with a `subscribe` method to start and monitor the ENS resolution and reverse resolution configuration.
-   *
-   * calling the `subscribe` method on the observable will immediately return a cancel function and start the asynchronous ENS configuration.
-   *
-   * calling the returned cancel method will stop the configuration process
-   *
-   * _NB_:
-   * - `address` must be an iExec RegistryEntry address (ie: app, dataset or workerpool) or the user address, default user address
-   * - the configuration may require up to 4 transactions, depending on the target type (EOA or RegistryEntry) and the current state, some transaction may or may not occur to complete the configuration
-   *
-   * example:
-   * - EOA ENS configuration
-   * ```js
-   * const configureResolutionObservable = await obsConfigureResolution(
-   *   'me.users.iexec.eth',
-   * );
-   * configureResolutionObservable.subscribe({
-   *   error: console.error,
-   *   next: ({ message, ...rest }) =>
-   *     console.log(`${message} ${JSON.stringify(rest)}`),
-   *   completed: () => console.log('resolution configured'),
-   * });
-   * ```
-   * - iExec App contract ENS configuration
-   * ```js
-   * const configureResolutionObservable = await obsConfigureResolution(
-   *   'my-app.eth',
-   *    appAddress
-   * );
-   * configureResolutionObservable.subscribe({
-   *   error: console.error,
-   *   next: ({ message, ...rest }) =>
-   *     console.log(`${message} ${JSON.stringify(rest)}`),
-   *   completed: () => console.log('resolution configured'),
-   * });
-   * ```
-   */
-  obsConfigureResolution(
-    name: ENS,
-    address?: Address,
-  ): Promise<ENSConfigurationObservable>;
-  /**
-   * **SIGNER REQUIRED, ONLY ENS NAME OWNER**
-   *
-   * configure the ENS resolution and reverse resolution for an owned ENS name, same as `obsConfigureResolution` wrapped in a `Promise`.
-   *
-   * _NB_:
-   * - `address` must be an iExec RegistryEntry address (ie: app, dataset or workerpool) or the user address, default user address
-   * - the configuration may require up to 3 transactions, depending on the current state, some transaction may or may not occur to complete the configuration
-   *
-   * example:
-   * - EOA ENS configuration
-   * ```js
-   * const { address, name } = await configureResolution(
-   *   'me.users.iexec.eth',
-   * );
-   * console.log('configured resolution:', address, '<=>', name);
-   * ```
-   * - iExec App contract ENS configuration
-   * ```js
-   * const { address, name } = await configureResolution(
-   *   'my-app.eth',
-   *    appAddress
-   * );
-   * console.log('configured resolution:', address, '<=>', name);
-   * ```
-   */
-  configureResolution(
-    name: ENS,
-    address?: Address,
-  ): Promise<{
-    name: ENS;
-    address: Address;
-    setResolverTxHash?: TxHash;
-    setAddrTxHash?: TxHash;
-    setNameTxHash?: TxHash;
-  }>;
-  /**
-   * read an ENS text record associated to an ENS name
-   *
-   * example:
-   * ```js
-   * const value = await readTextRecord('me.users.iexec.eth', 'email');
-   * console.log('email record:', value);
-   * ```
-   */
-  readTextRecord(name: ENS, key: string): Promise<string>;
-  /**
-   * **ONLY ENS NAME OWNER**
-   *
-   * set a text record associated to an ENS name
-   *
-   * _NB_:
-   * - if value is not specified, the text record is reset to `""`
-   *
-   * example:
-   * ```js
-   * const txHash = setTextRecord(
-   *   'me.users.iexec.eth',
-   *   'email',
-   *   'me@iex.ec'
-   * );
-   * console.log('txHash:', txHash);
-   * ```
-   */
-  setTextRecord(name: ENS, key: string, value?: string): Promise<TxHash>;
-  /**
-   * Create an IExecENSModule instance using an IExecConfig instance
-   */
-  static fromConfig(config: IExecConfig): IExecENSModule;
-}
diff --git a/src/lib/IExecENSModule.js b/src/lib/IExecENSModule.js
deleted file mode 100644
index dd350e4c..00000000
--- a/src/lib/IExecENSModule.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import IExecModule from './IExecModule.js';
-import {
-  getOwner,
-  resolveName,
-  lookupAddress,
-} from '../common/ens/resolution.js';
-import {
-  registerFifsEns,
-  obsConfigureResolution,
-  configureResolution,
-  getDefaultDomain,
-} from '../common/ens/registration.js';
-import { setTextRecord, readTextRecord } from '../common/ens/text-record.js';
-
-export default class IExecENSModule extends IExecModule {
-  constructor(...args) {
-    super(...args);
-
-    this.getOwner = async (name) =>
-      getOwner(await this.config.resolveContractsClient(), name);
-    this.resolveName = async (name) =>
-      resolveName(await this.config.resolveContractsClient(), name);
-    this.lookupAddress = async (address) =>
-      lookupAddress(await this.config.resolveContractsClient(), address);
-    this.getDefaultDomain = async (address) =>
-      getDefaultDomain(await this.config.resolveContractsClient(), address);
-    this.claimName = async (label, domain) =>
-      registerFifsEns(
-        await this.config.resolveContractsClient(),
-        label,
-        domain,
-      );
-    this.obsConfigureResolution = async (name, address) =>
-      obsConfigureResolution(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveEnsPublicResolverAddress(),
-        name,
-        address,
-      );
-    this.configureResolution = async (name, address) =>
-      configureResolution(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveEnsPublicResolverAddress(),
-        name,
-        address,
-      );
-    this.setTextRecord = async (name, key, value) =>
-      setTextRecord(
-        await this.config.resolveContractsClient(),
-        name,
-        key,
-        value,
-      );
-    this.readTextRecord = async (name, key) =>
-      readTextRecord(await this.config.resolveContractsClient(), name, key);
-  }
-}
diff --git a/src/lib/IExecNetworkModule.d.ts b/src/lib/IExecNetworkModule.d.ts
index 4d93489b..76269baa 100644
--- a/src/lib/IExecNetworkModule.d.ts
+++ b/src/lib/IExecNetworkModule.d.ts
@@ -11,15 +11,13 @@ export default class IExecNetworkModule extends IExecModule {
   /**
    * get info about the current iExec network
    *
-   * _NB_: `isNative` is true when the iExec instance use the chain's native token for payment (otherwise the payment token is an ERC20)
-   *
    * example:
    * ```js
-   * const { chainId, isNative } = await getNetwork();
-   * console.log(`working on chain ${chainId}, using native token: ${isNative}`);
+   * const { chainId } = await getNetwork();
+   * console.log(`working on chain ${chainId}`);
    * ```
    */
-  getNetwork(): Promise<{ chainId: string; isNative: boolean }>;
+  getNetwork(): Promise<{ chainId: string }>;
   /**
    * Create an IExecNetworkModule instance using an IExecConfig instance
    */
diff --git a/src/lib/IExecNetworkModule.js b/src/lib/IExecNetworkModule.js
index 64347507..ee36a653 100644
--- a/src/lib/IExecNetworkModule.js
+++ b/src/lib/IExecNetworkModule.js
@@ -6,7 +6,7 @@ export default class IExecNetworkModule extends IExecModule {
 
     this.getNetwork = async () => {
       const contracts = await this.config.resolveContractsClient();
-      return { chainId: contracts.chainId, isNative: contracts.isNative };
+      return { chainId: contracts.chainId };
     };
   }
 }
diff --git a/src/lib/IExecOrderModule.d.ts b/src/lib/IExecOrderModule.d.ts
index 5c1cda9c..cce929f2 100644
--- a/src/lib/IExecOrderModule.d.ts
+++ b/src/lib/IExecOrderModule.d.ts
@@ -5,7 +5,6 @@ import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
 import {
   Address,
-  Addressish,
   BNish,
   Bytes,
   Bytes32,
@@ -253,10 +252,6 @@ export interface RequestorderParams {
    * default `'ipfs'`
    */
   iexec_result_storage_provider?: string;
-  /**
-   * result proxy url
-   */
-  iexec_result_storage_proxy?: string;
   /**
    * bulk CID for the request
    *
@@ -369,7 +364,7 @@ export default class IExecOrderModule extends IExecModule {
    * ```
    */
   createApporder(overrides: {
-    app: Addressish;
+    app: Address;
     /**
      * price per task
      *
@@ -393,19 +388,19 @@ export default class IExecOrderModule extends IExecModule {
      *
      * default no restrict
      */
-    datasetrestrict?: Addressish;
+    datasetrestrict?: Address;
     /**
      * restrict usage to a specific workerpool
      *
      * default no restrict
      */
-    workerpoolrestrict?: Addressish;
+    workerpoolrestrict?: Address;
     /**
      * restrict usage to a specific requester
      *
      * default no restrict
      */
-    requesterrestrict?: Addressish;
+    requesterrestrict?: Address;
   }): Promise<ApporderTemplate>;
   /**
    * create a datasetorder template with specified parameters
@@ -416,7 +411,7 @@ export default class IExecOrderModule extends IExecModule {
    * ```
    */
   createDatasetorder(overrides: {
-    dataset: Addressish;
+    dataset: Address;
     /**
      * price per task
      *
@@ -440,19 +435,19 @@ export default class IExecOrderModule extends IExecModule {
      *
      * default no restrict
      */
-    apprestrict?: Addressish;
+    apprestrict?: Address;
     /**
      * restrict usage to a specific workerpool
      *
      * default no restrict
      */
-    workerpoolrestrict?: Addressish;
+    workerpoolrestrict?: Address;
     /**
      * restrict usage to a specific requester
      *
      * default no restrict
      */
-    requesterrestrict?: Addressish;
+    requesterrestrict?: Address;
   }): Promise<DatasetorderTemplate>;
   /**
    * create a workerpoolorder template with specified parameters
@@ -463,7 +458,7 @@ export default class IExecOrderModule extends IExecModule {
    * ```
    */
   createWorkerpoolorder(overrides: {
-    workerpool: Addressish;
+    workerpool: Address;
     /**
      * computation category
      */
@@ -497,19 +492,19 @@ export default class IExecOrderModule extends IExecModule {
      *
      * default no restrict
      */
-    apprestrict?: Addressish;
+    apprestrict?: Address;
     /**
      * restrict usage to a specific dataset
      *
      * default no restrict
      */
-    datasetrestrict?: Addressish;
+    datasetrestrict?: Address;
     /**
      * restrict usage to a specific requester
      *
      * default no restrict
      */
-    requesterrestrict?: Addressish;
+    requesterrestrict?: Address;
   }): Promise<WorkerpoolorderTemplate>;
   /**
    * create a requestorder template with specified parameters
@@ -527,7 +522,7 @@ export default class IExecOrderModule extends IExecModule {
     /**
      * app to run
      */
-    app: Addressish;
+    app: Address;
     /**
      * computation category
      */
@@ -537,13 +532,13 @@ export default class IExecOrderModule extends IExecModule {
      *
      * default none
      */
-    dataset?: Addressish;
+    dataset?: Address;
     /**
      * run one specified workerpool
      *
      * default run on any workerpool
      */
-    workerpool?: Addressish;
+    workerpool?: Address;
     /**
      * execution parameters
      */
@@ -594,13 +589,13 @@ export default class IExecOrderModule extends IExecModule {
      *
      * default connected wallet address
      */
-    requester?: Addressish;
+    requester?: Address;
     /**
      * beneficiary
      *
      * default connected wallet address
      */
-    beneficiary?: Addressish;
+    beneficiary?: Address;
   }): Promise<RequestorderTemplate>;
   /**
    * **ONLY APP OWNER**
@@ -906,7 +901,7 @@ export default class IExecOrderModule extends IExecModule {
    * console.log('published order hash:', orderHash);
    * ```
    */
-  unpublishLastApporder(appAddress: Addressish): Promise<OrderHash>;
+  unpublishLastApporder(appAddress: Address): Promise<OrderHash>;
   /**
    * **SIGNER REQUIRED, ONLY DATASETORDER SIGNER**
    *
@@ -920,7 +915,7 @@ export default class IExecOrderModule extends IExecModule {
    * console.log('unpublished order hash:', orderHash);
    * ```
    */
-  unpublishLastDatasetorder(datasetAddress: Addressish): Promise<OrderHash>;
+  unpublishLastDatasetorder(datasetAddress: Address): Promise<OrderHash>;
   /**
    * ****SIGNER REQUIRED, ONLY WORKERPOOLORDER SIGNER**
    *
@@ -934,9 +929,7 @@ export default class IExecOrderModule extends IExecModule {
    * console.log('unpublished order hash:', orderHash);
    * ```
    */
-  unpublishLastWorkerpoolorder(
-    workerpoolAddress: Addressish,
-  ): Promise<OrderHash>;
+  unpublishLastWorkerpoolorder(workerpoolAddress: Address): Promise<OrderHash>;
   /**
    * **SIGNER REQUIRED, ONLY REQUESTER**
    *
@@ -964,7 +957,7 @@ export default class IExecOrderModule extends IExecModule {
    * console.log('published orders count:', orderHashes.length);
    * ```
    */
-  unpublishAllApporders(appAddress: Addressish): Promise<OrderHash[]>;
+  unpublishAllApporders(appAddress: Address): Promise<OrderHash[]>;
   /**
    * **SIGNER REQUIRED, ONLY DATASETORDER SIGNER**
    *
@@ -978,7 +971,7 @@ export default class IExecOrderModule extends IExecModule {
    * console.log('unpublished orders count:', orderHashes.length);
    * ```
    */
-  unpublishAllDatasetorders(datasetAddress: Addressish): Promise<OrderHash[]>;
+  unpublishAllDatasetorders(datasetAddress: Address): Promise<OrderHash[]>;
   /**
    * **SIGNER REQUIRED, ONLY WORKERPOOLORDER SIGNER**
    *
@@ -993,7 +986,7 @@ export default class IExecOrderModule extends IExecModule {
    * ```
    */
   unpublishAllWorkerpoolorders(
-    workerpoolAddress: Addressish,
+    workerpoolAddress: Address,
   ): Promise<OrderHash[]>;
   /**
    * **SIGNER REQUIRED, ONLY REQUESTER**
@@ -1034,16 +1027,6 @@ export default class IExecOrderModule extends IExecModule {
     },
     options?: {
       preflightCheck?: boolean;
-      /**
-       * use a voucher contract to sponsor the deal
-       */
-      useVoucher?: boolean;
-      /**
-       * override the voucher contract to use, must be combined with `useVoucher: true`
-       *
-       * the user must be authorized by the voucher's owner to use it
-       */
-      voucherAddress?: Addressish;
     },
   ): Promise<{ dealid: Dealid; volume: BN; txHash: TxHash }>;
   /**
@@ -1057,32 +1040,17 @@ export default class IExecOrderModule extends IExecModule {
    *   workerpoolorder,
    *   requestorder,
    * };
-   * const result = await estimateMatchOrders(orders, {useVoucher: true});
+   * const result = await estimateMatchOrders(orders);
    * console.log(`executable volume: ${result.volume} tasks`);
    * console.log(`total cost for matching orders: ${result.total} nRLC`);
-   * console.log(`sponsored cost covered by voucher: ${result.sponsored} nRLC`);
    * ```
    */
-  estimateMatchOrders(
-    orders: {
-      apporder: ConsumableApporder;
-      datasetorder?: ConsumableDatasetorder;
-      workerpoolorder: ConsumableWorkerpoolorder;
-      requestorder: ConsumableRequestorder;
-    },
-    options?: {
-      /**
-       * use a voucher contract to sponsor the deal
-       */
-      useVoucher?: boolean;
-      /**
-       * override the voucher contract to use, must be combined with `useVoucher: true`
-       *
-       * the user must be authorized by the voucher's owner to use it
-       */
-      voucherAddress?: Addressish;
-    },
-  ): Promise<{ volume: BN; total: BN; sponsored: BN }>;
+  estimateMatchOrders(orders: {
+    apporder: ConsumableApporder;
+    datasetorder?: ConsumableDatasetorder;
+    workerpoolorder: ConsumableWorkerpoolorder;
+    requestorder: ConsumableRequestorder;
+  }): Promise<{ volume: BN; total: BN; sponsored: BN }>;
   /**
    * Prepare a bulk from datasetorders to process multiple datasets with a single requestorder
    *
diff --git a/src/lib/IExecOrderModule.js b/src/lib/IExecOrderModule.js
index 3302e531..6abef8e0 100644
--- a/src/lib/IExecOrderModule.js
+++ b/src/lib/IExecOrderModule.js
@@ -39,7 +39,6 @@ import {
 } from '../common/market/marketplace.js';
 import {
   checkRequestRequirements,
-  resolveTeeFrameworkFromTag,
   checkAppRequirements,
   checkDatasetRequirements,
   prepareDatasetBulk,
@@ -57,15 +56,11 @@ export default class IExecOrderModule extends IExecModule {
   constructor(...args) {
     super(...args);
 
-    this.createApporder = async (overwrite) =>
-      createApporder(await this.config.resolveContractsClient(), overwrite);
+    this.createApporder = async (overwrite) => createApporder(overwrite);
     this.createDatasetorder = async (overwrite) =>
-      createDatasetorder(await this.config.resolveContractsClient(), overwrite);
+      createDatasetorder(overwrite);
     this.createWorkerpoolorder = async (overwrite) =>
-      createWorkerpoolorder(
-        await this.config.resolveContractsClient(),
-        overwrite,
-      );
+      createWorkerpoolorder(overwrite);
     this.createRequestorder = async (overwrite) =>
       createRequestorder(
         {
@@ -111,12 +106,7 @@ export default class IExecOrderModule extends IExecModule {
         preflightCheck === true
           ? await checkDatasetRequirements(
               {
-                contracts: await this.config.resolveContractsClient(),
-                smsURL: await this.config.resolveSmsURL({
-                  teeFramework: await resolveTeeFrameworkFromTag(
-                    (await datasetorderSchema().validate(datasetorder)).tag,
-                  ),
-                }),
+                smsURL: await this.config.resolveSmsURL(),
               },
               datasetorder,
             ).then(() => datasetorder)
@@ -136,12 +126,7 @@ export default class IExecOrderModule extends IExecModule {
         preflightCheck === true
           ? await checkRequestRequirements(
               {
-                contracts: await this.config.resolveContractsClient(),
-                smsURL: await this.config.resolveSmsURL({
-                  teeFramework: await resolveTeeFrameworkFromTag(
-                    (await requestorderSchema().validate(requestorder)).tag,
-                  ),
-                }),
+                smsURL: await this.config.resolveSmsURL(),
               },
               requestorder,
             ).then(() => requestorder)
@@ -193,13 +178,7 @@ export default class IExecOrderModule extends IExecModule {
         preflightCheck === true
           ? await checkDatasetRequirements(
               {
-                contracts: await this.config.resolveContractsClient(),
-                smsURL: await this.config.resolveSmsURL({
-                  teeFramework: await resolveTeeFrameworkFromTag(
-                    (await datasetorderSchema().validate(signedDatasetorder))
-                      .tag,
-                  ),
-                }),
+                smsURL: await this.config.resolveSmsURL(),
               },
               signedDatasetorder,
             ).then(() => signedDatasetorder)
@@ -221,13 +200,7 @@ export default class IExecOrderModule extends IExecModule {
         preflightCheck === true
           ? await checkRequestRequirements(
               {
-                contracts: await this.config.resolveContractsClient(),
-                smsURL: await this.config.resolveSmsURL({
-                  teeFramework: await resolveTeeFrameworkFromTag(
-                    (await requestorderSchema().validate(signedRequestorder))
-                      .tag,
-                  ),
-                }),
+                smsURL: await this.config.resolveSmsURL(),
               },
               signedRequestorder,
             ).then(() => signedRequestorder)
@@ -310,13 +283,9 @@ export default class IExecOrderModule extends IExecModule {
         workerpoolorder,
         requestorder,
       },
-      { preflightCheck = true, useVoucher = false, voucherAddress } = {},
+      { preflightCheck = true } = {},
     ) => {
       const contracts = await this.config.resolveContractsClient();
-      let voucherHubAddress;
-      if (useVoucher) {
-        voucherHubAddress = await this.config.resolveVoucherHubAddress();
-      }
       if (preflightCheck === true) {
         const resolvedTag = sumTags([
           (
@@ -335,20 +304,15 @@ export default class IExecOrderModule extends IExecModule {
         ]);
         return matchOrders({
           contracts,
-          voucherHubAddress,
           apporder: await checkAppRequirements(
             {
               contracts,
             },
             apporder,
-            { tagOverride: resolvedTag },
           ).then(() => apporder),
           datasetorder: await checkDatasetRequirements(
             {
-              contracts,
-              smsURL: await this.config.resolveSmsURL({
-                teeFramework: await resolveTeeFrameworkFromTag(resolvedTag),
-              }),
+              smsURL: await this.config.resolveSmsURL(),
             },
             datasetorder,
             { tagOverride: resolvedTag },
@@ -356,43 +320,33 @@ export default class IExecOrderModule extends IExecModule {
           workerpoolorder,
           requestorder: await checkRequestRequirements(
             {
-              contracts,
-              smsURL: await this.config.resolveSmsURL({
-                teeFramework: await resolveTeeFrameworkFromTag(resolvedTag),
-              }),
+              smsURL: await this.config.resolveSmsURL(),
             },
             requestorder,
           ).then(() => requestorder),
-          useVoucher,
-          voucherAddress,
         });
       }
       return matchOrders({
         contracts,
-        voucherHubAddress,
         apporder,
         datasetorder,
         workerpoolorder,
         requestorder,
-        useVoucher,
-        voucherAddress,
       });
     };
-    this.estimateMatchOrders = async (
-      { apporder, datasetorder, workerpoolorder, requestorder },
-      { useVoucher = false, voucherAddress } = {},
-    ) => {
+    this.estimateMatchOrders = async ({
+      apporder,
+      datasetorder,
+      workerpoolorder,
+      requestorder,
+    }) => {
       const contracts = await this.config.resolveContractsClient();
-      const voucherHubAddress = await this.config.resolveVoucherHubAddress();
       return estimateMatchOrders({
         contracts,
-        voucherHubAddress,
         apporder,
         datasetorder,
         workerpoolorder,
         requestorder,
-        useVoucher,
-        voucherAddress,
       });
     };
     this.prepareDatasetBulk = async (
diff --git a/src/lib/IExecOrderbookModule.d.ts b/src/lib/IExecOrderbookModule.d.ts
index c2c307ef..09717068 100644
--- a/src/lib/IExecOrderbookModule.d.ts
+++ b/src/lib/IExecOrderbookModule.d.ts
@@ -5,7 +5,6 @@ import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
 import {
   Address,
-  Addressish,
   BNish,
   Bytes,
   Bytes32,
@@ -150,118 +149,60 @@ export default class IExecOrderbookModule extends IExecModule {
    * console.log('total orders:', count);
    * ```
    */
-  fetchAppOrderbook(
-    appAddressOrOptions:
-      | Addressish
-      | 'any'
-      | {
-          /**
-           * filter by app
-           */
-          app?: Addressish | 'any';
-          /**
-           * filter by app owner
-           */
-          appOwner?: Addressish;
-          /**
-           * include orders restricted to specified dataset (use `'any'` to include any dataset)
-           */
-          dataset?: Addressish | 'any';
-          /**
-           * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
-           */
-          workerpool?: Addressish | 'any';
-          /**
-           * include orders restricted to specified requester (use `'any'` to include any requester)
-           */
-          requester?: Addressish | 'any';
-          /**
-           * filter by minimum volume remaining
-           */
-          minVolume?: BNish;
-          /**
-           * filter by minimum tag required
-           */
-          minTag?: Tag | HumanSingleTag[];
-          /**
-           * filter by maximum tag accepted
-           */
-          maxTag?: Tag | HumanSingleTag[];
-          /**
-           * index of the page to fetch
-           */
-          page?: number;
-          /**
-           * size of the page to fetch
-           */
-          pageSize?: number;
-          /**
-           * filters out orders allowing “any” dataset (default: `false`)
-           */
-          isDatasetStrict?: boolean;
-          /**
-           * filters out orders allowing “any” requester (default: `false`)
-           */
-          isRequesterStrict?: boolean;
-          /**
-           * filters out orders allowing “any” workerpool (default: `false`)
-           */
-          isWorkerpoolStrict?: boolean;
-        },
-    /**
-     * @deprecated use first parameter instead
-     *
-     * migration:
-     *
-     * replace `fetchAppOrderbook(appAddress, options)` by `fetchAppOrderbook({ app: appAddress, ...options })`
-     */
-    options?: {
-      /**
-       * include orders restricted to specified dataset (use `'any'` to include any dataset)
-       */
-      dataset?: Addressish | 'any';
-      /**
-       * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
-       */
-      workerpool?: Addressish | 'any';
-      /**
-       * include orders restricted to specified requester (use `'any'` to include any requester)
-       */
-      requester?: Addressish | 'any';
-      /**
-       * filter by minimum volume remaining
-       */
-      minVolume?: BNish;
-      /**
-       * filter by minimum tag required
-       */
-      minTag?: Tag | HumanSingleTag[];
-      /**
-       * filter by maximum tag accepted
-       */
-      maxTag?: Tag | HumanSingleTag[];
-      /**
-       * index of the page to fetch
-       */
-      page?: number;
-      /**
-       * size of the page to fetch
-       */
-      pageSize?: number;
-      /**
-       * filters out orders allowing “any” dataset (default: `false`)
-       */
-      isDatasetStrict?: boolean;
-      /**
-       * filters out orders allowing “any” requester (default: `false`)
-       */
-      isRequesterStrict?: boolean;
-      /**
-       * filters out orders allowing “any” workerpool (default: `false`)
-       */
-      isWorkerpoolStrict?: boolean;
-    },
-  ): Promise<PaginableOrders<PublishedApporder>>;
+  fetchAppOrderbook(options: {
+    /**
+     * filter by app
+     */
+    app?: Address | 'any';
+    /**
+     * filter by app owner
+     */
+    appOwner?: Address;
+    /**
+     * include orders restricted to specified dataset (use `'any'` to include any dataset)
+     */
+    dataset?: Address | 'any';
+    /**
+     * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
+     */
+    workerpool?: Address | 'any';
+    /**
+     * include orders restricted to specified requester (use `'any'` to include any requester)
+     */
+    requester?: Address | 'any';
+    /**
+     * filter by minimum volume remaining
+     */
+    minVolume?: BNish;
+    /**
+     * filter by minimum tag required
+     */
+    minTag?: Tag | HumanSingleTag[];
+    /**
+     * filter by maximum tag accepted
+     */
+    maxTag?: Tag | HumanSingleTag[];
+    /**
+     * index of the page to fetch
+     */
+    page?: number;
+    /**
+     * size of the page to fetch
+     */
+    pageSize?: number;
+    /**
+     * filters out orders allowing “any” dataset (default: `false`)
+     */
+    isDatasetStrict?: boolean;
+    /**
+     * filters out orders allowing “any” requester (default: `false`)
+     */
+    isRequesterStrict?: boolean;
+    /**
+     * filters out orders allowing “any” workerpool (default: `false`)
+     */
+    isWorkerpoolStrict?: boolean;
+  }): Promise<PaginableOrders<PublishedApporder>>;
   /**
    * find the cheapest orders for the specified dataset.
    *
@@ -274,126 +215,64 @@ export default class IExecOrderbookModule extends IExecModule {
    * console.log('total orders:', count);
    * ```
    */
-  fetchDatasetOrderbook(
-    datasetAddressOrOptions:
-      | Addressish
-      | 'any'
-      | {
-          /**
-           * filter by dataset
-           */
-          dataset?: Addressish | 'any';
-          /**
-           * filter by dataset owner
-           */
-          datasetOwner?: Addressish;
-          /**
-           * include orders restricted to specified app (use `'any'` to include any app)
-           */
-          app?: Addressish | 'any';
-          /**
-           * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
-           */
-          workerpool?: Addressish | 'any';
-          /**
-           * include orders restricted to specified requester (use `'any'` to include any requester)
-           */
-          requester?: Addressish | 'any';
-          /**
-           * filter by minimum volume remaining
-           */
-          minVolume?: BNish;
-          /**
-           * filter by minimum tag required
-           */
-          minTag?: Tag | HumanSingleTag[];
-          /**
-           * filter by maximum tag accepted
-           */
-          maxTag?: Tag | HumanSingleTag[];
-          /**
-           * index of the page to fetch
-           */
-          page?: number;
-          /**
-           * size of the page to fetch
-           */
-          pageSize?: number;
-          /**
-           * filters out orders allowing “any” app (default: `false`)
-           */
-          isAppStrict?: boolean;
-          /**
-           * filters out orders allowing “any” requester (default: `false`)
-           */
-          isRequesterStrict?: boolean;
-          /**
-           * filters out orders allowing “any” workerpool (default: `false`)
-           */
-          isWorkerpoolStrict?: boolean;
-          /**
-           * filters out orders that don't allow bulk processing (default: `false`)
-           */
-          bulkOnly?: boolean;
-        },
-    /**
-     * @deprecated use first parameter instead
-     *
-     * migration:
-     *
-     * replace `fetchDatasetOrderbook(datasetAddress, options)` by `fetchDatasetOrderbook({ dataset: datasetAddress, ...options })`
-     */
-    options?: {
-      /**
-       * include orders restricted to specified app (use `'any'` to include any app)
-       */
-      app?: Addressish | 'any';
-      /**
-       * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
-       */
-      workerpool?: Addressish | 'any';
-      /**
-       * include orders restricted to specified requester (use `'any'` to include any requester)
-       */
-      requester?: Addressish | 'any';
-      /**
-       * filter by minimum volume remaining
-       */
-      minVolume?: BNish;
-      /**
-       * filter by minimum tag required
-       */
-      minTag?: Tag | HumanSingleTag[];
-      /**
-       * filter by maximum tag accepted
-       */
-      maxTag?: Tag | HumanSingleTag[];
-      /**
-       * index of the page to fetch
-       */
-      page?: number;
-      /**
-       * size of the page to fetch
-       */
-      pageSize?: number;
-      /**
-       * filters out orders allowing “any” app (default: `false`)
-       */
-      isAppStrict?: boolean;
-      /**
-       * filters out orders allowing “any” requester (default: `false`)
-       */
-      isRequesterStrict?: boolean;
-      /**
-       * filters out orders allowing “any” workerpool (default: `false`)
-       */
-      isWorkerpoolStrict?: boolean;
-      /**
-       * filters out orders that don't allow bulk processing (default: `false`)
-       */
-      bulkOnly?: boolean;
-    },
-  ): Promise<PaginableOrders<PublishedDatasetorder>>;
+  fetchDatasetOrderbook(options: {
+    /**
+     * filter by dataset
+     */
+    dataset?: Address | 'any';
+    /**
+     * filter by dataset owner
+     */
+    datasetOwner?: Address;
+    /**
+     * include orders restricted to specified app (use `'any'` to include any app)
+     */
+    app?: Address | 'any';
+    /**
+     * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
+     */
+    workerpool?: Address | 'any';
+    /**
+     * include orders restricted to specified requester (use `'any'` to include any requester)
+     */
+    requester?: Address | 'any';
+    /**
+     * filter by minimum volume remaining
+     */
+    minVolume?: BNish;
+    /**
+     * filter by minimum tag required
+     */
+    minTag?: Tag | HumanSingleTag[];
+    /**
+     * filter by maximum tag accepted
+     */
+    maxTag?: Tag | HumanSingleTag[];
+    /**
+     * index of the page to fetch
+     */
+    page?: number;
+    /**
+     * size of the page to fetch
+     */
+    pageSize?: number;
+    /**
+     * filters out orders allowing “any” app (default: `false`)
+     */
+    isAppStrict?: boolean;
+    /**
+     * filters out orders allowing “any” requester (default: `false`)
+     */
+    isRequesterStrict?: boolean;
+    /**
+     * filters out orders allowing “any” workerpool (default: `false`)
+     */
+    isWorkerpoolStrict?: boolean;
+    /**
+     * filters out orders that don't allow bulk processing (default: `false`)
+     */
+    bulkOnly?: boolean;
+  }): Promise<PaginableOrders<PublishedDatasetorder>>;
   /**
    * find the cheapest orders for the specified computing resource.
    *
@@ -410,11 +289,11 @@ export default class IExecOrderbookModule extends IExecModule {
     /**
      * filter by workerpool
      */
-    workerpool?: Addressish;
+    workerpool?: Address;
     /**
      * filter by workerpool owner
      */
-    workerpoolOwner?: Addressish;
+    workerpoolOwner?: Address;
     /**
      * filter by category
      */
@@ -422,15 +301,15 @@ export default class IExecOrderbookModule extends IExecModule {
     /**
      * include orders restricted to specified app (use `'any'` to include any app)
      */
-    app?: Addressish | 'any';
+    app?: Address | 'any';
     /**
      * include orders restricted to specified dataset (use `'any'` to include any dataset)
      */
-    dataset?: Addressish | 'any';
+    dataset?: Address | 'any';
     /**
      * include orders restricted to specified requester (use `'any'` to include any requester)
      */
-    requester?: Addressish | 'any';
+    requester?: Address | 'any';
     /**
      * filter by minimum volume remaining
      */
@@ -484,7 +363,7 @@ export default class IExecOrderbookModule extends IExecModule {
     /**
      * filter by requester
      */
-    requester?: Addressish;
+    requester?: Address;
     /**
      * filter by category
      */
@@ -492,15 +371,15 @@ export default class IExecOrderbookModule extends IExecModule {
     /**
      * filter by specified app
      */
-    app?: Addressish;
+    app?: Address;
     /**
      * filter by specified dataset
      */
-    dataset?: Addressish;
+    dataset?: Address;
     /**
      * include orders restricted to specified workerpool (use `'any'` to include any workerpool)
      */
-    workerpool?: Addressish | 'any';
+    workerpool?: Address | 'any';
     /**
      * filter by minimum volume remaining
      */
diff --git a/src/lib/IExecResultModule.d.ts b/src/lib/IExecResultModule.d.ts
index c09da5eb..983a20bd 100644
--- a/src/lib/IExecResultModule.d.ts
+++ b/src/lib/IExecResultModule.d.ts
@@ -3,7 +3,7 @@ export type * from './IExecConfig.js';
 
 import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
-import { Addressish, TeeFramework } from '../common/types.js';
+import { Address } from '../common/types.js';
 
 /**
  * module exposing result methods
@@ -18,10 +18,7 @@ export default class IExecResultModule extends IExecModule {
    * console.log('encryption key available:', isEncryptionKeyAvailable);
    * ```
    */
-  checkResultEncryptionKeyExists(
-    beneficiaryAddress: Addressish,
-    options: { teeFramework?: TeeFramework },
-  ): Promise<boolean>;
+  checkResultEncryptionKeyExists(beneficiaryAddress: Address): Promise<boolean>;
   /**
    * **SIGNER REQUIRED, ONLY BENEFICIARY**
    *
@@ -71,7 +68,6 @@ export default class IExecResultModule extends IExecModule {
     rsaPublicKey: string | CryptoKey,
     options?: {
       forceUpdate?: boolean;
-      teeFramework?: TeeFramework;
     },
   ): Promise<{ isPushed: boolean; isUpdated: boolean }>;
   /**
diff --git a/src/lib/IExecResultModule.js b/src/lib/IExecResultModule.js
index 39ec7a0e..bac5dbd0 100644
--- a/src/lib/IExecResultModule.js
+++ b/src/lib/IExecResultModule.js
@@ -8,19 +8,15 @@ export default class IExecResultModule extends IExecModule {
   constructor(...args) {
     super(...args);
 
-    this.checkResultEncryptionKeyExists = async (
-      address,
-      { teeFramework } = {},
-    ) =>
+    this.checkResultEncryptionKeyExists = async (address) =>
       checkWeb2SecretExists(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
+        await this.config.resolveSmsURL(),
         address,
         getResultEncryptionKeyName(),
       );
     this.pushResultEncryptionKey = async (
       publicKey,
-      { forceUpdate = false, teeFramework } = {},
+      { forceUpdate = false } = {},
     ) => {
       // secretValue can be:
       // - a PEM public key
@@ -29,7 +25,7 @@ export default class IExecResultModule extends IExecModule {
       const formattedPublicKey = await formatEncryptionKey(publicKey);
       return pushWeb2Secret(
         await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
+        await this.config.resolveSmsURL(),
         getResultEncryptionKeyName(),
         formattedPublicKey,
         { forceUpdate },
diff --git a/src/lib/IExecSecretsModule.d.ts b/src/lib/IExecSecretsModule.d.ts
index 42a5fa4d..4703937b 100644
--- a/src/lib/IExecSecretsModule.d.ts
+++ b/src/lib/IExecSecretsModule.d.ts
@@ -3,7 +3,7 @@ export type * from './IExecConfig.js';
 
 import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
-import { Addressish, TeeFramework } from '../common/types.js';
+import { Address } from '../common/types.js';
 
 /**
  * module exposing secrets methods
@@ -19,11 +19,8 @@ export default class IExecSecretsModule extends IExecModule {
    * ```
    */
   checkRequesterSecretExists(
-    requesterAddress: Addressish,
-    secretName: String,
-    options?: {
-      teeFramework?: TeeFramework;
-    },
+    requesterAddress: Address,
+    secretName: string,
   ): Promise<boolean>;
   /**
    * **SIGNER REQUIRED, ONLY REQUESTER**
@@ -43,9 +40,6 @@ export default class IExecSecretsModule extends IExecModule {
   pushRequesterSecret(
     secretName: String,
     secretValue: String,
-    options?: {
-      teeFramework?: TeeFramework;
-    },
   ): Promise<{ isPushed: boolean }>;
   /**
    * Create an IExecSecretsModule instance using an IExecConfig instance
diff --git a/src/lib/IExecSecretsModule.js b/src/lib/IExecSecretsModule.js
index e22b502a..dc31f3db 100644
--- a/src/lib/IExecSecretsModule.js
+++ b/src/lib/IExecSecretsModule.js
@@ -6,25 +6,16 @@ export default class IExecSecretModule extends IExecModule {
   constructor(...args) {
     super(...args);
 
-    this.checkRequesterSecretExists = async (
-      address,
-      secretName,
-      { teeFramework } = {},
-    ) =>
+    this.checkRequesterSecretExists = async (address, secretName) =>
       checkRequesterSecretExists(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
+        await this.config.resolveSmsURL(),
         address,
         secretName,
       );
-    this.pushRequesterSecret = async (
-      secretName,
-      secretValue,
-      { teeFramework } = {},
-    ) =>
+    this.pushRequesterSecret = async (secretName, secretValue) =>
       pushRequesterSecret(
         await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
+        await this.config.resolveSmsURL(),
         secretName,
         secretValue,
       );
diff --git a/src/lib/IExecStorageModule.d.ts b/src/lib/IExecStorageModule.d.ts
index ef50486f..4231f2d3 100644
--- a/src/lib/IExecStorageModule.d.ts
+++ b/src/lib/IExecStorageModule.d.ts
@@ -3,70 +3,48 @@ export type * from './IExecConfig.js';
 
 import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
-import { Addressish, TeeFramework } from '../common/types.js';
+import { Address } from '../common/types.js';
 
 /**
  * module exposing storage methods
  */
 export default class IExecStorageModule extends IExecModule {
   /**
-   * check if a storage token exists for the beneficiary in the Secret Management Service
+   * check if a storage access token exists for the beneficiary in the Secret Management Service
    *
-   * _NB_: specify the storage provider with the option `provider` (supported values `'ipfs'`|`'dropbox'` default `'ipfs'`)
+   * _NB_: currently only 'dropbox' storage provider authentication is supported.
    *
    * example:
    * ```js
-   * const isIpfsStorageInitialized = await checkStorageTokenExists(userAddress);
-   * console.log('IPFS storage initialized:', isIpfsStorageInitialized);
+   * const isStorageInitialized = await checkStorageTokenExists(userAddress, 'dropbox');
+   * console.log('Dropbox storage initialized:', isStorageInitialized);
    * ```
    */
   checkStorageTokenExists(
-    beneficiaryAddress: Addressish,
-    options?: {
-      provider?: string;
-      teeFramework?: TeeFramework;
-    },
+    beneficiaryAddress: Address,
+    storageProvider: string,
   ): Promise<boolean>;
   /**
    * **SIGNER REQUIRED, ONLY BENEFICIARY**
    *
-   * get an authorization token from the default IPFS based remote storage
-   *
-   * example:
-   * ```js
-   * const token = await defaultStorageLogin();
-   * const { isPushed } = await pushStorageToken(token);
-   * console.log('default storage initialized:', isPushed);
-   * ```
-   */
-  defaultStorageLogin(): Promise<string>;
-  /**
-   * **SIGNER REQUIRED, ONLY BENEFICIARY**
-   *
-   * push a personal storage token to the Secret Management Service to allow result archive upload
+   * push a storage access token to the Secret Management Service to allow result archive upload
+   * supported storage provider 'dropbox'.
    *
    * _NB_:
-   * - specify the storage provider with the option `provider` (supported values `'ipfs'`|`'dropbox'` default `'ipfs'`)
+   * - currently only 'dropbox' storage provider authentication is supported.
    * - this method will throw an error if a token already exists for the target storage provider in the Secret Management Service unless the option `forceUpdate: true` is used.
    *
    * example:
-   * - init default storage
-   * ```js
-   * const token = await defaultStorageLogin();
-   * const { isPushed } = await pushStorageToken(token);
-   * console.log('default storage initialized:', isPushed);
-   * ```
-   * - init dropbox storage
+   * - init Dropbox storage
    * ```js
-   * const { isPushed } = await pushStorageToken(dropboxApiToken, {provider: 'dropbox'});
-   * console.log('dropbox storage initialized:', isPushed);
+   * const { isPushed } = await pushStorageToken(dropboxApiToken, 'dropbox');
+   * console.log('Dropbox storage initialized:', isPushed);
    * ```
    */
   pushStorageToken(
     token: string,
+    storageProvider: string,
     options?: {
-      provider?: string;
-      teeFramework?: TeeFramework;
       forceUpdate?: boolean;
     },
   ): Promise<{ isPushed: boolean; isUpdated: boolean }>;
diff --git a/src/lib/IExecStorageModule.js b/src/lib/IExecStorageModule.js
index c42ec5ee..72a0d6d2 100644
--- a/src/lib/IExecStorageModule.js
+++ b/src/lib/IExecStorageModule.js
@@ -1,38 +1,31 @@
 import IExecModule from './IExecModule.js';
-import { checkWeb2SecretExists } from '../common/sms/check.js';
-import { pushWeb2Secret } from '../common/sms/push.js';
-import { login as resultProxyLogin } from '../common/storage/result-proxy.js';
-import { getStorageTokenKeyName } from '../common/utils/secrets-utils.js';
+import {
+  checkStorageTokenExists,
+  pushStorageToken,
+} from '../common/execution/storage.js';
 
 export default class IExecStorageModule extends IExecModule {
   constructor(...args) {
     super(...args);
-
-    this.defaultStorageLogin = async () =>
-      resultProxyLogin(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveResultProxyURL(),
-      );
-    this.checkStorageTokenExists = async (
-      address,
-      { provider, teeFramework } = {},
-    ) =>
-      checkWeb2SecretExists(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
+    this.checkStorageTokenExists = async (address, provider) =>
+      checkStorageTokenExists(
+        { smsURL: await this.config.resolveSmsURL() },
         address,
-        getStorageTokenKeyName(provider),
+        provider,
       );
 
     this.pushStorageToken = async (
       token,
-      { provider, teeFramework, forceUpdate = false } = {},
+      provider,
+      { forceUpdate = false } = {},
     ) =>
-      pushWeb2Secret(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveSmsURL({ teeFramework }),
-        getStorageTokenKeyName(provider),
+      pushStorageToken(
+        {
+          smsURL: await this.config.resolveSmsURL(),
+          contracts: await this.config.resolveContractsClient(),
+        },
         token,
+        provider,
         { forceUpdate },
       );
   }
diff --git a/src/lib/IExecVoucherModule.d.ts b/src/lib/IExecVoucherModule.d.ts
deleted file mode 100644
index c7635eae..00000000
--- a/src/lib/IExecVoucherModule.d.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-export type * from '../common/types.js';
-
-import IExecConfig from './IExecConfig.js';
-import IExecModule from './IExecModule.js';
-import { Address, Addressish, BN, TxHash } from '../common/types.js';
-
-interface VoucherInfo {
-  owner: Address;
-  address: Address;
-  type: BN;
-  balance: BN;
-  expirationTimestamp: BN;
-  sponsoredApps: Address[];
-  sponsoredDatasets: Address[];
-  sponsoredWorkerpools: Address[];
-  allowanceAmount: BN;
-  authorizedAccounts: Address[];
-}
-
-/**
- * module exposing voucher methods
- */
-export default class IExecVoucherModule extends IExecModule {
-  /**
-   * returns the address of the voucher contract for the specified address if the address owns a voucher
-   *
-   * example:
-   * ```js
-   * const voucherAddress = await getVoucherAddress(ownerAddress);
-   * console.log('voucher contract address:', voucherAddress);
-   * ```
-   */
-  getVoucherAddress(owner: Addressish): Promise<Address | null>;
-
-  /**
-   * **SIGNER REQUIRED**
-   *
-   * authorize a requester to use the voucher
-   *
-   * example:
-   * ```js
-   * const txHash = await authorizeRequester(requesterAddress);
-   * console.log('tx:', txHash);
-   * ```
-   */
-  authorizeRequester(requester: Addressish): Promise<TxHash>;
-
-  /**
-   * returns the user voucher information
-   *
-   * example:
-   * ```js
-   * const userVoucher = await showUserVoucher(userAddress);
-   * console.log('address:', userVoucher.address);
-   * console.log('balance:', userVoucher.balance);
-   * console.log('expiration:', userVoucher.expirationTimestamp);
-   * console.log('sponsored apps:', userVoucher.sponsoredApps);
-   * console.log('sponsored datasets:', userVoucher.sponsoredDatasets);
-   * console.log('sponsored workerpools:', userVoucher.sponsoredWorkerpools);
-   * console.log('allowance on user account:', userVoucher.allowanceAmount);
-   * console.log('authorized accounts:', userVoucher.authorizedAccounts);
-   * ```
-   */
-  showUserVoucher(owner: Addressish): Promise<VoucherInfo>;
-
-  /* **SIGNER REQUIRED**
-   *
-   * revoke the authorization previously granted to a requester to use the voucher
-   *
-   * example:
-   * ```js
-   * const txHash = await revokeRequesterAuthorization(requesterAddress);
-   * console.log('tx:', txHash);
-   * ```
-   */
-  revokeRequesterAuthorization(requester: Addressish): Promise<TxHash>;
-
-  /**
-   * Create an IExecVoucherModule instance using an IExecConfig instance
-   */
-  static fromConfig(config: IExecConfig): IExecVoucherModule;
-}
diff --git a/src/lib/IExecVoucherModule.js b/src/lib/IExecVoucherModule.js
deleted file mode 100644
index 6ba21ed4..00000000
--- a/src/lib/IExecVoucherModule.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import IExecModule from './IExecModule.js';
-import { fetchVoucherAddress } from '../common/voucher/voucherHub.js';
-import {
-  authorizeRequester,
-  revokeRequesterAuthorization,
-  showUserVoucher,
-} from '../common/voucher/voucher.js';
-
-export default class IExecVoucherModule extends IExecModule {
-  constructor(...args) {
-    super(...args);
-
-    this.getVoucherAddress = async (owner) => {
-      const contracts = await this.config.resolveContractsClient();
-      const voucherHubAddress = await this.config.resolveVoucherHubAddress();
-      return fetchVoucherAddress(contracts, voucherHubAddress, owner);
-    };
-
-    this.showUserVoucher = async (owner) => {
-      const contracts = await this.config.resolveContractsClient();
-      const voucherHubAddress = await this.config.resolveVoucherHubAddress();
-      const voucherSubgraphURL = await this.config.resolveVoucherSubgraphURL();
-
-      return showUserVoucher(
-        contracts,
-        voucherSubgraphURL,
-        voucherHubAddress,
-        owner,
-      );
-    };
-
-    this.authorizeRequester = async (requester) => {
-      const contracts = await this.config.resolveContractsClient();
-      const voucherHubAddress = await this.config.resolveVoucherHubAddress();
-      return authorizeRequester(contracts, voucherHubAddress, requester);
-    };
-
-    this.revokeRequesterAuthorization = async (requester) => {
-      const contracts = await this.config.resolveContractsClient();
-      const voucherHubAddress = await this.config.resolveVoucherHubAddress();
-      return revokeRequesterAuthorization(
-        contracts,
-        voucherHubAddress,
-        requester,
-      );
-    };
-  }
-}
diff --git a/src/lib/IExecWalletModule.d.ts b/src/lib/IExecWalletModule.d.ts
index 216d3aa5..e097b631 100644
--- a/src/lib/IExecWalletModule.d.ts
+++ b/src/lib/IExecWalletModule.d.ts
@@ -3,86 +3,7 @@ export type * from './IExecConfig.js';
 
 import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
-import {
-  Address,
-  Addressish,
-  NRLCAmount,
-  TxHash,
-  WeiAmount,
-  BN,
-} from '../common/types.js';
-import { Observable } from '../common/utils/reactive.js';
-
-declare class BridgeObservable extends Observable {
-  /**
-   * subscribe and start the bridge process to transfer tokens from one chain to another until either `complete()` or `error(error: Error)` is called on the Observer or the subscribtion is canceled by calling the returned cancel method.
-   *
-   * return the `cancel: () => void` method.
-   *
-   * data:
-   * | message | comment | additional entries |
-   * | --- | --- | --- |
-   * | `CHECK_BRIDGE_POLICY` | sent once | |
-   * | `BRIDGE_POLICY_CHECKED` | sent once | `minPerTx`,`maxPerTx`,`dailyLimit` |
-   * | `CHECK_BRIDGE_LIMIT` | sent once |  |
-   * | `BRIDGE_LIMIT_CHECKED` | sent once | `totalSpentPerDay` |
-   * | `SEND_TO_BRIDGE_TX_REQUEST` | sent once | `bridgeAddress` |
-   * | `SEND_TO_BRIDGE_TX_SUCCESS` | sent once | `txHash` |
-   * | `WAIT_RECEIVE_TX` | sent once if the bridged chain is configured | `bridgeAddress` |
-   * | `RECEIVE_TX_SUCCESS` | sent once if the bridged chain is configured | `txHash` |
-   */
-  subscribe(callbacks: {
-    /**
-     * callback fired at every configuration step
-     *
-     * data:
-     * | message | comment | additional entries |
-     * | --- | --- | --- |
-     * | `CHECK_BRIDGE_POLICY` | sent once | |
-     * | `BRIDGE_POLICY_CHECKED` | sent once | `minPerTx`,`maxPerTx`,`dailyLimit` |
-     * | `CHECK_BRIDGE_LIMIT` | sent once |  |
-     * | `BRIDGE_LIMIT_CHECKED` | sent once | `totalSpentPerDay` |
-     * | `SEND_TO_BRIDGE_TX_REQUEST` | sent once | `bridgeAddress` |
-     * | `SEND_TO_BRIDGE_TX_SUCCESS` | sent once | `txHash` |
-     * | `WAIT_RECEIVE_TX` | sent once if the bridged chain is configured | `bridgeAddress` |
-     * | `RECEIVE_TX_SUCCESS` | sent once if the bridged chain is configured | `txHash` |
-     */
-    next?: (data: {
-      message:
-        | 'CHECK_BRIDGE_POLICY'
-        | 'BRIDGE_POLICY_CHECKED'
-        | 'CHECK_BRIDGE_LIMIT'
-        | 'BRIDGE_LIMIT_CHECKED'
-        | 'SEND_TO_BRIDGE_TX_REQUEST'
-        | 'SEND_TO_BRIDGE_TX_SUCCESS'
-        | 'WAIT_RECEIVE_TX'
-        | 'RECEIVE_TX_SUCCESS';
-      minPerTx?: BN;
-      maxPerTx?: BN;
-      dailyLimit?: BN;
-      totalSpentPerDay?: BN;
-      bridgeAddress?: Address;
-      txHash?: TxHash;
-    }) => any;
-    /**
-     * callback fired once when the bridge process is completed
-     *
-     * no other callback is fired after firing `complete()`
-     */
-    complete?: () => any;
-    /**
-     * callback fired once when an error occurs
-     *
-     * no other callback is fired after firing `error(error: Error)`
-     */
-    error?: (error: Error) => any;
-  }): /**
-   * `cancel: () => void` method, calling this method cancels the subscription
-   *
-   * no callback is fired after calling this method
-   */
-  () => void;
-}
+import { Address, NRLCAmount, TxHash, WeiAmount, BN } from '../common/types.js';
 
 /**
  * module exposing wallet methods
@@ -110,21 +31,7 @@ export default class IExecWalletModule extends IExecModule {
    * console.log('ethereum wei:', wei.toString());
    * ```
    */
-  checkBalances(address: Addressish): Promise<{
-    wei: BN;
-    nRLC: BN;
-  }>;
-  /**
-   * check the wallet balances (native and iExec token) of specified address on bridged chain
-   *
-   * example:
-   * ```js
-   * const { wei, nRLC } = await checkBalances(address);
-   * console.log('iExec nano RLC:', nRLC.toString());
-   * console.log('ethereum wei:', wei.toString());
-   * ```
-   */
-  checkBridgedBalances(address: Addressish): Promise<{
+  checkBalances(address: Address): Promise<{
     wei: BN;
     nRLC: BN;
   }>;
@@ -139,7 +46,7 @@ export default class IExecWalletModule extends IExecModule {
    * console.log('transaction hash:', txHash);
    * ```
    */
-  sendETH(WeiAmount: WeiAmount, to: Addressish): Promise<TxHash>;
+  sendETH(WeiAmount: WeiAmount, to: Address): Promise<TxHash>;
   /**
    * **SIGNER REQUIRED**
    *
@@ -151,7 +58,7 @@ export default class IExecWalletModule extends IExecModule {
    * console.log('transaction hash:', txHash);
    * ```
    */
-  sendRLC(nRLCAmount: NRLCAmount, to: Addressish): Promise<TxHash>;
+  sendRLC(nRLCAmount: NRLCAmount, to: Address): Promise<TxHash>;
   /**
    * **SIGNER REQUIRED**
    *
@@ -165,76 +72,8 @@ export default class IExecWalletModule extends IExecModule {
    * ```
    */
   sweep(
-    to: Addressish,
+    to: Address,
   ): Promise<{ sendERC20TxHash: TxHash; sendNativeTxHash: TxHash }>;
-  /**
-   * **SIGNER REQUIRED**
-   *
-   * send some nRLC to the sidechain
-   *
-   * _NB_:
-   * - RLC is send to the mainchain bridge smart contract on mainchain then credited on sidechain by the sidechain bridge smart contract
-   * - the reception of the value on the sidechain (`receiveTxHash`) will not be monitored if the bridged network configuration is missing
-   *
-   * example:
-   * ```js
-   * const { sendTxHash, receiveTxHash } = await bridgeToSidechain('1000000000');
-   * console.log(`sent RLC on mainchain (tx: ${sendTxHash}), wallet credited on sidechain (tx: ${receiveTxHash})`);
-   * ```
-   */
-  bridgeToSidechain(
-    nRLCAmount: NRLCAmount,
-  ): Promise<{ sendTxHash: TxHash; receiveTxHash?: TxHash }>;
-  /**
-   * **SIGNER REQUIRED**
-   *
-   * send some nRLC to the mainchain
-   *
-   * _NB_:
-   * - RLC is send to the sidechain bridge smart contract on sidechain then credited on mainchain by the mainchain bridge smart contract
-   * - the reception of the value on the mainchain (`receiveTxHash`) will not be monitored if the bridged network configuration is missing
-   *
-   * example:
-   * ```js
-   * const { sendTxHash, receiveTxHash } = await bridgeToSidechain('1000000000');
-   * console.log(`sent RLC on sidechain (tx: ${sendTxHash}), wallet credited on mainchain (tx: ${receiveTxHash})`);
-   * ```
-   */
-  bridgeToMainchain(
-    nRLCAmount: NRLCAmount,
-  ): Promise<{ sendTxHash: TxHash; receiveTxHash?: TxHash }>;
-  /**
-   * **SIGNER REQUIRED**
-   *
-   * return an Observable with a subscribe method to start and monitor the bridge to sidechain process
-   *
-   * example:
-   * ```js
-   * const bridgeObservable = await obsBridgeToSidechain('1000000000');
-   * const cancel = bridgeObservable.subscribe({
-   *   next: ({message, ...rest}) => console.log(message, ...rest),
-   *   error: (err) => console.error(err),
-   *   complete: () => console.log('completed'),
-   * });
-   * ```
-   */
-  obsBridgeToSidechain(nRLCAmount: NRLCAmount): Promise<BridgeObservable>;
-  /**
-   * **SIGNER REQUIRED**
-   *
-   * return an Observable with a subscribe method to start and monitor the bridge to mainchain process
-   *
-   * example:
-   * ```js
-   * const bridgeObservable = await obsBridgeToMainchain('1000000000');
-   * const cancel = bridgeObservable.subscribe({
-   *   next: ({message, ...rest}) => console.log(message, ...rest),
-   *   error: (err) => console.error(err),
-   *   complete: () => console.log('completed'),
-   * });
-   * ```
-   */
-  obsBridgeToMainchain(nRLCAmount: NRLCAmount): Promise<BridgeObservable>;
   /**
    * Create an IExecWalletModule instance using an IExecConfig instance
    */
diff --git a/src/lib/IExecWalletModule.js b/src/lib/IExecWalletModule.js
index 48ba189a..98882754 100644
--- a/src/lib/IExecWalletModule.js
+++ b/src/lib/IExecWalletModule.js
@@ -2,12 +2,6 @@ import IExecModule from './IExecModule.js';
 import { getAddress } from '../common/wallet/address.js';
 import { checkBalances } from '../common/wallet/balance.js';
 import { sendETH, sendRLC, sweep } from '../common/wallet/send.js';
-import {
-  bridgeToMainchain,
-  bridgeToSidechain,
-  obsBridgeToMainchain,
-  obsBridgeToSidechain,
-} from '../common/wallet/bridge.js';
 
 export default class IExecWalletModule extends IExecModule {
   constructor(...args) {
@@ -17,53 +11,11 @@ export default class IExecWalletModule extends IExecModule {
       getAddress(await this.config.resolveContractsClient());
     this.checkBalances = async (address) =>
       checkBalances(await this.config.resolveContractsClient(), address);
-    this.checkBridgedBalances = async (address) =>
-      checkBalances(await this.config.resolveBridgedContractsClient(), address);
     this.sendETH = async (weiAmount, to) =>
       sendETH(await this.config.resolveContractsClient(), weiAmount, to);
     this.sendRLC = async (nRlcAmount, to) =>
       sendRLC(await this.config.resolveContractsClient(), nRlcAmount, to);
     this.sweep = async (to) =>
       sweep(await this.config.resolveContractsClient(), to);
-    this.bridgeToSidechain = async (nRlcAmount) =>
-      bridgeToSidechain(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveBridgeAddress(),
-        nRlcAmount,
-        {
-          bridgedContracts: await this.config.resolveBridgedContractsClient(),
-          sidechainBridgeAddress: await this.config.resolveBridgeBackAddress(),
-        },
-      );
-    this.bridgeToMainchain = async (nRlcAmount) =>
-      bridgeToMainchain(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveBridgeAddress(),
-        nRlcAmount,
-        {
-          bridgedContracts: await this.config.resolveBridgedContractsClient(),
-          mainchainBridgeAddress: await this.config.resolveBridgeBackAddress(),
-        },
-      );
-    this.obsBridgeToSidechain = async (nRlcAmount) =>
-      obsBridgeToSidechain(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveBridgeAddress(),
-        nRlcAmount,
-        {
-          bridgedContracts: await this.config.resolveBridgedContractsClient(),
-          sidechainBridgeAddress: await this.config.resolveBridgeBackAddress(),
-        },
-      );
-    this.obsBridgeToMainchain = async (nRlcAmount) =>
-      obsBridgeToMainchain(
-        await this.config.resolveContractsClient(),
-        await this.config.resolveBridgeAddress(),
-        nRlcAmount,
-        {
-          bridgedContracts: await this.config.resolveBridgedContractsClient(),
-          mainchainBridgeAddress: await this.config.resolveBridgeBackAddress(),
-        },
-      );
   }
 }
diff --git a/src/lib/IExecWorkerpoolModule.d.ts b/src/lib/IExecWorkerpoolModule.d.ts
index 4b7b55c8..8bb5b3f3 100644
--- a/src/lib/IExecWorkerpoolModule.d.ts
+++ b/src/lib/IExecWorkerpoolModule.d.ts
@@ -3,13 +3,13 @@ export type * from './IExecConfig.js';
 
 import IExecConfig from './IExecConfig.js';
 import IExecModule from './IExecModule.js';
-import { Address, Addressish, BN, BNish, TxHash } from '../common/types.js';
+import { Address, BN, BNish, TxHash } from '../common/types.js';
 
 export interface WorkerpoolDeploymentArgs {
   /**
    * the workerpool owner
    */
-  owner: Addressish;
+  owner: Address;
   /**
    * a description for the workerpool
    */
@@ -81,7 +81,7 @@ export default class IExecWorkerpoolModule extends IExecModule {
    * console.log('workerpool deployed', isDeployed);
    * ```
    */
-  checkDeployedWorkerpool(workerpoolAddress: Addressish): Promise<Boolean>;
+  checkDeployedWorkerpool(workerpoolAddress: Address): Promise<Boolean>;
   /**
    * show a deployed workerpool details
    *
@@ -92,7 +92,7 @@ export default class IExecWorkerpoolModule extends IExecModule {
    * ```
    */
   showWorkerpool(
-    workerpoolAddress: Addressish,
+    workerpoolAddress: Address,
   ): Promise<{ objAddress: Address; workerpool: Workerpool }>;
   /**
    * count the workerpools owned by an address.
@@ -103,7 +103,7 @@ export default class IExecWorkerpoolModule extends IExecModule {
    * console.log('workerpool count:', count);
    * ```
    */
-  countUserWorkerpools(userAddress: Addressish): Promise<BN>;
+  countUserWorkerpools(userAddress: Address): Promise<BN>;
   /**
    * show deployed workerpool details by index for specified user user
    *
@@ -115,25 +115,8 @@ export default class IExecWorkerpoolModule extends IExecModule {
    */
   showUserWorkerpool(
     index: BNish,
-    address: Addressish,
+    address: Address,
   ): Promise<{ objAddress: Address; workerpool: Workerpool }>;
-  /**
-   * **ONLY WORKERPOOL ENS NAME OWNER**
-   *
-   * declare the workerpool API url on the blockchain
-   *
-   * _NB_: declaring the workerpool API url require an ENS name with a configured reverse resolution on the workerpool address (see: IExecENSModule obsConfigureResolution/configureResolution)
-   *
-   * example:
-   * ```js
-   * const txHash = await setWorkerpoolApiUrl('my-workerpool.eth', 'my-workerpool.com');
-   * console.log('txHash:', txHash);
-   * ```
-   */
-  setWorkerpoolApiUrl(
-    workerpoolAddress: Addressish,
-    url: string,
-  ): Promise<TxHash>;
   /**
    * read the workerpool API url on the blockchain
    *
@@ -141,13 +124,11 @@ export default class IExecWorkerpoolModule extends IExecModule {
    *
    * example:
    * ```js
-   * const url = await getWorkerpoolApiUrl('my-workerpool.eth');
+   * const url = await getWorkerpoolApiUrl(address);
    * console.log('workerpool API url:', url);
    * ```
    */
-  getWorkerpoolApiUrl(
-    workerpoolAddress: Addressish,
-  ): Promise<string | undefined>;
+  getWorkerpoolApiUrl(workerpoolAddress: Address): Promise<string | undefined>;
   /**
    * **ONLY WORKERPOOL OWNER**
    *
@@ -162,8 +143,8 @@ export default class IExecWorkerpoolModule extends IExecModule {
    * ```
    */
   transferWorkerpool(
-    workerpoolAddress: Addressish,
-    to: Addressish,
+    workerpoolAddress: Address,
+    to: Address,
   ): Promise<{ address: Address; to: Address; txHash: TxHash }>;
   /**
    * Create an IExecWorkerpoolModule instance using an IExecConfig instance
diff --git a/src/lib/IExecWorkerpoolModule.js b/src/lib/IExecWorkerpoolModule.js
index 174e7c8e..dcd1b420 100644
--- a/src/lib/IExecWorkerpoolModule.js
+++ b/src/lib/IExecWorkerpoolModule.js
@@ -8,7 +8,6 @@ import {
   checkDeployedWorkerpool,
   transferWorkerpool,
 } from '../common/protocol/registries.js';
-import { setWorkerpoolApiUrl } from '../common/execution/workerpool.js';
 import { getWorkerpoolApiUrl } from '../common/execution/debug.js';
 
 export default class IExecWorkerpoolModule extends IExecModule {
@@ -27,12 +26,6 @@ export default class IExecWorkerpoolModule extends IExecModule {
       );
     this.countUserWorkerpools = async (address) =>
       countUserWorkerpools(await this.config.resolveContractsClient(), address);
-    this.setWorkerpoolApiUrl = async (workerpoolAddress, url) =>
-      setWorkerpoolApiUrl(
-        await this.config.resolveContractsClient(),
-        workerpoolAddress,
-        url,
-      );
     this.getWorkerpoolApiUrl = async (workerpoolAddress) =>
       getWorkerpoolApiUrl(
         await this.config.resolveContractsClient(),
diff --git a/src/lib/errors.d.ts b/src/lib/errors.d.ts
index e90da877..96131537 100644
--- a/src/lib/errors.d.ts
+++ b/src/lib/errors.d.ts
@@ -16,19 +16,17 @@ export class Web3ProviderError extends Error {
      * A descriptive error message detailing the nature of the error.
      */
     message: string,
-    /**
-     * The original Error object that caused this web3 provider error.
-     */
-    originalError: Error,
+    options?: {
+      /**
+       * The original error that caused this web3 provider error.
+       */
+      cause?: unknown;
+    },
   );
   /**
-   * @deprecated use Error cause instead.
-   */
-  originalError: Error;
-  /**
-   * The original Error object that caused this web3 provider error.
+   * The original error that caused this web3 provider error.
    */
-  cause: Error;
+  cause?: unknown;
   /**
    * Wether the error was caused by a user rejection
    */
@@ -77,33 +75,6 @@ export class ObjectNotFoundError extends Error {
    */
   chainId: string;
 }
-/**
- * BridgeError is thrown when bridging RLC between mainchain and sidechain fail before the value transfer confirmation.
- */
-export class BridgeError extends Error {
-  constructor(
-    /**
-     * The original Error object that caused this API call error.
-     */
-    originalError: Error,
-    /**
-     * Hash of the transaction sending the value to the bridge contract.
-     */
-    sendTxHash: string,
-  );
-  /**
-   * Hash of the transaction sending the value to the bridge contract.
-   */
-  sendTxHash: string;
-  /**
-   * @deprecated use Error cause instead
-   */
-  originalError: Error;
-  /**
-   * The original Error object that caused this API call error.
-   */
-  cause: Error;
-}
 
 /**
  * ApiCallError encapsulates an error occurring during a call to an API such as a network error or a server-side internal error.
@@ -114,19 +85,17 @@ export class ApiCallError extends Error {
      * A descriptive error message detailing the nature of the error.
      */
     message: string,
-    /**
-     * The original Error object that caused this API call error.
-     */
-    originalError: Error,
+    options?: {
+      /**
+       * The original error that caused this API call error.
+       */
+      cause?: unknown;
+    },
   );
   /**
-   * @deprecated use Error cause instead.
-   */
-  originalError: Error;
-  /**
-   * The original Error object that caused this API call error.
+   * The original error that caused this API call error.
    */
-  cause: Error;
+  cause?: unknown;
 }
 
 /**
@@ -134,11 +103,6 @@ export class ApiCallError extends Error {
  */
 export class SmsCallError extends ApiCallError {}
 
-/**
- * ResultProxyCallError encapsulates an error occurring during a call to the Result Proxy API such as a network error or a server-side internal error.
- */
-export class ResultProxyCallError extends ApiCallError {}
-
 /**
  * MarketCallError encapsulates an error occurring during a call to the Market API such as a network error or a server-side internal error.
  */
diff --git a/src/lib/index.d.ts b/src/lib/index.d.ts
index 1788b01e..21028a8e 100644
--- a/src/lib/index.d.ts
+++ b/src/lib/index.d.ts
@@ -8,7 +8,6 @@ export { default as IExecAccountModule } from './IExecAccountModule.js';
 export { default as IExecAppModule } from './IExecAppModule.js';
 export { default as IExecDatasetModule } from './IExecDatasetModule.js';
 export { default as IExecDealModule } from './IExecDealModule.js';
-export { default as IExecENSModule } from './IExecENSModule.js';
 export { default as IExecHubModule } from './IExecHubModule.js';
 export { default as IExecNetworkModule } from './IExecNetworkModule.js';
 export { default as IExecOrderModule } from './IExecOrderModule.js';
@@ -17,7 +16,6 @@ export { default as IExecResultModule } from './IExecResultModule.js';
 export { default as IExecSecretsModule } from './IExecSecretsModule.js';
 export { default as IExecStorageModule } from './IExecStorageModule.js';
 export { default as IExecTaskModule } from './IExecTaskModule.js';
-export { default as IExecVoucherModule } from './IExecVoucherModule.js';
 export { default as IExecWalletModule } from './IExecWalletModule.js';
 export { default as IExecWorkerpoolModule } from './IExecWorkerpoolModule.js';
 
diff --git a/src/lib/index.js b/src/lib/index.js
index 4ccfe63b..928d131a 100644
--- a/src/lib/index.js
+++ b/src/lib/index.js
@@ -8,7 +8,6 @@ export { default as IExecAccountModule } from './IExecAccountModule.js';
 export { default as IExecAppModule } from './IExecAppModule.js';
 export { default as IExecDatasetModule } from './IExecDatasetModule.js';
 export { default as IExecDealModule } from './IExecDealModule.js';
-export { default as IExecENSModule } from './IExecENSModule.js';
 export { default as IExecHubModule } from './IExecHubModule.js';
 export { default as IExecNetworkModule } from './IExecNetworkModule.js';
 export { default as IExecOrderModule } from './IExecOrderModule.js';
@@ -17,7 +16,6 @@ export { default as IExecResultModule } from './IExecResultModule.js';
 export { default as IExecSecretsModule } from './IExecSecretsModule.js';
 export { default as IExecStorageModule } from './IExecStorageModule.js';
 export { default as IExecTaskModule } from './IExecTaskModule.js';
-export { default as IExecVoucherModule } from './IExecVoucherModule.js';
 export { default as IExecWalletModule } from './IExecWalletModule.js';
 export { default as IExecWorkerpoolModule } from './IExecWorkerpoolModule.js';
 
diff --git a/src/lib/utils.d.ts b/src/lib/utils.d.ts
index 20b4ae7d..ba12093c 100644
--- a/src/lib/utils.d.ts
+++ b/src/lib/utils.d.ts
@@ -1,12 +1,10 @@
-import { BlockTag } from 'ethers';
-import { EnhancedWallet } from '../common/utils/signers.js';
+import { AbstractSigner, Provider } from 'ethers';
 import {
   BN,
   WeiAmount,
   NRLCAmount,
   HumanSingleTag,
   Bytes32,
-  ProviderOptions,
 } from '../common/types.js';
 
 export { BN } from '../common/bn.js';
@@ -30,18 +28,6 @@ export const getSignerFromPrivateKey: (
    */
   privateKey: string,
   options?: {
-    /**
-     * gas price override
-     */
-    gasPrice?: bigint | number | string;
-    /**
-     * nonce override
-     */
-    getTransactionCount?: (blockTag?: BlockTag) => Promise<number>;
-    /**
-     * providers options
-     */
-    providers?: ProviderOptions;
     /**
      * if true allows using a provider connected to an experimental networks (default false)
      *
@@ -49,7 +35,7 @@ export const getSignerFromPrivateKey: (
      */
     allowExperimentalNetworks?: boolean;
   },
-) => EnhancedWallet;
+) => AbstractSigner<Provider>;
 
 /**
  * ethereum null/zero address
diff --git a/test/cli/cli-common.test.js b/test/cli/cli-common.test.js
index 56cde5c8..5921d8e8 100644
--- a/test/cli/cli-common.test.js
+++ b/test/cli/cli-common.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { execAsync } from '../test-utils.js';
 import {
@@ -71,24 +69,25 @@ describe('chain.json', () => {
     await loadJSONFile('chain.json').then((obj) => {
       const chainJson = {
         ...obj,
-        providers: {
-          infura: process.env.INFURA_PROJECT_ID,
-        },
       };
       saveJSONToFile(chainJson, 'chain.json');
     });
   });
 
-  test('no "native" overwrites in templates', async () => {
-    const { chains } = await loadJSONFile('chain.json');
-    expect(chains.mainnet.native).toBeUndefined();
-    expect(chains.bellecour.native).toBeUndefined();
+  test('chains arbitrum-mainnet and arbitrum-sepolia-testnet are available', async () => {
+    const chainJson = await loadJSONFile('chain.json');
+    expect(chainJson).toHaveProperty('chains');
+
+    expect(chainJson.chains).toStrictEqual({
+      'arbitrum-sepolia-testnet': {},
+      'arbitrum-mainnet': {},
+    });
   });
 
-  test('bellecour is native', async () => {
-    const raw = await execAsync(`${iexecPath} info --chain bellecour --raw`);
-    const res = JSON.parse(raw);
-    expect(res.ok).toBe(true);
-    expect(res.useNative).toBe(true);
+  test('default chain is arbitrum-sepolia-testnet', async () => {
+    const chainJson = await loadJSONFile('chain.json');
+    expect(chainJson).toBeDefined();
+    expect(chainJson).toHaveProperty('default');
+    expect(chainJson.default).toBe('arbitrum-sepolia-testnet');
   });
 });
diff --git a/test/cli/cli-iexec-account.test.js b/test/cli/cli-iexec-account.test.js
index 12ec7ff4..98bf70f8 100644
--- a/test/cli/cli-iexec-account.test.js
+++ b/test/cli/cli-iexec-account.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
 import {
@@ -7,7 +5,7 @@ import {
   execAsync,
   getRandomAddress,
   getRandomWallet,
-  setBalance,
+  setNRlcBalance,
 } from '../test-utils.js';
 import {
   globalSetup,
@@ -20,7 +18,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec account', () => {
   let userWallet;
@@ -30,8 +28,8 @@ describe('iexec account', () => {
     // init the project
     await execAsync(`${iexecPath} init --skip-wallet --force`);
     await setChain(testChain)();
-    userWallet = await setRandomWallet();
-    await setBalance(testChain)(userWallet.address, 50n * 10n ** 18n);
+    userWallet = await setRandomWallet(testChain)();
+    await setNRlcBalance(testChain)(userWallet.address, 50n * 10n ** 9n);
   });
 
   afterAll(async () => {
@@ -56,9 +54,6 @@ describe('iexec account', () => {
       expect(res.ok).toBe(true);
       expect(res.amount).toBe(amount);
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
 
       const bnAmount = new BN(amount);
       const finalWalletBalance = new BN(
@@ -173,9 +168,7 @@ describe('iexec account', () => {
       expect(res.ok).toBe(true);
       expect(res.amount).toBe(amount);
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
+
       const bnAmount = new BN(amount);
       const finalWalletBalance = new BN(
         JSON.parse(await execAsync(`${iexecPath} wallet show --raw`)).balance
@@ -242,9 +235,6 @@ describe('iexec account', () => {
       const res = JSON.parse(raw);
       expect(res.ok).toBe(true);
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
 
       const raw1 = await execAsync(
         `${iexecPath} account allowance ${spender} --raw`,
@@ -264,9 +254,6 @@ describe('iexec account', () => {
       const res = JSON.parse(raw);
       expect(res.ok).toBe(true);
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
 
       const raw1 = await execAsync(
         `${iexecPath} account allowance ${spender} --raw`,
@@ -314,7 +301,7 @@ describe('iexec account', () => {
       const amount = '500';
       const spender = getRandomAddress();
       const { privateKey, address: owner } = getRandomWallet();
-      await setWallet(privateKey);
+      await setWallet(testChain)(privateKey);
       await execAsync(
         `${iexecPath} account approve ${amount} ${spender} --raw`,
       );
diff --git a/test/cli/cli-iexec-app.test.js b/test/cli/cli-iexec-app.test.js
index 491c738d..929a4581 100644
--- a/test/cli/cli-iexec-app.test.js
+++ b/test/cli/cli-iexec-app.test.js
@@ -1,21 +1,14 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   NULL_ADDRESS,
   NULL_BYTES32,
   TEST_CHAINS,
-  addVoucherEligibleAsset,
   adminCreateCategory,
-  createAndPublishWorkerpoolOrder,
-  createVoucher,
-  createVoucherType,
   execAsync,
   getRandomAddress,
   getRandomWallet,
 } from '../test-utils.js';
 import {
-  editRequestorder,
   globalSetup,
   globalTeardown,
   iexecPath,
@@ -26,9 +19,9 @@ import {
   setWallet,
 } from './cli-test-utils.js';
 import '../jest-setup.js';
-import { getTestConfig } from '../test-config-utils.js';
+import { encodeTag } from '../../src/lib/utils.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec app', () => {
   let userWallet;
@@ -40,7 +33,7 @@ describe('iexec app', () => {
     await execAsync(`${iexecPath} init --skip-wallet --force`);
     await setChain(testChain)();
 
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
     await execAsync(`${iexecPath} app init`);
     await setAppUniqueName();
     const deployed = await runIExecCliRaw(`${iexecPath} app deploy`);
@@ -60,67 +53,23 @@ describe('iexec app', () => {
       expect(res.app.owner).toBe(userWallet.address);
       expect(res.app.mrenclave).toBeUndefined();
     });
-
-    test('--tee', async () => {
-      const raw = await execAsync(`${iexecPath} app init --tee --raw`);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.app).toBeDefined();
-      expect(res.app.mrenclave).toBeDefined();
-      expect(res.app.mrenclave.framework).toBe('SCONE');
-    });
-
-    test('--tee-framework gramine', async () => {
-      const raw = await execAsync(
-        `${iexecPath} app init --tee-framework gramine --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.app).toBeDefined();
-      expect(res.app.mrenclave).toBeDefined();
-      expect(res.app.mrenclave.framework).toBe('GRAMINE');
-    });
-
-    test('--tee-framework scone', async () => {
-      const raw = await execAsync(
-        `${iexecPath} app init --tee-framework scone --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.app).toBeDefined();
-      expect(res.app.mrenclave).toBeDefined();
-      expect(res.app.mrenclave.framework).toBe('SCONE');
-    });
-
-    test('--tee-framework tdx', async () => {
-      const raw = await execAsync(
-        `${iexecPath} app init --tee-framework tdx --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.app).toBeDefined();
-      expect(res.app.mrenclave).toBeUndefined();
-    });
   });
 
   describe('deploy', () => {
     test('iexec app deploy', async () => {
-      await execAsync(`${iexecPath} app init --tee --raw`);
+      await execAsync(`${iexecPath} app init`);
       await setAppUniqueName();
       const raw = await execAsync(`${iexecPath} app deploy --raw`);
       const res = JSON.parse(raw);
       expect(res.ok).toBe(true);
       expect(res.address).toBeDefined();
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
     });
   });
 
   describe('show', () => {
     test('iexec app show (from deployed.json)', async () => {
-      await execAsync(`${iexecPath} app init --tee --raw`);
+      await execAsync(`${iexecPath} app init`);
       await setAppUniqueName();
       const { address } = await execAsync(`${iexecPath} app deploy --raw`).then(
         JSON.parse,
@@ -189,9 +138,6 @@ describe('iexec app', () => {
       expect(res.address).toBe(address);
       expect(res.to).toBe(receiverAddress);
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
     });
   });
 
@@ -207,7 +153,7 @@ describe('iexec app', () => {
         workClockTimeRef: '0',
       }).then(({ catid }) => catid.toString());
       // restore user wallet
-      await setWallet(userWallet.privateKey);
+      await setWallet(testChain)(userWallet.privateKey);
       await execAsync(`${iexecPath} app init`);
       await setAppUniqueName();
       await execAsync(`${iexecPath} dataset init`);
@@ -304,7 +250,7 @@ describe('iexec app', () => {
     test('iexec app run --workerpool deployed --dataset deployed --params <params> --tag <tag> --category <catid> --beneficiary <address> --callback <address>', async () => {
       const beneficiary = getRandomAddress();
       const raw = await execAsync(
-        `${iexecPath} app run --workerpool deployed --dataset deployed --params '{"iexec_args":"test params"}' --tag tee,scone,gpu --category 1 --beneficiary 0x0000000000000000000000000000000000000000 --callback ${beneficiary} --skip-preflight-check --force --raw`,
+        `${iexecPath} app run --workerpool deployed --dataset deployed --params '{"iexec_args":"test params"}' --tag tee,tdx,gpu --category 1 --beneficiary 0x0000000000000000000000000000000000000000 --callback ${beneficiary} --skip-preflight-check --force --raw`,
       );
       const res = JSON.parse(raw);
       expect(res.ok).toBe(true);
@@ -333,17 +279,15 @@ describe('iexec app', () => {
       expect(resDeal.deal.beneficiary).toBe(NULL_ADDRESS);
       expect(resDeal.deal.botFirst).toBe('0');
       expect(resDeal.deal.botSize).toBe('1');
-      expect(resDeal.deal.tag).toBe(
-        '0x0000000000000000000000000000000000000000000000000000000000000103',
-      );
+      expect(resDeal.deal.tag).toBe(encodeTag(['tee', 'tdx', 'gpu']));
       expect(resDeal.deal.trust).toBe('1');
       expect(Object.keys(resDeal.deal.tasks).length).toBe(1);
       expect(resDeal.deal.tasks['0']).toBeDefined();
     });
 
-    test('iexec app run --workerpool deployed --dataset deployed --args <args> --encrypt-result --input-files https://example.com/foo.txt,https://example.com/bar.zip --storage-provider dropbox --tag tee,scone', async () => {
+    test('iexec app run --workerpool deployed --dataset deployed --args <args> --encrypt-result --input-files https://example.com/foo.txt,https://example.com/bar.zip --storage-provider dropbox --tag tee,tdx', async () => {
       const raw = await execAsync(
-        `${iexecPath} app run --workerpool deployed --args 'command --help' --encrypt-result --input-files https://example.com/foo.txt,https://example.com/bar.zip --storage-provider dropbox --tag tee,scone --skip-preflight-check --force --raw`,
+        `${iexecPath} app run --workerpool deployed --args 'command --help' --encrypt-result --input-files https://example.com/foo.txt,https://example.com/bar.zip --storage-provider dropbox --tag tee,tdx --skip-preflight-check --force --raw`,
       );
       const res = JSON.parse(raw);
       expect(res.ok).toBe(true);
@@ -374,9 +318,7 @@ describe('iexec app', () => {
       expect(resDeal.deal.beneficiary).toBe(userWallet.address);
       expect(resDeal.deal.botFirst).toBe('0');
       expect(resDeal.deal.botSize).toBe('1');
-      expect(resDeal.deal.tag).toBe(
-        '0x0000000000000000000000000000000000000000000000000000000000000003',
-      );
+      expect(resDeal.deal.tag).toBe(encodeTag(['tee', 'tdx']));
       expect(resDeal.deal.trust).toBe('1');
       expect(Object.keys(resDeal.deal.tasks).length).toBe(1);
       expect(resDeal.deal.tasks['0']).toBeDefined();
@@ -410,170 +352,6 @@ describe('iexec app', () => {
       expect(res.failedTasks[0].statusName).toBe('TIMEOUT');
       expect(res.failedTasks[0].taskTimedOut).toBe(true);
     });
-
-    describe('iexec app run --use-voucher', () => {
-      beforeAll(async () => {
-        await runIExecCliRaw(
-          `${iexecPath} dataset publish ${userDataset} --price 2 nRLC --volume 100 --app-restrict ${userApp} --force`,
-        );
-
-        await execAsync(`${iexecPath} order init --request`);
-        await editRequestorder({
-          app: userApp,
-          dataset: userDataset,
-          workerpool: testChain.prodWorkerpool,
-          appmaxprice: '1000',
-          workerpoolmaxprice: '1000',
-          datasetmaxprice: '1000',
-          category: 0,
-          volume: '1',
-        });
-        await execAsync(
-          `${iexecPath} order sign --request --skip-preflight-check --raw`,
-        );
-      });
-
-      test('fail without voucher', async () => {
-        const raw = await execAsync(
-          `${iexecPath} app run --workerpool ${userWokerpool} --dataset ${userDataset} --use-voucher --skip-preflight-check --force --raw`,
-        ).catch((e) => e.message);
-        const res = JSON.parse(raw);
-        expect(res.ok).toBe(false);
-        expect(res.error.message).toBe(
-          `No voucher available for the requester ${userWallet.address}`,
-        );
-      });
-
-      test('should create a deal and match orders with voucher', async () => {
-        const voucherType = await createVoucherType(testChain)({});
-        await createVoucher(testChain)({
-          owner: userWallet.address,
-          voucherType,
-          value: 1000 + 2, // workerpoolprice + datasetprice nRLC
-        });
-        await addVoucherEligibleAsset(testChain)(
-          testChain.prodWorkerpool,
-          voucherType,
-        );
-        await addVoucherEligibleAsset(testChain)(userDataset, voucherType);
-
-        const raw = await execAsync(
-          `${iexecPath} app run --workerpool ${testChain.prodWorkerpool} --dataset ${userDataset} --use-voucher --skip-preflight-check --force --raw`,
-        ).catch((e) => e.message);
-        const res = JSON.parse(raw);
-        expect(res.ok).toBe(true);
-        expect(res.deals).toBeDefined();
-        expect(res.deals.length).toBe(1);
-        expect(res.deals[0].volume).toBe('1');
-        expect(res.deals[0].dealid).toBeDefined();
-        expect(res.deals[0].txHash).toBeDefined();
-
-        const rawDeal = await execAsync(
-          `${iexecPath} deal show ${res.deals[0].dealid} --raw`,
-        );
-        const ensRaw = await execAsync(
-          `${iexecPath} ens resolve ${testChain.prodWorkerpool} --raw`,
-        );
-        const workerpool = JSON.parse(ensRaw);
-
-        const resDeal = JSON.parse(rawDeal);
-
-        expect(resDeal.ok).toBe(true);
-        expect(resDeal.deal).toBeDefined();
-        expect(resDeal.deal.app.pointer).toBe(userApp);
-        expect(resDeal.deal.app.price).toBe('0');
-        expect(resDeal.deal.dataset.pointer).toBe(userDataset);
-        expect(resDeal.deal.dataset.price).toBe('0');
-        expect(resDeal.deal.workerpool.pointer).toBe(workerpool.address);
-        expect(resDeal.deal.category).toBe('0');
-        expect(resDeal.deal.callback).toBe(NULL_ADDRESS);
-        expect(resDeal.deal.requester).toBe(userWallet.address);
-        expect(resDeal.deal.beneficiary).toBe(userWallet.address);
-        expect(resDeal.deal.params).toBe(
-          `{"iexec_result_storage_provider":"ipfs"}`,
-        );
-        expect(resDeal.deal.botFirst).toBe('0');
-        expect(resDeal.deal.botSize).toBe('1');
-        expect(resDeal.deal.trust).toBe('1');
-        expect(Object.keys(resDeal.deal.tasks).length).toBe(1);
-        expect(resDeal.deal.tasks['0']).toBeDefined();
-      });
-      describe('--voucher-address', () => {
-        test('should create a deal and match orders with selected voucher', async () => {
-          const { iexec: iexecVoucherOwner, wallet: voucherOwnerWallet } =
-            getTestConfig(testChain)();
-          const voucherType = await createVoucherType(testChain)({});
-          await addVoucherEligibleAsset(testChain)(
-            testChain.prodWorkerpool,
-            voucherType,
-          );
-          await addVoucherEligibleAsset(testChain)(userDataset, voucherType);
-          const voucherAddress = await createVoucher(testChain)({
-            owner: voucherOwnerWallet.address,
-            voucherType,
-            value: 1000,
-          });
-          await iexecVoucherOwner.voucher.authorizeRequester(
-            userWallet.address,
-          );
-          // create dedicated order
-          await createAndPublishWorkerpoolOrder(testChain)({
-            workerpool: testChain.prodWorkerpool,
-            workerpoolOwnerWallet: testChain.prodWorkerpoolOwnerWallet,
-            price: 1,
-            volume: 1,
-            requesterrestrict: userWallet.address,
-          });
-
-          const raw = await execAsync(
-            `${iexecPath} app run --workerpool ${testChain.prodWorkerpool} --dataset ${userDataset} --use-voucher --voucher-address ${voucherAddress} --skip-preflight-check --force --raw`,
-          ).catch((e) => e.message);
-          const res = JSON.parse(raw);
-
-          expect(res.ok).toBe(true);
-          expect(res.deals).toBeDefined();
-          expect(res.deals.length).toBe(1);
-          expect(res.deals[0].volume).toBe('1');
-          expect(res.deals[0].dealid).toBeDefined();
-          expect(res.deals[0].txHash).toBeDefined();
-
-          const rawDeal = await execAsync(
-            `${iexecPath} deal show ${res.deals[0].dealid} --raw`,
-          );
-          const ensRaw = await execAsync(
-            `${iexecPath} ens resolve ${testChain.prodWorkerpool} --raw`,
-          );
-          const workerpool = JSON.parse(ensRaw);
-
-          const resDeal = JSON.parse(rawDeal);
-
-          expect(resDeal.ok).toBe(true);
-          expect(resDeal.deal).toBeDefined();
-          expect(resDeal.deal.app.pointer).toBe(userApp);
-          expect(resDeal.deal.app.price).toBe('0');
-          expect(resDeal.deal.dataset.pointer).toBe(userDataset);
-          expect(resDeal.deal.dataset.price).toBe('0');
-          expect(resDeal.deal.workerpool.pointer).toBe(workerpool.address);
-          expect(resDeal.deal.category).toBe('0');
-          expect(resDeal.deal.callback).toBe(NULL_ADDRESS);
-          expect(resDeal.deal.requester).toBe(userWallet.address);
-          expect(resDeal.deal.beneficiary).toBe(userWallet.address);
-          expect(resDeal.deal.params).toBe(
-            `{"iexec_result_storage_provider":"ipfs"}`,
-          );
-          expect(resDeal.deal.botFirst).toBe('0');
-          expect(resDeal.deal.botSize).toBe('1');
-          expect(resDeal.deal.trust).toBe('1');
-          expect(Object.keys(resDeal.deal.tasks).length).toBe(1);
-          expect(resDeal.deal.tasks['0']).toBeDefined();
-
-          const tx = await testChain.provider.getTransaction(
-            res.deals[0].txHash,
-          );
-          expect(tx.to).toBe(voucherAddress);
-        });
-      });
-    });
   });
 
   describe('push-secret / check-secret', () => {
@@ -605,20 +383,6 @@ describe('iexec app', () => {
       );
       expect(resPushed.ok).toBe(true);
       expect(resPushed.isSecretSet).toBe(true);
-
-      const resGramineNotPushed = await runIExecCliRaw(
-        `${iexecPath} app check-secret ${appAddress} --tee-framework gramine`,
-      );
-      expect(resGramineNotPushed.ok).toBe(true);
-      expect(resGramineNotPushed.isSecretSet).toBe(false);
-      await runIExecCliRaw(
-        `${iexecPath} app push-secret ${appAddress} --secret-value foo --tee-framework gramine`,
-      );
-      const resGraminePushed = await runIExecCliRaw(
-        `${iexecPath} app check-secret ${appAddress} --tee-framework gramine`,
-      );
-      expect(resGraminePushed.ok).toBe(true);
-      expect(resGraminePushed.isSecretSet).toBe(true);
     });
   });
 
@@ -646,11 +410,6 @@ describe('iexec app', () => {
     });
 
     test('from app address with options', async () => {
-      await expect(
-        execAsync(
-          `${iexecPath} app publish ${userFirstDeployedAppAddress} --price 0.1 RLC --volume 100 --tag tee,scone --force`,
-        ),
-      ).rejects.toThrow('Tag mismatch the TEE framework specified by app');
       const res = await runIExecCliRaw(
         `${iexecPath} app publish ${userFirstDeployedAppAddress} --price 0.1 RLC --volume 100 --force`,
       );
@@ -671,6 +430,28 @@ describe('iexec app', () => {
         salt: orderShowRes.apporder.order.salt,
       });
     });
+
+    test('from app address with tag', async () => {
+      const res = await runIExecCliRaw(
+        `${iexecPath} app publish ${userFirstDeployedAppAddress} --price 0.1 RLC --volume 100 --tag tee,tdx --force`,
+      );
+      expect(res.ok).toBe(true);
+      expect(res.orderHash).toBeDefined();
+      const orderShowRes = JSON.parse(
+        await execAsync(`${iexecPath} order show --app ${res.orderHash} --raw`),
+      );
+      expect(orderShowRes.apporder.order).toEqual({
+        app: userFirstDeployedAppAddress,
+        appprice: 100000000,
+        volume: 100,
+        tag: encodeTag(['tee', 'tdx']),
+        datasetrestrict: NULL_ADDRESS,
+        workerpoolrestrict: NULL_ADDRESS,
+        requesterrestrict: NULL_ADDRESS,
+        sign: orderShowRes.apporder.order.sign,
+        salt: orderShowRes.apporder.order.salt,
+      });
+    });
   });
 
   describe('unpublish', () => {
diff --git a/test/cli/cli-iexec-category.test.js b/test/cli/cli-iexec-category.test.js
index 2c9f05d2..b5073cb9 100644
--- a/test/cli/cli-iexec-category.test.js
+++ b/test/cli/cli-iexec-category.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { TEST_CHAINS, execAsync } from '../test-utils.js';
 import {
@@ -13,7 +11,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec category', () => {
   beforeAll(async () => {
@@ -27,7 +25,7 @@ describe('iexec category', () => {
   });
   describe('as user', () => {
     beforeAll(async () => {
-      await setRandomWallet();
+      await setRandomWallet(testChain)();
     });
 
     test('iexec category init', async () => {
@@ -79,9 +77,6 @@ describe('iexec category', () => {
       expect(res.ok).toBe(true);
       expect(res.catid).toBeDefined();
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
     });
   });
 });
diff --git a/test/cli/cli-iexec-dataset.test.js b/test/cli/cli-iexec-dataset.test.js
index b2cf927f..66ddabd7 100644
--- a/test/cli/cli-iexec-dataset.test.js
+++ b/test/cli/cli-iexec-dataset.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   NULL_ADDRESS,
@@ -20,7 +18,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec dataset', () => {
   let userWallet;
@@ -31,7 +29,7 @@ describe('iexec dataset', () => {
     // init the project
     await execAsync(`${iexecPath} init --skip-wallet --force`);
     await setChain(testChain)();
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
     await execAsync(`${iexecPath} dataset init`);
     await setDatasetUniqueName();
     const deployed = await runIExecCliRaw(`${iexecPath} dataset deploy`);
@@ -81,9 +79,6 @@ describe('iexec dataset', () => {
       expect(res.ok).toBe(true);
       expect(res.address).toBeDefined();
       expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
     });
   });
 
@@ -228,29 +223,6 @@ describe('iexec dataset', () => {
       expect(resAlreadyExists.error.message).toBe(
         `Secret already exists for ${address} and can't be updated`,
       );
-      // new dataset to push secret on another TEE framework
-      await execAsync(`${iexecPath} dataset init`);
-      await setDatasetUniqueName();
-      const { address: address2 } = JSON.parse(
-        await execAsync(`${iexecPath} dataset deploy --raw`),
-      );
-      await expect(
-        execAsync(
-          `${iexecPath} dataset push-secret ${address2} --tee-framework foo --raw`,
-        ),
-      ).rejects.toThrow();
-      const resPush2 = JSON.parse(
-        await execAsync(
-          `${iexecPath} dataset push-secret ${address2} --tee-framework gramine --raw`,
-        ),
-      );
-      expect(resPush2.ok).toBe(true);
-      const resAlreadyExists2 = JSON.parse(
-        await execAsync(
-          `${iexecPath} dataset push-secret ${address2} --tee-framework gramine --raw`,
-        ).catch((e) => e.message),
-      );
-      expect(resAlreadyExists2.ok).toBe(false);
     });
 
     test('iexec dataset check-secret', async () => {
@@ -271,53 +243,6 @@ describe('iexec dataset', () => {
       const resAlreadyExists = JSON.parse(rawAlreadyExists);
       expect(resAlreadyExists.ok).toBe(true);
       expect(resAlreadyExists.isSecretSet).toBe(true);
-      const rawRandomDataset = await execAsync(
-        `${iexecPath} dataset check-secret ${getRandomAddress()} --raw`,
-      );
-      const resRandomDataset = JSON.parse(rawRandomDataset);
-      expect(resRandomDataset.ok).toBe(true);
-      expect(resRandomDataset.isSecretSet).toBe(false);
-
-      // testing on gramine dataset
-
-      await execAsync(`${iexecPath} dataset init`);
-      await setDatasetUniqueName();
-      await execAsync(`${iexecPath} dataset deploy --raw`);
-      const resMyDataset2 = JSON.parse(
-        await execAsync(`${iexecPath} dataset check-secret --raw`),
-      );
-      expect(resMyDataset2.ok).toBe(true);
-      expect(resMyDataset2.isSecretSet).toBe(false);
-
-      await execAsync(
-        `${iexecPath} dataset push-secret --tee-framework gramine --raw`,
-      );
-      const rawWrongTee = await execAsync(
-        `${iexecPath} dataset check-secret --raw`,
-      );
-      const resWrongTee = JSON.parse(rawWrongTee);
-      expect(resWrongTee.ok).toBe(true);
-      expect(resWrongTee.isSecretSet).toBe(false);
-
-      const rawGoodTee = await execAsync(
-        `${iexecPath} dataset check-secret --tee-framework gramine --raw`,
-      );
-      const resGoodTee = JSON.parse(rawGoodTee);
-      expect(resGoodTee.ok).toBe(true);
-      expect(resGoodTee.isSecretSet).toBe(true);
-
-      const rawRandomDataset2 = await execAsync(
-        `${iexecPath} dataset check-secret ${getRandomAddress()} --raw`,
-      );
-      const resRandomDataset2 = JSON.parse(rawRandomDataset2);
-      expect(resRandomDataset2.ok).toBe(true);
-      expect(resRandomDataset2.isSecretSet).toBe(false);
-
-      await expect(
-        execAsync(
-          `${iexecPath} dataset check-secret ${getRandomAddress()} --tee-framework foo --raw`,
-        ),
-      ).rejects.toThrow();
     });
   });
 
@@ -371,7 +296,7 @@ describe('iexec dataset', () => {
       const appAddress = getRandomAddress();
       await expect(
         execAsync(
-          `${iexecPath} dataset publish ${userFirstDeployedDatasetAddress} --price 0.1 RLC --volume 100 --tag tee,scone --app-restrict ${appAddress} --force`,
+          `${iexecPath} dataset publish ${userFirstDeployedDatasetAddress} --price 0.1 RLC --volume 100 --tag tee,tdx --app-restrict ${appAddress} --force`,
         ),
       ).rejects.toThrow(
         `Dataset encryption key is not set for dataset ${userFirstDeployedDatasetAddress} in the SMS. Dataset decryption will fail.`,
diff --git a/test/cli/cli-iexec-deal.test.js b/test/cli/cli-iexec-deal.test.js
index f5407c10..182ad049 100644
--- a/test/cli/cli-iexec-deal.test.js
+++ b/test/cli/cli-iexec-deal.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   TEST_CHAINS,
@@ -18,7 +16,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec deal', () => {
   let userWallet;
@@ -39,7 +37,7 @@ describe('iexec deal', () => {
       workClockTimeRef: '0',
     }).then(({ catid }) => catid.toString());
     // restore user wallet
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
     await execAsync(`${iexecPath} app init`);
     await execAsync(`${iexecPath} dataset init`);
     await execAsync(`${iexecPath} workerpool init`);
diff --git a/test/cli/cli-iexec-ens.test.js b/test/cli/cli-iexec-ens.test.js
deleted file mode 100644
index e4baf4dc..00000000
--- a/test/cli/cli-iexec-ens.test.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect } from '@jest/globals';
-import { TEST_CHAINS, execAsync } from '../test-utils.js';
-import {
-  globalSetup,
-  globalTeardown,
-  iexecPath,
-  runIExecCliRaw,
-  setChain,
-  setRandomWallet,
-} from './cli-test-utils.js';
-import '../jest-setup.js';
-
-const testChain = TEST_CHAINS['bellecour-fork'];
-
-describe('iexec ens', () => {
-  let userWallet;
-  let app;
-  let dataset;
-  let workerpool;
-
-  beforeAll(async () => {
-    await globalSetup('cli-iexec-ens');
-    await execAsync(`${iexecPath} init --skip-wallet --force`);
-    await setChain(testChain)();
-    userWallet = await setRandomWallet();
-    await execAsync(`${iexecPath} app init`);
-    await execAsync(`${iexecPath} dataset init`);
-    await execAsync(`${iexecPath} workerpool init`);
-    app = await execAsync(`${iexecPath} app deploy --raw`).then(
-      (res) => JSON.parse(res).address,
-    );
-    dataset = await execAsync(`${iexecPath} dataset deploy --raw`).then(
-      (res) => JSON.parse(res).address,
-    );
-    workerpool = await execAsync(`${iexecPath} workerpool deploy --raw`).then(
-      (res) => JSON.parse(res).address,
-    );
-  });
-
-  afterAll(async () => {
-    await globalTeardown();
-  });
-
-  describe('register', () => {
-    test('iexec ens register <name> (for self)', async () => {
-      const expectedEns = `${userWallet.address.toLowerCase()}.users.iexec.eth`;
-      const res = await runIExecCliRaw(
-        `${iexecPath} ens register ${userWallet.address.toLowerCase()}`,
-      );
-      expect(res.ok).toBe(true);
-      expect(res.name).toBe(expectedEns);
-      expect(res.address).toBe(userWallet.address);
-      expect(res.registerTxHash).toBeTxHash();
-      expect(res.setResolverTxHash).toBeTxHash();
-      expect(res.setAddrTxHash).toBeTxHash();
-      expect(res.setNameTxHash).toBeTxHash();
-      await testChain.provider.getTransaction(res.registerTxHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-      await testChain.provider
-        .getTransaction(res.setResolverTxHash)
-        .then((tx) => {
-          expect(tx.gasPrice.toString()).toBe('0');
-        });
-      await testChain.provider.getTransaction(res.setAddrTxHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-      await testChain.provider.getTransaction(res.setNameTxHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-
-      const showAddressRes = await runIExecCliRaw(`${iexecPath} wallet show`);
-      expect(showAddressRes.ens).toBe(expectedEns);
-
-      const showEnsRes = await runIExecCliRaw(
-        `${iexecPath} wallet show ${expectedEns}`,
-      );
-      expect(showEnsRes.ens).toBe(expectedEns);
-    });
-
-    test('iexec ens register <name> --for <app>', async () => {
-      const expectedEns = `${app.toLowerCase()}.apps.iexec.eth`;
-      const res = await runIExecCliRaw(
-        `${iexecPath} ens register ${app.toLowerCase()} --for ${app}`,
-      );
-      expect(res.ok).toBe(true);
-      expect(res.name).toBe(expectedEns);
-      expect(res.address).toBe(app);
-      expect(res.registerTxHash).toBeTxHash();
-      expect(res.setResolverTxHash).toBeTxHash();
-      expect(res.setAddrTxHash).toBeTxHash();
-      expect(res.setNameTxHash).toBeTxHash();
-
-      const showAddressRes = await runIExecCliRaw(
-        `${iexecPath} app show ${app}`,
-      );
-      expect(showAddressRes.ens).toBe(expectedEns);
-
-      const showEnsRes = await runIExecCliRaw(
-        `${iexecPath} app show ${expectedEns}`,
-      );
-      expect(showEnsRes.address).toBe(app);
-    });
-
-    test('iexec ens register <name> --for <dataset>', async () => {
-      const expectedEns = `${dataset.toLowerCase()}.datasets.iexec.eth`;
-      const res = await runIExecCliRaw(
-        `${iexecPath} ens register ${dataset.toLowerCase()} --for ${dataset} --raw`,
-      );
-      expect(res.ok).toBe(true);
-      expect(res.name).toBe(expectedEns);
-      expect(res.address).toBe(dataset);
-      expect(res.registerTxHash).toBeTxHash();
-      expect(res.setResolverTxHash).toBeTxHash();
-      expect(res.setAddrTxHash).toBeTxHash();
-      expect(res.setNameTxHash).toBeTxHash();
-      const showAddressRes = await runIExecCliRaw(
-        `${iexecPath} dataset show ${dataset}`,
-      );
-      expect(showAddressRes.ens).toBe(expectedEns);
-
-      const showEnsRes = await runIExecCliRaw(
-        `${iexecPath} dataset show ${expectedEns}`,
-      );
-      expect(showEnsRes.address).toBe(dataset);
-    });
-
-    test('iexec ens register <name> --for <workerpool>', async () => {
-      const expectedEns = `${workerpool.toLowerCase()}.pools.iexec.eth`;
-      const res = await runIExecCliRaw(
-        `${iexecPath} ens register ${workerpool.toLowerCase()} --for ${workerpool} --raw`,
-      );
-      expect(res.ok).toBe(true);
-      expect(res.name).toBe(expectedEns);
-      expect(res.address).toBe(workerpool);
-      expect(res.registerTxHash).toBeTxHash();
-      expect(res.setResolverTxHash).toBeTxHash();
-      expect(res.setAddrTxHash).toBeTxHash();
-      expect(res.setNameTxHash).toBeTxHash();
-      const showAddressRes = await runIExecCliRaw(
-        `${iexecPath} workerpool show ${workerpool}`,
-      );
-      expect(showAddressRes.ens).toBe(expectedEns);
-
-      const showEnsRes = await runIExecCliRaw(
-        `${iexecPath} workerpool show ${expectedEns}`,
-      );
-      expect(showEnsRes.address).toBe(workerpool);
-    });
-  });
-});
diff --git a/test/cli/cli-iexec-info.test.js b/test/cli/cli-iexec-info.test.js
index 26935d88..69831a7a 100644
--- a/test/cli/cli-iexec-info.test.js
+++ b/test/cli/cli-iexec-info.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { TEST_CHAINS, execAsync } from '../test-utils.js';
 import {
@@ -10,17 +8,17 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
-
 describe('iexec info', () => {
   beforeAll(async () => {
     await globalSetup('cli-iexec-info');
-    await setChain(testChain)();
   });
   afterAll(async () => {
     await globalTeardown();
   });
-  test('iexec info', async () => {
+
+  test('iexec info (arbitrum-sepolia)', async () => {
+    const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
+    await setChain(testChain)();
     const raw = await execAsync(`${iexecPath} info --raw`);
     const res = JSON.parse(raw);
     expect(res.ok).toBe(true);
@@ -32,27 +30,27 @@ describe('iexec info', () => {
     expect(res.appRegistryAddress).toBeDefined();
     expect(res.datasetRegistryAddress).toBeDefined();
     expect(res.workerpoolRegistryAddress).toBeDefined();
-    expect(res.rlcAddress).toBeUndefined();
-    expect(res.useNative).toBe(true);
+    expect(res.rlcAddress).toBeDefined();
   });
 
-  test('iexec info --chain mainnet', async () => {
-    const raw = await execAsync(`${iexecPath} info --raw --chain mainnet`);
+  test('iexec info --chain arbitrum-mainnet', async () => {
+    const raw = await execAsync(
+      `${iexecPath} info --raw --chain arbitrum-mainnet`,
+    );
     const res = JSON.parse(raw);
     expect(res.ok).toBe(true);
     expect(res.host).toBe('default');
     expect(res.pocoVersion).toBeDefined();
-    expect(res.hubAddress).toBe('0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f');
+    expect(res.rlcAddress).toBe('0xe649e6a1F2afc63ca268C2363691ceCAF75CF47C');
+    expect(res.hubAddress).toBe('0x098bFCb1E50ebcA0BaA92C12eA0c3F045A1aD9f0');
     expect(res.appRegistryAddress).toBe(
-      '0xB1C52075b276f87b1834919167312221d50c9D16',
+      '0x9950D94fb074182ee93ff79A50Cd698C4983281F',
     );
     expect(res.datasetRegistryAddress).toBe(
-      '0x799DAa22654128d0C64d5b79eac9283008158730',
+      '0x07Cc4E1EA30dD02796795876509A3BfC5053128D',
     );
     expect(res.workerpoolRegistryAddress).toBe(
-      '0xC76A18c78B7e530A165c5683CB1aB134E21938B4',
+      '0xe3c13bb4A5068601c6A08041Cb50887B07B5F398',
     );
-    expect(res.rlcAddress).toBeDefined();
-    expect(res.useNative).toBe(false);
   });
 });
diff --git a/test/cli/cli-iexec-init.test.js b/test/cli/cli-iexec-init.test.js
index dd7e5fca..3eadaad9 100644
--- a/test/cli/cli-iexec-init.test.js
+++ b/test/cli/cli-iexec-init.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { TEST_CHAINS, execAsync } from '../test-utils.js';
 import {
@@ -11,7 +9,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec init', () => {
   beforeAll(async () => {
diff --git a/test/cli/cli-iexec-order.test.js b/test/cli/cli-iexec-order.test.js
index d62bbf5d..02452f92 100644
--- a/test/cli/cli-iexec-order.test.js
+++ b/test/cli/cli-iexec-order.test.js
@@ -1,13 +1,5 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect, beforeEach } from '@jest/globals';
-import {
-  TEST_CHAINS,
-  addVoucherEligibleAsset,
-  createVoucher,
-  createVoucherType,
-  execAsync,
-} from '../test-utils.js';
+import { describe, test, expect } from '@jest/globals';
+import { TEST_CHAINS, execAsync } from '../test-utils.js';
 import {
   editApporder,
   editDatasetorder,
@@ -16,14 +8,12 @@ import {
   globalSetup,
   globalTeardown,
   iexecPath,
-  runIExecCliRaw,
   setChain,
   setRandomWallet,
 } from './cli-test-utils.js';
 import '../jest-setup.js';
-import { getTestConfig } from '../test-config-utils.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec order', () => {
   let userWallet;
@@ -36,7 +26,7 @@ describe('iexec order', () => {
     // init the project
     await execAsync(`${iexecPath} init --skip-wallet --force`);
     await setChain(testChain)();
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
     await execAsync(`${iexecPath} app init`);
     await execAsync(`${iexecPath} dataset init`);
     await execAsync(`${iexecPath} workerpool init`);
@@ -139,21 +129,21 @@ describe('iexec order', () => {
     expect(res.requestorder.app).toBeDefined();
 
     await editRequestorder({
-      tag: ['tee', 'scone'],
+      tag: ['tee', 'tdx'],
     });
     await editWorkerpoolorder({
       tag: ['tee'],
     });
-    await editApporder({ tag: ['tee', 'scone'] });
-    await editDatasetorder({ tag: ['tee', 'scone'] });
+    await editApporder({ tag: ['tdx'] });
+    await editDatasetorder({ tag: ['tee', 'tdx'] });
     const failRes = await execAsync(`${iexecPath} order sign --raw`).then(
       JSON.parse,
     );
     expect(failRes.ok).toBe(false);
     expect(failRes.fail).toStrictEqual([
-      'apporder: App requirements check failed: Tag mismatch the TEE framework specified by app (If you consider this is not an issue, use --skip-preflight-check to skip preflight requirement check)',
+      "apporder: 'tdx' tag must be used with 'tee' tag",
       `datasetorder: Dataset requirements check failed: Dataset encryption key is not set for dataset ${userDataset} in the SMS. Dataset decryption will fail. (If you consider this is not an issue, use --skip-preflight-check to skip preflight requirement check)`,
-      "workerpoolorder: 'tee' tag must be used with a tee framework ('scone'|'gramine'|'tdx')",
+      "workerpoolorder: 'tee' tag must be used with a tee framework ('tdx')",
       `requestorder: Request requirements check failed: Dataset encryption key is not set for dataset ${userDataset} in the SMS. Dataset decryption will fail. (If you consider this is not an issue, use --skip-preflight-check to skip preflight requirement check)`,
     ]);
   });
@@ -167,9 +157,6 @@ describe('iexec order', () => {
     expect(res.volume).toBe('1');
     expect(res.dealid).toBeDefined();
     expect(res.txHash).toBeDefined();
-    await testChain.provider.getTransaction(res.txHash).then((tx) => {
-      expect(tx.gasPrice.toString()).toBe('0');
-    });
   });
 
   test('iexec order sign --app', async () => {
@@ -268,9 +255,6 @@ describe('iexec order', () => {
     expect(res.workerpoolorder).toBeUndefined();
     expect(res.requestorder).toBeUndefined();
     expect(res.fail).toBeUndefined();
-    await testChain.provider.getTransaction(res.apporder.txHash).then((tx) => {
-      expect(tx.gasPrice.toString()).toBe('0');
-    });
   });
 
   test('iexec order cancel --dataset', async () => {
@@ -286,11 +270,6 @@ describe('iexec order', () => {
     expect(res.workerpoolorder).toBeUndefined();
     expect(res.requestorder).toBeUndefined();
     expect(res.fail).toBeUndefined();
-    await testChain.provider
-      .getTransaction(res.datasetorder.txHash)
-      .then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
   });
 
   test('iexec order cancel --workerpool', async () => {
@@ -306,11 +285,6 @@ describe('iexec order', () => {
     expect(res.workerpoolorder.txHash).toBeDefined();
     expect(res.requestorder).toBeUndefined();
     expect(res.fail).toBeUndefined();
-    await testChain.provider
-      .getTransaction(res.workerpoolorder.txHash)
-      .then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
   });
 
   test('iexec order cancel --request', async () => {
@@ -328,115 +302,5 @@ describe('iexec order', () => {
     expect(res.requestorder).toBeDefined();
     expect(res.requestorder.txHash).toBeDefined();
     expect(res.fail).toBeUndefined();
-    await testChain.provider
-      .getTransaction(res.requestorder.txHash)
-      .then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-  });
-
-  describe('iexec order fill --use-voucher', () => {
-    let workerpoolOrderHash;
-    let datasetOrderHash;
-    let apporderHash;
-    let voucherType;
-
-    beforeAll(async () => {
-      const publishApporder = await runIExecCliRaw(
-        `${iexecPath} app publish ${userApp} --price 0.000000001 RLC --volume 100 --force`,
-      );
-      apporderHash = publishApporder.orderHash;
-      const publishDatasetorder = await runIExecCliRaw(
-        `${iexecPath} dataset publish ${userDataset} --price 0.000000002 RLC --volume 100 --app-restrict ${userApp} --force`,
-      );
-      datasetOrderHash = publishDatasetorder.orderHash;
-
-      const publishWorkerpoolorder = await runIExecCliRaw(
-        `${iexecPath} workerpool publish ${userWorkerpool} --price 0.000000003 RLC --volume 100 --category 0 --force`,
-      );
-      workerpoolOrderHash = publishWorkerpoolorder.orderHash;
-
-      await execAsync(`${iexecPath} order init --request`);
-      await editRequestorder({
-        app: userApp,
-        dataset: userDataset,
-        workerpool: userWorkerpool,
-        appmaxprice: '1000',
-        workerpoolmaxprice: '1000',
-        datasetmaxprice: '1000',
-        category: 0,
-        volume: '1',
-      });
-
-      voucherType = await createVoucherType(testChain)({});
-      await addVoucherEligibleAsset(testChain)(userWorkerpool, voucherType);
-      await addVoucherEligibleAsset(testChain)(userDataset, voucherType);
-      await addVoucherEligibleAsset(testChain)(userApp, voucherType);
-    });
-
-    beforeEach(async () => {
-      await execAsync(
-        `${iexecPath} order sign --request --skip-preflight-check --raw`,
-      );
-    });
-
-    test('fail without voucher', async () => {
-      const raw = await execAsync(
-        `${iexecPath} order fill --use-voucher --app ${apporderHash} --workerpool ${workerpoolOrderHash} --dataset ${datasetOrderHash} --skip-preflight-check --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        `No voucher available for the requester ${userWallet.address}`,
-      );
-    });
-
-    test('should match orders with voucher', async () => {
-      const voucherAddress = await createVoucher(testChain)({
-        owner: userWallet.address,
-        voucherType,
-        value: 6, // nRLC
-      });
-      const raw = await execAsync(
-        `${iexecPath} order fill --use-voucher --app ${apporderHash} --workerpool ${workerpoolOrderHash} --dataset ${datasetOrderHash} --skip-preflight-check --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.volume).toBe('1');
-      expect(res.dealid).toBeDefined();
-      expect(res.txHash).toBeDefined();
-      await testChain.provider.getTransaction(res.txHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx.to).toBe(voucherAddress);
-    });
-
-    describe('--voucher-address', () => {
-      test('should match orders with specified voucher', async () => {
-        const { iexec: iexecVoucherOwner, wallet: voucherOwnerWallet } =
-          getTestConfig(testChain)();
-        const voucherAddress = await createVoucher(testChain)({
-          owner: voucherOwnerWallet.address,
-          voucherType,
-          value: 6, // nRLC
-        });
-        await iexecVoucherOwner.voucher.authorizeRequester(userWallet.address);
-
-        const raw = await execAsync(
-          `${iexecPath} order fill --use-voucher --voucher-address ${voucherAddress} --app ${apporderHash} --workerpool ${workerpoolOrderHash} --dataset ${datasetOrderHash} --skip-preflight-check --raw`,
-        );
-        const res = JSON.parse(raw);
-        expect(res.ok).toBe(true);
-        expect(res.volume).toBe('1');
-        expect(res.dealid).toBeDefined();
-        expect(res.txHash).toBeDefined();
-        await testChain.provider.getTransaction(res.txHash).then((tx) => {
-          expect(tx.gasPrice.toString()).toBe('0');
-        });
-        const tx = await testChain.provider.getTransaction(res.txHash);
-        expect(tx.to).toBe(voucherAddress);
-      });
-    });
   });
 });
diff --git a/test/cli/cli-iexec-requester.test.js b/test/cli/cli-iexec-requester.test.js
index 2819d2e3..2478a5f8 100644
--- a/test/cli/cli-iexec-requester.test.js
+++ b/test/cli/cli-iexec-requester.test.js
@@ -1,12 +1,5 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
-import {
-  TEST_CHAINS,
-  TEE_FRAMEWORKS,
-  execAsync,
-  getRandomAddress,
-} from '../test-utils.js';
+import { TEST_CHAINS, execAsync, getRandomAddress } from '../test-utils.js';
 import {
   globalSetup,
   globalTeardown,
@@ -16,7 +9,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec requester', () => {
   let userWallet;
@@ -26,7 +19,7 @@ describe('iexec requester', () => {
     // init the project
     await execAsync(`${iexecPath} init --skip-wallet --force`);
     await setChain(testChain)();
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
   });
   afterAll(async () => {
     await globalTeardown();
@@ -85,39 +78,6 @@ describe('iexec requester', () => {
       expect(checkPushed.ok).toBe(true);
       expect(checkPushed.name).toBe('foo');
       expect(checkPushed.isSet).toBe(true);
-
-      // check secret TEE framework validation
-      await expect(
-        execAsync(
-          `${iexecPath} requester check-secret foo ${userWallet.address} --tee-framework tee --raw`,
-        ),
-      ).rejects.toThrow();
-
-      // check secret TEE framework override
-      const checkOtherFramework = JSON.parse(
-        await execAsync(
-          `${iexecPath} requester check-secret foo ${userWallet.address} --tee-framework ${TEE_FRAMEWORKS.GRAMINE} --raw`,
-        ),
-      );
-      expect(checkOtherFramework.ok).toBe(true);
-      expect(checkOtherFramework.name).toBe('foo');
-      expect(checkOtherFramework.isSet).toBe(false);
-
-      // push secret TEE framework override
-      const pushOtherFramework = JSON.parse(
-        await execAsync(
-          `${iexecPath} requester push-secret foo --secret-value foo --tee-framework ${TEE_FRAMEWORKS.GRAMINE} --raw`,
-        ),
-      );
-      expect(pushOtherFramework.ok).toBe(true);
-      const checkOtherFrameworkPushed = JSON.parse(
-        await execAsync(
-          `${iexecPath} requester check-secret foo ${userWallet.address} --tee-framework ${TEE_FRAMEWORKS.GRAMINE} --raw`,
-        ),
-      );
-      expect(checkOtherFrameworkPushed.ok).toBe(true);
-      expect(checkOtherFrameworkPushed.name).toBe('foo');
-      expect(checkOtherFrameworkPushed.isSet).toBe(true);
     });
   });
 });
diff --git a/test/cli/cli-iexec-result.test.js b/test/cli/cli-iexec-result.test.js
index a1e7e3fc..bf35550d 100644
--- a/test/cli/cli-iexec-result.test.js
+++ b/test/cli/cli-iexec-result.test.js
@@ -1,12 +1,5 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
-import {
-  TEST_CHAINS,
-  TEE_FRAMEWORKS,
-  execAsync,
-  getRandomAddress,
-} from '../test-utils.js';
+import { TEST_CHAINS, execAsync, getRandomAddress } from '../test-utils.js';
 import {
   globalSetup,
   globalTeardown,
@@ -17,7 +10,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec result', () => {
   let userWallet;
@@ -33,7 +26,7 @@ describe('iexec result', () => {
   });
 
   beforeEach(async () => {
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
   });
 
   describe('generate-encryption-keypair', () => {
@@ -79,21 +72,6 @@ describe('iexec result', () => {
       ).catch((e) => e.message);
       const resAlreadyExists = JSON.parse(rawAlreadyExists);
       expect(resAlreadyExists.ok).toBe(false);
-      const rawAlreadyExistsForTeeFramework = await execAsync(
-        `${iexecPath} result push-encryption-key --tee-framework scone --raw`,
-      ).catch((e) => e.message);
-      const resAlreadyExistsForTeeFramework = JSON.parse(
-        rawAlreadyExistsForTeeFramework,
-      );
-      expect(resAlreadyExistsForTeeFramework.ok).toBe(false);
-      const resNotExistsForTeeFramework = JSON.parse(
-        await execAsync(
-          `${iexecPath} result push-encryption-key --tee-framework gramine --raw`,
-        ),
-      );
-      expect(resNotExistsForTeeFramework.ok).toBe(true);
-      expect(resNotExistsForTeeFramework.isPushed).toBe(true);
-      expect(resNotExistsForTeeFramework.isUpdated).toBe(false);
     });
 
     test('iexec result push-encryption-key --force-update', async () => {
@@ -144,20 +122,6 @@ describe('iexec result', () => {
       const resExists = JSON.parse(rawExists);
       expect(resExists.ok).toBe(true);
       expect(resExists.isEncryptionKeySet).toBe(true);
-
-      const rawExistsOnTeeFramework = await execAsync(
-        `${iexecPath} result check-encryption-key --tee-framework ${TEE_FRAMEWORKS.SCONE} --raw`,
-      );
-      const resExistsOnTeeFramework = JSON.parse(rawExistsOnTeeFramework);
-      expect(resExistsOnTeeFramework.ok).toBe(true);
-      expect(resExistsOnTeeFramework.isEncryptionKeySet).toBe(true);
-
-      const rawNotExistsOnTeeFramework = await execAsync(
-        `${iexecPath} result check-encryption-key --tee-framework ${TEE_FRAMEWORKS.GRAMINE} --raw`,
-      );
-      const resNotExistsOnTeeFramework = JSON.parse(rawNotExistsOnTeeFramework);
-      expect(resNotExistsOnTeeFramework.ok).toBe(true);
-      expect(resNotExistsOnTeeFramework.isEncryptionKeySet).toBe(false);
     });
 
     test('check-secret (v4 legacy name)', async () => {
diff --git a/test/cli/cli-iexec-storage.test.js b/test/cli/cli-iexec-storage.test.js
index b2addbbf..ee40e8c2 100644
--- a/test/cli/cli-iexec-storage.test.js
+++ b/test/cli/cli-iexec-storage.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { TEST_CHAINS, execAsync, getRandomAddress } from '../test-utils.js';
 import {
@@ -11,7 +9,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec storage', () => {
   beforeAll(async () => {
@@ -22,46 +20,41 @@ describe('iexec storage', () => {
   });
 
   beforeEach(async () => {
-    await setRandomWallet();
+    await setRandomWallet(testChain)();
   });
 
   afterAll(async () => {
     await globalTeardown();
   });
 
-  test('iexec storage init', async () => {
-    const raw = await execAsync(`${iexecPath} storage init --raw`);
+  test('iexec storage init dropbox', async () => {
+    const raw = await execAsync(
+      `${iexecPath} storage init dropbox --token oops --raw`,
+    );
     const res = JSON.parse(raw);
     expect(res.ok).toBe(true);
     expect(res.isInitialized).toBe(true);
     expect(res.isUpdated).toBe(false);
     const rawAlreadyExists = await execAsync(
-      `${iexecPath} storage init --raw`,
+      `${iexecPath} storage init dropbox --token oops --raw`,
     ).catch((e) => e.message);
     const resAlreadyExists = JSON.parse(rawAlreadyExists);
     expect(resAlreadyExists.ok).toBe(false);
     expect(resAlreadyExists.error.message).toBe(
-      'default storage is already initialized, use --force-update option to update your storage token',
-    );
-    const rawInitWithTeeFramework = await execAsync(
-      `${iexecPath} storage init --tee-framework gramine --raw`,
+      'dropbox storage is already initialized, use --force-update option to update your storage token',
     );
-    const resInitWithTeeFramework = JSON.parse(rawInitWithTeeFramework);
-    expect(resInitWithTeeFramework.ok).toBe(true);
-    expect(resInitWithTeeFramework.isInitialized).toBe(true);
-    expect(resInitWithTeeFramework.isUpdated).toBe(false);
   });
 
-  test('iexec storage init --force-update', async () => {
+  test('iexec storage init dropbox --force-update', async () => {
     const raw = await execAsync(
-      `${iexecPath} storage init --force-update --raw`,
+      `${iexecPath} storage init dropbox --token oops --force-update --raw`,
     );
     const res = JSON.parse(raw);
     expect(res.ok).toBe(true);
     expect(res.isInitialized).toBe(true);
     expect(res.isUpdated).toBe(false);
     const rawAlreadyExists = await execAsync(
-      `${iexecPath} storage init --force-update --raw`,
+      `${iexecPath} storage init dropbox --token oops --force-update --raw`,
     );
     const resAlreadyExists = JSON.parse(rawAlreadyExists);
     expect(resAlreadyExists.ok).toBe(true);
@@ -69,90 +62,78 @@ describe('iexec storage', () => {
     expect(resAlreadyExists.isUpdated).toBe(true);
   });
 
-  test('iexec storage init dropbox', async () => {
+  test('iexec storage init ipfs - authentication not supported', async () => {
     const raw = await execAsync(
-      `${iexecPath} storage init dropbox --token oops --raw`,
-    );
-    const res = JSON.parse(raw);
-    expect(res.ok).toBe(true);
-    expect(res.isInitialized).toBe(true);
-    expect(res.isUpdated).toBe(false);
-    const rawAlreadyExists = await execAsync(
-      `${iexecPath} storage init dropbox --token oops --raw`,
+      `${iexecPath} storage init ipfs --token oops --raw`,
     ).catch((e) => e.message);
-    const resAlreadyExists = JSON.parse(rawAlreadyExists);
-    expect(resAlreadyExists.ok).toBe(false);
-    expect(resAlreadyExists.error.message).toBe(
-      'dropbox storage is already initialized, use --force-update option to update your storage token',
+    const res = JSON.parse(raw);
+    expect(res.ok).toBe(false);
+    expect(res.error.message).toBe(
+      'Storage provider "ipfs" does not support authentication tokens',
     );
   });
 
-  test('iexec storage init unsupported', async () => {
+  test('iexec storage init - unsupported provider', async () => {
     const raw = await execAsync(
       `${iexecPath} storage init unsupported --token oops --raw`,
     ).catch((e) => e.message);
     const res = JSON.parse(raw);
     expect(res.ok).toBe(false);
-    expect(res.error.message).toBe('"unsupported" not supported');
+    expect(res.error.message).toBe(
+      '"unsupported" is not a valid storage provider, use one of the supported providers (dropbox, ipfs)',
+    );
   });
 
-  test('iexec storage check', async () => {
-    const raw = await execAsync(`${iexecPath} storage check --raw`);
+  test('iexec storage check dropbox', async () => {
+    const raw = await execAsync(`${iexecPath} storage check dropbox --raw`);
     const res = JSON.parse(raw);
     expect(res.ok).toBe(true);
     expect(res.isInitialized).toBe(false);
-    await execAsync(`${iexecPath} storage init --raw`);
+    await execAsync(`${iexecPath} storage init dropbox --token oops --raw`);
     const rawAlreadyExists = await execAsync(
-      `${iexecPath} storage check --raw`,
+      `${iexecPath} storage check dropbox --raw`,
     );
     const resAlreadyExists = JSON.parse(rawAlreadyExists);
     expect(resAlreadyExists.ok).toBe(true);
     expect(resAlreadyExists.isInitialized).toBe(true);
-    const rawWithTeeFramework = await execAsync(
-      `${iexecPath} storage check --tee-framework gramine --raw`,
+  });
+
+  test('iexec storage check ipfs - authentication not supported', async () => {
+    const raw = await execAsync(`${iexecPath} storage check ipfs --raw`).catch(
+      (e) => e.message,
+    );
+    const res = JSON.parse(raw);
+    expect(res.ok).toBe(false);
+    expect(res.error.message).toBe(
+      'Storage provider "ipfs" does not support authentication tokens',
     );
-    const resWithTeeFramework = JSON.parse(rawWithTeeFramework);
-    expect(resWithTeeFramework.ok).toBe(true);
-    expect(resWithTeeFramework.isInitialized).toBe(false);
   });
 
-  test('iexec storage check --user', async () => {
-    const randomAddress = getRandomAddress();
+  test('iexec storage check - unsupported provider', async () => {
     const raw = await execAsync(
-      `${iexecPath} storage check --user ${randomAddress} --raw`,
-    );
+      `${iexecPath} storage check unsupported --raw`,
+    ).catch((e) => e.message);
     const res = JSON.parse(raw);
-    expect(res.ok).toBe(true);
-    expect(res.isInitialized).toBe(false);
-    await execAsync(`${iexecPath} storage init --raw`);
-    const rawAlreadyExists = await execAsync(
-      `${iexecPath} storage check --user ${randomAddress} --raw`,
+    expect(res.ok).toBe(false);
+    expect(res.error.message).toBe(
+      '"unsupported" is not a valid storage provider, use one of the supported providers (dropbox, ipfs)',
     );
-    const resAlreadyExists = JSON.parse(rawAlreadyExists);
-    expect(resAlreadyExists.ok).toBe(true);
-    expect(resAlreadyExists.isInitialized).toBe(false);
   });
 
-  test('iexec storage check dropbox', async () => {
-    const raw = await execAsync(`${iexecPath} storage check dropbox --raw`);
+  test('iexec storage check dropbox --user', async () => {
+    const randomAddress = getRandomAddress();
+    const raw = await execAsync(
+      `${iexecPath} storage check dropbox --user ${randomAddress} --raw`,
+    );
     const res = JSON.parse(raw);
     expect(res.ok).toBe(true);
     expect(res.isInitialized).toBe(false);
     await execAsync(`${iexecPath} storage init dropbox --token oops --raw`);
     const rawAlreadyExists = await execAsync(
-      `${iexecPath} storage check dropbox --raw`,
+      `${iexecPath} storage check dropbox --user ${randomAddress} --raw`,
     );
     const resAlreadyExists = JSON.parse(rawAlreadyExists);
     expect(resAlreadyExists.ok).toBe(true);
-    expect(resAlreadyExists.isInitialized).toBe(true);
-  });
-
-  test('iexec storage check unsupported', async () => {
-    const raw = await execAsync(
-      `${iexecPath} storage check unsupported --raw`,
-    ).catch((e) => e.message);
-    const res = JSON.parse(raw);
-    expect(res.ok).toBe(false);
-    expect(res.error.message).toBe('"unsupported" not supported');
+    expect(resAlreadyExists.isInitialized).toBe(false);
   });
 });
diff --git a/test/cli/cli-iexec-task.test.js b/test/cli/cli-iexec-task.test.js
index 85b03e49..5ed6f0bf 100644
--- a/test/cli/cli-iexec-task.test.js
+++ b/test/cli/cli-iexec-task.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   TEST_CHAINS,
@@ -19,7 +17,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec task', () => {
   let userApp;
@@ -38,7 +36,7 @@ describe('iexec task', () => {
       workClockTimeRef: '0',
     }).then(({ catid }) => catid.toString());
     // restore user wallet
-    await setRandomWallet();
+    await setRandomWallet(testChain)();
     await execAsync(`${iexecPath} app init`);
     await execAsync(`${iexecPath} dataset init`);
     await execAsync(`${iexecPath} workerpool init`);
diff --git a/test/cli/cli-iexec-voucher.test.js b/test/cli/cli-iexec-voucher.test.js
deleted file mode 100644
index 7808bb52..00000000
--- a/test/cli/cli-iexec-voucher.test.js
+++ /dev/null
@@ -1,211 +0,0 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect } from '@jest/globals';
-import {
-  TEST_CHAINS,
-  addVoucherEligibleAsset,
-  createVoucher,
-  createVoucherType,
-  execAsync,
-  getRandomAddress,
-} from '../test-utils.js';
-import {
-  globalSetup,
-  globalTeardown,
-  iexecPath,
-  runIExecCliRaw,
-  setAppUniqueName,
-  setChain,
-  setDatasetUniqueName,
-  setRandomWallet,
-  setWallet,
-  setWorkerpoolUniqueDescription,
-} from './cli-test-utils.js';
-import '../jest-setup.js';
-
-const testChain = TEST_CHAINS['bellecour-fork'];
-
-describe('iexec voucher', () => {
-  let userWallet;
-  let voucherType;
-  let voucherValue;
-  let deployedAppAddress;
-  let deployedDatasetAddress;
-  let deployedWorkerpoolAddress;
-  let requesterAddress;
-  beforeAll(async () => {
-    await globalSetup('cli-iexec-voucher');
-    await execAsync(`${iexecPath} init --skip-wallet --force`);
-    await setChain(testChain)();
-    userWallet = await setRandomWallet();
-
-    voucherType = await createVoucherType(testChain)({});
-    voucherValue = 1000;
-    await createVoucher(testChain)({
-      owner: userWallet.address,
-      voucherType,
-      value: voucherValue,
-    });
-    requesterAddress = await getRandomAddress();
-  });
-
-  afterAll(async () => {
-    await globalTeardown();
-  });
-
-  describe('show', () => {
-    test('returns voucher details when user has one without sponsored assets', async () => {
-      const raw = await execAsync(`${iexecPath} voucher show --raw`);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.address).toBeDefined();
-      expect(parseInt(res.balance, 16)).toBe(Number(voucherValue));
-      expect(parseInt(res.type, 16)).toBe(Number(voucherType));
-      expect(res.owner).toBe(userWallet.address);
-      expect(res.expirationTimestamp).toBeDefined();
-      expect(res.allowanceAmount).toBeDefined();
-      expect(res.sponsoredApps).toEqual([]);
-      expect(res.sponsoredDatasets).toEqual([]);
-      expect(res.sponsoredWorkerpools).toEqual([]);
-      expect(res.authorizedAccounts).toEqual([]);
-    });
-
-    test('returns voucher details when user has one with sponsored assets', async () => {
-      // deploy and add eligible assets (app, dataset, workerpool)
-      await execAsync(`${iexecPath} app init`);
-      await setAppUniqueName();
-      const deployedApp = await runIExecCliRaw(`${iexecPath} app deploy`);
-      deployedAppAddress = deployedApp.address;
-      await addVoucherEligibleAsset(testChain)(deployedAppAddress, voucherType);
-
-      await execAsync(`${iexecPath} dataset init`);
-      await setDatasetUniqueName();
-      const deployedDataset = await runIExecCliRaw(
-        `${iexecPath} dataset deploy`,
-      );
-      deployedDatasetAddress = deployedDataset.address;
-      await addVoucherEligibleAsset(testChain)(
-        deployedDatasetAddress,
-        voucherType,
-      );
-
-      await execAsync(`${iexecPath} workerpool init`);
-      await setWorkerpoolUniqueDescription();
-      const deployedWorkerpool = await runIExecCliRaw(
-        `${iexecPath} workerpool deploy`,
-      );
-      deployedWorkerpoolAddress = deployedWorkerpool.address;
-      await addVoucherEligibleAsset(testChain)(
-        deployedWorkerpoolAddress,
-        voucherType,
-      );
-
-      const randomRequesterAddress = await getRandomAddress();
-
-      await execAsync(
-        `${iexecPath} voucher authorize ${randomRequesterAddress} --raw`,
-      );
-
-      const raw = await execAsync(`${iexecPath} voucher show --raw`);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.address).toBeDefined();
-      expect(parseInt(res.balance, 16)).toBe(Number(voucherValue));
-      expect(parseInt(res.type, 16)).toBe(Number(voucherType));
-      expect(res.owner).toBe(userWallet.address);
-      expect(res.expirationTimestamp).toBeDefined();
-      expect(res.allowanceAmount).toBeDefined();
-      expect(res.sponsoredApps).toEqual([deployedAppAddress]);
-      expect(res.sponsoredDatasets).toEqual([deployedDatasetAddress]);
-      expect(res.authorizedAccounts).toEqual([randomRequesterAddress]);
-    });
-
-    test('returns error when no voucher is found for the user', async () => {
-      // use a new random wallet that doesn't have a voucher
-      const newWallet = await setRandomWallet();
-      const raw = await execAsync(`${iexecPath} voucher show --raw`).catch(
-        (e) => e.message,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        `No Voucher found for address ${newWallet.address}`,
-      );
-      setWallet(userWallet.privateKey);
-    });
-  });
-
-  describe('authorize', () => {
-    test('authorize the requester to use the voucher', async () => {
-      const raw = await execAsync(
-        `${iexecPath} voucher authorize ${requesterAddress} --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.txHash).toBeDefined();
-    });
-
-    test('throw when requester is already authorized', async () => {
-      const raw = await execAsync(
-        `${iexecPath} voucher authorize ${requesterAddress} --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        `${requesterAddress} is already authorized`,
-      );
-    });
-
-    test('throw when the user has no voucher', async () => {
-      // use a new random wallet that doesn't have a voucher
-      const newWallet = await setRandomWallet();
-      const raw = await execAsync(
-        `${iexecPath} voucher authorize ${requesterAddress} --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        `No Voucher found for address ${newWallet.address}`,
-      );
-      setWallet(userWallet.privateKey);
-    });
-  });
-
-  describe('revoke', () => {
-    test('revoke the requester authorization to use the voucher', async () => {
-      const raw = await execAsync(
-        `${iexecPath} voucher revoke ${requesterAddress} --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.txHash).toBeDefined();
-    });
-
-    test('throw when requester was not previously authorized', async () => {
-      const newRequesterAddress = await getRandomAddress();
-
-      const raw = await execAsync(
-        `${iexecPath} voucher revoke ${newRequesterAddress} --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        `${newRequesterAddress} is not authorized`,
-      );
-    });
-
-    test('throw when the user has no voucher', async () => {
-      // use a new random wallet that doesn't have a voucher
-      const newWallet = await setRandomWallet();
-      const raw = await execAsync(
-        `${iexecPath} voucher revoke ${requesterAddress} --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        `No Voucher found for address ${newWallet.address}`,
-      );
-      setWallet(userWallet.privateKey);
-    });
-  });
-});
diff --git a/test/cli/cli-iexec-wallet.test.js b/test/cli/cli-iexec-wallet.test.js
index 3a5753a5..102341b8 100644
--- a/test/cli/cli-iexec-wallet.test.js
+++ b/test/cli/cli-iexec-wallet.test.js
@@ -1,12 +1,11 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect } from '@jest/globals';
+import { describe, test, expect, beforeEach } from '@jest/globals';
 import {
   TEST_CHAINS,
   execAsync,
   getRandomAddress,
   getRandomWallet,
   setBalance,
+  setNRlcBalance,
 } from '../test-utils.js';
 import {
   checkExists,
@@ -20,7 +19,7 @@ import {
 } from './cli-test-utils.js';
 import '../jest-setup.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec wallet', () => {
   let userWallet;
@@ -31,8 +30,7 @@ describe('iexec wallet', () => {
     await globalSetup('cli-iexec-wallet');
     // init the project
     await execAsync(`${iexecPath} init --skip-wallet --force`);
-    await setChain(testChain)();
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
     importedWallet = getRandomWallet();
     const { fileName } = await runIExecCliRaw(
       `${iexecPath} wallet import ${importedWallet.privateKey} --password test --force`,
@@ -42,7 +40,9 @@ describe('iexec wallet', () => {
 
   beforeEach(async () => {
     // reset user wallet
-    await setWallet(userWallet.privateKey);
+    await setWallet(testChain)(userWallet.privateKey);
+    // reset chain
+    await setChain(testChain)();
   });
 
   afterAll(async () => {
@@ -59,7 +59,7 @@ describe('iexec wallet', () => {
       expect(res.wallet).toBeDefined();
       expect(res.address).toBe(wallet.address);
       expect(res.fileName).toBeDefined();
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
 
     test('--unencrypted', async () => {
@@ -73,7 +73,7 @@ describe('iexec wallet', () => {
       expect(res.wallet.address).toBe(wallet.address);
       expect(res.address).toBe(wallet.address);
       expect(res.fileName.indexOf('/')).toBe(-1);
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
 
     test('--keystoredir <path>', async () => {
@@ -84,7 +84,7 @@ describe('iexec wallet', () => {
       expect(res.wallet).toBeDefined();
       expect(res.address).toBe(userWallet.address);
       expect(res.fileName.indexOf('out/keystore/')).not.toBe(-1);
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
 
     test('--keystoredir local', async () => {
@@ -95,7 +95,7 @@ describe('iexec wallet', () => {
       expect(res.wallet).toBeDefined();
       expect(res.address).toBe(userWallet.address);
       expect(res.fileName.indexOf('/')).toBe(-1);
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
   });
 
@@ -120,7 +120,7 @@ describe('iexec wallet', () => {
       expect(res.wallet.address).toBeDefined();
       expect(res.address).toBeDefined();
       expect(res.fileName.indexOf('/')).toBe(-1);
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
 
     test('--keystoredir <path>', async () => {
@@ -131,7 +131,7 @@ describe('iexec wallet', () => {
       expect(res.wallet).toBeDefined();
       expect(res.address).toBeDefined();
       expect(res.fileName.indexOf('out/keystore/')).not.toBe(-1);
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
 
     test('--keystoredir local', async () => {
@@ -142,22 +142,24 @@ describe('iexec wallet', () => {
       expect(res.wallet).toBeDefined();
       expect(res.address).toBeDefined();
       expect(res.fileName.indexOf('/')).toBe(-1);
-      expect(await checkExists(res.fileName));
+      expect(await checkExists(res.fileName)).toBe(true);
     });
   });
 
   describe('show', () => {
     beforeAll(async () => {
-      await setBalance(testChain)(userWallet.address, 10n * 10n ** 18n);
+      await setBalance(testChain)(userWallet.address, 1n * 10n ** 18n);
+      await setNRlcBalance(testChain)(userWallet.address, 10n * 10n ** 9n);
     });
 
     test('iexec wallet show (user wallet)', async () => {
+      await setNRlcBalance(testChain)(userWallet.address, 10n * 10n ** 9n);
       const res = await runIExecCliRaw(`${iexecPath} wallet show`);
       expect(res.ok).toBe(true);
       expect(res.wallet.address).toBe(userWallet.address);
       expect(res.wallet.publicKey).toBeUndefined();
       expect(res.wallet.privateKey).toBeUndefined();
-      expect(res.balance.ether).toBeUndefined();
+      expect(res.balance.ether).toBe('1.0');
       expect(res.balance.RLC).toBe('10.0');
       expect(res.balance.nRLC).toBe('10000000000');
     });
@@ -170,7 +172,7 @@ describe('iexec wallet', () => {
       expect(res.wallet.address).toBe(userWallet.address);
       // expect(res.wallet.publicKey).toBe(userWallet.publicKey); // unexpected format
       expect(res.wallet.privateKey).toBe(userWallet.privateKey);
-      expect(res.balance.ether).toBeUndefined();
+      expect(res.balance.ether).toBe('1.0');
       expect(res.balance.RLC).toBe('10.0');
       expect(res.balance.nRLC).toBe('10000000000');
     });
@@ -181,8 +183,7 @@ describe('iexec wallet', () => {
       );
       expect(res.ok).toBe(true);
       expect(res.wallet).toBeUndefined();
-      expect(res.balance.ether).toBeUndefined();
-      expect(res.balance.nRLC).toBeDefined();
+      expect(res.balance.ether).toBe('0.0');
       expect(res.balance.RLC).toBe('0.0');
       expect(res.balance.nRLC).toBe('0');
     });
@@ -282,25 +283,27 @@ describe('iexec wallet', () => {
 
   describe('send-ether', () => {
     test('iexec wallet send-ether (error on sidechain)', async () => {
+      await setChain(testChain)();
       await setBalance(testChain)(userWallet.address, 10n * 10n ** 18n);
       const to = getRandomAddress();
       const res = await runIExecCliRaw(
         `${iexecPath} wallet send-ether 1 gwei --to ${to} --force`,
       );
-      expect(res.ok).toBe(false);
-      expect(res.error.message).toBe(
-        'sendETH() is disabled on sidechain, use sendRLC()',
+      expect(res.ok).toBe(true);
+      expect(res.from).toBe(userWallet.address);
+      expect(res.to).toBe(to);
+      expect(res.amount).toBe('1000000000');
+      expect(res.txHash).toBeDefined();
+      const { balance } = await runIExecCliRaw(
+        `${iexecPath} wallet show ${to}`,
       );
+      expect(balance.wei).toBe('1000000000');
     });
   });
 
   describe('send-RLC', () => {
-    beforeAll(async () => {
-      await setBalance(testChain)(userWallet.address, 10n * 10n ** 18n);
-    });
-
     test('iexec wallet send-RLC 0.5', async () => {
-      await setBalance(testChain)(userWallet.address, 10n * 10n ** 18n);
+      await setNRlcBalance(testChain)(userWallet.address, 10n ** 9n);
       const to = getRandomAddress();
       const res = await runIExecCliRaw(
         `${iexecPath} wallet send-RLC 0.5 --to ${to} --force`,
@@ -314,13 +317,11 @@ describe('iexec wallet', () => {
         `${iexecPath} wallet show ${to}`,
       );
       expect(balance.RLC).toBe('0.5');
-      await testChain.provider.getTransaction(res.txHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
     });
 
     test('iexec wallet send-RLC 1000000000 nRLC', async () => {
       const to = getRandomAddress();
+      await setNRlcBalance(testChain)(userWallet.address, 10n ** 9n);
       const res = await runIExecCliRaw(
         `${iexecPath} wallet send-RLC 1000000000 nRLC --to ${to} --force`,
       );
@@ -338,34 +339,35 @@ describe('iexec wallet', () => {
 
   describe('sweep', () => {
     test('iexec wallet sweep', async () => {
-      const walletToSweep = getRandomWallet();
+      const walletToSweep = await setRandomWallet(testChain)();
       const rlcBalance = 10n;
-      await setBalance(testChain)(
+      await setNRlcBalance(testChain)(
         walletToSweep.address,
-        rlcBalance * 10n ** 18n,
+        rlcBalance * 10n ** 9n,
       );
       const to = getRandomAddress();
-      await runIExecCliRaw(
-        `${iexecPath} wallet import ${walletToSweep.privateKey} --password test`,
-      );
       const res = await runIExecCliRaw(
-        `${iexecPath} wallet sweep --to ${to} --wallet-address ${walletToSweep.address} --password test --force`,
+        `${iexecPath} wallet sweep --to ${to} --force`,
       );
+
       expect(res.ok).toBe(true);
       expect(res.from).toBe(walletToSweep.address);
       expect(res.to).toBe(to);
-      expect(res.sendERC20TxHash).toBeUndefined();
+      expect(res.sendERC20TxHash).toBeDefined();
       expect(res.sendNativeTxHash).toBeDefined();
       expect(res.errors).toBeUndefined();
-      const { balance } = await runIExecCliRaw(
+      const { balance: balanceTo } = await runIExecCliRaw(
         `${iexecPath} wallet show ${to}`,
       );
-      expect(balance.RLC).toBe(`${rlcBalance}.0`);
-      await testChain.provider
-        .getTransaction(res.sendNativeTxHash)
-        .then((tx) => {
-          expect(tx.gasPrice.toString()).toBe('0');
-        });
+      const { balance: balanceFrom } = await runIExecCliRaw(
+        `${iexecPath} wallet show ${walletToSweep.address}`,
+      );
+
+      expect(balanceTo.RLC).toBe(`${rlcBalance}.0`);
+      expect(balanceTo.ether).not.toBe('0.0');
+
+      expect(balanceFrom.RLC).toBe('0.0');
+      expect(balanceFrom.ether).toBe('0.0');
     });
   });
 });
diff --git a/test/cli/cli-iexec-workerpool.test.js b/test/cli/cli-iexec-workerpool.test.js
index 457507c6..f7742d85 100644
--- a/test/cli/cli-iexec-workerpool.test.js
+++ b/test/cli/cli-iexec-workerpool.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   TEST_CHAINS,
@@ -18,8 +16,9 @@ import {
   iexecPath,
 } from './cli-test-utils.js';
 import '../jest-setup.js';
+import { encodeTag } from '../../src/lib/utils.js';
 
-const testChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('iexec workerpool', () => {
   let userWallet;
@@ -30,7 +29,7 @@ describe('iexec workerpool', () => {
     // init the project
     await execAsync(`${iexecPath} init --skip-wallet --force`);
     await setChain(testChain)();
-    userWallet = await setRandomWallet();
+    userWallet = await setRandomWallet(testChain)();
     await execAsync(`${iexecPath} workerpool init`);
     const deployed = await execAsync(
       `${iexecPath} workerpool deploy --raw`,
@@ -60,49 +59,6 @@ describe('iexec workerpool', () => {
       expect(res.ok).toBe(true);
       expect(res.address).toBeDefined();
       expect(res.txHash).toBeDefined();
-      await testChain.provider.getTransaction(res.txHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-    });
-  });
-
-  describe('set-api-url', () => {
-    test('iexec workerpool set-api-url', async () => {
-      await execAsync(
-        `${iexecPath} ens register ${userFirstDeployedWorkerpoolAddress.toLowerCase()} --for ${userFirstDeployedWorkerpoolAddress}`,
-      );
-      const raw = await execAsync(
-        `${iexecPath} workerpool set-api-url https://my-workerpool.com ${userFirstDeployedWorkerpoolAddress} --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.address).toBe(userFirstDeployedWorkerpoolAddress);
-      expect(res.url).toBe('https://my-workerpool.com');
-      expect(res.txHash).toBeTxHash();
-      await testChain.provider.getTransaction(res.txHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
-
-      const showRes = await runIExecCliRaw(
-        `${iexecPath} workerpool show ${userFirstDeployedWorkerpoolAddress}`,
-      );
-      expect(showRes.apiUrl).toBe('https://my-workerpool.com');
-    });
-
-    test('iexec workerpool set-api-url (fail no ENS)', async () => {
-      await setWorkerpoolUniqueDescription();
-      const { address } = await runIExecCliRaw(
-        `${iexecPath} workerpool deploy`,
-      );
-      const raw = await execAsync(
-        `${iexecPath} workerpool set-api-url https://my-workerpool.com --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.error.name).toBe('Error');
-      expect(res.error.message).toBe(
-        `Missing ENS for workerpool ${address}. You probably forgot to run "iexec ens register <name> --for ${address}"`,
-      );
     });
   });
 
@@ -173,9 +129,6 @@ describe('iexec workerpool', () => {
       expect(res.address).toBe(address);
       expect(res.to).toBe(receiverAddress);
       expect(res.txHash).toBeDefined();
-      await testChain.provider.getTransaction(res.txHash).then((tx) => {
-        expect(tx.gasPrice.toString()).toBe('0');
-      });
     });
   });
 
@@ -212,7 +165,7 @@ describe('iexec workerpool', () => {
 
     test('from workerpool address with options', async () => {
       const res = await runIExecCliRaw(
-        `${iexecPath} workerpool publish ${userFirstDeployedWorkerpoolAddress} --price 0.000000002 RLC --volume 5 --tag tee,scone --trust 20 --category 1 --force`,
+        `${iexecPath} workerpool publish ${userFirstDeployedWorkerpoolAddress} --price 0.000000002 RLC --volume 5 --tag tee,tdx --trust 20 --category 1 --force`,
       );
       expect(res.ok).toBe(true);
       expect(res.orderHash).toBeDefined();
@@ -225,7 +178,7 @@ describe('iexec workerpool', () => {
         workerpool: userFirstDeployedWorkerpoolAddress,
         workerpoolprice: 2,
         volume: 5,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000003',
+        tag: encodeTag(['tee', 'tdx']),
         trust: 20,
         category: 1,
         apprestrict: NULL_ADDRESS,
diff --git a/test/cli/cli-test-utils.js b/test/cli/cli-test-utils.js
index 81ae1bd7..4ba17fe7 100644
--- a/test/cli/cli-test-utils.js
+++ b/test/cli/cli-test-utils.js
@@ -2,13 +2,11 @@ import { readFile, writeFile } from 'fs/promises';
 import { pathExists, remove } from 'fs-extra';
 import { join } from 'path';
 import { Wallet } from 'ethers';
-import { execAsync, getId } from '../test-utils.js';
+import { execAsync, getId, setBalance } from '../test-utils.js';
 
 const IEXEC_JSON = 'iexec.json';
 const CHAIN_JSON = 'chain.json';
 
-const { INFURA_PROJECT_ID } = process.env;
-
 export const iexecPath = 'iexec';
 
 export const globalSetup = async (testid = 'shared') => {
@@ -41,8 +39,11 @@ export const saveJSONToFile = async (json, fileName) => {
   await writeFile(filePath(fileName), text);
 };
 
-export const setWallet = async (privateKey) => {
+export const setWallet = (chain) => async (privateKey) => {
   const wallet = privateKey ? new Wallet(privateKey) : Wallet.createRandom();
+  if (chain.defaultInitBalance) {
+    await setBalance(chain)(wallet.address, chain.defaultInitBalance);
+  }
   const jsonWallet = {
     privateKey: wallet.privateKey,
     publicKey: wallet.publicKey,
@@ -51,16 +52,16 @@ export const setWallet = async (privateKey) => {
   await saveJSONToFile(jsonWallet, 'wallet.json');
   return jsonWallet;
 };
-export const setRandomWallet = () => setWallet();
+export const setRandomWallet = (chain) => () => setWallet(chain)();
 
 export const setChainsPocoAdminWallet = (chain) => () =>
-  setWallet(chain.pocoAdminWallet.privateKey);
+  setWallet(chain)(chain.pocoAdminWallet.privateKey);
 
 export const removeWallet = () => remove('./wallet.json').catch(() => {});
 
 export const setChain =
   (chain) =>
-  (chainOptions = {}, providerOptions = {}) =>
+  (chainOptions = {}) =>
     saveJSONToFile(
       {
         default: 'dev',
@@ -69,22 +70,12 @@ export const setChain =
             id: chain.chainId,
             host: chain.rpcURL,
             hub: chain.hubAddress,
-            sms: chain.smsMap,
+            sms: chain.smsURL,
             iexecGateway: chain.iexecGatewayURL,
-            resultProxy: chain.resultProxyURL,
-            ensPublicResolver: chain.ensPublicResolverAddress,
-            voucherSubgraph: chain.voucherSubgraphURL,
-            voucherHub: chain.voucherHubAddress,
-            useGas: chain.useGas,
-            native: chain.isNative,
             ...chainOptions,
           },
-          bellecour: {},
-          mainnet: {},
-        },
-        providers: {
-          infura: INFURA_PROJECT_ID,
-          ...providerOptions,
+          'arbitrum-sepolia-testnet': {},
+          'arbitrum-mainnet': {},
         },
       },
       CHAIN_JSON,
diff --git a/test/cli/cli-tx-options.test.js b/test/cli/cli-tx-options.test.js
deleted file mode 100644
index ce2adfd8..00000000
--- a/test/cli/cli-tx-options.test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect } from '@jest/globals';
-import {
-  TEST_CHAINS,
-  execAsync,
-  getRandomAddress,
-  setBalance,
-} from '../test-utils.js';
-import {
-  globalSetup,
-  globalTeardown,
-  iexecPath,
-  setChain,
-  setRandomWallet,
-} from './cli-test-utils.js';
-import '../jest-setup.js';
-
-const testChain = TEST_CHAINS['custom-token-chain'];
-
-describe('tx options', () => {
-  let userWallet;
-
-  beforeAll(async () => {
-    await globalSetup('cli-tx-options');
-    // init the project
-    await execAsync(`${iexecPath} init --skip-wallet`);
-    await setChain(testChain)();
-    userWallet = await setRandomWallet();
-    await setBalance(testChain)(userWallet.address, 50n * 10n ** 18n);
-  });
-
-  afterAll(async () => {
-    await globalTeardown();
-  });
-
-  describe('--gas-price', () => {
-    test('--gas-price 1000000001', async () => {
-      const raw = await execAsync(
-        `${iexecPath} wallet send-ether 1 wei --to ${getRandomAddress()} --force --gas-price 1000000001 --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('1000000001');
-    });
-
-    test('--gas-price 0', async () => {
-      const raw = await execAsync(
-        `${iexecPath} wallet send-ether 1 wei --to ${getRandomAddress()} --force --gas-price 0 --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('0');
-    });
-
-    test('--gas-price 1.1 gwei', async () => {
-      const raw = await execAsync(
-        `${iexecPath} wallet send-ether 1 wei --to ${getRandomAddress()} --force --gas-price 1.1 gwei --raw`,
-      );
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(true);
-      expect(res.txHash).toBeDefined();
-      const tx = await testChain.provider.getTransaction(res.txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe('1100000000');
-    });
-
-    test('--gas-price -1 (invalid gas-price)', async () => {
-      const raw = await execAsync(
-        `${iexecPath} wallet send-ether 1 wei --to ${getRandomAddress()} --force --gas-price -1 --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.txHash).toBeUndefined();
-      expect(res.error.message).toBe('-1 is not a valid amount');
-    });
-
-    test('--gas-price 0.1 wei (invalid gas-price)', async () => {
-      const raw = await execAsync(
-        `${iexecPath} wallet send-ether 1 wei --to ${getRandomAddress()} --force --gas-price 0.1 wei --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.txHash).toBeUndefined();
-      expect(res.error.message).toBe('0.1 wei is not a valid amount');
-    });
-
-    test('--gas-price 1 ethereum (invalid gas-price)', async () => {
-      const raw = await execAsync(
-        `${iexecPath} wallet send-ether 1 wei --to ${getRandomAddress()} --force --gas-price 1 ethereum --raw`,
-      ).catch((e) => e.message);
-      const res = JSON.parse(raw);
-      expect(res.ok).toBe(false);
-      expect(res.txHash).toBeUndefined();
-      expect(res.error.message).toBe('1 ethereum is not a valid amount');
-    });
-  });
-});
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index 519413a5..72314287 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -1,23 +1,9 @@
 services:
-  custom-token-chain:
-    restart: unless-stopped
-    image: 'iexechub/poco-chaintest:5.3.2-token-openethereum'
-    expose:
-      - 8545
-    ports:
-      - 18545:8545
-    healthcheck:
-      test: nc -z 0.0.0.0 8545
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
-
-  bellecour-fork:
+  arbitrum-sepolia-fork:
     restart: 'no'
     image: ghcr.io/foundry-rs/foundry:v1.0.0
     entrypoint: anvil
-    command: '--host 0.0.0.0 --port 8545 --block-time 1 --hardfork berlin --fork-url $BELLECOUR_FORK_URL --fork-block-number $BELLECOUR_FORK_BLOCK --chain-id 134 --gas-limit 6700000 --gas-price 0'
+    command: '--host 0.0.0.0 --port 8545 --block-time 1 --fork-url $ARBITRUM_SEPOLIA_FORK_URL --fork-block-number $ARBITRUM_SEPOLIA_FORK_BLOCK --chain-id 421614'
     expose:
       - 8545
     ports:
@@ -30,79 +16,21 @@ services:
       retries: 3
       start_period: 30s
 
-  voucher-subgraph-deployer:
+  unknown-chain-fork:
     restart: 'no'
-    # https://github.com/iExecBlockchainComputing/iexec-voucher-subgraph
-    image: iexechub/voucher-subgraph-deployer:1.0.0
-    environment:
-      RPC_URL: http://bellecour-fork:8545
-      GRAPHNODE_URL: http://graphnode:8020
-      IPFS_URL: http://ipfs:5001
-      VOUCHER_HUB_ADDRESS: '0x3137B6DF4f36D338b82260eDBB2E7bab034AFEda'
-      VOUCHER_HUB_START_BLOCK: $BELLECOUR_FORK_BLOCK
-    depends_on:
-      bellecour-fork:
-        condition: service_healthy
-      graphnode:
-        condition: service_healthy
-      ipfs:
-        condition: service_healthy
-
-  graphnode-postgres:
-    image: postgres:12
-    restart: unless-stopped
-    command:
-      - 'postgres'
-      - '-cshared_preload_libraries=pg_stat_statements'
-    expose:
-      - 5432
-    environment:
-      POSTGRES_USER: graphnode
-      POSTGRES_PASSWORD: password
-      POSTGRES_DB: graphnode-db
-    healthcheck:
-      test: pg_isready -U graphnode -d graphnode-db
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
-
-  graphnode:
-    image: graphprotocol/graph-node:v0.27.0
-    restart: unless-stopped
+    image: ghcr.io/foundry-rs/foundry:v1.0.0
+    entrypoint: anvil
+    command: '--host 0.0.0.0 --port 8545 --block-time 1 --fork-url $ARBITRUM_SEPOLIA_FORK_URL --fork-block-number $ARBITRUM_SEPOLIA_FORK_BLOCK --chain-id 421615'
     expose:
-      - 8000
-      - 8020
+      - 8545
     ports:
-      # GraphQL HTTP
-      - 8000:8000
-      # GraphQL WS
-      # - 8001:8001
-      # admin RPC
-      - 8020:8020
-      # metrics
-      # - 8040:8040
-    environment:
-      postgres_host: graphnode-postgres
-      postgres_port: 5432
-      postgres_user: graphnode
-      postgres_pass: password
-      postgres_db: graphnode-db
-      ipfs: ipfs:5001
-      ethereum: bellecour:http://bellecour-fork:8545
-      GRAPH_ETHEREUM_GENESIS_BLOCK_NUMBER: $BELLECOUR_FORK_BLOCK
-    depends_on:
-      bellecour-fork:
-        condition: service_healthy
-      graphnode-postgres:
-        condition: service_healthy
-      ipfs:
-        condition: service_healthy
+      - 8565:8545
     healthcheck:
-      test: netcat -w 1 0.0.0.0 8020
+      # check port 8545 is open without nc
+      test: (echo >/dev/tcp/$(hostname)/8545) &>/dev/null
       interval: 10s
       timeout: 5s
-      retries: 5
+      retries: 3
       start_period: 30s
 
   service-internal-error:
@@ -114,13 +42,13 @@ services:
     ports:
       - 5500:80
 
-  sms:
+  sms-arbitrum-sepolia:
     image: iexechub/iexec-sms:8.7.0
     restart: unless-stopped
     environment:
       JAVA_TOOL_OPTIONS: '-Xmx256M'
-      IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
-      IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
+      IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://arbitrum-sepolia-fork:8545
+      IEXEC_HUB_ADDRESS: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E'
       IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
       IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
       IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
@@ -128,85 +56,12 @@ services:
       IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
       IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
     ports:
-      - 13300:13300
+      - 13350:13300
     healthcheck:
       test: curl -f localhost:13300/actuator/health || exit 1
     depends_on:
-      bellecour-fork:
+      arbitrum-sepolia-fork:
         condition: service_healthy
-
-  sms-gramine:
-    image: iexechub/iexec-sms:8.7.0
-    restart: unless-stopped
-    environment:
-      JAVA_TOOL_OPTIONS: '-Xmx256M'
-      IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
-      IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
-      IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
-      IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
-      IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
-      IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
-      IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
-      IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
-    ports:
-      - 13302:13300
-    healthcheck:
-      test: curl -f localhost:13300/actuator/health || exit 1
-    depends_on:
-      bellecour-fork:
-        condition: service_healthy
-
-  sms-tdx:
-    image: iexechub/iexec-sms:8.7.0
-    restart: unless-stopped
-    environment:
-      JAVA_TOOL_OPTIONS: '-Xmx256M'
-      IEXEC_SMS_BLOCKCHAIN_NODE_ADDRESS: http://bellecour-fork:8545
-      IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
-      IEXEC_SMS_TEE_RUNTIME_FRAMEWORK: scone
-      IEXEC_SMS_IMAGE_LAS_IMAGE: 'las-image'
-      IEXEC_TEE_WORKER_PRE_COMPUTE_IMAGE: 'pre-compute-image'
-      IEXEC_TEE_WORKER_PRE_COMPUTE_FINGERPRINT: 'pre-compute-fingerprint'
-      IEXEC_TEE_WORKER_POST_COMPUTE_IMAGE: 'post-compute-image'
-      IEXEC_TEE_WORKER_POST_COMPUTE_FINGERPRINT: 'post-compute-fingerprint'
-    ports:
-      - 13303:13300
-    healthcheck:
-      test: curl -f localhost:13300/actuator/health || exit 1
-    depends_on:
-      bellecour-fork:
-        condition: service_healthy
-
-  result-proxy:
-    image: iexechub/iexec-result-proxy:7.1.0
-    restart: unless-stopped
-    environment:
-      IEXEC_PRIVATE_CHAIN_ADDRESS: http://bellecour-fork:8545
-      IEXEC_PUBLIC_CHAIN_ADDRESS: http://bellecour-fork:8545
-      IEXEC_HUB_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
-      MONGO_HOST: result-proxy-mongo
-      MONGO_PORT: 13202
-      IEXEC_IPFS_HOST: ipfs
-    ports:
-      - 13200:13200
-    depends_on:
-      bellecour-fork:
-        condition: service_healthy
-      result-proxy-mongo:
-        condition: service_started
-      ipfs:
-        condition: service_healthy
-
-  result-proxy-mongo:
-    restart: unless-stopped
-    image: library/mongo:4.2
-    entrypoint: '/bin/bash'
-    command: -c "mongod --bind_ip_all --port 13202"
-    expose:
-      - 13202
-    ports:
-      - 13202:13202
-
   ipfs:
     restart: unless-stopped
     image: ipfs/go-ipfs:v0.9.1
@@ -246,51 +101,52 @@ services:
       retries: 3
       start_period: 30s
 
-  market-watcher:
+  market-watcher-arbitrum-sepolia:
     image: iexechub/iexec-market-watcher:7.0.1
     restart: unless-stopped
     environment:
-      CHAIN: BELLECOUR
-      START_BLOCK: $BELLECOUR_FORK_BLOCK
-      ETH_WS_HOST: ws://bellecour-fork:8545
-      ETH_RPC_HOST: http://bellecour-fork:8545
+      CHAIN: ARBITRUM_SEPOLIA
+      START_BLOCK: $ARBITRUM_SEPOLIA_FORK_BLOCK
+      CHAIN_ID: 421614
+      IEXEC_ADDRESS: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E'
+      ETH_WS_HOST: ws://arbitrum-sepolia-fork:8545
+      ETH_RPC_HOST: http://arbitrum-sepolia-fork:8545
       MONGO_HOST: market-mongo
       REDIS_HOST: market-redis
     depends_on:
-      bellecour-fork:
+      arbitrum-sepolia-fork:
         condition: service_healthy
       market-redis:
         condition: service_healthy
       market-mongo:
         condition: service_started
 
-  market-api:
+  market-api-arbitrum-sepolia:
     image: iexechub/iexec-market-api:7.1.2
     restart: unless-stopped
     ports:
-      - 3000:3000
+      - 3050:3000
     expose:
       - 3000
     environment:
-      CHAINS: BELLECOUR_FORK
-      BELLECOUR_FORK_ETH_RPC_HOST: http://bellecour-fork:8545
-      BELLECOUR_FORK_CHAIN_ID: 134
-      BELLECOUR_FORK_IS_NATIVE: 'true'
-      BELLECOUR_FORK_IEXEC_ADDRESS: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f'
+      CHAINS: ARBITRUM_SEPOLIA_FORK
+      ARBITRUM_SEPOLIA_FORK_ETH_RPC_HOST: http://arbitrum-sepolia-fork:8545
+      ARBITRUM_SEPOLIA_FORK_CHAIN_ID: 421614
+      ARBITRUM_SEPOLIA_FORK_IEXEC_ADDRESS: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E'
       MONGO_HOST: market-mongo
       REDIS_HOST: market-redis
       RATE_LIMIT_MAX: 10000
       RATE_LIMIT_PERIOD: 60000
       MAX_OPEN_ORDERS_PER_WALLET: 1000
     depends_on:
-      bellecour-fork:
+      arbitrum-sepolia-fork:
         condition: service_healthy
       market-redis:
         condition: service_healthy
       market-mongo:
         condition: service_started
 
-  custom-token-chain-compass:
+  compass-arbitrum-sepolia:
     image: iexechub/compass:v0.1.1
     restart: unless-stopped
     environment:
@@ -307,25 +163,17 @@ services:
     command:
       - echo "all services ready"
     depends_on:
-      bellecour-fork:
-        condition: service_healthy
-      custom-token-chain:
+      # arbitrum-sepolia stack
+      arbitrum-sepolia-fork:
         condition: service_healthy
-      graphnode:
+      sms-arbitrum-sepolia:
         condition: service_healthy
-      sms:
-        condition: service_healthy
-      sms-gramine:
-        condition: service_healthy
-      sms-tdx:
-        condition: service_healthy
-      market-watcher:
+      market-watcher-arbitrum-sepolia:
         condition: service_started
-      market-api:
+      market-api-arbitrum-sepolia:
         condition: service_started
-      result-proxy:
-        condition: service_started
-      custom-token-chain-compass:
+      compass-arbitrum-sepolia:
+        condition: service_healthy
+      # unknown chain
+      unknown-chain-fork:
         condition: service_healthy
-      voucher-subgraph-deployer:
-        condition: service_completed_successfully
diff --git a/test/jest-setup.js b/test/jest-setup.js
index 24621751..7432c9bc 100644
--- a/test/jest-setup.js
+++ b/test/jest-setup.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { jest, expect } from '@jest/globals';
 import { getAddress } from 'ethers';
 
@@ -40,7 +38,7 @@ expect.extend({
     try {
       getAddress(received);
       pass = true;
-    } catch (e) {
+    } catch {
       /* noop */
     }
     return {
diff --git a/test/lib/e2e/IExecAccountModule.test.js b/test/lib/e2e/IExecAccountModule.test.js
index da9d0aca..3b74c2c7 100644
--- a/test/lib/e2e/IExecAccountModule.test.js
+++ b/test/lib/e2e/IExecAccountModule.test.js
@@ -1,27 +1,23 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
-import { ONE_ETH, ONE_RLC, getTestConfig } from '../lib-test-utils.js';
+import { ONE_ETH, getTestConfig } from '../lib-test-utils.js';
 import {
-  DEFAULT_PROVIDER_OPTIONS,
   TEST_CHAINS,
   getRandomAddress,
   setBalance,
   setNRlcBalance,
 } from '../../test-utils.js';
 import '../../jest-setup.js';
-import { IExec } from '../../../src/lib/index.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-const tokenTestChain = TEST_CHAINS['custom-token-chain'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
+const tokenTestChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('account', () => {
   describe('checkBalance()', () => {
     test('shows account nRLC stake and locked balances', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await setNRlcBalance(iexecTestChain)(wallet.address, 10);
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      await setNRlcBalance(testChain)(wallet.address, 10);
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const initialBalance = await readOnlyIExec.account.checkBalance(
@@ -42,41 +38,10 @@ describe('account', () => {
     });
   });
 
-  describe('checkBridgedBalance()', () => {
-    describe('native chain', () => {
-      test('expose bridged balances (mainnet) on bellecour', async () => {
-        const iexec = new IExec(
-          { ethProvider: 'bellecour' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const res = await iexec.account.checkBridgedBalance(getRandomAddress());
-        expect(res.stake).toBeInstanceOf(BN);
-        expect(res.locked).toBeInstanceOf(BN);
-      });
-
-      describe('token chain', () => {
-        test('expose bridged balances (bellecour) on mainnet', async () => {
-          const iexec = new IExec(
-            { ethProvider: 'mainnet' },
-            {
-              providerOptions: DEFAULT_PROVIDER_OPTIONS,
-            },
-          );
-          const res =
-            await iexec.account.checkBridgedBalance(getRandomAddress());
-          expect(res.stake).toBeInstanceOf(BN);
-          expect(res.locked).toBeInstanceOf(BN);
-        });
-      });
-    });
-  });
-
   describe('approve()', () => {
     test('require a signer', async () => {
       const spenderAddress = getRandomAddress();
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(iexec.account.approve(10, spenderAddress)).rejects.toThrow(
         new Error(
           'The current provider is not a signer, impossible to sign messages or transactions',
@@ -85,7 +50,7 @@ describe('account', () => {
     });
 
     test('rejects invalid address', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const spenderAddress = 'invalid_address';
       const amount = 10;
 
@@ -97,7 +62,7 @@ describe('account', () => {
     });
 
     test('rejects invalid amount', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const spenderAddress = wallet.address;
       const amount = 'invalid_amount';
 
@@ -107,7 +72,7 @@ describe('account', () => {
     });
 
     test('prevents approve negative amount', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const spenderAddress = wallet.address;
       const negativeAmount = -999;
       await expect(
@@ -116,7 +81,7 @@ describe('account', () => {
     });
 
     test('approve succeeds', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const spenderAddress = getRandomAddress();
       const txHash = await iexec.account.approve(10, spenderAddress);
       expect(txHash).toBeDefined();
@@ -125,7 +90,7 @@ describe('account', () => {
 
   describe('checkAllowance()', () => {
     test('rejects invalid ownerAddress', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       const ownerAddress = 'invalid_address';
       const spenderAddress = getRandomAddress();
 
@@ -137,7 +102,7 @@ describe('account', () => {
     });
 
     test('rejects invalid spenderAddress', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       const ownerAddress = getRandomAddress();
       const spenderAddress = "'invalid_address'";
 
@@ -149,7 +114,7 @@ describe('account', () => {
     });
 
     test('return zero allowance if no approval exists', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       const ownerAddress = getRandomAddress();
       const spenderAddress = getRandomAddress();
 
@@ -162,8 +127,8 @@ describe('account', () => {
     });
 
     test('return the allowed amount as a BigNumber', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const ownerAddress = iexec.wallet.getAddress();
+      const { iexec } = await getTestConfig(testChain)();
+      const ownerAddress = await iexec.wallet.getAddress();
       const spenderAddress = getRandomAddress();
       const allowanceValue = '10';
 
@@ -186,7 +151,7 @@ describe('account', () => {
   describe('revokeApproval()', () => {
     test('require a signer', async () => {
       const spenderAddress = getRandomAddress();
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(
         iexec.account.revokeApproval(spenderAddress),
       ).rejects.toThrow(
@@ -197,7 +162,7 @@ describe('account', () => {
     });
 
     test('rejects invalid address', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const spenderAddress = 'invalid_address';
 
       await expect(
@@ -208,7 +173,7 @@ describe('account', () => {
     });
 
     test('revokeApproval succeeds', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const spenderAddress = getRandomAddress();
       const approvalTxHash = await iexec.account.approve(10, spenderAddress);
       expect(approvalTxHash).toBeDefined();
@@ -226,7 +191,7 @@ describe('account', () => {
 
   describe('deposit()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(iexec.account.deposit(10)).rejects.toThrow(
         new Error(
           'The current provider is not a signer, impossible to sign messages or transactions',
@@ -235,174 +200,76 @@ describe('account', () => {
     });
 
     test('prevents deposit 0', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       await expect(iexec.account.deposit(0)).rejects.toThrow(
         new Error('Deposit amount must be greater than 0'),
       );
     });
 
-    describe('native chain', () => {
-      test('deposits native asset (1 nRLC = 10⁹ wei)', async () => {
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        await setNRlcBalance(iexecTestChain)(wallet.address, 10);
-        const accountInitialBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletInitialBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        const res = await iexec.account.deposit(5);
-        const accountFinalBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletFinalBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        expect(res.txHash).toBeTxHash();
-        expect(res.amount).toBe('5');
-        expect(
-          accountFinalBalance.stake
-            .sub(new BN(5))
-            .eq(accountInitialBalance.stake),
-        ).toBe(true);
-        expect(
-          walletFinalBalance.nRLC.add(new BN(5)).eq(walletInitialBalance.nRLC),
-        ).toBe(true);
-        expect(
-          accountFinalBalance.locked.eq(accountInitialBalance.locked),
-        ).toBe(true);
-      });
-
-      test('deposits specified unit', async () => {
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        await setNRlcBalance(iexecTestChain)(wallet.address, ONE_RLC);
-        const accountInitialBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletInitialBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        const res = await iexec.account.deposit('0.005 RLC');
-        const accountFinalBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletFinalBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        expect(res.txHash).toBeTxHash();
-        expect(res.amount).toBe('5000000');
-        expect(
-          accountFinalBalance.stake
-            .sub(new BN('5000000'))
-            .eq(accountInitialBalance.stake),
-        ).toBe(true);
-        expect(
-          walletFinalBalance.nRLC
-            .add(new BN('5000000'))
-            .eq(walletInitialBalance.nRLC),
-        ).toBe(true);
-        expect(
-          accountFinalBalance.locked.eq(accountInitialBalance.locked),
-        ).toBe(true);
-      });
-
-      test('fails if amount exceed wallet balance', async () => {
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        const accountInitialBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletInitialBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        await expect(iexec.account.deposit(100)).rejects.toThrow(
-          new Error('Deposit amount exceed wallet balance'),
-        );
-        const accountFinalBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletFinalBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        expect(accountFinalBalance.stake.eq(accountInitialBalance.stake)).toBe(
-          true,
-        );
-        expect(walletFinalBalance.nRLC.eq(walletInitialBalance.nRLC)).toBe(
-          true,
-        );
-        expect(
-          accountFinalBalance.locked.eq(accountInitialBalance.locked),
-        ).toBe(true);
-      });
+    test('deposits ERC20', async () => {
+      const { iexec, wallet } = await getTestConfig(tokenTestChain)();
+      await setNRlcBalance(tokenTestChain)(wallet.address, 10);
+      await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
+      const accountInitialBalance = await iexec.account.checkBalance(
+        wallet.address,
+      );
+      const walletInitialBalance = await iexec.wallet.checkBalances(
+        wallet.address,
+      );
+      const res = await iexec.account.deposit(5);
+      const accountFinalBalance = await iexec.account.checkBalance(
+        wallet.address,
+      );
+      const walletFinalBalance = await iexec.wallet.checkBalances(
+        wallet.address,
+      );
+      expect(res.txHash).toBeTxHash();
+      expect(res.amount).toBe('5');
+      expect(
+        accountFinalBalance.stake
+          .sub(new BN(5))
+          .eq(accountInitialBalance.stake),
+      ).toBe(true);
+      expect(
+        walletFinalBalance.nRLC.add(new BN(5)).eq(walletInitialBalance.nRLC),
+      ).toBe(true);
+      expect(accountFinalBalance.locked.eq(accountInitialBalance.locked)).toBe(
+        true,
+      );
     });
 
-    describe('token chain', () => {
-      test('deposits ERC20', async () => {
-        const { iexec, wallet } = getTestConfig(tokenTestChain)();
-        await setNRlcBalance(tokenTestChain)(wallet.address, 10);
-        await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
-        const accountInitialBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletInitialBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        const res = await iexec.account.deposit(5);
-        const accountFinalBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletFinalBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        expect(res.txHash).toBeTxHash();
-        expect(res.amount).toBe('5');
-        expect(
-          accountFinalBalance.stake
-            .sub(new BN(5))
-            .eq(accountInitialBalance.stake),
-        ).toBe(true);
-        expect(
-          walletFinalBalance.nRLC.add(new BN(5)).eq(walletInitialBalance.nRLC),
-        ).toBe(true);
-        expect(
-          accountFinalBalance.locked.eq(accountInitialBalance.locked),
-        ).toBe(true);
-      });
-
-      test('fails if amount exceed wallet balance', async () => {
-        const { iexec, wallet } = getTestConfig(tokenTestChain)();
-        await setNRlcBalance(tokenTestChain)(wallet.address, 10);
-        await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
-        const accountInitialBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletInitialBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        await expect(iexec.account.deposit(100)).rejects.toThrow(
-          new Error('Deposit amount exceed wallet balance'),
-        );
-        const accountFinalBalance = await iexec.account.checkBalance(
-          wallet.address,
-        );
-        const walletFinalBalance = await iexec.wallet.checkBalances(
-          wallet.address,
-        );
-        expect(accountFinalBalance.stake.eq(accountInitialBalance.stake)).toBe(
-          true,
-        );
-        expect(walletFinalBalance.nRLC.eq(walletInitialBalance.nRLC)).toBe(
-          true,
-        );
-        expect(
-          accountFinalBalance.locked.eq(accountInitialBalance.locked),
-        ).toBe(true);
-      });
+    test('fails if amount exceed wallet balance', async () => {
+      const { iexec, wallet } = await getTestConfig(tokenTestChain)();
+      await setNRlcBalance(tokenTestChain)(wallet.address, 10);
+      await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
+      const accountInitialBalance = await iexec.account.checkBalance(
+        wallet.address,
+      );
+      const walletInitialBalance = await iexec.wallet.checkBalances(
+        wallet.address,
+      );
+      await expect(iexec.account.deposit(100)).rejects.toThrow(
+        new Error('Deposit amount exceed wallet balance'),
+      );
+      const accountFinalBalance = await iexec.account.checkBalance(
+        wallet.address,
+      );
+      const walletFinalBalance = await iexec.wallet.checkBalances(
+        wallet.address,
+      );
+      expect(accountFinalBalance.stake.eq(accountInitialBalance.stake)).toBe(
+        true,
+      );
+      expect(walletFinalBalance.nRLC.eq(walletInitialBalance.nRLC)).toBe(true);
+      expect(accountFinalBalance.locked.eq(accountInitialBalance.locked)).toBe(
+        true,
+      );
     });
   });
 
   describe('withdraw()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(iexec.account.withdraw(10)).rejects.toThrow(
         new Error(
           'The current provider is not a signer, impossible to sign messages or transactions',
@@ -411,15 +278,15 @@ describe('account', () => {
     });
 
     test('prevents withdraw 0', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       await expect(iexec.account.withdraw(0)).rejects.toThrow(
         new Error('Withdraw amount must be greater than 0'),
       );
     });
 
     test('withdraws stacked nRLC', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await setNRlcBalance(iexecTestChain)(wallet.address, 10);
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      await setNRlcBalance(testChain)(wallet.address, 10);
       await iexec.account.deposit(10);
       const accountInitialBalance = await iexec.account.checkBalance(
         wallet.address,
@@ -450,8 +317,8 @@ describe('account', () => {
     });
 
     test('withdraws specified unit', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await setNRlcBalance(iexecTestChain)(wallet.address, 10000);
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      await setNRlcBalance(testChain)(wallet.address, 10000);
       await iexec.account.deposit(10000);
       const accountInitialBalance = await iexec.account.checkBalance(
         wallet.address,
@@ -482,8 +349,8 @@ describe('account', () => {
     });
 
     test('fails if amount exceeds account balance)', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await setNRlcBalance(iexecTestChain)(wallet.address, 10);
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      await setNRlcBalance(testChain)(wallet.address, 10);
       await iexec.account.deposit(10);
       const accountInitialBalance = await iexec.account.checkBalance(
         wallet.address,
diff --git a/test/lib/e2e/IExecAppModule.test.js b/test/lib/e2e/IExecAppModule.test.js
index 01a60356..faa897e9 100644
--- a/test/lib/e2e/IExecAppModule.test.js
+++ b/test/lib/e2e/IExecAppModule.test.js
@@ -1,10 +1,7 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
 import {
   TEST_CHAINS,
-  TEE_FRAMEWORKS,
   getId,
   getRandomAddress,
   SERVICE_UNREACHABLE_URL,
@@ -20,15 +17,15 @@ import { errors } from '../../../src/lib/index.js';
 
 const { SmsCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('app', () => {
   describe('showApp()', () => {
     test('shows a deployed app', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const app = {
         owner: await iexec.wallet.getAddress(),
         name: `app${getId()}`,
@@ -36,14 +33,14 @@ describe('app', () => {
         multiaddr: 'registry.hub.docker.com/iexechub/vanityeth:1.1.1',
         checksum:
           '0x00f51494d7a42a3c1c43464d9f09e06b2a99968e3b978f6cd11ab3410b7bcd14',
-        mrenclave: {
+        mrenclave: JSON.stringify({
           framework: 'SCONE',
           version: 'v5',
           entrypoint: 'python /app/app.py',
           heapSize: 1073741824,
           fingerprint:
             'eca3ace86f1e8a5c47123c8fd271319e9eb25356803d36666dc620f30365c0c1',
-        },
+        }),
       };
       const { address } = await iexec.app.deployApp(app);
       const res = await readOnlyIExec.app.showApp(address);
@@ -54,26 +51,26 @@ describe('app', () => {
       expect(res.app.appType).toBe(app.type);
       expect(res.app.appMultiaddr).toBe(app.multiaddr);
       expect(res.app.appChecksum).toBe(app.checksum);
-      expect(res.app.appMREnclave).toBe(JSON.stringify(app.mrenclave));
+      expect(res.app.appMREnclave).toBe(app.mrenclave);
     });
 
     test('fails if the app is not deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const address = getRandomAddress();
       await expect(readOnlyIExec.app.showApp(address)).rejects.toThrow(
-        new errors.ObjectNotFoundError('app', address, iexecTestChain.chainId),
+        new errors.ObjectNotFoundError('app', address, testChain.chainId),
       );
     });
   });
 
   describe('showUserApp()', () => {
     test('shows the user app', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const app = {
         owner: wallet.address,
         name: `app${getId()}`,
@@ -81,14 +78,6 @@ describe('app', () => {
         multiaddr: 'registry.hub.docker.com/iexechub/vanityeth:1.1.1',
         checksum:
           '0x00f51494d7a42a3c1c43464d9f09e06b2a99968e3b978f6cd11ab3410b7bcd14',
-        mrenclave: {
-          framework: 'SCONE',
-          version: 'v5',
-          entrypoint: 'python /app/app.py',
-          heapSize: 1073741824,
-          fingerprint:
-            'eca3ace86f1e8a5c47123c8fd271319e9eb25356803d36666dc620f30365c0c1',
-        },
       };
       const { address } = await iexec.app.deployApp(app);
       const res = await readOnlyIExec.app.showUserApp(0, wallet.address);
@@ -99,11 +88,11 @@ describe('app', () => {
       expect(res.app.appType).toBe(app.type);
       expect(res.app.appMultiaddr).toBe(app.multiaddr);
       expect(res.app.appChecksum).toBe(app.checksum);
-      expect(res.app.appMREnclave).toBe(JSON.stringify(app.mrenclave));
+      expect(res.app.appMREnclave).toBe('');
     });
 
     test('fails if the app is not deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const address = getRandomAddress();
@@ -115,10 +104,10 @@ describe('app', () => {
 
   describe('countUserApps()', () => {
     test('counts user app', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const resBeforeDeploy = await readOnlyIExec.app.countUserApps(
         wallet.address,
       );
@@ -132,7 +121,7 @@ describe('app', () => {
 
   describe('deployApp()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       const app = {
         owner: getRandomAddress(),
         name: `app${getId()}`,
@@ -149,7 +138,7 @@ describe('app', () => {
     });
 
     test('deploys an app', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const app = {
         owner: getRandomAddress(),
         name: `app${getId()}`,
@@ -164,7 +153,7 @@ describe('app', () => {
     });
 
     test('cannot deploy twice with the same params', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const app = {
         owner: getRandomAddress(),
         name: `app${getId()}`,
@@ -182,10 +171,10 @@ describe('app', () => {
 
   describe('predictAppAddress()', () => {
     test('predicts the deployment address', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const app = {
         owner: getRandomAddress(),
         name: `app${getId()}`,
@@ -207,10 +196,10 @@ describe('app', () => {
 
   describe('checkDeployedApp()', () => {
     test('checks an app is deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const app = {
         owner: getRandomAddress(),
         name: `app${getId()}`,
@@ -232,7 +221,7 @@ describe('app', () => {
 
   describe('transferApp()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(
         iexec.app.transferApp(getRandomAddress(), getRandomAddress()),
       ).rejects.toThrow(
@@ -244,8 +233,8 @@ describe('app', () => {
 
     test('transfers the ownership', async () => {
       const receiverAddress = getRandomAddress();
-      const { iexec: iexecAppOwner } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecRandom } = getTestConfig(iexecTestChain)();
+      const { iexec: iexecAppOwner } = await getTestConfig(testChain)();
+      const { iexec: iexecRandom } = await getTestConfig(testChain)();
       const { address } = await deployRandomApp(iexecAppOwner);
       await expect(
         iexecRandom.app.transferApp(getRandomAddress(), receiverAddress),
@@ -265,13 +254,13 @@ describe('app', () => {
   describe('checkAppSecretExists()', () => {
     let randomAppAddress;
     beforeAll(async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const { address } = await deployRandomApp(iexec);
       randomAppAddress = address;
     });
 
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
@@ -287,7 +276,7 @@ describe('app', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           smsURL: SERVICE_HTTP_500_URL,
@@ -302,74 +291,19 @@ describe('app', () => {
       );
     });
 
-    test('checks an app secret exist on SMS inferred from gramine app TEE framework', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomApp(iexec, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
-      await expect(
-        readOnlyIExec.app.checkAppSecretExists(address),
-      ).resolves.toBe(false);
-      await iexec.app.pushAppSecret(address, 'foo');
-      // infer teeFramework to use
-      await expect(
-        readOnlyIExec.app.checkAppSecretExists(address),
-      ).resolves.toBe(true);
-      // check inferred teeFramework with teeFramework option
-      await expect(
-        readOnlyIExec.app.checkAppSecretExists(address, {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(true);
-    });
-
-    test('checks an app secret exist on SMS inferred from tdx app TEE framework', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+    test('checks an app secret exist on SMS', async () => {
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomApp(iexec, {
-        teeFramework: TEE_FRAMEWORKS.TDX,
-      });
+      const { iexec } = await getTestConfig(testChain)();
+      const { address } = await deployRandomApp(iexec);
       await expect(
         readOnlyIExec.app.checkAppSecretExists(address),
       ).resolves.toBe(false);
       await iexec.app.pushAppSecret(address, 'foo');
-      // infer teeFramework to use
       await expect(
         readOnlyIExec.app.checkAppSecretExists(address),
       ).resolves.toBe(true);
-      // check inferred teeFramework with teeFramework option
-      await expect(
-        readOnlyIExec.app.checkAppSecretExists(address, {
-          teeFramework: TEE_FRAMEWORKS.TDX,
-        }),
-      ).resolves.toBe(true);
-    });
-
-    test('allows teeFramework override', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomApp(iexec, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
-      await iexec.app.pushAppSecret(address, 'foo');
-      await expect(
-        readOnlyIExec.app.checkAppSecretExists(address, {
-          teeFramework: TEE_FRAMEWORKS.SCONE,
-        }),
-      ).resolves.toBe(false);
-      // validate teeFramework
-      await expect(
-        readOnlyIExec.app.checkAppSecretExists(getRandomAddress(), {
-          teeFramework: 'foo',
-        }),
-      ).rejects.toThrow(Error('teeFramework is not a valid TEE framework'));
     });
   });
 
@@ -377,14 +311,14 @@ describe('app', () => {
     let randomAppAddress;
     let randomAppOwnerWallet;
     beforeAll(async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const { address } = await deployRandomApp(iexec);
       randomAppAddress = address;
       randomAppOwnerWallet = wallet;
     });
 
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         privateKey: randomAppOwnerWallet.privateKey,
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
@@ -400,7 +334,7 @@ describe('app', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         privateKey: randomAppOwnerWallet.privateKey,
         options: {
           smsURL: SERVICE_HTTP_500_URL,
@@ -416,12 +350,10 @@ describe('app', () => {
     });
 
     test('only owner can push secret', async () => {
-      const { iexec: iexecAppOwner } = getTestConfig(iexecTestChain)();
+      const { iexec: iexecAppOwner } = await getTestConfig(testChain)();
       const { iexec: iexecRandom, wallet: randomWallet } =
-        getTestConfig(iexecTestChain)();
-      const { address: appAddress } = await deployRandomApp(iexecAppOwner, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
+        await getTestConfig(testChain)();
+      const { address: appAddress } = await deployRandomApp(iexecAppOwner);
       // only owner can push secret
       await expect(
         iexecRandom.app.pushAppSecret(appAddress, 'foo'),
@@ -432,53 +364,9 @@ describe('app', () => {
       );
     });
 
-    test('infers the SMS from gramine app TEE framework', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address: appAddress } = await deployRandomApp(iexec, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
-      // infer teeFramework to use
-      await expect(iexec.app.pushAppSecret(appAddress, 'foo')).resolves.toBe(
-        true,
-      );
-      // check inferred teeFramework with teeFramework option
-      await expect(
-        iexec.app.pushAppSecret(appAddress, 'foo', {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).rejects.toThrow(
-        new Error(
-          `Secret already exists for ${appAddress} and can't be updated`,
-        ),
-      );
-    });
-
-    test('infers the SMS from tdx app TEE framework', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address: appAddress } = await deployRandomApp(iexec, {
-        teeFramework: TEE_FRAMEWORKS.TDX,
-      });
-      // infer teeFramework to use
-      await expect(iexec.app.pushAppSecret(appAddress, 'foo')).resolves.toBe(
-        true,
-      );
-      // check inferred teeFramework with teeFramework option
-      await expect(
-        iexec.app.pushAppSecret(appAddress, 'foo', {
-          teeFramework: TEE_FRAMEWORKS.TDX,
-        }),
-      ).rejects.toThrow(
-        new Error(
-          `Secret already exists for ${appAddress} and can't be updated`,
-        ),
-      );
-    });
-
     test('cannot update existing secret', async () => {
-      const { iexec: iexecAppOwner } = getTestConfig(iexecTestChain)();
-      const { address: appAddress } = await deployRandomApp(iexecAppOwner, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
+      const { iexec: iexecAppOwner } = await getTestConfig(testChain)();
+      const { address: appAddress } = await deployRandomApp(iexecAppOwner);
 
       await expect(
         iexecAppOwner.app.pushAppSecret(appAddress, 'foo'),
@@ -492,36 +380,5 @@ describe('app', () => {
         ),
       );
     });
-
-    test('allow teeFramework override', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address: appAddress } = await deployRandomApp(iexec);
-      // infer teeFramework to use
-      await expect(iexec.app.pushAppSecret(appAddress, 'foo')).resolves.toBe(
-        true,
-      );
-      await expect(
-        iexec.app.checkAppSecretExists(appAddress, {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(false);
-      await expect(
-        iexec.app.pushAppSecret(appAddress, 'foo', {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(true);
-      await expect(
-        iexec.app.checkAppSecretExists(appAddress, {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(true);
-
-      // validate teeFramework
-      await expect(
-        iexec.app.pushAppSecret(appAddress, 'foo', {
-          teeFramework: 'foo',
-        }),
-      ).rejects.toThrow(Error('teeFramework is not a valid TEE framework'));
-    });
   });
 });
diff --git a/test/lib/e2e/IExecConfig.test.js b/test/lib/e2e/IExecConfig.test.js
index e93ad29a..5fb9a4d5 100644
--- a/test/lib/e2e/IExecConfig.test.js
+++ b/test/lib/e2e/IExecConfig.test.js
@@ -1,27 +1,9 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
+import { JsonRpcProvider, BrowserProvider, Wallet, HDNodeWallet } from 'ethers';
 import {
-  JsonRpcProvider,
-  FallbackProvider,
-  AlchemyProvider,
-  InfuraProvider,
-  EtherscanProvider,
-  CloudflareProvider,
-  BrowserProvider,
-  Wallet,
-  HDNodeWallet,
-} from 'ethers';
-import {
-  ALCHEMY_API_KEY,
-  ETHERSCAN_API_KEY,
-  INFURA_PROJECT_ID,
   InjectedProvider,
   TEST_CHAINS,
-  TEE_FRAMEWORKS,
-  getRandomAddress,
   getRandomWallet,
-  DEFAULT_PROVIDER_OPTIONS,
 } from '../../test-utils.js';
 import '../../jest-setup.js';
 
@@ -29,8 +11,8 @@ import { utils, IExecConfig, errors } from '../../../src/lib/index.js';
 import IExecContractsClient from '../../../src/common/utils/IExecContractsClient.js';
 import { getChainDefaults } from '../../../src/common/utils/config.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-const unknownTestChain = TEST_CHAINS['custom-token-chain'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
+const unknownTestChain = TEST_CHAINS['unknown-chain'];
 
 describe('[IExecConfig]', () => {
   describe('constructor', () => {
@@ -58,29 +40,12 @@ describe('[IExecConfig]', () => {
     });
 
     describe('throw Invalid option smsURL', () => {
-      test('IExecConfig({ ethProvider }, { smsURL: { foo: "https://foo.com" } })', () => {
+      test('IExecConfig({ ethProvider }, { smsURL: { } })', () => {
         const createConfig = () =>
-          new IExecConfig(
-            { ethProvider: 'bellecour' },
-            { smsURL: { foo: 'https://foo.com' } },
-          );
-        expect(createConfig).toThrow(
-          new Error('Invalid smsURL: this field has unspecified keys: foo'),
-        );
-        expect(createConfig).toThrow(errors.ConfigurationError);
-      });
-    });
-
-    describe('throw Invalid option defaultTeeFramework', () => {
-      test('IExecConfig({ ethProvider }, { defaultTeeFramework: "foo" })', () => {
-        const createConfig = () =>
-          new IExecConfig(
-            { ethProvider: 'bellecour' },
-            { defaultTeeFramework: 'foo' },
-          );
+          new IExecConfig({ ethProvider: 'arbitrum-mainnet' }, { smsURL: {} });
         expect(createConfig).toThrow(
           new Error(
-            'Invalid defaultTeeFramework: this is not a valid TEE framework',
+            'Invalid smsURL: this must be a `string` type, but the final value was: `{}`.',
           ),
         );
         expect(createConfig).toThrow(errors.ConfigurationError);
@@ -88,40 +53,17 @@ describe('[IExecConfig]', () => {
     });
 
     describe('read-only ethProvider from network name', () => {
-      test('IExecConfig({ ethProvider: "mainnet" })', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e');
-      });
-      test('IExecConfig({ ethProvider: "bellecour" })', async () => {
-        const config = new IExecConfig({ ethProvider: 'bellecour' });
+      test('IExecConfig({ ethProvider: "arbitrum-mainnet" })', async () => {
+        const config = new IExecConfig({ ethProvider: 'arbitrum-mainnet' });
         const { provider, signer, chainId } =
           await config.resolveContractsClient();
         expect(signer).toBeUndefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe('134');
+        expect(chainId).toBe('42161');
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(134n);
-        expect(network.name).toBe('bellecour');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x5f5B93fca68c9C79318d1F3868A354EE67D8c006');
+        expect(network.chainId).toBe(42161n);
+        expect(network.name).toBe('arbitrum');
       });
       test('throw with unsupported chains - IExecConfig({ ethProvider: "kovan" })', () => {
         const createConfig = () => new IExecConfig({ ethProvider: 'kovan' });
@@ -130,6 +72,7 @@ describe('[IExecConfig]', () => {
         );
         expect(createConfig).toThrow(errors.ConfigurationError);
       });
+      // skipped because no experimental networks are currently defined
       describe.skip('allowExperimentalNetworks', () => {
         test('throw with experimental chains when allowExperimentalNetworks is not enabled', () => {
           const createConfig = () =>
@@ -158,75 +101,41 @@ describe('[IExecConfig]', () => {
     });
 
     describe('read-only ethProvider from network chainId', () => {
-      test('IExecConfig({ ethProvider: "1" })', async () => {
-        const config = new IExecConfig(
-          { ethProvider: '1' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e');
-      });
-      test('IExecConfig({ ethProvider: "134" })', async () => {
-        const config = new IExecConfig({ ethProvider: '134' });
+      test('IExecConfig({ ethProvider: "42161" })', async () => {
+        const config = new IExecConfig({ ethProvider: '42161' });
         const { provider, signer, chainId } =
           await config.resolveContractsClient();
         expect(signer).toBeUndefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe('134');
+        expect(chainId).toBe('42161');
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(134n);
-        expect(network.name).toBe('bellecour');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x5f5B93fca68c9C79318d1F3868A354EE67D8c006');
+        expect(network.chainId).toBe(42161n);
+        expect(network.name).toBe('arbitrum');
       });
-      test('IExecConfig({ ethProvider: 1 })', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 1 },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
+      test('IExecConfig({ ethProvider: "421614" })', async () => {
+        const config = new IExecConfig({ ethProvider: '421614' });
         const { provider, signer, chainId } =
           await config.resolveContractsClient();
         expect(signer).toBeUndefined();
         expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(chainId).toBe('1');
+        expect(provider).toBeInstanceOf(JsonRpcProvider);
+        expect(chainId).toBe('421614');
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e');
+        expect(network.chainId).toBe(421614n);
+        expect(network.name).toBe('arbitrum-sepolia');
       });
-      test('IExecConfig({ ethProvider: 134 })', async () => {
-        const config = new IExecConfig({ ethProvider: 134 });
+      test('IExecConfig({ ethProvider: 42161 })', async () => {
+        const config = new IExecConfig({ ethProvider: 42161 });
         const { provider, signer, chainId } =
           await config.resolveContractsClient();
         expect(signer).toBeUndefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe('134');
+        expect(chainId).toBe('42161');
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(134n);
-        expect(network.name).toBe('bellecour');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x5f5B93fca68c9C79318d1F3868A354EE67D8c006');
+        expect(network.chainId).toBe(42161n);
+        expect(network.name).toBe('arbitrum');
       });
       test('throw with unsupported chains - IExecConfig({ ethProvider: 42 })', () => {
         const createConfig = () => new IExecConfig({ ethProvider: 42 });
@@ -242,6 +151,7 @@ describe('[IExecConfig]', () => {
         );
         expect(createConfig).toThrow(errors.ConfigurationError);
       });
+      // skipped because no experimental networks are currently defined
       describe.skip('allowExperimentalNetworks', () => {
         test('throw with experimental chains when allowExperimentalNetworks is not enabled', () => {
           const createConfig = () => new IExecConfig({ ethProvider: 421614 });
@@ -268,125 +178,6 @@ describe('[IExecConfig]', () => {
       });
     });
 
-    describe('read-only ethProvider with API keys', () => {
-      test('IExecConfig({ ethProvider: "mainnet" }, { providerOptions : { infura, alchemy, quorum: 1 }})', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: {
-              alchemy: ALCHEMY_API_KEY,
-              infura: INFURA_PROJECT_ID,
-              quorum: 1,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('IExecConfig({ ethProvider: "mainnet" }, { providerOptions : { infura }})', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: {
-              infura: INFURA_PROJECT_ID,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(InfuraProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('IExecConfig({ ethProvider: "mainnet" }, { providerOptions : { alchemy }})', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: {
-              alchemy: ALCHEMY_API_KEY,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(AlchemyProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('IExecConfig({ ethProvider: "mainnet" }, { providerOptions : { etherscan }})', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: {
-              etherscan: ETHERSCAN_API_KEY,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(EtherscanProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('IExecConfig({ ethProvider: "mainnet" }, { providerOptions : { cloudflare, infura, etherscan, alchemy }})', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: {
-              cloudflare: true,
-              infura: INFURA_PROJECT_ID,
-              alchemy: ALCHEMY_API_KEY,
-              etherscan: ETHERSCAN_API_KEY,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(provider.providerConfigs.length).toBe(4);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-    });
-
     describe('read-only ethProvider from node url', () => {
       test('IExecConfig({ ethProvider: "http://localhost:8545" }, { hubAddress })', async () => {
         const config = new IExecConfig(
@@ -402,25 +193,22 @@ describe('[IExecConfig]', () => {
         const network = await provider.getNetwork();
         expect(network.chainId).toBe(BigInt(unknownTestChain.chainId));
         expect(network.name).toBe('unknown');
-        expect(network.getPlugin('org.ethers.plugins.network.Ens')).toBe(null);
       });
-      test('IExecConfig({ ethProvider: "https://bellecour.iex.ec" }) - autodetect known network', async () => {
+      test('IExecConfig({ ethProvider: "https://sepolia-rollup.arbitrum.io/rpc" }) - autodetect known network', async () => {
         const config = new IExecConfig({
-          ethProvider: 'https://bellecour.iex.ec',
+          ethProvider: 'https://sepolia-rollup.arbitrum.io/rpc',
         });
         const { provider, signer, chainId } =
           await config.resolveContractsClient();
         expect(signer).toBeUndefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe('134');
+        expect(chainId).toBe('421614');
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(134n);
-        expect(network.name).toBe('bellecour');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x5f5B93fca68c9C79318d1F3868A354EE67D8c006');
+        expect(network.chainId).toBe(421614n);
+        expect(network.name).toBe('arbitrum-sepolia');
       });
+      // skipped because no experimental networks are currently defined
       describe.skip('allowExperimentalNetworks', () => {
         const experimentalNetworkRpcUrl = getChainDefaults(421614, {
           allowExperimentalNetworks: true,
@@ -460,7 +248,7 @@ describe('[IExecConfig]', () => {
         const wallet = getRandomWallet();
         const config = new IExecConfig({
           ethProvider: utils.getSignerFromPrivateKey(
-            iexecTestChain.rpcURL,
+            testChain.rpcURL,
             wallet.privateKey,
           ),
         });
@@ -469,45 +257,36 @@ describe('[IExecConfig]', () => {
         expect(signer).toBeDefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe(iexecTestChain.chainId);
+        expect(chainId).toBe(testChain.chainId);
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(BigInt(iexecTestChain.chainId));
-        expect(network.name).toBe(iexecTestChain.defaults.name);
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe(iexecTestChain.defaults.ensRegistryAddress);
+        expect(network.chainId).toBe(BigInt(testChain.chainId));
+        expect(network.name).toBe(testChain.defaults.name);
       });
 
-      test('getSignerFromPrivateKey() with network fallback', async () => {
+      test('getSignerFromPrivateKey() with network name', async () => {
         const wallet = getRandomWallet();
         const config = new IExecConfig({
           ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
+            'arbitrum-mainnet',
             wallet.privateKey,
-            {
-              providers: DEFAULT_PROVIDER_OPTIONS,
-            },
           ),
         });
         const { provider, signer, chainId } =
           await config.resolveContractsClient();
         expect(signer).toBeDefined();
         expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(chainId).toBe('1');
+        expect(provider).toBeInstanceOf(JsonRpcProvider);
+        expect(chainId).toBe('42161');
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe('0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e');
+        expect(network.chainId).toBe(42161n);
+        expect(network.name).toBe('arbitrum');
       });
     });
 
     describe('web3 provider', () => {
       test('InjectedProvider', async () => {
         const injectedProvider = new InjectedProvider(
-          iexecTestChain.rpcURL,
+          testChain.rpcURL,
           getRandomWallet().privateKey,
         );
         const config = new IExecConfig({
@@ -518,14 +297,12 @@ describe('[IExecConfig]', () => {
         expect(signer).toBeDefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(BrowserProvider);
-        expect(chainId).toBe(iexecTestChain.chainId);
+        expect(chainId).toBe(testChain.chainId);
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(BigInt(iexecTestChain.chainId));
-        expect(network.name).toBe(iexecTestChain.defaults.name);
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe(iexecTestChain.defaults.ensRegistryAddress);
+        expect(network.chainId).toBe(BigInt(testChain.chainId));
+        expect(network.name).toBe(testChain.defaults.name);
       });
+      // skipped because no experimental networks are currently defined
       describe.skip('allowExperimentalNetworks', () => {
         const experimentalNetworkRpcUrl = getChainDefaults(421614, {
           allowExperimentalNetworks: true,
@@ -570,7 +347,7 @@ describe('[IExecConfig]', () => {
 
     describe('ethers AbstractProvider', () => {
       test('JsonRpcProvider', async () => {
-        const ethersProvider = new JsonRpcProvider(iexecTestChain.rpcURL);
+        const ethersProvider = new JsonRpcProvider(testChain.rpcURL);
         const config = new IExecConfig({
           ethProvider: ethersProvider,
         });
@@ -579,42 +356,10 @@ describe('[IExecConfig]', () => {
         expect(signer).toBeUndefined();
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe(iexecTestChain.chainId);
+        expect(chainId).toBe(testChain.chainId);
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(BigInt(iexecTestChain.chainId));
-        expect(network.name).toBe(iexecTestChain.defaults.name);
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe(iexecTestChain.defaults.ensRegistryAddress);
-      });
-
-      test('JsonRpcProvider with custom network (including ens)', async () => {
-        const ethersProvider = new JsonRpcProvider(unknownTestChain.rpcURL, {
-          chainId: parseInt(unknownTestChain.chainId, 10),
-          name: 'test',
-          ensAddress: unknownTestChain.ensRegistryAddress,
-        });
-        const config = new IExecConfig(
-          {
-            ethProvider: ethersProvider,
-          },
-          {
-            hubAddress: unknownTestChain.hubAddress,
-            ensRegistryAddress: unknownTestChain.ensRegistryAddress,
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe(unknownTestChain.chainId);
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(BigInt(unknownTestChain.chainId));
-        expect(network.name).toBe('test');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe(unknownTestChain.ensRegistryAddress);
+        expect(network.chainId).toBe(BigInt(testChain.chainId));
+        expect(network.name).toBe(testChain.defaults.name);
       });
     });
 
@@ -631,7 +376,7 @@ describe('[IExecConfig]', () => {
 
       test('Wallet with provider', async () => {
         const ethersSigner = Wallet.createRandom(
-          new JsonRpcProvider(iexecTestChain.rpcURL),
+          new JsonRpcProvider(testChain.rpcURL),
         );
         const config = new IExecConfig({
           ethProvider: ethersSigner,
@@ -642,109 +387,10 @@ describe('[IExecConfig]', () => {
         expect(signer).toBeInstanceOf(HDNodeWallet);
         expect(provider).toBeDefined();
         expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe(iexecTestChain.chainId);
+        expect(chainId).toBe(testChain.chainId);
         const network = await provider.getNetwork();
-        expect(network.chainId).toBe(BigInt(iexecTestChain.chainId));
-        expect(network.name).toBe(iexecTestChain.defaults.name);
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBe(iexecTestChain.defaults.ensRegistryAddress);
-      });
-    });
-
-    describe('bridged chain provider', () => {
-      test('IExecConfig({ ethProvider: "bellecour" })', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'bellecour' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveBridgedContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('bridged contract IExecConfig({ ethProvider: "bellecour" }, { providerOptions : { infura }})', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'bellecour' },
-          {
-            providerOptions: {
-              cloudflare: true,
-              infura: INFURA_PROJECT_ID,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveBridgedContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(FallbackProvider);
-        expect(provider.providerConfigs.length).toBe(2);
-        expect(provider.providerConfigs[0].provider).toBeInstanceOf(
-          CloudflareProvider,
-        );
-        expect(provider.providerConfigs[1].provider).toBeInstanceOf(
-          InfuraProvider,
-        );
-        expect(chainId).toBe('1');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(1n);
-        expect(network.name).toBe('mainnet');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('IExecConfig({ ethProvider: "mainnet" })', async () => {
-        const config = new IExecConfig(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveBridgedContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe('134');
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(134n);
-        expect(network.name).toBe('bellecour');
-        expect(
-          network.getPlugin('org.ethers.plugins.network.Ens').address,
-        ).toBeDefined();
-      });
-      test('IExecConfig({ ethProvider: "http://localhost:8545" }, { hubAddress, bridgedNetworkConf })', async () => {
-        const config = new IExecConfig(
-          { ethProvider: iexecTestChain.rpcURL },
-          {
-            bridgedNetworkConf: {
-              rpcURL: unknownTestChain.rpcURL,
-              chainId: unknownTestChain.chainId,
-              hubAddress: unknownTestChain.hubAddress,
-              bridgeAddress: utils.NULL_ADDRESS,
-            },
-          },
-        );
-        const { provider, signer, chainId } =
-          await config.resolveBridgedContractsClient();
-        expect(signer).toBeUndefined();
-        expect(provider).toBeDefined();
-        expect(provider).toBeInstanceOf(JsonRpcProvider);
-        expect(chainId).toBe(unknownTestChain.chainId);
-        const network = await provider.getNetwork();
-        expect(network.chainId).toBe(BigInt(unknownTestChain.chainId));
-        expect(network.name).toBe('unknown');
-        expect(network.getPlugin('org.ethers.plugins.network.Ens')).toBe(null);
+        expect(network.chainId).toBe(BigInt(testChain.chainId));
+        expect(network.name).toBe(testChain.defaults.name);
       });
     });
   });
@@ -752,10 +398,10 @@ describe('[IExecConfig]', () => {
   describe('resolveChainId()', () => {
     test('success', async () => {
       const config = new IExecConfig({
-        ethProvider: iexecTestChain.rpcURL,
+        ethProvider: testChain.rpcURL,
       });
       await expect(config.resolveChainId()).resolves.toBe(
-        parseInt(iexecTestChain.chainId, 10),
+        parseInt(testChain.chainId, 10),
       );
     });
     test('throw on network error', async () => {
@@ -772,13 +418,12 @@ describe('[IExecConfig]', () => {
   describe('resolveContractsClient()', () => {
     test('success', async () => {
       const config = new IExecConfig({
-        ethProvider: 'bellecour',
+        ethProvider: 'arbitrum-sepolia-testnet',
       });
       const promise = config.resolveContractsClient();
       await expect(promise).resolves.toBeInstanceOf(IExecContractsClient);
       const contracts = await promise;
-      expect(contracts.chainId).toBe('134');
-      expect(contracts.isNative).toBe(true);
+      expect(contracts.chainId).toBe('421614');
     });
     test('success with hubAddress on custom chain', async () => {
       const config = new IExecConfig(
@@ -791,7 +436,6 @@ describe('[IExecConfig]', () => {
       await expect(promise).resolves.toBeInstanceOf(IExecContractsClient);
       const contracts = await promise;
       expect(contracts.chainId).toBe(unknownTestChain.chainId);
-      expect(contracts.isNative).toBe(false);
     });
     test('throw on unknown chain', async () => {
       const config = new IExecConfig({
@@ -815,156 +459,27 @@ describe('[IExecConfig]', () => {
     });
   });
 
-  describe('resolveBridgedContractsClient()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveBridgedContractsClient();
-      await expect(promise).resolves.toBeInstanceOf(IExecContractsClient);
-      const contracts = await promise;
-      expect(contracts.chainId).toBe('1');
-      expect(contracts.isNative).toBe(false);
-    });
-    test('success with bridgedNetworkConf on custom chain', async () => {
-      const homeChain = unknownTestChain;
-      const bridgedChain = unknownTestChain;
-      const config = new IExecConfig(
-        {
-          ethProvider: homeChain.rpcURL,
-        },
-        {
-          hubAddress: homeChain.rpcURL,
-          bridgedNetworkConf: {
-            chainId: bridgedChain.chainId,
-            rpcURL: bridgedChain.rpcURL,
-            hubAddress: bridgedChain.hubAddress,
-            bridgeAddress: utils.NULL_ADDRESS,
-          },
-        },
-      );
-      const promise = config.resolveBridgedContractsClient();
-      await expect(promise).resolves.toBeInstanceOf(IExecContractsClient);
-      const contracts = await promise;
-      expect(contracts.chainId).toBe(bridgedChain.chainId);
-      expect(contracts.isNative).toBe(true);
-    });
-    test('throw on unknown chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const promise = config.resolveBridgedContractsClient();
-      await expect(promise).rejects.toThrow(
-        new Error(
-          `bridgedNetworkConf option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-      await expect(promise).rejects.toThrow(errors.ConfigurationError);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveBridgedContractsClient();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
-  });
-
   describe('resolveSmsURL()', () => {
     test('success', async () => {
       const config = new IExecConfig({
-        ethProvider: 'bellecour',
+        ethProvider: 'arbitrum-sepolia-testnet',
       });
       const promise = config.resolveSmsURL();
       const url = await promise;
       expect(typeof url).toBe('string');
       expect(url.length > 0).toBe(true);
     });
-    test('success default resolves to scone', async () => {
-      const defaultSms = await new IExecConfig({
-        ethProvider: 'bellecour',
-      }).resolveSmsURL();
-      const sconeSmsUrl = await new IExecConfig({
-        ethProvider: 'bellecour',
-      }).resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.SCONE });
-      const gramineSmsUrl = await new IExecConfig({
-        ethProvider: 'bellecour',
-      }).resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.GRAMINE });
-      expect(defaultSms).toBe(sconeSmsUrl);
-      expect(defaultSms).not.toBe(gramineSmsUrl);
-    });
-    test('success override defaultTeeFramework', async () => {
-      const defaultSms = await new IExecConfig({
-        ethProvider: 'bellecour',
-      }).resolveSmsURL();
-      const defaultSmsTeeFrameworkOverride = await new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { defaultTeeFramework: TEE_FRAMEWORKS.GRAMINE },
-      ).resolveSmsURL();
-      const gramineSms = await new IExecConfig({
-        ethProvider: 'bellecour',
-      }).resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.GRAMINE });
-      expect(defaultSmsTeeFrameworkOverride).toBe(gramineSms);
-      expect(defaultSmsTeeFrameworkOverride).not.toBe(defaultSms);
-    });
-    test('success smsURL object override per teeFramework', async () => {
-      const smsMap = {
-        scone: 'http://foo.io',
-        gramine: 'http://bar.io',
-      };
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { smsURL: smsMap },
-      );
-      await expect(
-        config.resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.SCONE }),
-      ).resolves.toBe(smsMap.scone);
-      await expect(
-        config.resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.GRAMINE }),
-      ).resolves.toBe(smsMap.gramine);
-    });
-    test('success smsURL object override only one teeFramework', async () => {
-      const sconeDefaultSms = await new IExecConfig({
-        ethProvider: 'bellecour',
-      }).resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.SCONE });
-      const smsMap = {
-        gramine: 'http://bar.io',
-      };
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { smsURL: smsMap },
-      );
-      await expect(
-        config.resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.SCONE }),
-      ).resolves.toBe(sconeDefaultSms);
-      await expect(
-        config.resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.GRAMINE }),
-      ).resolves.toBe(smsMap.gramine);
-    });
-    test('success smsURL string override all teeFramework', async () => {
+    test('success smsURL override default URL', async () => {
       const smsOverride = 'http://sms-override.iex.ec';
       const config = new IExecConfig(
         {
-          ethProvider: 'bellecour',
+          ethProvider: 'arbitrum-sepolia-testnet',
         },
         { smsURL: smsOverride },
       );
       await expect(config.resolveSmsURL()).resolves.toBe(smsOverride);
-      await expect(
-        config.resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.SCONE }),
-      ).resolves.toBe(smsOverride);
-      await expect(
-        config.resolveSmsURL({ teeFramework: TEE_FRAMEWORKS.GRAMINE }),
-      ).resolves.toBe(smsOverride);
     });
-    test('success with smsURL string on custom chain', async () => {
+    test('success smsURL sets the URL on custom chain', async () => {
       const smsOverride = 'http://sms-override.iex.ec';
       const config = new IExecConfig(
         {
@@ -995,76 +510,12 @@ describe('[IExecConfig]', () => {
       await expect(promise).rejects.toThrow('Failed to detect network:');
       await expect(promise).rejects.toThrow(Error);
     });
-    test('throw with invalid TEE framework', async () => {
-      const config = new IExecConfig({
-        ethProvider: iexecTestChain.rpcURL,
-      });
-      const promise = config.resolveSmsURL({ teeFramework: 'foo' });
-      await expect(promise).rejects.toThrow(
-        new Error(`teeFramework is not a valid TEE framework`),
-      );
-      await expect(promise).rejects.toThrow(errors.ValidationError);
-    });
-  });
-
-  describe('resolveResultProxyURL()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveResultProxyURL();
-      const url = await promise;
-      expect(typeof url).toBe('string');
-      expect(url.length > 0).toBe(true);
-    });
-    test('success resultProxyURL override', async () => {
-      const resultProxyOverride = 'http://rp-override.iex.ec';
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { resultProxyURL: resultProxyOverride },
-      );
-      const promise = config.resolveResultProxyURL();
-      await expect(promise).resolves.toBe(resultProxyOverride);
-    });
-    test('success with resultProxyURL on custom chain', async () => {
-      const resultProxyOverride = 'http://rp-override.iex.ec';
-      const config = new IExecConfig(
-        {
-          ethProvider: unknownTestChain.rpcURL,
-        },
-        { resultProxyURL: resultProxyOverride },
-      );
-      const promise = config.resolveResultProxyURL();
-      await expect(promise).resolves.toBe(resultProxyOverride);
-    });
-    test('throw on unknown chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const promise = config.resolveResultProxyURL();
-      await expect(promise).rejects.toThrow(
-        new Error(
-          `resultProxyURL option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-      await expect(promise).rejects.toThrow(errors.ConfigurationError);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveResultProxyURL();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
   });
 
   describe('resolveIexecGatewayURL()', () => {
     test('success', async () => {
       const config = new IExecConfig({
-        ethProvider: 'bellecour',
+        ethProvider: 'arbitrum-sepolia-testnet',
       });
       const promise = config.resolveIexecGatewayURL();
       const url = await promise;
@@ -1086,7 +537,7 @@ describe('[IExecConfig]', () => {
       const marketOverride = 'https://api.market-override.iex.ec';
       const config = new IExecConfig(
         {
-          ethProvider: 'bellecour',
+          ethProvider: 'arbitrum-sepolia-testnet',
         },
         { iexecGatewayURL: marketOverride },
       );
@@ -1116,7 +567,7 @@ describe('[IExecConfig]', () => {
   describe('resolveIpfsGatewayURL()', () => {
     test('success', async () => {
       const config = new IExecConfig({
-        ethProvider: 'bellecour',
+        ethProvider: 'arbitrum-sepolia-testnet',
       });
       const promise = config.resolveIpfsGatewayURL();
       const url = await promise;
@@ -1136,7 +587,7 @@ describe('[IExecConfig]', () => {
     test('success ipfsGatewayURL override', async () => {
       const config = new IExecConfig(
         {
-          ethProvider: 'bellecour',
+          ethProvider: 'arbitrum-sepolia-testnet',
         },
         { ipfsGatewayURL: 'https://custom-ipfs.iex.ec' },
       );
@@ -1166,7 +617,7 @@ describe('[IExecConfig]', () => {
   describe('resolvePocoSubgraphURL()', () => {
     test('success', async () => {
       const config = new IExecConfig({
-        ethProvider: 'bellecour',
+        ethProvider: 'arbitrum-sepolia-testnet',
       });
       const promise = config.resolvePocoSubgraphURL();
       const url = await promise;
@@ -1188,7 +639,7 @@ describe('[IExecConfig]', () => {
     test('success pocoSubgraphURL override', async () => {
       const config = new IExecConfig(
         {
-          ethProvider: 'bellecour',
+          ethProvider: 'arbitrum-sepolia-testnet',
         },
         { pocoSubgraphURL: 'https://custom-subgraph.iex.ec/subgraph/name' },
       );
@@ -1216,282 +667,4 @@ describe('[IExecConfig]', () => {
       await expect(promise).rejects.toThrow(Error);
     });
   });
-
-  describe('resolveVoucherSubgraphURL()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveVoucherSubgraphURL();
-      const url = await promise;
-      expect(typeof url).toBe('string');
-      expect(url.length > 0).toBe(true);
-    });
-    test('success when configured on custom chain', async () => {
-      const config = new IExecConfig(
-        {
-          ethProvider: unknownTestChain.rpcURL,
-        },
-        { voucherSubgraphURL: 'https://custom-subgraph.iex.ec/subgraph/name' },
-      );
-      const promise = config.resolveVoucherSubgraphURL();
-      await expect(promise).resolves.toBe(
-        'https://custom-subgraph.iex.ec/subgraph/name',
-      );
-    });
-    test('success voucherSubgraphURL override', async () => {
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { voucherSubgraphURL: 'https://custom-subgraph.iex.ec/subgraph/name' },
-      );
-      const promise = config.resolveVoucherSubgraphURL();
-      await expect(promise).resolves.toBe(
-        'https://custom-subgraph.iex.ec/subgraph/name',
-      );
-    });
-    test('returns null when not configured on custom chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const res = await config.resolveVoucherSubgraphURL();
-      expect(res).toBe(null);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveVoucherSubgraphURL();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
-  });
-
-  describe('resolveBridgeAddress()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveBridgeAddress();
-      const address = await promise;
-      expect(typeof address).toBe('string');
-      expect(address.length).toBe(42);
-    });
-    test('success bridgeAddress override', async () => {
-      const bridgeAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { bridgeAddress: bridgeAddressOverride },
-      );
-      const promise = config.resolveBridgeAddress();
-      await expect(promise).resolves.toBe(bridgeAddressOverride);
-    });
-    test('success with bridgeAddress on custom chain', async () => {
-      const bridgeAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        { bridgeAddress: bridgeAddressOverride },
-      );
-      const promise = config.resolveBridgeAddress();
-      await expect(promise).resolves.toBe(bridgeAddressOverride);
-    });
-    test('throw on unknown chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const promise = config.resolveBridgeAddress();
-      await expect(promise).rejects.toThrow(
-        new Error(
-          `bridgeAddress option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-      await expect(promise).rejects.toThrow(errors.ConfigurationError);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveBridgeAddress();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
-  });
-
-  describe('resolveBridgeBackAddress()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveBridgeBackAddress();
-      const address = await promise;
-      expect(typeof address).toBe('string');
-      expect(address.length).toBe(42);
-    });
-    test('success bridgeAddress override', async () => {
-      const bridgeAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        {
-          bridgedNetworkConf: {
-            bridgeAddress: bridgeAddressOverride,
-          },
-        },
-      );
-      const promise = config.resolveBridgeBackAddress();
-      await expect(promise).resolves.toBe(bridgeAddressOverride);
-    });
-    test('success with bridgeAddress on custom chain', async () => {
-      const bridgeAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        {
-          bridgedNetworkConf: {
-            bridgeAddress: bridgeAddressOverride,
-          },
-        },
-      );
-      const promise = config.resolveBridgeBackAddress();
-      await expect(promise).resolves.toBe(bridgeAddressOverride);
-    });
-    test('throw on unknown chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const promise = config.resolveBridgeBackAddress();
-      await expect(promise).rejects.toThrow(
-        new Error(
-          `bridgedNetworkConf option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-      await expect(promise).rejects.toThrow(errors.ConfigurationError);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveBridgeBackAddress();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
-  });
-
-  describe('resolveEnsPublicResolverAddress()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveEnsPublicResolverAddress();
-      const address = await promise;
-      expect(typeof address).toBe('string');
-      expect(address.length).toBe(42);
-    });
-    test('success ensPublicResolverAddress override', async () => {
-      const ensPublicResolverAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        {
-          ensPublicResolverAddress: ensPublicResolverAddressOverride,
-        },
-      );
-      const promise = config.resolveEnsPublicResolverAddress();
-      await expect(promise).resolves.toBe(ensPublicResolverAddressOverride);
-    });
-    test('success with ensPublicResolverAddress on custom chain', async () => {
-      const ensPublicResolverAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: unknownTestChain.rpcURL,
-        },
-        {
-          ensPublicResolverAddress: ensPublicResolverAddressOverride,
-        },
-      );
-      const promise = config.resolveEnsPublicResolverAddress();
-      await expect(promise).resolves.toBe(ensPublicResolverAddressOverride);
-    });
-    test('throw on unknown chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const promise = config.resolveEnsPublicResolverAddress();
-      await expect(promise).rejects.toThrow(
-        new Error(
-          `ensPublicResolverAddress option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-      await expect(promise).rejects.toThrow(errors.ConfigurationError);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveEnsPublicResolverAddress();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
-  });
-
-  describe('resolveVoucherHubAddress()', () => {
-    test('success', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'bellecour',
-      });
-      const promise = config.resolveVoucherHubAddress();
-      const address = await promise;
-      expect(typeof address).toBe('string');
-      expect(address.length).toBe(42);
-    });
-    test('success voucherHubAddress override', async () => {
-      const voucherHubAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: 'bellecour',
-        },
-        {
-          voucherHubAddress: voucherHubAddressOverride,
-        },
-      );
-      const promise = config.resolveVoucherHubAddress();
-      await expect(promise).resolves.toBe(voucherHubAddressOverride);
-    });
-    test('success with voucherHubAddress on custom chain', async () => {
-      const voucherHubAddressOverride = getRandomAddress();
-      const config = new IExecConfig(
-        {
-          ethProvider: unknownTestChain.rpcURL,
-        },
-        {
-          voucherHubAddress: voucherHubAddressOverride,
-        },
-      );
-      const promise = config.resolveVoucherHubAddress();
-      await expect(promise).resolves.toBe(voucherHubAddressOverride);
-    });
-    test('returns null on unknown chain', async () => {
-      const config = new IExecConfig({
-        ethProvider: unknownTestChain.rpcURL,
-      });
-      const res = await config.resolveVoucherHubAddress();
-      expect(res).toBe(null);
-    });
-    test('throw on network error', async () => {
-      const config = new IExecConfig({
-        ethProvider: 'http://localhost:8888',
-      });
-      const promise = config.resolveVoucherHubAddress();
-      await expect(promise).rejects.toThrow('Failed to detect network:');
-      await expect(promise).rejects.toThrow(Error);
-    });
-  });
 });
diff --git a/test/lib/e2e/IExecDatasetModule.test.js b/test/lib/e2e/IExecDatasetModule.test.js
index 7dfd8a30..8f87a8e8 100644
--- a/test/lib/e2e/IExecDatasetModule.test.js
+++ b/test/lib/e2e/IExecDatasetModule.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { join } from 'path';
 import { BN } from 'bn.js';
@@ -11,7 +9,6 @@ import {
 } from '../lib-test-utils.js';
 import {
   TEST_CHAINS,
-  TEE_FRAMEWORKS,
   execAsync,
   getId,
   getRandomAddress,
@@ -25,15 +22,15 @@ const { SmsCallError } = errors;
 
 const { readFile, ensureDir, writeFile } = fsExtra;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('dataset', () => {
   describe('showDataset()', () => {
     test('shows a deployed dataset', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const dataset = {
         owner: await iexec.wallet.getAddress(),
         name: `dataset${getId()}`,
@@ -53,26 +50,22 @@ describe('dataset', () => {
     });
 
     test('fails if the dataset is not deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const address = getRandomAddress();
       await expect(readOnlyIExec.dataset.showDataset(address)).rejects.toThrow(
-        new errors.ObjectNotFoundError(
-          'dataset',
-          address,
-          iexecTestChain.chainId,
-        ),
+        new errors.ObjectNotFoundError('dataset', address, testChain.chainId),
       );
     });
   });
 
   describe('showUserDataset()', () => {
     test('shows the user dataset', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const dataset = {
         owner: wallet.address,
         name: `dataset${getId()}`,
@@ -94,7 +87,7 @@ describe('dataset', () => {
     });
 
     test('fails if the dataset is not deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const address = getRandomAddress();
@@ -106,10 +99,10 @@ describe('dataset', () => {
 
   describe('countUserDatasets()', () => {
     test('counts user datasets', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const resBeforeDeploy = await readOnlyIExec.dataset.countUserDatasets(
         wallet.address,
       );
@@ -123,7 +116,7 @@ describe('dataset', () => {
 
   describe('deployDataset()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       const dataset = {
         owner: getRandomAddress(),
         name: `dataset${getId()}`,
@@ -139,7 +132,7 @@ describe('dataset', () => {
     });
 
     test('deploys a dataset', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const dataset = {
         owner: await iexec.wallet.getAddress(),
         name: `dataset${getId()}`,
@@ -153,7 +146,7 @@ describe('dataset', () => {
     });
 
     test('cannot deploy twice with the same params', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const dataset = {
         owner: await iexec.wallet.getAddress(),
         name: `dataset${getId()}`,
@@ -170,10 +163,10 @@ describe('dataset', () => {
 
   describe('predictDatasetAddress()', () => {
     test('predicts the deployment address', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const dataset = {
         owner: getRandomAddress(),
         name: `dataset${getId()}`,
@@ -195,10 +188,10 @@ describe('dataset', () => {
 
   describe('checkDeployedDataset()', () => {
     test('checks a dataset is deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const dataset = {
         owner: getRandomAddress(),
         name: `dataset${getId()}`,
@@ -220,7 +213,7 @@ describe('dataset', () => {
 
   describe('transferDataset()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(
         iexec.dataset.transferDataset(getRandomAddress(), getRandomAddress()),
       ).rejects.toThrow(
@@ -232,8 +225,8 @@ describe('dataset', () => {
 
     test('transfers the ownership', async () => {
       const receiverAddress = getRandomAddress();
-      const { iexec: iexecDatasetOwner } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecRandom } = getTestConfig(iexecTestChain)();
+      const { iexec: iexecDatasetOwner } = await getTestConfig(testChain)();
+      const { iexec: iexecRandom } = await getTestConfig(testChain)();
       const { address } = await deployRandomDataset(iexecDatasetOwner);
       await expect(
         iexecRandom.dataset.transferDataset(
@@ -259,17 +252,19 @@ describe('dataset', () => {
   });
 
   describe('generateEncryptionKey()', () => {
-    const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
-      readOnly: true,
+    test('generates a random 32 bytes key encoded in base64', async () => {
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
+        readOnly: true,
+      });
+      const key = readOnlyIExec.dataset.generateEncryptionKey();
+      expect(typeof key).toBe('string');
+      expect(Buffer.from(key, 'base64').length).toBe(32);
     });
-    const key = readOnlyIExec.dataset.generateEncryptionKey();
-    expect(typeof key).toBe('string');
-    expect(Buffer.from(key, 'base64').length).toBe(32);
   });
 
   describe('encrypt()', () => {
     test('encrypts the input', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const key = iexec.dataset.generateEncryptionKey();
@@ -305,7 +300,7 @@ describe('dataset', () => {
 
   describe('computeEncryptedFileChecksum()', () => {
     test('does the sha256sum of the input', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const key = iexec.dataset.generateEncryptionKey();
@@ -329,13 +324,13 @@ describe('dataset', () => {
   describe('checkDatasetSecretExists()', () => {
     let randomDatasetAddress;
     beforeAll(async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const { address } = await deployRandomDataset(iexec);
       randomDatasetAddress = address;
     });
 
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
@@ -351,7 +346,7 @@ describe('dataset', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           smsURL: SERVICE_HTTP_500_URL,
@@ -366,11 +361,11 @@ describe('dataset', () => {
       );
     });
 
-    test('checks a dataset secret exist on default TEE framework SMS', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+    test('checks a dataset secret exist in the SMS', async () => {
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const { address } = await deployRandomDataset(iexec);
       await expect(
         readOnlyIExec.dataset.checkDatasetSecretExists(address),
@@ -379,38 +374,6 @@ describe('dataset', () => {
       await expect(
         readOnlyIExec.dataset.checkDatasetSecretExists(address),
       ).resolves.toBe(true);
-      await expect(
-        readOnlyIExec.dataset.checkDatasetSecretExists(address, {
-          teeFramework: TEE_FRAMEWORKS.SCONE,
-        }),
-      ).resolves.toBe(true);
-    });
-
-    test('allows teeFramework override', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomDataset(iexec);
-      await iexec.dataset.pushDatasetSecret(address, 'foo', {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
-      await expect(
-        readOnlyIExec.dataset.checkDatasetSecretExists(address, {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(true);
-      await expect(
-        readOnlyIExec.dataset.checkDatasetSecretExists(address, {
-          teeFramework: TEE_FRAMEWORKS.SCONE,
-        }),
-      ).resolves.toBe(false);
-      // validate teeFramework
-      await expect(
-        readOnlyIExec.dataset.checkDatasetSecretExists(getRandomAddress(), {
-          teeFramework: 'foo',
-        }),
-      ).rejects.toThrow(Error('teeFramework is not a valid TEE framework'));
     });
   });
 
@@ -418,14 +381,14 @@ describe('dataset', () => {
     let randomDatasetAddress;
     let randomDatasetOwnerWallet;
     beforeAll(async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const { address } = await deployRandomDataset(iexec);
       randomDatasetAddress = address;
       randomDatasetOwnerWallet = wallet;
     });
 
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         privateKey: randomDatasetOwnerWallet.privateKey,
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
@@ -441,7 +404,7 @@ describe('dataset', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         privateKey: randomDatasetOwnerWallet.privateKey,
         options: {
           smsURL: SERVICE_HTTP_500_URL,
@@ -457,9 +420,9 @@ describe('dataset', () => {
     });
 
     test('only owner can push secret', async () => {
-      const { iexec: iexecDatasetOwner } = getTestConfig(iexecTestChain)();
+      const { iexec: iexecDatasetOwner } = await getTestConfig(testChain)();
       const { iexec: iexecRandom, wallet: randomWallet } =
-        getTestConfig(iexecTestChain)();
+        await getTestConfig(testChain)();
       const { address: datasetAddress } =
         await deployRandomDataset(iexecDatasetOwner);
       // only owner can push secret
@@ -472,27 +435,22 @@ describe('dataset', () => {
       );
     });
 
-    test('use the default TEE framework SMS', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address: datasetAddress } = await deployRandomDataset(iexec, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
+    test('pushes secret to SMS', async () => {
+      const { iexec } = await getTestConfig(testChain)();
+      const { address: datasetAddress } = await deployRandomDataset(iexec);
+      await expect(
+        iexec.dataset.checkDatasetSecretExists(datasetAddress),
+      ).resolves.toBe(false);
       await expect(
         iexec.dataset.pushDatasetSecret(datasetAddress, 'foo'),
       ).resolves.toBe(true);
       await expect(
-        iexec.dataset.pushDatasetSecret(datasetAddress, 'foo', {
-          teeFramework: TEE_FRAMEWORKS.SCONE,
-        }),
-      ).rejects.toThrow(
-        new Error(
-          `Secret already exists for ${datasetAddress} and can't be updated`,
-        ),
-      );
+        iexec.dataset.checkDatasetSecretExists(datasetAddress),
+      ).resolves.toBe(true);
     });
 
     test('cannot update existing secret', async () => {
-      const { iexec: iexecDatasetOwner } = getTestConfig(iexecTestChain)();
+      const { iexec: iexecDatasetOwner } = await getTestConfig(testChain)();
       const { address: datasetAddress } =
         await deployRandomDataset(iexecDatasetOwner);
 
@@ -508,35 +466,5 @@ describe('dataset', () => {
         ),
       );
     });
-
-    test('allow teeFramework override', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address: datasetAddress } = await deployRandomDataset(iexec);
-      await expect(
-        iexec.dataset.pushDatasetSecret(datasetAddress, 'foo'),
-      ).resolves.toBe(true);
-      await expect(
-        iexec.dataset.checkDatasetSecretExists(datasetAddress, {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(false);
-      await expect(
-        iexec.dataset.pushDatasetSecret(datasetAddress, 'foo', {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(true);
-      await expect(
-        iexec.dataset.checkDatasetSecretExists(datasetAddress, {
-          teeFramework: TEE_FRAMEWORKS.GRAMINE,
-        }),
-      ).resolves.toBe(true);
-
-      // validate teeFramework
-      await expect(
-        iexec.dataset.pushDatasetSecret(datasetAddress, 'foo', {
-          teeFramework: 'foo',
-        }),
-      ).rejects.toThrow(Error('teeFramework is not a valid TEE framework'));
-    });
   });
 });
diff --git a/test/lib/e2e/IExecDealModule.test.js b/test/lib/e2e/IExecDealModule.test.js
index acba1c6b..5ae168fb 100644
--- a/test/lib/e2e/IExecDealModule.test.js
+++ b/test/lib/e2e/IExecDealModule.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   deployAndGetApporder,
@@ -26,11 +24,11 @@ import { errors } from '../../../src/lib/index.js';
 
 const { ObjectNotFoundError, MarketCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 describe('deal', () => {
   describe('fetchRequesterDeals()', () => {
     test("throw a MarketCallError when the Market API can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_UNREACHABLE_URL,
@@ -46,7 +44,7 @@ describe('deal', () => {
     });
 
     test('throw a MarketCallError when the Market API encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_HTTP_500_URL,
@@ -62,7 +60,7 @@ describe('deal', () => {
     });
 
     test('shows past deals', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const requesterAddress = await iexec.wallet.getAddress();
       const apporder = await deployAndGetApporder(iexec);
       const datasetorder = await deployAndGetDatasetorder(iexec);
@@ -125,7 +123,7 @@ describe('deal', () => {
 
   describe('fetchDealsBy...order()', () => {
     test("throw a MarketCallError when the Market API can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_UNREACHABLE_URL,
@@ -141,7 +139,7 @@ describe('deal', () => {
     });
 
     test('throw a MarketCallError when the Market API encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_HTTP_500_URL,
@@ -158,7 +156,7 @@ describe('deal', () => {
 
     describe('fetchDealsByApporder()', () => {
       test('shows past deals', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
+        const { iexec } = await getTestConfig(testChain)();
         const apporder = await deployAndGetApporder(iexec);
         const datasetorder = await deployAndGetDatasetorder(iexec);
         const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
@@ -189,7 +187,7 @@ describe('deal', () => {
 
     describe('fetchDealsByDatasetorder()', () => {
       test('shows past deals', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
+        const { iexec } = await getTestConfig(testChain)();
         const apporder = await deployAndGetApporder(iexec);
         const datasetorder = await deployAndGetDatasetorder(iexec);
         const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
@@ -223,7 +221,7 @@ describe('deal', () => {
 
     describe('fetchDealsByWorkerpoolorder()', () => {
       test('shows past deals', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
+        const { iexec } = await getTestConfig(testChain)();
         const apporder = await deployAndGetApporder(iexec);
         const datasetorder = await deployAndGetDatasetorder(iexec);
         const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
@@ -258,7 +256,7 @@ describe('deal', () => {
 
     describe('fetchDealsByRequestorder()', () => {
       test('shows past deals', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
+        const { iexec } = await getTestConfig(testChain)();
         const apporder = await deployAndGetApporder(iexec);
         const datasetorder = await deployAndGetDatasetorder(iexec);
         const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
@@ -291,9 +289,9 @@ describe('deal', () => {
 
   describe.skip('obsDeal()', () => {
     test('emits deal updates', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const catid = (
-        await adminCreateCategory(iexecTestChain)({
+        await adminCreateCategory(testChain)({
           name: 'custom',
           description: 'desc',
           workClockTimeRef: 10,
@@ -323,8 +321,8 @@ describe('deal', () => {
       const runnerUnsubBeforeInit = runObservableSubscribe(dealObservable);
       await sleep(6000);
       runnerUnsubBeforeInit.unsubscribe();
-      await initializeTask(iexecTestChain)(dealid, 3);
-      await initializeTask(iexecTestChain)(dealid, 0);
+      await initializeTask(testChain)(dealid, 3);
+      await initializeTask(testChain)(dealid, 0);
       await sleep(6000);
       runnerUnsubAfterInit.unsubscribe();
 
@@ -383,9 +381,9 @@ describe('deal', () => {
     });
 
     test('exits on deal timeout', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const catid = (
-        await adminCreateCategory(iexecTestChain)({
+        await adminCreateCategory(testChain)({
           name: 'custom',
           description: 'desc',
           workClockTimeRef: 2,
@@ -423,13 +421,13 @@ describe('deal', () => {
           runnerUnsub.unsubscribe();
           return runnerUnsub.wait();
         }),
-        initializeTask(iexecTestChain)(dealid, 3)
+        initializeTask(testChain)(dealid, 3)
           .then(sleep(5000))
-          .then(() => initializeTask(iexecTestChain)(dealid, 0)),
+          .then(() => initializeTask(testChain)(dealid, 0)),
       ]);
 
       expect(wrongDealidRes.error).toStrictEqual(
-        new ObjectNotFoundError('deal', NULL_BYTES32, iexecTestChain.chainId),
+        new ObjectNotFoundError('deal', NULL_BYTES32, testChain.chainId),
       );
       expect(wrongDealidRes.messages.length).toBe(0);
       expect(wrongDealidRes.completed).toBe(false);
diff --git a/test/lib/e2e/IExecEnsModule.test.js b/test/lib/e2e/IExecEnsModule.test.js
deleted file mode 100644
index 6f3dbd45..00000000
--- a/test/lib/e2e/IExecEnsModule.test.js
+++ /dev/null
@@ -1,491 +0,0 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect } from '@jest/globals';
-import { BN } from 'bn.js';
-import {
-  deployRandomApp,
-  deployRandomDataset,
-  deployRandomWorkerpool,
-  getTestConfig,
-  runObservableSubscribe,
-} from '../lib-test-utils.js';
-import {
-  TEST_CHAINS,
-  NULL_ADDRESS,
-  getId,
-  getRandomAddress,
-  DEFAULT_PROVIDER_OPTIONS,
-} from '../../test-utils.js';
-import '../../jest-setup.js';
-import { IExec } from '../../../src/lib/index.js';
-
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-
-describe('ens', () => {
-  describe('ens resolution', () => {
-    test('resolve ens on iExec sidechain', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const balance = await iexec.wallet.checkBalances('core.v5.iexec.eth');
-      expect(balance.wei).toBeInstanceOf(BN);
-      expect(balance.nRLC).toBeInstanceOf(BN);
-    });
-
-    test('resolve ens on mainnet', async () => {
-      const iexec = new IExec(
-        { ethProvider: 'mainnet' },
-        {
-          providerOptions: DEFAULT_PROVIDER_OPTIONS,
-        },
-      );
-      const balance = await iexec.wallet.checkBalances('core.v5.iexec.eth');
-      expect(balance.wei).toBeInstanceOf(BN);
-      expect(balance.nRLC).toBeInstanceOf(BN);
-    });
-  });
-
-  describe('getOwner()', () => {
-    test('get owner address', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.ens.getOwner('core.v5.iexec.eth');
-      expect(res).toBe('0x0B3a38b0A47aB0c5E8b208A703de366751Df5916');
-    });
-
-    test('get address zero for unregistered names', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.ens.getOwner('unregistered.iexec.eth');
-      expect(res).toBe(NULL_ADDRESS);
-    });
-  });
-
-  describe('resolveName()', () => {
-    test('known names resolves to address', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.ens.resolveName('core.v5.iexec.eth');
-      expect(res).toBe(
-        iexecTestChain.hubAddress || iexecTestChain.defaults.hubAddress,
-      );
-    });
-
-    test('unknown name resolves to null', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.ens.resolveName('unknown.eth');
-      expect(res).toBe(null);
-    });
-  });
-
-  describe('lookupAddress()', () => {
-    test('return the name when reverse resolution is configured', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const label = `ens-${getId()}`;
-      const domain = 'users.iexec.eth';
-      const name = `${label}.${domain}`;
-      await iexec.ens.claimName(label, domain);
-      await iexec.ens.configureResolution(name);
-      const res = await iexecReadOnly.ens.lookupAddress(name);
-      expect(res).toBe(name);
-    });
-
-    test('return null when no reverse resolution is configured', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.ens.lookupAddress(getRandomAddress());
-      expect(res).toBe(null);
-    });
-  });
-
-  describe('getDefaultDomain()', () => {
-    test('returns the domain corresponding to the address', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address: appAddress } = await deployRandomApp(iexec);
-      const { address: datasetAddress } = await deployRandomDataset(iexec);
-      const { address: workerpoolAddress } =
-        await deployRandomWorkerpool(iexec);
-      const appDomain = await iexecReadOnly.ens.getDefaultDomain(appAddress);
-      expect(appDomain).toBe('apps.iexec.eth');
-      const datasetDomain =
-        await iexecReadOnly.ens.getDefaultDomain(datasetAddress);
-      expect(datasetDomain).toBe('datasets.iexec.eth');
-      const workerpoolDomain =
-        await iexecReadOnly.ens.getDefaultDomain(workerpoolAddress);
-      expect(workerpoolDomain).toBe('pools.iexec.eth');
-      const defaultDomain =
-        await iexecReadOnly.ens.getDefaultDomain(getRandomAddress());
-      expect(defaultDomain).toBe('users.iexec.eth');
-    });
-  });
-
-  describe('claimName()', () => {
-    test('get an available name', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const label = `wallet-${wallet.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      const res = await iexec.ens.claimName(label);
-
-      expect(res.registerTxHash).toBeTxHash();
-      expect(res.name).toBe(name);
-
-      const resClaimSame = await iexec.ens.claimName(label);
-      expect(resClaimSame.registerTxHash).toBeUndefined();
-      expect(resClaimSame.name).toBe(name);
-    });
-
-    test('allow claim on custom domain with FIFS registrar', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const label = `wallet-${wallet.address.toLowerCase()}`;
-      const domain = 'apps.iexec.eth';
-      const name = `${label}.${domain}`;
-      const res = await iexec.ens.claimName(label, domain);
-      expect(res.registerTxHash).toBeTxHash();
-      expect(res.name).toBe(name);
-      const resClaimSame = await iexec.ens.claimName(label, domain);
-      expect(resClaimSame.registerTxHash).toBeUndefined();
-      expect(resClaimSame.name).toBe(name);
-    });
-
-    test('fails if name is not available', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const label = 'users';
-      const domain = 'iexec.eth';
-      await expect(iexec.ens.claimName(label, domain)).rejects.toThrow(
-        new Error(
-          'users.iexec.eth is already owned by 0xc7b2336c1A8932Fb9414356E254edee6A87dd37d',
-        ),
-      );
-    });
-
-    test('fails if custom domain has no registrar', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const label = 'test';
-      const domain = 'no-registrar.iexec.eth';
-      await expect(iexec.ens.claimName(label, domain)).rejects.toThrow(
-        new Error(
-          'The base domain no-registrar.iexec.eth owner 0x0000000000000000000000000000000000000000 is not a contract',
-        ),
-      );
-    });
-  });
-
-  describe('configureResolution()', () => {
-    test('configures for user address by default', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const label = `wallet-${wallet.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      const configureRes = await iexec.ens.configureResolution(name);
-      expect(configureRes.name).toBe(name);
-      expect(configureRes.address).toBe(wallet.address);
-      expect(configureRes.setAddrTxHash).toBeTxHash();
-      expect(configureRes.setNameTxHash).toBeTxHash();
-      expect(configureRes.setResolverTxHash).toBeTxHash();
-
-      const reconfigureSameRes = await iexec.ens.configureResolution(name);
-      expect(reconfigureSameRes.name).toBe(name);
-      expect(reconfigureSameRes.address).toBe(wallet.address);
-      expect(reconfigureSameRes.setAddrTxHash).toBeUndefined();
-      expect(reconfigureSameRes.setNameTxHash).toBeUndefined();
-      expect(reconfigureSameRes.setResolverTxHash).toBeUndefined();
-    });
-
-    test('optionally configures for target address', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app1 = await deployRandomApp(iexec);
-
-      const label = `address-${wallet.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      const configureRes = await iexec.ens.configureResolution(
-        name,
-        app1.address,
-      );
-      expect(configureRes.name).toBe(name);
-      expect(configureRes.address).toBe(app1.address);
-      expect(configureRes.setAddrTxHash).toBeTxHash();
-      expect(configureRes.setNameTxHash).toBeTxHash();
-      expect(configureRes.setResolverTxHash).toBeTxHash();
-
-      const reconfigureSameRes = await iexec.ens.configureResolution(
-        name,
-        app1.address,
-      );
-      expect(reconfigureSameRes.name).toBe(name);
-      expect(reconfigureSameRes.address).toBe(app1.address);
-      expect(reconfigureSameRes.setAddrTxHash).toBeUndefined();
-      expect(reconfigureSameRes.setNameTxHash).toBeUndefined();
-      expect(reconfigureSameRes.setResolverTxHash).toBeUndefined();
-
-      const app2 = await deployRandomApp(iexec);
-
-      const reconfigureRes = await iexec.ens.configureResolution(
-        name,
-        app2.address,
-      );
-      expect(reconfigureRes.name).toBe(name);
-      expect(reconfigureRes.address).toBe(app2.address);
-      expect(reconfigureRes.setAddrTxHash).toBeTxHash();
-      expect(reconfigureRes.setNameTxHash).toBeTxHash();
-      expect(reconfigureRes.setResolverTxHash).toBeUndefined();
-    });
-
-    test('fails if name is not owned', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await expect(
-        iexec.ens.configureResolution('not-owned.eth', wallet.address),
-      ).rejects.toThrow(
-        new Error(
-          `The current address ${wallet.address} is not owner of not-owned.eth`,
-        ),
-      );
-    });
-
-    test('fails if target app address not owned', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app = await deployRandomApp(iexec, { owner: getRandomAddress() });
-      const label = `address-${app.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      await expect(
-        iexec.ens.configureResolution(name, app.address),
-      ).rejects.toThrow(
-        new Error(
-          `${wallet.address} is not the owner of ${app.address}, impossible to setup ENS resolution`,
-        ),
-      );
-    });
-
-    test('fails if target address is an EAO different from user wallet', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const targetAddress = getRandomAddress();
-      const label = `address-${targetAddress.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      await expect(
-        iexec.ens.configureResolution(name, targetAddress),
-      ).rejects.toThrow(
-        new Error(
-          `Target address ${targetAddress} is not a contract and don't match current wallet address ${wallet.address}, impossible to setup ENS resolution`,
-        ),
-      );
-    });
-  });
-
-  describe('obsConfigureResolution()', () => {
-    test('configures for user address by default', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const label = `wallet-${wallet.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      const configureObs = await iexec.ens.obsConfigureResolution(name);
-
-      const configureRes = await runObservableSubscribe(configureObs).wait();
-      // do not resend tx
-      const reconfigureSameRes =
-        await runObservableSubscribe(configureObs).wait();
-
-      expect(configureRes.messages.length).toBe(10);
-      expect(reconfigureSameRes.messages.length).toBe(4);
-    });
-
-    test('optionally configures for target address', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app1 = await deployRandomApp(iexec);
-      const app2 = await deployRandomApp(iexec);
-
-      const label = `address-${wallet.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      const configureObs = await iexec.ens.obsConfigureResolution(
-        name,
-        app1.address,
-      );
-      const configureRes = await runObservableSubscribe(configureObs).wait();
-
-      // reuse name for another app
-      const reconfigureObs = await iexec.ens.obsConfigureResolution(
-        name,
-        app2.address,
-      );
-      const reconfigureRes =
-        await runObservableSubscribe(reconfigureObs).wait();
-      // do not resend tx
-      const reconfigureSameRes =
-        await runObservableSubscribe(reconfigureObs).wait();
-
-      expect(configureRes.messages.length).toBe(10);
-      expect(reconfigureRes.messages.length).toBe(8);
-      expect(reconfigureSameRes.messages.length).toBe(4);
-    });
-
-    test('ens.obsConfigureResolution(name, address) throw with name not owned', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const configureObs = await iexec.ens.obsConfigureResolution(
-        'not-owned.eth',
-        wallet.address,
-      );
-
-      const configureRes = await runObservableSubscribe(configureObs).wait();
-
-      expect(configureRes.messages.length).toBe(0);
-      expect(configureRes.completed).toBe(false);
-      expect(configureRes.error).toStrictEqual(
-        new Error(
-          `The current address ${wallet.address} is not owner of not-owned.eth`,
-        ),
-      );
-    });
-
-    test('fails if target app address not owned', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app = await deployRandomApp(iexec, {
-        owner: getRandomAddress(),
-      });
-      const label = `address-${app.address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      const configureObs = await iexec.ens.obsConfigureResolution(
-        name,
-        app.address,
-      );
-
-      const configureRes = await runObservableSubscribe(configureObs).wait();
-
-      expect(configureRes.messages.length).toBe(0);
-      expect(configureRes.completed).toBe(false);
-      expect(configureRes.error).toStrictEqual(
-        new Error(
-          `${wallet.address} is not the owner of ${app.address}, impossible to setup ENS resolution`,
-        ),
-      );
-    });
-
-    test('fails if target address is an EAO different from user wallet', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const targetAddress = getRandomAddress();
-      const label = `address-${targetAddress.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-
-      const configureObs = await iexec.ens.obsConfigureResolution(
-        name,
-        targetAddress,
-      );
-      const configureRes = await runObservableSubscribe(configureObs).wait();
-
-      expect(configureRes.messages.length).toBe(0);
-      expect(configureRes.completed).toBe(false);
-      expect(configureRes.error).toStrictEqual(
-        new Error(
-          `Target address ${targetAddress} is not a contract and don't match current wallet address ${wallet.address}, impossible to setup ENS resolution`,
-        ),
-      );
-    });
-  });
-
-  describe('setTextRecord()', () => {
-    test('fails if resolver is not configured', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const name = `${getId()}.users.iexec.eth`;
-      await expect(
-        iexec.ens.setTextRecord(name, 'key', 'value'),
-      ).rejects.toThrow(Error(`No resolver is configured for ${name}`));
-    });
-
-    test('fails if the name is not owned', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const label = getId();
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-      await iexec.ens.configureResolution(name);
-
-      const { iexec: iexecNotOwner, wallet: walletNotOwner } =
-        getTestConfig(iexecTestChain)();
-      await expect(
-        iexecNotOwner.ens.setTextRecord(name, 'key', 'value'),
-      ).rejects.toThrow(
-        new Error(
-          `${walletNotOwner.address} is not authorised to set a text record for ${name}`,
-        ),
-      );
-    });
-
-    test('sets a text record', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomWorkerpool(iexec);
-      const label = `workerpool-${address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-      await iexec.ens.configureResolution(name, address);
-
-      const key = `key_${getId()}`;
-      const value = `value_${getId()}`;
-      const res = await iexec.ens.setTextRecord(name, key, value);
-      expect(res).toBeTxHash();
-    });
-
-    test('can reset a text record', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomWorkerpool(iexec);
-      const label = `workerpool-${address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-      await iexec.ens.configureResolution(name, address);
-
-      const key = `key_${getId()}`;
-      const res = await iexec.ens.setTextRecord(name, key);
-      expect(res).toBeTxHash();
-    });
-  });
-
-  describe('readTextRecord()', () => {
-    test('fails if the resolver not configured', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const address = getRandomAddress();
-      const label = `address-${address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      await expect(iexec.ens.readTextRecord(name, 'key')).rejects.toThrow(
-        new Error(`No resolver is configured for ${name}`),
-      );
-    });
-
-    test('returns empty string if the record not set', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const label = getId();
-      const name = `${label}.users.iexec.eth`;
-      await iexec.ens.claimName(label);
-      await iexec.ens.configureResolution(name);
-      const res = await iexecReadOnly.ens.readTextRecord(name, 'key');
-      expect(res).toBe('');
-    });
-
-    test('shows an existing text record', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
-        readOnly: true,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomWorkerpool(iexec);
-      const label = `workerpool-${address.toLowerCase()}`;
-      const name = `${label}.users.iexec.eth`;
-      const key = `key_${getId()}`;
-      const value = `value_${getId()}`;
-      await iexec.ens.claimName(label);
-      await iexec.ens.configureResolution(name, address);
-      await iexec.ens.setTextRecord(name, key, value);
-      const res = await iexecReadOnly.ens.readTextRecord(name, key);
-      expect(res).toBe(value);
-    });
-  });
-});
diff --git a/test/lib/e2e/IExecHubModule.test.js b/test/lib/e2e/IExecHubModule.test.js
index f63536ad..daf5bd33 100644
--- a/test/lib/e2e/IExecHubModule.test.js
+++ b/test/lib/e2e/IExecHubModule.test.js
@@ -1,20 +1,18 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
 import { getTestConfig } from '../lib-test-utils.js';
 import { TEST_CHAINS, adminCreateCategory } from '../../test-utils.js';
 import '../../jest-setup.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('hub', () => {
   describe('showCategory()', () => {
     test('anyone can show category', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const res = await iexec.hub.showCategory(0);
       expect(res).toStrictEqual({
-        description: '{}',
+        description: '""',
         name: 'XS',
         workClockTimeRef: new BN(300),
       });
@@ -22,7 +20,7 @@ describe('hub', () => {
   });
   describe('createCategory()', () => {
     test('admin can create category', async () => {
-      const res = await adminCreateCategory(iexecTestChain)({
+      const res = await adminCreateCategory(testChain)({
         description: 'foo',
         name: 'bar',
         workClockTimeRef: 10,
diff --git a/test/lib/e2e/IExecOrderModule.test.js b/test/lib/e2e/IExecOrderModule.test.js
index 2791e369..7890925a 100644
--- a/test/lib/e2e/IExecOrderModule.test.js
+++ b/test/lib/e2e/IExecOrderModule.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect, beforeAll } from '@jest/globals';
 import { BN } from 'bn.js';
 import {
@@ -21,30 +19,28 @@ import {
   getRandomAddress,
   setNRlcBalance,
   NULL_ADDRESS,
-  createVoucher,
-  createVoucherType,
-  addVoucherEligibleAsset,
   SERVICE_UNREACHABLE_URL,
   SERVICE_HTTP_500_URL,
   setBalance,
 } from '../../test-utils.js';
 import '../../jest-setup.js';
 import { errors } from '../../../src/lib/index.js';
-import { DATASET_INFINITE_VOLUME } from '../../../src/lib/utils.js';
+import { DATASET_INFINITE_VOLUME, encodeTag } from '../../../src/lib/utils.js';
 
-const { MarketCallError, ConfigurationError } = errors;
+const { MarketCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 const signRegex = /^(0x)([0-9a-f]{2}){65}$/;
 
 describe('order', () => {
   describe('prepareDatasetBulk()', () => {
-    const testChain = TEST_CHAINS['custom-token-chain']; // no bulk processing on bellecour;
-    const { iexec: iexecRequester } = getTestConfig(testChain)();
+    const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
+    let iexecRequester;
     let datasetorders = [];
 
     beforeAll(async () => {
+      iexecRequester = (await getTestConfig(testChain)()).iexec;
       const requesterAddress = await iexecRequester.wallet.getAddress();
       await setBalance(testChain)(requesterAddress, ONE_ETH);
       const { address: appAddress } = await deployRandomApp(iexecRequester);
@@ -52,7 +48,7 @@ describe('order', () => {
         Array(10)
           .fill()
           .map(async () => {
-            const { iexec: iexecDataOwner } = getTestConfig(iexecTestChain)();
+            const { iexec: iexecDataOwner } = await getTestConfig(testChain)();
             const { address } = await deployRandomDataset(iexecDataOwner);
             const datasetBulkOrder = await iexecDataOwner.order
               .createDatasetorder({
@@ -80,956 +76,898 @@ describe('order', () => {
     });
   });
 
-  describe('createApporder()', () => {
-    test('creates a default apporder template', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const app = getRandomAddress();
-      const order = await iexec.order.createApporder({
-        app,
-      });
-      expect(order).toEqual({
-        app,
-        appprice: '0',
-        datasetrestrict: '0x0000000000000000000000000000000000000000',
-        requesterrestrict: '0x0000000000000000000000000000000000000000',
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        volume: '1',
-        workerpoolrestrict: '0x0000000000000000000000000000000000000000',
-      });
-    });
-
-    test('override defaults', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const app = getRandomAddress();
-      const datasetrestrict = getRandomAddress();
-      const workerpoolrestrict = getRandomAddress();
-      const requesterrestrict = getRandomAddress();
-      const order = await iexec.order.createApporder({
-        app,
-        appprice: '1 RLC',
-        datasetrestrict,
-        workerpoolrestrict,
-        requesterrestrict,
-        tag: ['tee', 'scone'],
-        volume: 100,
-      });
-      expect(order).toEqual({
-        app,
-        appprice: '1000000000',
-        datasetrestrict,
-        requesterrestrict,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000003',
-        volume: '100',
-        workerpoolrestrict,
+  describe('create...order()', () => {
+    describe('createApporder()', () => {
+      test('creates a default apporder template', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const app = getRandomAddress();
+        const order = await iexec.order.createApporder({
+          app,
+        });
+        expect(order).toEqual({
+          app,
+          appprice: '0',
+          datasetrestrict: '0x0000000000000000000000000000000000000000',
+          requesterrestrict: '0x0000000000000000000000000000000000000000',
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          volume: '1',
+          workerpoolrestrict: '0x0000000000000000000000000000000000000000',
+        });
       });
-    });
-  });
 
-  describe('createDatasetorder()', () => {
-    test('creates a default datasetorder template', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const dataset = getRandomAddress();
-      const order = await iexec.order.createDatasetorder({
-        dataset,
-      });
-      expect(order).toEqual({
-        apprestrict: '0x0000000000000000000000000000000000000000',
-        dataset,
-        datasetprice: '0',
-        requesterrestrict: '0x0000000000000000000000000000000000000000',
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        volume: '1',
-        workerpoolrestrict: '0x0000000000000000000000000000000000000000',
+      test('override defaults', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const app = getRandomAddress();
+        const datasetrestrict = getRandomAddress();
+        const workerpoolrestrict = getRandomAddress();
+        const requesterrestrict = getRandomAddress();
+        const order = await iexec.order.createApporder({
+          app,
+          appprice: '1 RLC',
+          datasetrestrict,
+          workerpoolrestrict,
+          requesterrestrict,
+          tag: ['tee', 'tdx'],
+          volume: 100,
+        });
+        expect(order).toEqual({
+          app,
+          appprice: '1000000000',
+          datasetrestrict,
+          requesterrestrict,
+          tag: encodeTag(['tee', 'tdx']),
+          volume: '100',
+          workerpoolrestrict,
+        });
       });
     });
 
-    test('override defaults', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const dataset = getRandomAddress();
-      const apprestrict = getRandomAddress();
-      const workerpoolrestrict = getRandomAddress();
-      const requesterrestrict = getRandomAddress();
-      const order = await iexec.order.createDatasetorder({
-        dataset,
-        datasetprice: '1 RLC',
-        apprestrict,
-        workerpoolrestrict,
-        requesterrestrict,
-        tag: ['tee'],
-        volume: 100,
-      });
-      expect(order).toEqual({
-        dataset,
-        datasetprice: '1000000000',
-        apprestrict,
-        requesterrestrict,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000001',
-        volume: '100',
-        workerpoolrestrict,
+    describe('createDatasetorder()', () => {
+      test('creates a default datasetorder template', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const dataset = getRandomAddress();
+        const order = await iexec.order.createDatasetorder({
+          dataset,
+        });
+        expect(order).toEqual({
+          apprestrict: '0x0000000000000000000000000000000000000000',
+          dataset,
+          datasetprice: '0',
+          requesterrestrict: '0x0000000000000000000000000000000000000000',
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          volume: '1',
+          workerpoolrestrict: '0x0000000000000000000000000000000000000000',
+        });
       });
-    });
-  });
 
-  describe('createWorkerpoolorder()', () => {
-    test('creates a default workerpoolorder template', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const workerpool = getRandomAddress();
-      const order = await iexec.order.createWorkerpoolorder({
-        workerpool,
-        category: 5,
-      });
-      expect(order).toEqual({
-        apprestrict: '0x0000000000000000000000000000000000000000',
-        category: '5',
-        datasetrestrict: '0x0000000000000000000000000000000000000000',
-        requesterrestrict: '0x0000000000000000000000000000000000000000',
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        trust: '0',
-        volume: '1',
-        workerpool,
-        workerpoolprice: '0',
+      test('override defaults', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const dataset = getRandomAddress();
+        const apprestrict = getRandomAddress();
+        const workerpoolrestrict = getRandomAddress();
+        const requesterrestrict = getRandomAddress();
+        const order = await iexec.order.createDatasetorder({
+          dataset,
+          datasetprice: '1 RLC',
+          apprestrict,
+          workerpoolrestrict,
+          requesterrestrict,
+          tag: ['tee'],
+          volume: 100,
+        });
+        expect(order).toEqual({
+          dataset,
+          datasetprice: '1000000000',
+          apprestrict,
+          requesterrestrict,
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000001',
+          volume: '100',
+          workerpoolrestrict,
+        });
       });
     });
 
-    test('override defaults', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const workerpool = getRandomAddress();
-      const apprestrict = getRandomAddress();
-      const datasetrestrict = getRandomAddress();
-      const requesterrestrict = getRandomAddress();
-      const order = await iexec.order.createWorkerpoolorder({
-        workerpool,
-        workerpoolprice: '0.1 RLC',
-        category: 5,
-        apprestrict,
-        datasetrestrict,
-        requesterrestrict,
-        tag: ['tee', 'scone'],
-        trust: '10',
-        volume: '100',
-      });
-      expect(order).toEqual({
-        apprestrict,
-        category: '5',
-        datasetrestrict,
-        requesterrestrict,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000003',
-        trust: '10',
-        volume: '100',
-        workerpool,
-        workerpoolprice: '100000000',
+    describe('createWorkerpoolorder()', () => {
+      test('creates a default workerpoolorder template', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const workerpool = getRandomAddress();
+        const order = await iexec.order.createWorkerpoolorder({
+          workerpool,
+          category: 5,
+        });
+        expect(order).toEqual({
+          apprestrict: '0x0000000000000000000000000000000000000000',
+          category: '5',
+          datasetrestrict: '0x0000000000000000000000000000000000000000',
+          requesterrestrict: '0x0000000000000000000000000000000000000000',
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          trust: '0',
+          volume: '1',
+          workerpool,
+          workerpoolprice: '0',
+        });
       });
-    });
-  });
 
-  describe('createRequestorder()', () => {
-    test('creates a default requestorder template', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app = getRandomAddress();
-      const order = await iexec.order.createRequestorder({
-        app,
-        category: 5,
-      });
-      expect(order).toEqual({
-        app,
-        appmaxprice: '0',
-        beneficiary: wallet.address,
-        callback: '0x0000000000000000000000000000000000000000',
-        category: '5',
-        dataset: '0x0000000000000000000000000000000000000000',
-        datasetmaxprice: '0',
-        params: {
-          iexec_result_storage_provider: 'ipfs',
-        },
-        requester: wallet.address,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-        trust: '0',
-        volume: '1',
-        workerpool: '0x0000000000000000000000000000000000000000',
-        workerpoolmaxprice: '0',
+      test('override defaults', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const workerpool = getRandomAddress();
+        const apprestrict = getRandomAddress();
+        const datasetrestrict = getRandomAddress();
+        const requesterrestrict = getRandomAddress();
+        const order = await iexec.order.createWorkerpoolorder({
+          workerpool,
+          workerpoolprice: '0.1 RLC',
+          category: 5,
+          apprestrict,
+          datasetrestrict,
+          requesterrestrict,
+          tag: ['tee', 'tdx'],
+          trust: '10',
+          volume: '100',
+        });
+        expect(order).toEqual({
+          apprestrict,
+          category: '5',
+          datasetrestrict,
+          requesterrestrict,
+          tag: encodeTag(['tee', 'tdx']),
+          trust: '10',
+          volume: '100',
+          workerpool,
+          workerpoolprice: '100000000',
+        });
       });
     });
 
-    test('override defaults', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app = getRandomAddress();
-      const dataset = getRandomAddress();
-      const workerpool = getRandomAddress();
-      const callback = getRandomAddress();
-      const order = await iexec.order.createRequestorder({
-        app,
-        category: 5,
-        dataset,
-        workerpool,
-        callback,
-        appmaxprice: '1 nRLC',
-        datasetmaxprice: '100 nRLC',
-        workerpoolmaxprice: '0.1 RLC',
-        params: {
-          iexec_result_storage_provider: 'dropbox',
-          iexec_result_encryption: true,
-          iexec_result_storage_proxy: 'https://custom-result-proxy.iex.ec',
-        },
-        tag: ['tee', 'scone'],
-        trust: '100',
-        volume: '5',
-      });
-      expect(order).toEqual({
-        app,
-        appmaxprice: '1',
-        beneficiary: wallet.address,
-        callback,
-        category: '5',
-        dataset,
-        datasetmaxprice: '100',
-        params: {
-          iexec_result_storage_provider: 'dropbox',
-          iexec_result_encryption: true,
-          iexec_result_storage_proxy: 'https://custom-result-proxy.iex.ec',
-        },
-        requester: wallet.address,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000003',
-        trust: '100',
-        volume: '5',
-        workerpool,
-        workerpoolmaxprice: '100000000',
+    describe('createRequestorder()', () => {
+      test('creates a default requestorder template', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const app = getRandomAddress();
+        const order = await iexec.order.createRequestorder({
+          app,
+          category: 5,
+        });
+        expect(order).toEqual({
+          app,
+          appmaxprice: '0',
+          beneficiary: wallet.address,
+          callback: '0x0000000000000000000000000000000000000000',
+          category: '5',
+          dataset: '0x0000000000000000000000000000000000000000',
+          datasetmaxprice: '0',
+          params: {
+            iexec_result_storage_provider: 'ipfs',
+          },
+          requester: wallet.address,
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          trust: '0',
+          volume: '1',
+          workerpool: '0x0000000000000000000000000000000000000000',
+          workerpoolmaxprice: '0',
+        });
       });
-    });
 
-    test('with iexec_secrets', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const app = getRandomAddress();
-      const order = await iexec.order.createRequestorder({
-        app,
-        category: 5,
-        params: {
-          iexec_secrets: {
-            1: 'foo',
+      test('override defaults', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const app = getRandomAddress();
+        const dataset = getRandomAddress();
+        const workerpool = getRandomAddress();
+        const callback = getRandomAddress();
+        const order = await iexec.order.createRequestorder({
+          app,
+          category: 5,
+          dataset,
+          workerpool,
+          callback,
+          appmaxprice: '1 nRLC',
+          datasetmaxprice: '100 nRLC',
+          workerpoolmaxprice: '0.1 RLC',
+          params: {
+            iexec_result_storage_provider: 'dropbox',
+            iexec_result_encryption: true,
           },
-        },
-        tag: ['tee', 'scone'],
-      });
-      expect(order).toEqual({
-        app,
-        appmaxprice: '0',
-        beneficiary: wallet.address,
-        callback: '0x0000000000000000000000000000000000000000',
-        category: '5',
-        dataset: '0x0000000000000000000000000000000000000000',
-        datasetmaxprice: '0',
-        params: {
-          iexec_secrets: {
-            1: 'foo',
+          tag: ['tee', 'tdx'],
+          trust: '100',
+          volume: '5',
+        });
+        expect(order).toEqual({
+          app,
+          appmaxprice: '1',
+          beneficiary: wallet.address,
+          callback,
+          category: '5',
+          dataset,
+          datasetmaxprice: '100',
+          params: {
+            iexec_result_storage_provider: 'dropbox',
+            iexec_result_encryption: true,
           },
-          iexec_result_storage_provider: 'ipfs',
-        },
-        requester: wallet.address,
-        tag: '0x0000000000000000000000000000000000000000000000000000000000000003',
-        trust: '0',
-        volume: '1',
-        workerpool: '0x0000000000000000000000000000000000000000',
-        workerpoolmaxprice: '0',
+          requester: wallet.address,
+          tag: encodeTag(['tee', 'tdx']),
+          trust: '100',
+          volume: '5',
+          workerpool,
+          workerpoolmaxprice: '100000000',
+        });
       });
     });
   });
 
-  describe('signApporder()', () => {
-    test('signs the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomApp(iexec);
-      const order = await iexec.order.createApporder({
-        app: address,
-      });
+  describe('sign...order()', () => {
+    describe('signApporder()', () => {
+      test('signs the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { address } = await deployRandomApp(iexec);
+        const order = await iexec.order.createApporder({
+          app: address,
+        });
 
-      const res = await iexec.order.signApporder(order);
-      expect(res.salt).toBeTxHash();
-      expect(res.sign).toMatch(signRegex);
-      expect(res).toEqual({
-        ...order,
-        ...{ sign: res.sign, salt: res.salt },
+        const res = await iexec.order.signApporder(order);
+        expect(res.salt).toBeTxHash();
+        expect(res.sign).toMatch(signRegex);
+        expect(res).toEqual({
+          ...order,
+          ...{ sign: res.sign, salt: res.salt },
+        });
       });
-    });
 
-    test('preflightCheck TEE framework', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomApp(iexec, {
-        teeFramework: TEE_FRAMEWORKS.GRAMINE,
-      });
-      const order = await iexec.order.createApporder({
-        app: address,
+      test('prevent creation of order for legacy TEE apps', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { address: appAddress } = await deployRandomApp(iexec, {
+          teeFramework: 'scone', // legacy SCONE app
+        });
+        const sconeAppOrder = await iexec.order.createApporder({
+          app: appAddress,
+        });
+        await expect(iexec.order.signApporder(sconeAppOrder)).rejects.toThrow(
+          new Error(
+            `App ${appAddress} has an MREnclave, which is no longer supported`,
+          ),
+        );
       });
-      await expect(iexec.order.signApporder(order)).rejects.toThrow(
-        new Error('Tag mismatch the TEE framework specified by app'),
-      );
-      await expect(
-        iexec.order.signApporder({ ...order, tag: ['tee', 'scone'] }),
-      ).rejects.toThrow(
-        new Error('Tag mismatch the TEE framework specified by app'),
-      );
-      await expect(
-        iexec.order.signApporder({ ...order, tag: ['tee', 'gramine'] }),
-      ).resolves.toBeDefined();
-    });
 
-    test('preflightCheck fails with invalid tag', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const order = await iexec.order.createApporder({
-        app: getRandomAddress(),
+      test('preflightCheck fails with invalid tag', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createApporder({
+          app: getRandomAddress(),
+        });
+        await expect(
+          iexec.order.signApporder({ ...order, tag: ['tee'] }),
+        ).rejects.toThrow(
+          new Error("'tee' tag must be used with a tee framework ('tdx')"),
+        );
+        await expect(
+          iexec.order.signApporder({ ...order, tag: ['tdx'] }),
+        ).rejects.toThrow(Error("'tdx' tag must be used with 'tee' tag"));
+        await expect(
+          iexec.order.signApporder({
+            ...order,
+            tag: ['scone', 'tdx'],
+          }),
+        ).rejects.toThrow(
+          new Error("Unsupported legacy TEE framework tag ('scone')"),
+        );
       });
-      await expect(
-        iexec.order.signApporder({ ...order, tag: ['tee'] }),
-      ).rejects.toThrow(
-        new Error(
-          "'tee' tag must be used with a tee framework ('scone'|'gramine'|'tdx')",
-        ),
-      );
-      await expect(
-        iexec.order.signApporder({ ...order, tag: ['scone'] }),
-      ).rejects.toThrow(Error("'scone' tag must be used with 'tee' tag"));
-      await expect(
-        iexec.order.signApporder({ ...order, tag: ['gramine'] }),
-      ).rejects.toThrow(Error("'gramine' tag must be used with 'tee' tag"));
-      await expect(
-        iexec.order.signApporder({
-          ...order,
-          tag: ['tee', 'scone', 'gramine'],
-        }),
-      ).rejects.toThrow(
-        new Error("tee framework tags are exclusive ('scone'|'gramine'|'tdx')"),
-      );
-    });
-  });
-});
-
-describe('signDatasetorder()', () => {
-  test('signs the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const { address } = await deployRandomDataset(iexec);
-    const order = await iexec.order.createDatasetorder({
-      dataset: address,
-    });
-
-    const res = await iexec.order.signDatasetorder(order, {
-      preflightCheck: false,
-    });
-    expect(res.salt).toBeTxHash();
-    expect(res.sign).toMatch(signRegex);
-    expect(res).toEqual({
-      ...order,
-      ...{ sign: res.sign, salt: res.salt },
-    });
-  });
-
-  test('preflightCheck dataset secret', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const { address } = await deployRandomDataset(iexec);
-    const order = await iexec.order.createDatasetorder({
-      dataset: address,
-    });
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee'] }),
-    ).rejects.toThrow(
-      new Error(
-        `Dataset encryption key is not set for dataset ${address} in the SMS. Dataset decryption will fail.`,
-      ),
-    );
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee', 'scone'] }),
-    ).rejects.toThrow(
-      new Error(
-        `Dataset encryption key is not set for dataset ${address} in the SMS. Dataset decryption will fail.`,
-      ),
-    );
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee', 'tdx'] }),
-    ).rejects.toThrow(
-      new Error(
-        `Dataset encryption key is not set for dataset ${address} in the SMS. Dataset decryption will fail.`,
-      ),
-    );
-    await iexec.dataset.pushDatasetSecret(
-      address,
-      iexec.dataset.generateEncryptionKey(),
-    );
-    await iexec.dataset.pushDatasetSecret(
-      address,
-      iexec.dataset.generateEncryptionKey(),
-      { teeFramework: TEE_FRAMEWORKS.TDX },
-    );
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee'] }),
-    ).resolves.toBeDefined();
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee', 'tdx'] }),
-    ).resolves.toBeDefined();
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee', 'scone'] }),
-    ).resolves.toBeDefined();
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['tee', 'gramine'] }),
-    ).rejects.toThrow(
-      new Error(
-        `Dataset encryption key is not set for dataset ${address} in the SMS. Dataset decryption will fail.`,
-      ),
-    );
-  });
-
-  test('preflightCheck fails with invalid tag', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await iexec.order.createDatasetorder({
-      dataset: getRandomAddress(),
-    });
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['scone'] }),
-    ).rejects.toThrow(Error("'scone' tag must be used with 'tee' tag"));
-    await expect(
-      iexec.order.signDatasetorder({ ...order, tag: ['gramine'] }),
-    ).rejects.toThrow(Error("'gramine' tag must be used with 'tee' tag"));
-    await expect(
-      iexec.order.signDatasetorder({
-        ...order,
-        tag: ['tee', 'scone', 'gramine'],
-      }),
-    ).rejects.toThrow(
-      new Error("tee framework tags are exclusive ('scone'|'gramine'|'tdx')"),
-    );
-  });
-});
-
-describe('signWorkerpoolorder()', () => {
-  test('signs the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const { address } = await deployRandomWorkerpool(iexec);
-    const order = await iexec.order.createWorkerpoolorder({
-      workerpool: address,
-      category: 5,
-    });
-
-    const res = await iexec.order.signWorkerpoolorder(order);
-    expect(res.salt).toBeTxHash();
-    expect(res.sign).toMatch(signRegex);
-    expect(res).toEqual({
-      ...order,
-      ...{ sign: res.sign, salt: res.salt },
     });
-  });
-});
 
-describe('signRequestorder()', () => {
-  test('signs the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await iexec.order.createRequestorder({
-      app: getRandomAddress(),
-      category: 5,
-    });
+    describe('signDatasetorder()', () => {
+      test('signs the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { address } = await deployRandomDataset(iexec);
+        const order = await iexec.order.createDatasetorder({
+          dataset: address,
+        });
 
-    const res = await iexec.order.signRequestorder(order, {
-      preflightCheck: false,
-    });
-    expect(res.salt).toBeTxHash();
-    expect(res.sign).toMatch(signRegex);
-    expect(res).toEqual({
-      ...order,
-      ...{ params: JSON.stringify(order.params) },
-      ...{ sign: res.sign, salt: res.salt },
-    });
-  });
+        const res = await iexec.order.signDatasetorder(order, {
+          preflightCheck: false,
+        });
+        expect(res.salt).toBeTxHash();
+        expect(res.sign).toMatch(signRegex);
+        expect(res).toEqual({
+          ...order,
+          ...{ sign: res.sign, salt: res.salt },
+        });
+      });
 
-  test('preflightCheck fails with invalid tag', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await iexec.order.createRequestorder({
-      app: getRandomAddress(),
-      category: 5,
-    });
-    await expect(
-      iexec.order.signRequestorder({ ...order, tag: ['scone'] }),
-    ).rejects.toThrow(Error("'scone' tag must be used with 'tee' tag"));
-    await expect(
-      iexec.order.signRequestorder({ ...order, tag: ['gramine'] }),
-    ).rejects.toThrow(Error("'gramine' tag must be used with 'tee' tag"));
-    await expect(
-      iexec.order.signRequestorder({
-        ...order,
-        tag: ['tee', 'scone', 'gramine'],
-      }),
-    ).rejects.toThrow(
-      new Error("tee framework tags are exclusive ('scone'|'gramine'|'tdx')"),
-    );
-  });
+      test('preflightCheck dataset secret', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { address } = await deployRandomDataset(iexec);
+        const order = await iexec.order.createDatasetorder({
+          dataset: address,
+        });
+        await expect(
+          iexec.order.signDatasetorder({ ...order, tag: ['tee'] }),
+        ).rejects.toThrow(
+          new Error(
+            `Dataset encryption key is not set for dataset ${address} in the SMS. Dataset decryption will fail.`,
+          ),
+        );
+        await iexec.dataset.pushDatasetSecret(
+          address,
+          iexec.dataset.generateEncryptionKey(),
+        );
+        await expect(
+          iexec.order.signDatasetorder({ ...order, tag: ['tee'] }),
+        ).resolves.toBeDefined();
+      });
 
-  test('preflightCheck dropbox storage token exists', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await iexec.order.createRequestorder({
-      app: getRandomAddress(),
-      category: 5,
-      tag: ['tee', 'scone'],
-      params: {
-        iexec_result_storage_provider: 'dropbox',
-      },
+      test('preflightCheck fails with invalid tag', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createDatasetorder({
+          dataset: getRandomAddress(),
+        });
+        await expect(
+          iexec.order.signDatasetorder({ ...order, tag: ['tdx'] }),
+        ).rejects.toThrow(Error("'tdx' tag must be used with 'tee' tag"));
+      });
     });
 
-    await expect(iexec.order.signRequestorder(order)).rejects.toThrow(
-      new Error(
-        'Requester storage token is not set for selected provider "dropbox". Result archive upload will fail.',
-      ),
-    );
-
-    await iexec.storage.pushStorageToken('oops', { provider: 'dropbox' });
-    const res = await iexec.order.signRequestorder(order);
-    expect(res.salt).toBeTxHash();
-    expect(res.sign).toMatch(signRegex);
-    expect(res).toEqual({
-      ...order,
-      ...{ params: JSON.stringify(order.params) },
-      ...{ sign: res.sign, salt: res.salt },
-    });
-  });
+    describe('signWorkerpoolorder()', () => {
+      test('signs the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { address } = await deployRandomWorkerpool(iexec);
+        const order = await iexec.order.createWorkerpoolorder({
+          workerpool: address,
+          category: 5,
+        });
 
-  test('preflightCheck result encryption exists', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await iexec.order.createRequestorder({
-      app: getRandomAddress(),
-      category: 5,
-      params: { iexec_result_encryption: true },
-    });
-    await iexec.storage
-      .defaultStorageLogin()
-      .then(iexec.storage.pushStorageToken);
-    await expect(iexec.order.signRequestorder(order)).rejects.toThrow(
-      new Error(
-        'Beneficiary result encryption key is not set in the SMS. Result encryption will fail.',
-      ),
-    );
-    await iexec.result.pushResultEncryptionKey('oops');
-    const res = await iexec.order.signRequestorder(order);
-    expect(res.salt).toBeTxHash();
-    expect(res.sign).toMatch(signRegex);
-    expect(res).toEqual({
-      ...order,
-      ...{ params: JSON.stringify(order.params) },
-      ...{ sign: res.sign, salt: res.salt },
+        const res = await iexec.order.signWorkerpoolorder(order);
+        expect(res.salt).toBeTxHash();
+        expect(res.sign).toMatch(signRegex);
+        expect(res).toEqual({
+          ...order,
+          ...{ sign: res.sign, salt: res.salt },
+        });
+      });
     });
-  });
-
-  test('preflightCheck checks dataset encryption key exists for tee datasets', async () => {
-    const { iexec: iexecDatasetProvider } = getTestConfig(iexecTestChain)();
-    const { iexec: iexecDatasetConsumer } = getTestConfig(iexecTestChain)();
-
-    await iexecDatasetConsumer.storage
-      .defaultStorageLogin()
-      .then(iexecDatasetConsumer.storage.pushStorageToken);
-    const { address: dataset } =
-      await deployRandomDataset(iexecDatasetProvider);
 
-    // non tee pass
-    await expect(
-      iexecDatasetConsumer.order
-        .createRequestorder({
+    describe('signRequestorder()', () => {
+      test('signs the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createRequestorder({
           app: getRandomAddress(),
           category: 5,
-          dataset,
-        })
-        .then(iexecDatasetConsumer.order.signRequestorder),
-    ).resolves.toBeDefined();
-
-    // tee fail without secret
-    await expect(
-      iexecDatasetConsumer.order
-        .createRequestorder({
-          app: getRandomAddress(),
-          category: 5,
-          dataset,
-          tag: ['tee', 'scone'],
-        })
-        .then(iexecDatasetConsumer.order.signRequestorder),
-    ).rejects.toThrow(
-      new Error(
-        `Dataset encryption key is not set for dataset ${dataset} in the SMS. Dataset decryption will fail.`,
-      ),
-    );
-
-    // tee pass with secret
-    await iexecDatasetProvider.dataset.pushDatasetSecret(
-      dataset,
-      iexecDatasetProvider.dataset.generateEncryptionKey(),
-    );
-    await expect(
-      iexecDatasetConsumer.order
-        .createRequestorder({
-          app: getRandomAddress(),
-          category: 5,
-          dataset,
-          tag: ['tee', 'scone'],
-        })
-        .then(iexecDatasetConsumer.order.signRequestorder),
-    ).resolves.toBeDefined();
-  });
+        });
 
-  test('preflightCheck requester secrets exist', async () => {
-    const { iexec, wallet } = getTestConfig(iexecTestChain)();
-    await iexec.storage
-      .defaultStorageLogin()
-      .then(iexec.storage.pushStorageToken);
+        const res = await iexec.order.signRequestorder(order, {
+          preflightCheck: false,
+        });
+        expect(res.salt).toBeTxHash();
+        expect(res.sign).toMatch(signRegex);
+        expect(res).toEqual({
+          ...order,
+          ...{ params: JSON.stringify(order.params) },
+          ...{ sign: res.sign, salt: res.salt },
+        });
+      });
 
-    // non requester secret pass
-    await expect(
-      iexec.order
-        .createRequestorder({
+      test('legacy TEE framework tags are not supported', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createRequestorder({
           app: getRandomAddress(),
           category: 5,
-          tag: ['tee', 'scone'],
-        })
-        .then(iexec.order.signRequestorder),
-    ).resolves.toBeDefined();
-
-    // unset secret fail
-    await iexec.secrets.pushRequesterSecret('foo', 'secret');
-    await expect(
-      iexec.order
-        .createRequestorder({
+        });
+        await expect(
+          iexec.order.signRequestorder({ ...order, tag: ['scone'] }),
+        ).rejects.toThrow(
+          Error("Unsupported legacy TEE framework tag ('scone')"),
+        );
+        await expect(
+          iexec.order.signRequestorder({ ...order, tag: ['gramine'] }),
+        ).rejects.toThrow(
+          Error("Unsupported legacy TEE framework tag ('gramine')"),
+        );
+      });
+
+      test('TEE framework tag requires tee tag', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createRequestorder({
           app: getRandomAddress(),
           category: 5,
-          tag: ['tee', 'scone'],
-          params: {
-            iexec_secrets: {
-              1: 'foo',
-              2: 'bar',
-            },
-          },
-        })
-        .then(iexec.order.signRequestorder),
-    ).rejects.toThrow(
-      new Error(
-        `Requester secret "bar" is not set for requester ${wallet.address} in the SMS. Requester secret provisioning will fail.`,
-      ),
-    );
-    // set secrets pass
-    await iexec.secrets.pushRequesterSecret('bar', 'secret');
-    await expect(
-      iexec.order
-        .createRequestorder({
+        });
+        await expect(
+          iexec.order.signRequestorder({ ...order, tag: ['scone'] }),
+        ).rejects.toThrow(
+          Error("Unsupported legacy TEE framework tag ('scone')"),
+        );
+        await expect(
+          iexec.order.signRequestorder({ ...order, tag: ['tdx'] }),
+        ).rejects.toThrow(Error("'tdx' tag must be used with 'tee' tag"));
+      });
+
+      test('preflightCheck dropbox storage token exists', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createRequestorder({
           app: getRandomAddress(),
           category: 5,
-          tag: ['tee', 'scone'],
+          tag: ['tee', 'tdx'],
           params: {
-            iexec_secrets: {
-              1: 'foo',
-              2: 'bar',
-            },
+            iexec_result_storage_provider: 'dropbox',
           },
-        })
-        .then(iexec.order.signRequestorder),
-    ).resolves.toBeDefined();
-  });
-});
-
-describe('hashApporder()', () => {
-  test('gives the order hash', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-    const order = {
-      app: '0x76fE91568d50C5fF9411223df5A0c50Ec5fa326A',
-      appprice: 0,
-      volume: 1000000,
-      tag: '0x0000000000000000000000000000000000000000000000000000000000000005',
-      datasetrestrict: '0x0000000000000000000000000000000000000000',
-      workerpoolrestrict: '0x0000000000000000000000000000000000000000',
-      requesterrestrict: '0x0000000000000000000000000000000000000000',
-      salt: '0xcadb4f169d98b940ae506dfc8ee7832e1ff36854aab92f89b7408257693207b3',
-      sign: '0x5b84b81dd0450897568fa1afdb7969f92259c2f9003a1bed0da96e00c9891957233ad6a0e16101b4ab7b2bf4d4aa117b58bae5fa2bad46522ec62e16ff3c36fe1b',
-    };
-    const res = await iexec.order.hashApporder(order);
-    expect(res).toBe(
-      '0x210576e452027bc2430a32f6fae97bec8bd1f7bb7a96f59202d6947ec7d6de8f',
-    );
-  });
-});
-
-describe('hashDatasetorder()', () => {
-  test('gives the order hash', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-    const order = {
-      dataset: '0x2Ad5773db1a705DB568fAd403cd247fee4808Fb8',
-      datasetprice: 0,
-      volume: 1,
-      tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-      apprestrict: '0x0000000000000000000000000000000000000000',
-      workerpoolrestrict: '0x0000000000000000000000000000000000000000',
-      requesterrestrict: '0x0000000000000000000000000000000000000000',
-      salt: '0x48380ababf82c79128c1e3ebcba70ce94c6a3ff0ba4125358d1e0c0f871e29e7',
-      sign: '0x4ce323a70464eb3b35aa90fcd1582e4733a57b16b0d6fb13ffa3189c2e970ffb399779d0c9d4a2d4b0a65adfc2037a7916a9a004148edcdf3dd1a9e12b3c1b0c1b',
-    };
-    const res = await iexec.order.hashDatasetorder(order);
-    expect(res).toBe(
-      '0x5831e4e2911c431236a3df6d82698fcb849da8c781d7c4e9eb75ed551e4d35d4',
-    );
-  });
-});
-
-describe('hashWorkerpoolorder()', () => {
-  test('gives the order hash', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-    const order = {
-      workerpool: '0x9DEB16F7861123CE34AE755F48D30697eD066793',
-      workerpoolprice: 0,
-      volume: 4,
-      tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-      category: 3,
-      trust: 1,
-      apprestrict: '0x0000000000000000000000000000000000000000',
-      datasetrestrict: '0x0000000000000000000000000000000000000000',
-      requesterrestrict: '0x0000000000000000000000000000000000000000',
-      salt: '0x0c8d51b480466c65b459e828ed8549cf4b15ba1abda0ef5d454964c23f3edf62',
-      sign: '0xd8941d9974d6b6468a6dac46e88eb80a1575aedd5921d78e002483bf4faa72e319e4c128f9a7f927857c6039988ba456de8ec337078eb538b13488d2374c379e1c',
-    };
-    const res = await iexec.order.hashWorkerpoolorder(order);
-    expect(res).toBe(
-      '0x7b23e26344284e809d7809395467d611ba148ef83b2ff3854e03430311f3f8fa',
-    );
-  });
-});
-
-describe('hashRequestorder()', () => {
-  test('gives the order hash', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-    const order = {
-      app: '0x33c791fE02eDDBfF3D3d37176737Eb3F488E150F',
-      dataset: '0x69d4a400CFf9838985cD2950aafF28289afc6ad3',
-      workerpool: '0x0000000000000000000000000000000000000000',
-      params:
-        '{"iexec_result_storage_provider":"ipfs","iexec_result_storage_proxy":"https://result.v8-bellecour.iex.ec","iexec_result_encryption":false,"iexec_args":"\\"0x4e64fb5fa96eb73ef37dacd416eb2bade0ea8f9e7efebe42abe9a062a9caede836ee4da1ec1a72264e1287e74fba7fdc76edce05729c4b2ecf6fb8970f13f8321b 22\\""}',
-      appmaxprice: 0,
-      datasetmaxprice: 0,
-      workerpoolmaxprice: 0,
-      volume: 1,
-      tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
-      category: 0,
-      trust: 0,
-      requester: '0x4CF114732732c072D49a783e80C6Fe9fe8BA420a',
-      beneficiary: '0x4CF114732732c072D49a783e80C6Fe9fe8BA420a',
-      callback: '0x0000000000000000000000000000000000000000',
-      salt: '0xef743ff11d68960e724362944b6cd22b59b88402a17f8a1ffabf8fb9be2f4008',
-      sign: '0xdcd90a96f4c5cd05a0f907220e173a038e01e2a647bd9c8e04714be5dd4f986b0478cb69cf46b3cb3eb05ee74d2b91868bee4d96a89bc79ac8d8cccc96810bf21c',
-    };
-    const res = await iexec.order.hashRequestorder(order);
-    expect(res).toBeTxHash();
-    expect(res).toBe(
-      '0x8096dd3852b29d6e86b03505ded47fbc96b0bacc9be097f11de3a747ee0e4283',
-    );
-  });
-});
+        });
 
-describe('cancelApporder()', () => {
-  test('revokes the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await deployAndGetApporder(iexec);
-    const res = await iexec.order.cancelApporder(order);
-    expect(res.order).toEqual(order);
-    expect(res.txHash).toBeTxHash();
-    await expect(iexec.order.cancelApporder(order)).rejects.toThrow(
-      new Error('apporder already canceled'),
-    );
-  });
-});
+        await expect(iexec.order.signRequestorder(order)).rejects.toThrow(
+          new Error(
+            'Requester storage token is not set for selected provider "dropbox". Result archive upload will fail.',
+          ),
+        );
 
-describe('cancelDatasetorder()', () => {
-  test('revokes the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await deployAndGetDatasetorder(iexec);
-    const res = await iexec.order.cancelDatasetorder(order);
-    expect(res.order).toEqual(order);
-    expect(res.txHash).toBeTxHash();
-    await expect(iexec.order.cancelDatasetorder(order)).rejects.toThrow(
-      new Error('datasetorder already canceled'),
-    );
-  });
-});
+        await iexec.storage.pushStorageToken('oops', 'dropbox');
+        const res = await iexec.order.signRequestorder(order);
+        expect(res.salt).toBeTxHash();
+        expect(res.sign).toMatch(signRegex);
+        expect(res).toEqual({
+          ...order,
+          ...{ params: JSON.stringify(order.params) },
+          ...{ sign: res.sign, salt: res.salt },
+        });
+      });
 
-describe('cancelWorkerpoolorder()', () => {
-  test('revokes the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await deployAndGetWorkerpoolorder(iexec);
-    const res = await iexec.order.cancelWorkerpoolorder(order);
-    expect(res.order).toEqual(order);
-    expect(res.txHash).toBeTxHash();
-    await expect(iexec.order.cancelWorkerpoolorder(order)).rejects.toThrow(
-      new Error('workerpoolorder already canceled'),
-    );
-  });
-});
+      test('preflightCheck result encryption exists', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order.createRequestorder({
+          app: getRandomAddress(),
+          category: 5,
+          params: { iexec_result_encryption: true },
+        });
+        await expect(iexec.order.signRequestorder(order)).rejects.toThrow(
+          new Error(
+            'Beneficiary result encryption key is not set in the SMS. Result encryption will fail.',
+          ),
+        );
+        await iexec.result.pushResultEncryptionKey('oops');
+        const res = await iexec.order.signRequestorder(order);
+        expect(res.salt).toBeTxHash();
+        expect(res.sign).toMatch(signRegex);
+        expect(res).toEqual({
+          ...order,
+          ...{ params: JSON.stringify(order.params) },
+          ...{ sign: res.sign, salt: res.salt },
+        });
+      });
 
-describe('cancelRequestorder()', () => {
-  test('revokes the order', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
-    const order = await iexec.order
-      .createRequestorder({
-        app: getRandomAddress(),
-        appmaxprice: 0,
-        workerpoolmaxprice: 0,
-        requester: await iexec.wallet.getAddress(),
-        volume: 1,
-        category: 1,
-      })
-      .then((o) => iexec.order.signRequestorder(o, { preflightCheck: false }));
-    const res = await iexec.order.cancelRequestorder(order);
-    expect(res.order).toEqual(order);
-    expect(res.txHash).toBeTxHash();
-    await expect(iexec.order.cancelRequestorder(order)).rejects.toThrow(
-      new Error('requestorder already canceled'),
-    );
-  });
-});
+      test('preflightCheck checks dataset encryption key exists for tee datasets', async () => {
+        const { iexec: iexecDatasetProvider } =
+          await getTestConfig(testChain)();
+        const { iexec: iexecDatasetConsumer } =
+          await getTestConfig(testChain)();
+        const { address: dataset } =
+          await deployRandomDataset(iexecDatasetProvider);
 
-describe('publish...order()', () => {
-  test("throw a MarketCallError when the Market API can't be reached", async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({
-      options: {
-        iexecGatewayURL: SERVICE_UNREACHABLE_URL,
-      },
-    });
-    const requestorder = await iexec.order
-      .createRequestorder({ app: getRandomAddress(), category: 0 })
-      .then(iexec.order.signRequestorder);
-    await expectAsyncCustomError(
-      iexec.order.publishRequestorder(requestorder),
-      {
-        constructor: MarketCallError,
-        message: `Market API error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
-      },
-    );
-  });
+        // non tee pass
+        await expect(
+          iexecDatasetConsumer.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              dataset,
+            })
+            .then(iexecDatasetConsumer.order.signRequestorder),
+        ).resolves.toBeDefined();
+
+        // tee fail without secret
+        await expect(
+          iexecDatasetConsumer.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              dataset,
+              tag: ['tee', 'tdx'],
+            })
+            .then(iexecDatasetConsumer.order.signRequestorder),
+        ).rejects.toThrow(
+          new Error(
+            `Dataset encryption key is not set for dataset ${dataset} in the SMS. Dataset decryption will fail.`,
+          ),
+        );
 
-  test('throw a MarketCallError when the Market API encounters an error', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({
-      options: {
-        iexecGatewayURL: SERVICE_HTTP_500_URL,
-      },
-    });
-    const requestorder = await iexec.order
-      .createRequestorder({ app: getRandomAddress(), category: 0 })
-      .then(iexec.order.signRequestorder);
-    await expectAsyncCustomError(
-      iexec.order.publishRequestorder(requestorder),
-      {
-        constructor: MarketCallError,
-        message: `Market API error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
-      },
-    );
-  });
+        await expect(
+          iexecDatasetConsumer.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              dataset,
+              tag: ['tee', 'tdx'],
+            })
+            .then(iexecDatasetConsumer.order.signRequestorder),
+        ).rejects.toThrow(
+          new Error(
+            `Dataset encryption key is not set for dataset ${dataset} in the SMS. Dataset decryption will fail.`,
+          ),
+        );
 
-  describe('publishApporder()', () => {
-    test('publishes the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      const orderHash = await iexec.order.publishApporder(apporder);
-      expect(orderHash).toBeTxHash();
+        // tee pass with secret
+        await iexecDatasetProvider.dataset.pushDatasetSecret(
+          dataset,
+          iexecDatasetProvider.dataset.generateEncryptionKey(),
+        );
+        await expect(
+          iexecDatasetConsumer.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              dataset,
+              tag: ['tee', 'tdx'],
+            })
+            .then(iexecDatasetConsumer.order.signRequestorder),
+        ).resolves.toBeDefined();
+      });
+
+      test('preflightCheck requester secrets exist', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        // non requester secret pass
+        await expect(
+          iexec.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              tag: ['tee', 'tdx'],
+            })
+            .then(iexec.order.signRequestorder),
+        ).resolves.toBeDefined();
+
+        // unset secret fail
+        await iexec.secrets.pushRequesterSecret('foo', 'secret');
+        await expect(
+          iexec.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              tag: ['tee', 'tdx'],
+              params: {
+                iexec_secrets: {
+                  1: 'foo',
+                  2: 'bar',
+                },
+              },
+            })
+            .then(iexec.order.signRequestorder),
+        ).rejects.toThrow(
+          new Error(
+            `Requester secret "bar" is not set for requester ${wallet.address} in the SMS. Requester secret provisioning will fail.`,
+          ),
+        );
+        // set secrets pass
+        await iexec.secrets.pushRequesterSecret('bar', 'secret');
+        await expect(
+          iexec.order
+            .createRequestorder({
+              app: getRandomAddress(),
+              category: 5,
+              tag: ['tee', 'tdx'],
+              params: {
+                iexec_secrets: {
+                  1: 'foo',
+                  2: 'bar',
+                },
+              },
+            })
+            .then(iexec.order.signRequestorder),
+        ).resolves.toBeDefined();
+      });
     });
   });
 
-  describe('publishDatasetorder()', () => {
-    test('publishes the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const datasetorder = await deployAndGetDatasetorder(iexec);
-      const orderHash = await iexec.order.publishDatasetorder(datasetorder);
-      expect(orderHash).toBeTxHash();
+  describe('hash...order()', () => {
+    describe('hashApporder()', () => {
+      test('gives the order hash', async () => {
+        const { iexec } = await getTestConfig(testChain)({
+          readOnly: true,
+        });
+        const order = {
+          app: '0x76fE91568d50C5fF9411223df5A0c50Ec5fa326A',
+          appprice: 0,
+          volume: 1000000,
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000009',
+          datasetrestrict: '0x0000000000000000000000000000000000000000',
+          workerpoolrestrict: '0x0000000000000000000000000000000000000000',
+          requesterrestrict: '0x0000000000000000000000000000000000000000',
+          salt: '0xcadb4f169d98b940ae506dfc8ee7832e1ff36854aab92f89b7408257693207b3',
+          sign: '0x5b84b81dd0450897568fa1afdb7969f92259c2f9003a1bed0da96e00c9891957233ad6a0e16101b4ab7b2bf4d4aa117b58bae5fa2bad46522ec62e16ff3c36fe1b',
+        };
+        const res = await iexec.order.hashApporder(order);
+        expect(res).toBe(
+          '0xdf5b460cef1d8420f358a93d85f206415cfcf34f1be87a9e15886fca910a0363',
+        );
+      });
     });
 
-    test('preflightChecks dataset secret exists for tee tag', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const datasetorder = await deployAndGetDatasetorder(iexec, {
-        tag: ['tee'],
+    describe('hashDatasetorder()', () => {
+      test('gives the order hash', async () => {
+        const { iexec } = await getTestConfig(testChain)({
+          readOnly: true,
+        });
+        const order = {
+          dataset: '0x2Ad5773db1a705DB568fAd403cd247fee4808Fb8',
+          datasetprice: 0,
+          volume: 1,
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          apprestrict: '0x0000000000000000000000000000000000000000',
+          workerpoolrestrict: '0x0000000000000000000000000000000000000000',
+          requesterrestrict: '0x0000000000000000000000000000000000000000',
+          salt: '0x48380ababf82c79128c1e3ebcba70ce94c6a3ff0ba4125358d1e0c0f871e29e7',
+          sign: '0x4ce323a70464eb3b35aa90fcd1582e4733a57b16b0d6fb13ffa3189c2e970ffb399779d0c9d4a2d4b0a65adfc2037a7916a9a004148edcdf3dd1a9e12b3c1b0c1b',
+        };
+        const res = await iexec.order.hashDatasetorder(order);
+        expect(res).toBe(
+          '0x3e068f770fddfd85d17978179382e79045fdccacbec7a69f244beb5f4b652947',
+        );
       });
-      const datasetAddress = datasetorder.dataset;
-      await expect(
-        iexec.order.publishDatasetorder(datasetorder),
-      ).rejects.toThrow(
-        new Error(
-          `Dataset encryption key is not set for dataset ${datasetAddress} in the SMS. Dataset decryption will fail.`,
-        ),
-      );
-
-      const orderHashSkipPreflight = await iexec.order.publishDatasetorder(
-        await iexec.order.signDatasetorder(datasetorder, {
-          preflightCheck: false,
-        }),
-        { preflightCheck: false },
-      );
-      expect(orderHashSkipPreflight).toBeTxHash();
-
-      await iexec.dataset.pushDatasetSecret(datasetAddress, 'foo');
-
-      const orderHashPreflight = await iexec.order.publishDatasetorder(
-        await iexec.order.signDatasetorder(datasetorder, {
-          preflightCheck: false,
-        }),
-      );
-      expect(orderHashPreflight).toBeTxHash();
     });
-  });
 
-  describe('publishWorkerpoolorder()', () => {
-    test('publishes the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
-      const orderHash =
-        await iexec.order.publishWorkerpoolorder(workerpoolorder);
-      expect(orderHash).toBeTxHash();
+    describe('hashWorkerpoolorder()', () => {
+      test('gives the order hash', async () => {
+        const { iexec } = await getTestConfig(testChain)({
+          readOnly: true,
+        });
+        const order = {
+          workerpool: '0x9DEB16F7861123CE34AE755F48D30697eD066793',
+          workerpoolprice: 0,
+          volume: 4,
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          category: 3,
+          trust: 1,
+          apprestrict: '0x0000000000000000000000000000000000000000',
+          datasetrestrict: '0x0000000000000000000000000000000000000000',
+          requesterrestrict: '0x0000000000000000000000000000000000000000',
+          salt: '0x0c8d51b480466c65b459e828ed8549cf4b15ba1abda0ef5d454964c23f3edf62',
+          sign: '0xd8941d9974d6b6468a6dac46e88eb80a1575aedd5921d78e002483bf4faa72e319e4c128f9a7f927857c6039988ba456de8ec337078eb538b13488d2374c379e1c',
+        };
+        const res = await iexec.order.hashWorkerpoolorder(order);
+        expect(res).toBe(
+          '0x4e1d29f1ba77a8548fd6c6e2bf7755bd2d0f654ef6ae13d3df03cc71fc4ac5d6',
+        );
+      });
     });
-  });
 
-  describe('publishRequestorder()', () => {
-    test('publishes the order (skip preflightCheck)', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      await iexec.order.publishApporder(apporder);
-      const requestorder = await iexec.order
-        .createRequestorder({
-          requester: await iexec.wallet.getAddress(),
-          app: apporder.app,
-          appmaxprice: apporder.appprice,
-          dataset: NULL_ADDRESS,
+    describe('hashRequestorder()', () => {
+      test('gives the order hash', async () => {
+        const { iexec } = await getTestConfig(testChain)({
+          readOnly: true,
+        });
+        const order = {
+          app: '0x33c791fE02eDDBfF3D3d37176737Eb3F488E150F',
+          dataset: '0x69d4a400CFf9838985cD2950aafF28289afc6ad3',
+          workerpool: '0x0000000000000000000000000000000000000000',
+          params:
+            '{"iexec_result_encryption":false,"iexec_args":"\\"0x4e64fb5fa96eb73ef37dacd416eb2bade0ea8f9e7efebe42abe9a062a9caede836ee4da1ec1a72264e1287e74fba7fdc76edce05729c4b2ecf6fb8970f13f8321b 22\\""}',
+          appmaxprice: 0,
           datasetmaxprice: 0,
-          workerpool: NULL_ADDRESS,
           workerpoolmaxprice: 0,
-          category: 1,
-          trust: 0,
           volume: 1,
-        })
-        .then((o) =>
-          iexec.order.signRequestorder(o, { preflightCheck: false }),
+          tag: '0x0000000000000000000000000000000000000000000000000000000000000000',
+          category: 0,
+          trust: 0,
+          requester: '0x4CF114732732c072D49a783e80C6Fe9fe8BA420a',
+          beneficiary: '0x4CF114732732c072D49a783e80C6Fe9fe8BA420a',
+          callback: '0x0000000000000000000000000000000000000000',
+          salt: '0xef743ff11d68960e724362944b6cd22b59b88402a17f8a1ffabf8fb9be2f4008',
+          sign: '0xdcd90a96f4c5cd05a0f907220e173a038e01e2a647bd9c8e04714be5dd4f986b0478cb69cf46b3cb3eb05ee74d2b91868bee4d96a89bc79ac8d8cccc96810bf21c',
+        };
+        const res = await iexec.order.hashRequestorder(order);
+        expect(res).toBeTxHash();
+        expect(res).toBe(
+          '0x46872d0a641b78875f1fd2b59086073ac1fefd1ab54d4cb333ade2a868aaf975',
         );
-      const orderHash = await iexec.order.publishRequestorder(requestorder, {
-        preflightCheck: false,
       });
-      expect(orderHash).toBeTxHash();
     });
+  });
 
-    test('preflightCheck result encryption key', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecAppDev } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexecAppDev, {
-        teeFramework: TEE_FRAMEWORKS.SCONE,
-        tag: ['tee', 'scone'],
+  describe('cancel...order()', () => {
+    describe('cancelApporder()', () => {
+      test('revokes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await deployAndGetApporder(iexec);
+        const res = await iexec.order.cancelApporder(order);
+        expect(res.order).toEqual(order);
+        expect(res.txHash).toBeTxHash();
+        await expect(iexec.order.cancelApporder(order)).rejects.toThrow(
+          new Error('apporder already canceled'),
+        );
       });
-      await iexecAppDev.order.publishApporder(apporder);
-      const requestorder = await iexec.order
-        .createRequestorder({
-          app: apporder.app,
-          appmaxprice: apporder.appprice,
-          category: 1,
-          params: { iexec_result_encryption: true },
-        })
-        .then((o) =>
-          iexec.order.signRequestorder(o, { preflightCheck: false }),
+    });
+
+    describe('cancelDatasetorder()', () => {
+      test('revokes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await deployAndGetDatasetorder(iexec);
+        const res = await iexec.order.cancelDatasetorder(order);
+        expect(res.order).toEqual(order);
+        expect(res.txHash).toBeTxHash();
+        await expect(iexec.order.cancelDatasetorder(order)).rejects.toThrow(
+          new Error('datasetorder already canceled'),
         );
-      await expect(
+      });
+    });
+
+    describe('cancelWorkerpoolorder()', () => {
+      test('revokes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await deployAndGetWorkerpoolorder(iexec);
+        const res = await iexec.order.cancelWorkerpoolorder(order);
+        expect(res.order).toEqual(order);
+        expect(res.txHash).toBeTxHash();
+        await expect(iexec.order.cancelWorkerpoolorder(order)).rejects.toThrow(
+          new Error('workerpoolorder already canceled'),
+        );
+      });
+    });
+
+    describe('cancelRequestorder()', () => {
+      test('revokes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const order = await iexec.order
+          .createRequestorder({
+            app: getRandomAddress(),
+            appmaxprice: 0,
+            workerpoolmaxprice: 0,
+            requester: await iexec.wallet.getAddress(),
+            volume: 1,
+            category: 1,
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        const res = await iexec.order.cancelRequestorder(order);
+        expect(res.order).toEqual(order);
+        expect(res.txHash).toBeTxHash();
+        await expect(iexec.order.cancelRequestorder(order)).rejects.toThrow(
+          new Error('requestorder already canceled'),
+        );
+      });
+    });
+  });
+
+  describe('publish...order()', () => {
+    test("throw a MarketCallError when the Market API can't be reached", async () => {
+      const { iexec } = await getTestConfig(testChain)({
+        options: {
+          iexecGatewayURL: SERVICE_UNREACHABLE_URL,
+        },
+      });
+      const requestorder = await iexec.order
+        .createRequestorder({ app: getRandomAddress(), category: 0 })
+        .then(iexec.order.signRequestorder);
+      await expectAsyncCustomError(
         iexec.order.publishRequestorder(requestorder),
-      ).rejects.toThrow(
-        new Error(
-          'Beneficiary result encryption key is not set in the SMS. Result encryption will fail.',
-        ),
+        {
+          constructor: MarketCallError,
+          message: `Market API error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
+        },
+      );
+    });
+
+    test('throw a MarketCallError when the Market API encounters an error', async () => {
+      const { iexec } = await getTestConfig(testChain)({
+        options: {
+          iexecGatewayURL: SERVICE_HTTP_500_URL,
+        },
+      });
+      const requestorder = await iexec.order
+        .createRequestorder({ app: getRandomAddress(), category: 0 })
+        .then(iexec.order.signRequestorder);
+      await expectAsyncCustomError(
+        iexec.order.publishRequestorder(requestorder),
+        {
+          constructor: MarketCallError,
+          message: `Market API error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
+        },
       );
-      await iexec.result.pushResultEncryptionKey(
-        `-----BEGIN PUBLIC KEY-----
+    });
+
+    describe('publishApporder()', () => {
+      test('publishes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        const orderHash = await iexec.order.publishApporder(apporder);
+        expect(orderHash).toBeTxHash();
+      });
+    });
+
+    describe('publishDatasetorder()', () => {
+      test('publishes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const datasetorder = await deployAndGetDatasetorder(iexec);
+        const orderHash = await iexec.order.publishDatasetorder(datasetorder);
+        expect(orderHash).toBeTxHash();
+      });
+
+      test('preflightChecks dataset secret exists for tee tag', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const datasetorder = await deployAndGetDatasetorder(iexec, {
+          tag: ['tee'],
+        });
+        const datasetAddress = datasetorder.dataset;
+        await expect(
+          iexec.order.publishDatasetorder(datasetorder),
+        ).rejects.toThrow(
+          new Error(
+            `Dataset encryption key is not set for dataset ${datasetAddress} in the SMS. Dataset decryption will fail.`,
+          ),
+        );
+
+        const orderHashSkipPreflight = await iexec.order.publishDatasetorder(
+          await iexec.order.signDatasetorder(datasetorder, {
+            preflightCheck: false,
+          }),
+          { preflightCheck: false },
+        );
+        expect(orderHashSkipPreflight).toBeTxHash();
+
+        await iexec.dataset.pushDatasetSecret(datasetAddress, 'foo');
+
+        const orderHashPreflight = await iexec.order.publishDatasetorder(
+          await iexec.order.signDatasetorder(datasetorder, {
+            preflightCheck: false,
+          }),
+        );
+        expect(orderHashPreflight).toBeTxHash();
+      });
+    });
+
+    describe('publishWorkerpoolorder()', () => {
+      test('publishes the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
+        const orderHash =
+          await iexec.order.publishWorkerpoolorder(workerpoolorder);
+        expect(orderHash).toBeTxHash();
+      });
+    });
+
+    describe('publishRequestorder()', () => {
+      test('publishes the order (skip preflightCheck)', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        await iexec.order.publishApporder(apporder);
+        const requestorder = await iexec.order
+          .createRequestorder({
+            requester: await iexec.wallet.getAddress(),
+            app: apporder.app,
+            appmaxprice: apporder.appprice,
+            dataset: NULL_ADDRESS,
+            datasetmaxprice: 0,
+            workerpool: NULL_ADDRESS,
+            workerpoolmaxprice: 0,
+            category: 1,
+            trust: 0,
+            volume: 1,
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        const orderHash = await iexec.order.publishRequestorder(requestorder, {
+          preflightCheck: false,
+        });
+        expect(orderHash).toBeTxHash();
+      });
+
+      test('preflightCheck result encryption key', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecAppDev } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexecAppDev, {
+          tag: ['tee', 'tdx'],
+        });
+        await iexecAppDev.order.publishApporder(apporder);
+        const requestorder = await iexec.order
+          .createRequestorder({
+            app: apporder.app,
+            appmaxprice: apporder.appprice,
+            category: 1,
+            params: { iexec_result_encryption: true },
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        await expect(
+          iexec.order.publishRequestorder(requestorder),
+        ).rejects.toThrow(
+          new Error(
+            'Beneficiary result encryption key is not set in the SMS. Result encryption will fail.',
+          ),
+        );
+        await iexec.result.pushResultEncryptionKey(
+          `-----BEGIN PUBLIC KEY-----
   MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA29Y2NYC08oFJ8GxPR3dK
   kI+Au+6keWHZ8CXs9f54WrXlNusNqqhOH7h4fQKaNHhptqSutmo6xYwmen4eUqe6
   72NnmTeBpexvlHj16uDqgVoySVMaYMSwexRr+n7BQ2NWYntYc3r0ZjBACK7NMyrb
@@ -1043,549 +981,442 @@ describe('publish...order()', () => {
   oSEDTczO+ZMeoYGNQwiFpetTB7E4zNfxofllEvMax3/VOFurRbwDlMavD0LPeRM6
   MUkxe2lT4YFowUo6JCUFlPcCAwEAAQ==
   -----END PUBLIC KEY-----`,
-      );
-      const orderHash = await iexec.order.publishRequestorder(requestorder);
-      expect(orderHash).toBeTxHash();
-    });
-
-    test('preflightCheck dropbox token', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecAppDev } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexecAppDev, {
-        teeFramework: TEE_FRAMEWORKS.SCONE,
-        tag: ['tee', 'scone'],
+        );
+        const orderHash = await iexec.order.publishRequestorder(requestorder);
+        expect(orderHash).toBeTxHash();
       });
-      await iexecAppDev.order.publishApporder(apporder);
-      const requestorder = await iexec.order
-        .createRequestorder({
-          app: apporder.app,
-          appmaxprice: apporder.appprice,
-          category: 1,
-          params: { iexec_result_storage_provider: 'dropbox' },
-          tag: ['tee', 'scone'],
-        })
-        .then((o) =>
-          iexec.order.signRequestorder(o, { preflightCheck: false }),
+
+      test('preflightCheck dropbox token', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecAppDev } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexecAppDev, {
+          tag: ['tee', 'tdx'],
+        });
+        await iexecAppDev.order.publishApporder(apporder);
+        const requestorder = await iexec.order
+          .createRequestorder({
+            app: apporder.app,
+            appmaxprice: apporder.appprice,
+            category: 1,
+            params: { iexec_result_storage_provider: 'dropbox' },
+            tag: ['tee', 'tdx'],
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        await expect(
+          iexec.order.publishRequestorder(requestorder),
+        ).rejects.toThrow(
+          new Error(
+            'Requester storage token is not set for selected provider "dropbox". Result archive upload will fail.',
+          ),
         );
-      await expect(
-        iexec.order.publishRequestorder(requestorder),
-      ).rejects.toThrow(
-        new Error(
-          'Requester storage token is not set for selected provider "dropbox". Result archive upload will fail.',
-        ),
-      );
-      await iexec.storage.pushStorageToken(`foo`, { provider: 'dropbox' });
-      const orderHash = await iexec.order.publishRequestorder(requestorder);
-      expect(orderHash).toBeTxHash();
+        await iexec.storage.pushStorageToken('foo', 'dropbox');
+        const orderHash = await iexec.order.publishRequestorder(requestorder);
+        expect(orderHash).toBeTxHash();
+      });
     });
   });
-});
 
-describe('unpublish...order()', () => {
-  test("throw a MarketCallError when the Market API can't be reached", async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({
-      options: {
-        iexecGatewayURL: SERVICE_UNREACHABLE_URL,
-      },
-    });
-    await expectAsyncCustomError(iexec.order.unpublishAllRequestorders(), {
-      constructor: MarketCallError,
-      message: `Market API error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
+  describe('unpublish...order()', () => {
+    test("throw a MarketCallError when the Market API can't be reached", async () => {
+      const { iexec } = await getTestConfig(testChain)({
+        options: {
+          iexecGatewayURL: SERVICE_UNREACHABLE_URL,
+        },
+      });
+      await expectAsyncCustomError(iexec.order.unpublishAllRequestorders(), {
+        constructor: MarketCallError,
+        message: `Market API error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
+      });
     });
-  });
 
-  test('throw a MarketCallError when the Market API encounters an error', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)({
-      options: {
-        iexecGatewayURL: SERVICE_HTTP_500_URL,
-      },
-    });
-    await expectAsyncCustomError(iexec.order.unpublishAllRequestorders(), {
-      constructor: MarketCallError,
-      message: `Market API error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
+    test('throw a MarketCallError when the Market API encounters an error', async () => {
+      const { iexec } = await getTestConfig(testChain)({
+        options: {
+          iexecGatewayURL: SERVICE_HTTP_500_URL,
+        },
+      });
+      await expectAsyncCustomError(iexec.order.unpublishAllRequestorders(), {
+        constructor: MarketCallError,
+        message: `Market API error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
+      });
     });
-  });
 
-  describe('unpublishApporder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      const orderHash = await iexec.order.publishApporder(apporder);
-      const unpublishRes = await iexec.order.unpublishApporder(orderHash);
-      expect(unpublishRes).toBe(orderHash);
-      await expect(iexec.order.unpublishApporder(orderHash)).rejects.toThrow(
-        new Error(
-          `API error: apporder with orderHash ${orderHash} is not published`,
-        ),
-      );
+    describe('unpublishApporder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        const orderHash = await iexec.order.publishApporder(apporder);
+        const unpublishRes = await iexec.order.unpublishApporder(orderHash);
+        expect(unpublishRes).toBe(orderHash);
+        await expect(iexec.order.unpublishApporder(orderHash)).rejects.toThrow(
+          new Error(
+            `API error: apporder with orderHash ${orderHash} is not published`,
+          ),
+        );
+      });
     });
-  });
 
-  describe('unpublishDatasetorder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const datasetorder = await deployAndGetDatasetorder(iexec);
-      const orderHash = await iexec.order.publishDatasetorder(datasetorder, {
-        preflightCheck: false,
+    describe('unpublishDatasetorder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const datasetorder = await deployAndGetDatasetorder(iexec);
+        const orderHash = await iexec.order.publishDatasetorder(datasetorder, {
+          preflightCheck: false,
+        });
+        const unpublishRes = await iexec.order.unpublishDatasetorder(orderHash);
+        expect(unpublishRes).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishDatasetorder(orderHash),
+        ).rejects.toThrow(
+          new Error(
+            `API error: datasetorder with orderHash ${orderHash} is not published`,
+          ),
+        );
       });
-      const unpublishRes = await iexec.order.unpublishDatasetorder(orderHash);
-      expect(unpublishRes).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishDatasetorder(orderHash),
-      ).rejects.toThrow(
-        new Error(
-          `API error: datasetorder with orderHash ${orderHash} is not published`,
-        ),
-      );
     });
-  });
 
-  describe('unpublishWorkerpoolorder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
-      const orderHash =
-        await iexec.order.publishWorkerpoolorder(workerpoolorder);
-      const unpublishRes =
-        await iexec.order.unpublishWorkerpoolorder(orderHash);
-      expect(unpublishRes).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishWorkerpoolorder(orderHash),
-      ).rejects.toThrow(
-        new Error(
-          `API error: workerpoolorder with orderHash ${orderHash} is not published`,
-        ),
-      );
+    describe('unpublishWorkerpoolorder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
+        const orderHash =
+          await iexec.order.publishWorkerpoolorder(workerpoolorder);
+        const unpublishRes =
+          await iexec.order.unpublishWorkerpoolorder(orderHash);
+        expect(unpublishRes).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishWorkerpoolorder(orderHash),
+        ).rejects.toThrow(
+          new Error(
+            `API error: workerpoolorder with orderHash ${orderHash} is not published`,
+          ),
+        );
+      });
     });
-  });
 
-  describe('unpublishRequestorder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      await iexec.order.publishApporder(apporder);
-      const requestorder = await iexec.order
-        .createRequestorder({
-          requester: await iexec.wallet.getAddress(),
-          app: apporder.app,
-          appmaxprice: apporder.appprice,
-          dataset: NULL_ADDRESS,
-          datasetmaxprice: 0,
-          workerpool: NULL_ADDRESS,
-          workerpoolmaxprice: 0,
-          category: 1,
-          trust: 0,
-          volume: 1,
-        })
-        .then((o) =>
-          iexec.order.signRequestorder(o, { preflightCheck: false }),
+    describe('unpublishRequestorder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        await iexec.order.publishApporder(apporder);
+        const requestorder = await iexec.order
+          .createRequestorder({
+            requester: await iexec.wallet.getAddress(),
+            app: apporder.app,
+            appmaxprice: apporder.appprice,
+            dataset: NULL_ADDRESS,
+            datasetmaxprice: 0,
+            workerpool: NULL_ADDRESS,
+            workerpoolmaxprice: 0,
+            category: 1,
+            trust: 0,
+            volume: 1,
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        const orderHash = await iexec.order.publishRequestorder(requestorder, {
+          preflightCheck: false,
+        });
+        const unpublishRes = await iexec.order.unpublishRequestorder(orderHash);
+        expect(unpublishRes).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishRequestorder(orderHash),
+        ).rejects.toThrow(
+          new Error(
+            `API error: requestorder with orderHash ${orderHash} is not published`,
+          ),
         );
-      const orderHash = await iexec.order.publishRequestorder(requestorder, {
-        preflightCheck: false,
       });
-      const unpublishRes = await iexec.order.unpublishRequestorder(orderHash);
-      expect(unpublishRes).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishRequestorder(orderHash),
-      ).rejects.toThrow(
-        new Error(
-          `API error: requestorder with orderHash ${orderHash} is not published`,
-        ),
-      );
     });
-  });
 
-  describe('unpublishLastApporder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      const orderHash = await iexec.order.publishApporder(apporder);
-      const lastApporder = await iexec.order.signApporder(apporder);
-      const lastOrderHash = await iexec.order.publishApporder(lastApporder);
-      const unpublishLastRes = await iexec.order.unpublishLastApporder(
-        apporder.app,
-      );
-      expect(unpublishLastRes).toBe(lastOrderHash);
-      const unpublishLast2Res = await iexec.order.unpublishLastApporder(
-        apporder.app,
-      );
-      expect(unpublishLast2Res).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishLastApporder(apporder.app),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open apporder published by signer ${wallet.address} for app ${apporder.app}`,
-        ),
-      );
+    describe('unpublishLastApporder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        const orderHash = await iexec.order.publishApporder(apporder);
+        const lastApporder = await iexec.order.signApporder(apporder);
+        const lastOrderHash = await iexec.order.publishApporder(lastApporder);
+        const unpublishLastRes = await iexec.order.unpublishLastApporder(
+          apporder.app,
+        );
+        expect(unpublishLastRes).toBe(lastOrderHash);
+        const unpublishLast2Res = await iexec.order.unpublishLastApporder(
+          apporder.app,
+        );
+        expect(unpublishLast2Res).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishLastApporder(apporder.app),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open apporder published by signer ${wallet.address} for app ${apporder.app}`,
+          ),
+        );
+      });
     });
-  });
 
-  describe('unpublishLastDatasetorder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const datasetorder = await deployAndGetDatasetorder(iexec);
-      const orderHash = await iexec.order.publishDatasetorder(datasetorder, {
-        preflightCheck: false,
-      });
-      const lastDatasetorder = await iexec.order.signDatasetorder(
-        datasetorder,
-        {
+    describe('unpublishLastDatasetorder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const datasetorder = await deployAndGetDatasetorder(iexec);
+        const orderHash = await iexec.order.publishDatasetorder(datasetorder, {
           preflightCheck: false,
-        },
-      );
-      const lastOrderHash = await iexec.order.publishDatasetorder(
-        lastDatasetorder,
-        { preflightCheck: false },
-      );
-      const unpublishLastRes = await iexec.order.unpublishLastDatasetorder(
-        datasetorder.dataset,
-      );
-      expect(unpublishLastRes).toBe(lastOrderHash);
-      const unpublishLast2Res = await iexec.order.unpublishLastDatasetorder(
-        datasetorder.dataset,
-      );
-      expect(unpublishLast2Res).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishLastDatasetorder(datasetorder.dataset),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open datasetorder published by signer ${wallet.address} for dataset ${datasetorder.dataset}`,
-        ),
-      );
+        });
+        const lastDatasetorder = await iexec.order.signDatasetorder(
+          datasetorder,
+          {
+            preflightCheck: false,
+          },
+        );
+        const lastOrderHash = await iexec.order.publishDatasetorder(
+          lastDatasetorder,
+          { preflightCheck: false },
+        );
+        const unpublishLastRes = await iexec.order.unpublishLastDatasetorder(
+          datasetorder.dataset,
+        );
+        expect(unpublishLastRes).toBe(lastOrderHash);
+        const unpublishLast2Res = await iexec.order.unpublishLastDatasetorder(
+          datasetorder.dataset,
+        );
+        expect(unpublishLast2Res).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishLastDatasetorder(datasetorder.dataset),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open datasetorder published by signer ${wallet.address} for dataset ${datasetorder.dataset}`,
+          ),
+        );
+      });
     });
-  });
 
-  describe('unpublishLastWorkerpoolorder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
-      const orderHash =
-        await iexec.order.publishWorkerpoolorder(workerpoolorder);
-      const lastWorkerpoolorder =
-        await iexec.order.signWorkerpoolorder(workerpoolorder);
-      const lastOrderHash =
-        await iexec.order.publishWorkerpoolorder(lastWorkerpoolorder);
-      const unpublishLastRes = await iexec.order.unpublishLastWorkerpoolorder(
-        workerpoolorder.workerpool,
-      );
-      expect(unpublishLastRes).toBe(lastOrderHash);
-      const unpublishLast2Res = await iexec.order.unpublishLastWorkerpoolorder(
-        workerpoolorder.workerpool,
-      );
-      expect(unpublishLast2Res).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishLastWorkerpoolorder(workerpoolorder.workerpool),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open workerpoolorder published by signer ${wallet.address} for workerpool ${workerpoolorder.workerpool}`,
-        ),
-      );
+    describe('unpublishLastWorkerpoolorder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
+        const orderHash =
+          await iexec.order.publishWorkerpoolorder(workerpoolorder);
+        const lastWorkerpoolorder =
+          await iexec.order.signWorkerpoolorder(workerpoolorder);
+        const lastOrderHash =
+          await iexec.order.publishWorkerpoolorder(lastWorkerpoolorder);
+        const unpublishLastRes = await iexec.order.unpublishLastWorkerpoolorder(
+          workerpoolorder.workerpool,
+        );
+        expect(unpublishLastRes).toBe(lastOrderHash);
+        const unpublishLast2Res =
+          await iexec.order.unpublishLastWorkerpoolorder(
+            workerpoolorder.workerpool,
+          );
+        expect(unpublishLast2Res).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishLastWorkerpoolorder(workerpoolorder.workerpool),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open workerpoolorder published by signer ${wallet.address} for workerpool ${workerpoolorder.workerpool}`,
+          ),
+        );
+      });
     });
-  });
 
-  describe('unpublishLastRequestorder()', () => {
-    test('unpublish the order', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      await iexec.order.publishApporder(apporder);
-      const requestorder = await iexec.order
-        .createRequestorder({
-          requester: await iexec.wallet.getAddress(),
-          app: apporder.app,
-          appmaxprice: apporder.appprice,
-          dataset: NULL_ADDRESS,
-          datasetmaxprice: 0,
-          workerpool: NULL_ADDRESS,
-          workerpoolmaxprice: 0,
-          category: 1,
-          trust: 0,
-          volume: 1,
-        })
-        .then((o) =>
-          iexec.order.signRequestorder(o, { preflightCheck: false }),
+    describe('unpublishLastRequestorder()', () => {
+      test('unpublish the order', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        await iexec.order.publishApporder(apporder);
+        const requestorder = await iexec.order
+          .createRequestorder({
+            requester: await iexec.wallet.getAddress(),
+            app: apporder.app,
+            appmaxprice: apporder.appprice,
+            dataset: NULL_ADDRESS,
+            datasetmaxprice: 0,
+            workerpool: NULL_ADDRESS,
+            workerpoolmaxprice: 0,
+            category: 1,
+            trust: 0,
+            volume: 1,
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        const orderHash = await iexec.order.publishRequestorder(requestorder, {
+          preflightCheck: false,
+        });
+        const lastRequestorder = await iexec.order.signRequestorder(
+          requestorder,
+          {
+            preflightCheck: false,
+          },
+        );
+        const lastOrderHash = await iexec.order.publishRequestorder(
+          lastRequestorder,
+          { preflightCheck: false },
+        );
+        const unpublishLastRes = await iexec.order.unpublishLastRequestorder(
+          requestorder.requester,
+        );
+        expect(unpublishLastRes).toBe(lastOrderHash);
+        const unpublishLast2Res = await iexec.order.unpublishLastRequestorder(
+          requestorder.requester,
+        );
+        expect(unpublishLast2Res).toBe(orderHash);
+        await expect(
+          iexec.order.unpublishLastRequestorder(requestorder.requester),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open requestorder published by signer ${wallet.address} for requester ${requestorder.requester}`,
+          ),
         );
-      const orderHash = await iexec.order.publishRequestorder(requestorder, {
-        preflightCheck: false,
       });
-      const lastRequestorder = await iexec.order.signRequestorder(
-        requestorder,
-        {
-          preflightCheck: false,
-        },
-      );
-      const lastOrderHash = await iexec.order.publishRequestorder(
-        lastRequestorder,
-        { preflightCheck: false },
-      );
-      const unpublishLastRes = await iexec.order.unpublishLastRequestorder(
-        requestorder.requester,
-      );
-      expect(unpublishLastRes).toBe(lastOrderHash);
-      const unpublishLast2Res = await iexec.order.unpublishLastRequestorder(
-        requestorder.requester,
-      );
-      expect(unpublishLast2Res).toBe(orderHash);
-      await expect(
-        iexec.order.unpublishLastRequestorder(requestorder.requester),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open requestorder published by signer ${wallet.address} for requester ${requestorder.requester}`,
-        ),
-      );
     });
-  });
 
-  describe('unpublishAllApporders()', () => {
-    test('unpublish all orders', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      const orderHash = await iexec.order.publishApporder(apporder);
-      const lastApporder = await iexec.order.signApporder(apporder);
-      const lastOrderHash = await iexec.order.publishApporder(lastApporder);
-      const unpublishAllRes = await iexec.order.unpublishAllApporders(
-        apporder.app,
-      );
-      expect(unpublishAllRes).toEqual(
-        expect.arrayContaining([orderHash, lastOrderHash]),
-      );
-      expect(unpublishAllRes.length).toBe(2);
-      await expect(
-        iexec.order.unpublishAllApporders(apporder.app),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open apporder published by signer ${wallet.address} for app ${apporder.app}`,
-        ),
-      );
+    describe('unpublishAllApporders()', () => {
+      test('unpublish all orders', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        const orderHash = await iexec.order.publishApporder(apporder);
+        const lastApporder = await iexec.order.signApporder(apporder);
+        const lastOrderHash = await iexec.order.publishApporder(lastApporder);
+        const unpublishAllRes = await iexec.order.unpublishAllApporders(
+          apporder.app,
+        );
+        expect(unpublishAllRes).toEqual(
+          expect.arrayContaining([orderHash, lastOrderHash]),
+        );
+        expect(unpublishAllRes.length).toBe(2);
+        await expect(
+          iexec.order.unpublishAllApporders(apporder.app),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open apporder published by signer ${wallet.address} for app ${apporder.app}`,
+          ),
+        );
+      });
     });
-  });
 
-  describe('unpublishAllDatasetorders()', () => {
-    test('unpublish all orders', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const datasetorder = await deployAndGetDatasetorder(iexec);
-      const orderHash = await iexec.order.publishDatasetorder(datasetorder, {
-        preflightCheck: false,
-      });
-      const lastDatasetorder = await iexec.order.signDatasetorder(
-        datasetorder,
-        {
+    describe('unpublishAllDatasetorders()', () => {
+      test('unpublish all orders', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const datasetorder = await deployAndGetDatasetorder(iexec);
+        const orderHash = await iexec.order.publishDatasetorder(datasetorder, {
           preflightCheck: false,
-        },
-      );
-      const lastOrderHash = await iexec.order.publishDatasetorder(
-        lastDatasetorder,
-        { preflightCheck: false },
-      );
-      const unpublishAllRes = await iexec.order.unpublishAllDatasetorders(
-        datasetorder.dataset,
-      );
-      expect(unpublishAllRes).toEqual(
-        expect.arrayContaining([orderHash, lastOrderHash]),
-      );
-      expect(unpublishAllRes.length).toBe(2);
-      await expect(
-        iexec.order.unpublishAllDatasetorders(datasetorder.dataset),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open datasetorder published by signer ${wallet.address} for dataset ${datasetorder.dataset}`,
-        ),
-      );
-    });
-  });
-
-  describe('unpublishAllWorkerpoolorders()', () => {
-    test('unpublish all orders', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
-      const orderHash =
-        await iexec.order.publishWorkerpoolorder(workerpoolorder);
-      const lastWorkerpoolorder =
-        await iexec.order.signWorkerpoolorder(workerpoolorder);
-      const lastOrderHash =
-        await iexec.order.publishWorkerpoolorder(lastWorkerpoolorder);
-      const unpublishAllRes = await iexec.order.unpublishAllWorkerpoolorders(
-        workerpoolorder.workerpool,
-      );
-      expect(unpublishAllRes).toEqual(
-        expect.arrayContaining([orderHash, lastOrderHash]),
-      );
-      expect(unpublishAllRes.length).toBe(2);
-      await expect(
-        iexec.order.unpublishAllWorkerpoolorders(workerpoolorder.workerpool),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open workerpoolorder published by signer ${wallet.address} for workerpool ${workerpoolorder.workerpool}`,
-        ),
-      );
-    });
-  });
-
-  describe('unpublishAllRequestorders()', () => {
-    test('unpublish all orders', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const apporder = await deployAndGetApporder(iexec);
-      await iexec.order.publishApporder(apporder);
-      const requestorder = await iexec.order
-        .createRequestorder({
-          requester: await iexec.wallet.getAddress(),
-          app: apporder.app,
-          appmaxprice: apporder.appprice,
-          dataset: NULL_ADDRESS,
-          datasetmaxprice: 0,
-          workerpool: NULL_ADDRESS,
-          workerpoolmaxprice: 0,
-          category: 1,
-          trust: 0,
-          volume: 1,
-        })
-        .then((o) =>
-          iexec.order.signRequestorder(o, { preflightCheck: false }),
+        });
+        const lastDatasetorder = await iexec.order.signDatasetorder(
+          datasetorder,
+          {
+            preflightCheck: false,
+          },
+        );
+        const lastOrderHash = await iexec.order.publishDatasetorder(
+          lastDatasetorder,
+          { preflightCheck: false },
+        );
+        const unpublishAllRes = await iexec.order.unpublishAllDatasetorders(
+          datasetorder.dataset,
+        );
+        expect(unpublishAllRes).toEqual(
+          expect.arrayContaining([orderHash, lastOrderHash]),
+        );
+        expect(unpublishAllRes.length).toBe(2);
+        await expect(
+          iexec.order.unpublishAllDatasetorders(datasetorder.dataset),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open datasetorder published by signer ${wallet.address} for dataset ${datasetorder.dataset}`,
+          ),
         );
-      const orderHash = await iexec.order.publishRequestorder(requestorder, {
-        preflightCheck: false,
       });
-      const lastRequestorder = await iexec.order.signRequestorder(
-        requestorder,
-        {
-          preflightCheck: false,
-        },
-      );
-      const lastOrderHash = await iexec.order.publishRequestorder(
-        lastRequestorder,
-        { preflightCheck: false },
-      );
-      const unpublishAllRes = await iexec.order.unpublishAllRequestorders(
-        requestorder.requester,
-      );
-      expect(unpublishAllRes).toEqual(
-        expect.arrayContaining([orderHash, lastOrderHash]),
-      );
-      expect(unpublishAllRes.length).toBe(2);
-      await expect(
-        iexec.order.unpublishAllRequestorders(requestorder.requester),
-      ).rejects.toThrow(
-        new Error(
-          `API error: no open requestorder published by signer ${wallet.address} for requester ${requestorder.requester}`,
-        ),
-      );
     });
-  });
-});
 
-describe('estimateMatchOrders()', () => {
-  test('estimates the total cost and volume', async () => {
-    const noVoucherTestChain = TEST_CHAINS['custom-token-chain'];
-    const options = {
-      resultProxyURL: 'https://result-proxy.iex.ec',
-      smsURL: 'https://sms.iex.ec',
-    };
-    const { iexec: iexecRequester } = getTestConfig(noVoucherTestChain)({
-      options,
-    });
-    const { iexec: iexecResourcesProvider, wallet: providerWallet } =
-      getTestConfig(noVoucherTestChain)({
-        options,
+    describe('unpublishAllWorkerpoolorders()', () => {
+      test('unpublish all orders', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
+        const orderHash =
+          await iexec.order.publishWorkerpoolorder(workerpoolorder);
+        const lastWorkerpoolorder =
+          await iexec.order.signWorkerpoolorder(workerpoolorder);
+        const lastOrderHash =
+          await iexec.order.publishWorkerpoolorder(lastWorkerpoolorder);
+        const unpublishAllRes = await iexec.order.unpublishAllWorkerpoolorders(
+          workerpoolorder.workerpool,
+        );
+        expect(unpublishAllRes).toEqual(
+          expect.arrayContaining([orderHash, lastOrderHash]),
+        );
+        expect(unpublishAllRes.length).toBe(2);
+        await expect(
+          iexec.order.unpublishAllWorkerpoolorders(workerpoolorder.workerpool),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open workerpoolorder published by signer ${wallet.address} for workerpool ${workerpoolorder.workerpool}`,
+          ),
+        );
       });
-
-    await setBalance(noVoucherTestChain)(providerWallet.address, ONE_ETH);
-
-    const apporder = await deployAndGetApporder(iexecResourcesProvider, {
-      volume: 10,
-      appprice: 5,
     });
-    const datasetorder = await deployAndGetDatasetorder(
-      iexecResourcesProvider,
-      {
-        volume: 7,
-        datasetprice: 1,
-      },
-    );
-    const workerpoolorder = await deployAndGetWorkerpoolorder(
-      iexecResourcesProvider,
-      { volume: 5, workerpoolprice: 1 },
-    );
-    const requestorder = await getMatchableRequestorder(iexecRequester, {
-      apporder,
-      datasetorder,
-      workerpoolorder,
-    });
-
-    const res = await iexecRequester.order.estimateMatchOrders({
-      apporder,
-      datasetorder,
-      workerpoolorder,
-      requestorder,
-    });
-    expect(res.sponsored).toBeInstanceOf(BN);
-    expect(res.sponsored).toEqual(new BN(0));
-    expect(res.total).toBeInstanceOf(BN);
-    expect(res.total).toEqual(new BN(35));
-    expect(res.volume).toBeInstanceOf(BN);
-    expect(res.volume).toEqual(new BN(5));
-  });
-
-  describe('with useVoucher', () => {
-    let iexecProvider;
-    let apporderTemplate;
-    let datasetorderTemplate;
-    let workerpoolorderTemplate;
-    let voucherTypeId;
-    let matchableVolume;
-    let expectedTotal;
-
-    beforeAll(async () => {
-      const providerConfig = getTestConfig(iexecTestChain)();
-      iexecProvider = providerConfig.iexec;
-      apporderTemplate = await deployAndGetApporder(iexecProvider, {
-        volume: 10,
-        appprice: 5,
-      });
-      datasetorderTemplate = await deployAndGetDatasetorder(iexecProvider, {
-        volume: 7,
-        datasetprice: 1,
-      });
-      workerpoolorderTemplate = await deployAndGetWorkerpoolorder(
-        iexecProvider,
-        { volume: 5, workerpoolprice: 1 },
-      );
-
-      matchableVolume = new BN(5); // min volume among orders
-      expectedTotal = new BN(5 + 1 + 1).mul(matchableVolume); // volume * orders unit prices
 
-      voucherTypeId = await createVoucherType(iexecTestChain)({
-        description: 'test voucher type',
-        duration: 60 * 60,
+    describe('unpublishAllRequestorders()', () => {
+      test('unpublish all orders', async () => {
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const apporder = await deployAndGetApporder(iexec);
+        await iexec.order.publishApporder(apporder);
+        const requestorder = await iexec.order
+          .createRequestorder({
+            requester: await iexec.wallet.getAddress(),
+            app: apporder.app,
+            appmaxprice: apporder.appprice,
+            dataset: NULL_ADDRESS,
+            datasetmaxprice: 0,
+            workerpool: NULL_ADDRESS,
+            workerpoolmaxprice: 0,
+            category: 1,
+            trust: 0,
+            volume: 1,
+          })
+          .then((o) =>
+            iexec.order.signRequestorder(o, { preflightCheck: false }),
+          );
+        const orderHash = await iexec.order.publishRequestorder(requestorder, {
+          preflightCheck: false,
+        });
+        const lastRequestorder = await iexec.order.signRequestorder(
+          requestorder,
+          {
+            preflightCheck: false,
+          },
+        );
+        const lastOrderHash = await iexec.order.publishRequestorder(
+          lastRequestorder,
+          { preflightCheck: false },
+        );
+        const unpublishAllRes = await iexec.order.unpublishAllRequestorders(
+          requestorder.requester,
+        );
+        expect(unpublishAllRes).toEqual(
+          expect.arrayContaining([orderHash, lastOrderHash]),
+        );
+        expect(unpublishAllRes.length).toBe(2);
+        await expect(
+          iexec.order.unpublishAllRequestorders(requestorder.requester),
+        ).rejects.toThrow(
+          new Error(
+            `API error: no open requestorder published by signer ${wallet.address} for requester ${requestorder.requester}`,
+          ),
+        );
       });
-
-      await addVoucherEligibleAsset(iexecTestChain)(
-        apporderTemplate.app,
-        voucherTypeId,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        datasetorderTemplate.dataset,
-        voucherTypeId,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        workerpoolorderTemplate.workerpool,
-        voucherTypeId,
-      );
     });
+  });
 
-    test('requires voucherHubAddress to be configured when useVoucher is true', async () => {
-      const noVoucherTestChain = TEST_CHAINS['custom-token-chain'];
-      const options = {
-        resultProxyURL: 'https://result-proxy.iex.ec',
-        smsURL: 'https://sms.iex.ec',
-      };
-      const { iexec: iexecRequester } = getTestConfig(noVoucherTestChain)({
-        options,
-      });
+  describe('estimateMatchOrders()', () => {
+    test('estimates the total cost and volume', async () => {
+      const { iexec: iexecRequester } = await getTestConfig(testChain)();
       const { iexec: iexecResourcesProvider, wallet: providerWallet } =
-        getTestConfig(noVoucherTestChain)({
-          options,
-        });
+        await getTestConfig(testChain)();
 
-      await setBalance(noVoucherTestChain)(providerWallet.address, ONE_ETH);
+      await setBalance(testChain)(providerWallet.address, ONE_ETH);
 
       const apporder = await deployAndGetApporder(iexecResourcesProvider, {
         volume: 10,
@@ -1608,113 +1439,37 @@ describe('estimateMatchOrders()', () => {
         workerpoolorder,
       });
 
-      await expect(
-        iexecRequester.order.estimateMatchOrders(
-          {
-            apporder,
-            datasetorder,
-            workerpoolorder,
-            requestorder,
-          },
-          { useVoucher: true },
-        ),
-      ).rejects.toThrow(
-        new ConfigurationError(
-          `voucherHubAddress option not set and no default value for your chain ${noVoucherTestChain.chainId}`,
-        ),
-      );
-      // estimate match orders without useVoucher should pass
-      const res = await iexecRequester.order.estimateMatchOrders(
-        {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-          requestorder,
-        },
-        { useVoucher: false },
-      );
-      expect(res.sponsored).toBeInstanceOf(BN);
-      expect(res.sponsored).toEqual(new BN(0));
-      expect(res.total).toBeInstanceOf(BN);
-      expect(res.total).toEqual(new BN(35));
-      expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume).toEqual(new BN(5));
-    });
-
-    test('should have sponsored amount as 0 when useVoucher is false', async () => {
-      const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
-
-      const requestorderTemplate = await getMatchableRequestorder(
-        iexecRequester,
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-        },
-      );
-
-      await createVoucher(iexecTestChain)({
-        owner: await requesterWallet.getAddress(),
-        voucherType: voucherTypeId,
-        value: 100,
-      });
-
       const res = await iexecRequester.order.estimateMatchOrders({
-        apporder: apporderTemplate,
-        datasetorder: datasetorderTemplate,
-        workerpoolorder: workerpoolorderTemplate,
-        requestorder: requestorderTemplate,
-      });
-
-      expect(res.sponsored).toBeInstanceOf(BN);
-      expect(res.sponsored).toEqual(new BN(0));
-      expect(res.total).toBeInstanceOf(BN);
-      expect(res.total).toEqual(expectedTotal);
-      expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume).toEqual(matchableVolume);
-    });
-
-    test('should return total cost and sponsored amount when using voucher', async () => {
-      const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
-
-      const requestorderTemplate = await getMatchableRequestorder(
-        iexecRequester,
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-        },
-      );
-
-      await createVoucher(iexecTestChain)({
-        owner: await requesterWallet.getAddress(),
-        voucherType: voucherTypeId,
-        value: 1000,
+        apporder,
+        datasetorder,
+        workerpoolorder,
+        requestorder,
       });
-
-      const res = await iexecRequester.order.estimateMatchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { useVoucher: true },
-      );
-      expect(res.sponsored).toBeInstanceOf(BN);
-      expect(res.sponsored).toEqual(expectedTotal);
       expect(res.total).toBeInstanceOf(BN);
-      expect(res.total).toEqual(expectedTotal);
+      expect(res.total).toEqual(new BN(35));
       expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume).toEqual(matchableVolume);
+      expect(res.volume).toEqual(new BN(5));
     });
+  });
 
-    test('should return sponsored amount equal to voucher balance when voucher value is less than total cost', async () => {
+  describe('matchOrders()', () => {
+    test('order.matchOrders() all tests (split TODO)', async () => {
+      const { iexec: iexecBroker } = await getTestConfig(testChain)();
+      const { iexec: iexecPoolManager, wallet: poolManagerWallet } =
+        await getTestConfig(testChain)();
       const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
-
+        await getTestConfig(testChain)();
+      const { iexec: iexecAppProvider } = await getTestConfig(testChain)();
+      const { iexec: iexecDatasetProvider } = await getTestConfig(testChain)();
+
+      await setNRlcBalance(testChain)(requesterWallet.address, 10n * ONE_RLC);
+      await setNRlcBalance(testChain)(poolManagerWallet.address, 10n * ONE_RLC);
+
+      const apporderTemplate = await deployAndGetApporder(iexecAppProvider);
+      const datasetorderTemplate =
+        await deployAndGetDatasetorder(iexecDatasetProvider);
+      const workerpoolorderTemplate =
+        await deployAndGetWorkerpoolorder(iexecPoolManager);
       const requestorderTemplate = await getMatchableRequestorder(
         iexecRequester,
         {
@@ -1724,1136 +1479,591 @@ describe('estimateMatchOrders()', () => {
         },
       );
 
-      await createVoucher(iexecTestChain)({
-        owner: await requesterWallet.getAddress(),
-        voucherType: voucherTypeId,
-        value: 10,
-      });
-      const voucherInfo = await iexecRequester.voucher.showUserVoucher(
-        requesterWallet.address,
-      );
-
-      const res = await iexecRequester.order.estimateMatchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { useVoucher: true },
-      );
-      expect(res.sponsored).toBeInstanceOf(BN);
-      expect(res.sponsored).toEqual(new BN(voucherInfo.balance));
-      expect(res.total).toBeInstanceOf(BN);
-      expect(res.total).toEqual(expectedTotal);
-      expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume).toEqual(matchableVolume);
-    });
-
-    test('should have sponsored amount as 0 when voucher expired', async () => {
-      const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
-
-      const requestorderTemplate = await getMatchableRequestorder(
-        iexecRequester,
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-        },
+      // resource not deployed
+      const fakeAddress = getRandomAddress();
+      const apporderNotDeployed = { ...apporderTemplate, app: fakeAddress };
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderNotDeployed,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error(`No app deployed at address ${fakeAddress}`));
+      const datasetorderNotDeployed = {
+        ...datasetorderTemplate,
+        dataset: fakeAddress,
+      };
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderNotDeployed,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error(`No dataset deployed at address ${fakeAddress}`));
+      const workerpoolorderNotDeployed = {
+        ...workerpoolorderTemplate,
+        workerpool: fakeAddress,
+      };
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderNotDeployed,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(`No workerpool deployed at address ${fakeAddress}`),
       );
-      const voucherType = await createVoucherType(iexecTestChain)({
-        description: 'test voucher type',
-        duration: 1,
-      });
-      await createVoucher(iexecTestChain)({
-        owner: await requesterWallet.getAddress(),
-        voucherType,
-        value: 100,
-      });
-
-      const res = await iexecRequester.order.estimateMatchOrders({
-        apporder: apporderTemplate,
-        datasetorder: datasetorderTemplate,
-        workerpoolorder: workerpoolorderTemplate,
-        requestorder: requestorderTemplate,
-      });
-      expect(res.sponsored).toBeInstanceOf(BN);
-      expect(res.sponsored).toEqual(new BN(0));
-      expect(res.total).toBeInstanceOf(BN);
-      expect(res.total).toEqual(expectedTotal);
-      expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume).toEqual(matchableVolume);
-    });
-
-    describe('with custom voucherAddress option', () => {
-      let voucherAddress;
-      let authorizedRequesterWallet;
-      beforeAll(async () => {
-        const { iexec: iexecVoucherOwner, wallet: voucherOwnerWallet } =
-          getTestConfig(iexecTestChain)();
-        ({ wallet: authorizedRequesterWallet } =
-          getTestConfig(iexecTestChain)());
-
-        voucherAddress = await createVoucher(iexecTestChain)({
-          owner: await voucherOwnerWallet.getAddress(),
-          voucherType: voucherTypeId,
-          value: 1000,
-        });
-        await iexecVoucherOwner.voucher.authorizeRequester(
-          authorizedRequesterWallet.address,
-        );
-      });
-
-      test('should use specified voucherAddress', async () => {
-        const { iexec: iexecRequester } = getTestConfig(iexecTestChain)({
-          privateKey: authorizedRequesterWallet.privateKey,
-        });
-
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-        });
-
-        const res = await iexecRequester.order.estimateMatchOrders(
+      // invalid sign
+      const apporderInvalidSign = {
+        ...apporderTemplate,
+        sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
+      };
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderInvalidSign,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('apporder invalid sign'));
+      const datasetorderInvalidSign = {
+        ...datasetorderTemplate,
+        sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
+      };
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderInvalidSign,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('datasetorder invalid sign'));
+      const workerpoolorderInvalidSign = {
+        ...workerpoolorderTemplate,
+        sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
+      };
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderInvalidSign,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('workerpoolorder invalid sign'));
+      const requestorderInvalidSign = {
+        ...requestorderTemplate,
+        sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
+      };
+      await expect(
+        iexecBroker.order.matchOrders(
           {
             apporder: apporderTemplate,
             datasetorder: datasetorderTemplate,
             workerpoolorder: workerpoolorderTemplate,
-            requestorder,
+            requestorder: requestorderInvalidSign,
           },
-          { useVoucher: true, voucherAddress },
-        );
-        expect(res.sponsored).toBeInstanceOf(BN);
-        expect(res.sponsored).toEqual(expectedTotal);
-        expect(res.total).toBeInstanceOf(BN);
-        expect(res.total).toEqual(expectedTotal);
-        expect(res.volume).toBeInstanceOf(BN);
-        expect(res.volume).toEqual(matchableVolume);
-      });
-
-      test('should throw if specified voucherAddress is not a voucher', async () => {
-        const { iexec: iexecRequester } = getTestConfig(iexecTestChain)({
-          privateKey: authorizedRequesterWallet.privateKey,
-        });
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('requestorder invalid sign'));
 
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
+      // address mismatch
+      const apporderAddressMismatch =
+        await deployAndGetApporder(iexecAppProvider);
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderAddressMismatch,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `app address mismatch between requestorder (${requestorderTemplate.app}) and apporder (${apporderAddressMismatch.app})`,
+        ),
+      );
+      const datasetorderAddressMismatch =
+        await deployAndGetDatasetorder(iexecDatasetProvider);
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderAddressMismatch,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `dataset address mismatch between requestorder (${requestorderTemplate.dataset}) and datasetorder (${datasetorderAddressMismatch.dataset})`,
+        ),
+      );
+      const workerpoolorderAddressMismatch =
+        await deployAndGetWorkerpoolorder(iexecPoolManager);
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderAddressMismatch,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `workerpool address mismatch between requestorder (${requestorderTemplate.workerpool}) and workerpoolorder (${workerpoolorderAddressMismatch.workerpool})`,
+        ),
+      );
+      // category check
+      const workerpoolorderCategoryMismatch =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          category: 2,
         });
-
-        await expect(
-          iexecRequester.order.estimateMatchOrders(
-            {
-              apporder: apporderTemplate,
-              datasetorder: datasetorderTemplate,
-              workerpoolorder: workerpoolorderTemplate,
-              requestorder,
-            },
-            { useVoucher: true, voucherAddress: getRandomAddress() },
-          ),
-        ).rejects.toThrow('Invalid voucher contract address');
-      });
-
-      test('should throw if user is not allowed to use specified voucherAddress', async () => {
-        const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderCategoryMismatch,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `category mismatch between requestorder (${requestorderTemplate.category}) and workerpoolorder (${workerpoolorderCategoryMismatch.category})`,
+        ),
+      );
+      // trust check
+      const workerpoolorderTrustZero =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          trust: 0,
         });
+      const requestorderTrustTooHigh =
+        await iexecRequester.order.signRequestorder(
+          {
+            ...requestorderTemplate,
+            trust: 2,
+          },
+          { preflightCheck: false },
+        );
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTrustZero,
+            requestorder: requestorderTrustTooHigh,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `workerpoolorder trust is too low (expected ${requestorderTrustTooHigh.trust}, got ${workerpoolorderTrustZero.trust})`,
+        ),
+      );
 
-        await expect(
-          iexecRequester.order.estimateMatchOrders(
-            {
-              apporder: apporderTemplate,
-              datasetorder: datasetorderTemplate,
-              workerpoolorder: workerpoolorderTemplate,
-              requestorder,
-            },
-            { useVoucher: true, voucherAddress },
-          ),
-        ).rejects.toThrow('User is not authorized to use the voucher');
-      });
-    });
-  });
-});
-
-describe('matchOrders()', () => {
-  test('order.matchOrders() all tests (split TODO)', async () => {
-    const { iexec: iexecBroker } = getTestConfig(iexecTestChain)();
-    const { iexec: iexecPoolManager, wallet: poolManagerWallet } =
-      getTestConfig(iexecTestChain)();
-    const { iexec: iexecRequester, wallet: requesterWallet } =
-      getTestConfig(iexecTestChain)();
-    const { iexec: iexecAppProvider } = getTestConfig(iexecTestChain)();
-    const { iexec: iexecDatasetProvider } = getTestConfig(iexecTestChain)();
-
-    await setNRlcBalance(iexecTestChain)(
-      requesterWallet.address,
-      10n * ONE_RLC,
-    );
-    await setNRlcBalance(iexecTestChain)(
-      poolManagerWallet.address,
-      10n * ONE_RLC,
-    );
-
-    const apporderTemplate = await deployAndGetApporder(iexecAppProvider);
-    const datasetorderTemplate =
-      await deployAndGetDatasetorder(iexecDatasetProvider);
-    const workerpoolorderTemplate =
-      await deployAndGetWorkerpoolorder(iexecPoolManager);
-    const requestorderTemplate = await getMatchableRequestorder(
-      iexecRequester,
-      {
-        apporder: apporderTemplate,
-        datasetorder: datasetorderTemplate,
-        workerpoolorder: workerpoolorderTemplate,
-      },
-    );
-
-    // resource not deployed
-    const fakeAddress = getRandomAddress();
-    const apporderNotDeployed = { ...apporderTemplate, app: fakeAddress };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderNotDeployed,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error(`No app deployed at address ${fakeAddress}`));
-    const datasetorderNotDeployed = {
-      ...datasetorderTemplate,
-      dataset: fakeAddress,
-    };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderNotDeployed,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error(`No dataset deployed at address ${fakeAddress}`));
-    const workerpoolorderNotDeployed = {
-      ...workerpoolorderTemplate,
-      workerpool: fakeAddress,
-    };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderNotDeployed,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(`No workerpool deployed at address ${fakeAddress}`),
-    );
-    // invalid sign
-    const apporderInvalidSign = {
-      ...apporderTemplate,
-      sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
-    };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderInvalidSign,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('apporder invalid sign'));
-    const datasetorderInvalidSign = {
-      ...datasetorderTemplate,
-      sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
-    };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderInvalidSign,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('datasetorder invalid sign'));
-    const workerpoolorderInvalidSign = {
-      ...workerpoolorderTemplate,
-      sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
-    };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderInvalidSign,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('workerpoolorder invalid sign'));
-    const requestorderInvalidSign = {
-      ...requestorderTemplate,
-      sign: '0xa1d59ea4f4ed84ed1c2fcbdb217f22d64180d95ccaed3268bdfef796ff7f5fa50c2d4c83bf7465afbd9ca292c433495eb573d1f8bcca585cb107b047c899dcb81c',
-    };
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderInvalidSign,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('requestorder invalid sign'));
-
-    // address mismatch
-    const apporderAddressMismatch =
-      await deployAndGetApporder(iexecAppProvider);
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderAddressMismatch,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `app address mismatch between requestorder (${requestorderTemplate.app}) and apporder (${apporderAddressMismatch.app})`,
-      ),
-    );
-    const datasetorderAddressMismatch =
-      await deployAndGetDatasetorder(iexecDatasetProvider);
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderAddressMismatch,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `dataset address mismatch between requestorder (${requestorderTemplate.dataset}) and datasetorder (${datasetorderAddressMismatch.dataset})`,
-      ),
-    );
-    const workerpoolorderAddressMismatch =
-      await deployAndGetWorkerpoolorder(iexecPoolManager);
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderAddressMismatch,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `workerpool address mismatch between requestorder (${requestorderTemplate.workerpool}) and workerpoolorder (${workerpoolorderAddressMismatch.workerpool})`,
-      ),
-    );
-    // category check
-    const workerpoolorderCategoryMismatch =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        category: 2,
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderCategoryMismatch,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `category mismatch between requestorder (${requestorderTemplate.category}) and workerpoolorder (${workerpoolorderCategoryMismatch.category})`,
-      ),
-    );
-    // trust check
-    const workerpoolorderTrustZero =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        trust: 0,
-      });
-    const requestorderTrustTooHigh =
-      await iexecRequester.order.signRequestorder(
+      // workerpool tag check
+      const requestorderTagTeeGpu = await iexecRequester.order.signRequestorder(
         {
           ...requestorderTemplate,
-          trust: 2,
+          tag: ['tee', 'tdx', 'gpu'],
         },
         { preflightCheck: false },
       );
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTrustZero,
-          requestorder: requestorderTrustTooHigh,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `workerpoolorder trust is too low (expected ${requestorderTrustTooHigh.trust}, got ${workerpoolorderTrustZero.trust})`,
-      ),
-    );
-
-    // workerpool tag check
-    const requestorderTagTeeGpu = await iexecRequester.order.signRequestorder(
-      {
-        ...requestorderTemplate,
-        tag: ['tee', 'scone', 'gpu'],
-      },
-      { preflightCheck: false },
-    );
-    const workerpoolorderTagGpu =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        tag: ['gpu'],
-      });
-    const workerpoolorderTagTee =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        tag: ['tee', 'scone'],
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTagGpu,
-          requestorder: requestorderTagTeeGpu,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('Missing tags [tee,scone] in workerpoolorder'));
-    const apporderTagGpu = await iexecAppProvider.order.signApporder({
-      ...apporderTemplate,
-      tag: ['gpu'],
-    });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTagGpu,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTagTee,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('Missing tags [gpu] in workerpoolorder'));
-    const datasetorderTagTeeGpu =
-      await iexecDatasetProvider.order.signDatasetorder(
-        {
-          ...datasetorderTemplate,
+      const workerpoolorderTagGpu =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
           tag: ['gpu'],
-        },
-        { preflightCheck: false },
-      );
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTagTeeGpu,
-          workerpoolorder: workerpoolorderTagTee,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('Missing tags [gpu] in workerpoolorder'));
-    // app tag check
-    const requestorderTagTee = await iexecRequester.order.signRequestorder(
-      {
-        ...requestorderTemplate,
-        tag: ['tee', 'scone'],
-      },
-      { preflightCheck: false },
-    );
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTagTee,
-          requestorder: requestorderTagTee,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('Missing tag [tee] in apporder'));
-    // price check
-    const apporderTooExpensive = await iexecAppProvider.order.signApporder({
-      ...apporderTemplate,
-      appprice: 1,
-    });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTooExpensive,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `appmaxprice too low (expected ${apporderTooExpensive.appprice}, got ${requestorderTemplate.appmaxprice})`,
-      ),
-    );
-
-    const datasetorderTooExpensive =
-      await iexecDatasetProvider.order.signDatasetorder(
-        {
-          ...datasetorderTemplate,
-          datasetprice: 1,
-        },
-        { preflightCheck: false },
-      );
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTooExpensive,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `datasetmaxprice too low (expected ${datasetorderTooExpensive.datasetprice}, got ${requestorderTemplate.datasetmaxprice})`,
-      ),
-    );
-
-    const workerpoolorderTooExpensive =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        workerpoolprice: 1,
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTooExpensive,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        `workerpoolmaxprice too low (expected ${workerpoolorderTooExpensive.workerpoolprice}, got ${requestorderTemplate.workerpoolmaxprice})`,
-      ),
-    );
-    // volumes checks
-    const apporderCanceled = await iexecAppProvider.order
-      .signApporder(apporderTemplate, { preflightCheck: false })
-      .then(async (order) => {
-        await iexecAppProvider.order.cancelApporder(order);
-        return order;
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderCanceled,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('apporder is fully consumed'));
-
-    const datasetorderCanceled = await iexecDatasetProvider.order
-      .signDatasetorder(datasetorderTemplate, { preflightCheck: false })
-      .then(async (order) => {
-        await iexecDatasetProvider.order.cancelDatasetorder(order);
-        return order;
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderCanceled,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('datasetorder is fully consumed'));
-
-    const workerpoolorderCanceled = await iexecPoolManager.order
-      .signWorkerpoolorder(workerpoolorderTemplate)
-      .then(async (order) => {
-        await iexecPoolManager.order.cancelWorkerpoolorder(order);
-        return order;
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderCanceled,
-          requestorder: requestorderTemplate,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('workerpoolorder is fully consumed'));
-    const requestorderCanceled = await iexecRequester.order
-      .signRequestorder(requestorderTemplate, { preflightCheck: false })
-      .then(async (order) => {
-        await iexecRequester.order.cancelRequestorder(order);
-        return order;
-      });
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporderTemplate,
-          datasetorder: datasetorderTemplate,
-          workerpoolorder: workerpoolorderTemplate,
-          requestorder: requestorderCanceled,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(Error('requestorder is fully consumed'));
-
-    // requester account stake check
-    const balance = await iexecRequester.account.checkBalance(
-      await iexecRequester.wallet.getAddress(),
-    );
-    await iexecRequester.account.withdraw(balance.stake).catch(() => {});
-    await iexecRequester.account.deposit(5);
-
-    const apporder3nRlc = await iexecAppProvider.order.signApporder(
-      {
-        ...apporderTemplate,
-        appprice: 3,
-      },
-      { preflightCheck: false },
-    );
-    const datasetorder2nRlc = await iexecDatasetProvider.order.signDatasetorder(
-      {
-        ...datasetorderTemplate,
-        datasetprice: 2,
-      },
-      { preflightCheck: false },
-    );
-    const workerpoolorder1nRlc =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        workerpoolprice: 1,
-      });
-    const requestorder300nRlc = await iexecRequester.order.signRequestorder(
-      {
-        ...requestorderTemplate,
-        appmaxprice: 100,
-        datasetmaxprice: 100,
-        workerpoolmaxprice: 100,
-      },
-      { preflightCheck: false },
-    );
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporder3nRlc,
-          datasetorder: datasetorder2nRlc,
-          workerpoolorder: workerpoolorder1nRlc,
-          requestorder: requestorder300nRlc,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        "Cost per task (6) is greater than requester account stake (5). Orders can't be matched. If you are the requester, you should deposit to top up your account",
-      ),
-    );
-
-    const apporder0nRlc = await iexecAppProvider.order.signApporder(
-      {
+        });
+      const workerpoolorderTagTee =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          tag: ['tee', 'tdx'],
+        });
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTagGpu,
+            requestorder: requestorderTagTeeGpu,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('Missing tags [tee,tdx] in workerpoolorder'));
+      const apporderTagGpu = await iexecAppProvider.order.signApporder({
         ...apporderTemplate,
-        appprice: 0,
-        volume: 1000,
-      },
-      { preflightCheck: false },
-    );
-    const datasetorder0nRlc = await iexecDatasetProvider.order.signDatasetorder(
-      {
-        ...datasetorderTemplate,
-        datasetprice: 0,
-        volume: 1000,
-      },
-      { preflightCheck: false },
-    );
-    const workerpoolorder2nRlc =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        workerpoolprice: 2,
-        volume: 1000,
+        tag: ['gpu'],
       });
-    const requestorder6nRlc = await iexecRequester.order.signRequestorder(
-      {
-        ...requestorderTemplate,
-        workerpoolmaxprice: 2,
-        volume: 3,
-      },
-      { preflightCheck: false },
-    );
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporder0nRlc,
-          datasetorder: datasetorder0nRlc,
-          workerpoolorder: workerpoolorder2nRlc,
-          requestorder: requestorder6nRlc,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        "Total cost for 3 tasks (6) is greater than requester account stake (5). Orders can't be matched. If you are the requester, you should deposit to top up your account or reduce your requestorder volume",
-      ),
-    );
-    // workerpool owner stake check
-    const workerpoolorder7nRlc =
-      await iexecPoolManager.order.signWorkerpoolorder({
-        ...workerpoolorderTemplate,
-        workerpoolprice: 7,
-      });
-    await iexecRequester.account.deposit(10);
-    const poolManagerBalance = await iexecPoolManager.account.checkBalance(
-      await iexecPoolManager.wallet.getAddress(),
-    );
-    await iexecPoolManager.account
-      .withdraw(poolManagerBalance.stake)
-      .catch(() => {});
-
-    await iexecPoolManager.account.deposit(1);
-    await expect(
-      iexecBroker.order.matchOrders(
-        {
-          apporder: apporder3nRlc,
-          datasetorder: datasetorder2nRlc,
-          workerpoolorder: workerpoolorder7nRlc,
-          requestorder: requestorder300nRlc,
-        },
-        { preflightCheck: false },
-      ),
-    ).rejects.toThrow(
-      new Error(
-        "workerpool required stake (2) is greater than workerpool owner's account stake (1). Orders can't be matched. If you are the workerpool owner, you should deposit to top up your account",
-      ),
-    );
-    // standard case
-    const res = await iexecBroker.order.matchOrders(
-      {
-        apporder: apporderTemplate,
-        datasetorder: datasetorderTemplate,
-        workerpoolorder: workerpoolorderTemplate,
-        requestorder: requestorderTemplate,
-      },
-      { preflightCheck: false },
-    );
-    expect(res.txHash).toBeTxHash();
-    expect(res.volume).toBeInstanceOf(BN);
-    expect(res.volume.eq(new BN(1))).toBe(true);
-    expect(res.dealid).toBeTxHash();
-  });
-
-  test('preflightChecks', async () => {
-    const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-    const { iexec: iexecResourcesProvider } = getTestConfig(iexecTestChain)();
-
-    const apporder = await deployAndGetApporder(iexecResourcesProvider);
-    const datasetorder = await deployAndGetDatasetorder(iexecResourcesProvider);
-    const workerpoolorder = await deployAndGetWorkerpoolorder(
-      iexecResourcesProvider,
-    );
-    const requestorder = await getMatchableRequestorder(iexecRequester, {
-      apporder,
-      datasetorder,
-      workerpoolorder,
-    });
-
-    const teeApporder = await deployAndGetApporder(iexecResourcesProvider, {
-      teeFramework: TEE_FRAMEWORKS.SCONE,
-      tag: ['tee', 'scone'],
-    });
-    const teeDatasetorder = await deployAndGetDatasetorder(
-      iexecResourcesProvider,
-      { tag: ['tee'] },
-    );
-    const teeWorkerpoolorder = await deployAndGetWorkerpoolorder(
-      iexecResourcesProvider,
-      {
-        tag: ['tee', 'scone'],
-      },
-    );
-    const res = await iexecRequester.order.matchOrders({
-      apporder,
-      datasetorder,
-      workerpoolorder,
-      requestorder,
-    });
-    expect(res.txHash).toBeTxHash();
-    expect(res.volume).toBeInstanceOf(BN);
-    expect(res.volume.eq(new BN(1))).toBe(true);
-    expect(res.dealid).toBeTxHash();
-
-    // trigger app check
-    await expect(
-      iexecRequester.order.matchOrders({
-        apporder,
-        datasetorder,
-        workerpoolorder: teeWorkerpoolorder,
-        requestorder: await getMatchableRequestorder(iexecRequester, {
-          apporder,
-          datasetorder,
-          workerpoolorder: teeWorkerpoolorder,
-        }).then((o) =>
-          iexecRequester.order.signRequestorder(
-            { ...o, tag: ['tee', 'scone'] },
-            { preflightCheck: false },
-          ),
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTagGpu,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTagTee,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
         ),
-      }),
-    ).rejects.toThrow(Error('Tag mismatch the TEE framework specified by app'));
-
-    // trigger dataset check
-    await expect(
-      iexecRequester.order.matchOrders({
-        apporder: teeApporder,
-        datasetorder: teeDatasetorder,
-        workerpoolorder: teeWorkerpoolorder,
-        requestorder: await getMatchableRequestorder(iexecRequester, {
-          apporder: teeApporder,
-          datasetorder: teeDatasetorder,
-          workerpoolorder: teeWorkerpoolorder,
-        }),
-      }),
-    ).rejects.toThrow('Dataset encryption key is not set for dataset ');
-  });
-
-  test('datasetorder tee framework burned tags are ignored', async () => {
-    const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-    const { iexec: iexecResourcesProvider } = getTestConfig(iexecTestChain)();
-
-    const apporder = await deployAndGetApporder(iexecResourcesProvider, {
-      teeFramework: TEE_FRAMEWORKS.SCONE,
-      tag: ['tee', 'scone'],
-    });
-    const datasetorder = await deployAndGetDatasetorder(
-      iexecResourcesProvider,
-      {
-        tag: ['tee', 'gramine'],
-      },
-    );
-    await iexecResourcesProvider.dataset.pushDatasetSecret(
-      datasetorder.dataset,
-      'foo',
-    );
-    const workerpoolorder = await deployAndGetWorkerpoolorder(
-      iexecResourcesProvider,
-      {
-        tag: ['tee', 'scone'],
-      },
-    );
-    const requestorder = await getMatchableRequestorder(iexecRequester, {
-      apporder,
-      datasetorder,
-      workerpoolorder,
-    });
-    // on bellecour burned tags are not implemented, so the match reverts on-chain but passes preflight checks
-    await expect(
-      iexecRequester.order.matchOrders({
-        apporder,
-        datasetorder,
-        workerpoolorder,
-        requestorder,
-      }),
-    ).rejects.toThrow('execution reverted: revert: iExecV5-matchOrders-0x06');
-  });
-
-  test('TDX tag with app without mrenclave passes checkAppRequirements (preflight)', async () => {
-    const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-    const { iexec: iexecResourcesProvider } = getTestConfig(iexecTestChain)();
-
-    const apporder = await deployAndGetApporder(iexecResourcesProvider, {
-      teeFramework: undefined,
-      tag: ['tee', 'tdx'],
-    });
-    const datasetorder = await deployAndGetDatasetorder(
-      iexecResourcesProvider,
-      {},
-    );
-    await iexecResourcesProvider.dataset.pushDatasetSecret(
-      datasetorder.dataset,
-      'foo',
-      { teeFramework: TEE_FRAMEWORKS.TDX },
-    );
-    const workerpoolorder = await deployAndGetWorkerpoolorder(
-      iexecResourcesProvider,
-      { tag: ['tee', 'tdx'] },
-    );
-    const requestorder = await getMatchableRequestorder(iexecRequester, {
-      apporder,
-      datasetorder,
-      workerpoolorder,
-    });
-    await iexecRequester.order
-      .matchOrders(
+      ).rejects.toThrow(Error('Missing tags [gpu] in workerpoolorder'));
+      const datasetorderTagTeeGpu =
+        await iexecDatasetProvider.order.signDatasetorder(
+          {
+            ...datasetorderTemplate,
+            tag: ['gpu'],
+          },
+          { preflightCheck: false },
+        );
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTagTeeGpu,
+            workerpoolorder: workerpoolorderTagTee,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('Missing tags [gpu] in workerpoolorder'));
+      // app tag check
+      const requestorderTagTee = await iexecRequester.order.signRequestorder(
         {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-          requestorder,
+          ...requestorderTemplate,
+          tag: ['tee', 'tdx'],
         },
-        { preflightCheck: true },
-      )
-      .then((res) => {
-        expect(res.txHash).toBeTxHash();
-        expect(res.volume).toBeInstanceOf(BN);
-        expect(res.volume.eq(new BN(1))).toBe(true);
-        expect(res.dealid).toBeTxHash();
-      });
-  });
-
-  describe('useVoucher option', () => {
-    let iexecProvider;
-    let apporderTemplate;
-    let datasetorderTemplate;
-    let workerpoolorderTemplate;
-    let voucherTypeId;
-
-    beforeAll(async () => {
-      const providerConfig = getTestConfig(iexecTestChain)();
-      iexecProvider = providerConfig.iexec;
-      apporderTemplate = await deployAndGetApporder(iexecProvider, {
-        volume: 10,
-        appprice: 5,
-      });
-      datasetorderTemplate = await deployAndGetDatasetorder(iexecProvider, {
-        volume: 7,
-        datasetprice: 1,
-      });
-      workerpoolorderTemplate = await deployAndGetWorkerpoolorder(
-        iexecProvider,
-        { volume: 5, workerpoolprice: 1 },
+        { preflightCheck: false },
       );
-
-      voucherTypeId = await createVoucherType(iexecTestChain)({
-        description: 'test voucher type',
-        duration: 60 * 60,
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTagTee,
+            requestorder: requestorderTagTee,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('Missing tag [tee] in apporder'));
+      // price check
+      const apporderTooExpensive = await iexecAppProvider.order.signApporder({
+        ...apporderTemplate,
+        appprice: 1,
       });
-
-      await addVoucherEligibleAsset(iexecTestChain)(
-        apporderTemplate.app,
-        voucherTypeId,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        datasetorderTemplate.dataset,
-        voucherTypeId,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        workerpoolorderTemplate.workerpool,
-        voucherTypeId,
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTooExpensive,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `appmaxprice too low (expected ${apporderTooExpensive.appprice}, got ${requestorderTemplate.appmaxprice})`,
+        ),
       );
-    });
-
-    test('should throw error if no voucher available for the requester', async () => {
-      const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
 
-      const apporder = await iexecProvider.order.signApporder(apporderTemplate);
-      const datasetorder =
-        await iexecProvider.order.signDatasetorder(datasetorderTemplate);
-      const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-        workerpoolorderTemplate,
+      const datasetorderTooExpensive =
+        await iexecDatasetProvider.order.signDatasetorder(
+          {
+            ...datasetorderTemplate,
+            datasetprice: 1,
+          },
+          { preflightCheck: false },
+        );
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTooExpensive,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `datasetmaxprice too low (expected ${datasetorderTooExpensive.datasetprice}, got ${requestorderTemplate.datasetmaxprice})`,
+        ),
       );
-      const requestorder = await getMatchableRequestorder(iexecRequester, {
-        apporder,
-        datasetorder,
-        workerpoolorder,
-      });
 
+      const workerpoolorderTooExpensive =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          workerpoolprice: 1,
+        });
       await expect(
-        iexecRequester.order.matchOrders(
+        iexecBroker.order.matchOrders(
           {
-            apporder,
-            datasetorder,
-            workerpoolorder,
-            requestorder,
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTooExpensive,
+            requestorder: requestorderTemplate,
           },
-          { useVoucher: true },
+          { preflightCheck: false },
         ),
       ).rejects.toThrow(
         new Error(
-          `No voucher available for the requester ${requesterWallet.address}`,
+          `workerpoolmaxprice too low (expected ${workerpoolorderTooExpensive.workerpoolprice}, got ${requestorderTemplate.workerpoolmaxprice})`,
         ),
       );
-    });
+      // volumes checks
+      const apporderCanceled = await iexecAppProvider.order
+        .signApporder(apporderTemplate, { preflightCheck: false })
+        .then(async (order) => {
+          await iexecAppProvider.order.cancelApporder(order);
+          return order;
+        });
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderCanceled,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('apporder is fully consumed'));
 
-    test('requires voucherHubAddress to be configured when useVoucher is true', async () => {
-      const noVoucherTestChain = TEST_CHAINS['custom-token-chain'];
-      const options = {
-        resultProxyURL: 'https://result-proxy.iex.ec',
-        smsURL: 'https://sms.iex.ec',
-      };
-      const { iexec: iexecRequester, wallet: requesterWallet } = getTestConfig(
-        noVoucherTestChain,
-      )({
-        options,
-      });
-      const { iexec: iexecResourceProvider, wallet: resourceProviderWallet } =
-        getTestConfig(noVoucherTestChain)({
-          options,
+      const datasetorderCanceled = await iexecDatasetProvider.order
+        .signDatasetorder(datasetorderTemplate, { preflightCheck: false })
+        .then(async (order) => {
+          await iexecDatasetProvider.order.cancelDatasetorder(order);
+          return order;
+        });
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderCanceled,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('datasetorder is fully consumed'));
+
+      const workerpoolorderCanceled = await iexecPoolManager.order
+        .signWorkerpoolorder(workerpoolorderTemplate)
+        .then(async (order) => {
+          await iexecPoolManager.order.cancelWorkerpoolorder(order);
+          return order;
+        });
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderCanceled,
+            requestorder: requestorderTemplate,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('workerpoolorder is fully consumed'));
+      const requestorderCanceled = await iexecRequester.order
+        .signRequestorder(requestorderTemplate, { preflightCheck: false })
+        .then(async (order) => {
+          await iexecRequester.order.cancelRequestorder(order);
+          return order;
         });
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporderTemplate,
+            datasetorder: datasetorderTemplate,
+            workerpoolorder: workerpoolorderTemplate,
+            requestorder: requestorderCanceled,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(Error('requestorder is fully consumed'));
 
-      await setBalance(noVoucherTestChain)(requesterWallet.address, ONE_ETH);
-      await setBalance(noVoucherTestChain)(
-        resourceProviderWallet.address,
-        ONE_ETH,
+      // requester account stake check
+      const balance = await iexecRequester.account.checkBalance(
+        await iexecRequester.wallet.getAddress(),
       );
+      await iexecRequester.account.withdraw(balance.stake).catch(() => {});
+      await iexecRequester.account.deposit(5);
 
-      const apporder = await deployAndGetApporder(iexecResourceProvider, {
-        volume: 10,
-        appprice: 5,
-      });
-      const datasetorder = await deployAndGetDatasetorder(
-        iexecResourceProvider,
+      const apporder3nRlc = await iexecAppProvider.order.signApporder(
         {
-          volume: 7,
-          datasetprice: 1,
+          ...apporderTemplate,
+          appprice: 3,
         },
+        { preflightCheck: false },
       );
-      const workerpoolorder = await deployAndGetWorkerpoolorder(
-        iexecResourceProvider,
-        { volume: 5, workerpoolprice: 1 },
+      const datasetorder2nRlc =
+        await iexecDatasetProvider.order.signDatasetorder(
+          {
+            ...datasetorderTemplate,
+            datasetprice: 2,
+          },
+          { preflightCheck: false },
+        );
+      const workerpoolorder1nRlc =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          workerpoolprice: 1,
+        });
+      const requestorder300nRlc = await iexecRequester.order.signRequestorder(
+        {
+          ...requestorderTemplate,
+          appmaxprice: 100,
+          datasetmaxprice: 100,
+          workerpoolmaxprice: 100,
+        },
+        { preflightCheck: false },
       );
-      const requestorder = await getMatchableRequestorder(iexecRequester, {
-        apporder,
-        datasetorder,
-        workerpoolorder,
-      });
-
-      await setNRlcBalance(noVoucherTestChain)(requesterWallet.address, 100);
-      await iexecRequester.account.deposit(100);
       await expect(
-        iexecRequester.order.matchOrders(
+        iexecBroker.order.matchOrders(
           {
-            apporder,
-            datasetorder,
-            workerpoolorder,
-            requestorder,
+            apporder: apporder3nRlc,
+            datasetorder: datasetorder2nRlc,
+            workerpoolorder: workerpoolorder1nRlc,
+            requestorder: requestorder300nRlc,
           },
-          { useVoucher: true },
+          { preflightCheck: false },
         ),
       ).rejects.toThrow(
-        new ConfigurationError(
-          `voucherHubAddress option not set and no default value for your chain ${noVoucherTestChain.chainId}`,
+        new Error(
+          "Cost per task (6) is greater than requester account stake (5). Orders can't be matched. If you are the requester, you should deposit to top up your account",
         ),
       );
-      // match orders without useVoucher should pass
-      const res = await iexecRequester.order.matchOrders(
+
+      const apporder0nRlc = await iexecAppProvider.order.signApporder(
         {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-          requestorder,
+          ...apporderTemplate,
+          appprice: 0,
+          volume: 1000,
         },
-        { useVoucher: false },
+        { preflightCheck: false },
       );
-      expect(res.txHash).toBeTxHash();
-      expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume.eq(new BN(5))).toBe(true);
-      expect(res.dealid).toBeTxHash();
-    });
-
-    test('should throw error for insufficient voucher allowance', async () => {
-      const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
-      const apporder = await iexecProvider.order.signApporder(apporderTemplate);
-      const datasetorder =
-        await iexecProvider.order.signDatasetorder(datasetorderTemplate);
-      const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-        workerpoolorderTemplate,
+      const datasetorder0nRlc =
+        await iexecDatasetProvider.order.signDatasetorder(
+          {
+            ...datasetorderTemplate,
+            datasetprice: 0,
+            volume: 1000,
+          },
+          { preflightCheck: false },
+        );
+      const workerpoolorder2nRlc =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          workerpoolprice: 2,
+          volume: 1000,
+        });
+      const requestorder6nRlc = await iexecRequester.order.signRequestorder(
+        {
+          ...requestorderTemplate,
+          workerpoolmaxprice: 2,
+          volume: 3,
+        },
+        { preflightCheck: false },
       );
-      const requestorder = await getMatchableRequestorder(iexecRequester, {
-        apporder,
-        datasetorder,
-        workerpoolorder,
-      });
-      const voucherAddress = await createVoucher(iexecTestChain)({
-        owner: await requesterWallet.getAddress(),
-        voucherType: voucherTypeId,
-        value: 10,
-      });
-      const allowance = await iexecRequester.account.checkAllowance(
-        requestorder.requester,
-        voucherAddress,
+      await expect(
+        iexecBroker.order.matchOrders(
+          {
+            apporder: apporder0nRlc,
+            datasetorder: datasetorder0nRlc,
+            workerpoolorder: workerpoolorder2nRlc,
+            requestorder: requestorder6nRlc,
+          },
+          { preflightCheck: false },
+        ),
+      ).rejects.toThrow(
+        new Error(
+          "Total cost for 3 tasks (6) is greater than requester account stake (5). Orders can't be matched. If you are the requester, you should deposit to top up your account or reduce your requestorder volume",
+        ),
       );
-      const { total, sponsored } =
-        await iexecRequester.order.estimateMatchOrders(
-          { apporder, datasetorder, workerpoolorder, requestorder },
-          { useVoucher: true },
-        );
-
-      const requiredAmount = total.sub(sponsored);
-      const missingAmount = requiredAmount.sub(allowance);
+      // workerpool owner stake check
+      const workerpoolorder7nRlc =
+        await iexecPoolManager.order.signWorkerpoolorder({
+          ...workerpoolorderTemplate,
+          workerpoolprice: 7,
+        });
+      await iexecRequester.account.deposit(10);
+      const poolManagerBalance = await iexecPoolManager.account.checkBalance(
+        await iexecPoolManager.wallet.getAddress(),
+      );
+      await iexecPoolManager.account
+        .withdraw(poolManagerBalance.stake)
+        .catch(() => {});
 
+      await iexecPoolManager.account.deposit(1);
       await expect(
-        iexecRequester.order.matchOrders(
+        iexecBroker.order.matchOrders(
           {
-            apporder,
-            datasetorder,
-            workerpoolorder,
-            requestorder,
+            apporder: apporder3nRlc,
+            datasetorder: datasetorder2nRlc,
+            workerpoolorder: workerpoolorder7nRlc,
+            requestorder: requestorder300nRlc,
           },
-          { useVoucher: true },
+          { preflightCheck: false },
         ),
       ).rejects.toThrow(
         new Error(
-          `Orders can't be matched. Please approve an additional ${missingAmount} for voucher usage.`,
+          "workerpool required stake (2) is greater than workerpool owner's account stake (1). Orders can't be matched. If you are the workerpool owner, you should deposit to top up your account",
         ),
       );
+      // standard case
+      const res = await iexecBroker.order.matchOrders(
+        {
+          apporder: apporderTemplate,
+          datasetorder: datasetorderTemplate,
+          workerpoolorder: workerpoolorderTemplate,
+          requestorder: requestorderTemplate,
+        },
+        { preflightCheck: false },
+      );
+      expect(res.txHash).toBeTxHash();
+      expect(res.volume).toBeInstanceOf(BN);
+      expect(res.volume.eq(new BN(1))).toBe(true);
+      expect(res.dealid).toBeTxHash();
     });
 
-    test('should match orders with voucher when user deposits to cover the missing amount', async () => {
-      const { iexec: iexecRequester, wallet: requesterWallet } =
-        getTestConfig(iexecTestChain)();
+    test('preflightChecks', async () => {
+      const { iexec: iexecRequester } = await getTestConfig(testChain)();
+      const { iexec: iexecResourcesProvider } =
+        await getTestConfig(testChain)();
 
-      const apporder = await iexecProvider.order.signApporder(apporderTemplate);
-      const datasetorder =
-        await iexecProvider.order.signDatasetorder(datasetorderTemplate);
-      const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-        workerpoolorderTemplate,
+      const apporder = await deployAndGetApporder(iexecResourcesProvider);
+      const datasetorder = await deployAndGetDatasetorder(
+        iexecResourcesProvider,
+      );
+      const workerpoolorder = await deployAndGetWorkerpoolorder(
+        iexecResourcesProvider,
       );
       const requestorder = await getMatchableRequestorder(iexecRequester, {
         apporder,
@@ -2861,198 +2071,127 @@ describe('matchOrders()', () => {
         workerpoolorder,
       });
 
-      const voucherAddress = await createVoucher(iexecTestChain)({
-        owner: await requesterWallet.getAddress(),
-        voucherType: voucherTypeId,
-        value: 10,
+      const teeApporder = await deployAndGetApporder(iexecResourcesProvider, {
+        tag: ['tee', 'tdx'],
       });
-      await setNRlcBalance(iexecTestChain)(requesterWallet.address, 30);
-      await iexecRequester.account.deposit(30);
-      await iexecRequester.account.approve(25, voucherAddress);
-      const res = await iexecRequester.order.matchOrders(
+      const teeDatasetorder = await deployAndGetDatasetorder(
+        iexecResourcesProvider,
+        { tag: ['tee'] },
+      );
+      const teeWorkerpoolorder = await deployAndGetWorkerpoolorder(
+        iexecResourcesProvider,
         {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-          requestorder,
+          tag: ['tee', 'tdx'],
         },
-        { useVoucher: true },
       );
+      const res = await iexecRequester.order.matchOrders({
+        apporder,
+        datasetorder,
+        workerpoolorder,
+        requestorder,
+      });
       expect(res.txHash).toBeTxHash();
       expect(res.volume).toBeInstanceOf(BN);
-      expect(res.volume.eq(new BN(5))).toBe(true);
+      expect(res.volume.eq(new BN(1))).toBe(true);
       expect(res.dealid).toBeTxHash();
-      const tx = await iexecTestChain.provider.getTransaction(res.txHash);
-      expect(tx.to).toBe(voucherAddress);
-    });
-
-    describe('with custom voucherAddress option', () => {
-      test('should use specified voucherAddress', async () => {
-        const { iexec: iexecRequester, wallet: requesterWallet } =
-          getTestConfig(iexecTestChain)();
-
-        const { iexec: iexecVoucherOwner, wallet: voucherOwnerWallet } =
-          getTestConfig(iexecTestChain)();
 
-        const apporder =
-          await iexecProvider.order.signApporder(apporderTemplate);
-        const datasetorder =
-          await iexecProvider.order.signDatasetorder(datasetorderTemplate);
-        const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-          workerpoolorderTemplate,
-        );
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-        });
+      // trigger dataset check
+      await expect(
+        iexecRequester.order.matchOrders({
+          apporder: teeApporder,
+          datasetorder: teeDatasetorder,
+          workerpoolorder: teeWorkerpoolorder,
+          requestorder: await getMatchableRequestorder(iexecRequester, {
+            apporder: teeApporder,
+            datasetorder: teeDatasetorder,
+            workerpoolorder: teeWorkerpoolorder,
+          }),
+        }),
+      ).rejects.toThrow('Dataset encryption key is not set for dataset ');
+    });
 
-        const voucherAddress = await createVoucher(iexecTestChain)({
-          owner: await voucherOwnerWallet.getAddress(),
-          voucherType: voucherTypeId,
-          value: 1000000000,
-        });
-        await iexecVoucherOwner.voucher.authorizeRequester(
-          requesterWallet.address,
-        );
+    test('datasetorder tee framework burned tags are ignored', async () => {
+      const { iexec: iexecRequester } = await getTestConfig(testChain)();
+      const { iexec: iexecResourcesProvider } =
+        await getTestConfig(testChain)();
 
-        const res = await iexecRequester.order.matchOrders(
-          {
-            apporder,
-            datasetorder,
-            workerpoolorder,
-            requestorder,
-          },
-          { useVoucher: true, voucherAddress },
-        );
-        expect(res.txHash).toBeTxHash();
-        expect(res.volume).toBeInstanceOf(BN);
-        expect(res.volume.eq(new BN(5))).toBe(true);
-        expect(res.dealid).toBeTxHash();
-        const tx = await iexecTestChain.provider.getTransaction(res.txHash);
-        expect(tx.to).toBe(voucherAddress);
+      const apporder = await deployAndGetApporder(iexecResourcesProvider, {
+        tag: ['tee', 'tdx'],
       });
+      const datasetorder = await deployAndGetDatasetorder(
+        iexecResourcesProvider,
+        {
+          tag: ['tee', 'gramine'],
+        },
+      );
+      await iexecResourcesProvider.dataset.pushDatasetSecret(
+        datasetorder.dataset,
+        'foo',
+      );
+      const workerpoolorder = await deployAndGetWorkerpoolorder(
+        iexecResourcesProvider,
+        {
+          tag: ['tee', 'tdx'],
+        },
+      );
+      const requestorder = await getMatchableRequestorder(iexecRequester, {
+        apporder,
+        datasetorder,
+        workerpoolorder,
+      });
+      const { dealid } = await iexecRequester.order.matchOrders({
+        apporder,
+        datasetorder,
+        workerpoolorder,
+        requestorder,
+      });
+      const deal = await iexecRequester.deal.show(dealid);
+      expect(deal.tag).toEqual(encodeTag(['tee', 'tdx']));
+    });
 
-      test('requester can pay for non-sponsored assets', async () => {
-        const { iexec: iexecRequester, wallet: requesterWallet } =
-          getTestConfig(iexecTestChain)();
-        await setNRlcBalance(iexecTestChain)(requesterWallet.address, 1000);
-        await iexecRequester.account.deposit(1000);
-
-        const { iexec: iexecVoucherOwner, wallet: voucherOwnerWallet } =
-          getTestConfig(iexecTestChain)();
-
-        const { iexec: iexecDatasetProvider } = getTestConfig(iexecTestChain)();
-
-        const apporder =
-          await iexecProvider.order.signApporder(apporderTemplate);
-        const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-          workerpoolorderTemplate,
-        );
-        // non-sponsored asset
-        const datasetorder = await deployAndGetDatasetorder(
-          iexecDatasetProvider,
-          { datasetprice: 200 },
-        );
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-        });
+    test('TDX tag with app without mrenclave passes checkAppRequirements (preflight)', async () => {
+      const { iexec: iexecRequester } = await getTestConfig(testChain)();
+      const { iexec: iexecResourcesProvider } =
+        await getTestConfig(testChain)();
 
-        const voucherAddress = await createVoucher(iexecTestChain)({
-          owner: await voucherOwnerWallet.getAddress(),
-          voucherType: voucherTypeId,
-          value: 1000000000,
-        });
-        await iexecVoucherOwner.voucher.authorizeRequester(
-          requesterWallet.address,
-        );
-        await iexecRequester.account.approve(500, voucherAddress);
-        const res = await iexecRequester.order.matchOrders(
+      const apporder = await deployAndGetApporder(iexecResourcesProvider, {
+        teeFramework: undefined,
+        tag: ['tee', 'tdx'],
+      });
+      const datasetorder = await deployAndGetDatasetorder(
+        iexecResourcesProvider,
+        {},
+      );
+      await iexecResourcesProvider.dataset.pushDatasetSecret(
+        datasetorder.dataset,
+        'foo',
+        { teeFramework: TEE_FRAMEWORKS.TDX },
+      );
+      const workerpoolorder = await deployAndGetWorkerpoolorder(
+        iexecResourcesProvider,
+        { tag: ['tee', 'tdx'] },
+      );
+      const requestorder = await getMatchableRequestorder(iexecRequester, {
+        apporder,
+        datasetorder,
+        workerpoolorder,
+      });
+      await iexecRequester.order
+        .matchOrders(
           {
             apporder,
             datasetorder,
             workerpoolorder,
             requestorder,
           },
-          { useVoucher: true, voucherAddress },
-        );
-        expect(res.txHash).toBeTxHash();
-        expect(res.dealid).toBeTxHash();
-        const tx = await iexecTestChain.provider.getTransaction(res.txHash);
-        expect(tx.to).toBe(voucherAddress);
-        const finalAccountBalance = await iexecRequester.account.checkBalance(
-          requesterWallet.address,
-        );
-        expect(finalAccountBalance.stake.eq(new BN(800))).toBe(true);
-      });
-
-      test('should throw if specified voucherAddress is not a voucher', async () => {
-        const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-
-        const apporder =
-          await iexecProvider.order.signApporder(apporderTemplate);
-        const datasetorder =
-          await iexecProvider.order.signDatasetorder(datasetorderTemplate);
-        const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-          workerpoolorderTemplate,
-        );
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder,
-          datasetorder,
-          workerpoolorder,
+          { preflightCheck: true },
+        )
+        .then((res) => {
+          expect(res.txHash).toBeTxHash();
+          expect(res.volume).toBeInstanceOf(BN);
+          expect(res.volume.eq(new BN(1))).toBe(true);
+          expect(res.dealid).toBeTxHash();
         });
-
-        await expect(
-          iexecRequester.order.matchOrders(
-            {
-              apporder,
-              datasetorder,
-              workerpoolorder,
-              requestorder,
-            },
-            { useVoucher: true, voucherAddress: getRandomAddress() },
-          ),
-        ).rejects.toThrow(Error('Invalid voucher contract address'));
-      });
-
-      test('should throw if user is not allowed to use specified voucherAddress', async () => {
-        const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-
-        const { wallet: voucherOwnerWallet } = getTestConfig(iexecTestChain)();
-
-        const apporder =
-          await iexecProvider.order.signApporder(apporderTemplate);
-        const datasetorder =
-          await iexecProvider.order.signDatasetorder(datasetorderTemplate);
-        const workerpoolorder = await iexecProvider.order.signWorkerpoolorder(
-          workerpoolorderTemplate,
-        );
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          apporder,
-          datasetorder,
-          workerpoolorder,
-        });
-
-        const voucherAddress = await createVoucher(iexecTestChain)({
-          owner: await voucherOwnerWallet.getAddress(),
-          voucherType: voucherTypeId,
-          value: 100000000,
-        });
-
-        await expect(
-          iexecRequester.order.matchOrders(
-            {
-              apporder,
-              datasetorder,
-              workerpoolorder,
-              requestorder,
-            },
-            { useVoucher: true, voucherAddress },
-          ),
-        ).rejects.toThrow(Error('User is not authorized to use the voucher'));
-      });
     });
   });
 });
diff --git a/test/lib/e2e/IExecOrderbookModule.test.js b/test/lib/e2e/IExecOrderbookModule.test.js
index dddad8cd..091a4c2e 100644
--- a/test/lib/e2e/IExecOrderbookModule.test.js
+++ b/test/lib/e2e/IExecOrderbookModule.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import {
   deployAndGetApporder,
@@ -23,12 +21,12 @@ import '../../jest-setup.js';
 
 const { MarketCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('orderbook', () => {
   describe('fetch...Order()', () => {
     test("throw a MarketCallError when the Market API can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_UNREACHABLE_URL,
@@ -44,7 +42,7 @@ describe('orderbook', () => {
     });
 
     test('throw a MarketCallError when the Market API encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_HTTP_500_URL,
@@ -61,8 +59,8 @@ describe('orderbook', () => {
 
     describe('fetchApporder()', () => {
       test('anyone can get a published order by hash', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const apporder = await deployAndGetApporder(iexec);
@@ -81,8 +79,8 @@ describe('orderbook', () => {
 
     describe('fetchDatasetorder()', () => {
       test('anyone can get a published order by hash', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const datasetorder = await deployAndGetDatasetorder(iexec);
@@ -104,8 +102,8 @@ describe('orderbook', () => {
 
     describe('fetchWorkerpoolorder()', () => {
       test('anyone can get a published order by hash', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
@@ -126,8 +124,8 @@ describe('orderbook', () => {
 
     describe('fetchRequestorder()', () => {
       test('anyone can get a published order by hash', async () => {
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const apporder = await deployAndGetApporder(iexec);
@@ -167,7 +165,7 @@ describe('orderbook', () => {
 
   describe('fetch...Orderbook()', () => {
     test("throw a MarketCallError when the Market API can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_UNREACHABLE_URL,
@@ -183,7 +181,7 @@ describe('orderbook', () => {
     });
 
     test('throw a MarketCallError when the Market API encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           iexecGatewayURL: SERVICE_HTTP_500_URL,
@@ -199,8 +197,8 @@ describe('orderbook', () => {
     });
     describe('fetchAppOrderbook()', () => {
       test('returns orders available fo anyone', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const appAddress = getRandomAddress();
@@ -280,18 +278,12 @@ describe('orderbook', () => {
           workerpool: 'any',
         });
         expect(res7.count >= 32).toBe(true);
-
-        // backward compatibility: deprecated appAddress parameter
-        const res1deprecated = await iexecReadOnly.orderbook.fetchAppOrderbook(
-          apporder.app,
-        );
-        expect(res1.orders).toLooseEqual(res1deprecated.orders);
       });
 
       test('appOwner returns orders from app owner', async () => {
-        const { iexec: iexecUser, wallet } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecOtherUser } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec: iexecUser, wallet } = await getTestConfig(testChain)();
+        const { iexec: iexecOtherUser } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         // publish orders from two different users
@@ -322,8 +314,8 @@ describe('orderbook', () => {
       });
 
       test('strict option allow filtering only orders for specified dataset, workerpool or requester', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
 
@@ -500,8 +492,8 @@ describe('orderbook', () => {
 
     describe('fetchDatasetOrderbook()', () => {
       test('returns orders available fo anyone', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const datasetAddress = getRandomAddress();
@@ -591,19 +583,12 @@ describe('orderbook', () => {
           workerpool: 'any',
         });
         expect(res7.count >= 33).toBe(true);
-
-        // backward compatibility: deprecated datasetAddress parameter
-        const res1deprecated =
-          await iexecReadOnly.orderbook.fetchDatasetOrderbook(
-            datasetorder.dataset,
-          );
-        expect(res1.orders).toLooseEqual(res1deprecated.orders);
       });
 
       test('datasetOwner returns orders from dataset owner', async () => {
-        const { iexec: iexecUser, wallet } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecOtherUser } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec: iexecUser, wallet } = await getTestConfig(testChain)();
+        const { iexec: iexecOtherUser } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         // publish orders from two different users
@@ -634,8 +619,8 @@ describe('orderbook', () => {
       });
 
       test('strict option allow filtering only orders for specified app, workerpool or requester', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         // 1 and 2: orders without any restrictions
@@ -819,8 +804,8 @@ describe('orderbook', () => {
       });
 
       test('bulkOnly option allow filtering only orders allowing dataset bulk processing', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         // 1 and 2: orders without any restrictions
@@ -868,8 +853,8 @@ describe('orderbook', () => {
 
     describe('fetchWorkerpoolOrderbook()', () => {
       test('returns orders available fo anyone', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const workerpoolorder = await deployAndGetWorkerpoolorder(iexec);
@@ -955,8 +940,8 @@ describe('orderbook', () => {
       });
 
       test('strict option allow filtering only orders for specified app, dataset or requester', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         // 1 and 2: orders without any restrictions
@@ -1132,8 +1117,8 @@ describe('orderbook', () => {
 
     describe('fetchRequestOrderbook()', () => {
       test('returns orders available fo anyone', async () => {
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const apporder = await deployAndGetApporder(iexec);
@@ -1200,8 +1185,8 @@ describe('orderbook', () => {
       });
 
       test('strict option allow filtering only orders for specified workerpool', async () => {
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+        const { iexec, wallet } = await getTestConfig(testChain)();
+        const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
           readOnly: true,
         });
         const requesterAddress = wallet.address;
diff --git a/test/lib/e2e/IExecResultModule.test.js b/test/lib/e2e/IExecResultModule.test.js
index d5ef2bc4..fc3573f8 100644
--- a/test/lib/e2e/IExecResultModule.test.js
+++ b/test/lib/e2e/IExecResultModule.test.js
@@ -1,16 +1,14 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { getTestConfig } from '../lib-test-utils.js';
-import { TEST_CHAINS, TEE_FRAMEWORKS } from '../../test-utils.js';
+import { TEST_CHAINS } from '../../test-utils.js';
 import '../../jest-setup.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('result', () => {
   describe('pushResultEncryptionKey()', () => {
     test('pushes the result encryption key', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const pushRes = await iexec.result.pushResultEncryptionKey('oops');
       expect(pushRes.isPushed).toBe(true);
       expect(pushRes.isUpdated).toBe(false);
@@ -21,25 +19,10 @@ describe('result', () => {
           `Secret "iexec-result-encryption-public-key" already exists for ${wallet.address}`,
         ),
       );
-      await expect(
-        iexec.result.pushResultEncryptionKey('oops', {
-          teeFramework: TEE_FRAMEWORKS.SCONE,
-        }),
-      ).rejects.toThrow(
-        new Error(
-          `Secret "iexec-result-encryption-public-key" already exists for ${wallet.address}`,
-        ),
-      );
-      const pushForTeeFrameworkRes = await iexec.result.pushResultEncryptionKey(
-        'oops',
-        { teeFramework: TEE_FRAMEWORKS.GRAMINE },
-      );
-      expect(pushForTeeFrameworkRes.isPushed).toBe(true);
-      expect(pushForTeeFrameworkRes.isUpdated).toBe(false);
     });
 
     test('forceUpdate allows updating the key', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const pushRes = await iexec.result.pushResultEncryptionKey('Oops', {
         forceUpdate: true,
       });
@@ -55,8 +38,8 @@ describe('result', () => {
 
   describe('checkResultEncryptionKeyExists()', () => {
     test('anyone can check the key exists', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const withoutSecretRes =
@@ -68,22 +51,6 @@ describe('result', () => {
           wallet.address,
         );
       expect(withSecretRes).toBe(true);
-      const withSecretForTeeFrameworkRes =
-        await iexecReadOnly.result.checkResultEncryptionKeyExists(
-          wallet.address,
-          {
-            teeFramework: TEE_FRAMEWORKS.SCONE,
-          },
-        );
-      expect(withSecretForTeeFrameworkRes).toBe(true);
-      const withoutSecretForTeeFrameworkRes =
-        await iexecReadOnly.result.checkResultEncryptionKeyExists(
-          wallet.address,
-          {
-            teeFramework: TEE_FRAMEWORKS.GRAMINE,
-          },
-        );
-      expect(withoutSecretForTeeFrameworkRes).toBe(false);
     });
   });
 });
diff --git a/test/lib/e2e/IExecSecretsModule.test.js b/test/lib/e2e/IExecSecretsModule.test.js
index 2ba268e0..9d3d6d3b 100644
--- a/test/lib/e2e/IExecSecretsModule.test.js
+++ b/test/lib/e2e/IExecSecretsModule.test.js
@@ -1,10 +1,7 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { expectAsyncCustomError, getTestConfig } from '../lib-test-utils.js';
 import {
   TEST_CHAINS,
-  TEE_FRAMEWORKS,
   SERVICE_UNREACHABLE_URL,
   SERVICE_HTTP_500_URL,
   getRandomAddress,
@@ -14,12 +11,12 @@ import { errors } from '../../../src/lib/index.js';
 
 const { SmsCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('secrets', () => {
   describe('pushRequesterSecret()', () => {
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
         },
@@ -34,7 +31,7 @@ describe('secrets', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_HTTP_500_URL,
         },
@@ -49,7 +46,7 @@ describe('secrets', () => {
     });
 
     test('pushes the secret', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const pushRes = await iexec.secrets.pushRequesterSecret('foo', 'oops');
       expect(pushRes.isPushed).toBe(true);
       await expect(
@@ -57,18 +54,12 @@ describe('secrets', () => {
       ).rejects.toThrow(
         new Error(`Secret "foo" already exists for ${wallet.address}`),
       );
-      const pushForTeeFrameworkRes = await iexec.secrets.pushRequesterSecret(
-        'foo',
-        'oops',
-        { teeFramework: TEE_FRAMEWORKS.GRAMINE },
-      );
-      expect(pushForTeeFrameworkRes.isPushed).toBe(true);
     });
   });
 
   describe('checkRequesterSecretExists()', () => {
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
         },
@@ -86,7 +77,7 @@ describe('secrets', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_HTTP_500_URL,
         },
@@ -104,8 +95,8 @@ describe('secrets', () => {
     });
 
     test('anyone can check a secret exists', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
       });
       await expect(
@@ -115,15 +106,6 @@ describe('secrets', () => {
       await expect(
         iexecReadOnly.secrets.checkRequesterSecretExists(wallet.address, 'foo'),
       ).resolves.toBe(true);
-      await expect(
-        iexecReadOnly.secrets.checkRequesterSecretExists(
-          wallet.address,
-          'foo',
-          {
-            teeFramework: TEE_FRAMEWORKS.GRAMINE,
-          },
-        ),
-      ).resolves.toBe(false);
     });
   });
 });
diff --git a/test/lib/e2e/IExecStorageModule.test.js b/test/lib/e2e/IExecStorageModule.test.js
index 6bcf805a..78fc92dc 100644
--- a/test/lib/e2e/IExecStorageModule.test.js
+++ b/test/lib/e2e/IExecStorageModule.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { expectAsyncCustomError, getTestConfig } from '../lib-test-utils.js';
 import {
@@ -11,130 +9,81 @@ import {
 import '../../jest-setup.js';
 import { errors } from '../../../src/lib/index.js';
 
-const { SmsCallError, ResultProxyCallError } = errors;
+const { SmsCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('storage', () => {
-  describe('defaultStorageLogin()', () => {
-    test("throw a ResultProxyCallError when the Result Proxy can't be reached", async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
-        options: {
-          resultProxyURL: SERVICE_UNREACHABLE_URL,
-        },
-      });
-      await expectAsyncCustomError(iexec.storage.defaultStorageLogin(), {
-        constructor: ResultProxyCallError,
-        message: `Result Proxy error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
-      });
-    });
-
-    test('throw a ResultProxyCallError when the Result Proxy encounters an error', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
-        options: {
-          resultProxyURL: SERVICE_HTTP_500_URL,
-        },
-      });
-      await expectAsyncCustomError(iexec.storage.defaultStorageLogin(), {
-        constructor: ResultProxyCallError,
-        message: `Result Proxy error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
-      });
-    });
-
-    test('gets a token from the result proxy', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const token = await iexec.storage.defaultStorageLogin();
-      expect(typeof token).toBe('string');
-      expect(token.split('.').length).toBe(3);
-      const token2 = await iexec.storage.defaultStorageLogin();
-      expect(token2).toBe(token);
-    });
-  });
-
   describe('pushStorageToken()', () => {
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
         },
       });
-      await expectAsyncCustomError(iexec.storage.pushStorageToken('oops'), {
-        constructor: SmsCallError,
-        message: `SMS error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
-      });
+      await expectAsyncCustomError(
+        iexec.storage.pushStorageToken('oops', 'dropbox'),
+        {
+          constructor: SmsCallError,
+          message: `SMS error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
+        },
+      );
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_HTTP_500_URL,
         },
       });
-      await expectAsyncCustomError(iexec.storage.pushStorageToken('oops'), {
-        constructor: SmsCallError,
-        message: `SMS error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
-      });
-    });
-
-    test('pushes the token on the SMS', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const pushRes = await iexec.storage.pushStorageToken('oops');
-      expect(pushRes.isPushed).toBe(true);
-      expect(pushRes.isUpdated).toBe(false);
-      await expect(iexec.storage.pushStorageToken('oops')).rejects.toThrow(
-        new Error(
-          `Secret "iexec-result-iexec-ipfs-token" already exists for ${wallet.address}`,
-        ),
+      await expectAsyncCustomError(
+        iexec.storage.pushStorageToken('oops', 'dropbox'),
+        {
+          constructor: SmsCallError,
+          message: `SMS error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
+        },
       );
-      const pushForTeeFramework = await iexec.storage.pushStorageToken('oops', {
-        teeFramework: 'gramine',
-      });
-      expect(pushForTeeFramework.isPushed).toBe(true);
-      expect(pushForTeeFramework.isUpdated).toBe(false);
     });
 
-    test('provider "default" pushes result proxy ipfs token', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const pushRes = await iexec.storage.pushStorageToken('oops', {
-        provider: 'default',
-      });
+    test('provider "dropbox" pushes dropbox token', async () => {
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      const pushRes = await iexec.storage.pushStorageToken('oops', 'dropbox');
       expect(pushRes.isPushed).toBe(true);
       expect(pushRes.isUpdated).toBe(false);
       await expect(
-        iexec.storage.pushStorageToken('oops', { provider: 'default' }),
+        iexec.storage.pushStorageToken('oops', 'dropbox'),
       ).rejects.toThrow(
         new Error(
-          `Secret "iexec-result-iexec-ipfs-token" already exists for ${wallet.address}`,
+          `Secret "iexec-result-dropbox-token" already exists for ${wallet.address}`,
         ),
       );
     });
 
-    test('provider "dropbox" pushes dropbox token', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const pushRes = await iexec.storage.pushStorageToken('oops', {
-        provider: 'dropbox',
-      });
-      expect(pushRes.isPushed).toBe(true);
-      expect(pushRes.isUpdated).toBe(false);
+    test('provider "ipfs" does not support token', async () => {
+      const { iexec } = await getTestConfig(testChain)();
       await expect(
-        iexec.storage.pushStorageToken('oops', { provider: 'dropbox' }),
+        iexec.storage.pushStorageToken('oops', 'ipfs'),
       ).rejects.toThrow(
         new Error(
-          `Secret "iexec-result-dropbox-token" already exists for ${wallet.address}`,
+          'Storage provider "ipfs" does not support authentication tokens',
         ),
       );
     });
 
     test('forceUpdate allows updating the token', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const pushRes = await iexec.storage.pushStorageToken('oops', {
+      const { iexec } = await getTestConfig(testChain)();
+      const pushRes = await iexec.storage.pushStorageToken('oops', 'dropbox', {
         forceUpdate: true,
       });
       expect(pushRes.isPushed).toBe(true);
       expect(pushRes.isUpdated).toBe(false);
-      const updateRes = await iexec.storage.pushStorageToken('oops', {
-        forceUpdate: true,
-      });
+      const updateRes = await iexec.storage.pushStorageToken(
+        'oops',
+        'dropbox',
+        {
+          forceUpdate: true,
+        },
+      );
       expect(updateRes.isPushed).toBe(true);
       expect(updateRes.isUpdated).toBe(true);
     });
@@ -142,13 +91,16 @@ describe('storage', () => {
 
   describe('checkStorageTokenExists()', () => {
     test("throw a SmsCallError when the SMS can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_UNREACHABLE_URL,
         },
       });
       await expectAsyncCustomError(
-        iexecReadOnly.storage.checkStorageTokenExists(getRandomAddress()),
+        iexecReadOnly.storage.checkStorageTokenExists(
+          getRandomAddress(),
+          'dropbox',
+        ),
         {
           constructor: SmsCallError,
           message: `SMS error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
@@ -157,13 +109,16 @@ describe('storage', () => {
     });
 
     test('throw a SmsCallError when the SMS encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         options: {
           smsURL: SERVICE_HTTP_500_URL,
         },
       });
       await expectAsyncCustomError(
-        iexecReadOnly.storage.checkStorageTokenExists(getRandomAddress()),
+        iexecReadOnly.storage.checkStorageTokenExists(
+          getRandomAddress(),
+          'dropbox',
+        ),
         {
           constructor: SmsCallError,
           message: `SMS error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
@@ -172,40 +127,38 @@ describe('storage', () => {
     });
 
     test('anyone can check a token exists', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec, wallet } = await getTestConfig(testChain)();
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const withoutSecretRes =
-        await iexecReadOnly.storage.checkStorageTokenExists(wallet.address, {
-          provider: 'dropbox',
-        });
+        await iexecReadOnly.storage.checkStorageTokenExists(
+          wallet.address,
+          'dropbox',
+        );
       expect(withoutSecretRes).toBe(false);
-      await iexec.storage.pushStorageToken('oops', { provider: 'dropbox' });
+      await iexec.storage.pushStorageToken('oops', 'dropbox');
       const withSecretRes = await iexecReadOnly.storage.checkStorageTokenExists(
         wallet.address,
-        { provider: 'dropbox' },
+        'dropbox',
       );
       expect(withSecretRes).toBe(true);
-      const unsetProviderRes =
-        await iexecReadOnly.storage.checkStorageTokenExists(wallet.address);
-      expect(unsetProviderRes).toBe(false);
+    });
+
+    test('provider "ipfs" does not support token', async () => {
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
+        readOnly: true,
+      });
       await expect(
-        iexecReadOnly.storage.checkStorageTokenExists(wallet.address, {
-          provider: 'test',
-        }),
-      ).rejects.toThrow(Error('"test" not supported'));
-      const unsetForTeeFramework =
-        await iexecReadOnly.storage.checkStorageTokenExists(wallet.address, {
-          teeFramework: 'gramine',
-        });
-      expect(unsetForTeeFramework).toBe(false);
-      await iexec.storage.pushStorageToken('oops', { teeFramework: 'gramine' });
-      const setForTeeFramework =
-        await iexecReadOnly.storage.checkStorageTokenExists(wallet.address, {
-          teeFramework: 'gramine',
-        });
-      expect(setForTeeFramework).toBe(true);
+        iexecReadOnly.storage.checkStorageTokenExists(
+          getRandomAddress(),
+          'ipfs',
+        ),
+      ).rejects.toThrow(
+        new Error(
+          `Storage provider "ipfs" does not support authentication tokens`,
+        ),
+      );
     });
   });
 });
diff --git a/test/lib/e2e/IExecTaskModule.test.js b/test/lib/e2e/IExecTaskModule.test.js
index 2b79355f..3574900d 100644
--- a/test/lib/e2e/IExecTaskModule.test.js
+++ b/test/lib/e2e/IExecTaskModule.test.js
@@ -1,6 +1,4 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect, beforeAll } from '@jest/globals';
+import { describe, test, expect } from '@jest/globals';
 import {
   deployAndGetApporder,
   deployAndGetWorkerpoolorder,
@@ -23,22 +21,22 @@ import { WorkerpoolCallError } from '../../../src/lib/errors.js';
 
 const { ObjectNotFoundError, IpfsGatewayCallError } = errors;
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('task', () => {
   describe('fetchResults()', () => {
-    const BELLECOUR_COMPLETED_TASK_ID =
-      '0xb8715386d9b9ab6d2be10aead05c46682af90d9a36a5ed0afb6a085db387f6ee';
+    const ARBITRUM_SEPOLIA_COMPLETED_TASK_ID =
+      '0x07ea14ef6d25eca722575a8d568e64d9fdb44fa1cae1229618988d6222dba7c4';
 
     test("throw a IpfsGatewayCallError when the IPFS gateway can't be reached", async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           ipfsGatewayURL: SERVICE_UNREACHABLE_URL,
         },
       });
       await expectAsyncCustomError(
-        iexecReadOnly.task.fetchResults(BELLECOUR_COMPLETED_TASK_ID),
+        iexecReadOnly.task.fetchResults(ARBITRUM_SEPOLIA_COMPLETED_TASK_ID),
         {
           constructor: IpfsGatewayCallError,
           message: `IPFS gateway error: Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
@@ -47,14 +45,14 @@ describe('task', () => {
     });
 
     test('throw a IpfsGatewayCallError when the IPFS gateway encounters an error', async () => {
-      const { iexec: iexecReadOnly } = getTestConfig(iexecTestChain)({
+      const { iexec: iexecReadOnly } = await getTestConfig(testChain)({
         readOnly: true,
         options: {
           ipfsGatewayURL: SERVICE_HTTP_500_URL,
         },
       });
       await expectAsyncCustomError(
-        iexecReadOnly.task.fetchResults(BELLECOUR_COMPLETED_TASK_ID),
+        iexecReadOnly.task.fetchResults(ARBITRUM_SEPOLIA_COMPLETED_TASK_ID),
         {
           constructor: IpfsGatewayCallError,
           message: `IPFS gateway error: Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
@@ -63,9 +61,11 @@ describe('task', () => {
     });
 
     test('downloads the result archive from IPFS', async () => {
-      const iexecReadOnly = new IExec({ ethProvider: 'bellecour' });
+      const iexecReadOnly = new IExec({
+        ethProvider: 'arbitrum-sepolia-testnet',
+      });
       const res = await iexecReadOnly.task.fetchResults(
-        BELLECOUR_COMPLETED_TASK_ID,
+        ARBITRUM_SEPOLIA_COMPLETED_TASK_ID,
       );
       expect(res).toBeInstanceOf(Response);
     });
@@ -73,9 +73,9 @@ describe('task', () => {
 
   describe.skip('obsTask()', () => {
     test('emits task updates', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const catid = (
-        await adminCreateCategory(iexecTestChain)({
+        await adminCreateCategory(testChain)({
           name: 'custom',
           description: 'desc',
           workClockTimeRef: 10,
@@ -177,7 +177,7 @@ describe('task', () => {
               .catch(reject);
           });
         }),
-        sleep(1000).then(() => initializeTask(iexecTestChain)(dealid, 0)),
+        sleep(1000).then(() => initializeTask(testChain)(dealid, 0)),
       ]);
 
       expect(unsubObsTaskWithDealid).toBeInstanceOf(Function);
@@ -223,9 +223,9 @@ describe('task', () => {
     });
 
     test('exits on task (deal) timeout', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const catid = (
-        await adminCreateCategory(iexecTestChain)({
+        await adminCreateCategory(testChain)({
           name: 'custom',
           description: 'desc',
           workClockTimeRef: 2,
@@ -353,16 +353,16 @@ describe('task', () => {
         }),
         sleep(2000).then(() => {
           unsubObsTaskBeforeComplete();
-          initializeTask(iexecTestChain)(dealid, 0);
+          initializeTask(testChain)(dealid, 0);
         }),
       ]);
 
       expect(obsTaskWithDealidComplete).toBeUndefined();
       expect(obsTaskWithWrongDealidError).toEqual(
-        new ObjectNotFoundError('deal', NULL_BYTES32, iexecTestChain.chainId),
+        new ObjectNotFoundError('deal', NULL_BYTES32, testChain.chainId),
       );
       expect(obsTaskBeforeInitError).toEqual(
-        new ObjectNotFoundError('task', taskid, iexecTestChain.chainId),
+        new ObjectNotFoundError('task', taskid, testChain.chainId),
       );
       expect(obsTaskAfterInitComplete).toBeUndefined();
 
@@ -422,77 +422,46 @@ describe('task', () => {
 
   describe('fetchOffchainInfo()', () => {
     test('throw when workerpool API is not configured', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       await expect(
         iexec.task.fetchOffchainInfo(
-          '0xf835e22624dd305c6a1f6c6b5688b92231455778847e7ef3bee1091e627e8786',
+          '0x4405e57c6afd6b3ed2399609213b88bbbc4663a02481f097b110ee7dca5a992f',
         ),
       ).rejects.toThrow(
         new Error(
-          'Impossible to resolve API url for workerpool 0x13EE8c43Abd7dFAcfa4C42554Dff72d9fbcF3330',
+          'Impossible to resolve API url for workerpool 0x0556feC57717B8146B03F8ce003eFa3012490d37',
         ),
       );
     });
 
     describe('when workerpool API is configured', () => {
-      const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecWorkerpoolOwner } = getTestConfig(iexecTestChain)();
-      let taskid;
-      let workerpool;
-
-      beforeAll(async () => {
-        const workerpoolorder =
-          await deployAndGetWorkerpoolorder(iexecWorkerpoolOwner);
-        const apporder = await deployAndGetApporder(iexecWorkerpoolOwner);
-
-        workerpool = workerpoolorder.workerpool;
-        const { name: workerpoolEns } =
-          await iexecWorkerpoolOwner.ens.claimName(
-            workerpool.toLowerCase(),
-            await iexecWorkerpoolOwner.ens.getDefaultDomain(workerpool),
-          );
-        await iexecWorkerpoolOwner.ens.configureResolution(
-          workerpoolEns,
-          workerpool,
-        );
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          workerpoolorder,
-          apporder,
-        });
-        const { dealid } = await iexecRequester.order.matchOrders({
-          apporder,
-          workerpoolorder,
-          requestorder,
-        });
-        await initializeTask(iexecTestChain)(dealid, 0);
-        taskid = await iexecRequester.deal.computeTaskId(dealid, 0);
-      });
-
       test('throw WorkerpoolCallError when the workerpool API is unreachable', async () => {
-        await iexecWorkerpoolOwner.workerpool.setWorkerpoolApiUrl(
-          workerpool,
-          SERVICE_UNREACHABLE_URL,
-        );
+        const { iexec } = await getTestConfig(testChain)();
         await expect(
-          iexecRequester.task.fetchOffchainInfo(taskid),
+          iexec.task.fetchOffchainInfo(
+            '0xc6a7f29715b563b75a1daf71458125ecb2f09858380c545ceda9d5652106a92f',
+          ),
         ).rejects.toThrow(
           new WorkerpoolCallError(
-            `Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
+            `Connection to https://unreachable-workerpool.iex.ec failed with a network error`,
           ),
         );
       });
 
       test('throw WorkerpoolCallError when the workerpool API answers with error', async () => {
-        await iexecWorkerpoolOwner.workerpool.setWorkerpoolApiUrl(
-          workerpool,
-          SERVICE_HTTP_500_URL,
-        );
+        const { iexec } = await getTestConfig(testChain)();
         await expect(
-          iexecRequester.task.fetchOffchainInfo(taskid),
+          iexec.task.fetchOffchainInfo(
+            '0x22069de2261dfad53437835ff268018105343583fb64d8cd06803bb3a9c49960',
+          ),
         ).rejects.toThrow(
           new WorkerpoolCallError(
-            `Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
-            new Error('Server internal error: 500 Internal Server Error'),
+            `Server at http://localhost:5500 encountered an internal error`,
+            {
+              cause: new Error(
+                'Server internal error: 500 Internal Server Error',
+              ),
+            },
           ),
         );
       });
@@ -501,89 +470,16 @@ describe('task', () => {
 
   describe('fetchLogs()', () => {
     test('throw when workerpool API is not configured', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       await expect(
         iexec.task.fetchLogs(
-          '0xf835e22624dd305c6a1f6c6b5688b92231455778847e7ef3bee1091e627e8786',
+          '0x4405e57c6afd6b3ed2399609213b88bbbc4663a02481f097b110ee7dca5a992f',
         ),
       ).rejects.toThrow(
         new Error(
-          'Impossible to resolve API url for workerpool 0x13EE8c43Abd7dFAcfa4C42554Dff72d9fbcF3330',
+          'Impossible to resolve API url for workerpool 0x0556feC57717B8146B03F8ce003eFa3012490d37',
         ),
       );
     });
-
-    describe('when workerpool API is configured', () => {
-      const { iexec: iexecRequester } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecWorkerpoolOwner } = getTestConfig(iexecTestChain)();
-      let taskid;
-      let workerpool;
-
-      beforeAll(async () => {
-        const workerpoolorder =
-          await deployAndGetWorkerpoolorder(iexecWorkerpoolOwner);
-        const apporder = await deployAndGetApporder(iexecWorkerpoolOwner);
-
-        workerpool = workerpoolorder.workerpool;
-        const { name: workerpoolEns } =
-          await iexecWorkerpoolOwner.ens.claimName(
-            workerpool.toLowerCase(),
-            await iexecWorkerpoolOwner.ens.getDefaultDomain(workerpool),
-          );
-        await iexecWorkerpoolOwner.ens.configureResolution(
-          workerpoolEns,
-          workerpool,
-        );
-        const requestorder = await getMatchableRequestorder(iexecRequester, {
-          workerpoolorder,
-          apporder,
-        });
-        const { dealid } = await iexecRequester.order.matchOrders({
-          apporder,
-          workerpoolorder,
-          requestorder,
-        });
-        await initializeTask(iexecTestChain)(dealid, 0);
-        taskid = await iexecRequester.deal.computeTaskId(dealid, 0);
-      });
-
-      test('throw when user is not the requester', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)();
-        await iexecWorkerpoolOwner.workerpool.setWorkerpoolApiUrl(
-          workerpool,
-          SERVICE_UNREACHABLE_URL,
-        );
-        await expect(iexec.task.fetchLogs(taskid)).rejects.toThrow(
-          new Error(
-            `Only task requester ${await iexecRequester.wallet.getAddress()} can access replicates logs`,
-          ),
-        );
-      });
-
-      test('throw WorkerpoolCallError when the workerpool API is unreachable', async () => {
-        await iexecWorkerpoolOwner.workerpool.setWorkerpoolApiUrl(
-          workerpool,
-          SERVICE_UNREACHABLE_URL,
-        );
-        await expect(iexecRequester.task.fetchLogs(taskid)).rejects.toThrow(
-          new WorkerpoolCallError(
-            `Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
-          ),
-        );
-      });
-
-      test('throw WorkerpoolCallError when the workerpool API answers with error', async () => {
-        await iexecWorkerpoolOwner.workerpool.setWorkerpoolApiUrl(
-          workerpool,
-          SERVICE_HTTP_500_URL,
-        );
-        await expect(iexecRequester.task.fetchLogs(taskid)).rejects.toThrow(
-          new WorkerpoolCallError(
-            `Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
-            new Error('Server internal error: 500 Internal Server Error'),
-          ),
-        );
-      });
-    });
   });
 });
diff --git a/test/lib/e2e/IExecVoucherModule.test.js b/test/lib/e2e/IExecVoucherModule.test.js
deleted file mode 100644
index 5cf73f3c..00000000
--- a/test/lib/e2e/IExecVoucherModule.test.js
+++ /dev/null
@@ -1,314 +0,0 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { beforeAll, describe, test, expect } from '@jest/globals';
-import { BN } from 'bn.js';
-import {
-  deployRandomApp,
-  deployRandomDataset,
-  deployRandomWorkerpool,
-  getTestConfig,
-} from '../lib-test-utils.js';
-import {
-  TEST_CHAINS,
-  addVoucherEligibleAsset,
-  createVoucher,
-  createVoucherType,
-  getRandomAddress,
-  getRandomWallet,
-  sleep,
-} from '../../test-utils.js';
-import '../../jest-setup.js';
-
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-const unknownTestChain = TEST_CHAINS['custom-token-chain'];
-
-describe('voucher', () => {
-  describe('getVoucherAddress()', () => {
-    test('requires voucherHubAddress to be configured', async () => {
-      const owner = getRandomAddress();
-      const { iexec } = getTestConfig(unknownTestChain)({ readOnly: true });
-      await expect(iexec.voucher.getVoucherAddress(owner)).rejects.toThrow(
-        new Error(
-          `voucherHubAddress option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-    });
-
-    test('returns null if user has no voucher', async () => {
-      const owner = getRandomAddress();
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.voucher.getVoucherAddress(owner);
-      expect(res).toBe(null);
-    });
-
-    test('returns voucher address when user has one', async () => {
-      const owner = getRandomAddress();
-      const voucherType = await createVoucherType(iexecTestChain)({});
-      const voucherAddress = await createVoucher(iexecTestChain)({
-        owner,
-        voucherType,
-        value: 1000,
-      });
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      const res = await iexec.voucher.getVoucherAddress(owner);
-      expect(res).toBe(voucherAddress);
-    });
-  });
-
-  describe('showUserVoucher()', () => {
-    test('requires voucherHubAddress to be configured', async () => {
-      const owner = getRandomAddress();
-      const { iexec } = getTestConfig(unknownTestChain)({
-        readOnly: true,
-        options: { voucherSubgraphURL: 'http://voucher-subgraph.iex.ec' },
-      });
-      await expect(iexec.voucher.showUserVoucher(owner)).rejects.toThrow(
-        new Error(
-          `voucherHubAddress option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-    });
-
-    test('requires voucherSubgraphURL to be configured', async () => {
-      const owner = getRandomAddress();
-      const { iexec } = getTestConfig(unknownTestChain)({
-        readOnly: true,
-        options: { voucherHubAddress: getRandomAddress() },
-      });
-      await expect(iexec.voucher.showUserVoucher(owner)).rejects.toThrow(
-        new Error(
-          `voucherSubgraphURL option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-    });
-
-    test('throw error if user has no voucher', async () => {
-      const owner = getRandomAddress();
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-
-      await expect(iexec.voucher.showUserVoucher(owner)).rejects.toThrowError(
-        `No Voucher found for address ${owner}`,
-      );
-    });
-
-    test('throw error if owner address is not provided', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      await expect(iexec.voucher.showUserVoucher()).rejects.toThrowError(
-        'Missing parameter',
-      );
-    });
-
-    test('throw error if user address is not a valid ethereum address', async () => {
-      const owner = 'invalid_address';
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      await expect(iexec.voucher.showUserVoucher(owner)).rejects.toThrowError(
-        `${owner} is not a valid ethereum address`,
-      );
-    });
-
-    test('returns voucher details when user has one', async () => {
-      // initial setup
-      const voucherOwnerWallet = getRandomWallet();
-      const { iexec } = getTestConfig(iexecTestChain)({
-        privateKey: voucherOwnerWallet.privateKey,
-      });
-      const voucherType = await createVoucherType(iexecTestChain)({});
-      // add sponsored assets
-      const { address: appAddress } = await deployRandomApp(iexec);
-      const { address: appAddress1 } = await deployRandomApp(iexec);
-      const { address: datasetAddress } = await deployRandomDataset(iexec);
-      const { address: datasetAddress1 } = await deployRandomDataset(iexec);
-      const { address: workerpoolAddress } =
-        await deployRandomWorkerpool(iexec);
-      const { address: workerpoolAddress1 } =
-        await deployRandomWorkerpool(iexec);
-
-      await addVoucherEligibleAsset(iexecTestChain)(appAddress, voucherType);
-      await addVoucherEligibleAsset(iexecTestChain)(appAddress1, voucherType);
-      await addVoucherEligibleAsset(iexecTestChain)(
-        datasetAddress,
-        voucherType,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        datasetAddress1,
-        voucherType,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        workerpoolAddress,
-        voucherType,
-      );
-      await addVoucherEligibleAsset(iexecTestChain)(
-        workerpoolAddress1,
-        voucherType,
-      );
-
-      // create voucher
-      const voucherValue = 1000;
-      const voucherAddress = await createVoucher(iexecTestChain)({
-        owner: voucherOwnerWallet.address,
-        voucherType,
-        value: voucherValue,
-      });
-
-      // authorize an account for the voucher
-      const accountAddress = getRandomAddress();
-      await iexec.voucher.authorizeRequester(accountAddress);
-      const accountAddress1 = getRandomAddress();
-      await iexec.voucher.authorizeRequester(accountAddress1);
-
-      await sleep(10000); // wait for subgraph indexation
-
-      // call the function and check the results
-      const userVoucher = await iexec.voucher.showUserVoucher(
-        voucherOwnerWallet.address,
-      );
-
-      expect(userVoucher.type).toBeInstanceOf(BN);
-      expect(userVoucher.expirationTimestamp).toBeInstanceOf(BN);
-      expect(userVoucher.balance).toBeInstanceOf(BN);
-      expect(userVoucher.allowanceAmount).toBeInstanceOf(BN);
-      expect(userVoucher.owner).toBe(voucherOwnerWallet.address);
-      expect(userVoucher.address).toBe(voucherAddress);
-      expect([...userVoucher.sponsoredApps].sort()).toEqual(
-        [appAddress, appAddress1].sort(),
-      );
-      expect([...userVoucher.sponsoredDatasets].sort()).toEqual(
-        [datasetAddress, datasetAddress1].sort(),
-      );
-      expect([...userVoucher.sponsoredWorkerpools].sort()).toEqual(
-        [workerpoolAddress, workerpoolAddress1].sort(),
-      );
-      expect([...userVoucher.authorizedAccounts].sort()).toEqual(
-        [accountAddress, accountAddress1].sort(),
-      );
-    });
-  });
-
-  describe('authorizeRequester()', () => {
-    let voucherType;
-    beforeAll(async () => {
-      voucherType = await createVoucherType(iexecTestChain)({});
-    });
-
-    test('requires voucherHubAddress to be configured', async () => {
-      const { iexec } = getTestConfig(unknownTestChain)();
-      await expect(
-        iexec.voucher.authorizeRequester(getRandomAddress()),
-      ).rejects.toThrow(
-        new Error(
-          `voucherHubAddress option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-    });
-
-    test('requires a signer', async () => {
-      const requester = getRandomAddress();
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      await expect(iexec.voucher.authorizeRequester(requester)).rejects.toThrow(
-        new Error(
-          'The current provider is not a signer, impossible to sign messages or transactions',
-        ),
-      );
-    });
-
-    test('requires the user owns a voucher', async () => {
-      const requester = getRandomAddress();
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await expect(iexec.voucher.authorizeRequester(requester)).rejects.toThrow(
-        new Error(`No Voucher found for address ${wallet.address}`),
-      );
-    });
-
-    test('authorizes the requester to use the voucher', async () => {
-      const requester = getRandomAddress();
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await createVoucher(iexecTestChain)({
-        owner: wallet.address,
-        voucherType,
-        value: 1000,
-      });
-      const res = await iexec.voucher.authorizeRequester(requester);
-      expect(res).toBeTxHash();
-    });
-
-    test('throw when the requester is already authorized', async () => {
-      const requester = getRandomAddress();
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await createVoucher(iexecTestChain)({
-        owner: wallet.address,
-        voucherType,
-        value: 1000,
-      });
-      await iexec.voucher.authorizeRequester(requester);
-      await expect(iexec.voucher.authorizeRequester(requester)).rejects.toThrow(
-        new Error(`${requester} is already authorized`),
-      );
-    });
-  });
-
-  describe('revokeRequesterAuthorization()', () => {
-    let voucherType;
-    beforeAll(async () => {
-      voucherType = await createVoucherType(iexecTestChain)({});
-    });
-
-    test('requires voucherHubAddress to be configured', async () => {
-      const { iexec } = getTestConfig(unknownTestChain)();
-      await expect(
-        iexec.voucher.revokeRequesterAuthorization(getRandomAddress()),
-      ).rejects.toThrow(
-        new Error(
-          `voucherHubAddress option not set and no default value for your chain ${unknownTestChain.chainId}`,
-        ),
-      );
-    });
-
-    test('requires a signer', async () => {
-      const requester = getRandomAddress();
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-      await expect(
-        iexec.voucher.revokeRequesterAuthorization(requester),
-      ).rejects.toThrow(
-        new Error(
-          'The current provider is not a signer, impossible to sign messages or transactions',
-        ),
-      );
-    });
-
-    test('requires the user owns a voucher', async () => {
-      const requester = getRandomAddress();
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await expect(
-        iexec.voucher.revokeRequesterAuthorization(requester),
-      ).rejects.toThrow(
-        new Error(`No Voucher found for address ${wallet.address}`),
-      );
-    });
-
-    test('throw when the requester is not previously authorized', async () => {
-      const requester = getRandomAddress();
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await createVoucher(iexecTestChain)({
-        owner: wallet.address,
-        voucherType,
-        value: 1000,
-      });
-      await expect(
-        iexec.voucher.revokeRequesterAuthorization(requester),
-      ).rejects.toThrow(Error(`${requester} is not authorized`));
-    });
-
-    test('revokes the requester authorization to use the voucher', async () => {
-      const requester = getRandomAddress();
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
-      await createVoucher(iexecTestChain)({
-        owner: wallet.address,
-        voucherType,
-        value: 1000,
-      });
-      await iexec.voucher.authorizeRequester(requester);
-      const res = await iexec.voucher.revokeRequesterAuthorization(requester);
-      expect(res).toBeTxHash();
-    });
-  });
-});
diff --git a/test/lib/e2e/IExecWalletModule.test.js b/test/lib/e2e/IExecWalletModule.test.js
index 5691a39a..0aa91d06 100644
--- a/test/lib/e2e/IExecWalletModule.test.js
+++ b/test/lib/e2e/IExecWalletModule.test.js
@@ -1,13 +1,7 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
 import { ONE_ETH, ONE_RLC, getTestConfig } from '../lib-test-utils.js';
 import {
-  ALCHEMY_API_KEY,
-  ETHERSCAN_API_KEY,
-  INFURA_PROJECT_ID,
-  DEFAULT_PROVIDER_OPTIONS,
   TEST_CHAINS,
   getRandomAddress,
   getRandomWallet,
@@ -15,20 +9,19 @@ import {
   setNRlcBalance,
 } from '../../test-utils.js';
 import '../../jest-setup.js';
-import { IExec } from '../../../src/lib/index.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-const tokenTestChain = TEST_CHAINS['custom-token-chain'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
+const tokenTestChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('wallet', () => {
   describe('getAddress()', () => {
     test('expose connected wallet', async () => {
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const res = await iexec.wallet.getAddress();
       expect(res).toBe(wallet.address);
     });
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       await expect(iexec.wallet.getAddress()).rejects.toThrow(
@@ -38,22 +31,11 @@ describe('wallet', () => {
   });
 
   describe('checkBalances()', () => {
-    describe('native chain', () => {
-      test('expose nRLC (as 10⁹ wei)', async () => {
-        const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-        const address = getRandomAddress();
-        await setNRlcBalance(iexecTestChain)(address, 1000);
-        const balance = await iexec.wallet.checkBalances(address);
-        expect(balance.nRLC).toBeInstanceOf(BN);
-        expect(balance.wei).toBeInstanceOf(BN);
-        expect(balance.nRLC).toStrictEqual(new BN(1000));
-        expect(balance.wei).toStrictEqual(new BN(1000n * 10n ** 9n));
-      });
-    });
-
     describe('token chain', () => {
       test('expose wei and nRLC', async () => {
-        const { iexec } = getTestConfig(tokenTestChain)({ readOnly: true });
+        const { iexec } = await getTestConfig(tokenTestChain)({
+          readOnly: true,
+        });
         const address = getRandomAddress();
         await setBalance(tokenTestChain)(address, 1000);
         const balance = await iexec.wallet.checkBalances(address);
@@ -65,42 +47,9 @@ describe('wallet', () => {
     });
   });
 
-  describe('checkBridgedBalances()', () => {
-    describe('native chain', () => {
-      test('expose bridged balances (mainnet) on bellecour', async () => {
-        const iexec = new IExec(
-          { ethProvider: 'bellecour' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const address = getRandomAddress();
-        const balance = await iexec.wallet.checkBridgedBalances(address);
-        expect(balance.nRLC).toBeInstanceOf(BN);
-        expect(balance.wei).toBeInstanceOf(BN);
-        expect(balance.nRLC).toStrictEqual(new BN(0));
-        expect(balance.wei).toStrictEqual(new BN(0));
-      });
-    });
-    describe('token chain', () => {
-      test('expose bridged balances (bellecour) on mainnet', async () => {
-        const iexec = new IExec(
-          { ethProvider: 'mainnet' },
-          {
-            providerOptions: DEFAULT_PROVIDER_OPTIONS,
-          },
-        );
-        const address = getRandomAddress();
-        const balance = await iexec.wallet.checkBridgedBalances(address);
-        expect(balance.nRLC).toStrictEqual(new BN(0));
-        expect(balance.wei).toStrictEqual(new BN(0));
-      });
-    });
-  });
-
   describe('sendETH()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(tokenTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(tokenTestChain)({ readOnly: true });
       await expect(
         iexec.wallet.sendETH(10, getRandomAddress()),
       ).rejects.toThrow(
@@ -113,7 +62,7 @@ describe('wallet', () => {
     describe('token chain', () => {
       test('sends wei', async () => {
         const receiverAddress = getRandomAddress();
-        const { iexec, wallet } = getTestConfig(tokenTestChain)();
+        const { iexec, wallet } = await getTestConfig(tokenTestChain)();
         await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
         const initialBalance = await iexec.wallet.checkBalances(wallet.address);
         const receiverInitialBalance =
@@ -139,7 +88,7 @@ describe('wallet', () => {
 
       test('sends specified unit', async () => {
         const receiverAddress = getRandomAddress();
-        const { iexec, wallet } = getTestConfig(tokenTestChain)();
+        const { iexec, wallet } = await getTestConfig(tokenTestChain)();
         await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
         const initialBalance = await iexec.wallet.checkBalances(wallet.address);
         const receiverInitialBalance =
@@ -163,21 +112,11 @@ describe('wallet', () => {
         );
       });
     });
-
-    describe('native chain', () => {
-      test('throw on native chain', async () => {
-        const receiverAddress = getRandomAddress();
-        const { iexec } = getTestConfig(iexecTestChain)();
-        await expect(iexec.wallet.sendETH(10, receiverAddress)).rejects.toThrow(
-          new Error('sendETH() is disabled on sidechain, use sendRLC()'),
-        );
-      });
-    });
   });
 
   describe('sendRLC()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(
         iexec.wallet.sendRLC(10, getRandomAddress()),
       ).rejects.toThrow(
@@ -187,79 +126,10 @@ describe('wallet', () => {
       );
     });
 
-    describe('native chain', () => {
-      test('sends nRLC', async () => {
-        const receiverAddress = getRandomAddress();
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        await setNRlcBalance(iexecTestChain)(wallet.address, ONE_RLC);
-        const initialBalance = await iexec.wallet.checkBalances(wallet.address);
-        const receiverInitialBalance =
-          await iexec.wallet.checkBalances(receiverAddress);
-        const txHash = await iexec.wallet.sendRLC(5, receiverAddress);
-        const finalBalance = await iexec.wallet.checkBalances(wallet.address);
-        const receiverFinalBalance =
-          await iexec.wallet.checkBalances(receiverAddress);
-        expect(txHash).toBeTxHash();
-        expect(finalBalance.nRLC.add(new BN(5)).eq(initialBalance.nRLC)).toBe(
-          true,
-        );
-        expect(
-          finalBalance.wei
-            .add(new BN(5).mul(new BN(1000000000)))
-            .eq(initialBalance.wei),
-        ).toBe(true);
-        expect(
-          receiverFinalBalance.nRLC
-            .sub(new BN(5))
-            .eq(receiverInitialBalance.nRLC),
-        ).toBe(true);
-        expect(
-          receiverFinalBalance.wei
-            .sub(new BN(5).mul(new BN(1000000000)))
-            .eq(receiverInitialBalance.wei),
-        ).toBe(true);
-      });
-
-      test('sends specified unit', async () => {
-        const receiverAddress = getRandomAddress();
-        const { iexec, wallet } = getTestConfig(iexecTestChain)();
-        await setNRlcBalance(iexecTestChain)(wallet.address, ONE_RLC);
-        const initialBalance = await iexec.wallet.checkBalances(wallet.address);
-        const receiverInitialBalance =
-          await iexec.wallet.checkBalances(receiverAddress);
-        const txHash = await iexec.wallet.sendRLC(
-          '0.000005 RLC',
-          receiverAddress,
-        );
-        const finalBalance = await iexec.wallet.checkBalances(wallet.address);
-        const receiverFinalBalance =
-          await iexec.wallet.checkBalances(receiverAddress);
-        expect(txHash).toBeTxHash();
-        expect(
-          finalBalance.nRLC.add(new BN(5000)).eq(initialBalance.nRLC),
-        ).toBe(true);
-        expect(
-          finalBalance.wei
-            .add(new BN(5000).mul(new BN(1000000000)))
-            .eq(initialBalance.wei),
-        ).toBe(true);
-        expect(
-          receiverFinalBalance.nRLC
-            .sub(new BN(5000))
-            .eq(receiverInitialBalance.nRLC),
-        ).toBe(true);
-        expect(
-          receiverFinalBalance.wei
-            .sub(new BN(5000).mul(new BN(1000000000)))
-            .eq(receiverInitialBalance.wei),
-        ).toBe(true);
-      });
-    });
-
     describe('token chain', () => {
       test('sends nRLC', async () => {
         const receiverAddress = getRandomAddress();
-        const { iexec, wallet } = getTestConfig(tokenTestChain)();
+        const { iexec, wallet } = await getTestConfig(tokenTestChain)();
         await setNRlcBalance(tokenTestChain)(wallet.address, 100);
         await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
         const initialBalance = await iexec.wallet.checkBalances(wallet.address);
@@ -286,7 +156,7 @@ describe('wallet', () => {
 
       test('sends specified unit', async () => {
         const receiverAddress = getRandomAddress();
-        const { iexec, wallet } = getTestConfig(tokenTestChain)();
+        const { iexec, wallet } = await getTestConfig(tokenTestChain)();
         await setNRlcBalance(tokenTestChain)(wallet.address, ONE_RLC);
         await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
         const initialBalance = await iexec.wallet.checkBalances(wallet.address);
@@ -313,50 +183,11 @@ describe('wallet', () => {
     });
   });
   describe('sweep()', () => {
-    describe('native chain', () => {
-      test('sweeps native nRLC', async () => {
-        const receiverWallet = getRandomWallet();
-        const { iexec, wallet: sweeperWallet } =
-          getTestConfig(iexecTestChain)();
-        await setBalance(iexecTestChain)(sweeperWallet.address, ONE_ETH);
-        await setNRlcBalance(iexecTestChain)(sweeperWallet.address, ONE_RLC);
-        const initialBalance = await iexec.wallet.checkBalances(
-          sweeperWallet.address,
-        );
-        const receiverInitialBalance = await iexec.wallet.checkBalances(
-          receiverWallet.address,
-        );
-        const res = await iexec.wallet.sweep(receiverWallet.address);
-        const finalBalance = await iexec.wallet.checkBalances(
-          sweeperWallet.address,
-        );
-        const receiverFinalBalance = await iexec.wallet.checkBalances(
-          receiverWallet.address,
-        );
-        expect(res.sendNativeTxHash).toBeTxHash();
-        expect(res.sendERC20TxHash).toBeUndefined();
-        expect(initialBalance.wei.gt(new BN(0))).toBe(true);
-        expect(initialBalance.nRLC.gt(new BN(0))).toBe(true);
-        expect(finalBalance.wei.eq(new BN(0))).toBe(true);
-        expect(finalBalance.nRLC.eq(new BN(0))).toBe(true);
-        expect(
-          receiverFinalBalance.wei
-            .sub(initialBalance.wei)
-            .eq(receiverInitialBalance.wei),
-        ).toBe(true);
-        expect(
-          receiverFinalBalance.nRLC
-            .sub(initialBalance.nRLC)
-            .eq(receiverInitialBalance.nRLC),
-        ).toBe(true);
-      });
-    });
-
     describe('token chain', () => {
       test('sweeps wei and nRLC', async () => {
         const receiverWallet = getRandomWallet();
         const { iexec, wallet: sweeperWallet } =
-          getTestConfig(tokenTestChain)();
+          await getTestConfig(tokenTestChain)();
         await setBalance(tokenTestChain)(sweeperWallet.address, ONE_ETH);
         await setNRlcBalance(tokenTestChain)(sweeperWallet.address, ONE_RLC);
 
@@ -392,7 +223,7 @@ describe('wallet', () => {
       test('stop when ERC20 transfer fails', async () => {
         const receiverWallet = getRandomWallet();
         const { iexec, wallet: sweeperWallet } =
-          getTestConfig(tokenTestChain)();
+          await getTestConfig(tokenTestChain)();
         await setNRlcBalance(tokenTestChain)(sweeperWallet.address, ONE_RLC);
         await setBalance(tokenTestChain)(sweeperWallet.address, 1);
         const initialBalance = await iexec.wallet.checkBalances(
@@ -427,10 +258,10 @@ describe('wallet', () => {
       test('report sendNativeTxHash and error when remaining wei cannot be sent', async () => {
         const receiverWallet = getRandomWallet();
         const { iexec, wallet: sweeperWallet } =
-          getTestConfig(tokenTestChain)();
+          await getTestConfig(tokenTestChain)();
         await setBalance(tokenTestChain)(
           sweeperWallet.address,
-          55000000000000n,
+          60000000000000n,
         ); // enough for erc20 transfer only
         await setNRlcBalance(tokenTestChain)(sweeperWallet.address, ONE_RLC);
         const initialBalance = await iexec.wallet.checkBalances(
diff --git a/test/lib/e2e/IExecWorkerpoolModule.test.js b/test/lib/e2e/IExecWorkerpoolModule.test.js
index 760f4e33..f65c28b7 100644
--- a/test/lib/e2e/IExecWorkerpoolModule.test.js
+++ b/test/lib/e2e/IExecWorkerpoolModule.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
 import { deployRandomWorkerpool, getTestConfig } from '../lib-test-utils.js';
@@ -11,17 +9,17 @@ import {
   getRandomAddress,
 } from '../../test-utils.js';
 import '../../jest-setup.js';
-import { errors, IExec } from '../../../src/lib/index.js';
+import { errors } from '../../../src/lib/index.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('workerpool', () => {
   describe('showWorkerpool()', () => {
     test('shows a deployed workerpool', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const workerpool = {
         owner: await iexec.wallet.getAddress(),
         description: `workerpool${getId()}`,
@@ -38,7 +36,7 @@ describe('workerpool', () => {
     });
 
     test('fails if the workerpool is not deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const address = getRandomAddress();
@@ -48,7 +46,7 @@ describe('workerpool', () => {
         new errors.ObjectNotFoundError(
           'workerpool',
           address,
-          iexecTestChain.chainId,
+          testChain.chainId,
         ),
       );
     });
@@ -56,10 +54,10 @@ describe('workerpool', () => {
 
   describe('showUserWorkerpool()', () => {
     test('shows the user workerpool', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const workerpool = {
         owner: wallet.address,
         description: `workerpool${getId()}`,
@@ -78,7 +76,7 @@ describe('workerpool', () => {
     });
 
     test('fails if the workerpool is not deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const address = getRandomAddress();
@@ -90,10 +88,10 @@ describe('workerpool', () => {
 
   describe('countUserWorkerpools()', () => {
     test('counts user workerpools', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec, wallet } = getTestConfig(iexecTestChain)();
+      const { iexec, wallet } = await getTestConfig(testChain)();
       const resBeforeDeploy =
         await readOnlyIExec.workerpool.countUserWorkerpools(wallet.address);
       await deployRandomWorkerpool(iexec);
@@ -108,7 +106,7 @@ describe('workerpool', () => {
 
   describe('deployWorkerpool()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({
+      const { iexec } = await getTestConfig(testChain)({
         readOnly: true,
       });
       const workerpool = {
@@ -125,7 +123,7 @@ describe('workerpool', () => {
     });
 
     test('deploys a workerpool', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const workerpool = {
         owner: await iexec.wallet.getAddress(),
         description: `workerpool${getId()}`,
@@ -136,7 +134,7 @@ describe('workerpool', () => {
     });
 
     test('cannot deploy twice with the same params', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const workerpool = {
         owner: await iexec.wallet.getAddress(),
         description: `workerpool${getId()}`,
@@ -152,10 +150,10 @@ describe('workerpool', () => {
 
   describe('predictWorkerpoolAddress()', () => {
     test('predicts the deployment address', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const workerpool = {
         owner: getRandomAddress(),
         description: `workerpool${getId()}`,
@@ -174,10 +172,10 @@ describe('workerpool', () => {
 
   describe('checkDeployedWorkerpool()', () => {
     test('checks a workerpool is deployed', async () => {
-      const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)({
         readOnly: true,
       });
-      const { iexec } = getTestConfig(iexecTestChain)();
+      const { iexec } = await getTestConfig(testChain)();
       const workerpool = {
         owner: getRandomAddress(),
         description: `workerpool${getId()}`,
@@ -196,7 +194,7 @@ describe('workerpool', () => {
 
   describe('transferWorkerpool()', () => {
     test('require a signer', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
+      const { iexec } = await getTestConfig(testChain)({ readOnly: true });
       await expect(
         iexec.workerpool.transferWorkerpool(
           getRandomAddress(),
@@ -211,8 +209,8 @@ describe('workerpool', () => {
 
     test('transfers the ownership', async () => {
       const receiverAddress = getRandomAddress();
-      const { iexec: iexecWorkerpoolOwner } = getTestConfig(iexecTestChain)();
-      const { iexec: iexecRandom } = getTestConfig(iexecTestChain)();
+      const { iexec: iexecWorkerpoolOwner } = await getTestConfig(testChain)();
+      const { iexec: iexecRandom } = await getTestConfig(testChain)();
       const { address } = await deployRandomWorkerpool(iexecWorkerpoolOwner);
       await expect(
         iexecRandom.workerpool.transferWorkerpool(
@@ -239,113 +237,58 @@ describe('workerpool', () => {
   });
 
   describe('getWorkerpoolApiUrl()', () => {
-    describe('on networks with ENS', () => {
-      test('resolves the url against ENS', async () => {
-        const { iexec: readOnlyIExec } = getTestConfig(iexecTestChain)({
-          readOnly: true,
-        });
-        const { iexec } = getTestConfig(iexecTestChain)();
-        const { address } = await deployRandomWorkerpool(iexec);
-        const resNoApiUrl =
-          await readOnlyIExec.workerpool.getWorkerpoolApiUrl(address);
-        expect(resNoApiUrl).toBe(undefined);
-        const label = address.toLowerCase();
-        const domain = 'pools.iexec.eth';
-        const name = `${label}.${domain}`;
-        await iexec.ens.claimName(label, domain);
-        await iexec.ens.configureResolution(name, address);
-        const apiUrl = 'https://my-workerpool.com';
-        await iexec.workerpool.setWorkerpoolApiUrl(address, apiUrl);
-        const resConfigured =
-          await readOnlyIExec.workerpool.getWorkerpoolApiUrl(address);
-        expect(resConfigured).toBe(apiUrl);
-      });
+    test('resolves the url against Compass', async () => {
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)();
+      const apiUrl = await readOnlyIExec.workerpool.getWorkerpoolApiUrl(
+        '0xB967057a21dc6A66A29721d96b8Aa7454B7c383F',
+      );
+      expect(typeof apiUrl).toBe('string');
+      expect(apiUrl.startsWith('https://')).toBe(true);
     });
 
-    describe('on networks relying on compass', () => {
-      const noEnsTestChain = TEST_CHAINS['custom-token-chain-no-ens'];
+    test('returns undefined if the workerpool does not exist in Compass', async () => {
+      const { iexec: readOnlyIExec } = await getTestConfig(testChain)();
+      const address = getRandomAddress();
+      await expect(
+        readOnlyIExec.workerpool.getWorkerpoolApiUrl(address),
+      ).resolves.toBe(undefined);
+    });
 
-      test('resolves the url against Compass', async () => {
-        const { iexec: readOnlyIExec } = getTestConfig(noEnsTestChain)();
-        const apiUrl = await readOnlyIExec.workerpool.getWorkerpoolApiUrl(
-          '0xB967057a21dc6A66A29721d96b8Aa7454B7c383F',
-        );
-        expect(typeof apiUrl).toBe('string');
-        expect(apiUrl.startsWith('https://')).toBe(true);
+    test('fails with CompassCallError if Compass is not available', async () => {
+      const { iexec: iexecCompassNotFound } = await getTestConfig(testChain)({
+        options: {
+          compassURL: SERVICE_UNREACHABLE_URL,
+        },
       });
+      await expect(
+        iexecCompassNotFound.workerpool.getWorkerpoolApiUrl(getRandomAddress()),
+      ).rejects.toThrow(
+        new errors.CompassCallError(
+          `Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
+        ),
+      );
 
-      test('returns undefined if the workerpool does not exist in Compass', async () => {
-        const { iexec: readOnlyIExec } = getTestConfig(noEnsTestChain)();
-        const address = getRandomAddress();
-        await expect(
-          readOnlyIExec.workerpool.getWorkerpoolApiUrl(address),
-        ).resolves.toBe(undefined);
+      const { iexec: iexecCompassInternalError } = await getTestConfig(
+        testChain,
+      )({
+        options: {
+          compassURL: SERVICE_HTTP_500_URL,
+        },
       });
-
-      test('fails with CompassCallError if Compass is not available', async () => {
-        const { iexec: iexecCompassNotFound } = getTestConfig(noEnsTestChain)({
-          options: {
-            compassURL: SERVICE_UNREACHABLE_URL,
-          },
-        });
-        await expect(
-          iexecCompassNotFound.workerpool.getWorkerpoolApiUrl(
-            getRandomAddress(),
-          ),
-        ).rejects.toThrow(
-          new errors.CompassCallError(
-            `Connection to ${SERVICE_UNREACHABLE_URL} failed with a network error`,
-          ),
-        );
-
-        const { iexec: iexecCompassInternalError } = getTestConfig(
-          noEnsTestChain,
-        )({
-          options: {
-            compassURL: SERVICE_HTTP_500_URL,
-          },
-        });
-        await expect(
-          iexecCompassInternalError.workerpool.getWorkerpoolApiUrl(
-            getRandomAddress(),
-          ),
-        ).rejects.toThrow(
-          new errors.CompassCallError(
-            `Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
-            new Error('Server internal error: 500 Internal Server Error'),
-          ),
-        );
-      });
-    });
-  });
-
-  describe('setWorkerpoolApiUrl()', () => {
-    test('require a configured ens name for the workerpool', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomWorkerpool(iexec);
       await expect(
-        iexec.workerpool.setWorkerpoolApiUrl(
-          address,
-          'https://my-workerpool.com',
+        iexecCompassInternalError.workerpool.getWorkerpoolApiUrl(
+          getRandomAddress(),
         ),
       ).rejects.toThrow(
-        new Error(`No ENS name reverse resolution configured for ${address}`),
-      );
-    });
-
-    test('sets the workerpool api url', async () => {
-      const { iexec } = getTestConfig(iexecTestChain)();
-      const { address } = await deployRandomWorkerpool(iexec);
-      const label = address.toLowerCase();
-      const domain = 'pools.iexec.eth';
-      const name = `${label}.${domain}`;
-      await iexec.ens.claimName(label, domain);
-      await iexec.ens.configureResolution(name, address);
-      const res = await iexec.workerpool.setWorkerpoolApiUrl(
-        address,
-        'https://my-workerpool.com',
+        new errors.CompassCallError(
+          `Server at ${SERVICE_HTTP_500_URL} encountered an internal error`,
+          {
+            cause: new Error(
+              'Server internal error: 500 Internal Server Error',
+            ),
+          },
+        ),
       );
-      expect(res).toBeTxHash();
     });
   });
 });
diff --git a/test/lib/e2e/utils.test.js b/test/lib/e2e/utils.test.js
index 7d0ab0d1..78e4732b 100644
--- a/test/lib/e2e/utils.test.js
+++ b/test/lib/e2e/utils.test.js
@@ -1,24 +1,13 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { readFile } from 'fs/promises';
 import { join } from 'path';
 import JSZip from 'jszip';
-import {
-  ALCHEMY_API_KEY,
-  ETHERSCAN_API_KEY,
-  INFURA_PROJECT_ID,
-  TEST_CHAINS,
-  getId,
-  getRandomWallet,
-  setBalance,
-} from '../../test-utils.js';
+import { getRandomWallet } from '../../test-utils.js';
 import '../../jest-setup.js';
-import { ONE_ETH, getTestConfigOptions } from '../lib-test-utils.js';
 
-import { IExec, utils } from '../../../src/lib/index.js';
+import { utils } from '../../../src/lib/index.js';
 
-const { BN, NULL_ADDRESS } = utils;
+const { BN } = utils;
 
 describe('utils', () => {
   describe('parseEth()', () => {
@@ -359,256 +348,7 @@ describe('utils', () => {
   });
 
   describe('getSignerFromPrivateKey()', () => {
-    const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-    const tokenTestChain = TEST_CHAINS['custom-token-chain'];
-
-    test('gasPrice option allows to specify gasPrice', async () => {
-      const gasPrice = '123456789';
-      const wallet = getRandomWallet();
-      const iexec = new IExec(
-        {
-          ethProvider: utils.getSignerFromPrivateKey(
-            tokenTestChain.rpcURL,
-            wallet.privateKey,
-            {
-              gasPrice,
-            },
-          ),
-        },
-        getTestConfigOptions(tokenTestChain)(),
-      );
-      await setBalance(tokenTestChain)(wallet.address, ONE_ETH);
-      const txHash = await iexec.wallet.sendETH(0, wallet.address);
-      const tx = await tokenTestChain.provider.getTransaction(txHash);
-      expect(tx).toBeDefined();
-      expect(tx.gasPrice.toString()).toBe(gasPrice);
-    });
-
-    test('getTransactionCount option allows custom nonce management', async () => {
-      const wallet = getRandomWallet();
-
-      const createNonceProvider = (address) => {
-        const initNoncePromise = iexecTestChain.provider.getTransactionCount(
-          address,
-          'latest',
-        );
-        let i = 0;
-        const getNonce = () =>
-          initNoncePromise.then((initNonce) => initNonce + i);
-        const increaseNonce = () => {
-          i += 1;
-        };
-        return {
-          getNonce,
-          increaseNonce,
-        };
-      };
-
-      const nonceProvider = createNonceProvider(wallet.address);
-
-      const signer = utils.getSignerFromPrivateKey(
-        iexecTestChain.rpcURL,
-        wallet.privateKey,
-        {
-          getTransactionCount: nonceProvider.getNonce,
-        },
-      );
-
-      const iexec = new IExec(
-        {
-          ethProvider: signer,
-        },
-        getTestConfigOptions(iexecTestChain)(),
-      );
-
-      const { registerTxHash: tx0 } = await iexec.ens.claimName(
-        `name-${getId()}`,
-      );
-      expect(tx0).toBeTxHash();
-
-      await expect(iexec.ens.claimName(`name-${getId()}`)).rejects.toThrow(
-        'nonce too low',
-      );
-
-      nonceProvider.increaseNonce();
-
-      const { registerTxHash: tx1 } = await iexec.ens.claimName(
-        `name-${getId()}`,
-      );
-      expect(tx1).toBeTxHash();
-
-      await expect(iexec.ens.claimName(`name-${getId()}`)).rejects.toThrow(
-        'nonce too low',
-      );
-
-      nonceProvider.increaseNonce();
-
-      const { registerTxHash: tx2 } = await iexec.ens.claimName(
-        `name-${getId()}`,
-      );
-      expect(tx2).toBeTxHash();
-    });
-
-    test.skip('providers option allow passing JSON RPC API providers api keys', async () => {
-      const providerOptions = {
-        infura: INFURA_PROJECT_ID,
-        alchemy: ALCHEMY_API_KEY,
-        etherscan: ETHERSCAN_API_KEY,
-      };
-      const alchemyFailQuorumFail = {
-        ...providerOptions,
-        alchemy: 'FAIL',
-        quorum: 3,
-      };
-      const alchemyFailQuorumPass = {
-        ...providerOptions,
-        alchemy: 'FAIL',
-        quorum: 2,
-      };
-      const infuraFailQuorumFail = {
-        ...providerOptions,
-        infura: 'FAIL',
-        quorum: 3,
-      };
-      const infuraFailQuorumPass = {
-        ...providerOptions,
-        infura: 'FAIL',
-        quorum: 2,
-      };
-      const etherscanFailQuorumFail = {
-        ...providerOptions,
-        etherscan: 'FAIL',
-        quorum: 3,
-      };
-      const etherscanFailQuorumPass = {
-        ...providerOptions,
-        etherscan: 'FAIL',
-        quorum: 2,
-      };
-      await expect(
-        new IExec({
-          ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
-            getRandomWallet().privateKey,
-            {
-              providers: alchemyFailQuorumFail,
-            },
-          ),
-        }).wallet.checkBalances(NULL_ADDRESS),
-      ).rejects.toThrow();
-      await expect(
-        new IExec({
-          ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
-            getRandomWallet().privateKey,
-            {
-              providers: alchemyFailQuorumPass,
-            },
-          ),
-        }).wallet.checkBalances(NULL_ADDRESS),
-      ).resolves.toBeDefined();
-      await expect(
-        new IExec({
-          ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
-            getRandomWallet().privateKey,
-            {
-              providers: etherscanFailQuorumFail,
-            },
-          ),
-        }).wallet.checkBalances(NULL_ADDRESS),
-      ).rejects.toThrow();
-      await expect(
-        new IExec({
-          ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
-            getRandomWallet().privateKey,
-            {
-              providers: etherscanFailQuorumPass,
-            },
-          ),
-        }).wallet.checkBalances(NULL_ADDRESS),
-      ).resolves.toBeDefined();
-      await expect(
-        new IExec({
-          ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
-            getRandomWallet().privateKey,
-            {
-              providers: infuraFailQuorumFail,
-            },
-          ),
-        }).wallet.checkBalances(NULL_ADDRESS),
-      ).rejects.toThrow();
-      await expect(
-        new IExec({
-          ethProvider: utils.getSignerFromPrivateKey(
-            'mainnet',
-            getRandomWallet().privateKey,
-            {
-              providers: infuraFailQuorumPass,
-            },
-          ),
-        }).wallet.checkBalances(NULL_ADDRESS),
-      ).resolves.toBeDefined();
-    });
-
-    test('providers option is ignored with RPC host', async () => {
-      const alchemyFailQuorumFail = {
-        alchemy: 'FAIL',
-        quorum: 3,
-      };
-      const infuraFailQuorumFail = {
-        infura: 'FAIL',
-        quorum: 3,
-      };
-      const etherscanFailQuorumFail = {
-        etherscan: 'FAIL',
-        quorum: 3,
-      };
-      await expect(
-        new IExec(
-          {
-            ethProvider: utils.getSignerFromPrivateKey(
-              tokenTestChain.rpcURL,
-              getRandomWallet().privateKey,
-              {
-                providers: alchemyFailQuorumFail,
-              },
-            ),
-          },
-          getTestConfigOptions(tokenTestChain)(),
-        ).wallet.checkBalances(NULL_ADDRESS),
-      ).resolves.toBeDefined();
-      await expect(
-        new IExec(
-          {
-            ethProvider: utils.getSignerFromPrivateKey(
-              tokenTestChain.rpcURL,
-              getRandomWallet().privateKey,
-              {
-                providers: etherscanFailQuorumFail,
-              },
-            ),
-          },
-          getTestConfigOptions(tokenTestChain)(),
-        ).wallet.checkBalances(NULL_ADDRESS),
-      ).resolves.toBeDefined();
-      await expect(
-        new IExec(
-          {
-            ethProvider: utils.getSignerFromPrivateKey(
-              tokenTestChain.rpcURL,
-              getRandomWallet().privateKey,
-              {
-                providers: infuraFailQuorumFail,
-              },
-            ),
-          },
-          getTestConfigOptions(tokenTestChain)(),
-        ).wallet.checkBalances(NULL_ADDRESS),
-      ).resolves.toBeDefined();
-    });
+    // skipped because no experimental networks are currently defined
     test.skip('allowExperimentalNetworks option allow creating signer connected to an experimental network', async () => {
       expect(() =>
         utils.getSignerFromPrivateKey(
diff --git a/test/lib/e2e/voucher.test.js b/test/lib/e2e/voucher.test.js
deleted file mode 100644
index ec187157..00000000
--- a/test/lib/e2e/voucher.test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { describe, test, expect } from '@jest/globals';
-import {
-  TEST_CHAINS,
-  createVoucher,
-  createVoucherType,
-  getRandomAddress,
-} from '../../test-utils.js';
-import '../../jest-setup.js';
-import { getTestConfig } from '../lib-test-utils.js';
-
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
-
-describe('voucher test utils', () => {
-  test('createVoucherType should create a voucherType and return the id', async () => {
-    const voucherTypeId = await createVoucherType(iexecTestChain)({
-      description: 'test voucher type',
-      duration: 42,
-    });
-    expect(typeof voucherTypeId).toBe('bigint');
-  });
-  test('createVoucher should create a voucher and publish workerpool orders', async () => {
-    const owner = getRandomAddress();
-    const voucherTypeId = await createVoucherType(iexecTestChain)();
-    await createVoucher(iexecTestChain)({
-      owner,
-      voucherType: voucherTypeId,
-      value: 48,
-    });
-    const { iexec } = getTestConfig(iexecTestChain)({ readOnly: true });
-    const debugWorkerpoolOrderbook =
-      await iexec.orderbook.fetchWorkerpoolOrderbook({
-        workerpool: 'debug-v8-bellecour.main.pools.iexec.eth',
-        minTag: ['tee', 'scone'],
-        requester: owner,
-        isRequesterStrict: true,
-      });
-    expect(debugWorkerpoolOrderbook.count).toBeGreaterThan(0);
-  });
-});
diff --git a/test/lib/e2e/workflow.test.js b/test/lib/e2e/workflow.test.js
index 76553e17..0d4c33fb 100644
--- a/test/lib/e2e/workflow.test.js
+++ b/test/lib/e2e/workflow.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BN } from 'bn.js';
 import { getTestConfig } from '../lib-test-utils.js';
@@ -14,7 +12,7 @@ import {
 import '../../jest-setup.js';
 import { errors } from '../../../src/lib/index.js';
 
-const iexecTestChain = TEST_CHAINS['bellecour-fork'];
+const testChain = TEST_CHAINS['arbitrum-sepolia-fork'];
 
 describe('[workflow]', () => {
   let noDurationCatId;
@@ -24,7 +22,7 @@ describe('[workflow]', () => {
   let workerpoolorderToClaim;
 
   test('create category', async () => {
-    const res = await adminCreateCategory(iexecTestChain)({
+    const res = await adminCreateCategory(testChain)({
       name: 'custom',
       description: 'desc',
       workClockTimeRef: '0',
@@ -36,7 +34,7 @@ describe('[workflow]', () => {
   });
 
   test('deploy and sell app', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
+    const { iexec } = await getTestConfig(testChain)();
     const owner = await iexec.wallet.getAddress();
     const appName = `My app${getId()}`;
     const appDeployRes = await iexec.app.deployApp({
@@ -76,7 +74,7 @@ describe('[workflow]', () => {
   });
 
   test('deploy and sell dataset', async () => {
-    const { iexec } = getTestConfig(iexecTestChain)();
+    const { iexec } = await getTestConfig(testChain)();
     const owner = await iexec.wallet.getAddress();
     const datasetName = `My dataset${getId()}`;
     const datasetDeployRes = await iexec.dataset.deployDataset({
@@ -115,9 +113,9 @@ describe('[workflow]', () => {
   });
 
   test('deploy and sell computing power', async () => {
-    const { iexec, wallet } = getTestConfig(iexecTestChain)();
+    const { iexec, wallet } = await getTestConfig(testChain)();
     const workerpoolPrice = '1000000000';
-    await setNRlcBalance(iexecTestChain)(wallet.address, workerpoolPrice);
+    await setNRlcBalance(testChain)(wallet.address, workerpoolPrice);
     const owner = await iexec.wallet.getAddress();
     const desc = `workerpool${getId()}`;
     const workerpoolDeployRes = await iexec.workerpool.deployWorkerpool({
@@ -163,7 +161,7 @@ describe('[workflow]', () => {
   });
 
   test('buy computation', async () => {
-    const { iexec, wallet } = getTestConfig(iexecTestChain)();
+    const { iexec, wallet } = await getTestConfig(testChain)();
     const order = await iexec.order.createRequestorder({
       app: apporder.app,
       appmaxprice: apporder.appprice,
@@ -189,7 +187,7 @@ describe('[workflow]', () => {
     const totalPrice = new BN(order.appmaxprice)
       .add(new BN(order.datasetmaxprice))
       .add(new BN(order.workerpoolmaxprice));
-    await setNRlcBalance(iexecTestChain)(wallet.address, totalPrice);
+    await setNRlcBalance(testChain)(wallet.address, totalPrice);
     await iexec.account.deposit(totalPrice);
     expect(signedorder.sign).toBeDefined();
 
@@ -209,7 +207,7 @@ describe('[workflow]', () => {
   });
 
   test('show & claim task, show & claim deal (initialized & uninitialized tasks)', async () => {
-    const { iexec, wallet } = getTestConfig(iexecTestChain)();
+    const { iexec, wallet } = await getTestConfig(testChain)();
     const order = await iexec.order.createRequestorder({
       app: apporder.app,
       appmaxprice: apporder.appprice,
@@ -227,7 +225,7 @@ describe('[workflow]', () => {
       .add(new BN(order.datasetmaxprice))
       .add(new BN(order.workerpoolmaxprice))
       .mul(new BN(order.volume));
-    await setNRlcBalance(iexecTestChain)(wallet.address, totalPrice);
+    await setNRlcBalance(testChain)(wallet.address, totalPrice);
     await iexec.account.deposit(totalPrice);
     expect(signedorder.sign).toBeDefined();
     const matchOrdersRes = await iexec.order.matchOrders(
@@ -293,11 +291,11 @@ describe('[workflow]', () => {
       .catch((e) => e);
     expect(showTaskUnsetRes instanceof errors.ObjectNotFoundError).toBe(true);
     expect(showTaskUnsetRes.message).toBe(
-      `No task found for id ${showDealRes.tasks[0]} on chain ${iexecTestChain.chainId}`,
+      `No task found for id ${showDealRes.tasks[0]} on chain ${testChain.chainId}`,
     );
 
     const taskIdxToInit = 1;
-    await initializeTask(iexecTestChain)(matchOrdersRes.dealid, taskIdxToInit);
+    await initializeTask(testChain)(matchOrdersRes.dealid, taskIdxToInit);
     const showTaskActiveRes = await iexec.task.show(
       showDealRes.tasks[taskIdxToInit],
     );
@@ -326,7 +324,7 @@ describe('[workflow]', () => {
     expect(showTaskActiveRes.taskTimedOut).toBe(true);
 
     const taskIdxToClaim = 2;
-    await initializeTask(iexecTestChain)(matchOrdersRes.dealid, taskIdxToClaim);
+    await initializeTask(testChain)(matchOrdersRes.dealid, taskIdxToClaim);
     const claimTaskRes = await iexec.task.claim(
       showDealRes.tasks[taskIdxToClaim],
     );
diff --git a/test/lib/lib-test-utils.js b/test/lib/lib-test-utils.js
index aa6725af..7dc4a382 100644
--- a/test/lib/lib-test-utils.js
+++ b/test/lib/lib-test-utils.js
@@ -1,7 +1,5 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { expect } from '@jest/globals';
-import { NULL_ADDRESS, TEE_FRAMEWORKS, getId, sleep } from '../test-utils.js';
+import { NULL_ADDRESS, getId, sleep } from '../test-utils.js';
 export { getTestConfig, getTestConfigOptions } from '../test-config-utils.js';
 
 export const ONE_ETH = 10n ** 18n;
@@ -19,16 +17,14 @@ export const deployRandomApp = async (iexec, { owner, teeFramework } = {}) =>
     checksum:
       '0x00f51494d7a42a3c1c43464d9f09e06b2a99968e3b978f6cd11ab3410b7bcd14',
     mrenclave:
-      teeFramework && teeFramework !== TEE_FRAMEWORKS.TDX
-        ? {
-            framework: teeFramework,
+      teeFramework === 'scone' // keep to test legacy scone app detection
+        ? JSON.stringify({
+            framework: 'SCONE',
             version: 'v1',
             fingerprint: 'fingerprint',
-            ...(teeFramework.toLowerCase() === TEE_FRAMEWORKS.SCONE && {
-              entrypoint: 'entrypoint.sh',
-              heapSize: 4096,
-            }),
-          }
+            entrypoint: 'entrypoint.sh',
+            heapSize: 4096,
+          })
         : undefined,
   });
 
diff --git a/test/lib/unit/config.test.js b/test/lib/unit/config.test.js
index 9d23f3f3..0c9c2902 100644
--- a/test/lib/unit/config.test.js
+++ b/test/lib/unit/config.test.js
@@ -1,54 +1,37 @@
 import { describe, test, expect } from '@jest/globals';
-import { Network } from 'ethers';
-import {
-  CHAIN_SPECIFIC_FEATURES,
-  checkImplementedOnChain,
-  getChainDefaults,
-  getId,
-} from '../../../src/common/utils/config.js';
+import { getChainDefaults, getId } from '../../../src/common/utils/config.js';
 
 describe('getId()', () => {
   test('chain id as number returns id', () => {
-    expect(getId(134)).toBe(134);
+    expect(getId(421614)).toBe(421614);
   });
   test('chain id as string returns id', () => {
-    expect(getId('134')).toBe(134);
+    expect(getId('421614')).toBe(421614);
   });
   test('chain name returns id', () => {
-    expect(getId('bellecour')).toBe(134);
+    expect(getId('arbitrum-sepolia-testnet')).toBe(421614);
   });
 });
 
 describe('getChainDefaults', () => {
-  test('id 134 returns bellecour config', () => {
-    expect(getChainDefaults(134)).toEqual({
-      bridge: {
-        bridgedChainId: '1',
-        contract: '0x188A4376a1D818bF2434972Eb34eFd57102a19b7',
-      },
-      ensPublicResolver: '0x1347d8a1840A810B990d0B774A6b7Bb8A1bd62BB',
-      ensRegistry: '0x5f5B93fca68c9C79318d1F3868A354EE67D8c006',
-      host: 'https://bellecour.iex.ec',
-      hub: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f',
-      iexecGateway: 'https://api.market.v8-bellecour.iex.ec',
-      ipfsGateway: 'https://ipfs-gateway.v8-bellecour.iex.ec',
-      ipfsNode: 'https://ipfs-upload.v8-bellecour.iex.ec',
-      name: 'bellecour',
-      pocoSubgraph: 'https://thegraph.iex.ec/subgraphs/name/bellecour/poco-v5',
-      resultProxy: 'https://result.v8-bellecour.iex.ec',
-      sms: {
-        gramine: 'https://sms.gramine.v8-bellecour.iex.ec',
-        scone: 'https://sms.iex.ec',
-      },
-      compass: undefined,
-      voucherHub: '0x3137B6DF4f36D338b82260eDBB2E7bab034AFEda',
-      voucherSubgraph:
-        'https://thegraph.iex.ec/subgraphs/name/bellecour/iexec-voucher',
+  test('id 421614 returns arbitrum-sepolia-testnet config', () => {
+    expect(getChainDefaults(421614)).toEqual({
+      host: 'https://sepolia-rollup.arbitrum.io/rpc',
+      hub: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E',
+      iexecGateway: 'https://api-market.arbitrum-sepolia-testnet.iex.ec',
+      ipfsGateway: 'https://ipfs-gateway.arbitrum-sepolia-testnet.iex.ec',
+      ipfsNode: 'https://ipfs-upload.arbitrum-sepolia-testnet.iex.ec',
+      name: 'arbitrum-sepolia-testnet',
+      pocoSubgraph:
+        'https://thegraph.arbitrum-sepolia-testnet.iex.ec/api/subgraphs/id/2GCj8gzLCihsiEDq8cYvC5nUgK6VfwZ6hm3Wj8A3kcxz',
+      sms: 'https://sms.arbitrum-sepolia-testnet.iex.ec',
+      compass: 'https://compass.arbitrum-sepolia-testnet.iex.ec',
     });
   });
   test('unknown id returns empty object', () => {
     expect(getChainDefaults(0)).toEqual({});
   });
+  // skipped because no experimental networks are currently defined
   test.skip('experimental networks are accessible with `allowExperimentalNetworks:true` hidden by default', () => {
     expect(getChainDefaults(421614)).toEqual({});
     expect(
@@ -56,134 +39,3 @@ describe('getChainDefaults', () => {
     ).toBeDefined();
   });
 });
-
-describe('Networks', () => {
-  test('ethers Networks is populated with bellecour', () => {
-    const networkFromId = Network.from(134);
-    expect(networkFromId.chainId).toBe(134n);
-    expect(networkFromId.name).toBe('bellecour');
-
-    const networkFromName = Network.from('bellecour');
-    expect(networkFromName.chainId).toBe(134n);
-    expect(networkFromName.name).toBe('bellecour');
-  });
-});
-
-describe('checkImplementedOnChain', () => {
-  describe(`feature ${CHAIN_SPECIFIC_FEATURES.ENS}`, () => {
-    const feature = CHAIN_SPECIFIC_FEATURES.ENS;
-    test('is implemented on bellecour', () => {
-      expect(() => checkImplementedOnChain(134, feature)).not.toThrow();
-    });
-    test('is implemented on mainnet', () => {
-      expect(() => checkImplementedOnChain(1, feature)).not.toThrow();
-    });
-    test('is not implemented on arbitrum-mainnet', () => {
-      expect(() => checkImplementedOnChain(42161, feature)).toThrow(
-        `${feature} is not available on network arbitrum-mainnet`,
-      );
-    });
-    test('is not implemented on arbitrum-sepolia-testnet', () => {
-      expect(() => checkImplementedOnChain(421614, feature)).toThrow(
-        `${feature} is not available on network arbitrum-sepolia-testnet`,
-      );
-    });
-  });
-  describe(`feature ${CHAIN_SPECIFIC_FEATURES.WORKERPOOL_API_URL_REGISTRATION}`, () => {
-    const feature = CHAIN_SPECIFIC_FEATURES.WORKERPOOL_API_URL_REGISTRATION;
-    test('is implemented on bellecour', () => {
-      expect(() => checkImplementedOnChain(134, feature)).not.toThrow();
-    });
-    test('is implemented on mainnet', () => {
-      expect(() => checkImplementedOnChain(1, feature)).not.toThrow();
-    });
-    test('is not implemented on arbitrum-mainnet', () => {
-      expect(() => checkImplementedOnChain(42161, feature)).toThrow(
-        `${feature} is not available on network arbitrum-mainnet`,
-      );
-    });
-    test('is not implemented on arbitrum-sepolia-testnet', () => {
-      expect(() => checkImplementedOnChain(421614, feature)).toThrow(
-        `${feature} is not available on network arbitrum-sepolia-testnet`,
-      );
-    });
-  });
-  describe(`feature ${CHAIN_SPECIFIC_FEATURES.VOUCHER}`, () => {
-    const feature = CHAIN_SPECIFIC_FEATURES.VOUCHER;
-    test('is implemented on bellecour', () => {
-      expect(() => checkImplementedOnChain(134, feature)).not.toThrow();
-    });
-    test('is not implemented on mainnet', () => {
-      expect(() => checkImplementedOnChain(1, feature)).toThrow(
-        `${feature} is not available on network mainnet`,
-      );
-    });
-    test('is not implemented on arbitrum-mainnet', () => {
-      expect(() => checkImplementedOnChain(42161, feature)).toThrow(
-        `${feature} is not available on network arbitrum-mainnet`,
-      );
-    });
-    test('is not implemented on arbitrum-sepolia-testnet', () => {
-      expect(() => checkImplementedOnChain(421614, feature)).toThrow(
-        `${feature} is not available on network arbitrum-sepolia-testnet`,
-      );
-    });
-  });
-  describe(`feature ${CHAIN_SPECIFIC_FEATURES.COMPASS}`, () => {
-    const feature = CHAIN_SPECIFIC_FEATURES.COMPASS;
-    test('is not implemented on bellecour', () => {
-      expect(() => checkImplementedOnChain(134, feature)).toThrow(
-        `${feature} is not available on network bellecour`,
-      );
-    });
-    test('is not implemented on mainnet', () => {
-      expect(() => checkImplementedOnChain(1, feature)).toThrow(
-        `${feature} is not available on network mainnet`,
-      );
-    });
-    test('is implemented on arbitrum-mainnet', () => {
-      expect(() => checkImplementedOnChain(42161, feature)).not.toThrow();
-    });
-    test('is implemented on arbitrum-sepolia-testnet', () => {
-      expect(() => checkImplementedOnChain(421614, feature)).not.toThrow();
-    });
-  });
-  describe(`feature ${CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE}`, () => {
-    const feature = CHAIN_SPECIFIC_FEATURES.XRLC_BRIDGE;
-    test('is implemented on bellecour', () => {
-      expect(() => checkImplementedOnChain(134, feature)).not.toThrow();
-    });
-    test('is implemented on mainnet', () => {
-      expect(() => checkImplementedOnChain(1, feature)).not.toThrow();
-    });
-    test('is not implemented on arbitrum-mainnet', () => {
-      expect(() => checkImplementedOnChain(42161, feature)).toThrow(
-        `${feature} is not available on network arbitrum-mainnet`,
-      );
-    });
-    test('is not implemented on arbitrum-sepolia-testnet', () => {
-      expect(() => checkImplementedOnChain(421614, feature)).toThrow(
-        `${feature} is not available on network arbitrum-sepolia-testnet`,
-      );
-    });
-  });
-  describe(`feature ${CHAIN_SPECIFIC_FEATURES.BULK_PROCESSING}`, () => {
-    const feature = CHAIN_SPECIFIC_FEATURES.BULK_PROCESSING;
-    test('is not implemented on bellecour', () => {
-      expect(() => checkImplementedOnChain(134, feature)).toThrow(
-        `${feature} is not available on network bellecour`,
-      );
-    });
-    test('is not implemented on mainnet', () => {
-      expect(() => checkImplementedOnChain(1, feature)).toThrow(
-        `${feature} is not available on network mainnet`,
-      );
-    });
-    test('is not implemented on arbitrum-mainnet', () => {
-      expect(() => checkImplementedOnChain(42161, feature)).not.toThrow();
-    });
-    test('is implemented on arbitrum-sepolia-testnet', () => {
-      expect(() => checkImplementedOnChain(421614, feature)).not.toThrow();
-    });
-  });
-});
diff --git a/test/lib/unit/errorWrappers.test.js b/test/lib/unit/errorWrappers.test.js
index 6254d282..226941d5 100644
--- a/test/lib/unit/errorWrappers.test.js
+++ b/test/lib/unit/errorWrappers.test.js
@@ -1,5 +1,3 @@
-// @jest/global comes with jest
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { describe, test, expect } from '@jest/globals';
 import { BrowserProvider } from 'ethers';
 import {
@@ -21,7 +19,7 @@ describe('wrapPersonalSign', () => {
   test('detects user signature rejection', async () => {
     const userRejectSigner = await new BrowserProvider(
       new InjectedProvider(
-        'https://bellecour.iex.ec',
+        'https://sepolia-rollup.arbitrum.io/rpc',
         getRandomWallet().privateKey,
         {
           mockUserRejection: true,
@@ -36,7 +34,7 @@ describe('wrapPersonalSign', () => {
 
     const errorSigner = await new BrowserProvider(
       new InjectedProvider(
-        'https://bellecour.iex.ec',
+        'https://sepolia-rollup.arbitrum.io/rpc',
         getRandomWallet().privateKey,
         {
           mockError: true,
@@ -55,7 +53,7 @@ describe('wrapSignTypedData', () => {
   test('detects user signature rejection', async () => {
     const userRejectSigner = await new BrowserProvider(
       new InjectedProvider(
-        'https://bellecour.iex.ec',
+        'https://sepolia-rollup.arbitrum.io/rpc',
         getRandomWallet().privateKey,
         {
           mockUserRejection: true,
@@ -74,7 +72,7 @@ describe('wrapSignTypedData', () => {
 
     const errorSigner = await new BrowserProvider(
       new InjectedProvider(
-        'https://bellecour.iex.ec',
+        'https://sepolia-rollup.arbitrum.io/rpc',
         getRandomWallet().privateKey,
         {
           mockError: true,
@@ -97,7 +95,7 @@ describe('wrapSend', () => {
   test('detects user signature rejection', async () => {
     const userRejectSigner = await new BrowserProvider(
       new InjectedProvider(
-        'https://bellecour.iex.ec',
+        'https://sepolia-rollup.arbitrum.io/rpc',
         getRandomWallet().privateKey,
         {
           mockUserRejection: true,
@@ -112,7 +110,7 @@ describe('wrapSend', () => {
 
     const errorSigner = await new BrowserProvider(
       new InjectedProvider(
-        'https://bellecour.iex.ec',
+        'https://sepolia-rollup.arbitrum.io/rpc',
         getRandomWallet().privateKey,
         {
           mockError: true,
diff --git a/test/lib/unit/order-helper.test.js b/test/lib/unit/order-helper.test.js
index 5814f05e..07983162 100644
--- a/test/lib/unit/order-helper.test.js
+++ b/test/lib/unit/order-helper.test.js
@@ -19,15 +19,5 @@ describe('order-helper', () => {
       const framework = await resolveTeeFrameworkFromTag(['tee']);
       expect(framework).toBeUndefined();
     });
-
-    test('returns SCONE for tag [tee, scone]', async () => {
-      const framework = await resolveTeeFrameworkFromTag(['tee', 'scone']);
-      expect(framework).toBe(TEE_FRAMEWORKS.SCONE);
-    });
-
-    test('returns GRAMINE for tag [tee, gramine]', async () => {
-      const framework = await resolveTeeFrameworkFromTag(['tee', 'gramine']);
-      expect(framework).toBe(TEE_FRAMEWORKS.GRAMINE);
-    });
   });
 });
diff --git a/test/lib/unit/validator.test.js b/test/lib/unit/validator.test.js
index 7a7da89f..0fa77908 100644
--- a/test/lib/unit/validator.test.js
+++ b/test/lib/unit/validator.test.js
@@ -1,14 +1,8 @@
 import { Buffer } from 'buffer';
 import { BN } from 'bn.js';
-import { getDefaultProvider } from 'ethers';
 import fsExtra from 'fs-extra';
 import { join } from 'path';
-import {
-  ALCHEMY_API_KEY,
-  ETHERSCAN_API_KEY,
-  INFURA_PROJECT_ID,
-  TEE_FRAMEWORKS,
-} from '../../test-utils.js';
+import { TEE_FRAMEWORKS } from '../../test-utils.js';
 import {
   uint256Schema,
   weiAmountSchema,
@@ -23,13 +17,6 @@ import {
   objParamsSchema,
   base64Encoded256bitsKeySchema,
   fileBufferSchema,
-  ensDomainSchema,
-  ensLabelSchema,
-  textRecordKeySchema,
-  textRecordValueSchema,
-  workerpoolApiUrlSchema,
-  smsUrlOrMapSchema,
-  teeFrameworkSchema,
   addressOrAnySchema,
   signedDatasetorderBulkSchema,
 } from '../../../src/common/utils/validator.js';
@@ -40,13 +27,6 @@ const { ValidationError } = errors;
 
 const { readFile } = fsExtra;
 
-const mainnetDefaultProvider = getDefaultProvider('mainnet', {
-  cloudflare: true,
-  alchemy: ALCHEMY_API_KEY || '-',
-  etherscan: ETHERSCAN_API_KEY || '-',
-  infura: INFURA_PROJECT_ID || '-',
-});
-
 describe('[positiveIntSchema]', () => {
   test('int', async () => {
     await expect(positiveIntSchema().validate(48)).resolves.toBe(48);
@@ -573,7 +553,7 @@ describe('[objParamsSchema]', () => {
       ),
     ).rejects.toThrow(
       new ValidationError(
-        'iexec_result_storage_provider "foo" is not a valid storage provider, use one of the supported providers (ipfs, dropbox)',
+        'iexec_result_storage_provider "foo" is not a valid storage provider, use one of the supported providers (dropbox, ipfs)',
       ),
     );
   });
@@ -718,17 +698,6 @@ describe('[objParamsSchema]', () => {
     );
   });
 
-  test('with custom result-proxy', async () => {
-    await expect(
-      objParamsSchema().validate({
-        iexec_result_storage_proxy: 'https://custom-result-proxy.iex.ec',
-      }),
-    ).resolves.toEqual({
-      iexec_result_storage_provider: 'ipfs',
-      iexec_result_storage_proxy: 'https://custom-result-proxy.iex.ec',
-    });
-  });
-
   test('with encryption (true)', async () => {
     await expect(
       objParamsSchema().validate({
@@ -787,10 +756,10 @@ describe('[tagSchema]', () => {
   test('bytes 32 tags', async () => {
     await expect(
       tagSchema().validate(
-        '0x0000000000000000000000000000000000000000000000000000000000000103',
+        '0x0000000000000000000000000000000000000000000000000000000000000109',
       ),
     ).resolves.toBe(
-      '0x0000000000000000000000000000000000000000000000000000000000000103',
+      '0x0000000000000000000000000000000000000000000000000000000000000109',
     );
   });
   test('unknown bytes 32 tag is allowed', async () => {
@@ -803,8 +772,8 @@ describe('[tagSchema]', () => {
     );
   });
   test('array of tags', async () => {
-    await expect(tagSchema().validate(['tee', 'scone', 'gpu'])).resolves.toBe(
-      '0x0000000000000000000000000000000000000000000000000000000000000103',
+    await expect(tagSchema().validate(['tee', 'tdx', 'gpu'])).resolves.toBe(
+      '0x0000000000000000000000000000000000000000000000000000000000000109',
     );
   });
   test('empty tag', async () => {
@@ -818,8 +787,8 @@ describe('[tagSchema]', () => {
     );
   });
   test('comma separated tags', async () => {
-    await expect(tagSchema().validate('gpu,tee,scone')).resolves.toBe(
-      '0x0000000000000000000000000000000000000000000000000000000000000103',
+    await expect(tagSchema().validate('gpu,tee,tdx')).resolves.toBe(
+      '0x0000000000000000000000000000000000000000000000000000000000000109',
     );
   });
   test('unknown tag in array', async () => {
@@ -835,7 +804,7 @@ describe('[tagSchema]', () => {
   test('invalid tee tag', async () => {
     await expect(tagSchema().validate('tee')).rejects.toThrow(
       new ValidationError(
-        "'tee' tag must be used with a tee framework ('scone'|'gramine'|'tdx')",
+        "'tee' tag must be used with a tee framework ('tdx')",
       ),
     );
     await expect(
@@ -844,29 +813,9 @@ describe('[tagSchema]', () => {
       ),
     ).rejects.toThrow(
       new ValidationError(
-        "'tee' tag must be used with a tee framework ('scone'|'gramine'|'tdx')",
+        "'tee' tag must be used with a tee framework ('tdx')",
       ),
     );
-    await expect(tagSchema().validate('scone')).rejects.toThrow(
-      new ValidationError("'scone' tag must be used with 'tee' tag"),
-    );
-    await expect(
-      tagSchema().validate(
-        '0x0000000000000000000000000000000000000000000000000000000000000002',
-      ),
-    ).rejects.toThrow(
-      new ValidationError("'scone' tag must be used with 'tee' tag"),
-    );
-    await expect(tagSchema().validate('gramine')).rejects.toThrow(
-      new ValidationError("'gramine' tag must be used with 'tee' tag"),
-    );
-    await expect(
-      tagSchema().validate(
-        '0x0000000000000000000000000000000000000000000000000000000000000004',
-      ),
-    ).rejects.toThrow(
-      new ValidationError("'gramine' tag must be used with 'tee' tag"),
-    );
     await expect(tagSchema().validate('tdx')).rejects.toThrow(
       new ValidationError("'tdx' tag must be used with 'tee' tag"),
     );
@@ -883,19 +832,15 @@ describe('[tagSchema]', () => {
     expect(agnosticTeeTag).toBe(
       '0x0000000000000000000000000000000000000000000000000000000000000001',
     );
-    await expect(tagSchema().validate('tee,gramine,scone')).rejects.toThrow(
-      new ValidationError(
-        "tee framework tags are exclusive ('scone'|'gramine'|'tdx')",
-      ),
+    await expect(tagSchema().validate('tee,scone,tdx')).rejects.toThrow(
+      new ValidationError("Unsupported legacy TEE framework tag ('scone')"),
     );
     await expect(
       tagSchema().validate(
-        '0x0000000000000000000000000000000000000000000000000000000000000007',
+        '0x0000000000000000000000000000000000000000000000000000000000000003',
       ),
     ).rejects.toThrow(
-      new ValidationError(
-        "tee framework tags are exclusive ('scone'|'gramine'|'tdx')",
-      ),
+      new ValidationError("Unsupported legacy TEE framework tag ('scone')"),
     );
     const teeTdxTag = await tagSchema().validate(['tee', 'tdx']);
     expect(teeTdxTag).toBe(
@@ -906,11 +851,7 @@ describe('[tagSchema]', () => {
 
 describe('[addressSchema]', () => {
   test('undefined', async () => {
-    await expect(
-      addressSchema({
-        ethProvider: mainnetDefaultProvider,
-      }).validate(undefined),
-    ).resolves.toBe(undefined);
+    await expect(addressSchema().validate(undefined)).resolves.toBe(undefined);
   });
   test('address', async () => {
     await expect(
@@ -922,13 +863,6 @@ describe('[addressSchema]', () => {
       addressSchema().validate('607F4C5BB672230e8672085532f7e901544a7375'),
     ).resolves.toBe('0x607F4C5BB672230e8672085532f7e901544a7375');
   });
-  test('address (with ethProvider)', async () => {
-    await expect(
-      addressSchema({ ethProvider: mainnetDefaultProvider }).validate(
-        '0x607F4C5BB672230e8672085532f7e901544a7375',
-      ),
-    ).resolves.toBe('0x607F4C5BB672230e8672085532f7e901544a7375');
-  });
   test('invalid address', async () => {
     await expect(
       addressSchema().validate('0x07F4C5BB672230e8672085532f7e901544a7375'),
@@ -938,36 +872,13 @@ describe('[addressSchema]', () => {
       ),
     );
   });
-  test('ens (resolve ENS with ethProvider)', async () => {
-    await expect(
-      addressSchema({ ethProvider: mainnetDefaultProvider }).validate(
-        'rlc.iexec.eth',
-      ),
-    ).resolves.toBe('0x607F4C5BB672230e8672085532f7e901544a7375');
-  }, 10000);
-  test('invalid ens (throw when ens is missing)', async () => {
-    await expect(
-      addressSchema({ ethProvider: mainnetDefaultProvider }).validate(
-        'pierre.iexec.eth',
-      ),
-    ).rejects.toThrow(
-      new ValidationError('Unable to resolve ENS pierre.iexec.eth'),
-    );
-  });
-  test('ens (throw when ethProvider is missing)', async () => {
-    await expect(addressSchema().validate('rlc.iexec.eth')).rejects.toThrow(
-      new ValidationError('Unable to resolve ENS rlc.iexec.eth'),
-    );
-  });
 });
 
 describe('[addressOrAnySchema]', () => {
   test('undefined', async () => {
-    await expect(
-      addressOrAnySchema({
-        ethProvider: mainnetDefaultProvider,
-      }).validate(undefined),
-    ).resolves.toBe(undefined);
+    await expect(addressOrAnySchema().validate(undefined)).resolves.toBe(
+      undefined,
+    );
   });
   test('any', async () => {
     await expect(addressOrAnySchema().validate('any')).resolves.toBe('any');
@@ -986,9 +897,9 @@ describe('[addressOrAnySchema]', () => {
   });
   test('address (with ethProvider)', async () => {
     await expect(
-      addressOrAnySchema({
-        ethProvider: mainnetDefaultProvider,
-      }).validate('0x607F4C5BB672230e8672085532f7e901544a7375'),
+      addressOrAnySchema().validate(
+        '0x607F4C5BB672230e8672085532f7e901544a7375',
+      ),
     ).resolves.toBe('0x607F4C5BB672230e8672085532f7e901544a7375');
   });
   test('invalid address', async () => {
@@ -1002,29 +913,6 @@ describe('[addressOrAnySchema]', () => {
       ),
     );
   });
-  test('ens (resolve ENS with ethProvider)', async () => {
-    await expect(
-      addressOrAnySchema({
-        ethProvider: mainnetDefaultProvider,
-      }).validate('rlc.iexec.eth'),
-    ).resolves.toBe('0x607F4C5BB672230e8672085532f7e901544a7375');
-  }, 10000);
-  test('invalid ens (throw when ens is missing)', async () => {
-    await expect(
-      addressOrAnySchema({
-        ethProvider: mainnetDefaultProvider,
-      }).validate('pierre.iexec.eth'),
-    ).rejects.toThrow(
-      new ValidationError('Unable to resolve ENS pierre.iexec.eth'),
-    );
-  });
-  test('ens (throw when ethProvider is missing)', async () => {
-    await expect(
-      addressOrAnySchema().validate('rlc.iexec.eth'),
-    ).rejects.toThrow(
-      new ValidationError('Unable to resolve ENS rlc.iexec.eth'),
-    );
-  });
 });
 
 describe('[base64Encoded256bitsKeySchema]', () => {
@@ -1082,31 +970,7 @@ describe('[fileBufferSchema]', () => {
 });
 
 describe('[mrenclaveSchema]', () => {
-  test('valid obj', async () => {
-    const obj = {
-      framework: 'GRAMINE',
-      version: 'v5',
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    };
-    await expect(mrenclaveSchema().validate(obj)).resolves.toEqual(
-      Buffer.from(JSON.stringify(obj), 'utf8'),
-    );
-  });
-  test('valid SCONE obj', async () => {
-    const obj = {
-      framework: 'SCONE',
-      version: 'v5',
-      entrypoint: '/app/helloworld',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    };
-    await expect(mrenclaveSchema().validate(obj)).resolves.toEqual(
-      Buffer.from(JSON.stringify(obj), 'utf8'),
-    );
-  });
-  test('valid string', async () => {
+  test('any string', async () => {
     const str = JSON.stringify({
       framework: 'SCONE',
       version: 'v5',
@@ -1119,7 +983,7 @@ describe('[mrenclaveSchema]', () => {
       Buffer.from(str, 'utf8'),
     );
   });
-  test('valid bytes', async () => {
+  test('any bytes', async () => {
     const bytes = Buffer.from(
       JSON.stringify({
         framework: 'SCONE',
@@ -1151,33 +1015,9 @@ describe('[mrenclaveSchema]', () => {
       Buffer.from([]),
     );
   });
-  test('throw when "entrypoint" is set for non SCONE framework', async () => {
-    const obj = {
-      framework: 'GRAMINE',
-      version: 'v5',
-      entrypoint: '/app/helloworld',
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    };
-    await expect(mrenclaveSchema().validate(obj)).rejects.toThrow(
-      new ValidationError('Unknown key "entrypoint" in mrenclave'),
-    );
-  });
-  test('throw when "heapSize" is set for non SCONE framework', async () => {
-    const obj = {
-      framework: 'GRAMINE',
-      version: 'v5',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    };
-    await expect(mrenclaveSchema().validate(obj)).rejects.toThrow(
-      new ValidationError('Unknown key "heapSize" in mrenclave'),
-    );
-  });
   test('throw with null', async () => {
     await expect(mrenclaveSchema().validate(null)).rejects.toThrow(
-      new ValidationError('this is not a valid mrenclave'),
+      new ValidationError('this cannot be null'),
     );
   });
   test('throw with number', async () => {
@@ -1190,313 +1030,6 @@ describe('[mrenclaveSchema]', () => {
       new ValidationError('this is not a valid mrenclave'),
     );
   });
-  test('throw when unexpected key is found in obj', async () => {
-    const obj = {
-      framework: 'SCONE',
-      version: 'v5',
-      entrypoint: '/app/helloworld',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-      foo: 'bar',
-    };
-    await expect(mrenclaveSchema().validate(obj)).rejects.toThrow(
-      new ValidationError('Unknown key "foo" in mrenclave'),
-    );
-  });
-  test('throw when unexpected key is found in JSON string', async () => {
-    const str = JSON.stringify({
-      framework: 'SCONE',
-      version: 'v5',
-      entrypoint: '/app/helloworld',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-      foo: 'bar',
-    });
-    await expect(mrenclaveSchema().validate(str)).rejects.toThrow(
-      new ValidationError('Unknown key "foo" in mrenclave'),
-    );
-  });
-  test('throw when unexpected key is found in decoded bytes', async () => {
-    const bytes = Buffer.from(
-      JSON.stringify({
-        framework: 'SCONE',
-        version: 'v5',
-        entrypoint: '/app/helloworld',
-        heapSize: 1073741824,
-        fingerprint:
-          '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-        foo: 'bar',
-      }),
-      'utf8',
-    );
-    await expect(mrenclaveSchema().validate(bytes)).rejects.toThrow(
-      new ValidationError('Unknown key "foo" in mrenclave'),
-    );
-  });
-  test('throw when a key is missing in obj', async () => {
-    const obj = {
-      version: 'v5',
-      entrypoint: '/app/helloworld',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    };
-    await expect(mrenclaveSchema().validate(obj)).rejects.toThrow(
-      new ValidationError('framework is a required field'),
-    );
-  });
-  test('throw when a key is missing in JSON string', async () => {
-    const str = JSON.stringify({
-      framework: 'SCONE',
-      entrypoint: '/app/helloworld',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    });
-    await expect(mrenclaveSchema().validate(str)).rejects.toThrow(
-      new ValidationError('version is a required field'),
-    );
-  });
-  test('throw when a key is missing in decoded bytes', async () => {
-    const bytes = Buffer.from(
-      JSON.stringify({
-        framework: 'SCONE',
-        version: 'v5',
-        heapSize: 1073741824,
-        fingerprint:
-          '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-      }),
-      'utf8',
-    );
-    await expect(mrenclaveSchema().validate(bytes)).rejects.toThrow(
-      new ValidationError('entrypoint is a required field'),
-    );
-  });
-  test('throw when framework is not a valid TEE framework', async () => {
-    const obj = {
-      framework: 'FOO',
-      version: 'v5',
-      entrypoint: '/app/helloworld',
-      heapSize: 1073741824,
-      fingerprint:
-        '5036854f3f108465726a1374430ad0963b72a27a0e83dfea2ca11dae4cdbdf7d',
-    };
-    await expect(mrenclaveSchema().validate(obj)).rejects.toThrow(
-      new ValidationError('framework is not a valid TEE framework'),
-    );
-  });
-});
-
-describe('[ensLabelSchema]', () => {
-  test('valid', async () => {
-    await expect(ensLabelSchema().validate('a')).resolves.toBe('a');
-    await expect(ensLabelSchema().validate('🦄')).resolves.toBe('🦄');
-    await expect(ensLabelSchema().validate('a-b')).resolves.toBe('a-b');
-  });
-  test('throw with uppercase', async () => {
-    await expect(ensLabelSchema().validate('A')).rejects.toThrow(
-      'A is not a valid ENS label (label cannot contain uppercase characters)',
-    );
-  });
-  test('throw with unsupported characters', async () => {
-    await expect(ensLabelSchema().validate('&')).rejects.toThrow(
-      '& is not a valid ENS label (label cannot contain unsupported characters)',
-    );
-    await expect(ensLabelSchema().validate('@')).rejects.toThrow(
-      '@ is not a valid ENS label (label cannot contain unsupported characters)',
-    );
-  });
-  test('throw with dot', async () => {
-    await expect(ensLabelSchema().validate('foo.bar')).rejects.toThrow(
-      'foo.bar is not a valid ENS label (label cannot have `.`)',
-    );
-  });
-});
-
-describe('[ensDomainSchema]', () => {
-  test('valid', async () => {
-    await expect(ensDomainSchema().validate('foo.a-b.bar.eth')).resolves.toBe(
-      'foo.a-b.bar.eth',
-    );
-    await expect(
-      ensDomainSchema().validate('foo.🦄🦄🦄.bar.eth'),
-    ).resolves.toBe('foo.🦄🦄🦄.bar.eth');
-  });
-  test('throw with uppercase', async () => {
-    await expect(ensDomainSchema().validate('foo.Abc.bar.eth')).rejects.toThrow(
-      'foo.Abc.bar.eth is not a valid ENS domain (domain cannot contain uppercase characters)',
-    );
-  });
-  test('throw with unsupported characters', async () => {
-    await expect(ensDomainSchema().validate('foo.a&b.bar.eth')).rejects.toThrow(
-      'foo.a&b.bar.eth is not a valid ENS domain (domain cannot contain unsupported characters)',
-    );
-    await expect(ensDomainSchema().validate('foo.a@a.bar.eth')).rejects.toThrow(
-      'foo.a@a.bar.eth is not a valid ENS domain (domain cannot contain unsupported characters)',
-    );
-  });
-  test('throw with empty labels', async () => {
-    await expect(ensDomainSchema().validate('foo..bar.eth')).rejects.toThrow(
-      'foo..bar.eth is not a valid ENS domain (domain cannot have empty labels)',
-    );
-  });
-});
-
-describe('[textRecordKeySchema]', () => {
-  test('" "', async () => {
-    const res = await textRecordKeySchema().validate(' ');
-    expect(res).toBe(' ');
-  });
-  test('throw with empty string', async () => {
-    await expect(textRecordKeySchema().validate('')).rejects.toThrow(
-      'this is a required field',
-    );
-  });
-  test('throw with string coercible value', async () => {
-    await expect(textRecordKeySchema().validate(1)).rejects.toThrow(
-      'this must be a `string` type, but the final value was: `1`.',
-    );
-  });
-});
-
-describe('[textRecordValueSchema]', () => {
-  test('" "', async () => {
-    const res = await textRecordValueSchema().validate(' ');
-    expect(res).toBe(' ');
-  });
-  test('allow undefined', async () => {
-    const res = await textRecordValueSchema().validate();
-    expect(res).toBe(undefined);
-  });
-  test('allow empty string', async () => {
-    const res = await textRecordValueSchema().validate('');
-    expect(res).toBe('');
-  });
-  test('throw with null', async () => {
-    await expect(textRecordValueSchema().validate(null)).rejects.toThrow(
-      'this cannot be null',
-    );
-  });
-  test('throw with string coercible value', async () => {
-    await expect(textRecordValueSchema().validate(1)).rejects.toThrow(
-      'this must be a `string` type, but the final value was: `1`.',
-    );
-  });
-});
-
-describe('[workerpoolApiUrlSchema]', () => {
-  test('allow IP with port', async () => {
-    const res = await workerpoolApiUrlSchema().validate(
-      'http://192.168.0.1:8080',
-    );
-    expect(res).toBe('http://192.168.0.1:8080');
-  });
-  test('allow url', async () => {
-    const res = await workerpoolApiUrlSchema().validate(
-      'https://my-workerpool.com',
-    );
-    expect(res).toBe('https://my-workerpool.com');
-  });
-  test('allow undefined', async () => {
-    const res = await workerpoolApiUrlSchema().validate();
-    expect(res).toBe('');
-  });
-  test('allow empty string', async () => {
-    const res = await workerpoolApiUrlSchema().validate('');
-    expect(res).toBe('');
-  });
-  test('throw with null', async () => {
-    await expect(workerpoolApiUrlSchema().validate(null)).rejects.toThrow(
-      'this cannot be null',
-    );
-  });
-});
-
-describe('[smsUrlOrMapSchema]', () => {
-  test('allow IP with port', async () => {
-    const res = await smsUrlOrMapSchema().validate('http://192.168.0.1:8080');
-    expect(res).toBe('http://192.168.0.1:8080');
-  });
-  test('allow url', async () => {
-    const res = await smsUrlOrMapSchema().validate('https://my-sms.com');
-    expect(res).toBe('https://my-sms.com');
-  });
-  test('allow docker url', async () => {
-    const res = await smsUrlOrMapSchema().validate('http://my-sms');
-    expect(res).toBe('http://my-sms');
-  });
-  test('allow undefined', async () => {
-    const res = await smsUrlOrMapSchema().validate();
-    expect(res).toBe(undefined);
-  });
-  test('allow Record<TeeFramework,Url>', async () => {
-    const smsMap = {
-      scone: 'http://scone-sms',
-      gramine: 'http://gramine-sms',
-    };
-    const res = await smsUrlOrMapSchema().validate(smsMap);
-    expect(res).toEqual(smsMap);
-  });
-  test('allow partial Record<TeeFramework,Url>', async () => {
-    const smsMap = {
-      gramine: 'http://gramine-sms',
-    };
-    const res = await smsUrlOrMapSchema().validate(smsMap);
-    expect(res).toEqual(smsMap);
-  });
-  test('throw with empty string', async () => {
-    await expect(smsUrlOrMapSchema().validate('')).rejects.toThrow(
-      'this "" is not a valid URL',
-    );
-  });
-  test('throw with null', async () => {
-    await expect(smsUrlOrMapSchema().validate(null)).rejects.toThrow(
-      'this cannot be null',
-    );
-  });
-  test('throw with invalid url', async () => {
-    await expect(smsUrlOrMapSchema().validate('foo')).rejects.toThrow(
-      'this "foo" is not a valid URL',
-    );
-  });
-  test('throw with unknown TEE framework key', async () => {
-    await expect(
-      smsUrlOrMapSchema().validate({ foo: 'https://my-sms.com' }),
-    ).rejects.toThrow('this field has unspecified keys: foo');
-  });
-  test('throw with invalid url on a TEE framework key', async () => {
-    await expect(
-      smsUrlOrMapSchema().validate({ scone: 'foo' }),
-    ).rejects.toThrow('scone "foo" is not a valid URL');
-  });
-});
-
-describe('[teeFrameworkSchema]', () => {
-  test('allow known TEE frameworks', async () => {
-    await Promise.all(
-      Object.values(TEE_FRAMEWORKS).map(async (name) => {
-        await expect(teeFrameworkSchema().validate(name)).resolves.toBe(name);
-        await expect(
-          teeFrameworkSchema().validate(name.toUpperCase()),
-        ).resolves.toBe(name);
-      }),
-    );
-  });
-  test('allow undefined', async () => {
-    await expect(teeFrameworkSchema().validate()).resolves.toBe(undefined);
-  });
-  test('throw with unknown TEE framework', async () => {
-    await expect(teeFrameworkSchema().validate('foo')).rejects.toThrow(
-      'this is not a valid TEE framework',
-    );
-  });
-  test('throw with empty string', async () => {
-    await expect(teeFrameworkSchema().validate('')).rejects.toThrow(
-      'this is not a valid TEE framework',
-    );
-  });
 });
 
 describe('[signedDatasetorderBulkSchema]', () => {
diff --git a/test/mock/compass/data.json b/test/mock/compass/data.json
index 3ddfaf0d..293736de 100644
--- a/test/mock/compass/data.json
+++ b/test/mock/compass/data.json
@@ -1,13 +1,18 @@
 [
   {
-    "chainId": "65535",
-    "description": "custom-token-chain-no-ens",
+    "chainId": "421614",
+    "description": "arbitrum-sepolia-fork",
     "iapps": [],
     "workerpools": [
       {
-        "name": "custom-token-chain-no-ens-workerpool",
-        "apiUrl": "https://core.custom-token-chain-no-ens.iex.ec",
+        "name": "unreachable-workerpool",
+        "apiUrl": "https://unreachable-workerpool.iex.ec",
         "address": "0xB967057a21dc6A66A29721d96b8Aa7454B7c383F"
+      },
+      {
+        "name": "workerpool-http-500",
+        "apiUrl": "http://localhost:5500",
+        "address": "0x2956f0cb779904795a5f30d3b3ea88b714c3123f"
       }
     ]
   }
diff --git a/test/scripts/prepare-bellecour-fork-for-tests.js b/test/scripts/prepare-bellecour-fork-for-tests.js
deleted file mode 100755
index c66aa9b4..00000000
--- a/test/scripts/prepare-bellecour-fork-for-tests.js
+++ /dev/null
@@ -1,319 +0,0 @@
-import {
-  Contract,
-  JsonRpcProvider,
-  JsonRpcSigner,
-  formatEther,
-  keccak256,
-  toBeHex,
-} from 'ethers';
-
-const IEXEC_HUB_ADDRESS = '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f';
-const VOUCHER_HUB_ADDRESS = '0x3137B6DF4f36D338b82260eDBB2E7bab034AFEda';
-const TARGET_POCO_ADMIN_WALLET = '0x7bd4783FDCAD405A28052a0d1f11236A741da593';
-const TARGET_FAUCET_WALLET = '0xdFa2585C16cAf9c853086F36d2A37e9b8d1eab87';
-const TARGET_VOUCHER_MANAGER_WALLET =
-  '0x44cA21A3c4efE9B1A0268e2e9B2547E7d9C8f19C';
-const DEBUG_WORKERPOOL_OWNER_WALLET =
-  '0x02D0e61355e963210d0DE382e6BA09781181bB94';
-const PROD_WORKERPOOL_OWNER_WALLET =
-  '0x1Ff6AfF580e8Ca738F76485E0914C2aCaDa7B462';
-const DEBUG_WORKERPOOL = '0xdb214a4a444d176e22030be1ed89da1b029320f2'; // 'debug-v8-bellecour.main.pools.iexec.eth';
-const PROD_WORKERPOOL = '0x0e7bc972c99187c191a17f3cae4a2711a4188c3f'; // 'prod-v8-bellecour.main.pools.iexec.eth';
-
-const rpcURL = 'http://localhost:8545';
-
-const provider = new JsonRpcProvider(rpcURL, undefined, {
-  pollingInterval: 100, // fast polling for tests
-});
-
-const setBalance = async (address, weiAmount) => {
-  fetch(rpcURL, {
-    method: 'POST',
-    body: JSON.stringify({
-      method: 'anvil_setBalance',
-      params: [address, toBeHex(weiAmount)],
-      id: 1,
-      jsonrpc: '2.0',
-    }),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-  const balance = await provider.getBalance(address);
-  console.log(`${address} wallet balance is now ${formatEther(balance)} RLC`);
-};
-
-const impersonate = async (address) => {
-  await fetch(rpcURL, {
-    method: 'POST',
-    body: JSON.stringify({
-      method: 'anvil_impersonateAccount',
-      params: [address],
-      id: 1,
-      jsonrpc: '2.0',
-    }),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-  console.log(`impersonating ${address}`);
-};
-
-const stopImpersonate = async (address) => {
-  await fetch(rpcURL, {
-    method: 'POST',
-    body: JSON.stringify({
-      method: 'anvil_stopImpersonatingAccount',
-      params: [address],
-      id: 1,
-      jsonrpc: '2.0',
-    }),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-  console.log(`stop impersonating ${address}`);
-};
-
-const getIExecHubOwnership = async (targetOwner) => {
-  const iexecContract = new Contract(
-    IEXEC_HUB_ADDRESS,
-    [
-      {
-        inputs: [],
-        name: 'owner',
-        outputs: [{ internalType: 'address', name: '', type: 'address' }],
-        stateMutability: 'view',
-        type: 'function',
-        constant: true,
-      },
-      {
-        inputs: [
-          { internalType: 'address', name: 'newOwner', type: 'address' },
-        ],
-        name: 'transferOwnership',
-        outputs: [],
-        stateMutability: 'nonpayable',
-        type: 'function',
-      },
-    ],
-    provider,
-  );
-  const iexecOwner = await iexecContract.owner();
-  await impersonate(iexecOwner);
-  await iexecContract
-    .connect(new JsonRpcSigner(provider, iexecOwner))
-    .transferOwnership(targetOwner, { gasPrice: 0 })
-    .then((tx) => tx.wait());
-  await stopImpersonate(iexecOwner);
-
-  const newOwner = await iexecContract.owner();
-  console.log(
-    `IExecHub proxy at ${IEXEC_HUB_ADDRESS} is now owned by ${newOwner}`,
-  );
-};
-
-const getVoucherManagementRoles = async (targetManager) => {
-  const voucherHubContract = new Contract(
-    VOUCHER_HUB_ADDRESS,
-    [
-      {
-        inputs: [],
-        name: 'defaultAdmin',
-        outputs: [
-          {
-            internalType: 'address',
-            name: '',
-            type: 'address',
-          },
-        ],
-        stateMutability: 'view',
-        type: 'function',
-      },
-      {
-        inputs: [
-          {
-            internalType: 'bytes32',
-            name: 'role',
-            type: 'bytes32',
-          },
-          {
-            internalType: 'address',
-            name: 'account',
-            type: 'address',
-          },
-        ],
-        name: 'grantRole',
-        outputs: [],
-        stateMutability: 'nonpayable',
-        type: 'function',
-      },
-      {
-        inputs: [
-          {
-            internalType: 'bytes32',
-            name: 'role',
-            type: 'bytes32',
-          },
-          {
-            internalType: 'address',
-            name: 'account',
-            type: 'address',
-          },
-        ],
-        name: 'hasRole',
-        outputs: [
-          {
-            internalType: 'bool',
-            name: '',
-            type: 'bool',
-          },
-        ],
-        stateMutability: 'view',
-        type: 'function',
-      },
-    ],
-    provider,
-  );
-
-  const defaultAdmin = await voucherHubContract.defaultAdmin();
-
-  console.log('VoucherHub defaultAdmin:', defaultAdmin);
-
-  await impersonate(defaultAdmin);
-
-  const MINTER_ROLE = keccak256(Buffer.from('MINTER_ROLE'));
-
-  const MANAGER_ROLE = keccak256(Buffer.from('MANAGER_ROLE'));
-
-  await voucherHubContract
-    .connect(new JsonRpcSigner(provider, defaultAdmin))
-    .grantRole(MINTER_ROLE, targetManager, { gasPrice: 0 })
-    .then((tx) => tx.wait());
-
-  await voucherHubContract
-    .connect(new JsonRpcSigner(provider, defaultAdmin))
-    .grantRole(MANAGER_ROLE, targetManager, {
-      gasPrice: 0,
-    })
-    .then((tx) => tx.wait());
-
-  await stopImpersonate(defaultAdmin);
-
-  console.log(
-    `${targetManager} has role MINTER_ROLE: ${await voucherHubContract.hasRole(
-      MINTER_ROLE,
-      targetManager,
-    )}`,
-  );
-
-  console.log(
-    `${targetManager} has role MANAGER_ROLE: ${await voucherHubContract.hasRole(
-      MANAGER_ROLE,
-      targetManager,
-    )}`,
-  );
-};
-
-const getWorkerpoolOwnership = async (resourceAddress, targetOwner) => {
-  const RESOURCE_ABI = [
-    {
-      inputs: [],
-      name: 'owner',
-      outputs: [
-        {
-          internalType: 'address',
-          name: '',
-          type: 'address',
-        },
-      ],
-      stateMutability: 'view',
-      type: 'function',
-    },
-    {
-      inputs: [],
-      name: 'registry',
-      outputs: [
-        {
-          internalType: 'contract IRegistry',
-          name: '',
-          type: 'address',
-        },
-      ],
-      stateMutability: 'view',
-      type: 'function',
-    },
-  ];
-  const RESOURCE_REGISTRY_ABI = [
-    {
-      inputs: [
-        {
-          internalType: 'address',
-          name: 'from',
-          type: 'address',
-        },
-        {
-          internalType: 'address',
-          name: 'to',
-          type: 'address',
-        },
-        {
-          internalType: 'uint256',
-          name: 'tokenId',
-          type: 'uint256',
-        },
-      ],
-      name: 'safeTransferFrom',
-      outputs: [],
-      stateMutability: 'nonpayable',
-      type: 'function',
-    },
-  ];
-
-  const resourceContract = new Contract(
-    resourceAddress,
-    RESOURCE_ABI,
-    provider,
-  );
-
-  const resourceOwner = await resourceContract.owner();
-  const resourceRegistryAddress = await resourceContract.registry();
-  const resourceRegistryContract = new Contract(
-    resourceRegistryAddress,
-    RESOURCE_REGISTRY_ABI,
-    provider,
-  );
-
-  await impersonate(resourceOwner);
-  await resourceRegistryContract
-    .connect(new JsonRpcSigner(provider, resourceOwner))
-    .safeTransferFrom(resourceOwner, targetOwner, resourceAddress, {
-      gasPrice: 0,
-    })
-    .then((tx) => tx.wait());
-  await stopImpersonate(resourceOwner);
-
-  const newOwner = await resourceContract.owner();
-  console.log(`Workerpool ${resourceAddress} is now owned by ${newOwner}`);
-};
-
-const main = async () => {
-  console.log(`preparing bellecour-fork at ${rpcURL}`);
-
-  // prepare PoCo
-  await setBalance(TARGET_POCO_ADMIN_WALLET, 1000000n * 10n ** 18n);
-  await getIExecHubOwnership(TARGET_POCO_ADMIN_WALLET);
-
-  // prepare faucet wallet
-  await setBalance(TARGET_FAUCET_WALLET, 1000000n * 10n ** 18n);
-
-  // prepare Voucher
-  await setBalance(TARGET_VOUCHER_MANAGER_WALLET, 1000000n * 10n ** 18n);
-  await getVoucherManagementRoles(TARGET_VOUCHER_MANAGER_WALLET);
-
-  // prepare workerpools
-  await getWorkerpoolOwnership(DEBUG_WORKERPOOL, DEBUG_WORKERPOOL_OWNER_WALLET);
-  await getWorkerpoolOwnership(PROD_WORKERPOOL, PROD_WORKERPOOL_OWNER_WALLET);
-};
-
-main();
diff --git a/test/scripts/prepare-forks-for-tests.js b/test/scripts/prepare-forks-for-tests.js
new file mode 100755
index 00000000..e4f5b39a
--- /dev/null
+++ b/test/scripts/prepare-forks-for-tests.js
@@ -0,0 +1,117 @@
+import {
+  Contract,
+  JsonRpcProvider,
+  JsonRpcSigner,
+  formatEther,
+  toBeHex,
+} from 'ethers';
+
+const TARGET_POCO_ADMIN_WALLET = '0x7bd4783FDCAD405A28052a0d1f11236A741da593';
+
+const getProvider = (rpcUrl) =>
+  new JsonRpcProvider(rpcUrl, undefined, {
+    pollingInterval: 100, // fast polling for tests
+  });
+
+const setBalance = (rpcUrl) => async (address, weiAmount) => {
+  await fetch(rpcUrl, {
+    method: 'POST',
+    body: JSON.stringify({
+      method: 'anvil_setBalance',
+      params: [address, toBeHex(weiAmount)],
+      id: 1,
+      jsonrpc: '2.0',
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+  const balance = await getProvider(rpcUrl).getBalance(address);
+  console.log(`${address} wallet balance is now ${formatEther(balance)}`);
+};
+
+const impersonate = (rpcUrl) => async (address) => {
+  await fetch(rpcUrl, {
+    method: 'POST',
+    body: JSON.stringify({
+      method: 'anvil_impersonateAccount',
+      params: [address],
+      id: 1,
+      jsonrpc: '2.0',
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+  console.log(`impersonating ${address}`);
+};
+
+const stopImpersonate = (rpcUrl) => async (address) => {
+  await fetch(rpcUrl, {
+    method: 'POST',
+    body: JSON.stringify({
+      method: 'anvil_stopImpersonatingAccount',
+      params: [address],
+      id: 1,
+      jsonrpc: '2.0',
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+  console.log(`stop impersonating ${address}`);
+};
+
+const getIExecHubOwnership = (rpcUrl) => async (hubAddress, targetOwner) => {
+  const iexecContract = new Contract(
+    hubAddress,
+    [
+      {
+        inputs: [],
+        name: 'owner',
+        outputs: [{ internalType: 'address', name: '', type: 'address' }],
+        stateMutability: 'view',
+        type: 'function',
+        constant: true,
+      },
+      {
+        inputs: [
+          { internalType: 'address', name: 'newOwner', type: 'address' },
+        ],
+        name: 'transferOwnership',
+        outputs: [],
+        stateMutability: 'nonpayable',
+        type: 'function',
+      },
+    ],
+    getProvider(rpcUrl),
+  );
+  const iexecOwner = await iexecContract.owner();
+  await setBalance(rpcUrl)(iexecOwner, 1n * 10n ** 18n); // give some ETH to the owner to be able to send the transaction
+  await impersonate(rpcUrl)(iexecOwner);
+  await iexecContract
+    .connect(new JsonRpcSigner(getProvider(rpcUrl), iexecOwner))
+    .transferOwnership(targetOwner)
+    .then((tx) => tx.wait());
+  await stopImpersonate(rpcUrl)(iexecOwner);
+
+  const newOwner = await iexecContract.owner();
+  console.log(`IExecHub proxy at ${hubAddress} is now owned by ${newOwner}`);
+};
+
+const main = async () => {
+  const arbitrumSepoliaForkRpcUrl = 'http://localhost:8545';
+  console.log(
+    `preparing arbitrum-sepolia-fork at ${arbitrumSepoliaForkRpcUrl}`,
+  );
+  await setBalance(arbitrumSepoliaForkRpcUrl)(
+    TARGET_POCO_ADMIN_WALLET,
+    1000000n * 10n ** 18n,
+  );
+  await getIExecHubOwnership(arbitrumSepoliaForkRpcUrl)(
+    '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E',
+    TARGET_POCO_ADMIN_WALLET,
+  );
+};
+
+main();
diff --git a/test/scripts/prepare-test-env.js b/test/scripts/prepare-test-env.js
index 66ff927d..8c9db358 100644
--- a/test/scripts/prepare-test-env.js
+++ b/test/scripts/prepare-test-env.js
@@ -1,32 +1,51 @@
 import { writeFileSync } from 'fs';
 
-const forkUrl = process.env.BELLECOUR_FORK_URL || 'https://bellecour.iex.ec';
+const arbitrumSepoliaForkUrl =
+  process.env.ARBITRUM_SEPOLIA_FORK_URL ||
+  'https://sepolia-rollup.arbitrum.io/rpc';
 
-fetch(forkUrl, {
-  method: 'POST',
-  body: JSON.stringify({
-    jsonrpc: 2.0,
-    method: 'eth_blockNumber',
-    params: [],
-    id: 1,
-  }),
-})
-  .then((res) => res.json())
-  .then((jsonRes) => {
-    const forkBlockNumber = parseInt(jsonRes.result.substring(2), 16);
-    console.log('Creating .env file for docker-compose test-stack');
-    writeFileSync(
-      '.env',
-      `############ THIS FILE IS GENERATED ############
+const arbitrumSepoliaForkBlock = await getCurrentBlockNumber(
+  arbitrumSepoliaForkUrl,
+);
+
+console.log('Creating .env file for docker-compose test-stack');
+writeFileSync(
+  '.env',
+  `############ THIS FILE IS GENERATED ############
 # run "node prepare-test-env.js" to regenerate #
 ################################################
 
 # blockchain node to use as the reference for the local fork
-BELLECOUR_FORK_URL=${forkUrl}
+ARBITRUM_SEPOLIA_FORK_URL=${arbitrumSepoliaForkUrl}
 # block number to fork from
-BELLECOUR_FORK_BLOCK=${forkBlockNumber}`,
-    );
+ARBITRUM_SEPOLIA_FORK_BLOCK=${arbitrumSepoliaForkBlock}`,
+);
+
+async function getCurrentBlockNumber(forkUrl) {
+  const blockNumber = await fetch(forkUrl, {
+    method: 'POST',
+    body: JSON.stringify({
+      jsonrpc: '2.0',
+      method: 'eth_blockNumber',
+      params: [],
+      id: 1,
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
   })
-  .catch((e) => {
-    throw new Error(`Failed to get current block number from ${forkUrl}: ${e}`);
-  });
+    .then((res) => res.json())
+    .then((jsonRes) => {
+      console.log(
+        `Current block number of ${forkUrl} is ${JSON.stringify(jsonRes)}`,
+      );
+      const forkBlockNumber = parseInt(jsonRes.result.substring(2), 16);
+      return forkBlockNumber;
+    })
+    .catch((e) => {
+      throw new Error(
+        `Failed to get current block number from ${forkUrl}: ${e}`,
+      );
+    });
+  return blockNumber;
+}
diff --git a/test/test-config-utils.js b/test/test-config-utils.js
index 14fa7441..6a07fd6d 100644
--- a/test/test-config-utils.js
+++ b/test/test-config-utils.js
@@ -1,35 +1,53 @@
 import { Wallet, JsonRpcProvider } from 'ethers';
 import { IExec } from '../src/lib/index.js';
+import { setBalance } from './test-utils.js';
 
 export const getTestConfigOptions =
   (chain) =>
   ({ options = {} } = {}) => ({
-    bridgeAddress: options.bridgeAddress ?? chain.bridgeAddress,
-    bridgedNetworkConf: options.bridgedNetworkConf ?? chain.bridgedNetworkConf,
     confirms: options.confirms ?? chain.confirms,
-    defaultTeeFramework:
-      options.defaultTeeFramework ?? chain.defaultTeeFramework,
-    ensPublicResolverAddress:
-      options.ensPublicResolverAddress ?? chain.ensPublicResolverAddress,
-    ensRegistryAddress: options.ensRegistryAddress ?? chain.ensRegistryAddress,
     hubAddress: options.hubAddress ?? chain.hubAddress,
-    voucherHubAddress: options.voucherHubAddress ?? chain.voucherHubAddress,
     iexecGatewayURL: options.iexecGatewayURL ?? chain.iexecGatewayURL,
     ipfsNodeURL: options.ipfsNodeURL ?? chain.ipfsNodeURL,
     ipfsGatewayURL: options.ipfsGatewayURL ?? chain.ipfsGatewayURL,
     pocoSubgraphURL: options.pocoSubgraphURL ?? chain.pocoSubgraphURL,
-    voucherSubgraphURL: options.voucherSubgraphURL ?? chain.voucherSubgraphURL,
-    isNative: options.isNative ?? chain.isNative,
     providerOptions: options.providerOptions ?? chain.providerOptions,
-    resultProxyURL: options.resultProxyURL ?? chain.resultProxyURL,
     compassURL: options.compassURL ?? chain.compassURL,
-    smsURL: options.smsURL ?? chain.smsMap,
-    useGas: options.useGas ?? chain.useGas,
+    smsURL: options.smsURL ?? chain.smsURL,
   });
 
 export const getTestConfig =
-  (chain) =>
-  ({ privateKey, readOnly = false, options = {} } = {}) => {
+  (
+    /**
+     * Target test blockchain configuration.
+     */
+    chain,
+  ) =>
+  async ({
+    /**
+     * The private key to use for the wallet, if not provided a random wallet will be created unless `readOnly` is set to true.
+     * If `readOnly` is true, this parameter is ignored.
+     * @type {string}
+     */
+    privateKey,
+    /**
+     * Whether the IExec instance should be read-only (no transactions will be sent).
+     * Defaults to false.
+     * @type {boolean}
+     */
+    readOnly = false,
+    /**
+     * The balance to set for the wallet.
+     * If not provided, defaults to the chain's default initial balance or 0n.
+     * @type {bigint}
+     */
+    balance = chain.defaultInitBalance || 0n,
+    /**
+     * IExec configuration options.
+     * @type {Object}
+     */
+    options = {},
+  } = {}) => {
     const configOptions = getTestConfigOptions(chain)({ options });
     if (readOnly) {
       return {
@@ -40,6 +58,10 @@ export const getTestConfig =
       pollingInterval: 1000,
     });
     const wallet = privateKey ? new Wallet(privateKey) : Wallet.createRandom();
+    // fund wallet if needed
+    if (balance > 0n) {
+      await setBalance(chain)(await wallet.getAddress(), balance);
+    }
     const ethProvider = new Wallet(wallet.privateKey, provider);
     return {
       iexec: new IExec({ ethProvider }, configOptions),
diff --git a/test/test-utils.js b/test/test-utils.js
index 620eb069..cd059b5d 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -3,16 +3,15 @@ import { exec } from 'child_process';
 import {
   Wallet,
   JsonRpcProvider,
-  ethers,
   Contract,
   hexlify,
   randomBytes,
+  keccak256,
+  AbiCoder,
+  toBeHex,
 } from 'ethers';
 import { IExec } from '../src/lib/index.js';
 import { getSignerFromPrivateKey } from '../src/lib/utils.js';
-import { getEventFromLogs } from '../src/common/utils/utils.js';
-import { getTestConfig } from './test-config-utils.js';
-import { abi as voucherHubAbi } from '../src/common/generated/@iexec/voucher-contracts/VoucherHub.js';
 
 export {
   TEE_FRAMEWORKS,
@@ -38,127 +37,43 @@ export const execAsync = (cmd) =>
     });
   });
 
-export const { INFURA_PROJECT_ID, ETHERSCAN_API_KEY, ALCHEMY_API_KEY } =
-  process.env;
-
-console.log('using env INFURA_PROJECT_ID', !!INFURA_PROJECT_ID);
-console.log('using env ETHERSCAN_API_KEY', !!ETHERSCAN_API_KEY);
-console.log('using env ALCHEMY_API_KEY', !!ALCHEMY_API_KEY);
-
-export const DEFAULT_PROVIDER_OPTIONS = {
-  cloudflare: true,
-  alchemy: ALCHEMY_API_KEY,
-  etherscan: ETHERSCAN_API_KEY,
-  infura: INFURA_PROJECT_ID,
-  quorum: 1,
-};
-
 export const SERVICE_HTTP_500_URL = 'http://localhost:5500';
 
 export const SERVICE_UNREACHABLE_URL = 'http://unreachable:80';
 
 export const TEST_CHAINS = {
-  // autoseal chain with iExec token
-  'custom-token-chain': {
-    rpcURL: 'http://localhost:18545',
-    chainId: '65535',
-    hubAddress: '0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca',
-    ensRegistryAddress: '0xaf87b82B01E484f8859c980dE69eC8d09D30F22a',
-    ensPublicResolverAddress: '0x464E9FC01C2970173B183D24B43A0FA07e6A072E',
+  'arbitrum-sepolia-fork': {
+    rpcURL: 'http://localhost:8545',
+    chainId: '421614',
+    smsURL: 'http://localhost:13350',
+    iexecGatewayURL: 'http://localhost:3050',
     ipfsNodeURL: 'http://localhost:5001',
     ipfsGatewayURL: 'http://localhost:8080',
-    pocoAdminWallet: new Wallet(
-      '0x564a9db84969c8159f7aa3d5393c5ecd014fce6a375842a45b12af6677b12407',
-    ),
-    // TODO use another wallet
-    faucetWallet: new Wallet(
-      '0x564a9db84969c8159f7aa3d5393c5ecd014fce6a375842a45b12af6677b12407',
-    ),
-    provider: new JsonRpcProvider('http://localhost:18545', undefined, {
-      pollingInterval: 100,
-    }),
-    defaults: {
-      isNative: false,
-      useGas: true,
-    },
-    isAnvil: false,
-  },
-  'custom-token-chain-no-ens': {
-    rpcURL: 'http://localhost:18545',
-    chainId: '65535',
-    hubAddress: '0xC129e7917b7c7DeDfAa5Fff1FB18d5D7050fE8ca',
-    pocoAdminWallet: new Wallet(
-      '0x564a9db84969c8159f7aa3d5393c5ecd014fce6a375842a45b12af6677b12407',
-    ),
     compassURL: 'http://localhost:8069',
-    // TODO use another wallet
-    faucetWallet: new Wallet(
+    pocoAdminWallet: new Wallet(
       '0x564a9db84969c8159f7aa3d5393c5ecd014fce6a375842a45b12af6677b12407',
     ),
-    provider: new JsonRpcProvider('http://localhost:18545', undefined, {
+    provider: new JsonRpcProvider('http://localhost:8545', undefined, {
       pollingInterval: 100,
     }),
     defaults: {
-      isNative: false,
-      useGas: true,
+      hubAddress: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E',
+      name: 'arbitrum-sepolia',
     },
-    isAnvil: false,
+    defaultInitBalance: 1n * 10n ** 18n, // 1 ETH for gas
   },
-  'bellecour-fork': {
-    rpcURL: 'http://localhost:8545',
-    chainId: '134',
-    sconeSmsURL: 'http://localhost:13300',
-    gramineSmsURL: 'http://localhost:13302',
-    tdxSmsURL: 'http://localhost:13303',
-    iexecGatewayURL: 'http://localhost:3000',
-    resultProxyURL: 'http://localhost:13200',
-    ipfsNodeURL: 'http://localhost:5001',
-    ipfsGatewayURL: 'http://localhost:8080',
-    pocoAdminWallet: new Wallet(
-      '0x564a9db84969c8159f7aa3d5393c5ecd014fce6a375842a45b12af6677b12407',
-    ),
-    faucetWallet: new Wallet(
-      '0xde43b282c2931fc41ca9e1486fedc2c45227a3b9b4115c89d37f6333c8816d89',
-    ),
-    voucherManagerWallet: new Wallet(
-      '0x2c906d4022cace2b3ee6c8b596564c26c4dcadddf1e949b769bcb0ad75c40c33',
-    ),
-    voucherSubgraphURL:
-      'http://localhost:8000/subgraphs/name/bellecour/iexec-voucher',
-    debugWorkerpool: 'debug-v8-bellecour.main.pools.iexec.eth',
-    debugWorkerpoolOwnerWallet: new Wallet(
-      '0x800e01919eadf36f110f733decb1cc0f82e7941a748e89d7a3f76157f6654bb3',
-    ),
-    prodWorkerpool: 'prod-v8-bellecour.main.pools.iexec.eth',
-    prodWorkerpoolOwnerWallet: new Wallet(
-      '0x6a12f56d7686e85ab0f46eb3c19cb0c75bfabf8fb04e595654fc93ad652fa7bc',
-    ),
-    provider: new JsonRpcProvider('http://localhost:8545', undefined, {
+  'unknown-chain': {
+    rpcURL: 'http://localhost:8565',
+    chainId: '421615',
+    hubAddress: '0xB2157BF2fAb286b2A4170E3491Ac39770111Da3E',
+    name: 'unknown-chain',
+    provider: new JsonRpcProvider('http://localhost:8565', undefined, {
       pollingInterval: 100,
     }),
-    defaults: {
-      hubAddress: '0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f',
-      voucherHubAddress: '0x3137B6DF4f36D338b82260eDBB2E7bab034AFEda',
-      ensRegistryAddress: '0x5f5B93fca68c9C79318d1F3868A354EE67D8c006',
-      ensPublicResolverAddress: '0x1347d8a1840A810B990d0B774A6b7Bb8A1bd62BB',
-      isNative: true,
-      useGas: false,
-      name: 'bellecour',
-    },
-    isAnvil: true,
+    defaultInitBalance: 1n * 10n ** 18n, // 1 ETH for gas
   },
 };
 
-Object.keys(TEST_CHAINS).forEach((chain) => {
-  if (!TEST_CHAINS[chain].smsMap) {
-    TEST_CHAINS[chain].smsMap = {
-      gramine: TEST_CHAINS[chain].gramineSmsURL,
-      scone: TEST_CHAINS[chain].sconeSmsURL,
-      tdx: TEST_CHAINS[chain].tdxSmsURL,
-    };
-  }
-});
-
 export const getId = () => randomInt(0, 1000000);
 
 export const getRandomWallet = () => {
@@ -223,47 +138,65 @@ export class InjectedProvider {
   }
 }
 
-const faucetSendWeiToReachTargetBalance =
-  (chain) =>
-  async (address, targetWeiBalance, tryCount = 1) => {
-    const currentBalance = await chain.provider.getBalance(address);
-    const delta = BigInt(`${targetWeiBalance}`) - currentBalance;
-    if (delta < 0n) {
-      console.warn(
-        `Faucet send Eth: aborted - current balance exceed target balance`,
-      );
-      return;
-    }
-    try {
-      const tx = await chain.faucetWallet
-        .connect(chain.provider)
-        .sendTransaction({ to: address, value: delta });
-      await tx.wait();
-    } catch (e) {
-      console.warn(`Faucet send Eth: error (try count ${tryCount}) - ${e}`);
-      // retry as concurrent calls can lead to nonce collisions on the faucet wallet
-      if (tryCount < 5) {
-        await sleep(3000 * tryCount);
-        await faucetSendWeiToReachTargetBalance(chain)(
-          address,
-          targetWeiBalance,
-          tryCount + 1,
-        );
-      } else {
-        throw new Error(
-          `Failed to send Eth from faucet (tried ${tryCount} times)`,
-        );
-      }
-    }
-  };
+const anvilSetBalance = (chain) => async (address, targetWeiBalance) => {
+  await fetch(chain.rpcURL, {
+    method: 'POST',
+    body: JSON.stringify({
+      method: 'anvil_setBalance',
+      params: [address, toBeHex(targetWeiBalance)],
+      id: 1,
+      jsonrpc: '2.0',
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+};
+
+const anvilSetNRlcTokenBalance =
+  (chain) => async (address, targetNRlcBalance) => {
+    const rlcAddress = await new Contract(
+      chain.hubAddress ?? chain.defaults.hubAddress,
+      [
+        {
+          inputs: [],
+          name: 'token',
+          outputs: [{ internalType: 'address', name: '', type: 'address' }],
+          stateMutability: 'view',
+          type: 'function',
+        },
+      ],
+      chain.provider,
+    ).token();
+
+    /** [rlc-multichain](https://github.com/iExecBlockchainComputing/rlc-multichain/tree/v0.1.0) is an openzeppelin ERC20Upgradeable contract
+     *
+     * ERC20Upgradeable contract use a specific storage slot, which is:
+     * ```
+     * // keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.ERC20")) - 1)) & ~bytes32(uint256(0xff))
+     * bytes32 private constant ERC20StorageLocation = 0x52c63247e1f47db19d5ce0460030c497f067ca4cebf71ba98eeadabe20bace00;
+     * ```
+     * sources: https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v5.3.0/contracts/token/ERC20/ERC20Upgradeable.sol#L43-L44
+     */
+    const erc20StorageLocation =
+      '0x52c63247e1f47db19d5ce0460030c497f067ca4cebf71ba98eeadabe20bace00';
+
+    const balanceSlot = keccak256(
+      AbiCoder.defaultAbiCoder().encode(
+        ['address', 'uint256'],
+        [address, erc20StorageLocation],
+      ),
+    );
 
-export const setBalance = (chain) => async (address, targetWeiBalance) => {
-  if (chain.isAnvil) {
     await fetch(chain.rpcURL, {
       method: 'POST',
       body: JSON.stringify({
-        method: 'anvil_setBalance',
-        params: [address, ethers.toBeHex(targetWeiBalance)],
+        method: 'anvil_setStorageAt',
+        params: [
+          rlcAddress,
+          balanceSlot,
+          toBeHex(BigInt(targetNRlcBalance), 32),
+        ],
         id: 1,
         jsonrpc: '2.0',
       }),
@@ -271,85 +204,21 @@ export const setBalance = (chain) => async (address, targetWeiBalance) => {
         'Content-Type': 'application/json',
       },
     });
-  } else {
-    await faucetSendWeiToReachTargetBalance(chain)(address, targetWeiBalance);
-  }
-};
-
-const faucetSendNRlcToReachTargetBalance =
-  (chain) =>
-  async (address, nRlcTargetBalance, tryCount = 1) => {
-    const iexec = new IExec(
-      {
-        ethProvider: getSignerFromPrivateKey(
-          chain.rpcURL,
-          chain.faucetWallet.privateKey,
-        ),
-      },
-      { hubAddress: chain.hubAddress },
-    );
-    const { nRLC } = await iexec.wallet.checkBalances(address);
-    const delta = BigInt(`${nRlcTargetBalance}`) - BigInt(`${nRLC}`);
-    if (delta < 0n) {
-      console.warn(
-        `Faucet send RLC: aborted - current balance exceed target balance`,
-      );
-      return;
-    }
-    try {
-      await iexec.wallet.sendRLC(`${delta}`, address);
-    } catch (e) {
-      console.warn(`Faucet send RLC: error (try count ${tryCount}) - ${e}`);
-      // retry as concurrent calls can lead to nonce collisions on the faucet wallet
-      if (tryCount < 5) {
-        await sleep(3000 * tryCount);
-        await faucetSendNRlcToReachTargetBalance(chain)(
-          address,
-          nRlcTargetBalance,
-          tryCount + 1,
-        );
-      } else {
-        throw new Error(
-          `Failed to send RLC from faucet (tried ${tryCount} times)`,
-        );
-      }
-    }
   };
 
-export const setNRlcBalance = (chain) => async (address, nRlcTargetBalance) => {
-  if (chain.isNative || chain.defaults?.isNative) {
-    const weiAmount = BigInt(`${nRlcTargetBalance}`) * 10n ** 9n; // 1 nRLC is 10^9 wei
-    await setBalance(chain)(address, weiAmount);
-    return;
-  }
-  await faucetSendNRlcToReachTargetBalance(chain)(address, nRlcTargetBalance);
+export const setBalance = (chain) => async (address, targetWeiBalance) => {
+  await anvilSetBalance(chain)(address, targetWeiBalance);
 };
 
-export const setStakedNRlcBalance =
-  (chain) => async (address, nRlcTargetBalance) => {
-    const sponsorWallet = Wallet.createRandom(chain.provider);
-    const iexec = new IExec(
-      {
-        ethProvider: sponsorWallet,
-      },
-      { hubAddress: chain.hubAddress },
-    );
-    await setNRlcBalance(chain)(
-      sponsorWallet.address,
-      BigInt(nRlcTargetBalance),
-    );
-    const contractClient = await iexec.config.resolveContractsClient();
-    const iexecContract = contractClient.getIExecContract();
-    const tx = await iexecContract.depositFor(address, {
-      value: BigInt(nRlcTargetBalance) * 10n ** 9n,
-      gasPrice: 0, // TODO: wont work on non gasless chain
-    });
-    await tx.wait();
-  };
+export const setNRlcBalance = (chain) => async (address, nRlcTargetBalance) => {
+  await anvilSetNRlcTokenBalance(chain)(address, nRlcTargetBalance);
+};
 
 export const initializeTask = (chain) => async (dealid, idx) => {
+  const wallet = Wallet.createRandom(chain.provider);
+  await setBalance(chain)(wallet.address, 1n * 10n ** 18n); // fund wallet to pay for initialization
   const iexecContract = new Contract(
-    chain.hubAddress || chain.defaults.hubAddress,
+    chain.hubAddress ?? chain.defaults.hubAddress,
     [
       {
         constant: false,
@@ -375,7 +244,7 @@ export const initializeTask = (chain) => async (dealid, idx) => {
         type: 'function',
       },
     ],
-    Wallet.createRandom(chain.provider), // random to avoid nonce collisions
+    wallet,
   );
   const initTx = await iexecContract.initialize(dealid, idx);
   await initTx.wait();
@@ -391,7 +260,7 @@ export const adminCreateCategory =
           chain.pocoAdminWallet.privateKey,
         ),
       },
-      { hubAddress: chain.hubAddress },
+      { hubAddress: chain.hubAddress ?? chain.defaults.hubAddress },
     );
     let res;
     try {
@@ -400,7 +269,7 @@ export const adminCreateCategory =
       console.warn(
         `Admin create category: error (try count ${tryCount}) - ${e}`,
       );
-      // retry as concurrent calls can lead to nonce collisions on the faucet wallet
+      // retry as concurrent calls can lead to nonce collisions on the admin wallet
       if (tryCount < 5) {
         await sleep(3000 * tryCount);
         res = await adminCreateCategory(chain)(category, tryCount + 1);
@@ -412,171 +281,3 @@ export const adminCreateCategory =
     }
     return res;
   };
-
-export const createVoucherType =
-  (chain) =>
-  async ({ description = 'test', duration = 1000 } = {}) => {
-    const voucherHubAddress =
-      chain.voucherHubAddress || chain.defaults.voucherHubAddress;
-
-    const voucherHubContract = new Contract(
-      voucherHubAddress,
-      voucherHubAbi,
-      chain.provider,
-    );
-    const signer = chain.voucherManagerWallet.connect(chain.provider);
-
-    const retryableCreateVoucherType = async (tryCount = 1) => {
-      let id;
-      try {
-        const createVoucherTypeTxHash = await voucherHubContract
-          .connect(signer)
-          .createVoucherType(description, duration);
-        const txReceipt = await createVoucherTypeTxHash.wait();
-        id = getEventFromLogs('VoucherTypeCreated', txReceipt.logs, {
-          strict: true,
-        }).args.id;
-      } catch (error) {
-        console.warn(
-          `Error creating voucher type (try count ${tryCount}):`,
-          error,
-        );
-        if (tryCount < 5) {
-          await sleep(3000 * tryCount);
-          id = await retryableCreateVoucherType(tryCount + 1);
-        } else {
-          throw new Error(
-            `Failed to create voucher after ${tryCount} attempts`,
-          );
-        }
-      }
-      return id;
-    };
-    return retryableCreateVoucherType(); // return voucherType id (bigint)
-  };
-
-// TODO: update createWorkerpoolorder() parameters when it is specified
-export const createAndPublishWorkerpoolOrder =
-  (chain) =>
-  async ({
-    workerpool,
-    workerpoolOwnerWallet,
-    requesterrestrict,
-    volume = 1000,
-    price = 1000,
-  }) => {
-    const { iexec } = getTestConfig(chain)({
-      privateKey: workerpoolOwnerWallet.privateKey,
-    });
-
-    await setStakedNRlcBalance(chain)(
-      workerpoolOwnerWallet.address,
-      volume * price,
-    );
-
-    const workerpoolorder = await iexec.order.createWorkerpoolorder({
-      workerpool,
-      category: 0,
-      requesterrestrict,
-      volume,
-      workerpoolprice: price,
-      tag: ['tee', 'scone'],
-    });
-
-    await iexec.order
-      .signWorkerpoolorder(workerpoolorder)
-      .then((o) => iexec.order.publishWorkerpoolorder(o));
-  };
-
-export const createVoucher =
-  (chain) =>
-  async ({ owner, voucherType, value }) => {
-    const voucherHubAddress =
-      chain.voucherHubAddress || chain.defaults.voucherHubAddress;
-    // deposit voucher value on VoucherHub with a random wallet
-    await setStakedNRlcBalance(chain)(voucherHubAddress, value);
-
-    const voucherHubContract = new Contract(
-      voucherHubAddress,
-      voucherHubAbi,
-      chain.provider,
-    );
-
-    const signer = chain.voucherManagerWallet.connect(chain.provider);
-
-    const retryableCreateVoucher = async (tryCount = 1) => {
-      try {
-        const createVoucherTx = await voucherHubContract
-          .connect(signer)
-          .createVoucher(owner, voucherType, value);
-        await createVoucherTx.wait();
-      } catch (error) {
-        console.warn(`Error creating voucher (try count ${tryCount}):`, error);
-        if (tryCount < 5) {
-          await sleep(3000 * tryCount);
-          await retryableCreateVoucher(tryCount + 1);
-        } else {
-          throw new Error(
-            `Failed to create voucher after ${tryCount} attempts`,
-          );
-        }
-      }
-    };
-    await retryableCreateVoucher();
-
-    try {
-      await createAndPublishWorkerpoolOrder(chain)({
-        workerpool: chain.debugWorkerpool,
-        workerpoolOwnerWallet: chain.debugWorkerpoolOwnerWallet,
-        requesterrestrict: owner,
-      });
-      await createAndPublishWorkerpoolOrder(chain)({
-        workerpool: chain.prodWorkerpool,
-        workerpoolOwnerWallet: chain.prodWorkerpoolOwnerWallet,
-        requesterrestrict: owner,
-      });
-    } catch (error) {
-      console.error('Error publishing workerpoolorder:', error);
-      throw error;
-    }
-
-    try {
-      return await voucherHubContract.getVoucher(owner);
-    } catch (error) {
-      console.error('Error getting voucher:', error);
-      throw error;
-    }
-  };
-
-export const addVoucherEligibleAsset =
-  (chain) => async (assetAddress, voucherTypeId) => {
-    const voucherHubAddress =
-      chain.voucherHubAddress || chain.defaults.voucherHubAddress;
-
-    const voucherHubContract = new Contract(voucherHubAddress, voucherHubAbi);
-
-    const signer = chain.voucherManagerWallet.connect(chain.provider);
-
-    const retryableAddEligibleAsset = async (tryCount = 1) => {
-      try {
-        const tx = await voucherHubContract
-          .connect(signer)
-          .addEligibleAsset(voucherTypeId, assetAddress);
-        await tx.wait();
-      } catch (error) {
-        console.warn(
-          `Error adding eligible asset to voucher (try count ${tryCount}):`,
-          error,
-        );
-        if (tryCount < 5) {
-          await sleep(3000 * tryCount);
-          await retryableAddEligibleAsset(tryCount + 1);
-        } else {
-          throw new Error(
-            `Failed to add eligible asset to voucher after ${tryCount} attempts`,
-          );
-        }
-      }
-    };
-    await retryableAddEligibleAsset();
-  };
diff --git a/typedoc_template.md b/typedoc_template.md
index d40d7a39..081818ab 100644
--- a/typedoc_template.md
+++ b/typedoc_template.md
@@ -71,7 +71,6 @@ Additionally the [IExec](./classes/IExec.md) module exposes all the following li
 - [IExecAppModule](./classes/IExecAppModule.md) exposes **app** methods
 - [IExecDatasetModule](./classes/IExecDatasetModule.md) exposes **dataset** methods
 - [IExecDealModule](./classes/IExecDealModule.md) exposes **deal** methods
-- [IExecENSModule](./classes/IExecENSModule.md) exposes **ENS** methods
 - [IExecHubModule](./classes/IExecHubModule.md) exposes **hub** methods
 - [IExecNetworkModule](./classes/IExecNetworkModule.md) exposes **network** methods
 - [IExecOrderModule](./classes/IExecOrderModule.md) exposes **order** methods
@@ -80,7 +79,6 @@ Additionally the [IExec](./classes/IExec.md) module exposes all the following li
 - [IExecSecretsModule](./classes/IExecSecretsModule.md) exposes **secrets** methods
 - [IExecStorageModule](./classes/IExecStorageModule.md) exposes **storage** methods
 - [IExecTaskModule](./classes/IExecTaskModule.md) exposes **task** methods
-- [IExecVoucherModule](./classes/IExecVoucherModule.md) exposes **voucher** methods
 - [IExecWalletModule](./classes/IExecWalletModule.md) exposes **wallet** methods
 - [IExecWorkerpoolModule](./classes/IExecWorkerpoolModule.md) exposes **workerpool** methods