Skip to content

Commit 1fe1b5b

Browse files
elpielelpiel
authored
Merge pull request #447 from AmbireTech/update-protocol-eth
Update protocol-eth & make a snapshot for ganache-cli
2 parents 4776684 + b0c13da commit 1fe1b5b

File tree

74 files changed

+76
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+76
-2
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "lib/protocol-eth"]
22
path = lib/protocol-eth
3-
url = https://github.com/AdExNetwork/adex-protocol-eth/
3+
url = https://github.com/AmbireTech/adex-protocol-eth/
44
branch = master

‎lib/protocol-eth

Submodule protocol-eth updated 39 files

‎scripts/ethereum/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ LABEL maintainer="[email protected]"
66
WORKDIR /scripts
77

88
COPY ganache-cli.sh .
9+
COPY snapshot_contracts snapshot
910

1011
EXPOSE 8545
1112

‎scripts/ethereum/ganache-cli.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# Address 4: 0x8c4B95383a46D30F056aCe085D8f453fCF4Ed66d
1111
# Address 5: 0x1059B025E3F8b8f76A8120D6D6Fd9fBa172c80b8
1212
node /app/ganache-core.docker.cli.js --gasLimit 0xfffffffffffff \
13+
--db="./snapshot" \
14+
--deterministic \
15+
--mnemonic="diary west sketch curious expose decade symptom height minor layer carry man" \
1316
--account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200,9000000000000000000000000000" \
1417
--account="0xd66ecc35fe42ae2063888bfd11c4573db08bdbd5c2b9b835deef05beb43b407f,9000000000000000000000000000" \
1518
--account="0x1d00a65debb6143cebc3b48b11db2ddfa81411c1f7c443f706d4f2bd8145ee4a,9000000000000000000000000000" \

‎scripts/ethereum/snapshot_contracts/!blockHashes!0x5a6ffccd8c7c31e0fd02c1326fd98ba39a44a9da9ec3be501b4d3993221124a6

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2

‎scripts/ethereum/snapshot_contracts/!blockHashes!0x8a2233376dc443326245f8cd643286ab8566dc66c553b924818366264d9076f7

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3

‎scripts/ethereum/snapshot_contracts/!blockHashes!0x975d76545f72a59a7c2ab91fcd593afdd383066576dece74838fd445d1356d3b

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1

‎scripts/ethereum/snapshot_contracts/!blockHashes!0xfd125080d3a5ca68d1a8d7db1184894b70f01b9a955a3d5b1b6035fafa07fe19

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0

‎scripts/ethereum/snapshot_contracts/!blockLogs!0

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎scripts/ethereum/snapshot_contracts/!blockLogs!1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎scripts/ethereum/snapshot_contracts/!blockLogs!2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎scripts/ethereum/snapshot_contracts/!blockLogs!3

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎scripts/ethereum/snapshot_contracts/!blockLogs!length

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4

‎scripts/ethereum/snapshot_contracts/!blocks!0

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"header":{"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","uncleHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","coinbase":"0x0000000000000000000000000000000000000000","stateRoot":"0x3b5ef0bb33a6950c7da03b1e272b3a1dbb656d67f1c07390ee335a44be0a02fe","transactionsTrie":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","receiptTrie":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","bloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","difficulty":"0x","number":"0x","gasLimit":"0x0fffffffffffff","gasUsed":"0x","timestamp":"0x6168337d","extraData":"0x","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000"},"transactions":[],"uncleHeaders":[]}

‎scripts/ethereum/snapshot_contracts/!blocks!1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"header":{"parentHash":"0xfd125080d3a5ca68d1a8d7db1184894b70f01b9a955a3d5b1b6035fafa07fe19","uncleHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","coinbase":"0x0000000000000000000000000000000000000000","stateRoot":"0xafdfb0b9b4b28607606c22a11b23dd9164696b5a29d09d2237b4a434713db92d","transactionsTrie":"0x72872dd3f1601bbf2e421695b1ccf34c790d8dbeac345cb688bd725fecc2a7b4","receiptTrie":"0x41d3cb5fd6e113debbe92b0ba67ff8c62ae8ad5b7bed3b87cf7f61a4fbe49694","bloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","difficulty":"0x","number":"0x01","gasLimit":"0x0fffffffffffff","gasUsed":"0x09b2b3","timestamp":"0x61683387","extraData":"0x","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000"},"transactions":[{"hash":"0x5ae6a41a9e2e02dade9efeb1760050af9db80b91d0387fc816e06e1004435dee","nonce":"0x0","from":"0x5a04a8fb90242fb7e1db7d1f51e268a03b7f93a5","to":null,"value":"0x0","gas":"0x6691b7","gasPrice":"0x1","data":"608060405234801561001057600080fd5b50610a8f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c8063095ea7b31461006757806323b872dd1461009757806370a08231146100c7578063a2b0a1c7146100f7578063a9059cbb14610113578063dd62ed3e14610143575b600080fd5b610081600480360381019061007c919061081d565b610173565b60405161008e919061089a565b60405180910390f35b6100b160048036038101906100ac91906107ce565b6101c3565b6040516100be919061089a565b60405180910390f35b6100e160048036038101906100dc9190610769565b61045c565b6040516100ee91906108d5565b60405180910390f35b610111600480360381019061010c919061081d565b6104a4565b005b61012d6004803603810190610128919061081d565b6104eb565b60405161013a919061089a565b60405180910390f35b61015d60048036038101906101589190610792565b6106f5565b60405161016a91906108d5565b60405180910390f35b600081600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506001905092915050565b6000816000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610246576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161023d906108b5565b60405180910390fd5b816000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546102909190610957565b6000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461031c9190610901565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506000600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205411156103ec576000600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8460405161044991906108d5565b60405180910390a3600190509392505050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505050565b6000816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561056e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610565906108b5565b60405180910390fd5b816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546105b89190610957565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546106449190610901565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040516106e391906108d5565b60405180910390a36001905092915050565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60008135905061074e81610a2b565b92915050565b60008135905061076381610a42565b92915050565b60006020828403121561077b57600080fd5b60006107898482850161073f565b91505092915050565b600080604083850312156107a557600080fd5b60006107b38582860161073f565b92505060206107c48582860161073f565b9150509250929050565b6000806000606084860312156107e357600080fd5b60006107f18682870161073f565b93505060206108028682870161073f565b925050604061081386828701610754565b9150509250925092565b6000806040838503121561083057600080fd5b600061083e8582860161073f565b925050602061084f85828601610754565b9150509250929050565b6108628161099d565b82525050565b60006108756012836108f0565b915061088082610a02565b602082019050919050565b610894816109c9565b82525050565b60006020820190506108af6000830184610859565b92915050565b600060208201905081810360008301526108ce81610868565b9050919050565b60006020820190506108ea600083018461088b565b92915050565b600082825260208201905092915050565b600061090c826109c9565b9150610917836109c9565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561094c5761094b6109d3565b5b828201905092915050565b6000610962826109c9565b915061096d836109c9565b9250828210156109805761097f6109d3565b5b828203905092915050565b6000610996826109a9565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f494e53554646494349454e545f46554e44530000000000000000000000000000600082015250565b610a348161098b565b8114610a3f57600080fd5b50565b610a4b816109c9565b8114610a5657600080fd5b5056fea264697066735822122012d9e565a541ef14f604411fe60ee4679227706bb736ccd2d5aeb4962f73033e64736f6c63430008010033","v":"0x26","r":"0xb1b8a8d5e59d3cfbf21090dc2796ecc5a64498e6f16f41c6431cd3db272f1456","s":"0x3456e3eff3343fb99834fefc9c4d918e8b429cfd4a512cfc9e04edb4b92ff372","_type":1,"_options":{"hardfork":"muirGlacier","chainId":1,"networkId":1634218876956}}],"uncleHeaders":[]}

‎scripts/ethereum/snapshot_contracts/!blocks!2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"header":{"parentHash":"0x975d76545f72a59a7c2ab91fcd593afdd383066576dece74838fd445d1356d3b","uncleHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","coinbase":"0x0000000000000000000000000000000000000000","stateRoot":"0x6c87d8647ca3a248185a1c8474cf3f088c6d4ae06ffa9994aca569f959f79263","transactionsTrie":"0x6064b6aeb2f2d908b682aba6219a6efbef05c989af8dd6afdf1fe24ae875f450","receiptTrie":"0xcc59375bb9d531bce9864a33598e9fca6f2f4f1ee324b703dc1b34d20d823cb2","bloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","difficulty":"0x","number":"0x02","gasLimit":"0x0fffffffffffff","gasUsed":"0x06ba37","timestamp":"0x61683387","extraData":"0x","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000"},"transactions":[{"hash":"0x3562f70968d93d3486ae02db02628d54ef3dcef67cafcce82f95674d903874cc","nonce":"0x1","from":"0x5a04a8fb90242fb7e1db7d1f51e268a03b7f93a5","to":null,"value":"0x0","gas":"0x6691b7","gasPrice":"0x1","data":"608060405234801561001057600080fd5b50610704806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063a41283ff14610030575b600080fd5b61004361003e36600461016a565b610045565b005b60005b81518110156100cc576000801b848484848151811061007757634e487b7160e01b600052603260045260246000fd5b602002602001015160405161008b906100d2565b6100979392919061022c565b8190604051809103906000f59050801580156100b7573d6000803e3d6000fd5b505080806100c4906102b8565b915050610048565b50505050565b6103c18061030e83390190565b600082601f8301126100ef578081fd5b8135602067ffffffffffffffff82111561010b5761010b6102df565b808202610119828201610287565b838152828101908684018388018501891015610133578687fd5b8693505b8584101561015e57803561014a816102f5565b835260019390930192918401918401610137565b50979650505050505050565b600080600083850360e081121561017f578384fd5b843561018a816102f5565b935060a0601f198201121561019d578283fd5b506101a860a0610287565b60208501356101b6816102f5565b815260408501356101c6816102f5565b602082015260608501356101d9816102f5565b604082015260808501356101ec816102f5565b606082015260a08501356080820152915060c084013567ffffffffffffffff811115610216578182fd5b610222868287016100df565b9150509250925092565b6001600160a01b039384168152825184166020808301919091528301518416604080830191909152830151841660608083019190915283015184166080808301919091529092015160a083015290911660c082015260e00190565b604051601f8201601f1916810167ffffffffffffffff811182821017156102b0576102b06102df565b604052919050565b60006000198214156102d857634e487b7160e01b81526011600452602481fd5b5060010190565b634e487b7160e01b600052604160045260246000fd5b6001600160a01b038116811461030a57600080fd5b5056fe608060405234801561001057600080fd5b506040516103c13803806103c183398101604081905261002f9161020e565b60608201516040516370a0823160e01b81526000916001600160a01b0316906370a08231906100629030906004016102ed565b60206040518083038186803b15801561007a57600080fd5b505afa15801561008e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100b291906102d5565b90506100cd8360600151858361013260201b6100091760201c565b60405163db6198a360e01b81526001600160a01b0385169063db6198a3906100fd90869086908690600401610351565b600060405180830381600087803b15801561011757600080fd5b505af115801561012b573d6000803e3d6000fd5b5050505081ff5b60405163095ea7b360e01b81526001600160a01b0384169063095ea7b3906101609085908590600401610301565b600060405180830381600087803b15801561017a57600080fd5b505af115801561018e573d6000803e3d6000fd5b505050506101a06101ca60201b60201c565b6101c55760405162461bcd60e51b81526004016101bc9061031a565b60405180910390fd5b505050565b6000803d80156101e157602081146101ea576101f6565b600191506101f6565b60206000803e60005191505b501515905090565b8051610209816103a8565b919050565b600080600083850360e0811215610223578384fd5b845161022e816103a8565b935060a0601f1982011215610241578283fd5b5060405160a081016001600160401b038111828210171561027057634e487b7160e01b84526041600452602484fd5b60405261027f602086016101fe565b815261028d604086016101fe565b602082015261029e606086016101fe565b60408201526102af608086016101fe565b606082015260a0850151608082015291506102cc60c085016101fe565b90509250925092565b6000602082840312156102e6578081fd5b5051919050565b6001600160a01b0391909116815260200190565b6001600160a01b03929092168252602082015260400190565b60208082526019908201527f5361666545524332303a20617070726f7665206661696c656400000000000000604082015260600190565b83516001600160a01b039081168252602080860151821690830152604080860151821690830152606080860151821690830152608094850151948201949094529190921660a082015260c081019190915260e00190565b6001600160a01b03811681146103bd57600080fd5b5056fea264697066735822122067959ee3a7560f3cf459a35bee2ec1208611ed45f243b2aadcc5859421f23dc464736f6c63430008010033","v":"0x26","r":"0x58f655a3ffc625e74df6ab30435ec6cc585e70a351e45238035e54f2ad01dadb","s":"0x201549f9aa7481899b021b9ddf20af8c12d4be11f1fcfd73277daf5b5a485918","_type":1,"_options":{"hardfork":"muirGlacier","chainId":1,"networkId":1634218876956}}],"uncleHeaders":[]}

0 commit comments

Comments
 (0)