Skip to content
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

Hotfix/sync2 #1424

Merged
merged 19 commits into from
Nov 28, 2022
Merged

Hotfix/sync2 #1424

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5c2d7e5
Bump github.com/urfave/cli/v2 from 2.16.3 to 2.20.2 (#1301)
dependabot[bot] Oct 17, 2022
d86b125
Bump google.golang.org/grpc from 1.49.0 to 1.50.1 (#1300)
dependabot[bot] Oct 17, 2022
8104066
Bump github.com/jackc/pgx/v4 from 4.17.1 to 4.17.2 (#1215)
dependabot[bot] Oct 17, 2022
db001a9
Feature/#1145 genesis refactor (#1211)
ARR552 Oct 18, 2022
9680e50
Check added to checkTrustedState (#1255)
ARR552 Oct 18, 2022
d14799a
fixed not working deletion from the pool (#1307)
Mikelle Oct 20, 2022
4e77718
trying to fix: "sequencer seems not to store the proper new state" (#…
Mikelle Oct 20, 2022
da9b442
Resume WIP proof generation (#1306)
ToniRamirezM Oct 20, 2022
50a147e
Properly check tx hash in CheckSupersetBatchTransactions (#1127)
ToniRamirezM Oct 20, 2022
f17238d
approve without genesis (#1312)
ARR552 Oct 20, 2022
4e1f661
Fix pointer log (#1313)
ToniRamirezM Oct 20, 2022
f8f12c5
test/utils: provide 'ZKPROVER_URI' and 'MERKLETREE_URI' as env variab…
Psykepro Oct 20, 2022
c1959fd
fix typos (#1314)
ToniRamirezM Oct 20, 2022
8c0efb8
fix the claim signature (#1316)
cool-develope Oct 20, 2022
adc0c87
added failed_counter check to make txs invalid, if failed_counter is …
Mikelle Oct 21, 2022
1bc8c7e
add wait after verify batch mining tx (#1319)
ToniRamirezM Oct 21, 2022
4f85784
fixed failed -> invalid (#1322)
Mikelle Oct 21, 2022
fc5d0b6
hotfix
ToniRamirezM Nov 28, 2022
a4d94be
Merge branch 'fix/synchHotfix' into deployed
arnaubennassar Nov 28, 2022
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
Prev Previous commit
Next Next commit
fix the claim signature (#1316) 
* fix the claim signature

* fix config
  • Loading branch information
@cool-develope
cool-develope authored Oct 20, 2022
commit 8c0efb87fbda6257b0da8acddf3983f60021c6b9
4 changes: 2 additions & 2 deletions config/config.debug.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ TxProfitabilityMinReward = "1.1"
Type = "default"
DefaultGasPriceWei = 1000000000

[Prover]
ProverURI = "localhost:50052"
[Provers]
ProverURIs = ["localhost:50052"]

[MTServer]
Host = "0.0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion pool/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const (
txMaxSize = 4 * txSlotSize // 128KB

// bridgeClaimMethodSignature for tracking bridgeClaimMethodSignature method
bridgeClaimMethodSignature = "0x25308c93"
bridgeClaimMethodSignature = "0x5d5d326f"
)

var (
Expand Down