BigInt wrapper and local types#135

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

Closed
austinabell wants to merge 1 commit into from
Closed

BigInt wrapper and local types #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
"node",
"node/clock",
"crypto",
"encoding"
"encoding",
"math/bigint",
]
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
@cargo clean -p interpreter
@cargo clean -p crypto
@cargo clean -p encoding
@cargo clean -p bigint
@echo "Done cleaning."

lint: clean
Expand Down
8 changes: 8 additions & 0 deletions math/bigint/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
65 changes: 65 additions & 0 deletions math/bigint/src/big.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
num: BaseBigInt,
}

impl From<i64> for BigInt {
#[inline]
fn from(n: i64) -> Self {
BigInt::from(BaseBigInt::from(n))
}
}

impl From<BaseBigInt> for BigInt {
fn from(num: BaseBigInt) -> Self {
Self { num }
}
}

impl Deref for BigInt {
type Target = BaseBigInt;
fn deref(&self) -> &Self::Target {
&self.num
}
}

impl DerefMut for BigInt {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.num
}
}

impl fmt::Display for BigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::Binary for BigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::Octal for BigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::LowerHex for BigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::UpperHex for BigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}
6 changes: 6 additions & 0 deletions math/bigint/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;
64 changes: 64 additions & 0 deletions math/bigint/src/ubig.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
num: BaseUBigInt,
}

impl From<u64> for UBigInt {
#[inline]
fn from(n: u64) -> Self {
UBigInt::from(BaseUBigInt::from(n))
}
}

impl From<BaseUBigInt> for UBigInt {
fn from(num: BaseUBigInt) -> Self {
Self { num }
}
}

impl Deref for UBigInt {
type Target = BaseUBigInt;
fn deref(&self) -> &Self::Target {
&self.num
}
}

impl DerefMut for UBigInt {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.num
}
}

impl fmt::Display for UBigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::Binary for UBigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::Octal for UBigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::LowerHex for UBigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}

impl fmt::UpperHex for UBigInt {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.deref().fmt(f)
}
}
62 changes: 62 additions & 0 deletions math/bigint/tests/big_test.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
let hello = BigInt::from(
BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{:x}", a), "a");
assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
let hello = BigInt::from(
BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{:X}", a), "A");
assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

assert_eq!(format!("{:b}", a), "1010");
assert_eq!(
format!("{:b}", hello),
"110010111100011011110011000101101001100011010011"
);
assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
let hello = BigInt::from(
BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{:o}", a), "12");
assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
let hello = BigInt::from(
BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{}", a), "10");
assert_eq!(format!("{}", hello), "22405534230753963835153736737");
assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}
62 changes: 62 additions & 0 deletions math/bigint/tests/ubig_test.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
let hello = UBigInt::from(
BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{:x}", a), "a");
assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
let hello = UBigInt::from(
BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{:X}", a), "A");
assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

assert_eq!(format!("{:b}", a), "1010");
assert_eq!(
format!("{:b}", hello),
"110010111100011011110011000101101001100011010011"
);
assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
let hello = UBigInt::from(
BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{:o}", a), "12");
assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
let hello = UBigInt::from(
BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
);

assert_eq!(format!("{}", a), "10");
assert_eq!(format!("{}", hello), "22405534230753963835153736737");
assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}
2 changes: 1 addition & 1 deletion vm/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}
2 changes: 1 addition & 1 deletion vm/actor/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions vm/actor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
code_id: CodeID,
state: Cid,
balance: BigUint,
balance: UBigInt,
sequence: u64,
}

impl ActorState {
/// Constructor for actor state
pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
Self {
code_id,
state,
Expand Down
2 changes: 1 addition & 1 deletion vm/message/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down
6 changes: 3 additions & 3 deletions vm/message/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
/// params returns the encoded parameters for the method call
fn params(&self) -> MethodParams;
/// gas_price returns gas price for the message
fn gas_price(&self) -> BigUint;
fn gas_price(&self) -> UBigInt;
/// gas_limit returns the gas limit for the message
fn gas_limit(&self) -> BigUint;
fn gas_limit(&self) -> UBigInt;
}
4 changes: 2 additions & 2 deletions vm/message/src/message_receipt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
// TODO: determine if this is necessary, code returned from cbor
pub exit_code: ExitCode,
pub return_data: Vec<u8>,
pub gas_used: BigUint,
pub gas_used: UBigInt,
}
6 changes: 3 additions & 3 deletions vm/message/src/signed_message.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
self.message.params()
}
/// gas_price returns gas price for the message
fn gas_price(&self) -> BigUint {
fn gas_price(&self) -> UBigInt {
self.message.gas_price()
}
/// gas_limit returns the gas limit for the message
fn gas_limit(&self) -> BigUint {
fn gas_limit(&self) -> UBigInt {
self.message.gas_limit()
}
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
BigInt wrapper and local types#135

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

 Closed

austinabell
wants to merge
1
commit into

from

 Closed


BigInt wrapper and local types
#135
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


3 changes: 2 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,5 +14,6 @@ members = [
 "node",
 "node/clock",
 "crypto",
 "encoding"
 "encoding",
 "math/bigint",
]

1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ clean:
	@cargo clean -p interpreter
	@cargo clean -p crypto
	@cargo clean -p encoding
	@cargo clean -p bigint
	@echo "Done cleaning."

lint: clean
Expand Down

8 changes: 8 additions & 0 deletions
math/bigint/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
[package]
name = "ferret_bigint"
version = "0.1.0"
authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"

65 changes: 65 additions & 0 deletions
math/bigint/src/big.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
pub use num_bigint::BigInt as BaseBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

/// Signed Big integer variable
#[derive(PartialEq, Eq, Clone, Debug, Hash, Default, Ord, PartialOrd)]
pub struct BigInt {
 num: BaseBigInt,
}

impl From<i64> for BigInt {
 #[inline]
 fn from(n: i64) -> Self {
 BigInt::from(BaseBigInt::from(n))
 }
}

impl From<BaseBigInt> for BigInt {
 fn from(num: BaseBigInt) -> Self {
 Self { num }
 }
}

impl Deref for BigInt {
 type Target = BaseBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for BigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for BigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

6 changes: 6 additions & 0 deletions
math/bigint/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
mod big;
mod ubig;

pub use self::big::{BaseBigInt, BigInt};
pub use self::ubig::{BaseUBigInt, UBigInt};
pub use num_bigint as base_big;

64 changes: 64 additions & 0 deletions
math/bigint/src/ubig.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
pub use num_bigint::BigUint as BaseUBigInt;
use std::fmt;
use std::ops::{Deref, DerefMut};

#[derive(PartialEq, Eq, Clone, Debug, Hash, Default)]
pub struct UBigInt {
 num: BaseUBigInt,
}

impl From<u64> for UBigInt {
 #[inline]
 fn from(n: u64) -> Self {
 UBigInt::from(BaseUBigInt::from(n))
 }
}

impl From<BaseUBigInt> for UBigInt {
 fn from(num: BaseUBigInt) -> Self {
 Self { num }
 }
}

impl Deref for UBigInt {
 type Target = BaseUBigInt;
 fn deref(&self) -> &Self::Target {
 &self.num
 }
}

impl DerefMut for UBigInt {
 fn deref_mut(&mut self) -> &mut Self::Target {
 &mut self.num
 }
}

impl fmt::Display for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Binary for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::Octal for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::LowerHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

impl fmt::UpperHex for UBigInt {
 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 self.deref().fmt(f)
 }
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/big_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseBigInt, BigInt};

#[test]
fn test_lower_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(BaseBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = BigInt::from(BaseBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = BigInt::from(
 BaseBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

62 changes: 62 additions & 0 deletions
math/bigint/tests/ubig_test.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
use ferret_bigint::{BaseUBigInt, UBigInt};

#[test]
fn test_lower_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:x}", a), "a");
 assert_eq!(format!("{:x}", hello), "48656c6c6f20776f726c6421");
 assert_eq!(format!("{:♥>+#8x}", a), "♥♥♥♥+0xa");
}

#[test]
fn test_upper_hex() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:X}", a), "A");
 assert_eq!(format!("{:X}", hello), "48656C6C6F20776F726C6421");
 assert_eq!(format!("{:♥>+#8X}", a), "♥♥♥♥+0xA");
}

#[test]
fn test_binary() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(BaseUBigInt::parse_bytes("224055342307539".as_bytes(), 10).unwrap());

 assert_eq!(format!("{:b}", a), "1010");
 assert_eq!(
 format!("{:b}", hello),
 "110010111100011011110011000101101001100011010011"
 );
 assert_eq!(format!("{:♥>+#8b}", a), "♥+0b1010");
}

#[test]
fn test_octal() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{:o}", a), "12");
 assert_eq!(format!("{:o}", hello), "22062554330674403566756233062041");
 assert_eq!(format!("{:♥>+#8o}", a), "♥♥♥+0o12");
}

#[test]
fn test_display() {
 let a = UBigInt::from(BaseUBigInt::parse_bytes(b"A", 16).unwrap());
 let hello = UBigInt::from(
 BaseUBigInt::parse_bytes("22405534230753963835153736737".as_bytes(), 10).unwrap(),
 );

 assert_eq!(format!("{}", a), "10");
 assert_eq!(format!("{}", hello), "22405534230753963835153736737");
 assert_eq!(format!("{:♥>+#8}", a), "♥♥♥♥♥+10");
}

2 changes: 1 addition & 1 deletion
vm/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
edition = "2018"

[dependencies]
num-bigint = "0.2.3"
ferret_bigint = {path = "../math/bigint"}
address = {path = "./address"}
encoding = {path = "../encoding"}

2 changes: 1 addition & 1 deletion
vm/actor/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ vm = {path = "../../vm"}
address = {path = "../address"}
runtime = {path = "../runtime"}
cid = "0.3.1"
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
num-traits = "0.2"
num-derive = "0.2"
Expand Down

6 changes: 3 additions & 3 deletions
vm/actor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ pub use self::code::*;

use cid::Cid;
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

#[derive(PartialEq, Eq, Copy, Clone, Debug, Default)]
pub struct ActorID(u64);
Expand All@@ -33,13 +33,13 @@ impl Cbor for ActorID {
pub struct ActorState {
 code_id: CodeID,
 state: Cid,
 balance: BigUint,
 balance: UBigInt,
 sequence: u64,
}

impl ActorState {
 /// Constructor for actor state
 pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
 pub fn new(code_id: CodeID, state: Cid, balance: UBigInt, sequence: u64) -> Self {
 Self {
 code_id,
 state,
Expand Down

2 changes: 1 addition & 1 deletion
vm/message/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
vm = {path = "../../vm"}
address = {path = "../address"}
num-bigint = "0.2.3"
ferret_bigint = {path = "../../math/bigint"}
encoding = {path = "../../encoding"}
crypto = {path = "../../crypto"}
derive_builder = "0.9"
Expand Down

6 changes: 3 additions & 3 deletions
vm/message/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ pub use signed_message::*;
pub use unsigned_message::*;

use address::Address;
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::{MethodNum, MethodParams, TokenAmount};

pub trait Message {
Expand All@@ -24,7 +24,7 @@ pub trait Message {
 /// params returns the encoded parameters for the method call
 fn params(&self) -> MethodParams;
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint;
 fn gas_price(&self) -> UBigInt;
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint;
 fn gas_limit(&self) -> UBigInt;
}

4 changes: 2 additions & 2 deletions
vm/message/src/message_receipt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
use num_bigint::BigUint;
use ferret_bigint::UBigInt;
use vm::ExitCode;

/// MessageReceipt is the result of a state transition from a message
Expand All@@ -7,5 +7,5 @@ pub struct MessageReceipt {
 // TODO: determine if this is necessary, code returned from cbor
 pub exit_code: ExitCode,
 pub return_data: Vec<u8>,
 pub gas_used: BigUint,
 pub gas_used: UBigInt,
}

6 changes: 3 additions & 3 deletions
vm/message/src/signed_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use vm::{MethodNum, MethodParams, TokenAmount};
use address::Address;
use crypto::{Error as CryptoError, Signature, Signer};
use encoding::{Cbor, CodecProtocol, Error as EncodingError};
use num_bigint::BigUint;
use ferret_bigint::UBigInt;

/// SignedMessage represents a wrapped message with signature bytes
#[derive(PartialEq, Clone, Debug)]
Expand DownExpand Up@@ -58,11 +58,11 @@ impl Message for SignedMessage {
 self.message.params()
 }
 /// gas_price returns gas price for the message
 fn gas_price(&self) -> BigUint {
 fn gas_price(&self) -> UBigInt {
 self.message.gas_price()
 }
 /// gas_limit returns the gas limit for the message
 fn gas_limit(&self) -> BigUint {
 fn gas_limit(&self) -> UBigInt {
 self.message.gas_limit()
 }
}
Expand Down
Loading