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.

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

Docs cleanup and truffle usage #9

Merged
merged 5 commits into from
Feb 19, 2020
Merged

Docs cleanup and truffle usage #9

merged 5 commits into from
Feb 19, 2020

Conversation

ben-chain
Copy link
Collaborator

@ben-chain ben-chain commented Feb 18, 2020

Description

Addresses YAS31 and YAS167 to fix some documentation formatting and add updated explanation for how to use Truffle.

Metadata

Fixes

Contributing Agreement

Copy link

@willmeister willmeister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like some unresolved conflicts are in there. Other than that looks good!

Comment on lines 17 to 25
<<<<<<< HEAD
- ``ADD, MUL, SUB, DIV, SDIV, MOD, SMOD, ADDMOD, MULMOD, EXP, SIGNEXTEND, LT, GT, SLT, SGT, EQ, ISZERO, AND, OR, XOR, NOT, BYT, SHL, SHR, SAAR, SHA3``.
- \"Pure\" code execution operations:
- ``PUSH1....PUSH32, DUP1...DUP16, SWAP1...SWAP16, POP, LOG0...LOG4, STOP, REVERT, RETURN, PC, GAS, JUMPDEST*``. \* NOTE: `See section <https://github.com/op-optimism/optimistic-rollup/wiki/JUMP-Transpilation>`_ which involves ``JUMPDEST`` s.
=======
- ``ADD, MUL, SUB, DIV, SDIV, MOD, SMOD, ADDMOD, MULMOD, EXP, SIGNEXTEND, LT, GT, SLT, SGT, EQ, ISZERO, AND, OR, XOR, NOT, BYT, SHL, SHR, SAAR, SHA3``.
- "Pure" code execution operations:
- ``PUSH1....PUSH32, DUP1...DUP16, SWAP1...SWAP16, POP, LOG0...LOG4, STOP, REVERT, RETURN, PC, GAS, JUMPDEST*``. \* NOTE: `See section <https://github.com/op-optimism/optimistic-rollup/wiki/JUMP-Transpilation>`_ which involves ``JUMPDEST``s.
>>>>>>> newrepo/master

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an unresolved conflict. Choose one or the other and get rid of the metadata (<<<<<<< HEAD, ========, >>>>>>>).

Comment on lines 97 to 98
<<<<<<< HEAD
=======

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an unresolved conflict. Choose one or the other and get rid of the metadata (<<<<<<< HEAD, ========, >>>>>>>).

@@ -96,13 +105,24 @@ To replace Call-type opcodes, we have to pass an existing slice of ``calldata``
- 2
* - ``DELEGATECALL``
- 2
>>>>>>> newrepo/master

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like an unresolved conflict. Choose one or the other and get rid of the metadata (<<<<<<< HEAD, ========, >>>>>>>).

@ben-chain ben-chain merged commit 7b02e21 into master Feb 19, 2020
@ben-chain ben-chain deleted the feat/new-truffle-docs branch March 4, 2020 20:18
snario pushed a commit that referenced this pull request Apr 14, 2021
protolambda pushed a commit to protolambda/optimism that referenced this pull request May 1, 2022
refcell pushed a commit that referenced this pull request Sep 6, 2023
Add explicit deadline to delegated attestation/revocation requests
max-sanchez added a commit to hemilabs/optimism that referenced this pull request Apr 16, 2024
88047e707 Add tbcd, a small bitcoin daemon that participates on bitcoin p2p (ethereum-optimism#50)
1146a08b5 localnet reorg fix (ethereum-optimism#76)
87f18a191 build(deps): bump github.com/docker/docker (ethereum-optimism#64)
9073baeaf localnet (ethereum-optimism#37)
1588cbf04 Add common user-specific files to gitignore (ethereum-optimism#51)
210aabe7a Update popm.go, fix typo (ethereum-optimism#40)
a5e689493 make: automate copyright headers (ethereum-optimism#31)
1c3bfc9bc Use `maps.Clone(m)` to copy returned map in `APICommands()` (ethereum-optimism#33)
1be4df2a3 Use 'errors.Is' to compare errors (ethereum-optimism#32)
3f6bc5f8e e2e: sync ElectrumX environment variables with infra (ethereum-optimism#36)
c5b0fea01 electrumx: add connection reuse and pooling (ethereum-optimism#26)
cfc1293e9 Update README.md (ethereum-optimism#29)
8896259f0 retry mine keystone on failure (ethereum-optimism#18)
a10e3bb29 Use '%w' verb in fmt.Errorf to wrap errors (fixes ethereum-optimism#13) (ethereum-optimism#27)
6cd677611 deps: update google.golang.org/protobuf to v1.33.0 (ethereum-optimism#28)
ed7eb8e97 ci: fix concurrency cancel-in-progress for pull requests (ethereum-optimism#16)
ac3b7eacb docker: update golang image to v1.22.1 (ethereum-optimism#25)
d6b0ac8af returning response errors if they exist from bfg -> popm (ethereum-optimism#24)
d450b787a Network test start height + no panic (ethereum-optimism#22)
b390805c5 allowing BTC Block and L2 Keystone generation rates to be configurable in local network (ethereum-optimism#19)
bfd3b1dc0 make: add -local flag to goimports (ethereum-optimism#9)
e0e8964fc Move internal error into protocol package (ethereum-optimism#10)
7875a897c l2 keystone mining fixes (#3)

git-subtree-dir: heminetwork
git-subtree-split: 88047e707e2db8522e2ad77c5f849e55bc94cd10
ClaytonNorthey92 pushed a commit to hemilabs/optimism that referenced this pull request Apr 17, 2024
88047e707 Add tbcd, a small bitcoin daemon that participates on bitcoin p2p (ethereum-optimism#50)
1146a08b5 localnet reorg fix (ethereum-optimism#76)
87f18a191 build(deps): bump github.com/docker/docker (ethereum-optimism#64)
9073baeaf localnet (ethereum-optimism#37)
1588cbf04 Add common user-specific files to gitignore (ethereum-optimism#51)
210aabe7a Update popm.go, fix typo (ethereum-optimism#40)
a5e689493 make: automate copyright headers (ethereum-optimism#31)
1c3bfc9bc Use `maps.Clone(m)` to copy returned map in `APICommands()` (ethereum-optimism#33)
1be4df2a3 Use 'errors.Is' to compare errors (ethereum-optimism#32)
3f6bc5f8e e2e: sync ElectrumX environment variables with infra (ethereum-optimism#36)
c5b0fea01 electrumx: add connection reuse and pooling (ethereum-optimism#26)
cfc1293e9 Update README.md (ethereum-optimism#29)
8896259f0 retry mine keystone on failure (ethereum-optimism#18)
a10e3bb29 Use '%w' verb in fmt.Errorf to wrap errors (fixes ethereum-optimism#13) (ethereum-optimism#27)
6cd677611 deps: update google.golang.org/protobuf to v1.33.0 (ethereum-optimism#28)
ed7eb8e97 ci: fix concurrency cancel-in-progress for pull requests (ethereum-optimism#16)
ac3b7eacb docker: update golang image to v1.22.1 (ethereum-optimism#25)
d6b0ac8af returning response errors if they exist from bfg -> popm (ethereum-optimism#24)
d450b787a Network test start height + no panic (ethereum-optimism#22)
b390805c5 allowing BTC Block and L2 Keystone generation rates to be configurable in local network (ethereum-optimism#19)
bfd3b1dc0 make: add -local flag to goimports (ethereum-optimism#9)
e0e8964fc Move internal error into protocol package (ethereum-optimism#10)
7875a897c l2 keystone mining fixes (#3)

git-subtree-dir: heminetwork
git-subtree-split: 88047e707e2db8522e2ad77c5f849e55bc94cd10
therealbytes added a commit to therealbytes/optimism that referenced this pull request May 17, 2024
* feat: add pc with abi

* feat: add big pi store

* refactor: minor rename

* featL add built in pcs for preimage stores

* refactor: generalize pi registry pc

* fix: register pc pc on init

* fix: pi pc source url

* build: registry pcs abis

* fix: account for built-in pcs

* chore: remove commented out loc

* fix: pc registry types

* test: pc registry

* refactor: minor change in built-in pcs

* test: preimage registry

* refactor: store big preimage size in big pi acc
blockchaindevsh pushed a commit to blockchaindevsh/optimism that referenced this pull request Jun 24, 2024
bap2pecs referenced this pull request in babylonlabs-io/optimism Jul 31, 2024
* add docker file

* makefile and minor fix

---------

Co-authored-by: Vitalis Salis <vitsalis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants