Skip to content
This repository has been archived by the owner on Nov 29, 2024. It is now read-only.

feat: implement misbehaviour program #103

Merged
merged 23 commits into from
Sep 4, 2024
Merged

feat: implement misbehaviour program #103

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
16df45a
initial implementation of the misbehaviour program
gjermundgaraba Jul 28, 2024
0c329f8
Merge branch 'main' into gjermund/56-implement-misbehavior-program
gjermundgaraba Aug 19, 2024
269bb6a
misbehaviour program with operator integration with fixture output
gjermundgaraba Aug 21, 2024
4ac34e9
lint
gjermundgaraba Aug 21, 2024
849d020
output misbehaviour fixture from e2e test
gjermundgaraba Aug 26, 2024
dcb3e73
misbehaviour tests (unit and e2e)
gjermundgaraba Aug 28, 2024
91aee68
some code cleanup
gjermundgaraba Aug 28, 2024
bf39613
code cleanup
gjermundgaraba Aug 28, 2024
5f750fa
added clippy linting
gjermundgaraba Aug 28, 2024
c9cbfb3
Added misbehaviour program to ci build pipeline
gjermundgaraba Aug 28, 2024
4f3864e
fix cargo setups for misbehaviour
gjermundgaraba Aug 28, 2024
46dfe66
lint and add e2e test to ci
gjermundgaraba Aug 28, 2024
588f580
Update programs/misbehaviour/src/lib.rs
gjermundgaraba Aug 30, 2024
df06cd8
Update programs/misbehaviour/src/lib.rs
gjermundgaraba Aug 30, 2024
f36b596
Update programs/misbehaviour/src/lib.rs
gjermundgaraba Aug 30, 2024
f0d9b70
Update programs/misbehaviour/src/lib.rs
gjermundgaraba Aug 30, 2024
aff47cc
pr review fixes
gjermundgaraba Aug 30, 2024
b7b8d0e
Update operator/src/runners/fixtures/misbehaviour.rs
gjermundgaraba Sep 3, 2024
5676c8e
Update e2e/interchaintestv8/sp1_ics07_test.go
gjermundgaraba Sep 3, 2024
8947815
code review fixes
gjermundgaraba Sep 3, 2024
4b8e72b
added test for misbehaviour breaking time monotonicity
gjermundgaraba Sep 3, 2024
e6ae78f
added unit test for TrustingPeriodTooLong
gjermundgaraba Sep 3, 2024
0e641ce
rename validators correctly
gjermundgaraba Sep 4, 2024
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
2 changes: 1 addition & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# URL of the Tendermint RPC node
TENDERMINT_RPC_URL=https://rpc.celestia-mocha.com/
TENDERMINT_RPC_URL=http://public-celestia-mocha4-consensus.numia.xyz/
# URL of the Ethereum RPC node
# use https://ethereum-sepolia.publicnode.com/ for the Eth Sepolia testnet
RPC_URL=https://ethereum-holesky-rpc.publicnode.com
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v3.7.0
uses: golangci/golangci-lint-action@v6.1.0
with:
version: v1.59
version: v1.60
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed to use 1.60 because there is a memory bug in 1.59 that causes a lot of problems on my machine.

The version bumps in this file is just because I thought it was good to have latest version 🤷

args: --timeout 5m
working-directory: e2e/interchaintestv8
e2e:
Expand All @@ -41,13 +41,14 @@ jobs:
- TestWithSP1ICS07TendermintTestSuite/TestDeploy
- TestWithSP1ICS07TendermintTestSuite/TestUpdateClient
- TestWithSP1ICS07TendermintTestSuite/TestUpdateClientAndMembership
- TestWithSP1ICS07TendermintTestSuite/TestMisbehaviour
name: ${{ matrix.test }}
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.22"
check-latest: true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/programs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- programs/update-client
- programs/membership
- programs/uc-and-membership
- programs/misbehaviour
name: 'build: ${{ matrix.programs }}'
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --workspace --exclude sp1-ics07-tendermint-update-client --exclude sp1-ics07-tendermint-membership --exclude sp1-ics07-tendermint-uc-and-membership --all-features --locked
args: --workspace --exclude sp1-ics07-tendermint-update-client --exclude sp1-ics07-tendermint-membership --exclude sp1-ics07-tendermint-uc-and-membership --exclude sp1-ics07-tendermint-misbehaviour --all-features --locked
19 changes: 19 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ sp1-zkvm = "1.1"
sp1-ics07-tendermint-solidity = { path = "./packages/solidity/" }
sp1-ics07-tendermint-update-client = { path = "./programs/update-client/" }
sp1-ics07-tendermint-membership = { path = "./programs/membership/" }
sp1-ics07-tendermint-uc-and-membership = { path = "./programs/uc-and-membership/" }
sp1-ics07-tendermint-misbehaviour = { path = "./programs/misbehaviour/" }

# ibc-proto
ibc-proto = { version = "0.47", default-features = false }
Expand Down
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ After generating the verify the proof with the SP1 EVM verifier.
just test-foundry
```

The recipe also accepts a `testname` argument that will only run the test with the given name. For example:

```shell
just test-foundry test_success_sendTransfer
```

## End to End Testing

There are several end-to-end tests in the `e2e/interchaintestv8` directory. These tests are written in Go and use the [`interchaintest`](https://github.com/strangelove-ventures/interchaintest) library. It spins up a local Ethereum and a Tendermint network and runs the tests found in [`e2e/interchaintestv8/sp1_ics07_test.go`](e2e/interchaintestv8/sp1_ics07_test.go). Some of the tests use the prover network to generate the proofs, so you need to provide your SP1 network private key to `.env` for these tests to pass.
Expand Down
177 changes: 174 additions & 3 deletions contracts/abi/SP1ICS07Tendermint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "misbehaviourProgramVkey",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "verifier",
"type": "address",
Expand Down Expand Up @@ -61,6 +66,19 @@
],
"stateMutability": "view"
},
{
"type": "function",
"name": "MISBEHAVIOUR_PROGRAM_VKEY",
"inputs": [],
"outputs": [
{
"name": "",
"type": "bytes32",
"internalType": "bytes32"
}
],
"stateMutability": "view"
},
{
"type": "function",
"name": "UPDATE_CLIENT_AND_MEMBERSHIP_PROGRAM_VKEY",
Expand Down Expand Up @@ -190,7 +208,7 @@
{
"name": "env",
"type": "tuple",
"internalType": "struct IUpdateClientMsgs.Env",
"internalType": "struct IICS07TendermintMsgs.Env",
"components": [
{
"name": "chainId",
Expand Down Expand Up @@ -406,6 +424,159 @@
]
}
]
},
{
"name": "o7",
"type": "tuple",
"internalType": "struct IMisbehaviourMsgs.MisbehaviourOutput",
"components": [
{
"name": "env",
"type": "tuple",
"internalType": "struct IICS07TendermintMsgs.Env",
"components": [
{
"name": "chainId",
"type": "string",
"internalType": "string"
},
{
"name": "trustThreshold",
"type": "tuple",
"internalType": "struct IICS07TendermintMsgs.TrustThreshold",
"components": [
{
"name": "numerator",
"type": "uint8",
"internalType": "uint8"
},
{
"name": "denominator",
"type": "uint8",
"internalType": "uint8"
}
]
},
{
"name": "trustingPeriod",
"type": "uint32",
"internalType": "uint32"
},
{
"name": "now",
"type": "uint64",
"internalType": "uint64"
}
]
},
{
"name": "trustedHeight1",
"type": "tuple",
"internalType": "struct IICS02ClientMsgs.Height",
"components": [
{
"name": "revisionNumber",
"type": "uint32",
"internalType": "uint32"
},
{
"name": "revisionHeight",
"type": "uint32",
"internalType": "uint32"
}
]
},
{
"name": "trustedHeight2",
"type": "tuple",
"internalType": "struct IICS02ClientMsgs.Height",
"components": [
{
"name": "revisionNumber",
"type": "uint32",
"internalType": "uint32"
},
{
"name": "revisionHeight",
"type": "uint32",
"internalType": "uint32"
}
]
},
{
"name": "trustedConsensusState1",
"type": "tuple",
"internalType": "struct IICS07TendermintMsgs.ConsensusState",
"components": [
{
"name": "timestamp",
"type": "uint64",
"internalType": "uint64"
},
{
"name": "root",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "nextValidatorsHash",
"type": "bytes32",
"internalType": "bytes32"
}
]
},
{
"name": "trustedConsensusState2",
"type": "tuple",
"internalType": "struct IICS07TendermintMsgs.ConsensusState",
"components": [
{
"name": "timestamp",
"type": "uint64",
"internalType": "uint64"
},
{
"name": "root",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "nextValidatorsHash",
"type": "bytes32",
"internalType": "bytes32"
}
]
}
]
},
{
"name": "o8",
"type": "tuple",
"internalType": "struct IMisbehaviourMsgs.MsgSubmitMisbehaviour",
"components": [
{
"name": "sp1Proof",
"type": "tuple",
"internalType": "struct ISP1Msgs.SP1Proof",
"components": [
{
"name": "vKey",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "publicValues",
"type": "bytes",
"internalType": "bytes"
},
{
"name": "proof",
"type": "bytes",
"internalType": "bytes"
}
]
}
]
}
],
"outputs": [],
Expand Down Expand Up @@ -557,13 +728,13 @@
"name": "misbehaviour",
"inputs": [
{
"name": "",
"name": "misbehaviourMsg",
"type": "bytes",
"internalType": "bytes"
}
],
"outputs": [],
"stateMutability": "pure"
"stateMutability": "nonpayable"
},
{
"type": "function",
Expand Down
9 changes: 9 additions & 0 deletions contracts/fixtures/e2e_misbehaviour_fixture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
Copy link

@crodriguezvega crodriguezvega Sep 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe rename file to misbehaviour_fixture.json? (to keep naming consistent with the other files in the folder - alternatively rename the other files to prepend e2e 😄)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it makes sense. It was just to signify a difference as the other ones are currently generated from Celestia mocha testnet. But I think it still makes sense to rename this one to misbehaviour_fixture.json to keep naming consistent 👍

"trustedClientState": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
"trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066cf2589d6f58e945fde7fddc86e50aee4d66e9bdf8363621eb6fc2344567d77ce669999fb1ffbd155bc4f1ae1474837ad85ed946c0af8d7f4dec0590cddc6c4fcc2a0f8",
"updateClientVkey": "0x00aae7c6a541134ce5c556dd8bb23516240292e127321b5de81bc27892355622",
"membershipVkey": "0x00eae02a2c448b3242c5b37cef161b94e908fc12d861c481cff9d10217648697",
"ucAndMembershipVkey": "0x00a477c762e91e1e004d9362b4bd6a69b0f577f24b0e6db30f1b57ea87bd7011",
"misbehaviourVkey": "0x0030026e0e957529c07b87a560fd345b72ea926853c5d871384f86caaac707b9",
"submitMsg": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200030026e0e957529c07b87a560fd345b72ea926853c5d871384f86caaac707b9000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000066cf2589d6f58e945fde7fddc86e50aee4d66e9bdf8363621eb6fc2344567d77ce669999fb1ffbd155bc4f1ae1474837ad85ed946c0af8d7f4dec0590cddc6c4fcc2a0f80000000000000000000000000000000000000000000000000000000066cf2589d6f58e945fde7fddc86e50aee4d66e9bdf8363621eb6fc2344567d77ce669999fb1ffbd155bc4f1ae1474837ad85ed946c0af8d7f4dec0590cddc6c4fcc2a0f800000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275450000000000000000000000000000000000000000000000000000000066cf25dd000000000000000000000000000000000000000000000000000000000000000673696d642d3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364c430ff7f1618d63a7e81bc96ba1ff0c537303708a96487a86cfae76053de08107abfcc0b108959f6bb5e16c70e0bf23dd999b3a3ef57336eed567d4430e41d4e954bde451ffa2e267944b7a238d42b3397203741f60870299c1fbb62a9022821506c942f033ba20256323b52d8aca13aab53b13a1e1c1fe1e5d55841a40fcc3217f50c162a8a43b5d17026545e1c66d40a5fddeb4ef08d2dae84242bd8d28881738b61362886ee779d9c6696ac1efb08f5f8e65cca5b806a2c8747ef1b7c712f65cbd35e088fc691143855d0bf646101cd0629632cb15c5f7b715d217761375d3194c44218ec8baf68ff0bd00485f348ea683e7e97368ba25be64ca17019e7307ef42b2d1d323c1a7a3b4ec84c112b02901ed7718f77ba35e02609deda4bb7b31d6119f414bef6804964fdac85418afcaeb2765bab4859100d84cb5ae2e0a1a7c56a44e211dbf869ad20f3b3ce16f69ea43278b3a0512ba09fea020f176990961e0f50f711e23ea32ea1963897b4f00ace029f37548f5eb3dfce595969d9b1bd154633712012bb578bbecd6519b4f2a15c1b2b9dff937c2976a54b1f1bddddf1c8178c382bc98a5b88d8f5a1ada806e538068a5b553bf1cc0078600ab653da886b9b83292e8ac25980d9b6febbd7c478e5f9a16d1066d14999127c6980d8f24428e948f722b425bd4fb2ecbe564ba6a1245111e1e1c1d6aff6afcf5379f25c5e20334afd153782b4de31ece69a899170c7807ac1c847c679c00337fb07c4861615d1ef320fc5b4075f4c45c9d0a9f1b97222e7c44044419c02cfedbd56ba36fa62e6d237011cb71c1ed583ea5f4569ba98e7f5e28a83bab983bfb55d3a5e8719ede8930516bd5082e2e6ce691bbc6f91eed08f2b4a86bc81becc7dda176dff3dc27c4fe91d804d197fc02fc3338d1e164275741f602c2489b702968060811247c2bb583e0ad1ac9ff5f59d5dfd454ca3542fb74135eaf6d0bb1ec01b52968db9a2aee5d40cc55f63f54ddd950d21052ceb02c8cdccf56524264812ab68dcf9641d2de9ad047586b7b74699783e2baf4dc320a930ebe50d06cad5110a4b75d5fd132d83dd01d00c2699a7c822e38e6e5546d5c3b6d0485d447d19b88d7ffe8753c697f58f1a541099f74bacb1d9670d9d19add724be7c73109a227e030713b0c6c6fe31ca04feabc7bdc03ba56d1d3836d80c2fa56cc81465fbc945a8c32a9e0a27b632ec00000000000000000000000000000000000000000000000000000000"
}
Loading
Loading