chore: update rpcURL

albttx · Jan 26, 2024 · 1c101a8 · 1c101a8
1 parent 414cf6d
commit 1c101a8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/misc/loop/cmd/portalloopd/main.go b/misc/loop/cmd/portalloopd/main.go
@@ -160,7 +160,7 @@ func (s *service) execBackup(ctx context.Context, args []string) error {
 		return err
 	}
 
-	return s.portalLoop.backupTXs(ctx)
+	return s.portalLoop.backupTXs(ctx, s.portalLoopURL)
 }
 
 func (s *service) startPortalLoop(ctx context.Context, force bool) error {
@@ -227,7 +227,7 @@ func (s *service) startPortalLoop(ctx context.Context, force bool) error {
 
 	l.Info("Backup txs")
 	// 5. Backup TXs
-	err = s.portalLoop.backupTXs(ctx)
+	err = s.portalLoop.backupTXs(ctx, s.portalLoopURL)
 	if err != nil {
 		return err
 	}

diff --git a/misc/loop/cmd/portalloopd/snapshotter.go b/misc/loop/cmd/portalloopd/snapshotter.go
@@ -190,7 +190,7 @@ func (s snapshotter) startPortalLoopContainer(ctx context.Context) (*types.Conta
 	return nil, fmt.Errorf("container not found")
 }
 
-func (s snapshotter) backupTXs(ctx context.Context) error {
+func (s snapshotter) backupTXs(ctx context.Context, rpcURL string) error {
 	cfg := backup.DefaultConfig()
 	cfg.FromBlock = 1
 	cfg.Watch = false
@@ -202,7 +202,8 @@ func (s snapshotter) backupTXs(ctx context.Context) error {
 	defer instanceBackupFile.Close()
 
 	w := legacy.NewWriter(instanceBackupFile)
-	client := http.NewClient(s.cfg.rpcAddr)
+	// client := http.NewClient(s.cfg.rpcAddr)
+	client := http.NewClient(rpcURL)
 
 	backupService := backup.NewService(client, w)
 

diff --git a/misc/loop/docker-compose.production.yml b/misc/loop/docker-compose.production.yml
@@ -4,6 +4,9 @@ networks:
   portal-loop:
     name: portal-loop
     driver: bridge
+    ipam:
+      config:
+        - subnet: 172.177.0.0/16
 
 services:
   traefik:
@@ -73,7 +76,6 @@ services:
   portalloopd:
     image: ghcr.io/albttx/gno/portalloopd
     restart: unless-stopped
-    working_dir: /app
     volumes:
       - ./scripts:/scripts
       - ./backups:/backups

diff --git a/misc/loop/docker-compose.yml b/misc/loop/docker-compose.yml
@@ -4,6 +4,10 @@ networks:
   portal-loop:
     name: portal-loop
     driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.42.0.0/16
 
 services:
   traefik:

diff --git a/misc/loop/traefik/gno.yml b/misc/loop/traefik/gno.yml
@@ -5,12 +5,13 @@ http:
       ipWhiteList:
         sourceRange:
           - "127.0.0.1/32"
+          - "172.42.0.1/32"
 
   routers:
     gno-portal-loop-local:
       service: gno-portal-loop
-      rule: "Host(`rpc.portal.gno.local`)"
-      entrypoints: ["web", "private"]
+      rule: "PathPrefix(`/`)"
+      entrypoints: ["private"]
       middlewares: []
 
     gno-portal-loop:
@@ -25,4 +26,4 @@ http:
     gno-portal-loop:
       loadBalancer:
         servers:
-          - url: "http://localhost:32780"
+          - url: "http://172.42.0.6:26657"