arvo: retool for goerli instead of deprecated ropsten

Author: liam-fitzgerald

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build build-all install cross release test pills ropsten-pills clean
+.PHONY: build build-all install cross release test pills goerli-pills clean
 
 build:
 	nix-build -A urbit --no-out-link
@@ -17,8 +17,8 @@ pills:
 	sh/update-brass-pill
 	sh/update-ivory-pill
 
-ropsten-pills:
-	sh/create-ropsten-pills
+goerli-pills:
+	sh/create-goerli-pills
 
 interface:
 	sh/build-interface

default.nix

@@ -117,8 +117,8 @@ let
       pill = solid.lfs;
     };
 
-    ivory-ropsten = ivory.override { arvo = arvo.ropsten; };
-    brass-ropsten = brass.override { arvo = arvo.ropsten; };
+    ivory-goerli = ivory.override { arvo = arvo.goerli; };
+    brass-goerli = brass.override { arvo = arvo.goerli; };
 
     # Create a .tgz of the primary binaries.
     tarball = let

nix/pkgs/arvo/default.nix

@@ -5,16 +5,16 @@ stdenvNoCC.mkDerivation {
 
   src = marsSources;
 
-  outputs = [ "out" "ropsten" ];
+  outputs = [ "out" "goerli" ];
 
-  phases = [ "mainnetPhase" "ropstenPhase" ];
+  phases = [ "mainnetPhase" "goerliPhase" ];
 
   mainnetPhase = ''
     ln -s ${marsSources.out}/arvo $out
     '';
 
-  ropstenPhase = ''
-    ln -s ${marsSources.ropsten}/arvo $ropsten
+  goerliPhase = ''
+    ln -s ${marsSources.goerli}/arvo $goerli
     '';
 
   preferLocalBuild = true;

nix/pkgs/marsSources/default.nix

@@ -6,26 +6,26 @@ stdenvNoCC.mkDerivation {
 
   buildInputs = [ bc ];
 
-  outputs = [ "out" "ropsten" ];
+  outputs = [ "out" "goerli" ];
 
-  phases = [ "mainnetPhase" "ropstenPhase" ];
+  phases = [ "mainnetPhase" "goerliPhase" ];
 
   mainnetPhase = ''
     cp -r $src $out
     chmod -R u+w $out
   '';
 
-  ropstenPhase = ''
+  goerliPhase = ''
     cp -r $src tmp
     chmod -R u+w tmp
 
     ZUSE=tmp/arvo/sys/zuse.hoon
     AMES=tmp/arvo/sys/vane/ames.hoon
     ACME=tmp/arvo/app/acme.hoon
 
-    # Replace the mainnet azimuth contract with the ropsten contract
+    # Replace the mainnet azimuth contract with the goerli contract
     sed --in-place \
-      's/\(\+\+  contracts  \)mainnet\-contracts/\1ropsten-contracts/' \
+      's/\(\+\+  contracts  \)mainnet\-contracts/\1goerli-contracts/' \
       $ZUSE
 
     # Increment the %ames protocol version
@@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation {
       's_https://acme-v02.api.letsencrypt.org/directory_https://acme-staging-v02.api.letsencrypt.org/directory_' \
       $ACME
 
-    cp -r tmp $ropsten
-    chmod -R u+w $ropsten
+    cp -r tmp $goerli
+    chmod -R u+w $goerli
   '';
 
   preferLocalBuild = true;

nix/pkgs/pill/brass.nix

@@ -1,5 +1,5 @@
 { lib, stdenvNoCC, fetchGitHubLFS, bootFakeShip, solid, urbit, arvo, curl
-, withRopsten ? false }:
+, withGoerli ? false }:
 
 let
 
@@ -9,14 +9,14 @@ in {
   build = import ./builder.nix {
     inherit stdenvNoCC urbit curl;
 
-    name = "brass" + lib.optionalString withRopsten "-ropsten";
+    name = "brass" + lib.optionalString withGoerli "-goerli";
     builder = ./brass.sh;
-    arvo = if withRopsten then arvo.ropsten else arvo;
+    arvo = if withGoerli then arvo.goerli else arvo;
     pier = bootFakeShip {
       inherit urbit;
 
       pill = solid.lfs;
       ship = "zod";
     };
   };
-} // lib.optionalAttrs (!withRopsten) { inherit lfs; }
+} // lib.optionalAttrs (!withGoerli) { inherit lfs; }

nix/pkgs/pill/ivory.nix

@@ -1,5 +1,5 @@
 { lib, stdenvNoCC, fetchGitHubLFS, bootFakeShip, solid, urbit, arvo, curl, xxd
-, withRopsten ? false }:
+, withGoerli ? false }:
 
 let
 
@@ -9,9 +9,9 @@ in {
   build = import ./builder.nix {
     inherit stdenvNoCC urbit curl;
 
-    name = "ivory" + lib.optionalString withRopsten "-ropsten";
+    name = "ivory" + lib.optionalString withGoerli "-goerli";
     builder = ./ivory.sh;
-    arvo = if withRopsten then arvo.ropsten else arvo;
+    arvo = if withGoerli then arvo.goerli else arvo;
     pier = bootFakeShip {
       inherit urbit;
 
@@ -39,4 +39,4 @@ in {
 
     preferLocalBuild = true;
   };
-} // lib.optionalAttrs (!withRopsten) { inherit lfs; }
+} // lib.optionalAttrs (!withGoerli) { inherit lfs; }

pkg/arvo/app/claz.hoon

@@ -185,7 +185,7 @@
     ::
       ?-  network
         %mainnet    0x1
-        %ropsten    0x3
+        %goerli     0x5
         %fakenet    `@ux``@`1.337
         [%other *]  id.network
       ==

pkg/arvo/app/roller.hoon

@@ -65,7 +65,7 @@
       ::  frequency: time to wait between sending batches (TODO fancier)
       ::  endpoint: ethereum rpc endpoint to use
       ::  contract: ethereum contract address
-      ::  chain-id: mainnet, ropsten, local (https://chainid.network/)
+      ::  chain-id: mainnet, goerli, local (https://chainid.network/)
       ::  resend-time: time to resend a batch with higher gas prie
       ::  update-rate: frequency to update the roller's predicted state
       ::  fallback-gas-price: default batch gas price
@@ -1019,7 +1019,7 @@
       =,  azimuth
       ?-  net.config
         %mainnet  mainnet-contracts
-        %ropsten  ropsten-contracts
+        %goerli   goerli-contracts
         %local    local-contracts
         %default  contracts
       ==

pkg/arvo/gen/azimuth/watch.hoon

@@ -1,5 +1,5 @@
 ::  Change node url and network for azimuth
 ::
 :-  %say
-|=  [* [url=@ta net=?(%mainnet %ropsten %local %default) ~] ~]
+|=  [* [url=@ta net=?(%mainnet %goerli %local %default) ~] ~]
 [%azimuth-poke %watch url net]

pkg/arvo/gen/roller/endpoint.hoon

@@ -1,4 +1,4 @@
 ::
 :-  %say
-|=  [* [url=@t net=?(%mainnet %ropsten %local) ~] ~]
+|=  [* [url=@t net=?(%mainnet %goerli %local) ~] ~]
 [%roller-action %config %endpoint url net]