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

New instance of sepolia #173

Merged
merged 4 commits into from
Apr 3, 2024
Merged

New instance of sepolia #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c751e2
update
sunnyvempati Apr 2, 2024
1231132
Add missing salts from package deployments
noisekit Apr 2, 2024
07d7573
Give monies to the poor pool owner
noisekit Apr 3, 2024
4fc3772
Version bump
noisekit Apr 3, 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
1 change: 1 addition & 0 deletions e2e/tests/omnibus-base-mainnet-andromeda.toml/Rewards_SNX.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ describe(require('path').basename(__filename, '.e2e.js'), function () {
const poolId = 1;
const poolOwner = await getPoolOwner({ poolId });
log({ poolOwner });
await setEthBalance({ address: poolOwner, balance: 100 });

await provider.send('anvil_impersonateAccount', [poolOwner]);
const signer = provider.getSigner(poolOwner);
Expand Down
1 change: 1 addition & 0 deletions e2e/tests/omnibus-base-mainnet-andromeda.toml/Rewards_USDC.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ describe(require('path').basename(__filename, '.e2e.js'), function () {
const poolId = 1;
const poolOwner = await getPoolOwner({ poolId });
log({ poolOwner });
await setEthBalance({ address: poolOwner, balance: 100 });

await provider.send('anvil_impersonateAccount', [poolOwner]);
const signer = provider.getSigner(poolOwner);
Expand Down
6 changes: 3 additions & 3 deletions omnibus-base-sepolia-andromeda.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "synthetix-omnibus"
version = "8"
version = "11"
description = "Andromeda dev deployment"
preset = "andromeda"
include = [
Expand Down Expand Up @@ -45,13 +45,13 @@ defaultValue = "op-gas-price-oracle:3.3.15"
defaultValue = "synthetix-spot-market:3.3.15"

[setting.perps_market_package]
defaultValue = "synthetix-perps-market:3.3.17"
defaultValue = "synthetix-perps-market:3.3.19"

[setting.buyback_snx_package]
defaultValue = "buyback-snx:3.3.14" # Do not update! This package isn't upgradeable. A version change will deploy a new contract.

[setting.salt]
defaultValue = "andromeda-dev"
defaultValue = "andromeda-dev-2"

[setting.target_preset]
defaultValue = "andromeda" # Preset assigned to provisioned packages
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"devDependencies": {
"@pythnetwork/pyth-evm-js": "^1.33.0",
"@usecannon/builder": "2.11.22",
"@usecannon/cli": "2.11.22",
"@usecannon/builder": "2.11.24",
"@usecannon/cli": "2.11.24",
"debug": "^4.3.4",
"ethers": "^5.7.2",
"hardhat": "^2.21.0",
Expand Down
2 changes: 2 additions & 0 deletions tomls/omnibus-base-sepolia-andromeda/perps/feeCollector.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[provision.snx_mock_collateral]
source = "mintable-token@permissionless-mint"
options.salt = "<%= settings.salt %>"
options.name = "Fake Wrapped SNX"
options.symbol = "fwSNX"
options.owner = "<%= settings.owner %>"
Expand All @@ -19,6 +20,7 @@ defaultValue = "0x39d020f60982ed892abbcd4a06a276a9f9b7bfbce003204c110b6e488f502d
[provision.buyback_snx]
source = "<%= settings.buyback_snx_package %>"
targetPreset = "<%= settings.target_preset %>"
options.salt = "<%= settings.salt %>"
options.premium = "<%= settings.buyback_premium %>"
options.snx_fee_share = "<%= settings.buyback_fee_share %>"
options.oracle_manager_address = "<%= imports.system.imports.oracle_manager.contracts.Proxy.address %>"
Expand Down
1 change: 1 addition & 0 deletions tomls/omnibus-base-sepolia-andromeda/spot/usdc.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ depositingEnabled = false

[provision.usdc_mock_collateral]
source = "mintable-token:1.8"
options.salt = "<%= settings.salt %>"
options.name = "Fake USD Coin"
options.symbol = "fUSDC"
options.owner = "<%= settings.owner %>"
Expand Down
34 changes: 17 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,9 +1189,9 @@ __metadata:
languageName: node
linkType: hard

"@usecannon/builder@npm:2.11.22":
version: 2.11.22
resolution: "@usecannon/builder@npm:2.11.22"
"@usecannon/builder@npm:2.11.24":
version: 2.11.24
resolution: "@usecannon/builder@npm:2.11.24"
dependencies:
"@synthetixio/router": "npm:^3.3.7"
axios: "npm:^1.6.7"
Expand All @@ -1204,19 +1204,19 @@ __metadata:
promise-events: "npm:^0.2.4"
typedoc-plugin-markdown: "npm:^3.17.1"
typestub-ipfs-only-hash: "npm:^4.0.0"
viem: "npm:^2.6.1"
viem: "npm:^2.9.3"
zod: "npm:^3.22.4"
checksum: 10/9443e9e7a781b8f3eae53496819a891655087ee223c1a2f76149c39cbfc62e380c25f0534e3737e69d36ba9d4691a760a075dec678b20aee6598ae3e0e1425ff
checksum: 10/750674b09fc348913c76c936f218a411241826e3d2177a26dbf21ad279786e776e5c8174e062508d9f1f36b8f75c8104ce0cf493610b3de0c62f88cb615a42bb
languageName: node
linkType: hard

"@usecannon/cli@npm:2.11.22":
version: 2.11.22
resolution: "@usecannon/cli@npm:2.11.22"
"@usecannon/cli@npm:2.11.24":
version: 2.11.24
resolution: "@usecannon/cli@npm:2.11.24"
dependencies:
"@iarna/toml": "npm:^3.0.0"
"@synthetixio/wei": "npm:^2.74.1"
"@usecannon/builder": "npm:2.11.22"
"@usecannon/builder": "npm:2.11.24"
abitype: "npm:^1.0.0"
chalk: "npm:^4.1.2"
commander: "npm:^9.5.0"
Expand All @@ -1231,12 +1231,12 @@ __metadata:
table: "npm:^6.8.0"
tildify: "npm:2.0.0"
untildify: "npm:^4.0.0"
viem: "npm:^2.6.1"
viem: "npm:^2.9.3"
znv: "npm:^0.4.0"
zod: "npm:^3.22.4"
bin:
cannon: bin/cannon.js
checksum: 10/a29f11a111cc9559e2d1e5384a8b86eff1f8e374ccb08a7835a25fce245096cfd0e68793ed44d502f85d841e85692c6a4a79bdf73def80caa66addf07ddc9ca8
checksum: 10/c2aec9bd647f86002009f7164f507b31845034d59eb8386a0a8be4a5fbad01b30eea7d4fcf55cbc943fd94e8cdaaea944e243628708f279847d9da7e9f3ebfc6
languageName: node
linkType: hard

Expand Down Expand Up @@ -4717,8 +4717,8 @@ __metadata:
resolution: "synthetix-deployments@workspace:."
dependencies:
"@pythnetwork/pyth-evm-js": "npm:^1.33.0"
"@usecannon/builder": "npm:2.11.22"
"@usecannon/cli": "npm:2.11.22"
"@usecannon/builder": "npm:2.11.24"
"@usecannon/cli": "npm:2.11.24"
debug: "npm:^4.3.4"
ethers: "npm:^5.7.2"
hardhat: "npm:^2.21.0"
Expand Down Expand Up @@ -5048,9 +5048,9 @@ __metadata:
languageName: node
linkType: hard

"viem@npm:^2.6.1":
version: 2.7.13
resolution: "viem@npm:2.7.13"
"viem@npm:^2.9.3":
version: 2.9.6
resolution: "viem@npm:2.9.6"
dependencies:
"@adraffy/ens-normalize": "npm:1.10.0"
"@noble/curves": "npm:1.2.0"
Expand All @@ -5065,7 +5065,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/948073caac0fea1878fa384ddf87bf084a7b4c6011be32f3c9c6e38776ed4a4b10e10603874bb970957993a3aacab5238bf875078ab8ddae3324e0be7b859ad3
checksum: 10/e96f96c757a38dd6f61aa486592738fb8bff30cc30c9836ea9267fe76d0efc9bec828b3743d39e2c5593f4c5b99563787f7cfa9dfd308733ba9160ca67a4b847
languageName: node
linkType: hard

Expand Down