feat: silius v0.7.0 (#55)

* feat: silius v0.7.0

README.md

@@ -19,7 +19,7 @@ Each bundler to run has a folder and yml file [./bundlers](./bundlers) folder
 - see the `runbundler/.env` for global settings, like `FUND` for funded addresses.
 - The bundler-specific RPC calls (eth_ and debug_) should be exposed on `BUNDLER_URL`
 - To test bundler startup script:
-  * `./runbundler/runbundler.sh {./runblers/aabundler/aabundler.yml} start` - start the bundler (along with node, and deployed contract)
+  * `./runbundler/runbundler.sh {./bundlers/aabundler/aabundler.yml} start` - start the bundler (along with node, and deployed contract)
   * `down` - stop all docker images.
   * (or any other docker-compose command, such as `logs`)
 

bundlers/silius/.env

@@ -1 +1 @@
-BUNDLER_ACCOUNT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+BOOT_ENR=enr:-Iu4QKWfapgYurSypiE8Oa1ZdOyK8lC2BLytkihEd-b5QwWtd-szKPuncudIbUUQ9wHMhZk-cbzTsEUxS4QiTtrYKPwBgmlkgnY0gmlwhMCoZGWJc2VjcDI1NmsxoQJEdmi_LPA0b8j2BHHDsyGi_Y086wDplSGNVe96M4sWnIN0Y3CCIyiDdWRwgiMo

bundlers/silius/p2p-boot.yml-v06

@@ -0,0 +1,33 @@
+services:
+  bundler:
+    ports: [ "3000:3000" ]
+    image: ghcr.io/silius-rs/silius:latest
+    command: node
+      --eth-client-address $ETH_RPC_URL
+      --datadir data/silius
+      --mnemonic-file /root/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+      --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+      --entry-points $ENTRYPOINT
+      --http --http.addr 0.0.0.0
+      --http.port 3000
+      --http.api eth,debug,web3
+      --poll-interval "5"
+      --enable-p2p
+      --p2p.addr $BUNDLER_IP
+      --p2p.baddr $BUNDLER_IP
+    volumes:
+      - ./keys:/root
+      - ./p2p-boot:/data/silius/p2p
+    networks:
+      default:
+      p2p:
+        ipv4_address: $BUNDLER_IP
+
+  bundler-verify:
+    image: docker
+    # volumes:
+    #   - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      bundler:
+        condition: service_started
+    command: echo docker exec runbundler-bundler-1 cat /data/silius/p2p/node-enr

bundlers/silius/p2p-boot/node-enr

@@ -0,0 +1 @@
+enr:-Iu4QKWfapgYurSypiE8Oa1ZdOyK8lC2BLytkihEd-b5QwWtd-szKPuncudIbUUQ9wHMhZk-cbzTsEUxS4QiTtrYKPwBgmlkgnY0gmlwhMCoZGWJc2VjcDI1NmsxoQJEdmi_LPA0b8j2BHHDsyGi_Y086wDplSGNVe96M4sWnIN0Y3CCIyiDdWRwgiMo

bundlers/silius/p2p-boot/node-key

@@ -0,0 +1 @@
+ ��!4}���@;���v��|��rC�<�ψRd�

bundlers/silius/p2p-peer.yml-v06

@@ -0,0 +1,25 @@
+services:
+  bundler:
+    ports: [ "3001:3000" ]
+    image: ghcr.io/silius-rs/silius:latest
+    command: node
+      --eth-client-address $ETH_RPC_URL
+      --datadir data/silius
+      --mnemonic-file /root/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+      --beneficiary 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+      --entry-points $ENTRYPOINT
+      --http --http.addr 0.0.0.0  
+      --http.port 3000
+      --http.api eth,debug,web3
+      --poll-interval "5"
+      --enable-p2p
+      --bootnodes $BOOT_ENR
+      --p2p.addr $BUNDLER2_IP
+      --p2p.baddr $BUNDLER2_IP
+    volumes:
+      - ./keys:/root
+      - ./p2p-peer:/data/silius/p2p
+    networks:
+      default:
+      p2p:
+        ipv4_address: $BUNDLER2_IP

bundlers/silius/p2p-peer/node-enr

@@ -0,0 +1 @@
+enr:-Iu4QBIlfz_fSAGGmUkgPxFEvv_kgplO49l08Rg-la7v1zJoDYqvvatwDLl4Rk6xGXt0-OAd9Jakg-P8LNfPna-cvwABgmlkgnY0gmlwhMCoZGaJc2VjcDI1NmsxoQOKdUBFbAaoQIlmcvxyt2qn3yEwQK5fA3AUKElwyK1Zg4N0Y3CCIyiDdWRwgiMo

bundlers/silius/p2p-peer/node-key

@@ -0,0 +1,2 @@
+ ǁ�%#J�
+�c��u!��LʆI����%ev��

bundlers/silius/silius.yml

@@ -0,0 +1,28 @@
+services:
+  bundler:
+    image: ghcr.io/silius-rs/silius:v07-latest
+    command: 
+      - node
+      - --eth-client-address
+      - $ETH_RPC_URL
+      - --datadir
+      - data/silius
+      - --mnemonic-file
+      - /root/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+      - --beneficiary
+      - "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+      - --entry-points 
+      - $ENTRYPOINT
+      - --http 
+      - --http.addr
+      - 0.0.0.0
+      - --http.port
+      - "3000"
+      - --http.api
+      - eth,debug,web3
+      - --poll-interval
+      - "5"
+    ports: [ '3000:3000' ]
+    volumes:
+      - ./keys:/root
+

bundlers/silius/silius.yml-v06

@@ -2,13 +2,13 @@ services:
   bundler:
     image: ghcr.io/silius-rs/silius:latest
     command: 
-      - bundler
+      - node
       - --eth-client-address
       - $ETH_RPC_URL
       - --datadir
       - data/silius
       - --mnemonic-file
-      - /root/${BUNDLER_ACCOUNT}
+      - /root/0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
       - --beneficiary
       - "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
       - --entry-points 
@@ -20,6 +20,8 @@ services:
       - "3000"
       - --http.api
       - eth,debug,web3
+      - --poll-interval
+      - "5"
     ports: [ '3000:3000' ]
     volumes:
       - ./keys:/root

tests/silius-silius.env

@@ -0,0 +1,4 @@
+export BUNDLER_YML=bundlers/silius/p2p-boot.yml
+export BUNDLER2_YML=bundlers/silius/p2p-peer.yml
+
+export ENVFILE=bundlers/silius/.env

tests/silius-skandha.env

@@ -0,0 +1,5 @@
+export BUNDLER_YML=bundlers/silius/p2p-boot.yml
+export BUNDLER2_YML=bundlers/skandha/p2p-peer.yml
+
+# the peer should use this enr to connect to
+export ENVFILE=bundlers/silius/.env

tests/skandha-silius.env

@@ -0,0 +1,6 @@
+export BUNDLER_YML=bundlers/skandha/p2p-boot.yml
+export BUNDLER2_YML=bundlers/silius/p2p-peer.yml
+
+#the skanha env file defines the BOOT_ENR that is exposed by p2p-boot.
+# the peer should use this enr to connect to
+export ENVFILE=bundlers/skandha/.env