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

BlockHeaderRegistry #123

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

BlockHeaderRegistry #123

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f8f9cbe
BlockHeaderRegistry
Mar 25, 2022
35d6c1b
Update spark to OE 3.3.5 (#125)
Andrew-Pohl Apr 5, 2022
caa3287
Pass bootnodes into the container (#124)
Andrew-Pohl Apr 5, 2022
9d32df8
Update bootnodes (#126)
Andrew-Pohl Apr 11, 2022
5488489
Add abi and config for block registry
Apr 24, 2022
ab884bf
Fix logic for listening to new block headers
Apr 25, 2022
cb6079c
Deploy to mainnet
May 9, 2022
9f4288a
Merge branch 'master' of https://github.com/fuseio/fuse-network
May 9, 2022
edf0723
Fix some issues with initBlockchain
May 9, 2022
d838980
Fix issues outlined in review
May 9, 2022
7a6b716
Catch errors in block subscription
May 9, 2022
47040cb
Bring requested changes
May 9, 2022
3de0b53
Remove header registry contracts
May 9, 2022
7f81d05
Export BlockRegistry functinos to separate file
May 12, 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
6 changes: 3 additions & 3 deletions Dockerfile.spark
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.13.2 AS builder
FROM alpine:edge AS builder
pmlambert marked this conversation as resolved.
Show resolved Hide resolved

ENV HOME=/home/parity
ENV PARITY_HOME_DIR=$HOME/.local/share/io.parity.ethereum
ENV PARITY_CONFIG_FILE_CHAIN=$PARITY_HOME_DIR/spec.json
Expand All @@ -20,7 +20,7 @@ RUN apk add --no-cache \
jq \
bash

COPY --from=openethereum/openethereum:v3.2.6 /home/openethereum/openethereum $PARITY_BIN
COPY --from=openethereum/openethereum:v3.3.5 /home/openethereum/openethereum $PARITY_BIN

### Network RPC WebSocket
EXPOSE 30300 8545 8546
Expand Down
2 changes: 1 addition & 1 deletion Version_testNet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DOCKER_IMAGE_FUSE_APP_VERSION="1.0.0"
DOCKER_IMAGE_FUSE_PARITY_VERSION="2.0.2"
DOCKER_IMAGE_FUSE_PARITY_VERSION="3.0.0"
DOCKER_IMAGE_NET_STATS_VERSION="1.0.0"
3 changes: 2 additions & 1 deletion app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ ENV LOG_LEVEL=debug
ENV RPC=https://rpc.fuse.io
ENV CONSENSUS_ADDRESS=0x3014ca10b91cb3D0AD85fEf7A3Cb95BCAc9c0f79
ENV BLOCK_REWARD_ADDRESS=0x63D4efeD2e3dA070247bea3073BCaB896dFF6C9B
ENV BLOCK_REGISTRY_ADDRESS=

COPY ./ ./
RUN npm install --only=prod

CMD ["node", "index.js"]
CMD ["node", "index.js"]
322 changes: 322 additions & 0 deletions app/abi/blockRegistry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,322 @@
[
{
"inputs": [
{
"internalType": "address",
"name": "_voting",
"type": "address"
},
{
"internalType": "address",
"name": "_consensus",
"type": "address"
}
],
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"internalType": "uint256",
"name": "blockchainId",
"type": "uint256"
},
{
"indexed": false,
"internalType": "string",
"name": "rpc",
"type": "string"
}
],
"name": "Blockchain",
"type": "event"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "blockchainId",
"type": "uint256"
},
{
"internalType": "string",
"name": "rpc",
"type": "string"
}
],
"name": "addBlockchain",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "bytes",
"name": "rlpHeader",
"type": "bytes"
},
{
"components": [
{
"internalType": "bytes32",
"name": "r",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "vs",
"type": "bytes32"
}
],
"internalType": "struct Signature",
"name": "signature",
"type": "tuple"
},
{
"internalType": "uint256",
"name": "blockchainId",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "blockHash",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "cycleEnd",
"type": "uint256"
},
{
"internalType": "address[]",
"name": "validators",
"type": "address[]"
}
],
"internalType": "struct Block[]",
"name": "blocks",
"type": "tuple[]"
}
],
"name": "addSignedBlocks",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "blockHashes",
"outputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "blockchains",
"outputs": [
{
"internalType": "string",
"name": "",
"type": "string"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "blockchainId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "number",
"type": "uint256"
}
],
"name": "getSignedBlock",
"outputs": [
{
"internalType": "bytes32",
"name": "blockHash",
"type": "bytes32"
},
{
"components": [
{
"internalType": "bytes32",
"name": "parentHash",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "uncleHash",
"type": "bytes32"
},
{
"internalType": "address",
"name": "coinbase",
"type": "address"
},
{
"internalType": "bytes32",
"name": "root",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "txHash",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "receiptHash",
"type": "bytes32"
},
{
"internalType": "bytes32[8]",
"name": "bloom",
"type": "bytes32[8]"
},
{
"internalType": "uint256",
"name": "difficulty",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "number",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "gasLimit",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "gasUsed",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "time",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "mixDigest",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "nonce",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "baseFee",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "extra",
"type": "bytes"
}
],
"internalType": "struct BlockHeader",
"name": "blockHeader",
"type": "tuple"
},
{
"components": [
{
"internalType": "address",
"name": "creator",
"type": "address"
},
{
"internalType": "bytes[]",
"name": "signatures",
"type": "bytes[]"
},
{
"internalType": "uint256",
"name": "cycleEnd",
"type": "uint256"
},
{
"internalType": "address[]",
"name": "validators",
"type": "address[]"
}
],
"internalType": "struct SignedBlock",
"name": "signedBlock",
"type": "tuple"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"name": "signedBlocks",
"outputs": [
{
"internalType": "address",
"name": "creator",
"type": "address"
},
{
"internalType": "uint256",
"name": "cycleEnd",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
}
]
Loading