Skip to content

feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
entropidelic merged 4 commits into from
Sep 16, 2024
Merged

feat: add retry to get batch of s3 #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b12340
feat: add retry to get batch of s3
NicolasRampoldi Sep 11, 2024
95fef34
chore: log sleep time before retry
taturosati Sep 11, 2024
24d3e12
chore: change getBatchFromS3 to getBatchFromDataService
entropidelic Sep 13, 2024
6f17ef8
fix: burst size var on make send burst
uri-99 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
--proving_system SP1 \
--proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
--vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
--repetitions 15 \
--repetitions $(BURST_SIZE) \
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
--rpc_url $(RPC_URL) \
--payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
--vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
--repetitions 15 \
--repetitions $(BURST_SIZE) \
--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
--rpc_url $(RPC_URL) \
--payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down
8 changes: 5 additions & 3 deletions operator/pkg/operator.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
BatchDownloadTimeout = 1 * time.Minute
BatchDownloadTimeout = 1 * time.Minute
BatchDownloadMaxRetries = 3
BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
)

o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
defer cancel()

verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
if err != nil {
o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
return err
Expand Down
51 changes: 42 additions & 9 deletions operator/pkg/s3.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
"fmt"
"io"
"net/http"
"time"

"github.com/ugorji/go/codec"

"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

var resp *http.Response
var err error
var req *http.Request

for attempt := 0; attempt < maxRetries; attempt++ {
if attempt > 0 {
o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
select {
case <-time.After(retryDelay):
// Wait before retrying
case <-ctx.Done():
return nil, ctx.Err()
}
retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
}

req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
if err != nil {
return nil, err
}

if err != nil {
return nil, err
resp, err = http.DefaultClient.Do(req)
if err == nil && resp.StatusCode == http.StatusOK {
break // Successful request, exit retry loop
}

if resp != nil {
err := resp.Body.Close()
if err != nil {
return nil, err
}
}

o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
}

resp, err := http.DefaultClient.Do(req)
if err != nil {
return nil, err
}

// At this point, the HTTP request was successfull.

defer func(Body io.ReadCloser) {
err := Body.Close()
if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

// Check if the response is OK
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
}

contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

// Checks if downloaded merkle root is the same as the expected one
o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
if !merkleRootCheck {
return nil, fmt.Errorf("merkle root check failed")
}
o.Logger.Infof("Batch merkle tree verified")
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: add retry to get batch of s3 by NicolasRampoldi · Pull Request #958 · yetanotherco/aligned_layer · GitHub
Skip to content
feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

entropidelic
merged 4 commits into

from

Sep 16, 2024
 Merged


feat: add retry to get batch of s3
#958
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
3b12340

feat: add retry to get batch of s3


NicolasRampoldi Sep 11, 2024
95fef34

chore: log sleep time before retry


taturosati Sep 11, 2024
24d3e12

chore: change getBatchFromS3 to getBatchFromDataService


entropidelic Sep 13, 2024
6f17ef8

fix: burst size var on make send burst


uri-99 Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
 --proving_system SP1 \
 --proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
 --proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
 --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
 --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down

8 changes: 5 additions & 3 deletions
operator/pkg/operator.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadMaxRetries = 3
	BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
 hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
 hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
	)

	o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
	defer cancel()

	verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
	if err != nil {
 o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 return err
Expand Down

51 changes: 42 additions & 9 deletions
operator/pkg/s3.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
	"fmt"
	"io"
	"net/http"
	"time"

	"github.com/ugorji/go/codec"

	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

	var resp *http.Response
	var err error
	var req *http.Request

	for attempt := 0; attempt < maxRetries; attempt++ {
 if attempt > 0 {
 o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
 select {
 case <-time.After(retryDelay):
 // Wait before retrying
 case <-ctx.Done():
 return nil, ctx.Err()
 }
 retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
 }

	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 if err != nil {
 return nil, err
 }

	if err != nil {
 return nil, err
 resp, err = http.DefaultClient.Do(req)
 if err == nil && resp.StatusCode == http.StatusOK {
 break // Successful request, exit retry loop
 }

 if resp != nil {
 err := resp.Body.Close()
 if err != nil {
 return nil, err
 }
 }

 o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
	}

	resp, err := http.DefaultClient.Do(req)
	if err != nil {
 return nil, err
	}

	// At this point, the HTTP request was successfull.

	defer func(Body io.ReadCloser) {
 err := Body.Close()
 if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Check if the response is OK
	if resp.StatusCode != http.StatusOK {
 return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
 return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
	}

	contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Checks if downloaded merkle root is the same as the expected one
	o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkleRootCheck {
 return nil, fmt.Errorf("merkle root check failed")
	}
	o.Logger.Infof("Batch merkle tree verified")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add retry to get batch of s3 by NicolasRampoldi · Pull Request #958 · yetanotherco/aligned_layer · GitHub
Skip to content
feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

entropidelic
merged 4 commits into

from

Sep 16, 2024
 Merged


feat: add retry to get batch of s3
#958
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
3b12340

feat: add retry to get batch of s3


NicolasRampoldi Sep 11, 2024
95fef34

chore: log sleep time before retry


taturosati Sep 11, 2024
24d3e12

chore: change getBatchFromS3 to getBatchFromDataService


entropidelic Sep 13, 2024
6f17ef8

fix: burst size var on make send burst


uri-99 Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
 --proving_system SP1 \
 --proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
 --proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
 --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
 --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down

8 changes: 5 additions & 3 deletions
operator/pkg/operator.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadMaxRetries = 3
	BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
 hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
 hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
	)

	o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
	defer cancel()

	verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
	if err != nil {
 o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 return err
Expand Down

51 changes: 42 additions & 9 deletions
operator/pkg/s3.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
	"fmt"
	"io"
	"net/http"
	"time"

	"github.com/ugorji/go/codec"

	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

	var resp *http.Response
	var err error
	var req *http.Request

	for attempt := 0; attempt < maxRetries; attempt++ {
 if attempt > 0 {
 o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
 select {
 case <-time.After(retryDelay):
 // Wait before retrying
 case <-ctx.Done():
 return nil, ctx.Err()
 }
 retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
 }

	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 if err != nil {
 return nil, err
 }

	if err != nil {
 return nil, err
 resp, err = http.DefaultClient.Do(req)
 if err == nil && resp.StatusCode == http.StatusOK {
 break // Successful request, exit retry loop
 }

 if resp != nil {
 err := resp.Body.Close()
 if err != nil {
 return nil, err
 }
 }

 o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
	}

	resp, err := http.DefaultClient.Do(req)
	if err != nil {
 return nil, err
	}

	// At this point, the HTTP request was successfull.

	defer func(Body io.ReadCloser) {
 err := Body.Close()
 if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Check if the response is OK
	if resp.StatusCode != http.StatusOK {
 return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
 return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
	}

	contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Checks if downloaded merkle root is the same as the expected one
	o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkleRootCheck {
 return nil, fmt.Errorf("merkle root check failed")
	}
	o.Logger.Infof("Batch merkle tree verified")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add retry to get batch of s3 by NicolasRampoldi · Pull Request #958 · yetanotherco/aligned_layer · GitHub
Skip to content
feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

entropidelic
merged 4 commits into

from

Sep 16, 2024
 Merged


feat: add retry to get batch of s3
#958
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
3b12340

feat: add retry to get batch of s3


NicolasRampoldi Sep 11, 2024
95fef34

chore: log sleep time before retry


taturosati Sep 11, 2024
24d3e12

chore: change getBatchFromS3 to getBatchFromDataService


entropidelic Sep 13, 2024
6f17ef8

fix: burst size var on make send burst


uri-99 Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
 --proving_system SP1 \
 --proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
 --proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
 --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
 --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down

8 changes: 5 additions & 3 deletions
operator/pkg/operator.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadMaxRetries = 3
	BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
 hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
 hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
	)

	o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
	defer cancel()

	verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
	if err != nil {
 o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 return err
Expand Down

51 changes: 42 additions & 9 deletions
operator/pkg/s3.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
	"fmt"
	"io"
	"net/http"
	"time"

	"github.com/ugorji/go/codec"

	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

	var resp *http.Response
	var err error
	var req *http.Request

	for attempt := 0; attempt < maxRetries; attempt++ {
 if attempt > 0 {
 o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
 select {
 case <-time.After(retryDelay):
 // Wait before retrying
 case <-ctx.Done():
 return nil, ctx.Err()
 }
 retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
 }

	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 if err != nil {
 return nil, err
 }

	if err != nil {
 return nil, err
 resp, err = http.DefaultClient.Do(req)
 if err == nil && resp.StatusCode == http.StatusOK {
 break // Successful request, exit retry loop
 }

 if resp != nil {
 err := resp.Body.Close()
 if err != nil {
 return nil, err
 }
 }

 o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
	}

	resp, err := http.DefaultClient.Do(req)
	if err != nil {
 return nil, err
	}

	// At this point, the HTTP request was successfull.

	defer func(Body io.ReadCloser) {
 err := Body.Close()
 if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Check if the response is OK
	if resp.StatusCode != http.StatusOK {
 return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
 return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
	}

	contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Checks if downloaded merkle root is the same as the expected one
	o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkleRootCheck {
 return nil, fmt.Errorf("merkle root check failed")
	}
	o.Logger.Infof("Batch merkle tree verified")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
feat: add retry to get batch of s3 by NicolasRampoldi · Pull Request #958 · yetanotherco/aligned_layer · GitHub
Skip to content
feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

entropidelic
merged 4 commits into

from

Sep 16, 2024
 Merged


feat: add retry to get batch of s3
#958
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
3b12340

feat: add retry to get batch of s3


NicolasRampoldi Sep 11, 2024
95fef34

chore: log sleep time before retry


taturosati Sep 11, 2024
24d3e12

chore: change getBatchFromS3 to getBatchFromDataService


entropidelic Sep 13, 2024
6f17ef8

fix: burst size var on make send burst


uri-99 Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
 --proving_system SP1 \
 --proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
 --proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
 --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
 --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down

8 changes: 5 additions & 3 deletions
operator/pkg/operator.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadMaxRetries = 3
	BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
 hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
 hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
	)

	o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
	defer cancel()

	verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
	if err != nil {
 o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 return err
Expand Down

51 changes: 42 additions & 9 deletions
operator/pkg/s3.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
	"fmt"
	"io"
	"net/http"
	"time"

	"github.com/ugorji/go/codec"

	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

	var resp *http.Response
	var err error
	var req *http.Request

	for attempt := 0; attempt < maxRetries; attempt++ {
 if attempt > 0 {
 o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
 select {
 case <-time.After(retryDelay):
 // Wait before retrying
 case <-ctx.Done():
 return nil, ctx.Err()
 }
 retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
 }

	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 if err != nil {
 return nil, err
 }

	if err != nil {
 return nil, err
 resp, err = http.DefaultClient.Do(req)
 if err == nil && resp.StatusCode == http.StatusOK {
 break // Successful request, exit retry loop
 }

 if resp != nil {
 err := resp.Body.Close()
 if err != nil {
 return nil, err
 }
 }

 o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
	}

	resp, err := http.DefaultClient.Do(req)
	if err != nil {
 return nil, err
	}

	// At this point, the HTTP request was successfull.

	defer func(Body io.ReadCloser) {
 err := Body.Close()
 if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Check if the response is OK
	if resp.StatusCode != http.StatusOK {
 return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
 return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
	}

	contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Checks if downloaded merkle root is the same as the expected one
	o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkleRootCheck {
 return nil, fmt.Errorf("merkle root check failed")
	}
	o.Logger.Infof("Batch merkle tree verified")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat: add retry to get batch of s3 by NicolasRampoldi · Pull Request #958 · yetanotherco/aligned_layer · GitHub
Skip to content
feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

entropidelic
merged 4 commits into

from

Sep 16, 2024
 Merged


feat: add retry to get batch of s3
#958
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
3b12340

feat: add retry to get batch of s3


NicolasRampoldi Sep 11, 2024
95fef34

chore: log sleep time before retry


taturosati Sep 11, 2024
24d3e12

chore: change getBatchFromS3 to getBatchFromDataService


entropidelic Sep 13, 2024
6f17ef8

fix: burst size var on make send burst


uri-99 Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
 --proving_system SP1 \
 --proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
 --proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
 --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
 --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down

8 changes: 5 additions & 3 deletions
operator/pkg/operator.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadMaxRetries = 3
	BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
 hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
 hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
	)

	o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
	defer cancel()

	verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
	if err != nil {
 o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 return err
Expand Down

51 changes: 42 additions & 9 deletions
operator/pkg/s3.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
	"fmt"
	"io"
	"net/http"
	"time"

	"github.com/ugorji/go/codec"

	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

	var resp *http.Response
	var err error
	var req *http.Request

	for attempt := 0; attempt < maxRetries; attempt++ {
 if attempt > 0 {
 o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
 select {
 case <-time.After(retryDelay):
 // Wait before retrying
 case <-ctx.Done():
 return nil, ctx.Err()
 }
 retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
 }

	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 if err != nil {
 return nil, err
 }

	if err != nil {
 return nil, err
 resp, err = http.DefaultClient.Do(req)
 if err == nil && resp.StatusCode == http.StatusOK {
 break // Successful request, exit retry loop
 }

 if resp != nil {
 err := resp.Body.Close()
 if err != nil {
 return nil, err
 }
 }

 o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
	}

	resp, err := http.DefaultClient.Do(req)
	if err != nil {
 return nil, err
	}

	// At this point, the HTTP request was successfull.

	defer func(Body io.ReadCloser) {
 err := Body.Close()
 if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Check if the response is OK
	if resp.StatusCode != http.StatusOK {
 return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
 return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
	}

	contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Checks if downloaded merkle root is the same as the expected one
	o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkleRootCheck {
 return nil, fmt.Errorf("merkle root check failed")
	}
	o.Logger.Infof("Batch merkle tree verified")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
feat: add retry to get batch of s3 by NicolasRampoldi · Pull Request #958 · yetanotherco/aligned_layer · GitHub
Skip to content
feat: add retry to get batch of s3#958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

entropidelic
merged 4 commits into

from

Sep 16, 2024
 Merged


feat: add retry to get batch of s3
#958
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
3b12340

feat: add retry to get batch of s3


NicolasRampoldi Sep 11, 2024
95fef34

chore: log sleep time before retry


taturosati Sep 11, 2024
24d3e12

chore: change getBatchFromS3 to getBatchFromDataService


entropidelic Sep 13, 2024
6f17ef8

fix: burst size var on make send burst


uri-99 Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,7 @@ batcher_send_sp1_burst:
 --proving_system SP1 \
 --proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 --vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand All@@ -271,7 +271,7 @@ batcher_send_risc0_burst:
 --proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
 --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
 --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
 --repetitions 15 \
 --repetitions $(BURST_SIZE) \
 --proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
 --rpc_url $(RPC_URL) \
 --payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
Expand Down

8 changes: 5 additions & 3 deletions
operator/pkg/operator.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,9 @@ type Operator struct {
}

const (
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadTimeout = 1 * time.Minute
	BatchDownloadMaxRetries = 3
	BatchDownloadRetryDelay = 5 * time.Second
)

func NewOperatorFromConfig(configuration config.OperatorConfig) (*Operator, error) {
Expand DownExpand Up@@ -183,7 +185,7 @@ func (o *Operator) handleNewBatchLog(newBatchLog *servicemanager.ContractAligned
 hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
 hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
	)

	o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
}

Expand All@@ -199,7 +201,7 @@ func (o *Operator) ProcessNewBatchLog(newBatchLog *servicemanager.ContractAligne
	ctx, cancel := context.WithTimeout(context.Background(), BatchDownloadTimeout)
	defer cancel()

	verificationDataBatch, err := o.getBatchFromS3(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot)
	verificationDataBatch, err := o.getBatchFromDataService(ctx, newBatchLog.BatchDataPointer, newBatchLog.BatchMerkleRoot, BatchDownloadMaxRetries, BatchDownloadRetryDelay)
	if err != nil {
 o.Logger.Errorf("Could not get proofs from S3 bucket: %v", err)
 return err
Expand Down

51 changes: 42 additions & 9 deletions
operator/pkg/s3.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,25 +5,58 @@ import (
	"fmt"
	"io"
	"net/http"
	"time"

	"github.com/ugorji/go/codec"

	"github.com/yetanotherco/aligned_layer/operator/merkle_tree"
)

func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from S3..., batchURL: %s", batchURL)
func (o *Operator) getBatchFromDataService(ctx context.Context, batchURL string, expectedMerkleRoot [32]byte, maxRetries int, retryDelay time.Duration) ([]VerificationData, error) {
	o.Logger.Infof("Getting batch from data service, batchURL: %s", batchURL)

	var resp *http.Response
	var err error
	var req *http.Request

	for attempt := 0; attempt < maxRetries; attempt++ {
 if attempt > 0 {
 o.Logger.Infof("Waiting for %s before retrying data fetch (attempt %d of %d)", retryDelay, attempt+1, maxRetries)
 select {
 case <-time.After(retryDelay):
 // Wait before retrying
 case <-ctx.Done():
 return nil, ctx.Err()
 }
 retryDelay *= 2 // Exponential backoff. Ex: 5s, 10s, 20s
 }

	req, err := http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 req, err = http.NewRequestWithContext(ctx, "GET", batchURL, nil)
 if err != nil {
 return nil, err
 }

	if err != nil {
 return nil, err
 resp, err = http.DefaultClient.Do(req)
 if err == nil && resp.StatusCode == http.StatusOK {
 break // Successful request, exit retry loop
 }

 if resp != nil {
 err := resp.Body.Close()
 if err != nil {
 return nil, err
 }
 }

 o.Logger.Warnf("Error fetching batch from data service - (attempt %d): %v", attempt+1, err)
	}

	resp, err := http.DefaultClient.Do(req)
	if err != nil {
 return nil, err
	}

	// At this point, the HTTP request was successfull.

	defer func(Body io.ReadCloser) {
 err := Body.Close()
 if err != nil {
Expand All@@ -33,7 +66,7 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Check if the response is OK
	if resp.StatusCode != http.StatusOK {
 return nil, fmt.Errorf("error getting Proof Head from S3: %s", resp.Status)
 return nil, fmt.Errorf("error getting batch from data service: %s", resp.Status)
	}

	contentLength := resp.ContentLength
Expand All@@ -58,8 +91,8 @@ func (o *Operator) getBatchFromS3(ctx context.Context, batchURL string, expected

	// Checks if downloaded merkle root is the same as the expected one
	o.Logger.Infof("Verifying batch merkle tree...")
merkle_root_check := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkle_root_check {
merkleRootCheck := merkle_tree.VerifyMerkleTreeBatch(batchBytes, uint(len(batchBytes)), expectedMerkleRoot)
	if !merkleRootCheck {
 return nil, fmt.Errorf("merkle root check failed")
	}
	o.Logger.Infof("Batch merkle tree verified")
Expand Down