fix: Avail blobID back to block height + extrinsic index

Author: 0xRampey

availda/availda.go

@@ -207,9 +207,11 @@ out:
 	}
 
 	var dataProofResp DataProofRPCResponse
+	var extIndex int
 	for idx, e := range block.Block.Extrinsics {
 		// Look for our submitted extrinsic in the block
 		if ext.Signature.Signature.AsEcdsa.Hex() == e.Signature.Signature.AsEcdsa.Hex() {
+			extIndex = idx
 			resp, err := http.Post("https://goldberg.avail.tools/api", "application/json",
 				strings.NewReader(fmt.Sprintf("{\"id\":1,\"jsonrpc\":\"2.0\",\"method\":\"kate_queryDataProofV2\",\"params\":[%d, \"%#x\"]}", idx+1, blockHash))) //nolint: noctx
 			if err != nil {
@@ -235,15 +237,8 @@ out:
 		}
 	}
 	dataProof := dataProofResp.Result.DataProof
-
-	extBytes, err := json.Marshal(ext)
-	if err != nil {
-		return nil, nil, fmt.Errorf("cannot marshal extrinsic", err)
-	}
-	// Strip string of any leading or following quotes
-	extBytes = []byte(strings.Trim(string(extBytes), "\""))
 	// NOTE: Substrate's BlockNumber type is an alias for u32 type, which is uint32
-	blobID := makeID(uint32(block.Block.Header.Number), string(extBytes))
+	blobID := makeID(uint32(block.Block.Header.Number), extIndex)
 	blobIDs := make([]da.ID, 1)
 	blobIDs[0] = blobID
 
@@ -313,20 +308,21 @@ func (a *DAClient) GetAccountNextIndex() (types.UCompact, error) {
 	var accountNextIndex AccountNextIndexRPCResponse
 	err = json.Unmarshal(data, &accountNextIndex)
 	if err != nil {
-		return types.NewUCompactFromUInt(0), fmt.Errorf("cannot unmarshal account next index", err)
+		return types.NewUCompactFromUInt(0), fmt.Errorf("cannot unmarshal account next index:%w Response: %s", err, data)
 	}
 
 	return types.NewUCompactFromUInt(uint64(accountNextIndex.Result)), nil
 }
 
 // makeID creates a unique ID to reference a blob on Avail
-func makeID(blockHeight uint32, extHash string) da.ID {
+func makeID(blockHeight uint32, extIndex int) da.ID {
 	// Serialise height and leaf index to binary
 	heightLen := 4
 	heightBytes := make([]byte, heightLen)
 	binary.LittleEndian.PutUint32(heightBytes, blockHeight)
-	idBytes := append(heightBytes, []byte(extHash)...)
-	return da.ID(idBytes)
+	extIndexBytes := make([]byte, 4)
+	binary.LittleEndian.PutUint32(extIndexBytes, uint32(extIndex))
+	return da.ID(append(heightBytes, extIndexBytes...))
 }
 
 // SplitID returns the block height and leaf index from a unique ID

cmd/blob-server/main.go

@@ -68,7 +68,7 @@ func main() {
 
 	server := NewBlobServer()
 	// Initialise all DA clients
-	err = server.Daasher.InitClients(ctx, []daash.DALayer{daash.Avail, daash.Celestia, daash.Eigen}, "./avail-config.json", authToken)
+	_, err = server.Daasher.InitClients(ctx, []daash.DALayer{daash.Avail, daash.Celestia, daash.Eigen}, "./avail-config.json", authToken)
 	if err != nil {
 		fmt.Printf("failed to build DA clients: %v", err)
 		return

daash.go

@@ -45,9 +45,9 @@ func NewDABuilder() *DABuilder {
 }
 
 // Initiates a new DAManager with clients from the sepcified DA layers
-func (d *DABuilder) InitClients(ctx context.Context, layers []DALayer, availConfigPath string, celestiaAuthToken string) error {
+func (d *DABuilder) InitClients(ctx context.Context, layers []DALayer, availConfigPath string, celestiaAuthToken string) (*DABuilder, error) {
 	if len(layers) == 0 {
-		return fmt.Errorf("no da layers provided")
+		return nil, fmt.Errorf("no da layers provided")
 	}
 
 	for _, layer := range layers {
@@ -61,29 +61,29 @@ func (d *DABuilder) InitClients(ctx context.Context, layers []DALayer, availConf
 			}, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 5))
 			if err != nil {
 				log.Println("❌ Failed to initialise Avail DA client")
-				return fmt.Errorf(" Failed to create avail client: %v", err)
+				return nil, fmt.Errorf(" Failed to create avail client: %v", err)
 			}
 			log.Println("🟢 Avail DA client initialised")
 			d.Clients[Avail] = avail
 
 		case Celestia:
 			if celestiaAuthToken == "" {
 				fmt.Println("AUTH_TOKEN is not set")
-				return fmt.Errorf("celestia auth token is not set")
+				return nil, fmt.Errorf("celestia auth token is not set")
 			}
 			// We use a random pre-set hex string for namespace rn
 			namespace := "9cb73e106b03d1050a13"
 			celestia, err := celestiada.New(ctx, CelestiaClientUrl, celestiaAuthToken, namespace, -1)
 			if err != nil {
-				return err
+				return nil, err
 			}
 			log.Println("🟢 Celestia DA client initialised")
 			d.Clients[Celestia] = celestia
 
 		case Eigen:
 			eigen, err := eigenda.New("disperser-goerli.eigenda.xyz:443", time.Second*90, time.Second*5)
 			if err != nil {
-				return err
+				return nil, err
 			}
 			d.Clients[Eigen] = eigen
 			log.Println("🟢 Eigen DA client initialised")
@@ -93,8 +93,8 @@ func (d *DABuilder) InitClients(ctx context.Context, layers []DALayer, availConf
 			log.Println("🟢 Mock DA client initialised")
 
 		default:
-			return fmt.Errorf("invalid da layer provided: %s", layer)
+			return nil, fmt.Errorf("invalid da layer provided: %s", layer)
 		}
 	}
-	return nil
+	return d, nil
 }