Merge branch 'main' into ckartik/add-reverting-txnlist

primev · Jul 9, 2024 · 2a7cd32 · 2a7cd32
2 parents acc413f + 1ffcb06
commit 2a7cd32
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -296,12 +296,13 @@ jobs:
             done
           done
 
-      - name: Upload Cluster Logs
-        if: ${{ env.IS_MANUAL_DEPLOYMENT == 'false' && failure() }}
+      - name: Upload Debug Artifacts
+        if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
-          name: cluster-logs
+          name: debug-artifacts
           path: |
+            /tmp/dist/
             nomad_jobs.json
             nomad.log
             *_stdout.log

diff --git a/infrastructure/nomad/playbooks/deploy.yml b/infrastructure/nomad/playbooks/deploy.yml
@@ -530,21 +530,6 @@
         label: "{{ item.path | basename }}"
       when: build_artifacts and upload_artifacts.matched > 0 and env == 'devenv'
 
-    - name: Read Generated Secrets
-      slurp:
-        src: "{{ dist_dir }}/secrets.json"
-      register: secrets_json
-      when: build_artifacts and environments[env].secrets == 'generate'
-      delegate_to: localhost
-      run_once: true
-
-    - name: Debug Generated Secrets
-      ansible.builtin.debug:
-        msg: "{{ secrets_json.content | b64decode }}"
-      when: build_artifacts and env == 'devenv' and environments[env].secrets == 'generate'
-      delegate_to: localhost
-      run_once: true
-
     - name: Push Generated Secrets to Vault
       ansible.builtin.uri:
         url: "{{ vault_address }}/v1/{{ vault_kv_engine_path }}/data/{{ vault_secret_path }}"
@@ -553,7 +538,7 @@
         headers:
           X-Vault-Token: "{{ vault_init.json.root_token }}"
           Content-Type: "application/json"
-        body: "{{ {'data': (secrets_json.content | b64decode | from_json)} | to_json }}"
+        body: "{{ {'data': (lookup('file', dist_dir + '/secrets.json') | from_json)} | to_json }}"
         status_code: [200, 204]
         validate_certs: no
       when: build_artifacts and environments[env].secrets == 'generate'

diff --git a/p2p/pkg/rpc/provider/service.go b/p2p/pkg/rpc/provider/service.go
@@ -44,7 +44,7 @@ type ProviderRegistryContract interface {
 	RegisterAndStake(opts *bind.TransactOpts, blsPublicKey []byte) (*types.Transaction, error)
 	CheckStake(*bind.CallOpts, common.Address) (*big.Int, error)
 	MinStake(*bind.CallOpts) (*big.Int, error)
-	ParseFundsDeposited(types.Log) (*providerregistry.ProviderregistryFundsDeposited, error)
+	ParseProviderRegistered(types.Log) (*providerregistry.ProviderregistryProviderRegistered, error)
 }
 
 type Watcher interface {
@@ -226,10 +226,10 @@ func (s *Service) RegisterStake(
 	}
 
 	for _, log := range receipt.Logs {
-		if registration, err := s.registryContract.ParseFundsDeposited(*log); err == nil {
-			s.logger.Info("stake registered", "amount", registration.Amount)
+		if registration, err := s.registryContract.ParseProviderRegistered(*log); err == nil {
+			s.logger.Info("stake registered", "amount", registration.StakedAmount)
 			return &providerapiv1.StakeResponse{
-				Amount:       registration.Amount.String(),
+				Amount:       registration.StakedAmount.String(),
 				BlsPublicKey: stake.BlsPublicKey,
 			}, nil
 		}

diff --git a/p2p/pkg/rpc/provider/service_test.go b/p2p/pkg/rpc/provider/service_test.go
@@ -42,10 +42,10 @@ func (t *testRegistryContract) MinStake(_ *bind.CallOpts) (*big.Int, error) {
 	return t.minStake, nil
 }
 
-func (t *testRegistryContract) ParseFundsDeposited(log types.Log) (*providerregistry.ProviderregistryFundsDeposited, error) {
-	return &providerregistry.ProviderregistryFundsDeposited{
+func (t *testRegistryContract) ParseProviderRegistered(log types.Log) (*providerregistry.ProviderregistryProviderRegistered, error) {
+	return &providerregistry.ProviderregistryProviderRegistered{
 		Provider: common.Address{},
-		Amount:   t.stake,
+		StakedAmount: t.stake,
 	}, nil
 }