replace with gsn dev provider

scripts/test.sh

@@ -24,11 +24,6 @@ else
   ganache_port=8545
 fi
 
-node_url="http://localhost:$ganache_port"
-
-relayer_port=8099
-relayer_url="http://localhost:${relayer_port}"
-
 ganache_running() {
   nc -z localhost "$ganache_port"
 }
@@ -38,8 +33,8 @@ relayer_running() {
 }
 
 start_ganache() {
-  # We define 10 accounts with balance 1M ether, needed for high-value tests.
   local accounts=(
+    # 10 accounts with balance 1M ether, needed for high-value tests.
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200,1000000000000000000000000"
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501201,1000000000000000000000000"
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501202,1000000000000000000000000"
@@ -50,6 +45,10 @@ start_ganache() {
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501207,1000000000000000000000000"
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501208,1000000000000000000000000"
     --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501209,1000000000000000000000000"
+    # 3 accounts to be used for GSN matters.
+    --account="0x956b91cb2344d7863ea89e6945b753ca32f6d74bb97a59e59e04903ded14ad00,1000000000000000000000000"
+    --account="0x956b91cb2344d7863ea89e6945b753ca32f6d74bb97a59e59e04903ded14ad01,1000000000000000000000000"
+    --account="0x956b91cb2344d7863ea89e6945b753ca32f6d74bb97a59e59e04903ded14ad02,1000000000000000000000000"
   )
 
   if [ "$SOLIDITY_COVERAGE" = true ]; then
@@ -69,21 +68,10 @@ start_ganache() {
   echo "Ganache launched!"
 }
 
-setup_gsn_relay() {
-  npx oz-gsn deploy-relay-hub --ethereumNodeURL $node_url
-
-  echo "Launching GSN relay server"
-
-  ./scripts/gsnRelayServer -DevMode -RelayHubAddress "0x537F27a04470242ff6b2c3ad247A05248d0d27CE" -GasPricePercent -99 -EthereumNodeUrl $node_url -Url $relayer_url &> /dev/null &
-  gsn_relay_server_pid=$!
-
-  while ! relayer_running; do
-    sleep 0.1 # wait for 1/10 of the second before check again
-  done
-
-  echo "GSN relay server launched!"
-
-  npx oz-gsn register-relayer --ethereumNodeURL $node_url --relayUrl $relayer_url
+setup_relayhub() {
+  npx oz-gsn deploy-relay-hub \
+    --ethereumNodeURL "http://localhost:$ganache_port" \
+    --from "0xbb49ad04422f9fa6a217f3ed82261b942f6981f7"
 }
 
 if ganache_running; then
@@ -93,10 +81,10 @@ else
   start_ganache
 fi
 
-setup_gsn_relay
-
 npx truffle version
 
+setup_relayhub
+
 if [ "$SOLIDITY_COVERAGE" = true ]; then
   npx solidity-coverage
 else

truffle-config.js

@@ -1,5 +1,5 @@
 require('chai/register-should');
-const { GSNProvider } = require('@openzeppelin/gsn-provider');
+const { GSNDevProvider } = require('@openzeppelin/gsn-provider');
 
 const solcStable = {
   version: '0.5.7',
@@ -15,7 +15,13 @@ const useSolcNightly = process.env.SOLC_NIGHTLY === 'true';
 module.exports = {
   networks: {
     development: {
-      provider: () => new GSNProvider('http://localhost:8545', { txfee: 70, useGSN: false }),
+      provider: () => new GSNDevProvider('http://localhost:8545', {
+        txfee: 0,
+        useGSN: false,
+        // The last two accounts defined in test.sh
+        ownerAddress: '0x26be9c03ca7f61ad3d716253ee1edcae22734698',
+        relayerAddress: '0xdc5fd04802ea70f6e27aec12d56716624c98e749',
+      }),
       network_id: '*', // eslint-disable-line camelcase
     },
     coverage: {