fixed mint decimals issue; still have logo issue

This commit is contained in:
dd 2021-01-24 23:19:22 -05:00
parent 633f0b60d2
commit 7fe8477a45
18 changed files with 351 additions and 185 deletions

View File

@ -42,7 +42,7 @@ Significant contributions to the source code may be compensated with a grant fro
### setup testing
```
# Get solana tools
VERSION=v1.4.22
VERSION=v1.5.4
sh -c "$(curl -sSfL https://release.solana.com/$VERSION/install)"
git clone https://github.com/solana-labs/solana.git
cd solana

221
cli/Cargo.lock generated
View File

@ -291,6 +291,12 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "bytes"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16"
[[package]]
name = "bzip2"
version = "0.3.3"
@ -406,7 +412,7 @@ dependencies = [
[[package]]
name = "cli"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"anyhow",
"chrono",
@ -423,7 +429,7 @@ dependencies = [
[[package]]
name = "client"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"anyhow",
"bincode",
@ -1719,12 +1725,25 @@ dependencies = [
"kernel32-sys",
"libc",
"log",
"miow",
"miow 0.2.2",
"net2",
"slab",
"winapi 0.2.8",
]
[[package]]
name = "mio"
version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7"
dependencies = [
"libc",
"log",
"miow 0.3.6",
"ntapi",
"winapi 0.3.9",
]
[[package]]
name = "mio-uds"
version = "0.6.8"
@ -1733,7 +1752,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
dependencies = [
"iovec",
"libc",
"mio",
"mio 0.6.23",
]
[[package]]
@ -1748,6 +1767,16 @@ dependencies = [
"ws2_32-sys",
]
[[package]]
name = "miow"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
"socket2",
"winapi 0.3.9",
]
[[package]]
name = "native-tls"
version = "0.2.6"
@ -1807,6 +1836,15 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "ntapi"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "num-derive"
version = "0.3.3"
@ -1883,7 +1921,7 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
[[package]]
name = "omega"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"arrayref",
"bincode",
@ -2763,6 +2801,15 @@ dependencies = [
"opaque-debug 0.3.0",
]
[[package]]
name = "signal-hook-registry"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
dependencies = [
"libc",
]
[[package]]
name = "signature"
version = "1.2.2"
@ -2803,9 +2850,9 @@ dependencies = [
[[package]]
name = "solana-account-decoder"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f615679e600178987fc3d20f68f176c4af5db4b2f1dd52025795196f5a3fb1b"
checksum = "37dc248bdb63b156b47d2ad2cddf59fdeb31f0a974bd8ad944a2e1d3d73d1564"
dependencies = [
"Inflector",
"base64 0.12.3",
@ -2827,9 +2874,9 @@ dependencies = [
[[package]]
name = "solana-bpf-loader-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db09276a114e91cb76ae998b95d7a822b71e147f7b3fb08521106a769b365292"
checksum = "28f086d54de42bad13870f2d5217bd879ba1aa5c955bc4018b9060dbfc5c84ae"
dependencies = [
"bincode",
"byteorder",
@ -2844,9 +2891,9 @@ dependencies = [
[[package]]
name = "solana-clap-utils"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e657fd63ebd8c4d5db21ab10d054890ebfe6df9eacc3c161893752cc0c25e3dd"
checksum = "44868b702341acc7bb6a83589fd17ce6f502068a742b327629f8357053cdb2b5"
dependencies = [
"chrono",
"clap 2.33.3",
@ -2860,9 +2907,9 @@ dependencies = [
[[package]]
name = "solana-cli"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3ff3857067010cfb8514f57c0ea022aa9a9c712c2161b0caa3668ae518f9578"
checksum = "6aa5de2c131e9d591595ed391b06ec94484adaf4f07fbccfea405f8ebcce993e"
dependencies = [
"Inflector",
"bincode",
@ -2906,9 +2953,9 @@ dependencies = [
[[package]]
name = "solana-cli-config"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86a98aa2837380603d02295a545a6ab1b00a3144bad6c4da06d15fc1aa59faf3"
checksum = "e1500ba2d39eb614956d13b007644e9273cc2e3668788907db2e27f76af3bb2f"
dependencies = [
"dirs-next",
"lazy_static",
@ -2920,9 +2967,9 @@ dependencies = [
[[package]]
name = "solana-cli-output"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147f5faf93412ab8f88053ce3fd25393a3646e7426fad78802a6b1ba2ff164cd"
checksum = "b6a87f9380125f7adece55d0a6f94aacc0b0d39e25bcd06af0be0a280161cfbc"
dependencies = [
"Inflector",
"chrono",
@ -2943,9 +2990,9 @@ dependencies = [
[[package]]
name = "solana-client"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f5ca241545e4c2367ae92084ee0109e284a1e05b39b8dcf978a5207ed88f29e"
checksum = "61b6ecea59798a5d19de6a7b88482dfde65dcb3892cde980a904f6a5f934c32f"
dependencies = [
"base64 0.13.0",
"bincode",
@ -2975,9 +3022,9 @@ dependencies = [
[[package]]
name = "solana-config-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d0fbe1d82bef9ac50413cd72a65e8547853f936d765ffd0a334b196f1acdc3f"
checksum = "17fba85a45e4f31ca19625dbeadd56a73e6ccb303964d70e840542fb54e28255"
dependencies = [
"bincode",
"chrono",
@ -2989,9 +3036,9 @@ dependencies = [
[[package]]
name = "solana-crate-features"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd154192d2b458d6ebfe2343b26225880daaa771f5c43069c45a2b53369ba4d6"
checksum = "d50eefc7937431dbfe88850f08e24df378f47d6d15f3569c945e2a1bf442f780"
dependencies = [
"backtrace",
"bytes 0.4.12",
@ -3013,13 +3060,12 @@ dependencies = [
[[package]]
name = "solana-faucet"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5f62fd2f172bc6aa1ab7d4c2d64e9ed315a518e2c8d6e5e8da9a1389d96875c"
checksum = "ef7ecffb88116540551bb2348d3f6f5bbe0d4f860f0c76f16c8551c6322915c5"
dependencies = [
"bincode",
"byteorder",
"bytes 0.4.12",
"clap 2.33.3",
"log",
"serde",
@ -3030,15 +3076,14 @@ dependencies = [
"solana-metrics",
"solana-sdk",
"solana-version",
"tokio 0.1.22",
"tokio-codec",
"tokio 0.3.6",
]
[[package]]
name = "solana-frozen-abi"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2511b9e46d30daa7bde24eb6330eb3808885573ceca99c550f4fc8d3e428785a"
checksum = "be99de05fdc07ba4bb5c8eeb9c5de9791d2311915cb1977343272f24bcfc9035"
dependencies = [
"bs58 0.3.1",
"bv",
@ -3056,9 +3101,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f616e1d66cfb1d5f35d4677af1e5592dc4da2141e718ddf42c926ad47d4727f"
checksum = "586940f7b9b45a047a6349184dcce3a1bae6f476627e6fba574ae622541ec9d7"
dependencies = [
"lazy_static",
"proc-macro2 1.0.24",
@ -3069,9 +3114,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c2be7d6ec2bd98cabae975b9eea0a418ae550f60188892d2190b8b0c9e8ae20"
checksum = "7de92de992c3fa3a7243bfea609b7432e23a469151de9fb1f682b82fbfc77626"
dependencies = [
"env_logger",
"lazy_static",
@ -3080,9 +3125,9 @@ dependencies = [
[[package]]
name = "solana-measure"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39228713bf50403f45d6b95c8e6c2bdabaa5dbf0c56a117139f587b646ae5c52"
checksum = "7cc7ce7e104be389c633dc650ad2f0b50aee80fae79cf6a22d0f88443744146a"
dependencies = [
"jemalloc-ctl",
"jemallocator",
@ -3093,9 +3138,9 @@ dependencies = [
[[package]]
name = "solana-metrics"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60fb3d751091e53f3f2f88fdd70fb93617625b4ad0bcd82e6873c4bb3052de1c"
checksum = "a86bd910c84763616f5abeb33c193b6baa316f00c9021c9811dfa0090be0aca5"
dependencies = [
"env_logger",
"gethostname",
@ -3107,12 +3152,11 @@ dependencies = [
[[package]]
name = "solana-net-utils"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08121e9069e056c2c4c53835ff05ea7642639094f39533f5979d0047614766c"
checksum = "d8f06f107dc3c001def7e0e56f4a957a6c2edf48f52a0184ccecf94a78318adb"
dependencies = [
"bincode",
"bytes 0.4.12",
"clap 2.33.3",
"log",
"nix 0.19.1",
@ -3123,15 +3167,15 @@ dependencies = [
"solana-clap-utils",
"solana-logger",
"solana-version",
"tokio 0.1.22",
"tokio 0.3.6",
"url",
]
[[package]]
name = "solana-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a7df63d84d4ba7f67365d179b9994f2690554f313e219f29810b4583077e066"
checksum = "744f75e0e41c04ee3a175b0a2c278db0ec74ee81b22d978d07d3914b85def6ae"
dependencies = [
"bincode",
"bs58 0.3.1",
@ -3159,9 +3203,9 @@ dependencies = [
[[package]]
name = "solana-rayon-threadlimit"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a3e4ea131c14949da4a1856cd98972fd1f24baeb39e0aaacd726cc83ebb3683"
checksum = "ab3ee300ae07755ef9fff39b88f12fb64de9b2db92a0cd9382fbacb76a8f188b"
dependencies = [
"lazy_static",
"num_cpus",
@ -3169,9 +3213,9 @@ dependencies = [
[[package]]
name = "solana-remote-wallet"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4851431ec03e4836dd8796a635b21d832b0924393ecd16afecc7760c666ac"
checksum = "87115b43d61ce88ae24259290b869c26544ca18ce15485586833a30e2a4d5c78"
dependencies = [
"base32",
"console 0.11.3",
@ -3189,9 +3233,9 @@ dependencies = [
[[package]]
name = "solana-runtime"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a59d25d0f5bb22c6343a2be817efa481fbe0985a213f140ce205d55562d11a96"
checksum = "71317b21da9d290808eb59d388ad48fc51fa7d3b5b907adb0d46445d1df7844b"
dependencies = [
"bincode",
"blake3",
@ -3240,9 +3284,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e37771fa6acdce54c456765d7d247536a4123b1afd0b96efbf164d38a5b08fa2"
checksum = "0eb4e0066e81c1688d082e8ac9bf51a3f29f7148f64a906a0d163f60b67673e5"
dependencies = [
"assert_matches",
"bincode",
@ -3284,9 +3328,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "012a3f407ae5a2571c810592d72f86c87b4652aeeb8ed7e3082970af172d5ac6"
checksum = "0ea0fb6bee092ff0ed0f3735331102394653ad68521918101f883c8d8afe1d4e"
dependencies = [
"bs58 0.3.1",
"proc-macro2 1.0.24",
@ -3297,9 +3341,9 @@ dependencies = [
[[package]]
name = "solana-secp256k1-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ae342254431819ba2118aa34b50d7b37da296cde90d56af302d9d3df5473ef5"
checksum = "d107abbb5d6e7e6e4d1f816a1229bc88d583332214d6069fd47c287ccda8cccb"
dependencies = [
"bincode",
"digest 0.9.0",
@ -3312,9 +3356,9 @@ dependencies = [
[[package]]
name = "solana-stake-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b77f387a020aab9f69989172c043b59887a2380f70ae4899ea13ea918ec2412"
checksum = "0b107e22e21de58b2cb5207a8346dcebc06c83a25cf0d8dbe1bd8c94b59fcf2b"
dependencies = [
"bincode",
"log",
@ -3334,9 +3378,9 @@ dependencies = [
[[package]]
name = "solana-transaction-status"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b29b8f38f217384dcaad6790018695cb37b1ed5eb16400cb36a8806b3e5d1b5c"
checksum = "95e2dd1a209005f3e3c11da5d364dac588a0a8cddd77ffe3d7de42d1644e3571"
dependencies = [
"Inflector",
"base64 0.12.3",
@ -3358,9 +3402,9 @@ dependencies = [
[[package]]
name = "solana-version"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "449dfdd4a87520f14f776b4265a61b7908379b1381e772016b6c2d2a4afa8b0b"
checksum = "afd3d01ebeb631afe83835f72a1d37b5f86e3ce2a5c70ce85312e00fc6962ac8"
dependencies = [
"log",
"rustc_version",
@ -3374,9 +3418,9 @@ dependencies = [
[[package]]
name = "solana-vote-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9831d3f343c6acc1a218381969a829f46b77f9e7c2f89241a615dc5c8c27a7d9"
checksum = "294f29f9b01bf60bb7790c01d5079ee75611e26c28aa243a88b2b9b977b5e56b"
dependencies = [
"bincode",
"log",
@ -3395,9 +3439,9 @@ dependencies = [
[[package]]
name = "solana_rbpf"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3f14c9649bc6c2dfc205b3450007ef02ec7331c1ea8f109468d53d159a09f3a"
checksum = "77cd2bce0b970bcc90210d005d838cd37745899f41f4d096edc58b49d8bb6094"
dependencies = [
"byteorder",
"combine",
@ -3722,7 +3766,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
dependencies = [
"bytes 0.4.12",
"futures",
"mio",
"mio 0.6.23",
"num_cpus",
"tokio-codec",
"tokio-current-thread",
@ -3750,12 +3794,34 @@ dependencies = [
"iovec",
"lazy_static",
"memchr",
"mio",
"mio 0.6.23",
"num_cpus",
"pin-project-lite 0.1.11",
"slab",
]
[[package]]
name = "tokio"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "720ba21c25078711bf456d607987d95bce90f7c3bea5abe1db587862e7a1e87c"
dependencies = [
"autocfg",
"bytes 0.6.0",
"futures-core",
"libc",
"memchr",
"mio 0.7.7",
"num_cpus",
"once_cell",
"parking_lot 0.11.1",
"pin-project-lite 0.2.0",
"signal-hook-registry",
"slab",
"tokio-macros",
"winapi 0.3.9",
]
[[package]]
name = "tokio-codec"
version = "0.1.2"
@ -3809,6 +3875,17 @@ dependencies = [
"log",
]
[[package]]
name = "tokio-macros"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46dfffa59fc3c8aad216ed61bdc2c263d2b9d87a9c8ac9de0c11a813e51b6db7"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.8",
"syn 1.0.55",
]
[[package]]
name = "tokio-reactor"
version = "0.1.12"
@ -3819,7 +3896,7 @@ dependencies = [
"futures",
"lazy_static",
"log",
"mio",
"mio 0.6.23",
"num_cpus",
"parking_lot 0.9.0",
"slab",
@ -3859,7 +3936,7 @@ dependencies = [
"bytes 0.4.12",
"futures",
"iovec",
"mio",
"mio 0.6.23",
"tokio-io",
"tokio-reactor",
]
@ -3902,7 +3979,7 @@ dependencies = [
"bytes 0.4.12",
"futures",
"log",
"mio",
"mio 0.6.23",
"tokio-codec",
"tokio-io",
"tokio-reactor",
@ -3919,7 +3996,7 @@ dependencies = [
"iovec",
"libc",
"log",
"mio",
"mio 0.6.23",
"mio-uds",
"tokio-codec",
"tokio-io",

View File

@ -1,6 +1,6 @@
[package]
name = "cli"
version = "0.2.0"
version = "0.3.0"
description = "CLI for Omega Predictions Protocol"
authors = ["Blockworks <hello@blockworks.foundation>"]
license = "Apache-2.0"
@ -14,10 +14,10 @@ path = "src/main.rs"
client = { path = "../client" }
anyhow = "1.0.36"
clap = "3.0.0-beta.2"
solana-client = "1.4.17"
solana-cli = "1.4.17"
solana-sdk = "1.4.17"
omega = { version = "0.2.0", path = "../program", features=["no-entrypoint"] }
solana-client = "1.5.4"
solana-cli = "1.5.4"
solana-sdk = "1.5.4"
omega = { version = "0.3.0", path = "../program", features=["no-entrypoint"] }
spl-token = { version = "^3.0", features=["no-entrypoint"] }
spl-token-swap = { version = "*", git = "https://github.com/solana-labs/solana-program-library.git", features=["no-entrypoint"]}
serde_json = "1.0.60"

View File

@ -4,4 +4,4 @@ export CLUSTER=devnet
export KEYPAIR=~/.config/solana/id.json
export MY_ADDR="$(solana address)"
solana config set --url $CLUSTER_URL
export OMEGA_PROGRAM_ID=9sSiUH8wZ1MCT3HJDYn8vMV57YuHQEXdNjVoncB5z6Cw
export OMEGA_PROGRAM_ID=E9LcZwiT8f9REGn4wmastVb2rJHCMfRSSKUQzgiUEdJT

211
client/Cargo.lock generated
View File

@ -285,6 +285,12 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "bytes"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16"
[[package]]
name = "bzip2"
version = "0.3.3"
@ -359,7 +365,7 @@ dependencies = [
[[package]]
name = "client"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"anyhow",
"bincode",
@ -1529,12 +1535,25 @@ dependencies = [
"kernel32-sys",
"libc",
"log",
"miow",
"miow 0.2.1",
"net2",
"slab",
"winapi 0.2.8",
]
[[package]]
name = "mio"
version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7"
dependencies = [
"libc",
"log",
"miow 0.3.6",
"ntapi",
"winapi 0.3.9",
]
[[package]]
name = "mio-uds"
version = "0.6.8"
@ -1543,7 +1562,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
dependencies = [
"iovec",
"libc",
"mio",
"mio 0.6.22",
]
[[package]]
@ -1558,6 +1577,16 @@ dependencies = [
"ws2_32-sys",
]
[[package]]
name = "miow"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
"socket2",
"winapi 0.3.9",
]
[[package]]
name = "native-tls"
version = "0.2.6"
@ -1605,6 +1634,15 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "ntapi"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "num-derive"
version = "0.3.3"
@ -1921,6 +1959,12 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
[[package]]
name = "pin-project-lite"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
[[package]]
name = "pin-utils"
version = "0.1.0"
@ -2153,7 +2197,7 @@ dependencies = [
"mime",
"mime_guess",
"percent-encoding",
"pin-project-lite",
"pin-project-lite 0.1.11",
"rustls",
"serde",
"serde_json",
@ -2431,6 +2475,15 @@ dependencies = [
"opaque-debug 0.3.0",
]
[[package]]
name = "signal-hook-registry"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
dependencies = [
"libc",
]
[[package]]
name = "signature"
version = "1.2.2"
@ -2471,9 +2524,9 @@ dependencies = [
[[package]]
name = "solana-account-decoder"
version = "1.4.17"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "504721e687f5192353bbb7fbcea3b1c5af4cf3c7ef06a70a3d3b2f9e06a80509"
checksum = "37dc248bdb63b156b47d2ad2cddf59fdeb31f0a974bd8ad944a2e1d3d73d1564"
dependencies = [
"Inflector",
"base64 0.12.3",
@ -2495,9 +2548,9 @@ dependencies = [
[[package]]
name = "solana-clap-utils"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e657fd63ebd8c4d5db21ab10d054890ebfe6df9eacc3c161893752cc0c25e3dd"
checksum = "44868b702341acc7bb6a83589fd17ce6f502068a742b327629f8357053cdb2b5"
dependencies = [
"chrono",
"clap",
@ -2511,9 +2564,9 @@ dependencies = [
[[package]]
name = "solana-client"
version = "1.4.17"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "751c3ce10f6e64f3e05c518a3688cb47911b63cb355e58b9e67e6f5ee23c7711"
checksum = "61b6ecea59798a5d19de6a7b88482dfde65dcb3892cde980a904f6a5f934c32f"
dependencies = [
"base64 0.13.0",
"bincode",
@ -2543,9 +2596,9 @@ dependencies = [
[[package]]
name = "solana-config-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d0fbe1d82bef9ac50413cd72a65e8547853f936d765ffd0a334b196f1acdc3f"
checksum = "17fba85a45e4f31ca19625dbeadd56a73e6ccb303964d70e840542fb54e28255"
dependencies = [
"bincode",
"chrono",
@ -2557,9 +2610,9 @@ dependencies = [
[[package]]
name = "solana-crate-features"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd154192d2b458d6ebfe2343b26225880daaa771f5c43069c45a2b53369ba4d6"
checksum = "d50eefc7937431dbfe88850f08e24df378f47d6d15f3569c945e2a1bf442f780"
dependencies = [
"backtrace",
"bytes 0.4.12",
@ -2581,9 +2634,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2511b9e46d30daa7bde24eb6330eb3808885573ceca99c550f4fc8d3e428785a"
checksum = "be99de05fdc07ba4bb5c8eeb9c5de9791d2311915cb1977343272f24bcfc9035"
dependencies = [
"bs58 0.3.1",
"bv",
@ -2601,9 +2654,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f616e1d66cfb1d5f35d4677af1e5592dc4da2141e718ddf42c926ad47d4727f"
checksum = "586940f7b9b45a047a6349184dcce3a1bae6f476627e6fba574ae622541ec9d7"
dependencies = [
"lazy_static",
"proc-macro2 1.0.24",
@ -2614,9 +2667,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c2be7d6ec2bd98cabae975b9eea0a418ae550f60188892d2190b8b0c9e8ae20"
checksum = "7de92de992c3fa3a7243bfea609b7432e23a469151de9fb1f682b82fbfc77626"
dependencies = [
"env_logger",
"lazy_static",
@ -2625,9 +2678,9 @@ dependencies = [
[[package]]
name = "solana-measure"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39228713bf50403f45d6b95c8e6c2bdabaa5dbf0c56a117139f587b646ae5c52"
checksum = "7cc7ce7e104be389c633dc650ad2f0b50aee80fae79cf6a22d0f88443744146a"
dependencies = [
"jemalloc-ctl",
"jemallocator",
@ -2638,9 +2691,9 @@ dependencies = [
[[package]]
name = "solana-metrics"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60fb3d751091e53f3f2f88fdd70fb93617625b4ad0bcd82e6873c4bb3052de1c"
checksum = "a86bd910c84763616f5abeb33c193b6baa316f00c9021c9811dfa0090be0aca5"
dependencies = [
"env_logger",
"gethostname",
@ -2652,12 +2705,11 @@ dependencies = [
[[package]]
name = "solana-net-utils"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08121e9069e056c2c4c53835ff05ea7642639094f39533f5979d0047614766c"
checksum = "d8f06f107dc3c001def7e0e56f4a957a6c2edf48f52a0184ccecf94a78318adb"
dependencies = [
"bincode",
"bytes 0.4.12",
"clap",
"log",
"nix",
@ -2668,15 +2720,15 @@ dependencies = [
"solana-clap-utils",
"solana-logger",
"solana-version",
"tokio 0.1.22",
"tokio 0.3.6",
"url",
]
[[package]]
name = "solana-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a7df63d84d4ba7f67365d179b9994f2690554f313e219f29810b4583077e066"
checksum = "744f75e0e41c04ee3a175b0a2c278db0ec74ee81b22d978d07d3914b85def6ae"
dependencies = [
"bincode",
"bs58 0.3.1",
@ -2704,9 +2756,9 @@ dependencies = [
[[package]]
name = "solana-rayon-threadlimit"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a3e4ea131c14949da4a1856cd98972fd1f24baeb39e0aaacd726cc83ebb3683"
checksum = "ab3ee300ae07755ef9fff39b88f12fb64de9b2db92a0cd9382fbacb76a8f188b"
dependencies = [
"lazy_static",
"num_cpus",
@ -2714,9 +2766,9 @@ dependencies = [
[[package]]
name = "solana-remote-wallet"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4851431ec03e4836dd8796a635b21d832b0924393ecd16afecc7760c666ac"
checksum = "87115b43d61ce88ae24259290b869c26544ca18ce15485586833a30e2a4d5c78"
dependencies = [
"base32",
"console 0.11.3",
@ -2734,9 +2786,9 @@ dependencies = [
[[package]]
name = "solana-runtime"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a59d25d0f5bb22c6343a2be817efa481fbe0985a213f140ce205d55562d11a96"
checksum = "71317b21da9d290808eb59d388ad48fc51fa7d3b5b907adb0d46445d1df7844b"
dependencies = [
"bincode",
"blake3",
@ -2785,9 +2837,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e37771fa6acdce54c456765d7d247536a4123b1afd0b96efbf164d38a5b08fa2"
checksum = "0eb4e0066e81c1688d082e8ac9bf51a3f29f7148f64a906a0d163f60b67673e5"
dependencies = [
"assert_matches",
"bincode",
@ -2829,9 +2881,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "012a3f407ae5a2571c810592d72f86c87b4652aeeb8ed7e3082970af172d5ac6"
checksum = "0ea0fb6bee092ff0ed0f3735331102394653ad68521918101f883c8d8afe1d4e"
dependencies = [
"bs58 0.3.1",
"proc-macro2 1.0.24",
@ -2842,9 +2894,9 @@ dependencies = [
[[package]]
name = "solana-secp256k1-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ae342254431819ba2118aa34b50d7b37da296cde90d56af302d9d3df5473ef5"
checksum = "d107abbb5d6e7e6e4d1f816a1229bc88d583332214d6069fd47c287ccda8cccb"
dependencies = [
"bincode",
"digest 0.9.0",
@ -2857,9 +2909,9 @@ dependencies = [
[[package]]
name = "solana-stake-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b77f387a020aab9f69989172c043b59887a2380f70ae4899ea13ea918ec2412"
checksum = "0b107e22e21de58b2cb5207a8346dcebc06c83a25cf0d8dbe1bd8c94b59fcf2b"
dependencies = [
"bincode",
"log",
@ -2879,9 +2931,9 @@ dependencies = [
[[package]]
name = "solana-transaction-status"
version = "1.4.17"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54e1a2d7f49a1fd4c2e3e312cdcdf8a4b7061684171b9dae59e58cc7c6d6da02"
checksum = "95e2dd1a209005f3e3c11da5d364dac588a0a8cddd77ffe3d7de42d1644e3571"
dependencies = [
"Inflector",
"base64 0.12.3",
@ -2903,9 +2955,9 @@ dependencies = [
[[package]]
name = "solana-version"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "449dfdd4a87520f14f776b4265a61b7908379b1381e772016b6c2d2a4afa8b0b"
checksum = "afd3d01ebeb631afe83835f72a1d37b5f86e3ce2a5c70ce85312e00fc6962ac8"
dependencies = [
"log",
"rustc_version",
@ -2919,9 +2971,9 @@ dependencies = [
[[package]]
name = "solana-vote-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9831d3f343c6acc1a218381969a829f46b77f9e7c2f89241a615dc5c8c27a7d9"
checksum = "294f29f9b01bf60bb7790c01d5079ee75611e26c28aa243a88b2b9b977b5e56b"
dependencies = [
"bincode",
"log",
@ -2946,18 +2998,18 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spl-memo"
version = "2.0.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99775feb54f735a6826ea0af500c1f78f7a5974d6b17f1ac586cd114e2da7d80"
checksum = "fb2b771f6146dec14ef5fbf498f9374652c54badc3befc8c40c1d426dd45d720"
dependencies = [
"solana-program",
]
[[package]]
name = "spl-token"
version = "3.0.0"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f77fa0b41cbc82d1d7c8f2d914b49e9a1a7b6e32af952d03383fb989c42bc89"
checksum = "a9774eebb62ff1ff2f5eca112413e476143925a2f5a43cee98fc5d3a6c0eec5c"
dependencies = [
"arrayref",
"num-derive",
@ -3186,7 +3238,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
dependencies = [
"bytes 0.4.12",
"futures",
"mio",
"mio 0.6.22",
"num_cpus",
"tokio-codec",
"tokio-current-thread",
@ -3214,12 +3266,34 @@ dependencies = [
"iovec",
"lazy_static",
"memchr",
"mio",
"mio 0.6.22",
"num_cpus",
"pin-project-lite",
"pin-project-lite 0.1.11",
"slab",
]
[[package]]
name = "tokio"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "720ba21c25078711bf456d607987d95bce90f7c3bea5abe1db587862e7a1e87c"
dependencies = [
"autocfg",
"bytes 0.6.0",
"futures-core",
"libc",
"memchr",
"mio 0.7.7",
"num_cpus",
"once_cell",
"parking_lot 0.11.1",
"pin-project-lite 0.2.4",
"signal-hook-registry",
"slab",
"tokio-macros",
"winapi 0.3.9",
]
[[package]]
name = "tokio-codec"
version = "0.1.2"
@ -3273,6 +3347,17 @@ dependencies = [
"log",
]
[[package]]
name = "tokio-macros"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46dfffa59fc3c8aad216ed61bdc2c263d2b9d87a9c8ac9de0c11a813e51b6db7"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.7",
"syn 1.0.48",
]
[[package]]
name = "tokio-reactor"
version = "0.1.12"
@ -3283,7 +3368,7 @@ dependencies = [
"futures",
"lazy_static",
"log",
"mio",
"mio 0.6.22",
"num_cpus",
"parking_lot 0.9.0",
"slab",
@ -3323,7 +3408,7 @@ dependencies = [
"bytes 0.4.12",
"futures",
"iovec",
"mio",
"mio 0.6.22",
"tokio-io",
"tokio-reactor",
]
@ -3366,7 +3451,7 @@ dependencies = [
"bytes 0.4.12",
"futures",
"log",
"mio",
"mio 0.6.22",
"tokio-codec",
"tokio-io",
"tokio-reactor",
@ -3383,7 +3468,7 @@ dependencies = [
"iovec",
"libc",
"log",
"mio",
"mio 0.6.22",
"mio-uds",
"tokio-codec",
"tokio-io",
@ -3400,7 +3485,7 @@ dependencies = [
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
"pin-project-lite 0.1.11",
"tokio 0.2.23",
]
@ -3427,7 +3512,7 @@ checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27"
dependencies = [
"cfg-if 0.1.10",
"log",
"pin-project-lite",
"pin-project-lite 0.1.11",
"tracing-core",
]

View File

@ -1,6 +1,6 @@
[package]
name = "client"
version = "0.2.0"
version = "0.3.0"
description = "Client for Omega Predictions Protocol"
authors = ["Blockworks <hello@blockworks.foundation>"]
license = "Apache-2.0"
@ -8,10 +8,10 @@ edition = "2018"
[dependencies]
solana-sdk = { version = "1.4.17", features=["default"]}
solana-sdk = { version = "1.5.4", features=["default"]}
spl-token = { version = "^3.0", features=["no-entrypoint"] }
anyhow = "^1.0.36"
solana-client = "1.4.17"
solana-client = "1.5.4"
serde_json = "1.0.60"
bs58 = "0.4.0"
bincode = "1.3.1"

30
program/Cargo.lock generated
View File

@ -1025,7 +1025,7 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
[[package]]
name = "omega"
version = "0.2.0"
version = "0.3.0"
dependencies = [
"arrayref",
"bincode",
@ -1522,9 +1522,9 @@ dependencies = [
[[package]]
name = "solana-crate-features"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd154192d2b458d6ebfe2343b26225880daaa771f5c43069c45a2b53369ba4d6"
checksum = "d50eefc7937431dbfe88850f08e24df378f47d6d15f3569c945e2a1bf442f780"
dependencies = [
"backtrace",
"bytes 0.4.12",
@ -1546,9 +1546,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2511b9e46d30daa7bde24eb6330eb3808885573ceca99c550f4fc8d3e428785a"
checksum = "be99de05fdc07ba4bb5c8eeb9c5de9791d2311915cb1977343272f24bcfc9035"
dependencies = [
"bs58",
"bv",
@ -1566,9 +1566,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f616e1d66cfb1d5f35d4677af1e5592dc4da2141e718ddf42c926ad47d4727f"
checksum = "586940f7b9b45a047a6349184dcce3a1bae6f476627e6fba574ae622541ec9d7"
dependencies = [
"lazy_static",
"proc-macro2 1.0.24",
@ -1579,9 +1579,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c2be7d6ec2bd98cabae975b9eea0a418ae550f60188892d2190b8b0c9e8ae20"
checksum = "7de92de992c3fa3a7243bfea609b7432e23a469151de9fb1f682b82fbfc77626"
dependencies = [
"env_logger",
"lazy_static",
@ -1590,9 +1590,9 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a7df63d84d4ba7f67365d179b9994f2690554f313e219f29810b4583077e066"
checksum = "744f75e0e41c04ee3a175b0a2c278db0ec74ee81b22d978d07d3914b85def6ae"
dependencies = [
"bincode",
"bs58",
@ -1620,9 +1620,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e37771fa6acdce54c456765d7d247536a4123b1afd0b96efbf164d38a5b08fa2"
checksum = "0eb4e0066e81c1688d082e8ac9bf51a3f29f7148f64a906a0d163f60b67673e5"
dependencies = [
"assert_matches",
"bincode",
@ -1664,9 +1664,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.5.0"
version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "012a3f407ae5a2571c810592d72f86c87b4652aeeb8ed7e3082970af172d5ac6"
checksum = "0ea0fb6bee092ff0ed0f3735331102394653ad68521918101f883c8d8afe1d4e"
dependencies = [
"bs58",
"proc-macro2 1.0.24",

View File

@ -1,6 +1,6 @@
[package]
name = "omega"
version = "0.2.0"
version = "0.3.0"
description = "Omega Predictions Protocol"
authors = ["Blockworks <hello@blockworks.foundation>"]
license = "Apache-2.0"
@ -10,7 +10,7 @@ edition = "2018"
no-entrypoint = []
[dependencies]
solana-program = "1.4.17"
solana-program = "1.5.4"
spl-token = { version = "^3.0.0", features=["no-entrypoint"] }
byteorder = "1.3.4"
arrayref = "0.3.6"
@ -24,7 +24,7 @@ serde = "1.0.118"
bincode = "1.3.1"
[dev-dependencies]
solana-sdk = "1.4.17"
solana-sdk = "1.5.4"
[profile.release]
lto = true

View File

@ -42,7 +42,7 @@ export const AccountInfo = (props: {}) => {
const outcomeAccount = userAccounts?.find(a => a.info.mint.toBase58() === o.mint_pk);
if (outcomeAccount && mint) {
const balance = outcomeAccount.info.amount.toNumber() / Math.pow(10, mint.decimals - 1);
const balance = outcomeAccount.info.amount.toNumber() / Math.pow(10, mint.decimals);
if (balance > 0)
userOutcomeBalances.set(o.name, balance);
}

View File

@ -126,7 +126,7 @@ export const BetButton = (props: {
A.setAmount(epsilon.toString());
}, [A, B, setPoolOperation, setLastTypedAccount]);
const history = useHistory();
// const history = useHistory();
let odds = "";
if (B?.amount) {

View File

@ -48,7 +48,6 @@ export const TradeEntry = () => {
} = useCurrencyPairState();
const pool = usePoolForBasket([A?.mintAddress, B?.mintAddress]);
console.log('SWAP pool', pool);
const { slippage } = useSlippageConfig();
const { tokenMap } = useConnectionConfig();

View File

@ -2,7 +2,7 @@
"contract_name": "SBOWL-KC",
"details": "None",
"omega_contract_pk": "4n3HjJT4NgzANhKBN7qXmUmScoYr8YNFbg4zYGqgcJii",
"omega_program_id": "9sSiUH8wZ1MCT3HJDYn8vMV57YuHQEXdNjVoncB5z6Cw",
"omega_program_id": "E9LcZwiT8f9REGn4wmastVb2rJHCMfRSSKUQzgiUEdJT",
"oracle_pk": "FJpmfVUmd75kVieMjBLixdk5611xvXVUNadhcSbhE4Hm",
"outcomes": [
{

View File

@ -4,8 +4,5 @@ import kc from "./kc.json";
import tb from "./tb.json";
export const markets = [
kc,
gb,
buf,
tb
kc
];

View File

@ -1,23 +1,23 @@
{
"contract_name": "Kansas City Chiefs",
"details": "None",
"omega_contract_pk": "FgEPtRH7XH8jUcX394QGA4ggJbjy2ii2pPuTCwudmXSn",
"omega_program_id": "9sSiUH8wZ1MCT3HJDYn8vMV57YuHQEXdNjVoncB5z6Cw",
"oracle_pk": "AiV4j8BnezLr6xojE2P7DT1cMCQKwybinSYBusoECm9w",
"omega_contract_pk": "ANSW3PWijciE53SHCD8M8foRay3tFWZYYkFXsT2REkm4",
"omega_program_id": "E9LcZwiT8f9REGn4wmastVb2rJHCMfRSSKUQzgiUEdJT",
"oracle_pk": "FJpmfVUmd75kVieMjBLixdk5611xvXVUNadhcSbhE4Hm",
"outcomes": [
{
"icon": "/markets/SUPERBOWL21/kc.png",
"mint_pk": "DV63zwVsfhkrGBwZBDoZqCTGJUHsz4hYEdfx7DxYGJ2c",
"mint_pk": "CcWQLmhjpvCWRg99Bn4vGDXppwjcFW13H74BSKQzYGK",
"name": "KC-YES"
},
{
"icon": "/markets/SUPERBOWL21/kc_no.png",
"mint_pk": "4CpcJvB9Qb4C3SmiVLsqTE1QY3vMNfQ6sPyGwy1yMmd8",
"mint_pk": "B4rrr2YNvnyTEDSYHTRdFLzMBBDgMyU9awkncnMybhSP",
"name": "KC-NO"
}
],
"quote_mint_pk": "Fq939Y5hycK62ZGwBjftLY2VyxqAQ8f1MxRqBMdAaBS7",
"quote_vault_pk": "DvKiKpJGJfXKeUkUqgKNWeQ2pqn5iyjXgFXw1LsjysDW",
"signer_nonce": 1,
"signer_pk": "GEgT1mcKQRmGyJRnMgTF4jZYpY97WbLPKuJg5u6NJg8M"
}
"quote_vault_pk": "HburRfepkyhbNmJC5tfrunRY2H9oKkQEtHZG2zf3epQq",
"signer_nonce": 0,
"signer_pk": "HLxcm95hwN6i4HosaVudNzS5HTqVKNwqXjQkKkX98vwr"
}

View File

@ -216,6 +216,7 @@ export const cache = {
}
const address = id.toBase58();
let mint = mintCache.get(address);
if (mint) {
return mint;
@ -223,11 +224,13 @@ export const cache = {
let query = pendingMintCalls.get(address);
if (query) {
return query;
}
query = getMintInfo(connection, id).then((data) => {
pendingAccountCalls.delete(address);
mintCache.set(address, data);
return data;
}) as Promise<MintInfo>;
@ -551,6 +554,9 @@ export function useMint(key?: string | PublicKey) {
const event = e;
if (event.id === id) {
cache.queryMint(connection, id).then(setMint);
if (id === "DV63zwVsfhkrGBwZBDoZqCTGJUHsz4hYEdfx7DxYGJ2c") {
console.log()
}
}
});
return () => {

View File

@ -123,8 +123,8 @@ export function ConnectionProvider({ children = undefined as any }) {
console.log('knownMints', knownMints);
setTokenMap(knownMints);
setTokens(list);
// setTokenMap(knownMints);
// setTokens(list);
});
}, [env]);

View File

@ -47,6 +47,7 @@ const CurrencyPairContext = React.createContext<CurrencyPairContextState | null>
);
export const convertAmount = (amount: string, mint?: MintInfo) => {
return parseFloat(amount) * Math.pow(10, mint?.decimals || 0);
};
@ -67,7 +68,7 @@ export const useCurrencyLeg = (defaultMint?: string) => {
icon: getTokenIcon(tokenMap, mintAddress),
setAmount: setAmount,
setMint: setMintAddress,
convertAmount: () => convertAmount(amount, mint),
convertAmount: () => (convertAmount(amount, mint)),
sufficientBalance: () =>
account !== undefined && convert(account, mint) >= parseFloat(amount),
}),
@ -79,6 +80,7 @@ export function CurrencyPairProvider({
baseMintAddress = "" as string,
quoteMintAddress = "" as string,
children = null as any }) {
const connection = useConnection();
const { tokens } = useConnectionConfig();
@ -180,7 +182,6 @@ export function CurrencyPairProvider({
poolOperation
);
console.log('calculateDependent', amount, result, independent);
if (typeof result === "string") {
setDependent(result);
} else if (result !== undefined && Number.isFinite(result)) {
@ -223,6 +224,7 @@ export function CurrencyPairProvider({
export const useCurrencyPairState = () => {
const context = useContext(CurrencyPairContext);
return context as CurrencyPairContextState;
};

View File

@ -418,7 +418,7 @@ export const usePools = () => {
if (obj.data.length === AccountLayout.span) {
return cache.addAccount(pubKey, obj);
} else if (obj.data.length === MintLayout.span) {
return cache.addMint(pubKey, obj);
// return cache.addMint(pubKey, obj);
}
return obj;