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

update master with develop #140

Merged
merged 59 commits into from
Jun 22, 2021
Merged

update master with develop #140

Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
05e7def
Fixing details to run the relay without having to run multiple comman…
Apr 9, 2021
13bcae1
Merge remote-tracking branch 'enveloping/master'
Apr 15, 2021
8a5126a
Change truffle version
Apr 15, 2021
035c8b9
Adding startup scripts
Apr 15, 2021
8f612be
Fixing truffle version since rskj doesn't support chainId field on tr…
Apr 16, 2021
e5d91ea
Keeping yarn.lock like master of enveloping since otherwise rskj does…
Apr 16, 2021
5fa7cef
Keeping yarn.lock like master of enveloping since otherwise rskj does…
Apr 16, 2021
1baacc9
Keeping yarn.lock like master of enveloping since otherwise rskj does…
Apr 16, 2021
4303b64
Merge branch 'master' of github.com:rsksmart/enveloping
Apr 19, 2021
92a1dfd
Fixing deploy script to output correct addresses
Apr 27, 2021
3274705
Merge branch 'feature/RLP-1067/enveloping-inception' of https://githu…
Apr 28, 2021
61fdc76
Fixing gasOverhead on RelayHub and cushion parameter for open channel…
Apr 28, 2021
7db44b0
Merge branch 'feature/RLP-1067/enveloping-inception' of https://githu…
May 4, 2021
5a64690
Create tests scripts
May 6, 2021
6651d23
Add execute tests script
May 6, 2021
2bd8ee1
Fixing some details on documentation changes.
May 6, 2021
f3cfeb6
Changing execute-test context
May 6, 2021
9b793a8
Making changes on custom logic on tests
May 6, 2021
307e861
Merge remote-tracking branch 'origin/master' into feature/RLP-1067/en…
mortelli May 7, 2021
5e4370c
Test if custom logic is called
May 11, 2021
e83f144
Fix custom smart wallet dangling pointer
May 11, 2021
40511ce
Add failure test to custom logic
May 11, 2021
8eb5742
Add duplicate nonce test to custom smart wallet
May 14, 2021
9450089
Improve the code a bit, missing more improvements
May 14, 2021
ab4abcf
Do not create an image for tests
May 14, 2021
c73f554
Merge branch 'feature/RLP-1067/enveloping-inception' of github.com:rs…
May 14, 2021
05bbc45
Fix some review comments
May 17, 2021
b3bef71
Fix linting issues
May 17, 2021
3116e36
Undo unwanted changes
May 17, 2021
6f9a896
Remove duplicated scripts
May 17, 2021
1c000f0
Improve code in custom smart wallet test
May 18, 2021
ccb2819
Fix Typo
May 18, 2021
dac86d7
Readd single test running script
May 20, 2021
a6891ab
Fix styling issues
May 21, 2021
6d9b4cb
Fix styling issues
May 21, 2021
2e831df
Merge branch 'feature/3/fixing-tests' of github.com:rsksmart/envelopi…
May 21, 2021
eec3b16
undo not needed changes
Jun 1, 2021
820ec63
Merge branch 'feature/3/fixing-tests' of github.com:rsksmart/envelopi…
Jun 1, 2021
70c5112
undo not needed changes
Jun 1, 2021
f055469
Change base branch to master
Jun 1, 2021
1b8e30e
Change base branch to master
Jun 1, 2021
fe90782
Ignore solhint for test contracts
Jun 1, 2021
78880e7
Disable solhint when needed
Jun 1, 2021
b42b7d5
Add custom wallet to circleci
Jun 4, 2021
6bda15a
Check if receipt exist multiple times
Jun 16, 2021
518c3ab
Fix linter issues
Jun 17, 2021
97fd813
Merge pull request #125 from rsksmart/feature/3/fixing-tests
mauricioirace Jun 17, 2021
ec93429
make retries and initialBackoff configurable
Jun 18, 2021
081fba6
Add more logs
Jun 18, 2021
ff00877
Fix parameters not being passed in relayclient
Jun 18, 2021
269e67c
linter fix
Jun 18, 2021
ad1f647
Merge pull request #137 from rsksmart/fix/logs-of-null
mauricioirace Jun 18, 2021
854a423
allowed tokens unit tests (#139)
mortelli Jun 18, 2021
8e704be
iterate setup/test files (#138)
mortelli Jun 18, 2021
9760253
Updating Readme with the new contract addresses (#129)
Jun 21, 2021
8522a2f
Merge remote-tracking branch 'origin/master' into develop
mortelli Jun 21, 2021
7279312
Merge remote-tracking branch 'origin/develop' into develop
mortelli Jun 21, 2021
8d8e362
remove duplicate getTransactionReceipt function declaration
mortelli Jun 21, 2021
6f3ceb2
apply js linter
mortelli Jun 21, 2021
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
apply js linter
  • Loading branch information
@mortelli
mortelli committed Jun 21, 2021
commit 6f3ceb2f077b6d49454ef19a0d572039814aa2ff
2 changes: 1 addition & 1 deletion src/relayclient/RelayClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export class RelayClient {
const estimatedGas: number = await this.contractInteractor.estimateRelayTransactionMaxPossibleGasWithTransactionRequest(testInfo)
return estimatedGas
}

async _prepareFactoryGasEstimationRequest (
transactionDetails: EnvelopingTransactionDetails, relayWorker: string
): Promise<DeployTransactionRequest> {
Expand Down