Skip to content

Commit

Permalink
Merge branch 'main' into refactor_sdkCoin
Browse files Browse the repository at this point in the history
  • Loading branch information
srdtrk authored Aug 21, 2024
2 parents af6666c + 0e26d3d commit 1f3ba25
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 52 deletions.
15 changes: 10 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Mnemonic used in base script (not e2e)
export MNEMONIC="YOUR_MNEMONIC"
# Private key with the permission to use the network prover
SP1_PRIVATE_KEY="PRIVATE_KEY"

# SP1_PROVER={network|local|mock}
SP1_PROVER=network
# SP1_OPERATOR_REV={a commit hash of `https://github.com/cosmos/sp1-ics07-tendermint`}
SP1_OPERATOR_REV=b158cc84a50e6924904b48e0220785c1a5e10a98
SP1_PROVER=mock

# Private key with the permission to use the network prover (optional if you use SP1_PROVER=mock)
SP1_PRIVATE_KEY="PRIVATE_KEY"

# Optional field to specify the revision (in the form of a commit hash) of the SP1 operator
# If not specified the default revision from justfile will be used when building the operator with `just install-operator`
# Format: SP1_OPERATOR_REV={a commit hash of `https://github.com/cosmos/sp1-ics07-tendermint`}
# Example: SP1_OPERATOR_REV=b158cc84a50e6924904b48e0220785c1a5e10a98
1 change: 1 addition & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: e2e
on:
workflow_dispatch:
push:
branches: [main]
pull_request:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ This project is structered as a [foundry](https://getfoundry.sh/) project with t
- [Foundry](https://book.getfoundry.sh/getting-started/installation)
- [Bun](https://bun.sh/)
- [Just](https://just.systems/man/en/)
- [SP1](https://succinctlabs.github.io/sp1/getting-started/install.html) (for end-to-end tests)
- [sp1-ics07-tendermint](https://github.com/cosmos/sp1-ics07-tendermint) (for end-to-end tests)

Foundry typically uses git submodules to manage contract dependencies, but this repository uses Node.js packages (via Bun) because submodules don't scale. You can install the contracts dependencies by running the following command:
Expand Down
13 changes: 0 additions & 13 deletions abi/IBCERC20.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,6 @@
],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "DEFAULT_COSMOS_DECIMALS",
"inputs": [],
"outputs": [
{
"name": "",
"type": "uint8",
"internalType": "uint8"
}
],
"stateMutability": "view"
},
{
"type": "function",
"name": "allowance",
Expand Down
5 changes: 3 additions & 2 deletions e2e/interchaintestv8/ibc_eureka_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ func (s *IbcEurekaTestSuite) SetupSuite(ctx context.Context) {
os.Setenv(testvalues.EnvKeyTendermintRPC, simd.GetHostRPCAddress())
os.Setenv(testvalues.EnvKeySp1Prover, prover)
os.Setenv(testvalues.EnvKeyOperatorPrivateKey, hex.EncodeToString(crypto.FromECDSA(operatorKey)))
// make sure that the SP1_PRIVATE_KEY is set.
s.Require().NotEmpty(os.Getenv(testvalues.EnvKeySp1PrivateKey))
if os.Getenv(testvalues.EnvKeyGenerateFixtures) == testvalues.EnvValueGenerateFixtures_True {
s.generateFixtures = true
}
Expand Down Expand Up @@ -164,6 +162,9 @@ func (s *IbcEurekaTestSuite) SetupSuite(ctx context.Context) {
})
s.Require().NoError(err, fmt.Sprintf("error deploying contracts: \nstderr: %s\nstdout: %s", stderr, stdout))
case testvalues.EnvValueSp1Prover_Network:
// make sure that the SP1_PRIVATE_KEY is set.
s.Require().NotEmpty(os.Getenv(testvalues.EnvKeySp1PrivateKey))

stdout, stderr, err = eth.ForgeScript(ctx, s.deployer.KeyName(), ethereum.ForgeScriptOpts{
ContractRootDir: ".",
SolidityContract: "script/E2ETestDeploy.s.sol",
Expand Down
33 changes: 1 addition & 32 deletions e2e/interchaintestv8/types/ibcerc20/contract.go

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

0 comments on commit 1f3ba25

Please sign in to comment.