diff --git a/Makefile b/Makefile index 5e23b550f1..cdd22c93b3 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,9 @@ endif development: make all environment=development -# Build with contract packages published to the NPM registry and tagged `goerli`. -goerli: - make all environment=goerli +# Build with contract packages published to the NPM registry and tagged `sepolia`. +sepolia: + make all environment=sepolia # Build with contract packages published to the NPM registry and tagged `mainnet`. mainnet: @@ -146,4 +146,4 @@ cmd-help: build @echo '$$ $(app_name) start --help' > docs/resources/client-start-help ./$(app_name) start --help >> docs/resources/client-start-help -.PHONY: all development goerli download_artifacts generate gen_proto build cmd-help release build_multi +.PHONY: all development sepolia download_artifacts generate gen_proto build cmd-help release build_multi diff --git a/config/network/network.go b/config/network/network.go index 160430a719..3bd21d2b6b 100644 --- a/config/network/network.go +++ b/config/network/network.go @@ -30,7 +30,7 @@ func (n Type) Ethereum() ethereum.Network { return []ethereum.Network{ ethereum.Unknown, ethereum.Mainnet, - ethereum.Goerli, + ethereum.Sepolia, ethereum.Developer, }[n] } diff --git a/config/peers_test.go b/config/peers_test.go index 7705dd9d4b..692496ac11 100644 --- a/config/peers_test.go +++ b/config/peers_test.go @@ -21,7 +21,7 @@ func TestResolvePeers(t *testing.T) { "/dns4/bst-a01.tbtc.boar.network/tcp/5001/ipfs/16Uiu2HAmAmCrLuUmnBgpavU8y8JBUN6jWAQ93JwydZy3ABRyY6wU", "/dns4/bst-b01.tbtc.boar.network/tcp/5001/ipfs/16Uiu2HAm4w5HdJQxBnadGRepaiGfWVvtMzhdAGZVcrf9i71mv69V", }}, - "goerli network": { + "sepolia network": { network: network.Testnet, expectedPeers: []string{ "/dns4/bootstrap-0.test.keep.network/tcp/3919/ipfs/16Uiu2HAmCcfVpHwfBKNFbQuhvGuFXHVLQ65gB4sJm7HyrcZuLttH", diff --git a/docs/development/README.adoc b/docs/development/README.adoc index 3a45f0c4ed..8ea7c9fd0d 100644 --- a/docs/development/README.adoc +++ b/docs/development/README.adoc @@ -246,7 +246,7 @@ make mainnet ``` ``` -make goerli +make sepolia ``` Development diff --git a/docs/registration.adoc b/docs/registration.adoc index 11ecbddf33..4986a05d19 100644 --- a/docs/registration.adoc +++ b/docs/registration.adoc @@ -126,4 +126,4 @@ link:https://docs.threshold.network/extras/contract-addresses/ethereum-mainnet[E page for the recent Mainnet addresses of the contracts. NOTE: icon:flask[] For addresses of Testnet contracts please visit the -link:https://docs.threshold.network/extras/contract-addresses/goerli-testnet#tbtc-application-contracts[link]. +link:https://docs.threshold.network/resources/contract-addresses/sepolia-testnet[link]. diff --git a/docs/run-keep-node.adoc b/docs/run-keep-node.adoc index 1cc085fe08..b1cb634e5b 100644 --- a/docs/run-keep-node.adoc +++ b/docs/run-keep-node.adoc @@ -397,7 +397,7 @@ include::../config/_peers/testnet[] === Contracts To get adresses of contracts on Testnet please see the -link:https://docs.threshold.network/extras/contract-addresses/goerli-testnet#tbtc-application-contracts[link]. +link:https://docs.threshold.network/resources/contract-addresses/sepolia-testnet[link]. === Installation diff --git a/go.mod b/go.mod index 00170e6d71..2dc9e6429e 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,6 @@ require ( github.com/checksum0/go-electrum v0.0.0-20220912200153-b862ac442cf9 github.com/ethereum/go-ethereum v1.10.19 github.com/go-test/deep v1.0.8 - github.com/golang/protobuf v1.5.2 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa github.com/hashicorp/go-multierror v1.1.1 github.com/ipfs/go-datastore v0.5.1 @@ -33,7 +32,7 @@ require ( github.com/ipfs/go-log v1.0.5 github.com/ipfs/go-log/v2 v2.5.1 github.com/jbenet/goprocess v0.1.4 - github.com/keep-network/keep-common v1.7.1-0.20230501122407-5cc3757ccf0d + github.com/keep-network/keep-common v1.7.1-0.20231107101149-559db3d3849e github.com/libp2p/go-addr-util v0.2.0 github.com/libp2p/go-libp2p v0.20.1 github.com/libp2p/go-libp2p-core v0.16.1 @@ -79,6 +78,7 @@ require ( github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/godbus/dbus/v5 v5.0.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/google/gopacket v1.1.19 // indirect github.com/google/uuid v1.3.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect diff --git a/go.sum b/go.sum index 04e8267f6d..ad9f0b10ce 100644 --- a/go.sum +++ b/go.sum @@ -601,8 +601,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0= github.com/keep-network/go-electrum v0.0.0-20230524074410-befe891c2f8c h1:wBBb0rIOnYpOqH+QkwEQ/2LT6n7v+ELJlDePvoR7pQY= github.com/keep-network/go-electrum v0.0.0-20230524074410-befe891c2f8c/go.mod h1:eiMFzdvS+x8Voi0bmiZtVfJ3zMNRUnPNDnhCQR0tudo= -github.com/keep-network/keep-common v1.7.1-0.20230501122407-5cc3757ccf0d h1:6AiGKgOEmwO1Cri87bMfmxgF8ZgE5HIJOQUO7nZszh0= -github.com/keep-network/keep-common v1.7.1-0.20230501122407-5cc3757ccf0d/go.mod h1:OmaZrnZODf6RJ95yUn2kBjy8Z4u2npPJQkSiyimluto= +github.com/keep-network/keep-common v1.7.1-0.20231107101149-559db3d3849e h1:6kXLtv3TfObPoBNSAMqpMefOyK01y6X4zghau6F5NDg= +github.com/keep-network/keep-common v1.7.1-0.20231107101149-559db3d3849e/go.mod h1:OmaZrnZODf6RJ95yUn2kBjy8Z4u2npPJQkSiyimluto= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/infrastructure/kube/keep-test/keep-client/README.md b/infrastructure/kube/keep-test/keep-client/README.md index 0082f84c0c..9ece10b201 100644 --- a/infrastructure/kube/keep-test/keep-client/README.md +++ b/infrastructure/kube/keep-test/keep-client/README.md @@ -27,6 +27,6 @@ Config Maps: Secrets: -- `eth-network-goerli` +- `eth-network-sepolia` - `eth-account-passphrases` - `eth-account-privatekeys` diff --git a/infrastructure/kube/keep-test/keep-client/gen/template.yaml b/infrastructure/kube/keep-test/keep-client/gen/template.yaml index 22193abd11..2f5a569566 100644 --- a/infrastructure/kube/keep-test/keep-client/gen/template.yaml +++ b/infrastructure/kube/keep-test/keep-client/gen/template.yaml @@ -6,7 +6,7 @@ app: keep type: client id: #@ str(client.id) -network: goerli +network: sepolia #@ end #@ def name(): @@ -73,7 +73,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -117,12 +117,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -139,7 +139,7 @@ spec: args: - "initialize" - "--network" - - "goerli" + - "sepolia" - "--owner" - "$(KEEP_CLIENT_ETH_ADDRESS)" - "--provider" diff --git a/infrastructure/kube/keep-test/keep-client/keep-clients.yaml b/infrastructure/kube/keep-test/keep-client/keep-clients.yaml index 5bc649215a..d3f284bb8c 100644 --- a/infrastructure/kube/keep-test/keep-client/keep-clients.yaml +++ b/infrastructure/kube/keep-test/keep-client/keep-clients.yaml @@ -8,7 +8,7 @@ metadata: app: keep type: client id: "0" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -16,7 +16,7 @@ spec: app: keep type: client id: "0" - network: goerli + network: sepolia serviceName: keep-client-0 volumeClaimTemplates: - metadata: @@ -33,7 +33,7 @@ spec: app: keep type: client id: "0" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -67,7 +67,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -106,12 +106,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -128,7 +128,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -146,12 +146,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -168,7 +168,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -189,7 +189,7 @@ metadata: app: keep type: client id: "0" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -203,7 +203,7 @@ spec: app: keep type: client id: "0" - network: goerli + network: sepolia loadBalancerIP: 104.154.61.116 --- apiVersion: apps/v1 @@ -215,7 +215,7 @@ metadata: app: keep type: client id: "1" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -223,7 +223,7 @@ spec: app: keep type: client id: "1" - network: goerli + network: sepolia serviceName: keep-client-1 volumeClaimTemplates: - metadata: @@ -240,7 +240,7 @@ spec: app: keep type: client id: "1" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -274,7 +274,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -313,12 +313,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -335,7 +335,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -353,12 +353,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -375,7 +375,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -396,7 +396,7 @@ metadata: app: keep type: client id: "1" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -410,7 +410,7 @@ spec: app: keep type: client id: "1" - network: goerli + network: sepolia loadBalancerIP: 35.223.100.87 --- apiVersion: apps/v1 @@ -422,7 +422,7 @@ metadata: app: keep type: client id: "2" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -430,7 +430,7 @@ spec: app: keep type: client id: "2" - network: goerli + network: sepolia serviceName: keep-client-2 volumeClaimTemplates: - metadata: @@ -447,7 +447,7 @@ spec: app: keep type: client id: "2" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -481,7 +481,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -518,12 +518,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -540,7 +540,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -558,12 +558,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -580,7 +580,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -601,7 +601,7 @@ metadata: app: keep type: client id: "2" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -615,7 +615,7 @@ spec: app: keep type: client id: "2" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -627,7 +627,7 @@ metadata: app: keep type: client id: "3" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -635,7 +635,7 @@ spec: app: keep type: client id: "3" - network: goerli + network: sepolia serviceName: keep-client-3 volumeClaimTemplates: - metadata: @@ -652,7 +652,7 @@ spec: app: keep type: client id: "3" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -686,7 +686,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -723,12 +723,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -745,7 +745,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -763,12 +763,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -785,7 +785,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -806,7 +806,7 @@ metadata: app: keep type: client id: "3" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -820,7 +820,7 @@ spec: app: keep type: client id: "3" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -832,7 +832,7 @@ metadata: app: keep type: client id: "4" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -840,7 +840,7 @@ spec: app: keep type: client id: "4" - network: goerli + network: sepolia serviceName: keep-client-4 volumeClaimTemplates: - metadata: @@ -857,7 +857,7 @@ spec: app: keep type: client id: "4" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -891,7 +891,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -928,12 +928,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -950,7 +950,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -968,12 +968,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -990,7 +990,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1011,7 +1011,7 @@ metadata: app: keep type: client id: "4" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -1025,7 +1025,7 @@ spec: app: keep type: client id: "4" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -1037,7 +1037,7 @@ metadata: app: keep type: client id: "5" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -1045,7 +1045,7 @@ spec: app: keep type: client id: "5" - network: goerli + network: sepolia serviceName: keep-client-5 volumeClaimTemplates: - metadata: @@ -1062,7 +1062,7 @@ spec: app: keep type: client id: "5" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -1096,7 +1096,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -1133,12 +1133,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1155,7 +1155,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1173,12 +1173,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1195,7 +1195,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1216,7 +1216,7 @@ metadata: app: keep type: client id: "5" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -1230,7 +1230,7 @@ spec: app: keep type: client id: "5" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -1242,7 +1242,7 @@ metadata: app: keep type: client id: "6" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -1250,7 +1250,7 @@ spec: app: keep type: client id: "6" - network: goerli + network: sepolia serviceName: keep-client-6 volumeClaimTemplates: - metadata: @@ -1267,7 +1267,7 @@ spec: app: keep type: client id: "6" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -1301,7 +1301,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -1338,12 +1338,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1360,7 +1360,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1378,12 +1378,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1400,7 +1400,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1421,7 +1421,7 @@ metadata: app: keep type: client id: "6" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -1435,7 +1435,7 @@ spec: app: keep type: client id: "6" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -1447,7 +1447,7 @@ metadata: app: keep type: client id: "7" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -1455,7 +1455,7 @@ spec: app: keep type: client id: "7" - network: goerli + network: sepolia serviceName: keep-client-7 volumeClaimTemplates: - metadata: @@ -1472,7 +1472,7 @@ spec: app: keep type: client id: "7" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -1506,7 +1506,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -1543,12 +1543,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1565,7 +1565,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1583,12 +1583,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1605,7 +1605,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1626,7 +1626,7 @@ metadata: app: keep type: client id: "7" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -1640,7 +1640,7 @@ spec: app: keep type: client id: "7" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -1652,7 +1652,7 @@ metadata: app: keep type: client id: "8" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -1660,7 +1660,7 @@ spec: app: keep type: client id: "8" - network: goerli + network: sepolia serviceName: keep-client-8 volumeClaimTemplates: - metadata: @@ -1677,7 +1677,7 @@ spec: app: keep type: client id: "8" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -1711,7 +1711,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -1748,12 +1748,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1770,7 +1770,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1788,12 +1788,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1810,7 +1810,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1831,7 +1831,7 @@ metadata: app: keep type: client id: "8" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -1845,7 +1845,7 @@ spec: app: keep type: client id: "8" - network: goerli + network: sepolia loadBalancerIP: null --- apiVersion: apps/v1 @@ -1857,7 +1857,7 @@ metadata: app: keep type: client id: "9" - network: goerli + network: sepolia spec: replicas: 1 selector: @@ -1865,7 +1865,7 @@ spec: app: keep type: client id: "9" - network: goerli + network: sepolia serviceName: keep-client-9 volumeClaimTemplates: - metadata: @@ -1882,7 +1882,7 @@ spec: app: keep type: client id: "9" - network: goerli + network: sepolia spec: volumes: - name: keep-client-data @@ -1916,7 +1916,7 @@ spec: - name: ETH_WS_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: ws-url envFrom: - configMapRef: @@ -1953,12 +1953,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -1975,7 +1975,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -1993,12 +1993,12 @@ spec: - name: CHAIN_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: CONTRACT_OWNER_ETH_PRIVATE_KEY valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: contract-owner-eth-account-private-key - name: KEEP_CLIENT_ETH_PRIVATE_KEY valueFrom: @@ -2015,7 +2015,7 @@ spec: args: - initialize - --network - - goerli + - sepolia - --owner - $(KEEP_CLIENT_ETH_ADDRESS) - --provider @@ -2036,7 +2036,7 @@ metadata: app: keep type: client id: "9" - network: goerli + network: sepolia spec: type: LoadBalancer ports: @@ -2050,5 +2050,5 @@ spec: app: keep type: client id: "9" - network: goerli + network: sepolia loadBalancerIP: null diff --git a/infrastructure/kube/keep-test/keep-maintainer-staging/README.md b/infrastructure/kube/keep-test/keep-maintainer-staging/README.md deleted file mode 100644 index ffe03d61d5..0000000000 --- a/infrastructure/kube/keep-test/keep-maintainer-staging/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Keep Maintainer Staging Mainnet - -Bitcoin Relay used by the tTBTC system on testnet environment is an optimized version -of the Light Relay implemented by [GoerliLightRelay](https://github.com/keep-network/tbtc-v2/blob/main/solidity/contracts/test/GoerliLightRelay.sol) -contract. The reason the Light Relay had to be modified for testnet is that on -Bitcoin testnet difficulty often drops to `1`, which makes the blocks validation -on such change impossible to the regular Light Relay contract. - -The `GoerliLightRelay` version doesn't require a maintainer bot to submit block -headers on difficulty change. It accepts ad-hoc difficulty alignment according to -the tests needs. - -The setup defined in this directory is meant for testing the bitcoin difficulty module -of the maintainer bot with the Bitcoin mainnet blockchain state. diff --git a/infrastructure/kube/keep-test/keep-maintainer-staging/kustomization.yaml b/infrastructure/kube/keep-test/keep-maintainer-staging/kustomization.yaml deleted file mode 100644 index 6130febd1b..0000000000 --- a/infrastructure/kube/keep-test/keep-maintainer-staging/kustomization.yaml +++ /dev/null @@ -1,50 +0,0 @@ -resources: - - ../../templates/keep-maintainer - -namespace: default - -# Regular testnet maintainer doesn't run bitcoinDifficulty module due to specifics -# of LightRelay running on testnet (GoerliLightRelay). This setup is running -# the `bitcoinDifficulty` module of maintainer connected to Bitcoin mainnet. -nameSuffix: -staging - -commonLabels: - app: keep-maintainer-staging - type: bitcoinDifficulty - network: goerli - -images: - - name: keep-maintainer - newName: gcr.io/keep-test-f3e0/keep-client - newTag: latest - -configMapGenerator: - - name: keep-maintainer-config - behavior: merge - literals: - - network=testnet - - electrum-api-url=wss://electrumx-server.tbtc.network:8443 - files: - - .secret/keep-maintainer-keyfile - -secretGenerator: - - name: keep-maintainer-eth-account-password - files: - - .secret/keep-maintainer-password - -patches: - - target: - kind: StatefulSet - name: keep-maintainer - patch: |- - - op: add - path: /spec/template/spec/containers/0/args/- - value: --bitcoinDifficulty - - op: replace - path: /spec/template/spec/containers/0/env/0/valueFrom/secretKeyRef/name - value: eth-network-goerli - -generatorOptions: - disableNameSuffixHash: true - annotations: - note: generated diff --git a/infrastructure/kube/keep-test/keep-maintainer/kustomization.yaml b/infrastructure/kube/keep-test/keep-maintainer/kustomization.yaml index 7129c3deef..b5af7cc89d 100644 --- a/infrastructure/kube/keep-test/keep-maintainer/kustomization.yaml +++ b/infrastructure/kube/keep-test/keep-maintainer/kustomization.yaml @@ -8,11 +8,14 @@ commonLabels: # The current setup runs spv and walletCoordination modules as a workaround # for reasons mentioned in `patches` property below. type: all - network: goerli + network: sepolia images: + # Special maintainer version working with the modified version of LightRelay + # contract (SepoliaLightRelay). Source code lives in the `keep-maintainer-testnet` + # branch of the `keep-network/keep-core` repository. - name: keep-maintainer - newName: gcr.io/keep-test-f3e0/keep-client + newName: gcr.io/keep-test-f3e0/keep-maintainer newTag: latest configMapGenerator: @@ -32,7 +35,7 @@ secretGenerator: patches: # Testnet's maintainer shouldn't run `--bitcoinDifficulty` module, as the testnet - # uses modified version of LightRelay contract (GoerliLightRelay) that doesn't + # uses modified version of LightRelay contract (SepoliaLightRelay) that doesn't # require the bitcoin difficulty to be submitted. This patch defines manually # which modules should be started. - target: @@ -47,7 +50,7 @@ patches: value: --walletCoordination - op: replace path: /spec/template/spec/containers/0/env/0/valueFrom/secretKeyRef/name - value: eth-network-goerli + value: eth-network-sepolia generatorOptions: disableNameSuffixHash: true diff --git a/infrastructure/kube/keep-test/tbtc-v2-maintainer/guardian-statefulset.yaml b/infrastructure/kube/keep-test/tbtc-v2-maintainer/guardian-statefulset.yaml index 7b5d669801..ae4eeb6677 100644 --- a/infrastructure/kube/keep-test/tbtc-v2-maintainer/guardian-statefulset.yaml +++ b/infrastructure/kube/keep-test/tbtc-v2-maintainer/guardian-statefulset.yaml @@ -57,7 +57,7 @@ spec: - name: ETHEREUM_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: ELECTRUM_API_URL valueFrom: diff --git a/infrastructure/kube/keep-test/tbtc-v2-maintainer/kustomization.yaml b/infrastructure/kube/keep-test/tbtc-v2-maintainer/kustomization.yaml index aa07730a3b..e2b8559f5b 100644 --- a/infrastructure/kube/keep-test/tbtc-v2-maintainer/kustomization.yaml +++ b/infrastructure/kube/keep-test/tbtc-v2-maintainer/kustomization.yaml @@ -7,7 +7,7 @@ namespace: default commonLabels: app: tbtc-v2-maintainer - network: goerli + network: sepolia configMapGenerator: - name: tbtc-v2-maintainer-eth-accounts-info diff --git a/infrastructure/kube/keep-test/tbtc-v2-maintainer/minter-statefulset.yaml b/infrastructure/kube/keep-test/tbtc-v2-maintainer/minter-statefulset.yaml index 2660faa5e9..20256a816a 100644 --- a/infrastructure/kube/keep-test/tbtc-v2-maintainer/minter-statefulset.yaml +++ b/infrastructure/kube/keep-test/tbtc-v2-maintainer/minter-statefulset.yaml @@ -57,7 +57,7 @@ spec: - name: ETHEREUM_API_URL valueFrom: secretKeyRef: - name: eth-network-goerli + name: eth-network-sepolia key: http-url - name: ELECTRUM_API_URL valueFrom: diff --git a/scripts/build.sh b/scripts/build.sh index 2387808f53..d307685631 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -3,7 +3,7 @@ set -eou pipefail ROOT_DIR="$(realpath "$(dirname $0)/../")" -ENVIRONMENT_DEFAULT=goerli +ENVIRONMENT_DEFAULT=sepolia read -p "Ethereum Network [$ENVIRONMENT_DEFAULT]: " ENVIRONMENT ENVIRONMENT=${ENVIRONMENT:-$ENVIRONMENT_DEFAULT}