deployment fixes and improvements

integration-tests/deployment/keystone/deploy.go

@@ -267,7 +267,7 @@ func ConfigureForwardContracts(env *deployment.Environment, dons []RegisteredDon
  return fmt.Errorf("no forwarder contract found for chain %d", chain.Selector)
  }
 
- err := configureForwarder(chain, fwrd, dons)
+ err := configureForwarder(env.Logger, chain, fwrd, dons)
  if err != nil {
  return fmt.Errorf("failed to configure forwarder for chain selector %d: %w", chain.Selector, err)
  }
@@ -669,12 +669,13 @@ func sortedHash(p2pids [][32]byte) string {
 }
 
 func registerDons(lggr logger.Logger, req registerDonsRequest) (*registerDonsResponse, error) {
- resp := &registerDonsResponse{
+ resp := registerDonsResponse{
  donInfos: make(map[string]capabilities_registry.CapabilitiesRegistryDONInfo),
  }
  // track hash of sorted p2pids to don name because the registry return value does not include the don name
  // and we need to map it back to the don name to access the other mapping data such as the don's capabilities & nodes
  p2pIdsToDon := make(map[string]string)
+ var registeredDons = 0
 
  for don, ocr2nodes := range req.donToOcr2Nodes {
  var p2pIds [][32]byte
@@ -724,25 +725,47 @@ func registerDons(lggr logger.Logger, req registerDonsRequest) (*registerDonsRes
  return nil, fmt.Errorf("failed to confirm AddDON transaction %s for don %s: %w", tx.Hash().String(), don, err)
  }
  lggr.Debugw("registered DON", "don", don, "p2p sorted hash", p2pSortedHash, "cgs", cfgs, "wfSupported", wfSupported, "f", f)
+ registeredDons++
+ }
+ lggr.Debugf("Registered all DONS %d, waiting for registry to update", registeredDons)
+
+ // occasionally the registry does not return the expected number of DONS, so we retry a few times
+ // while crude, it is effective
+ var donInfos []capabilities_registry.CapabilitiesRegistryDONInfo
+ var err error
+ for i := 0; i < 10; i++ {
+ lggr.Debug("attempting to get DONS from registry", i)
+ donInfos, err = req.registry.GetDONs(&bind.CallOpts{})
+ if len(donInfos) != registeredDons {
+ lggr.Debugw("expected dons not registered", "expected", registeredDons, "got", len(donInfos))
+ time.Sleep(2 * time.Second)
+ } else {
+ break
+ }
  }
- donInfos, err := req.registry.GetDONs(&bind.CallOpts{})
  if err != nil {
  err = DecodeErr(kcr.CapabilitiesRegistryABI, err)
  return nil, fmt.Errorf("failed to call GetDONs: %w", err)
  }
+
  for i, donInfo := range donInfos {
  donName, ok := p2pIdsToDon[sortedHash(donInfo.NodeP2PIds)]
  if !ok {
  return nil, fmt.Errorf("don not found for p2pids %s in %v", sortedHash(donInfo.NodeP2PIds), p2pIdsToDon)
  }
+ lggr.Debugw("adding don info", "don", donName, "cnt", i)
  resp.donInfos[donName] = donInfos[i]
  }
- return resp, nil
+ lggr.Debugw("found registered DONs", "count", len(resp.donInfos))
+ if len(resp.donInfos) != registeredDons {
+ return nil, fmt.Errorf("expected %d dons, got %d", registeredDons, len(resp.donInfos))
+ }
+ return &resp, nil
 }
 
 // configureForwarder sets the config for the forwarder contract on the chain for all Dons that accept workflows
 // dons that don't accept workflows are not registered with the forwarder
-func configureForwarder(chain deployment.Chain, fwdr *kf.KeystoneForwarder, dons []RegisteredDon) error {
+func configureForwarder(lggr logger.Logger, chain deployment.Chain, fwdr *kf.KeystoneForwarder, dons []RegisteredDon) error {
  if fwdr == nil {
  return errors.New("nil forwarder contract")
  }
@@ -761,6 +784,7 @@ func configureForwarder(chain deployment.Chain, fwdr *kf.KeystoneForwarder, dons
  err = DecodeErr(kf.KeystoneForwarderABI, err)
  return fmt.Errorf("failed to confirm SetConfig for forwarder %s: %w", fwdr.Address().String(), err)
  }
+ lggr.Debugw("configured forwarder", "forwarder", fwdr.Address().String(), "donId", dn.Info.Id, "version", ver, "f", dn.Info.F, "signers", dn.signers())
  }
  return nil
 }

integration-tests/deployment/keystone/types.go

@@ -70,7 +70,8 @@ type ocr2Node struct {
 }
 
 func (o *ocr2Node) signerAddress() common.Address {
- return common.BytesToAddress(o.Signer[:])
+ // eth address is the first 20 bytes of the Signer
+ return common.BytesToAddress(o.Signer[:20])
 }
 
 func (o *ocr2Node) toNodeKeys() NodeKeys {
@@ -128,6 +129,10 @@ func newOcr2Node(id string, ccfgs map[chaintype.ChainType]*v1.ChainConfig, csaPu
  }
 
  var sigb [32]byte
+ // initialize sigb to 0s
+ for i := range sigb {
+ sigb[i] = 0
+ }
  copy(sigb[:], signerB)
 
  n := &ocr2Node{